Changeset 46c20c8 in mainline for kernel/generic/include/proc/thread.h

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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/thread.h (modified) (15 diffs)

kernel/generic/include/proc/thread.h

@@ -40 +40 @@
 #include <time/timeout.h>
 #include <cpu.h>
-#include <synch/rwlock.h>
 #include <synch/spinlock.h>
 #include <adt/avl.h>
@@ -48 +47 @@
 #include <proc/uarg.h>
 #include <udebug/udebug.h>
-
-#define THREAD_STACK_SIZE       STACK_SIZE
-#define THREAD_NAME_BUFLEN      20
-
-extern char *thread_states[];
+#include <sysinfo/abi.h>
+
+#define THREAD_STACK_SIZE   STACK_SIZE
+#define THREAD_NAME_BUFLEN  20
+
+extern const char *thread_states[];
 
 /* Thread flags */
@@ -60 +60 @@
  * 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)
+ *
+ */
+#define THREAD_FLAG_WIRED  (1 << 0)
+
 /** Thread was migrated to another CPU and has not run yet. */
-#define THREAD_FLAG_STOLEN      (1 << 1)
+#define THREAD_FLAG_STOLEN  (1 << 1)
+
 /** Thread executes in userspace. */
-#define THREAD_FLAG_USPACE      (1 << 2)
+#define THREAD_FLAG_USPACE  (1 << 2)
+
 /** Thread will be attached by the caller. */
-#define THREAD_FLAG_NOATTACH    (1 << 3)
-
-/** 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;
+#define THREAD_FLAG_NOATTACH  (1 << 3)
 
 /** Thread structure. There is one per thread. */
 typedef struct thread {
-        link_t rq_link;         /**< Run queue link. */
-        link_t wq_link;         /**< Wait queue link. */
-        link_t th_link;         /**< Links to threads within containing task. */
-
+        link_t rq_link;  /**< Run queue link. */
+        link_t wq_link;  /**< Wait queue link. */
+        link_t th_link;  /**< Links to threads within containing task. */
+        
         /** Threads linkage to the threads_tree. */
         avltree_node_t threads_tree_node;
@@ -100 +86 @@
          * Protects the whole thread structure except list links above.
          */
-        SPINLOCK_DECLARE(lock);
-
+        IRQ_SPINLOCK_DECLARE(lock);
+        
         char name[THREAD_NAME_BUFLEN];
-
+        
         /** Function implementing the thread. */
         void (* thread_code)(void *);
         /** Argument passed to thread_code() function. */
         void *thread_arg;
-
+        
         /**
          * From here, the stored context is restored when the thread is
@@ -124 +110 @@
          */
         context_t sleep_interruption_context;
-
+        
         /** If true, the thread can be interrupted from sleep. */
         bool sleep_interruptible;
@@ -132 +118 @@
         timeout_t sleep_timeout;
         /** Flag signalling sleep timeout in progress. */
-        volatile int timeout_pending;
-
+        volatile bool timeout_pending;
+        
         /**
          * True if this thread is executing copy_from_uspace().
@@ -149 +135 @@
          * thread_exit() before returning to userspace.
          */
-        bool interrupted;                       
+        bool interrupted;
         
         /** If true, thread_join_timeout() cannot be used on this thread. */
@@ -157 +143 @@
         /** Link used in the joiner_head list. */
         link_t joiner_link;
-
+        
         fpu_context_t *saved_fpu_context;
         int fpu_context_exists;
-
+        
         /*
          * Defined only if thread doesn't run.
@@ -167 +153 @@
          */
         int fpu_context_engaged;
-
-        rwlock_type_t rwlock_holder_type;
-
-        /** Callback fired in scheduler before the thread is put asleep. */
-        void (* call_me)(void *);
-        /** Argument passed to call_me(). */
-        void *call_me_with;
-
+        
         /** Thread's state. */
         state_t state;
         /** Thread's flags. */
-        int flags;
+        unsigned int flags;
         
         /** Thread's CPU. */
@@ -184 +163 @@
         /** Containing task. */
         task_t *task;
-
+        
         /** Ticks before preemption. */
         uint64_t ticks;
         
         /** Thread accounting. */
-        uint64_t cycles;
+        uint64_t ucycles;
+        uint64_t kcycles;
         /** Last sampled cycle. */
         uint64_t last_cycle;
-        /** Thread doesn't affect accumulated accounting. */    
+        /** Thread doesn't affect accumulated accounting. */
         bool uncounted;
-
+        
         /** Thread's priority. Implemented as index to CPU->rq */
         int priority;
@@ -202 +182 @@
         /** Architecture-specific data. */
         thread_arch_t arch;
-
+        
         /** Thread's kernel stack. */
         uint8_t *kstack;
-
+        
 #ifdef CONFIG_UDEBUG
         /** Debugging stuff */
         udebug_thread_t udebug;
-#endif
-
+#endif /* CONFIG_UDEBUG */
 } thread_t;
 
@@ -219 +198 @@
  *
  */
-SPINLOCK_EXTERN(threads_lock);
+IRQ_SPINLOCK_EXTERN(threads_lock);
 
 /** AVL tree containing all threads. */
@@ -225 +204 @@
 
 extern void thread_init(void);
-extern thread_t *thread_create(void (*)(void *), void *, task_t *, int, char *,
-    bool);
+extern thread_t *thread_create(void (*)(void *), void *, task_t *,
+    unsigned int, const char *, bool);
 extern void thread_attach(thread_t *, task_t *);
 extern void thread_ready(thread_t *);
@@ -234 +213 @@
 extern void thread_create_arch(thread_t *);
 #endif
+
 #ifndef thr_constructor_arch
 extern void thr_constructor_arch(thread_t *);
 #endif
+
 #ifndef thr_destructor_arch
 extern void thr_destructor_arch(thread_t *);
@@ -246 +227 @@
 #define thread_join(t) \
         thread_join_timeout((t), SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NONE)
-extern int thread_join_timeout(thread_t *, uint32_t, int);
+
+extern int thread_join_timeout(thread_t *, uint32_t, unsigned int);
 extern void thread_detach(thread_t *);
 
-extern void thread_register_call_me(void (*)(void *), void *);
-extern void thread_print_list(void);
-extern void thread_destroy(thread_t *);
-extern void thread_update_accounting(void);
+extern void thread_print_list(bool);
+extern void thread_destroy(thread_t *, bool);
+extern thread_t *thread_find_by_id(thread_id_t);
+extern void thread_update_accounting(bool);
 extern bool thread_exists(thread_t *);