Changeset 9dae191e in mainline for kernel/generic/include/proc

Timestamp:

2010-04-18T00:24:40Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

a80687e5

Parents:

d8e3467

Message:

sysinfo API cleanup

• better support for generated subtrees
• synchronization
• memory management (generated items cleanup)
• simplier sysinfo_dump()

remove separate statistical syscalls, replace with virtual sysinfo items (some functionality is still missing)

• naming consolidation
• cleaner API
• proper synchronization

minor renames

• zone_print_list() → zones_print_list()
• zone_busy_and_free() → zones_stats()

Location:

kernel/generic/include/proc

Files:

• task.h (modified) (4 diffs)
• thread.h (modified) (1 diff)

kernel/generic/include/proc/task.h

@@ -56 +56 @@
 #include <ipc/kbox.h>
 #include <mm/as.h>
-
-#include <ps/taskinfo.h>
+#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];
-        task_ipc_info_t ipc_info; /**< IPC statistics */
+        stats_ipc_t ipc_info;   /**< IPC statistics */
         /**
          * Active asynchronous messages. It is used for limiting uspace to
@@ -120 +119 @@
         mutex_t futexes_lock;
         /** B+tree of futexes referenced by this task. */
-        btree_t futexes;        
+        btree_t futexes;
         
         /** Accumulated accounting. */

kernel/generic/include/proc/thread.h

@@ -69 +69 @@
 #define THREAD_FLAG_NOATTACH    (1 << 3)
 
-/* We need state_t enum definition */
-#include <ps/taskinfo.h>
+/** Thread states. */
+typedef enum {
+        /** It is an error, if thread is found in this state. */
+        Invalid,
+        /** State of a thread that is currently executing on some CPU. */
+        Running,
+        /** Thread in this state is waiting for an event. */
+        Sleeping,
+        /** State of threads in a run queue. */
+        Ready,
+        /** Threads are in this state before they are first readied. */
+        Entering,
+        /** After a thread calls thread_exit(), it is put into Exiting state. */
+        Exiting,
+        /** Threads that were not detached but exited are Lingering. */
+        Lingering
+} state_t;
 
 /** Thread structure. There is one per thread. */