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

Timestamp:

2012-06-20T23:03:29Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

d5070ef

Parents:

8375d0eb (diff), 6eef3c4 (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) (6 diffs)

kernel/generic/src/proc/scheduler.c

@@ -98 +98 @@
         else {
                 fpu_init();
-                THREAD->fpu_context_exists = 1;
+                THREAD->fpu_context_exists = true;
         }
 #endif
@@ -142 +142 @@
                 
                 /* Don't prevent migration */
-                CPU->fpu_owner->fpu_context_engaged = 0;
+                CPU->fpu_owner->fpu_context_engaged = false;
                 irq_spinlock_unlock(&CPU->fpu_owner->lock, false);
                 CPU->fpu_owner = NULL;
@@ -163 +163 @@
                 }
                 fpu_init();
-                THREAD->fpu_context_exists = 1;
+                THREAD->fpu_context_exists = true;
         }
         
         CPU->fpu_owner = THREAD;
-        THREAD->fpu_context_engaged = 1;
+        THREAD->fpu_context_engaged = true;
         irq_spinlock_unlock(&THREAD->lock, false);
         
@@ -248 +248 @@
                 
                 /*
-                 * Clear the THREAD_FLAG_STOLEN flag so that t can be migrated
+                 * Clear the stolen flag so that it can be migrated
                  * when load balancing needs emerge.
                  */
-                thread->flags &= ~THREAD_FLAG_STOLEN;
+                thread->stolen = false;
                 irq_spinlock_unlock(&thread->lock, false);
                 
@@ -630 +630 @@
                                 irq_spinlock_lock(&thread->lock, false);
                                 
-                                if (!(thread->flags & THREAD_FLAG_WIRED) &&
-                                    !(thread->flags & THREAD_FLAG_STOLEN) &&
-                                    !thread->nomigrate &&
-                                    !thread->fpu_context_engaged) {
+                                if ((!thread->wired) && (!thread->stolen) &&
+                                    (!thread->nomigrate) &&
+                                    (!thread->fpu_context_engaged)) {
                                         /*
                                          * Remove thread from ready queue.
@@ -670 +669 @@
 #endif
                                 
-                                thread->flags |= THREAD_FLAG_STOLEN;
+                                thread->stolen = true;
                                 thread->state = Entering;