Changeset c028b22 in mainline for kernel/generic/src/proc/scheduler.c

Timestamp:

2011-07-08T17:01:01Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cc1a727

Parents:

4e36219 (diff), 026793d (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/scheduler.c (modified) (8 diffs)

kernel/generic/src/proc/scheduler.c

@@ -237 +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);
                 
@@ -273 +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);
         
@@ -284 +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;
@@ -292 +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);
@@ -586 +586 @@
          * Searching least priority queues on all CPU's first and most priority
          * queues on all CPU's last.
-         *
          */
         size_t acpu;
@@ -617 +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);
@@ -660 +660 @@
                                  */
                                 
-                                irq_spinlock_pass(&(cpu->rq[rq].lock), &thread->lock);
+                                irq_spinlock_pass(&(cpu->rq[rq].lock),
+                                    &thread->lock);
                                 
 #ifdef KCPULB_VERBOSE
@@ -739 +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]);