Changeset 4fe3b6d in mainline for uspace/app/stats/stats.c

Timestamp:

2011-05-20T11:07:00Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

8bb61e6

Parents:

3476be8 (diff), 7941bd6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge with development

File:

• uspace/app/stats/stats.c (modified) (1 diff)

uspace/app/stats/stats.c

@@ -69 +69 @@
         size_t i;
         for (i = 0; i < count; i++) {
-                uint64_t resmem, virtmem, ucycles, kcycles;
-                char resmem_suffix, virtmem_suffix, usuffix, ksuffix;
-                
-                order_suffix(stats_tasks[i].resmem, &resmem, &resmem_suffix);
-                order_suffix(stats_tasks[i].virtmem, &virtmem, &virtmem_suffix);
+                uint64_t resmem;
+                uint64_t virtmem;
+                uint64_t ucycles;
+                uint64_t kcycles;
+                const char *resmem_suffix;
+                const char *virtmem_suffix;
+                char usuffix;
+                char ksuffix;
+                
+                bin_order_suffix(stats_tasks[i].resmem, &resmem, &resmem_suffix, true);
+                bin_order_suffix(stats_tasks[i].virtmem, &virtmem, &virtmem_suffix, true);
                 order_suffix(stats_tasks[i].ucycles, &ucycles, &usuffix);
                 order_suffix(stats_tasks[i].kcycles, &kcycles, &ksuffix);
                 
-                printf("%-8" PRIu64 " %7zu %9" PRIu64 "%c %8" PRIu64 "%c"
+                printf("%-8" PRIu64 " %7zu %7" PRIu64 "%s %6" PRIu64 "%s"
                     " %8" PRIu64 "%c %8" PRIu64 "%c %s\n",
                     stats_tasks[i].task_id, stats_tasks[i].threads,