Changeset 380553c in mainline for kernel/generic/include/proc/thread.h

Timestamp:

2012-06-21T10:49:44Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

d510ac01

Parents:

2616a75b (diff), f22dc820 (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 with mainline

File:

• kernel/generic/include/proc/thread.h (modified) (4 diffs)

kernel/generic/include/proc/thread.h

@@ -54 +54 @@
 
 /* Thread flags */
-
-/** Thread cannot be migrated to another CPU.
- *
- * When using this flag, the caller must set cpu in the thread_t
- * structure manually before calling thread_ready (even on uniprocessor).
- *
- */
-#define THREAD_FLAG_WIRED  (1 << 0)
-
-/** Thread was migrated to another CPU and has not run yet. */
-#define THREAD_FLAG_STOLEN  (1 << 1)
-
-/** Thread executes in userspace. */
-#define THREAD_FLAG_USPACE  (1 << 2)
-
-/** Thread will be attached by the caller. */
-#define THREAD_FLAG_NOATTACH  (1 << 3)
+typedef enum {
+        THREAD_FLAG_NONE = 0,
+        /** Thread executes in user space. */
+        THREAD_FLAG_USPACE = (1 << 0),
+        /** Thread will be attached by the caller. */
+        THREAD_FLAG_NOATTACH = (1 << 1),
+        /** Thread accounting doesn't affect accumulated task accounting. */
+        THREAD_FLAG_UNCOUNTED = (1 << 2)
+} thread_flags_t;
 
 /** Thread structure. There is one per thread. */
@@ -147 +139 @@
         
         fpu_context_t *saved_fpu_context;
-        int fpu_context_exists;
+        bool fpu_context_exists;
         
         /*
@@ -154 +146 @@
          * thread. This disables migration.
          */
-        int fpu_context_engaged;
+        bool fpu_context_engaged;
         
         /* The thread will not be migrated if nomigrate is non-zero. */
-        int nomigrate;
-        
-        /** Thread's state. */
+        unsigned int nomigrate;
+        
+        /** Thread state. */
         state_t state;
-        /** Thread's flags. */
-        unsigned int flags;
-        
-        /** Thread's CPU. */
+        
+        /** Thread CPU. */
         cpu_t *cpu;
         /** Containing task. */
         task_t *task;
+        /** Thread is wired to CPU. */
+        bool wired;
+        /** Thread was migrated to another CPU and has not run yet. */
+        bool stolen;
+        /** Thread is executed in user space. */
+        bool uspace;
         
         /** Ticks before preemption. */
@@ -216 +212 @@
 extern void thread_init(void);
 extern thread_t *thread_create(void (*)(void *), void *, task_t *,
-    unsigned int, const char *, bool);
+    thread_flags_t, const char *);
+extern void thread_wire(thread_t *, cpu_t *);
 extern void thread_attach(thread_t *, task_t *);
 extern void thread_ready(thread_t *);