Changeset a0ce870 in mainline

Timestamp:

2011-01-25T18:11:17Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

6265a2b, bf75e3cb

Parents:

311bc25

Message:

statistics: provide resident (actually used) memory of tasks

Files:

• kernel/generic/include/sysinfo/abi.h (modified) (1 diff)
• kernel/generic/src/mm/backend_phys.c (modified) (1 diff)
• kernel/generic/src/sysinfo/stats.c (modified) (3 diffs)
• uspace/app/top/screen.c (modified) (2 diffs)
• uspace/app/top/top.c (modified) (3 diffs)
• uspace/app/top/top.h (modified) (1 diff)

kernel/generic/include/sysinfo/abi.h

@@ -104 +104 @@
         char name[TASK_NAME_BUFLEN];  /**< Task name (in kernel) */
         size_t virtmem;               /**< Size of VAS (bytes) */
+        size_t resmem;                /**< Size of resident (used) memory (bytes) */
         size_t threads;               /**< Number of threads */
         uint64_t ucycles;             /**< Number of CPU cycles in user space */

kernel/generic/src/mm/backend_phys.c

@@ -81 +81 @@
         page_mapping_insert(AS, addr, base + (addr - area->base),
             as_area_get_flags(area));
-        if (!used_space_insert(area, ALIGN_DOWN(addr, PAGE_SIZE), 1))
-                panic("Cannot insert used space.");
+        
+        if (!used_space_insert(area, ALIGN_DOWN(addr, PAGE_SIZE), 1))
+                panic("Cannot insert used space.");
 
         return AS_PF_OK;

kernel/generic/src/sysinfo/stats.c

@@ -170 +170 @@
          * Note that it may be infinitely better to let the address space
          * management code compute these statistics as it proceeds instead of
-         * having them calculated here over and over again here.
+         * having them calculated over and over again here.
          */
 
@@ -199 +199 @@
 }
 
+/** Get the resident (used) size of a virtual address space
+ *
+ * @param as Address space.
+ *
+ * @return Size of the resident (used) virtual address space (bytes).
+ *
+ */
+static size_t get_task_resmem(as_t *as)
+{
+        size_t result = 0;
+        
+        /*
+         * We are holding some spinlocks here and therefore are not allowed to
+         * block. Only attempt to lock the address space and address space area
+         * mutexes conditionally. If it is not possible to lock either object,
+         * allow the statistics to be inexact by skipping the respective object.
+         *
+         * Note that it may be infinitely better to let the address space
+         * management code compute these statistics as it proceeds instead of
+         * having them calculated over and over again here.
+         */
+        
+        if (SYNCH_FAILED(mutex_trylock(&as->lock)))
+                return result * PAGE_SIZE;
+        
+        /* Walk the B+ tree of AS areas */
+        link_t *cur;
+        for (cur = as->as_area_btree.leaf_head.next;
+            cur != &as->as_area_btree.leaf_head; cur = cur->next) {
+                btree_node_t *node =
+                    list_get_instance(cur, btree_node_t, leaf_link);
+                
+                unsigned int i;
+                for (i = 0; i < node->keys; i++) {
+                        as_area_t *area = node->value[i];
+                        
+                        if (SYNCH_FAILED(mutex_trylock(&area->lock)))
+                                continue;
+                        
+                        /* Walk the B+ tree of resident pages */
+                        link_t *rcur;
+                        for (rcur = area->used_space.leaf_head.next;
+                            rcur != &area->used_space.leaf_head; rcur = rcur->next) {
+                                btree_node_t *rnode =
+                                    list_get_instance(rcur, btree_node_t, leaf_link);
+                                
+                                unsigned int j;
+                                for (j = 0; j < rnode->keys; j++)
+                                        result += (size_t) rnode->value[i];
+                        }
+                        
+                        mutex_unlock(&area->lock);
+                }
+        }
+        
+        mutex_unlock(&as->lock);
+        
+        return result * PAGE_SIZE;
+}
+
 /* Produce task statistics
  *
@@ -215 +275 @@
         str_cpy(stats_task->name, TASK_NAME_BUFLEN, task->name);
         stats_task->virtmem = get_task_virtmem(task->as);
+        stats_task->resmem = get_task_resmem(task->as);
         stats_task->threads = atomic_get(&task->refcount);
         task_get_accounting(task, &(stats_task->ucycles),

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;