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

Timestamp:

2010-04-23T21:42:26Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6c39a907

Parents:

38aaacc2 (diff), 80badbe (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.

File:

• kernel/generic/include/proc/task.h (modified) (5 diffs)

kernel/generic/include/proc/task.h

@@ -56 +56 @@
 #include <ipc/kbox.h>
 #include <mm/as.h>
-
-#define TASK_NAME_BUFLEN        20
+#include <sysinfo/abi.h>
 
 struct thread;
@@ -81 +80 @@
         task_id_t taskid;
         /** Task security context. */
-        context_id_t context;   
+        context_id_t context;
 
         /** Number of references (i.e. threads). */
@@ -89 +88 @@
 
         /** Task capabilities. */
-        cap_t capabilities;     
+        cap_t capabilities;
 
         /* IPC stuff */
         answerbox_t answerbox;  /**< Communication endpoint */
         phone_t phones[IPC_MAX_PHONES];
+        stats_ipc_t ipc_info;   /**< IPC statistics */
         /**
          * Active asynchronous messages. It is used for limiting uspace to
@@ -119 +119 @@
         mutex_t futexes_lock;
         /** B+tree of futexes referenced by this task. */
-        btree_t futexes;        
+        btree_t futexes;
         
         /** Accumulated accounting. */
-        uint64_t cycles;
+        uint64_t ucycles;
+        uint64_t kcycles;
 } task_t;
 
@@ -134 +135 @@
 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);