Changeset 97f1691 in mainline for generic/src/proc/scheduler.c

Timestamp:

2006-02-28T00:02:39Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7d6ec87

Parents:

d87c3f3

Message:

sparc64 work.
Fix KBD_VIRT_ADDRESS.
Call before_thread_runs() prior to the switch to the thread's stack. Add comment why this is crucial.
Add after_thread_ran() to the scheduler.
Add before_thread_runs_arch() and after_thread_ran_arch() for sparc64, mapping/demapping thread's kernel stack.
Add dummy after_thread_ran_arch() to all other architectures.
Add dtlb_insert_mapping() to promote code reuse.

File:

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

generic/src/proc/scheduler.c

@@ -50 +50 @@
 atomic_t nrdy;
 
-/** Take actions before new thread runs
+/** Take actions before new thread runs.
  *
  * Perform actions that need to be
@@ -76 +76 @@
         }
 #endif
+}
+
+/** Take actions after old thread ran.
+ *
+ * Perform actions that need to be
+ * taken after the running thread
+ * was preempted by the scheduler.
+ *
+ * THREAD->lock is locked on entry
+ *
+ */
+void after_thread_ran(void)
+{
+        after_thread_ran_arch();
 }
 
@@ -258 +272 @@
 
         if (THREAD) {
+                /* must be run after switch to scheduler stack */
+                after_thread_ran();
+
                 switch (THREAD->state) {
                     case Running:
@@ -301 +318 @@
                         break;
                 }
+
                 THREAD = NULL;
         }
@@ -350 +368 @@
         printf("cpu%d: tid %d (priority=%d,ticks=%d,nrdy=%d)\n", CPU->id, THREAD->tid, THREAD->priority, THREAD->ticks, atomic_get(&CPU->nrdy));
         #endif  
+
+        /*
+         * Some architectures provide late kernel PA2KA(identity)
+         * mapping in a page fault handler. However, the page fault
+         * handler uses the kernel stack of the running thread and
+         * therefore cannot be used to map it. The kernel stack, if
+         * necessary, is to be mapped in before_thread_runs(). This
+         * function must be executed before the switch to the new stack.
+         */
+        before_thread_runs();
 
         /*
@@ -388 +416 @@
                          * This is the place where threads leave scheduler();
                          */
-                        before_thread_runs();
                         spinlock_unlock(&THREAD->lock);
                         interrupts_restore(THREAD->saved_context.ipl);