Changeset 22f7769 in mainline for src/time

Timestamp:

2005-10-17T23:31:41Z (20 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.

Location:

src/time

Files:

• clock.c (modified) (1 diff)
• delay.c (modified) (1 diff)
• timeout.c (modified) (4 diffs)

src/time/clock.c

@@ -45 +45 @@
  *
  * Clock routine executed from clock interrupt handler
- * (assuming cpu_priority_high()). Runs expired timeouts
+ * (assuming interrupts_disable()'d). Runs expired timeouts
  * and preemptive scheduling.
  *

src/time/delay.c

@@ -43 +43 @@
 void delay(__u32 usec)
 {
-        pri_t pri;
+        ipl_t ipl;
         
-        /* The delay loop is calibrated for each and every
-           CPU in the system. Therefore it is necessary to
-           cpu_priority_high() before calling the asm_delay_loop(). */
-        pri = cpu_priority_high();
+        /* 
+         * The delay loop is calibrated for each and every
+         * CPU in the system. Therefore it is necessary to
+         * call interrupts_disable() before calling the
+         * asm_delay_loop().
+         */
+        ipl = interrupts_disable();
         asm_delay_loop(usec * CPU->delay_loop_const);
-        cpu_priority_restore(pri);
+        interrupts_restore(ipl);
 }

src/time/timeout.c

@@ -101 +101 @@
         timeout_t *hlp;
         link_t *l, *m;
-        pri_t pri;
+        ipl_t ipl;
         __u64 sum;
 
-        pri = cpu_priority_high();
+        ipl = interrupts_disable();
         spinlock_lock(&CPU->timeoutlock);
         spinlock_lock(&t->lock);
@@ -153 +153 @@
         spinlock_unlock(&t->lock);
         spinlock_unlock(&CPU->timeoutlock);
-        cpu_priority_restore(pri);
+        interrupts_restore(ipl);
 }
 
@@ -169 +169 @@
         timeout_t *hlp;
         link_t *l;
-        pri_t pri;
+        ipl_t ipl;
 
 grab_locks:
-        pri = cpu_priority_high();
+        ipl = interrupts_disable();
         spinlock_lock(&t->lock);
         if (!t->cpu) {
                 spinlock_unlock(&t->lock);
-                cpu_priority_restore(pri);
+                interrupts_restore(ipl);
                 return false;
         }
         if (!spinlock_trylock(&t->cpu->timeoutlock)) {
                 spinlock_unlock(&t->lock);
-                cpu_priority_restore(pri);              
+                interrupts_restore(ipl);                
                 goto grab_locks;
         }
@@ -204 +204 @@
         spinlock_unlock(&t->lock);
 
-        cpu_priority_restore(pri);
+        interrupts_restore(ipl);
         return true;
 }