|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen-unstable] xenpm: assorted adjustments
# HG changeset patch
# User Jan Beulich <jbeulich@xxxxxxxx>
# Date 1326212690 0
# Node ID a2ed45b6df07556647b7dfd86b81dc2fd1324ed6
# Parent 3a79842d4845f55214042edc4885519258fdb335
xenpm: assorted adjustments
- use consistent error values (stop mixing of [positive] errno values
with literal -E... ones)
- properly format output
- don't use leading zeros in decimal output
- move printing of average frequency into P-state conditional (rather
than a C-state one)
- don't print some C-state related info when CPU idle management is
disabled in the hypervisor
- use calloc() for array allocations that also got cleared via memset()
so far
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
diff -r 3a79842d4845 -r a2ed45b6df07 tools/misc/xenpm.c
--- a/tools/misc/xenpm.c Tue Jan 10 16:13:06 2012 +0000
+++ b/tools/misc/xenpm.c Tue Jan 10 16:24:50 2012 +0000
@@ -87,20 +87,20 @@
cxstat->idle_time/1000000UL);
for ( i = 0; i < cxstat->nr; i++ )
{
- printf("C%d : transition [%020"PRIu64"]\n",
+ printf("C%-20d: transition [%20"PRIu64"]\n",
i, cxstat->triggers[i]);
- printf(" residency [%020"PRIu64" ms]\n",
+ printf(" residency [%20"PRIu64" ms]\n",
cxstat->residencies[i]/1000000UL);
}
- printf("pc2 : [%020"PRIu64" ms]\n"
- "pc3 : [%020"PRIu64" ms]\n"
- "pc6 : [%020"PRIu64" ms]\n"
- "pc7 : [%020"PRIu64" ms]\n",
+ printf("pc2 : [%20"PRIu64" ms]\n"
+ "pc3 : [%20"PRIu64" ms]\n"
+ "pc6 : [%20"PRIu64" ms]\n"
+ "pc7 : [%20"PRIu64" ms]\n",
cxstat->pc2/1000000UL, cxstat->pc3/1000000UL,
cxstat->pc6/1000000UL, cxstat->pc7/1000000UL);
- printf("cc3 : [%020"PRIu64" ms]\n"
- "cc6 : [%020"PRIu64" ms]\n"
- "cc7 : [%020"PRIu64" ms]\n",
+ printf("cc3 : [%20"PRIu64" ms]\n"
+ "cc6 : [%20"PRIu64" ms]\n"
+ "cc7 : [%20"PRIu64" ms]\n",
cxstat->cc3/1000000UL, cxstat->cc6/1000000UL,
cxstat->cc7/1000000UL);
printf("\n");
@@ -114,7 +114,7 @@
ret = xc_pm_get_max_cx(xc_handle, cpuid, &max_cx_num);
if ( ret )
- return errno;
+ return -errno;
if ( !cxstat )
return -EINVAL;
@@ -135,15 +135,14 @@
ret = xc_pm_get_cxstat(xc_handle, cpuid, cxstat);
if( ret )
{
- int temp = errno;
+ ret = -errno;
free(cxstat->triggers);
free(cxstat->residencies);
cxstat->triggers = NULL;
cxstat->residencies = NULL;
- return temp;
}
- return 0;
+ return ret;
}
static int show_max_cstate(xc_interface *xc_handle)
@@ -214,14 +213,13 @@
for ( i = 0; i < pxstat->total; i++ )
{
if ( pxstat->cur == i )
- printf("*P%d", i);
+ printf("*P%-9d", i);
else
- printf("P%d ", i);
- printf(" : freq [%04"PRIu64" MHz]\n",
- pxstat->pt[i].freq);
- printf(" transition [%020"PRIu64"]\n",
+ printf("P%-10d", i);
+ printf("[%4"PRIu64" MHz]", pxstat->pt[i].freq);
+ printf(": transition [%20"PRIu64"]\n",
pxstat->pt[i].count);
- printf(" residency [%020"PRIu64" ms]\n",
+ printf(" residency [%20"PRIu64" ms]\n",
pxstat->pt[i].residency/1000000UL);
}
printf("\n");
@@ -235,7 +233,7 @@
ret = xc_pm_get_max_px(xc_handle, cpuid, &max_px_num);
if ( ret )
- return errno;
+ return -errno;
if ( !pxstat)
return -EINVAL;
@@ -254,15 +252,14 @@
ret = xc_pm_get_pxstat(xc_handle, cpuid, pxstat);
if( ret )
{
- int temp = errno;
+ ret = -errno;
free(pxstat->trans_pt);
free(pxstat->pt);
pxstat->trans_pt = NULL;
pxstat->pt = NULL;
- return temp;
}
- return 0;
+ return ret;
}
/* show cpu actual average freq information on CPU cpuid */
@@ -272,11 +269,9 @@
ret = xc_get_cpufreq_avgfreq(xc_handle, cpuid, avgfreq);
if ( ret )
- {
- return errno;
- }
+ ret = -errno;
- return 0;
+ return ret;
}
static int show_pxstat_by_cpuid(xc_interface *xc_handle, int cpuid)
@@ -325,7 +320,7 @@
static void signal_int_handler(int signo)
{
- int i, j, k, ret;
+ int i, j, k;
struct timeval tv;
int cx_cap = 0, px_cap = 0;
DECLARE_HYPERCALL_BUFFER(uint32_t, cpu_to_core);
@@ -404,6 +399,8 @@
res / 1000000UL, 100UL * res / (double)sum_px[i]);
}
}
+ if ( px_cap && avgfreq[i] )
+ printf(" Avg freq\t%d\tKHz\n", avgfreq[i]);
}
set_xen_guest_handle(info.cpu_to_core, cpu_to_core);
@@ -411,8 +408,7 @@
set_xen_guest_handle(info.cpu_to_node, cpu_to_node);
info.max_cpu_index = MAX_NR_CPU - 1;
- ret = xc_topologyinfo(xc_handle, &info);
- if ( !ret )
+ if ( cx_cap && !xc_topologyinfo(xc_handle, &info) )
{
uint32_t socket_ids[MAX_NR_CPU];
uint32_t core_ids[MAX_NR_CPU];
@@ -461,7 +457,7 @@
if ( cpu_to_socket[j] == socket_ids[i] )
break;
}
- printf("Socket %d\n", socket_ids[i]);
+ printf("\nSocket %d\n", socket_ids[i]);
res = cxstat_end[j].pc2 - cxstat_start[j].pc2;
printf("\tPC2\t%"PRIu64" ms\t%.2f%%\n", res / 1000000UL,
100UL * res / (double)sum_cx[j]);
@@ -492,12 +488,9 @@
res = cxstat_end[j].cc7 - cxstat_start[j].cc7;
printf("\t\tCC7\t%"PRIu64" ms\t%.2f%%\n", res / 1000000UL,
100UL * res / (double)sum_cx[j]);
- printf("\n");
-
}
}
}
- printf(" Avg freq\t%d\tKHz\n", avgfreq[i]);
}
/* some clean up and then exits */
@@ -542,23 +535,23 @@
}
usec_start = tv.tv_sec * 1000000UL + tv.tv_usec;
- sum = malloc(sizeof(uint64_t) * 2 * max_cpu_nr);
+ sum = calloc(2 * max_cpu_nr, sizeof(*sum));
if ( sum == NULL )
return ;
- cxstat = malloc(sizeof(struct xc_cx_stat) * 2 * max_cpu_nr);
+ cxstat = calloc(2 * max_cpu_nr, sizeof(*cxstat));
if ( cxstat == NULL )
{
free(sum);
return ;
}
- pxstat = malloc(sizeof(struct xc_px_stat) * 2 * max_cpu_nr);
+ pxstat = calloc(2 * max_cpu_nr, sizeof(*pxstat));
if ( pxstat == NULL )
{
free(sum);
free(cxstat);
return ;
}
- avgfreq = malloc(sizeof(int) * max_cpu_nr);
+ avgfreq = calloc(max_cpu_nr, sizeof(*avgfreq));
if ( avgfreq == NULL )
{
free(sum);
@@ -566,10 +559,6 @@
free(pxstat);
return ;
}
- memset(sum, 0, sizeof(uint64_t) * 2 * max_cpu_nr);
- memset(cxstat, 0, sizeof(struct xc_cx_stat) * 2 * max_cpu_nr);
- memset(pxstat, 0, sizeof(struct xc_px_stat) * 2 * max_cpu_nr);
- memset(avgfreq, 0, sizeof(int) * max_cpu_nr);
sum_cx = sum;
sum_px = sum + max_cpu_nr;
cxstat_start = cxstat;
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |