Changeset 6265a2b in mainline for kernel

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:

kernel/generic

Files:

• include/sysinfo/abi.h (modified) (1 diff)
• include/sysinfo/sysinfo.h (modified) (1 diff)
• src/mm/backend_phys.c (modified) (1 diff)
• src/sysinfo/stats.c (modified) (3 diffs)
• src/sysinfo/sysinfo.c (modified) (4 diffs)

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/include/sysinfo/sysinfo.h

@@ -148 +148 @@
 extern sysarg_t sys_sysinfo_get_value(void *, size_t, void *);
 extern sysarg_t sys_sysinfo_get_data_size(void *, size_t, void *);
-extern sysarg_t sys_sysinfo_get_data(void *, size_t, void *, size_t);
+extern sysarg_t sys_sysinfo_get_data(void *, size_t, void *, size_t, size_t *);
 
 #endif

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),

kernel/generic/src/sysinfo/sysinfo.c

@@ -40 +40 @@
 #include <arch/asm.h>
 #include <errno.h>
+#include <macros.h>
 
 /** Maximal sysinfo path length */
@@ -761 +762 @@
  * character must be null).
  *
- * The user space buffer must be sized exactly according
- * to the size of the binary data, otherwise the request
- * fails.
+ * If the user space buffer size does not equal
+ * the actual size of the returned data, the data
+ * is truncated. Whether this is actually a fatal
+ * error or the data can be still interpreted as valid
+ * depends on the nature of the data and has to be
+ * decided by the user space.
+ *
+ * The actual size of data returned is stored to
+ * size_ptr.
  *
  * @param path_ptr    Sysinfo path in the user address space.
@@ -770 +777 @@
  *                    to store the binary data.
  * @param buffer_size User space buffer size.
+ * @param size_ptr    User space pointer where to store the
+ *                    binary data size.
  *
  * @return Error code (EOK in case of no error).
@@ -775 +784 @@
  */
 sysarg_t sys_sysinfo_get_data(void *path_ptr, size_t path_size,
-    void *buffer_ptr, size_t buffer_size)
+    void *buffer_ptr, size_t buffer_size, size_t *size_ptr)
 {
         int rc;
         
         /* Get the item */
-        sysinfo_return_t ret = sysinfo_get_item_uspace(path_ptr, path_size, false);
-
+        sysinfo_return_t ret = sysinfo_get_item_uspace(path_ptr, path_size,
+            false);
+        
         /* Only constant or generated binary data is considered */
-        if ((ret.tag == SYSINFO_VAL_DATA) || (ret.tag == SYSINFO_VAL_FUNCTION_DATA)) {
-                /* Check destination buffer size */
-                if (ret.data.size == buffer_size)
-                        rc = copy_to_uspace(buffer_ptr, ret.data.data,
-                            ret.data.size);
-                else
-                        rc = ENOMEM;
+        if ((ret.tag == SYSINFO_VAL_DATA) ||
+            (ret.tag == SYSINFO_VAL_FUNCTION_DATA)) {
+                size_t size = min(ret.data.size, buffer_size);
+                rc = copy_to_uspace(buffer_ptr, ret.data.data, size);
+                if (rc == EOK)
+                        rc = copy_to_uspace(size_ptr, &size, sizeof(size));
         } else
                 rc = EINVAL;