Changeset b1c57a8 in mainline for kernel/generic/src/proc/thread.c

Timestamp:

2014-10-09T15:03:55Z (10 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.

File:

• kernel/generic/src/proc/thread.c (modified) (7 diffs)

kernel/generic/src/proc/thread.c

@@ -46 +46 @@
 #include <synch/spinlock.h>
 #include <synch/waitq.h>
+#include <synch/workqueue.h>
+#include <synch/rcu.h>
 #include <cpu.h>
 #include <str.h>
@@ -263 +265 @@
 }
 
+/** Invoked right before thread_ready() readies the thread. thread is locked. */
+static void before_thread_is_ready(thread_t *thread)
+{
+        ASSERT(irq_spinlock_locked(&thread->lock));
+        workq_before_thread_is_ready(thread);
+}
+
 /** Make thread ready
  *
@@ -275 +284 @@
         
         ASSERT(thread->state != Ready);
+
+        before_thread_is_ready(thread);
         
         int i = (thread->priority < RQ_COUNT - 1) ?
             ++thread->priority : thread->priority;
-        
-        cpu_t *cpu;
-        if (thread->wired || thread->nomigrate || thread->fpu_context_engaged) {
-                ASSERT(thread->cpu != NULL);
-                cpu = thread->cpu;
-        } else
+
+        /* Check that thread->cpu is set whenever it needs to be. */
+        ASSERT(thread->cpu != NULL || 
+                (!thread->wired && !thread->nomigrate && !thread->fpu_context_engaged));
+
+        /* 
+         * Prefer to run on the same cpu as the last time. Used by wired 
+         * threads as well as threads with disabled migration.
+         */
+        cpu_t *cpu = thread->cpu;
+        if (cpu == NULL) 
                 cpu = CPU;
         
@@ -377 +393 @@
         thread->task = task;
         
+        thread->workq = NULL;
+        
         thread->fpu_context_exists = false;
         thread->fpu_context_engaged = false;
@@ -391 +409 @@
         /* Might depend on previous initialization */
         thread_create_arch(thread);
+        
+        rcu_thread_init(thread);
         
         if ((flags & THREAD_FLAG_NOATTACH) != THREAD_FLAG_NOATTACH)
@@ -501 +521 @@
                          */
                         ipc_cleanup();
-                        futex_cleanup();
+                        futex_task_cleanup();
                         LOG("Cleanup of task %" PRIu64" completed.", TASK->taskid);
                 }
@@ -521 +541 @@
         /* Not reached */
         while (true);
+}
+
+/** Interrupts an existing thread so that it may exit as soon as possible.
+ * 
+ * Threads that are blocked waiting for a synchronization primitive 
+ * are woken up with a return code of ESYNCH_INTERRUPTED if the
+ * blocking call was interruptable. See waitq_sleep_timeout().
+ * 
+ * The caller must guarantee the thread object is valid during the entire
+ * function, eg by holding the threads_lock lock.
+ * 
+ * Interrupted threads automatically exit when returning back to user space.
+ * 
+ * @param thread A valid thread object. The caller must guarantee it
+ *               will remain valid until thread_interrupt() exits.
+ */
+void thread_interrupt(thread_t *thread)
+{
+        ASSERT(thread != NULL);
+        
+        irq_spinlock_lock(&thread->lock, true);
+        
+        thread->interrupted = true;
+        bool sleeping = (thread->state == Sleeping);
+        
+        irq_spinlock_unlock(&thread->lock, true);
+        
+        if (sleeping)
+                waitq_interrupt_sleep(thread);
+}
+
+/** Returns true if the thread was interrupted.
+ * 
+ * @param thread A valid thread object. User must guarantee it will
+ *               be alive during the entire call.
+ * @return true if the thread was already interrupted via thread_interrupt().
+ */
+bool thread_interrupted(thread_t *thread)
+{
+        ASSERT(thread != NULL);
+        
+        bool interrupted;
+        
+        irq_spinlock_lock(&thread->lock, true);
+        interrupted = thread->interrupted;
+        irq_spinlock_unlock(&thread->lock, true);
+        
+        return interrupted;
 }