Changeset 22f7769 in mainline for src/synch/waitq.c

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.

File:

• src/synch/waitq.c (modified) (8 diffs)

src/synch/waitq.c

@@ -138 +138 @@
 int waitq_sleep_timeout(waitq_t *wq, __u32 usec, int nonblocking)
 {
-        volatile pri_t pri; /* must be live after context_restore() */
+        volatile ipl_t ipl; /* must be live after context_restore() */
         
         
 restart:
-        pri = cpu_priority_high();
+        ipl = interrupts_disable();
         
         /*
@@ -154 +154 @@
         if (THREAD->timeout_pending) {
                 spinlock_unlock(&THREAD->lock);
-                cpu_priority_restore(pri);              
+                interrupts_restore(ipl);                
                 goto restart;
         }
@@ -165 +165 @@
                 wq->missed_wakeups--;
                 spinlock_unlock(&wq->lock);
-                cpu_priority_restore(pri);
+                interrupts_restore(ipl);
                 return ESYNCH_OK_ATOMIC;
         }
@@ -172 +172 @@
                         /* return immediatelly instead of going to sleep */
                         spinlock_unlock(&wq->lock);
-                        cpu_priority_restore(pri);
+                        interrupts_restore(ipl);
                         return ESYNCH_WOULD_BLOCK;
                 }
@@ -190 +190 @@
                         before_thread_runs();
                         spinlock_unlock(&THREAD->lock);
-                        cpu_priority_restore(pri);
+                        interrupts_restore(ipl);
                         return ESYNCH_TIMEOUT;
                 }
@@ -208 +208 @@
 
         scheduler();    /* wq->lock is released in scheduler_separated_stack() */
-        cpu_priority_restore(pri);
+        interrupts_restore(ipl);
         
         return ESYNCH_OK_BLOCKED;
@@ -229 +229 @@
 void waitq_wakeup(waitq_t *wq, int all)
 {
-        pri_t pri;
-
-        pri = cpu_priority_high();
+        ipl_t ipl;
+
+        ipl = interrupts_disable();
         spinlock_lock(&wq->lock);
 
@@ -237 +237 @@
 
         spinlock_unlock(&wq->lock);     
-        cpu_priority_restore(pri);      
+        interrupts_restore(ipl);        
 }