Changes in kernel/generic/src/proc/scheduler.c [481d4751:37c9fc8] in mainline

File:

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

kernel/generic/src/proc/scheduler.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Jakub Jermar
+ * Copyright (c) 2001-2007 Jakub Jermar
  * All rights reserved.
  *
@@ -382 +382 @@
         int priority;
         DEADLOCK_PROBE_INIT(p_joinwq);
-        task_t *old_task = TASK;
-        as_t *old_as = AS;
 
         ASSERT(CPU != NULL);
         
-        /*
-         * Hold the current task and the address space to prevent their
-         * possible destruction should thread_destroy() be called on this or any
-         * other processor while the scheduler is still using them.
-         */
-        if (old_task)
-                task_hold(old_task);
-        if (old_as)
-                as_hold(old_as);
-
         if (THREAD) {
                 /* must be run after the switch to scheduler stack */
@@ -488 +476 @@
          */
         if (TASK != THREAD->task) {
-                as_t *new_as = THREAD->task->as;
+                as_t *as1 = NULL;
+                as_t *as2;
+
+                if (TASK) {
+                        spinlock_lock(&TASK->lock);
+                        as1 = TASK->as;
+                        spinlock_unlock(&TASK->lock);
+                }
+
+                spinlock_lock(&THREAD->task->lock);
+                as2 = THREAD->task->as;
+                spinlock_unlock(&THREAD->task->lock);
                 
                 /*
@@ -494 +493 @@
                  * space.
                  */
-                if (old_as != new_as) {
+                if (as1 != as2) {
                         /*
                          * Both tasks and address spaces are different.
                          * Replace the old one with the new one.
                          */
-                        as_switch(old_as, new_as);
-                }
-
+                        as_switch(as1, as2);
+                }
                 TASK = THREAD->task;
                 before_task_runs();
         }
 
-        if (old_task)
-                task_release(old_task);
-        if (old_as)
-                as_release(old_as);
-        
         spinlock_lock(&THREAD->lock);   
         THREAD->state = Running;