# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1306228450 -3600
# Node ID 5463bdc1d77942b50b28eea059eaba4d1ec7d2ac
# Parent c6265f8b07948c5e5042b18f612e17f187921229
libxc: save: don't bother calculating stat's deltas unless we are going to
print them
Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
diff -r c6265f8b0794 -r 5463bdc1d779 tools/libxc/xc_domain_save.c
--- a/tools/libxc/xc_domain_save.c Tue May 24 10:14:10 2011 +0100
+++ b/tools/libxc/xc_domain_save.c Tue May 24 10:14:10 2011 +0100
@@ -275,10 +275,6 @@ static int print_stats(xc_interface *xch
static struct time_stats last;
struct time_stats now;
- long long wall_delta;
- long long d0_cpu_delta;
- long long d1_cpu_delta;
-
gettimeofday(&now.wall, NULL);
now.d0_cpu = xc_domain_get_cpu_usage(xch, 0, /* FIXME */ 0)/1000;
@@ -287,14 +283,19 @@ static int print_stats(xc_interface *xch
if ( (now.d0_cpu == -1) || (now.d1_cpu == -1) )
DPRINTF("ARRHHH!!\n");
- wall_delta = tv_delta(&now.wall,&last.wall)/1000;
- if ( wall_delta == 0 )
- wall_delta = 1;
+ if ( print )
+ {
+ long long wall_delta;
+ long long d0_cpu_delta;
+ long long d1_cpu_delta;
- d0_cpu_delta = (now.d0_cpu - last.d0_cpu)/1000;
- d1_cpu_delta = (now.d1_cpu - last.d1_cpu)/1000;
+ wall_delta = tv_delta(&now.wall,&last.wall)/1000;
+ if ( wall_delta == 0 )
+ wall_delta = 1;
- if ( print )
+ d0_cpu_delta = (now.d0_cpu - last.d0_cpu)/1000;
+ d1_cpu_delta = (now.d1_cpu - last.d1_cpu)/1000;
+
DPRINTF("delta %lldms, dom0 %d%%, target %d%%, sent %dMb/s, "
"dirtied %dMb/s %" PRId32 " pages\n",
wall_delta,
@@ -303,6 +304,7 @@ static int print_stats(xc_interface *xch
(int)((pages_sent*PAGE_SIZE)/(wall_delta*(1000/8))),
(int)((stats->dirty_count*PAGE_SIZE)/(wall_delta*(1000/8))),
stats->dirty_count);
+ }
last = now;
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
Home