Changeset 7a3ccbc in mainline for uspace/app/top

Timestamp:

2010-04-07T10:41:42Z (16 years ago)

Author:

Stanislav Kozina <stanislav.kozina@…>

Branches:

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

Children:

a325832

Parents:

36b5b0f

Message:

Echo task memory in kb instead of pages count

Location:

uspace/app/top

Files:

• screen.c (modified) (2 diffs)
• top.c (modified) (3 diffs)
• top.h (modified) (1 diff)

uspace/app/top/screen.c

@@ -155 +155 @@
                         return;
                 task_info_t *taskinfo = &data->taskinfos[i];
-                printf("%8llu %8u %8u ", taskinfo->taskid,
-                        taskinfo->thread_count, taskinfo->pages);
+                uint64_t mem;
+                char suffix;
+                order(taskinfo->virt_mem, &mem, &suffix);
+                printf("%8llu %8u %8llu%c ", taskinfo->taskid,
+                        taskinfo->thread_count, mem, suffix);
                 task_perc_t *taskperc = &data->task_perc[i];
                 puts("   ");
-                print_float(taskperc->pages, 2);
+                print_float(taskperc->mem, 2);
                 puts("%   ");
                 print_float(taskperc->ucycles, 2);
@@ -173 +176 @@
         fflush(stdout);
         console_set_rgb_color(fphone(stdout), WHITE, BLACK);
-        printf("      ID  Threads    Pages    %%Pages %%uCycles %%kCycles Name");
+        printf("      ID  Threads      Mem      %%Mem %%uCycles %%kCycles Name");
         int i;
         for (i = 60; i < colls; ++i)

uspace/app/top/top.c

@@ -111 +111 @@
 
         /* For all tasks compute sum and differencies of all cycles */
-        uint64_t pages_total = 0;
+        uint64_t mem_total = 0;
         uint64_t ucycles_total = 0;
         uint64_t kcycles_total = 0;
@@ -131 +131 @@
                 kcycles_diff[i] = new_data->taskinfos[i].kcycles - old_data->taskinfos[j].kcycles;
 
-                pages_total += new_data->taskinfos[i].pages;
+                mem_total += new_data->taskinfos[i].virt_mem;
                 ucycles_total += ucycles_diff[i];
                 kcycles_total += kcycles_diff[i];
@@ -139 +139 @@
         new_data->task_perc = malloc(new_data->task_count * sizeof(task_perc_t));
         for (i = 0; i < new_data->task_count; ++i) {
-                new_data->task_perc[i].pages = (float)(new_data->taskinfos[i].pages * 100) / pages_total;
+                new_data->task_perc[i].mem = (float)(new_data->taskinfos[i].virt_mem * 100) / mem_total;
                 new_data->task_perc[i].ucycles = (float)(ucycles_diff[i] * 100) / ucycles_total;
                 new_data->task_perc[i].kcycles = (float)(kcycles_diff[i] * 100) / kcycles_total;

uspace/app/top/top.h

@@ -46 +46 @@
         float ucycles;
         float kcycles;
-        float pages;
+        float mem;
 } task_perc_t;