[PATCH] oxenstored: fix del_watches and del_transactions

[PATCH] oxenstored: fix del_watches and del_transactions

[Wei Liu]

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

Re: [PATCH] oxenstored: fix del_watches and del_transactions

[Dave Scott]

> 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
> 

Re: [PATCH] oxenstored: fix del_watches and del_transactions

[Ian Campbell]

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 

Re: [PATCH] oxenstored: fix del_watches and del_transactions

[Ian Campbell]

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 

Re: [PATCH] oxenstored: fix del_watches and del_transactions

[Ian Campbell]

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

Re: [PATCH] oxenstored: fix del_watches and del_transactions

[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 
> 

Re: [PATCH] oxenstored: fix del_watches and del_transactions

[Ian Campbell]

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