Changeset 8ad7dd1 in mainline

Timestamp:

2016-05-26T09:55:54Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7f0580d

Parents:

84b8936d

Message:

When readying a migrated thread, make sure it runs on the current CPU

File:

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

kernel/generic/src/proc/thread.c

@@ -290 +290 @@
             ++thread->priority : thread->priority;
 
-        /* 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_t *cpu;
+        if (thread->wired || thread->nomigrate || thread->fpu_context_engaged) {
+                /* Cannot ready to another CPU */
+                ASSERT(thread->cpu != NULL);
+                cpu = thread->cpu;
+        } else if (thread->stolen) {
+                /* Ready to the stealing CPU */
                 cpu = CPU;
+        } else if (thread->cpu) {
+                /* Prefer the CPU on which the thread ran last */
+                ASSERT(thread->cpu != NULL);
+                cpu = thread->cpu;
+        } else {
+                cpu = CPU;
+        }
         
         thread->state = Ready;
@@ -316 +320 @@
         
         atomic_inc(&nrdy);
-        // FIXME: Why is the avg value not used
-        // avg = atomic_get(&nrdy) / config.cpu_active;
         atomic_inc(&cpu->nrdy);
 }