Changeset 6265a2b in mainline for uspace/app

Timestamp:

2011-01-26T14:52:55Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

7fc092a, 9f0318c, ea6a824

Parents:

192a0063 (diff), a0ce870 (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 mainline changes

Location:

uspace/app

Files:

• tasks/tasks.c (modified) (2 diffs)
• top/screen.c (modified) (2 diffs)
• top/top.c (modified) (3 diffs)
• top/top.h (modified) (1 diff)
• trace/syscalls.c (modified) (1 diff)

uspace/app/tasks/tasks.c

@@ -66 +66 @@
         }
         
-        printf("      ID  Threads      Mem       uCycles       kCycles   Name\n");
+        printf(" Task ID  Threads      Mem       uCycles       kCycles   Name\n");
         
         size_t i;
@@ -96 +96 @@
         }
         
-        printf("    ID    State  CPU   Prio    [k]uCycles    [k]kcycles   Cycle fault\n");
+        printf(" ThrID    State  CPU   Prio    [k]uCycles    [k]kcycles   Cycle fault\n");
         size_t i;
         for (i = 0; i < count; i++) {

uspace/app/top/screen.c

@@ -274 +274 @@
 {
         screen_style_inverted();
-        printf("[taskid] [threads] [virtual] [%%virt] [%%user]"
-            " [%%kernel] [name");
+        printf("[taskid] [threads] [resident] [%%resi] [virtual] [%%virt]"
+            " [%%user] [%%kern] [name");
         screen_newline();
         screen_style_normal();
@@ -295 +295 @@
                 perc_task_t *perc = data->tasks_perc + data->tasks_map[i];
                 
+                uint64_t resmem;
+                char resmem_suffix;
+                order_suffix(task->resmem, &resmem, &resmem_suffix);
+                
                 uint64_t virtmem;
                 char virtmem_suffix;
                 order_suffix(task->virtmem, &virtmem, &virtmem_suffix);
                 
-                printf("%-8" PRIu64 " %9zu %8" PRIu64 "%c ", task->task_id,
-                    task->threads, virtmem, virtmem_suffix);
+                printf("%-8" PRIu64 " %9zu %9" PRIu64 "%c ",
+                    task->task_id, task->threads, resmem, resmem_suffix);
+                print_percent(perc->resmem, 2);
+                printf(" %8" PRIu64 "%c ", virtmem, virtmem_suffix);
                 print_percent(perc->virtmem, 2);
                 puts(" ");
                 print_percent(perc->ucycles, 2);
-                puts("   ");
+                puts(" ");
                 print_percent(perc->kcycles, 2);
                 puts(" ");

uspace/app/top/top.c

@@ -195 +195 @@
         
         uint64_t virtmem_total = 0;
+        uint64_t resmem_total = 0;
         uint64_t ucycles_total = 0;
         uint64_t kcycles_total = 0;
@@ -223 +224 @@
                 
                 virtmem_total += new_data->tasks[i].virtmem;
+                resmem_total += new_data->tasks[i].resmem;
                 ucycles_total += new_data->ucycles_diff[i];
                 kcycles_total += new_data->kcycles_diff[i];
@@ -232 +234 @@
                 FRACTION_TO_FLOAT(new_data->tasks_perc[i].virtmem,
                     new_data->tasks[i].virtmem * 100, virtmem_total);
+                FRACTION_TO_FLOAT(new_data->tasks_perc[i].resmem,
+                    new_data->tasks[i].resmem * 100, resmem_total);
                 FRACTION_TO_FLOAT(new_data->tasks_perc[i].ucycles,
                     new_data->ucycles_diff[i] * 100, ucycles_total);

uspace/app/top/top.h

@@ -77 +77 @@
 typedef struct {
         fixed_float virtmem;
+        fixed_float resmem;
         fixed_float ucycles;
         fixed_float kcycles;

uspace/app/trace/syscalls.c

@@ -77 +77 @@
     [SYS_SYSINFO_GET_VALUE] = { "sysinfo_get_value",            3,      V_ERRNO },
     [SYS_SYSINFO_GET_DATA_SIZE] = { "sysinfo_get_data_size",    3,      V_ERRNO },
-    [SYS_SYSINFO_GET_DATA] = { "sysinfo_get_data",              4,      V_ERRNO },
+    [SYS_SYSINFO_GET_DATA] = { "sysinfo_get_data",              5,      V_ERRNO },
 
     [SYS_DEBUG_ENABLE_CONSOLE] = { "debug_enable_console", 0,   V_ERRNO },