Changes in kernel/generic/src/proc/scheduler.c [df58e44:55b77d9] in mainline

File:

• kernel/generic/src/proc/scheduler.c (modified) (12 diffs)

kernel/generic/src/proc/scheduler.c

@@ -102 +102 @@
 #endif
         
+#ifdef CONFIG_UDEBUG
         if (THREAD->btrace) {
                 istate_t *istate = THREAD->udebug.uspace_state;
@@ -111 +112 @@
                 THREAD->btrace = false;
         }
+#endif
 }
 
@@ -235 +237 @@
                  * Take the first thread from the queue.
                  */
-                thread_t *thread =
-                    list_get_instance(CPU->rq[i].rq_head.next, thread_t, rq_link);
+                thread_t *thread = list_get_instance(
+                    list_first(&CPU->rq[i].rq), thread_t, rq_link);
                 list_remove(&thread->rq_link);
                 
@@ -271 +273 @@
 static void relink_rq(int start)
 {
-        link_t head;
-        
-        list_initialize(&head);
+        list_t list;
+        
+        list_initialize(&list);
         irq_spinlock_lock(&CPU->lock, false);
         
@@ -282 +284 @@
                         
                         irq_spinlock_lock(&CPU->rq[i + 1].lock, false);
-                        list_concat(&head, &CPU->rq[i + 1].rq_head);
+                        list_concat(&list, &CPU->rq[i + 1].rq);
                         size_t n = CPU->rq[i + 1].n;
                         CPU->rq[i + 1].n = 0;
@@ -290 +292 @@
                         
                         irq_spinlock_lock(&CPU->rq[i].lock, false);
-                        list_concat(&CPU->rq[i].rq_head, &head);
+                        list_concat(&CPU->rq[i].rq, &list);
                         CPU->rq[i].n += n;
                         irq_spinlock_unlock(&CPU->rq[i].lock, false);
@@ -352 +354 @@
         
         /*
-         * Through the 'THE' structure, we keep track of THREAD, TASK, CPU, VM
+         * Through the 'THE' structure, we keep track of THREAD, TASK, CPU, AS
          * and preemption counter. At this point THE could be coming either
          * from THREAD's or CPU's stack.
@@ -374 +376 @@
         context_save(&CPU->saved_context);
         context_set(&CPU->saved_context, FADDR(scheduler_separated_stack),
-            (uintptr_t) CPU->stack, CPU_STACK_SIZE);
+            (uintptr_t) CPU->stack, STACK_SIZE);
         context_restore(&CPU->saved_context);
         
@@ -584 +586 @@
          * Searching least priority queues on all CPU's first and most priority
          * queues on all CPU's last.
-         *
          */
         size_t acpu;
@@ -615 +616 @@
                         
                         /* Search rq from the back */
-                        link_t *link = cpu->rq[rq].rq_head.prev;
-                        
-                        while (link != &(cpu->rq[rq].rq_head)) {
-                                thread = (thread_t *) list_get_instance(link, thread_t, rq_link);
+                        link_t *link = cpu->rq[rq].rq.head.prev;
+                        
+                        while (link != &(cpu->rq[rq].rq.head)) {
+                                thread = (thread_t *) list_get_instance(link,
+                                    thread_t, rq_link);
                                 
                                 /*
-                                 * We don't want to steal CPU-wired threads
-                                 * neither threads already stolen. The latter
-                                 * prevents threads from migrating between CPU's
-                                 * without ever being run. We don't want to
-                                 * steal threads whose FPU context is still in
-                                 * CPU.
-                                 *
+                                 * Do not steal CPU-wired threads, threads
+                                 * already stolen, threads for which migration
+                                 * was temporarily disabled or threads whose
+                                 * FPU context is still in the CPU.
                                  */
                                 irq_spinlock_lock(&thread->lock, false);
                                 
-                                if ((!(thread->flags & (THREAD_FLAG_WIRED | THREAD_FLAG_STOLEN)))
-                                    && (!(thread->fpu_context_engaged))) {
+                                if (!(thread->flags & THREAD_FLAG_WIRED) &&
+                                    !(thread->flags & THREAD_FLAG_STOLEN) &&
+                                    !thread->nomigrate &&
+                                    !thread->fpu_context_engaged) {
                                         /*
                                          * Remove thread from ready queue.
                                          */
-                                        irq_spinlock_unlock(&thread->lock, false);
+                                        irq_spinlock_unlock(&thread->lock,
+                                            false);
                                         
                                         atomic_dec(&cpu->nrdy);
@@ -658 +660 @@
                                  */
                                 
-                                irq_spinlock_pass(&(cpu->rq[rq].lock), &thread->lock);
+                                irq_spinlock_pass(&(cpu->rq[rq].lock),
+                                    &thread->lock);
                                 
 #ifdef KCPULB_VERBOSE
@@ -737 +740 @@
                         
                         printf("\trq[%u]: ", i);
-                        link_t *cur;
-                        for (cur = cpus[cpu].rq[i].rq_head.next;
-                            cur != &(cpus[cpu].rq[i].rq_head);
-                            cur = cur->next) {
-                                thread_t *thread = list_get_instance(cur, thread_t, rq_link);
+                        list_foreach(cpus[cpu].rq[i].rq, cur) {
+                                thread_t *thread = list_get_instance(cur,
+                                    thread_t, rq_link);
                                 printf("%" PRIu64 "(%s) ", thread->tid,
                                     thread_states[thread->state]);