[Xen-devel] [PATCH 0/3] tools/xentop: Fix calculation of used memory and some cleanups

[Xen-devel] [PATCH 0/3] tools/xentop: Fix calculation of used memory and some cleanups

[Sander Eikelenboom]

Fixes some fallout from: c588c002cc1 ('tools: remove tmem code and commands')

Sander Eikelenboom (3):
  tools/xentop: Fix calculation of used memory.
  tools/xentop: Remove dead code
  tools/xentop: Cleanup some trailing whitespace

 tools/xenstat/xentop/xentop.c | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

-- 
2.20.1


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

[Xen-devel] [PATCH 1/3] tools/xentop: Fix calculation of used memory.

[Sander Eikelenboom]

Signed-off-by: Sander Eikelenboom <linux@eikelenboom.it>
---
 tools/xenstat/xentop/xentop.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/xenstat/xentop/xentop.c b/tools/xenstat/xentop/xentop.c
index af11ebfbf7..13b612f26d 100644
--- a/tools/xenstat/xentop/xentop.c
+++ b/tools/xenstat/xentop/xentop.c
@@ -969,7 +969,7 @@ void do_summary(void)
 	      "%u crashed, %u dying, %u shutdown \n",
 	      num_domains, run, block, pause, crash, dying, shutdown);
 
-	used = xenstat_node_tot_mem(cur_node);
+	used = xenstat_node_tot_mem(cur_node)-xenstat_node_free_mem(cur_node);
 	freeable_mb = 0;
 
 	/* Dump node memory and cpu information */
-- 
2.20.1


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [Xen-devel] [PATCH 1/3] tools/xentop: Fix calculation of used memory.

[Wei Liu]

The code looks correct to me, but I would like to add the following
commit message to this change.

Used memory should be calculated by subtracting free memory from total
memory.


On Wed, Feb 19, 2020 at 09:31:30PM +0100, Sander Eikelenboom wrote:
> Signed-off-by: Sander Eikelenboom <linux@eikelenboom.it>
> ---
>  tools/xenstat/xentop/xentop.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/xenstat/xentop/xentop.c b/tools/xenstat/xentop/xentop.c
> index af11ebfbf7..13b612f26d 100644
> --- a/tools/xenstat/xentop/xentop.c
> +++ b/tools/xenstat/xentop/xentop.c
> @@ -969,7 +969,7 @@ void do_summary(void)
>  	      "%u crashed, %u dying, %u shutdown \n",
>  	      num_domains, run, block, pause, crash, dying, shutdown);
>  
> -	used = xenstat_node_tot_mem(cur_node);
> +	used = xenstat_node_tot_mem(cur_node)-xenstat_node_free_mem(cur_node);

Also, I will add spaces around "-".

Acked-by: Wei Liu <wl@xen.org>

>  	freeable_mb = 0;
>  
>  	/* Dump node memory and cpu information */
> -- 
> 2.20.1
> 

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [Xen-devel] [PATCH 1/3] tools/xentop: Fix calculation of used memory.

[Wei Liu]

On Thu, Feb 20, 2020 at 12:48:16AM +0000, Wei Liu wrote:
> The code looks correct to me, but I would like to add the following
> commit message to this change.
> 
> Used memory should be calculated by subtracting free memory from total
> memory.

Fixes: c588c002cc1 ("tools: remove tmem code and commands")

> 
> 
> On Wed, Feb 19, 2020 at 09:31:30PM +0100, Sander Eikelenboom wrote:
> > Signed-off-by: Sander Eikelenboom <linux@eikelenboom.it>
> > ---
> >  tools/xenstat/xentop/xentop.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/tools/xenstat/xentop/xentop.c b/tools/xenstat/xentop/xentop.c
> > index af11ebfbf7..13b612f26d 100644
> > --- a/tools/xenstat/xentop/xentop.c
> > +++ b/tools/xenstat/xentop/xentop.c
> > @@ -969,7 +969,7 @@ void do_summary(void)
> >  	      "%u crashed, %u dying, %u shutdown \n",
> >  	      num_domains, run, block, pause, crash, dying, shutdown);
> >  
> > -	used = xenstat_node_tot_mem(cur_node);
> > +	used = xenstat_node_tot_mem(cur_node)-xenstat_node_free_mem(cur_node);
> 
> Also, I will add spaces around "-".
> 
> Acked-by: Wei Liu <wl@xen.org>
> 
> >  	freeable_mb = 0;
> >  
> >  	/* Dump node memory and cpu information */
> > -- 
> > 2.20.1
> > 

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

[Xen-devel] [PATCH 2/3] tools/xentop: Remove dead code

[Sander Eikelenboom]

Signed-off-by: Sander Eikelenboom <linux@eikelenboom.it>
---
 tools/xenstat/xentop/xentop.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/tools/xenstat/xentop/xentop.c b/tools/xenstat/xentop/xentop.c
index 13b612f26d..bbb5d47b76 100644
--- a/tools/xenstat/xentop/xentop.c
+++ b/tools/xenstat/xentop/xentop.c
@@ -943,7 +943,6 @@ void do_summary(void)
 	         crash = 0, dying = 0, shutdown = 0;
 	unsigned i, num_domains = 0;
 	unsigned long long used = 0;
-	long freeable_mb = 0;
 	xenstat_domain *domain;
 	time_t curt;
 
@@ -970,17 +969,12 @@ void do_summary(void)
 	      num_domains, run, block, pause, crash, dying, shutdown);
 
 	used = xenstat_node_tot_mem(cur_node)-xenstat_node_free_mem(cur_node);
-	freeable_mb = 0;
 
 	/* Dump node memory and cpu information */
-	if ( freeable_mb <= 0 )
-	     print("Mem: %lluk total, %lluk used, %lluk free    ",
+	print("Mem: %lluk total, %lluk used, %lluk free    ",
 	      xenstat_node_tot_mem(cur_node)/1024, used/1024,
 	      xenstat_node_free_mem(cur_node)/1024);
-	else
-	     print("Mem: %lluk total, %lluk used, %lluk free, %ldk freeable, ",
-	      xenstat_node_tot_mem(cur_node)/1024, used/1024,
-	      xenstat_node_free_mem(cur_node)/1024, freeable_mb*1024);
+
 	print("CPUs: %u @ %lluMHz\n",
 	      xenstat_node_num_cpus(cur_node),
 	      xenstat_node_cpu_hz(cur_node)/1000000);
-- 
2.20.1


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [Xen-devel] [PATCH 2/3] tools/xentop: Remove dead code

[Wei Liu]

On Wed, Feb 19, 2020 at 09:31:31PM +0100, Sander Eikelenboom wrote:
> Signed-off-by: Sander Eikelenboom <linux@eikelenboom.it>
> ---

I will add the following commit message:

The variable freealbe_mb was never really used. Delete it and the code
associated with it.

Acked-by: Wei Liu <wl@xen.org>

>  tools/xenstat/xentop/xentop.c | 10 ++--------
>  1 file changed, 2 insertions(+), 8 deletions(-)
> 
> diff --git a/tools/xenstat/xentop/xentop.c b/tools/xenstat/xentop/xentop.c
> index 13b612f26d..bbb5d47b76 100644
> --- a/tools/xenstat/xentop/xentop.c
> +++ b/tools/xenstat/xentop/xentop.c
> @@ -943,7 +943,6 @@ void do_summary(void)
>  	         crash = 0, dying = 0, shutdown = 0;
>  	unsigned i, num_domains = 0;
>  	unsigned long long used = 0;
> -	long freeable_mb = 0;
>  	xenstat_domain *domain;
>  	time_t curt;
>  
> @@ -970,17 +969,12 @@ void do_summary(void)
>  	      num_domains, run, block, pause, crash, dying, shutdown);
>  
>  	used = xenstat_node_tot_mem(cur_node)-xenstat_node_free_mem(cur_node);
> -	freeable_mb = 0;
>  
>  	/* Dump node memory and cpu information */
> -	if ( freeable_mb <= 0 )
> -	     print("Mem: %lluk total, %lluk used, %lluk free    ",
> +	print("Mem: %lluk total, %lluk used, %lluk free    ",
>  	      xenstat_node_tot_mem(cur_node)/1024, used/1024,
>  	      xenstat_node_free_mem(cur_node)/1024);
> -	else
> -	     print("Mem: %lluk total, %lluk used, %lluk free, %ldk freeable, ",
> -	      xenstat_node_tot_mem(cur_node)/1024, used/1024,
> -	      xenstat_node_free_mem(cur_node)/1024, freeable_mb*1024);
> +
>  	print("CPUs: %u @ %lluMHz\n",
>  	      xenstat_node_num_cpus(cur_node),
>  	      xenstat_node_cpu_hz(cur_node)/1000000);
> -- 
> 2.20.1
> 

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [Xen-devel] [PATCH 2/3] tools/xentop: Remove dead code

[Wei Liu]

On Thu, Feb 20, 2020 at 12:51:23AM +0000, Wei Liu wrote:
> On Wed, Feb 19, 2020 at 09:31:31PM +0100, Sander Eikelenboom wrote:
> > Signed-off-by: Sander Eikelenboom <linux@eikelenboom.it>
> > ---
> 
> I will add the following commit message:
> 
> The variable freealbe_mb was never really used. Delete it and the code
> associated with it.

Actually, use the following:

The freeable_mb variable was made to always be zero when purging tmem
from tools. We can in fact just delete it and the code associated with
it.

Fixes: c588c002cc1 ("tools: remove tmem code and commands")

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

[Xen-devel] [PATCH 3/3] tools/xentop: Cleanup some trailing whitespace

[Sander Eikelenboom]

Signed-off-by: Sander Eikelenboom <linux@eikelenboom.it>
---
 tools/xenstat/xentop/xentop.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/xenstat/xentop/xentop.c b/tools/xenstat/xentop/xentop.c
index bbb5d47b76..fdcfb3b396 100644
--- a/tools/xenstat/xentop/xentop.c
+++ b/tools/xenstat/xentop/xentop.c
@@ -1015,7 +1015,7 @@ void do_bottom_line(void)
 		addch(A_REVERSE | 'N');
 		attr_addstr(show_networks ? COLOR_PAIR(1) : 0, "etworks");
 		addstr("  ");
-		
+
 		/* VBDs */
 		attr_addstr(show_vbds ? COLOR_PAIR(1) : 0, "v");
 		addch(A_REVERSE | 'B');
@@ -1123,7 +1123,7 @@ void do_vbd(xenstat_domain *domain)
 		"BlkBack",           /* number 1 */
 		"BlkTap",            /* number 2 */
 	};
-	
+
 	num_vbds = xenstat_domain_num_vbds(domain);
 
 	for (i=0 ; i< num_vbds; i++) {
-- 
2.20.1


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [Xen-devel] [PATCH 3/3] tools/xentop: Cleanup some trailing whitespace

[Wei Liu]

On Wed, Feb 19, 2020 at 09:31:32PM +0100, Sander Eikelenboom wrote:
> Signed-off-by: Sander Eikelenboom <linux@eikelenboom.it>

Acked-by: Wei Liu <wl@xen.org>

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [Xen-devel] [PATCH 0/3] tools/xentop: Fix calculation of used memory and some cleanups

[Wei Liu]

On Wed, Feb 19, 2020 at 09:31:29PM +0100, Sander Eikelenboom wrote:
> Fixes some fallout from: c588c002cc1 ('tools: remove tmem code and commands')

Thanks. I made some suggestions on adding commit messages. Let me know
if you're okay with those.

Wei.

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [Xen-devel] [PATCH 0/3] tools/xentop: Fix calculation of used memory and some cleanups

[Sander Eikelenboom]

On 20/02/2020 01:53, Wei Liu wrote:
> On Wed, Feb 19, 2020 at 09:31:29PM +0100, Sander Eikelenboom wrote:
>> Fixes some fallout from: c588c002cc1 ('tools: remove tmem code and commands')
> 
> Thanks. I made some suggestions on adding commit messages. Let me know
> if you're okay with those.
> 
> Wei.
> 

Yes, they all seem improvements, thanks !

--
Sander

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel