* [PATCH] oxenstored: fix del_watches and del_transactions @ 2015-06-17 19:39 Wei Liu 2015-06-17 19:44 ` Dave Scott 0 siblings, 1 reply; 7+ messages in thread From: Wei Liu @ 2015-06-17 19:39 UTC (permalink / raw) To: Xen-devel; +Cc: David Scott, Wei Liu, Ian Campbell The statement to reset nb_watches should be in del_watches, not del_transactions. Signed-off-by: Wei Liu <wei.liu2@citrix.com> Cc: David Scott <dave.scott@citrix.com> --- It was only until Ian applied previous patch that I discovered this copy-n-paste error. Sorry about this. --- tools/ocaml/xenstored/connection.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ocaml/xenstored/connection.ml b/tools/ocaml/xenstored/connection.ml index 9de4978..935939a 100644 --- a/tools/ocaml/xenstored/connection.ml +++ b/tools/ocaml/xenstored/connection.ml @@ -188,10 +188,10 @@ let del_watch con path token = let del_watches con = Hashtbl.clear con.watches + con.nb_watches <- 0 let del_transactions con = Hashtbl.clear con.transactions; - con.nb_watches <- 0 let list_watches con = let ll = Hashtbl.fold -- 1.9.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] oxenstored: fix del_watches and del_transactions 2015-06-17 19:39 [PATCH] oxenstored: fix del_watches and del_transactions Wei Liu @ 2015-06-17 19:44 ` Dave Scott 2015-06-18 8:53 ` Ian Campbell 0 siblings, 1 reply; 7+ messages in thread From: Dave Scott @ 2015-06-17 19:44 UTC (permalink / raw) To: Wei Liu; +Cc: Xen-devel, Ian Campbell > On 17 Jun 2015, at 20:39, Wei Liu <wei.liu2@citrix.com> wrote: > > The statement to reset nb_watches should be in del_watches, not > del_transactions. > > Signed-off-by: Wei Liu <wei.liu2@citrix.com> > Cc: David Scott <dave.scott@citrix.com> > --- > It was only until Ian applied previous patch that I discovered this > copy-n-paste error. Sorry about this. Oh yes I see what you mean. Acked-by: David Scott <dave.scott@citrix.com> Cheers, Dave > --- > tools/ocaml/xenstored/connection.ml | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/ocaml/xenstored/connection.ml b/tools/ocaml/xenstored/connection.ml > index 9de4978..935939a 100644 > --- a/tools/ocaml/xenstored/connection.ml > +++ b/tools/ocaml/xenstored/connection.ml > @@ -188,10 +188,10 @@ let del_watch con path token = > > let del_watches con = > Hashtbl.clear con.watches > + con.nb_watches <- 0 > > let del_transactions con = > Hashtbl.clear con.transactions; > - con.nb_watches <- 0 > > let list_watches con = > let ll = Hashtbl.fold > -- > 1.9.1 > ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] oxenstored: fix del_watches and del_transactions 2015-06-17 19:44 ` Dave Scott @ 2015-06-18 8:53 ` Ian Campbell 2015-06-18 8:56 ` Ian Campbell 0 siblings, 1 reply; 7+ messages in thread From: Ian Campbell @ 2015-06-18 8:53 UTC (permalink / raw) To: Dave Scott; +Cc: Xen-devel, Wei Liu On Wed, 2015-06-17 at 20:44 +0100, Dave Scott wrote: > > On 17 Jun 2015, at 20:39, Wei Liu <wei.liu2@citrix.com> wrote: > > > > The statement to reset nb_watches should be in del_watches, not > > del_transactions. > > > > Signed-off-by: Wei Liu <wei.liu2@citrix.com> > > Cc: David Scott <dave.scott@citrix.com> > > --- > > It was only until Ian applied previous patch that I discovered this > > copy-n-paste error. Sorry about this. > > Oh yes I see what you mean. > > Acked-by: David Scott <dave.scott@citrix.com> Alas: File "connection.ml", line 191, characters 17-19: Error: Syntax error If I just need to append a ; to the moved line I can do that on commit, if it needs e.g. wrapping in a begin/end or something then I'd best have another patch. Ian. diff --git a/tools/ocaml/xenstored/connection.ml b/tools/ocaml/xenstore index 9de4978..935939a 100644 --- a/tools/ocaml/xenstored/connection.ml +++ b/tools/ocaml/xenstored/connection.ml @@ -188,10 +188,10 @@ let del_watch con path token = let del_watches con = Hashtbl.clear con.watches + con.nb_watches <- 0 let del_transactions con = Hashtbl.clear con.transactions; - con.nb_watches <- 0 let list_watches con = let ll = Hashtbl.fold ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] oxenstored: fix del_watches and del_transactions 2015-06-18 8:53 ` Ian Campbell @ 2015-06-18 8:56 ` Ian Campbell 2015-06-18 9:13 ` Ian Campbell 2015-06-18 9:23 ` Wei Liu 0 siblings, 2 replies; 7+ messages in thread From: Ian Campbell @ 2015-06-18 8:56 UTC (permalink / raw) To: Dave Scott; +Cc: Xen-devel, Wei Liu On Thu, 2015-06-18 at 09:53 +0100, Ian Campbell wrote: > On Wed, 2015-06-17 at 20:44 +0100, Dave Scott wrote: > > > On 17 Jun 2015, at 20:39, Wei Liu <wei.liu2@citrix.com> wrote: > > > > > > The statement to reset nb_watches should be in del_watches, not > > > del_transactions. > > > > > > Signed-off-by: Wei Liu <wei.liu2@citrix.com> > > > Cc: David Scott <dave.scott@citrix.com> > > > --- > > > It was only until Ian applied previous patch that I discovered this > > > copy-n-paste error. Sorry about this. > > > > Oh yes I see what you mean. > > > > Acked-by: David Scott <dave.scott@citrix.com> > > Alas: > File "connection.ml", line 191, characters 17-19: > Error: Syntax error > > If I just need to append a ; to the moved line I can do that on commit, > if it needs e.g. wrapping in a begin/end or something then I'd best have > another patch. Actually, I think the ; should be on the previous line and the one on the old previous line should go, like the below. Look correct? commit d962aa44e4128ea677ce8407fc2483d94f007d91 Author: Wei Liu <wei.liu2@citrix.com> Date: Wed Jun 17 20:39:49 2015 +0100 oxenstored: fix del_watches and del_transactions The statement to reset nb_watches should be in del_watches, not del_transactions. Signed-off-by: Wei Liu <wei.liu2@citrix.com> Cc: David Scott <dave.scott@citrix.com> Acked-by: David Scott <dave.scott@citrix.com> [ ijc -- fix syntax error by adding a ";" to the previous line in the new location and removing from the previous line in the old ] diff --git a/tools/ocaml/xenstored/connection.ml b/tools/ocaml/xenstored/connection.ml index 9de4978..0a2c481 100644 --- a/tools/ocaml/xenstored/connection.ml +++ b/tools/ocaml/xenstored/connection.ml @@ -187,11 +187,11 @@ let del_watch con path token = apath, w let del_watches con = - Hashtbl.clear con.watches + Hashtbl.clear con.watches; + con.nb_watches <- 0 let del_transactions con = - Hashtbl.clear con.transactions; - con.nb_watches <- 0 + Hashtbl.clear con.transactions let list_watches con = let ll = Hashtbl.fold ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] oxenstored: fix del_watches and del_transactions 2015-06-18 8:56 ` Ian Campbell @ 2015-06-18 9:13 ` Ian Campbell 2015-06-18 9:23 ` Wei Liu 1 sibling, 0 replies; 7+ messages in thread From: Ian Campbell @ 2015-06-18 9:13 UTC (permalink / raw) To: Dave Scott; +Cc: Xen-devel, Wei Liu On Thu, 2015-06-18 at 09:56 +0100, Ian Campbell wrote: > On Thu, 2015-06-18 at 09:53 +0100, Ian Campbell wrote: > > On Wed, 2015-06-17 at 20:44 +0100, Dave Scott wrote: > > > > On 17 Jun 2015, at 20:39, Wei Liu <wei.liu2@citrix.com> wrote: > > > > > > > > The statement to reset nb_watches should be in del_watches, not > > > > del_transactions. > > > > > > > > Signed-off-by: Wei Liu <wei.liu2@citrix.com> > > > > Cc: David Scott <dave.scott@citrix.com> > > > > --- > > > > It was only until Ian applied previous patch that I discovered this > > > > copy-n-paste error. Sorry about this. > > > > > > Oh yes I see what you mean. > > > > > > Acked-by: David Scott <dave.scott@citrix.com> > > > > Alas: > > File "connection.ml", line 191, characters 17-19: > > Error: Syntax error > > > > If I just need to append a ; to the moved line I can do that on commit, > > if it needs e.g. wrapping in a begin/end or something then I'd best have > > another patch. > > Actually, I think the ; should be on the previous line and the one on > the old previous line should go, like the below. Look correct? It built -- I'll wait for an ok before pushing though. > commit d962aa44e4128ea677ce8407fc2483d94f007d91 > Author: Wei Liu <wei.liu2@citrix.com> > Date: Wed Jun 17 20:39:49 2015 +0100 > > oxenstored: fix del_watches and del_transactions > > The statement to reset nb_watches should be in del_watches, not > del_transactions. > > Signed-off-by: Wei Liu <wei.liu2@citrix.com> > Cc: David Scott <dave.scott@citrix.com> > Acked-by: David Scott <dave.scott@citrix.com> > [ ijc -- fix syntax error by adding a ";" to the previous line in the > new location and removing from the previous line in the old ] > > diff --git a/tools/ocaml/xenstored/connection.ml b/tools/ocaml/xenstored/connection.ml > index 9de4978..0a2c481 100644 > --- a/tools/ocaml/xenstored/connection.ml > +++ b/tools/ocaml/xenstored/connection.ml > @@ -187,11 +187,11 @@ let del_watch con path token = > apath, w > > let del_watches con = > - Hashtbl.clear con.watches > + Hashtbl.clear con.watches; > + con.nb_watches <- 0 > > let del_transactions con = > - Hashtbl.clear con.transactions; > - con.nb_watches <- 0 > + Hashtbl.clear con.transactions > > let list_watches con = > let ll = Hashtbl.fold > > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] oxenstored: fix del_watches and del_transactions 2015-06-18 8:56 ` Ian Campbell 2015-06-18 9:13 ` Ian Campbell @ 2015-06-18 9:23 ` Wei Liu 2015-06-18 9:27 ` Ian Campbell 1 sibling, 1 reply; 7+ messages in thread From: Wei Liu @ 2015-06-18 9:23 UTC (permalink / raw) To: Ian Campbell; +Cc: Xen-devel, Dave Scott, Wei Liu On Thu, Jun 18, 2015 at 09:56:37AM +0100, Ian Campbell wrote: > On Thu, 2015-06-18 at 09:53 +0100, Ian Campbell wrote: > > On Wed, 2015-06-17 at 20:44 +0100, Dave Scott wrote: > > > > On 17 Jun 2015, at 20:39, Wei Liu <wei.liu2@citrix.com> wrote: > > > > > > > > The statement to reset nb_watches should be in del_watches, not > > > > del_transactions. > > > > > > > > Signed-off-by: Wei Liu <wei.liu2@citrix.com> > > > > Cc: David Scott <dave.scott@citrix.com> > > > > --- > > > > It was only until Ian applied previous patch that I discovered this > > > > copy-n-paste error. Sorry about this. > > > > > > Oh yes I see what you mean. > > > > > > Acked-by: David Scott <dave.scott@citrix.com> > > > > Alas: > > File "connection.ml", line 191, characters 17-19: > > Error: Syntax error > > > > If I just need to append a ; to the moved line I can do that on commit, > > if it needs e.g. wrapping in a begin/end or something then I'd best have > > another patch. > > Actually, I think the ; should be on the previous line and the one on > the old previous line should go, like the below. Look correct? Yes. Thanks for the fix. (I really shouldn't have worked after 7pm) > commit d962aa44e4128ea677ce8407fc2483d94f007d91 > Author: Wei Liu <wei.liu2@citrix.com> > Date: Wed Jun 17 20:39:49 2015 +0100 > > oxenstored: fix del_watches and del_transactions > > The statement to reset nb_watches should be in del_watches, not > del_transactions. > > Signed-off-by: Wei Liu <wei.liu2@citrix.com> > Cc: David Scott <dave.scott@citrix.com> > Acked-by: David Scott <dave.scott@citrix.com> > [ ijc -- fix syntax error by adding a ";" to the previous line in the > new location and removing from the previous line in the old ] > > diff --git a/tools/ocaml/xenstored/connection.ml b/tools/ocaml/xenstored/connection.ml > index 9de4978..0a2c481 100644 > --- a/tools/ocaml/xenstored/connection.ml > +++ b/tools/ocaml/xenstored/connection.ml > @@ -187,11 +187,11 @@ let del_watch con path token = > apath, w > > let del_watches con = > - Hashtbl.clear con.watches > + Hashtbl.clear con.watches; > + con.nb_watches <- 0 > > let del_transactions con = > - Hashtbl.clear con.transactions; > - con.nb_watches <- 0 > + Hashtbl.clear con.transactions > > let list_watches con = > let ll = Hashtbl.fold > ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] oxenstored: fix del_watches and del_transactions 2015-06-18 9:23 ` Wei Liu @ 2015-06-18 9:27 ` Ian Campbell 0 siblings, 0 replies; 7+ messages in thread From: Ian Campbell @ 2015-06-18 9:27 UTC (permalink / raw) To: Wei Liu; +Cc: Xen-devel, Dave Scott On Thu, 2015-06-18 at 10:23 +0100, Wei Liu wrote: > On Thu, Jun 18, 2015 at 09:56:37AM +0100, Ian Campbell wrote: > > On Thu, 2015-06-18 at 09:53 +0100, Ian Campbell wrote: > > > On Wed, 2015-06-17 at 20:44 +0100, Dave Scott wrote: > > > > > On 17 Jun 2015, at 20:39, Wei Liu <wei.liu2@citrix.com> wrote: > > > > > > > > > > The statement to reset nb_watches should be in del_watches, not > > > > > del_transactions. > > > > > > > > > > Signed-off-by: Wei Liu <wei.liu2@citrix.com> > > > > > Cc: David Scott <dave.scott@citrix.com> > > > > > --- > > > > > It was only until Ian applied previous patch that I discovered this > > > > > copy-n-paste error. Sorry about this. > > > > > > > > Oh yes I see what you mean. > > > > > > > > Acked-by: David Scott <dave.scott@citrix.com> > > > > > > Alas: > > > File "connection.ml", line 191, characters 17-19: > > > Error: Syntax error > > > > > > If I just need to append a ; to the moved line I can do that on commit, > > > if it needs e.g. wrapping in a begin/end or something then I'd best have > > > another patch. > > > > Actually, I think the ; should be on the previous line and the one on > > the old previous line should go, like the below. Look correct? > > Yes. Thanks for the fix. Pushed, thanks. > (I really shouldn't have worked after 7pm) :-D ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2015-06-18 9:28 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-06-17 19:39 [PATCH] oxenstored: fix del_watches and del_transactions Wei Liu 2015-06-17 19:44 ` Dave Scott 2015-06-18 8:53 ` Ian Campbell 2015-06-18 8:56 ` Ian Campbell 2015-06-18 9:13 ` Ian Campbell 2015-06-18 9:23 ` Wei Liu 2015-06-18 9:27 ` Ian Campbell
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.