Changeset ccb426c in mainline

Timestamp:

2010-06-24T09:56:58Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

549012c

Parents:

851f33a

Message:

improve other kernel printouts

Location:

kernel

Files:

• arch/amd64/src/debugger.c (modified) (3 diffs)
• arch/ia32/src/mm/frame.c (modified) (1 diff)
• arch/mips32/src/debugger.c (modified) (2 diffs)
• arch/mips32/src/mm/frame.c (modified) (1 diff)
• arch/mips32/src/mm/tlb.c (modified) (2 diffs)
• arch/ppc32/src/mm/frame.c (modified) (1 diff)
• generic/src/mm/frame.c (modified) (3 diffs)
• generic/src/mm/slab.c (modified) (2 diffs)

kernel/arch/amd64/src/debugger.c

@@ -349 +349 @@
 {
 #ifdef __32_BITS__
-        printf("#  Count Address    In symbol\n");
-        printf("-- ----- ---------- ---------\n");
+        printf("[nr] [count] [address ] [in symbol\n");
 #endif
         
 #ifdef __64_BITS__
-        printf("#  Count Address            In symbol\n");
-        printf("-- ----- ------------------ ---------\n");
+        printf("[nr] [count] [address         ] [in symbol\n");
 #endif
         
@@ -365 +363 @@
                         
 #ifdef __32_BITS__
-                        printf("%-2u %-5" PRIs " %p %s\n", i,
+                        printf("%-4u %7" PRIs " %p %s\n", i,
                             breakpoints[i].counter, breakpoints[i].address,
                             symbol);
@@ -371 +369 @@
                         
 #ifdef __64_BITS__
-                        printf("%-2u %-5" PRIs " %p %s\n", i,
+                        printf("%-4u %7" PRIs " %p %s\n", i,
                             breakpoints[i].counter, breakpoints[i].address,
                             symbol);

kernel/arch/ia32/src/mm/frame.c

@@ -123 +123 @@
         const char *name;
         
-        printf("Base               Size               Name\n");
-        printf("------------------ ------------------ ---------\n");
+        printf("[base            ] [size            ] [name\n");
                 
         for (i = 0; i < e820counter; i++) {

kernel/arch/mips32/src/debugger.c

@@ -260 +260 @@
         unsigned int i;
         
-        printf("#  Count Address    INPROG ONESHOT FUNCCALL In symbol\n");
-        printf("-- ----- ---------- ------ ------- -------- ---------\n");
+        printf("[nr] [count] [address ] [inprog] [oneshot] [funccall] [in symbol\n");
         
         for (i = 0; i < BKPOINTS_MAX; i++) {
@@ -268 +267 @@
                             breakpoints[i].address);
                         
-                        printf("%-2u %-5d %#10zx %-6s %-7s %-8s %s\n", i,
+                        printf("%-4u %7" PRIs " %p %-8s %-9s %-10s %s\n", i,
                             breakpoints[i].counter, breakpoints[i].address,
                             ((breakpoints[i].flags & BKPOINT_INPROG) ? "true" :

kernel/arch/mips32/src/mm/frame.c

@@ -249 +249 @@
 void physmem_print(void)
 {
-        printf("Base       Size\n");
-        printf("---------- ----------\n");
+        printf("[base    ] [size    ]\n");
         
         size_t i;

kernel/arch/mips32/src/mm/tlb.c

@@ -455 +455 @@
         hi_save.value = cp0_entry_hi_read();
         
-        printf("#  ASID VPN2   MASK G V D C PFN\n");
-        printf("-- ---- ------ ---- - - - - ------\n");
+        printf("[nr] [asid] [vpn2] [mask] [gvdc] [pfn ]\n");
         
         for (i = 0; i < TLB_ENTRY_COUNT; i++) {
@@ -467 +466 @@
                 lo1.value = cp0_entry_lo1_read();
                 
-                printf("%-2u %-4u %#6x %#4x %1u %1u %1u %1u %#6x\n",
+                printf("%-4u %-6u %#6x %#6x  %1u%1u%1u%1u  %#6x\n",
                     i, hi.asid, hi.vpn2, mask.mask,
                     lo0.g, lo0.v, lo0.d, lo0.c, lo0.pfn);
-                printf("                    %1u %1u %1u %1u %#6x\n",
+                printf("                           %1u%1u%1u%1u  %#6x\n",
                     lo1.g, lo1.v, lo1.d, lo1.c, lo1.pfn);
         }

kernel/arch/ppc32/src/mm/frame.c

@@ -45 +45 @@
 void physmem_print(void)
 {
-        printf("Base       Size\n");
-        printf("---------- ----------\n");
+        printf("[base    ] [size    ]\n");
         
         size_t i;

kernel/generic/src/mm/frame.c

@@ -1234 +1234 @@
 {
 #ifdef __32_BITS__
-        printf("#  base address frames       flags    free frames  busy frames\n");
-        printf("-- ------------ ------------ -------- ------------ ------------\n");
+        printf("[nr] [base addr ] [frames    ] [flags ] [free frames ] [busy frames ]\n");
 #endif
 
 #ifdef __64_BITS__
-        printf("#  base address          frames      flags    free frames  busy frames\n");
-        printf("-- -------------------- ------------ -------- ------------ ------------\n");
+        printf("[nr] [base address      ] [frames    ] [flags ] [free frames ] [busy frames ]\n");
 #endif
         
@@ -1273 +1271 @@
                 bool available = zone_flags_available(flags);
                 
-                printf("%-2" PRIs, i);
+                printf("%-4" PRIs, i);
                 
 #ifdef __32_BITS__
@@ -1289 +1287 @@
                 
                 if (available)
-                        printf("%12" PRIs " %12" PRIs,
+                        printf("%14" PRIs " %14" PRIs,
                             free_count, busy_count);
                 

kernel/generic/src/mm/slab.c

@@ -829 +829 @@
 void slab_print_list(void)
 {
-        printf("slab name        size     pages  obj/pg   slabs  cached allocated"
-            " ctl\n");
-        printf("---------------- -------- ------ -------- ------ ------ ---------"
-            " ---\n");
+        printf("[slab name       ] [size  ] [pages ] [obj/pg] [slabs ]"
+            " [cached] [alloc ] [ctl]\n");
         
         size_t skip = 0;
@@ -887 +885 @@
                 irq_spinlock_unlock(&slab_cache_lock, true);
                 
-                printf("%-16s %8" PRIs " %6u %8" PRIs " %6ld %6ld %9ld %-3s\n",
+                printf("%-18s %8" PRIs " %8u %8" PRIs " %8ld %8ld %8ld %-5s\n",
                     name, size, (1 << order), objects, allocated_slabs,
                     cached_objs, allocated_objs,