| Message ID | 20221122152043.8518-2-andrew.cooper3@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Oxenstored live update fixes | expand |
On 22/11/2022 15:20, Andrew Cooper wrote: > A debug statement got inserted into a single-expression if statement. > > Insert brackets to give the intended meaning, rather than the actual meaning > where the "let con = Connections..." is outside and executed unconditionally. > > This results in some unnecessary ring checks for domains which otherwise have > IO credit. > > Fixes: 42f0581a91d4 ("tools/oxenstored: Implement live update for socket connections") > Reported-by: Edwin Török <edvin.torok@citrix.com> > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> > --- > CC: Christian Lindig <christian.lindig@citrix.com> > CC: David Scott <dave@recoil.org> > CC: Edwin Torok <edvin.torok@citrix.com> > CC: Rob Hoes <Rob.Hoes@citrix.com> Christian doesn't have this email for some reason, but has given me his ack in private. ~Andrew
diff --git a/tools/ocaml/xenstored/xenstored.ml b/tools/ocaml/xenstored/xenstored.ml index ffd43a4eee64..c5dc7a28d082 100644 --- a/tools/ocaml/xenstored/xenstored.ml +++ b/tools/ocaml/xenstored/xenstored.ml @@ -475,7 +475,7 @@ let _ = let ring_scan_checker dom = (* no need to scan domains already marked as for processing *) - if not (Domain.get_io_credit dom > 0) then + if not (Domain.get_io_credit dom > 0) then ( debug "Looking up domid %d" (Domain.get_id dom); let con = Connections.find_domain cons (Domain.get_id dom) in if not (Connection.has_more_work con) then ( @@ -490,7 +490,8 @@ let _ = let n = 32 + 2 * (Domains.number domains) in info "found lazy domain %d, credit %d" (Domain.get_id dom) n; Domain.set_io_credit ~n dom - ) in + ) + ) in let last_stat_time = ref 0. in let last_scan_time = ref 0. in
A debug statement got inserted into a single-expression if statement. Insert brackets to give the intended meaning, rather than the actual meaning where the "let con = Connections..." is outside and executed unconditionally. This results in some unnecessary ring checks for domains which otherwise have IO credit. Fixes: 42f0581a91d4 ("tools/oxenstored: Implement live update for socket connections") Reported-by: Edwin Török <edvin.torok@citrix.com> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> --- CC: Christian Lindig <christian.lindig@citrix.com> CC: David Scott <dave@recoil.org> CC: Edwin Torok <edvin.torok@citrix.com> CC: Rob Hoes <Rob.Hoes@citrix.com> --- tools/ocaml/xenstored/xenstored.ml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)