Changeset 88dea9d in mainline for kernel/generic/src/syscall/syscall.c

Timestamp:

2010-04-17T16:28:49Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

30a5470

Parents:

5ba201d (diff), 95319bd (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 from measuring branch

File:

• kernel/generic/src/syscall/syscall.c (modified) (4 diffs)

kernel/generic/src/syscall/syscall.c

@@ -54 +54 @@
 #include <console/console.h>
 #include <udebug/udebug.h>
+#include <ps/ps.h>
+#include <ps/load.h>
+#include <ps/uptime.h>
 
 /** Dispatch system call */
@@ -60 +63 @@
 {
         unative_t rc;
+
+        /* Do userpace accounting */
+        thread_update_accounting(true);
 
 #ifdef CONFIG_UDEBUG
@@ -95 +101 @@
         }
 #endif
+
+        /* Do kernel accounting */
+        thread_update_accounting(false);
         
         return rc;
@@ -161 +170 @@
         (syshandler_t) sys_debug_enable_console,
         (syshandler_t) sys_debug_disable_console,
+
+        /* Ps calls */
+        (syshandler_t) sys_ps_get_cpu_info,
+        (syshandler_t) sys_ps_get_mem_info,
+        (syshandler_t) sys_ps_get_tasks,
+        (syshandler_t) sys_ps_get_task_info,
+        (syshandler_t) sys_ps_get_threads,
+        (syshandler_t) sys_ps_get_uptime,
+        (syshandler_t) sys_ps_get_load,
         
         (syshandler_t) sys_ipc_connect_kbox