Changeset 88dea9d in mainline for kernel/generic/include/proc/task.h

Timestamp:

2010-04-17T16:28:49Z (14 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/include/proc/task.h (modified) (4 diffs)

kernel/generic/include/proc/task.h

@@ -57 +57 @@
 #include <mm/as.h>
 
-#define TASK_NAME_BUFLEN        20
+#include <ps/taskinfo.h>
 
 struct thread;
@@ -94 +94 @@
         answerbox_t answerbox;  /**< Communication endpoint */
         phone_t phones[IPC_MAX_PHONES];
+        task_ipc_info_t ipc_info; /**< IPC statistics */
         /**
          * Active asynchronous messages. It is used for limiting uspace to
@@ -122 +123 @@
         
         /** Accumulated accounting. */
-        uint64_t cycles;
+        uint64_t ucycles;
+        uint64_t kcycles;
 } task_t;
 
@@ -134 +136 @@
 extern task_t *task_find_by_id(task_id_t id);
 extern int task_kill(task_id_t id);
-extern uint64_t task_get_accounting(task_t *t);
+extern void task_get_accounting(task_t *t, uint64_t *ucycles, uint64_t *kcycles);
 extern void task_print_list(void);