Changes in kernel/generic/src/proc/thread.c [c0699467:ae0300b5] in mainline

File:

• kernel/generic/src/proc/thread.c (modified) (15 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>
@@ -44 +45 @@
 #include <arch/cycle.h>
 #include <arch.h>
+#include <synch/synch.h>
 #include <synch/spinlock.h>
 #include <synch/waitq.h>
@@ -53 +55 @@
 #include <time/clock.h>
 #include <time/timeout.h>
-#include <time/delay.h>
 #include <config.h>
 #include <arch/interrupt.h>
@@ -66 +67 @@
 #include <syscall/copy.h>
 #include <errno.h>
+
+
+#ifndef LOADED_PROG_STACK_PAGES_NO
+#define LOADED_PROG_STACK_PAGES_NO 1
+#endif
+
 
 /** Thread states */
@@ -258 +265 @@
          */
         
-        list_append(&thread->rq_link, &cpu->rq[i].rq);
+        list_append(&thread->rq_link, &cpu->rq[i].rq_head);
         cpu->rq[i].n++;
         irq_spinlock_unlock(&(cpu->rq[i].lock), true);
@@ -293 +300 @@
         
         /* Not needed, but good for debugging */
-        memsetb(thread->kstack, STACK_SIZE, 0);
+        memsetb(thread->kstack, THREAD_STACK_SIZE * 1 << STACK_FRAMES, 0);
         
         irq_spinlock_lock(&tidlock, true);
@@ -301 +308 @@
         context_save(&thread->saved_context);
         context_set(&thread->saved_context, FADDR(cushion),
-            (uintptr_t) thread->kstack, STACK_SIZE);
+            (uintptr_t) thread->kstack, THREAD_STACK_SIZE);
         
         the_initialize((the_t *) thread->kstack);
@@ -320 +327 @@
         thread->cpu = NULL;
         thread->flags = flags;
-        thread->nomigrate = 0;
         thread->state = Entering;
         
@@ -421 +427 @@
                 atomic_inc(&task->lifecount);
         
-        list_append(&thread->th_link, &task->threads);
+        list_append(&thread->th_link, &task->th_head);
         
         irq_spinlock_pass(&task->lock, &threads_lock);
@@ -483 +489 @@
 }
 
-/** 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--;
-}
-
 /** Thread sleep
  *
@@ -616 +605 @@
                 printf("%-8" PRIu64 " %-14s %10p %-8s %10p %-5" PRIu32 "\n",
                     thread->tid, name, thread, thread_states[thread->state],
-                    thread->task, thread->task->container);
+                    thread->task, thread->task->context);
 #endif
         
@@ -628 +617 @@
                 printf("%-8" PRIu64 " %-14s %18p %-8s %18p %-5" PRIu32 "\n",
                     thread->tid, name, thread, thread_states[thread->state],
-                    thread->task, thread->task->container);
+                    thread->task, thread->task->context);
 #endif
         
@@ -669 +658 @@
         else
                 printf("[id    ] [name        ] [address ] [state ] [task    ]"
-                    " [ctn]\n");
+                    " [ctx]\n");
 #endif
         
@@ -678 +667 @@
         } else
                 printf("[id    ] [name        ] [address         ] [state ]"
-                    " [task            ] [ctn]\n");
+                    " [task            ] [ctx]\n");
 #endif
         
@@ -929 +918 @@
 }
 
-sysarg_t sys_thread_udelay(uint32_t usec)
-{
-        delay(usec);
-        return 0;
-}
-
 /** @}
  */