Changeset b1c57a8 in mainline for kernel/generic/include/proc

Timestamp:

2014-10-09T15:03:55Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e367939c

Parents:

21799398 (diff), 207e8880 (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 lp:~adam-hraska+lp/helenos/rcu/.

Only merge from the feature branch and resolve all conflicts.

Location:

kernel/generic/include/proc

Files:

• task.h (modified) (3 diffs)
• thread.h (modified) (4 diffs)

kernel/generic/include/proc/task.h

@@ -43 +43 @@
 #include <synch/mutex.h>
 #include <synch/futex.h>
+#include <synch/workqueue.h>
 #include <adt/avl.h>
 #include <adt/btree.h>
+#include <adt/cht.h>
 #include <adt/list.h>
 #include <security/cap.h>
@@ -57 +59 @@
 #include <mm/as.h>
 #include <abi/sysinfo.h>
+#include <arch.h>
+
+#define TASK                 THE->task
+
 
 struct thread;
@@ -123 +129 @@
         task_arch_t arch;
         
-        /**
-         * Serializes access to the B+tree of task's futexes. This mutex is
-         * independent on the task spinlock.
-         */
-        mutex_t futexes_lock;
-        /** B+tree of futexes referenced by this task. */
-        btree_t futexes;
+        struct futex_cache {
+                /** CHT mapping virtual addresses of futex variables to futex objects.*/
+                cht_t ht;
+                /** Serializes access to futex_list.*/
+                spinlock_t list_lock;
+                /** List of all futexes accesses by this task. */
+                list_t list;
+                work_t destroy_work;
+        } *futexes;
         
         /** Accumulated accounting. */

kernel/generic/include/proc/thread.h

@@ -41 +41 @@
 #include <cpu.h>
 #include <synch/spinlock.h>
+#include <synch/rcu_types.h>
 #include <adt/avl.h>
 #include <mm/slab.h>
@@ -48 +49 @@
 #include <udebug/udebug.h>
 #include <abi/sysinfo.h>
+#include <arch.h>
+
+
+#define THREAD              THE->thread
 
 #define THREAD_NAME_BUFLEN  20
@@ -180 +185 @@
         /** Thread ID. */
         thread_id_t tid;
+
+        /** Work queue this thread belongs to or NULL. Immutable. */
+        struct work_queue *workq;
+        /** Links work queue threads. Protected by workq->lock. */
+        link_t workq_link; 
+        /** True if the worker was blocked and is not running. Use thread->lock. */
+        bool workq_blocked;
+        /** True if the worker will block in order to become idle. Use workq->lock. */
+        bool workq_idling;
+        
+        /** RCU thread related data. Protected by its own locks. */
+        rcu_thread_data_t rcu;
         
         /** Architecture-specific data. */
@@ -217 +234 @@
 extern void thread_ready(thread_t *);
 extern void thread_exit(void) __attribute__((noreturn));
+extern void thread_interrupt(thread_t *);
+extern bool thread_interrupted(thread_t *);
 
 #ifndef thread_create_arch