Changeset 22f7769 in mainline for src/synch/rwlock.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/rwlock.c (modified) (10 diffs)

src/synch/rwlock.c

@@ -97 +97 @@
 int _rwlock_write_lock_timeout(rwlock_t *rwl, __u32 usec, int trylock)
 {
-        pri_t pri;
+        ipl_t ipl;
         int rc;
         
-        pri = cpu_priority_high();
+        ipl = interrupts_disable();
         spinlock_lock(&THREAD->lock);
         THREAD->rwlock_holder_type = RWLOCK_WRITER;
         spinlock_unlock(&THREAD->lock); 
-        cpu_priority_restore(pri);
+        interrupts_restore(ipl);
 
         /*
@@ -119 +119 @@
                  */
                  
-                pri = cpu_priority_high();
+                ipl = interrupts_disable();
                 spinlock_lock(&rwl->lock);
                 /*
@@ -129 +129 @@
                         let_others_in(rwl, ALLOW_READERS_ONLY);
                 spinlock_unlock(&rwl->lock);
-                cpu_priority_restore(pri);
+                interrupts_restore(ipl);
         }
         
@@ -152 +152 @@
 {
         int rc;
-        pri_t pri;
-        
-        pri = cpu_priority_high();
+        ipl_t ipl;
+        
+        ipl = interrupts_disable();
         spinlock_lock(&THREAD->lock);
         THREAD->rwlock_holder_type = RWLOCK_READER;
@@ -205 +205 @@
                                 /*
                                  * The sleep timeouted.
-                                 * We just restore the cpu priority.
+                                 * We just restore interrupt priority level.
                                  */
                         case ESYNCH_OK_BLOCKED:         
@@ -216 +216 @@
                                  * rwl->lock is held.)
                                  */
-                                cpu_priority_restore(pri);
+                                interrupts_restore(ipl);
                                 break;
                         case ESYNCH_OK_ATOMIC:
@@ -237 +237 @@
         
         spinlock_unlock(&rwl->lock);
-        cpu_priority_restore(pri);
+        interrupts_restore(ipl);
 
         return ESYNCH_OK_ATOMIC;
@@ -252 +252 @@
 void rwlock_write_unlock(rwlock_t *rwl)
 {
-        pri_t pri;
-        
-        pri = cpu_priority_high();
+        ipl_t ipl;
+        
+        ipl = interrupts_disable();
         spinlock_lock(&rwl->lock);
         let_others_in(rwl, ALLOW_ALL);
         spinlock_unlock(&rwl->lock);
-        cpu_priority_restore(pri);
+        interrupts_restore(ipl);
         
 }
@@ -273 +273 @@
 void rwlock_read_unlock(rwlock_t *rwl)
 {
-        pri_t pri;
-
-        pri = cpu_priority_high();
+        ipl_t ipl;
+
+        ipl = interrupts_disable();
         spinlock_lock(&rwl->lock);
         if (!--rwl->readers_in)
                 let_others_in(rwl, ALLOW_ALL);
         spinlock_unlock(&rwl->lock);
-        cpu_priority_restore(pri);
+        interrupts_restore(ipl);
 }
 
@@ -290 +290 @@
  *
  * Must be called with rwl->lock locked.
- * Must be called with cpu_priority_high'ed.
+ * Must be called with interrupts_disable()'d.
  *
  * @param rwl Reader/Writer lock.