bitkeeper revision 1.389 (3f28df19Z3T_sAYRfO2FBURRnxpp_w)

dev.c, perfc_defn.h, perfc.c, domain_page.c:
  Perfctr hacks and additions.

1 files changed, 11 insertions, 9 deletions

diff --git a/xen/common/perfc.c b/xen/common/perfc.c
index 09780a8a88..00f599e881 100644
--- a/xen/common/perfc.c
+++ b/xen/common/perfc.c
@@ -34,29 +34,31 @@ void perfc_printall(u_char key, void *dev_id, struct pt_regs *regs)
 
     for ( i = 0; i < NR_PERFCTRS; i++ ) 
     {
+        printk("%20s  ",  perfc_info[i].name);
         switch ( perfc_info[i].type )
         {
         case TYPE_SINGLE:
-            printk("%10d  0x%08x  %s\n", 
-                   atomic_read(&counters[0]), atomic_read(&counters[0]), 
-                   perfc_info[i].name);
+            printk("%10d  0x%08x",
+                   atomic_read(&counters[0]), 
+                   atomic_read(&counters[0]));
             counters += 1;
             break;
         case TYPE_CPU:
             for ( j = 0; j < smp_num_cpus; j++ )
-                printk("%10d  0x%08x  %s[CPU %02d]\n",
-                       atomic_read(&counters[j]), atomic_read(&counters[j]), 
-                       perfc_info[i].name, j);
+                printk("CPU%02d[%10d 0x%08x]  ",
+                       j, atomic_read(&counters[j]), 
+                       atomic_read(&counters[j]));
             counters += NR_CPUS;
             break;
         case TYPE_ARRAY:
             for ( j = 0; j < perfc_info[i].nr_elements; j++ )
-                printk("%10d  0x%08x  %s[ARR %02d]\n",
-                       atomic_read(&counters[j]), atomic_read(&counters[j]), 
-                       perfc_info[i].name, j);
+                printk("ARR%02d[%10d 0x%08x]  ",
+                       j, atomic_read(&counters[j]), 
+                       atomic_read(&counters[j]));
             counters += j;
             break;
         }
+        printk("\n");
     }
 }