Changeset 22f7769 in mainline for src/proc/scheduler.c

Timestamp:

2005-10-17T23:31:41Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4b2c872d

Parents:

75eacab

Message:

Rename cpu_priority_{high|low|restore|read} functions to interrupts_{disable|enable|restore|read}.
Rename pri_t to ipl_t (Interrupt Priority Level).
Rename thread_t::pri to thread_t::priority.

File:

• src/proc/scheduler.c (modified) (15 diffs)

src/proc/scheduler.c

@@ -126 +126 @@
 
 loop:
-        cpu_priority_high();
+        interrupts_disable();
 
         spinlock_lock(&CPU->lock);
@@ -132 +132 @@
         spinlock_unlock(&CPU->lock);
 
-        cpu_priority_low();
+        interrupts_enable();
         
         if (n == 0) {
@@ -156 +156 @@
         }
 
-        cpu_priority_high();
+        interrupts_disable();
         
         i = 0;
@@ -197 +197 @@
 
                 t->ticks = us2ticks((i+1)*10000);
-                t->pri = i;     /* eventually correct rq index */
+                t->priority = i;        /* eventually correct rq index */
 
                 /*
@@ -262 +262 @@
 void scheduler(void)
 {
-        volatile pri_t pri;
+        volatile ipl_t ipl;
 
         ASSERT(CPU != NULL);
 
-        pri = cpu_priority_high();
+        ipl = interrupts_disable();
 
         if (haltstate)
@@ -282 +282 @@
                         before_thread_runs();
                         spinlock_unlock(&THREAD->lock);
-                        cpu_priority_restore(THREAD->saved_context.pri);
+                        interrupts_restore(THREAD->saved_context.ipl);
                         return;
                 }
 
                 /*
-                 * CPU priority of preempted thread is recorded here
-                 * to facilitate scheduler() invocations from
-                 * cpu_priority_high()'ed code (e.g. waitq_sleep_timeout()). 
-                 */
-                THREAD->saved_context.pri = pri;
+                 * Interrupt priority level of preempted thread is recorded here
+                 * to facilitate scheduler() invocations from interrupts_disable()'d
+                 * code (e.g. waitq_sleep_timeout()). 
+                 */
+                THREAD->saved_context.ipl = ipl;
         }
 
@@ -372 +372 @@
                          * Prefer the thread after it's woken up.
                          */
-                        THREAD->pri = -1;
+                        THREAD->priority = -1;
 
                         /*
@@ -407 +407 @@
         
         spinlock_lock(&THREAD->lock);
-        priority = THREAD->pri;
+        priority = THREAD->priority;
         spinlock_unlock(&THREAD->lock); 
 
@@ -447 +447 @@
 
         #ifdef SCHEDULER_VERBOSE
-        printf("cpu%d: tid %d (pri=%d,ticks=%d,nrdy=%d)\n", CPU->id, THREAD->tid, THREAD->pri, THREAD->ticks, CPU->nrdy);
+        printf("cpu%d: tid %d (priority=%d,ticks=%d,nrdy=%d)\n", CPU->id, THREAD->tid, THREAD->priority, THREAD->ticks, CPU->nrdy);
         #endif  
 
@@ -473 +473 @@
         thread_t *t;
         int count, i, j, k = 0;
-        pri_t pri;
+        ipl_t ipl;
 
 loop:
@@ -487 +487 @@
          * passes. Each time get the most up to date counts.
          */
-        pri = cpu_priority_high();
+        ipl = interrupts_disable();
         spinlock_lock(&CPU->lock);
         count = nrdy / config.cpu_active;
         count -= CPU->nrdy;
         spinlock_unlock(&CPU->lock);
-        cpu_priority_restore(pri);
+        interrupts_restore(ipl);
 
         if (count <= 0)
@@ -515 +515 @@
                                 continue;                               
 
-restart:                pri = cpu_priority_high();
+restart:                ipl = interrupts_disable();
                         r = &cpu->rq[j];
                         spinlock_lock(&r->lock);
                         if (r->n == 0) {
                                 spinlock_unlock(&r->lock);
-                                cpu_priority_restore(pri);
+                                interrupts_restore(ipl);
                                 continue;
                         }
@@ -549 +549 @@
                                                 /* Release all locks and try again. */ 
                                                 spinlock_unlock(&r->lock);
-                                                cpu_priority_restore(pri);
+                                                interrupts_restore(ipl);
                                                 goto restart;
                                         }
@@ -581 +581 @@
                                 thread_ready(t);
 
-                                cpu_priority_restore(pri);
+                                interrupts_restore(ipl);
         
                                 if (--count == 0)
@@ -593 +593 @@
                                 continue;
                         }
-                        cpu_priority_restore(pri);
+                        interrupts_restore(ipl);
                 }
         }