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

Timestamp:

2011-11-06T22:21:05Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

898e847

Parents:

2bdf8313 (diff), 7b5f4c9 (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/src/proc/thread.c (modified) (8 diffs)

kernel/generic/src/proc/thread.c

@@ -39 +39 @@
 #include <proc/thread.h>
 #include <proc/task.h>
-#include <proc/uarg.h>
 #include <mm/frame.h>
 #include <mm/page.h>
@@ -45 +44 @@
 #include <arch/cycle.h>
 #include <arch.h>
-#include <synch/synch.h>
 #include <synch/spinlock.h>
 #include <synch/waitq.h>
@@ -55 +53 @@
 #include <time/clock.h>
 #include <time/timeout.h>
+#include <time/delay.h>
 #include <config.h>
 #include <arch/interrupt.h>
@@ -259 +258 @@
          */
         
-        list_append(&thread->rq_link, &cpu->rq[i].rq_head);
+        list_append(&thread->rq_link, &cpu->rq[i].rq);
         cpu->rq[i].n++;
         irq_spinlock_unlock(&(cpu->rq[i].lock), true);
@@ -321 +320 @@
         thread->cpu = NULL;
         thread->flags = flags;
+        thread->nomigrate = 0;
         thread->state = Entering;
         
@@ -421 +421 @@
                 atomic_inc(&task->lifecount);
         
-        list_append(&thread->th_link, &task->th_head);
+        list_append(&thread->th_link, &task->threads);
         
         irq_spinlock_pass(&task->lock, &threads_lock);
@@ -481 +481 @@
         /* Not reached */
         while (true);
+}
+
+/** Prevent the current thread from being migrated to another processor. */
+void thread_migration_disable(void)
+{
+        ASSERT(THREAD);
+
+        THREAD->nomigrate++;
+}
+
+/** Allow the current thread to be migrated to another processor. */
+void thread_migration_enable(void)
+{
+        ASSERT(THREAD);
+        ASSERT(THREAD->nomigrate > 0);
+
+        THREAD->nomigrate--;
 }
 
@@ -912 +929 @@
 }
 
+sysarg_t sys_thread_udelay(uint32_t usec)
+{
+        delay(usec);
+        return 0;
+}
+
 /** @}
  */