Changeset 22f7769 in mainline for src/proc/thread.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/proc/thread.c (modified) (11 diffs)

src/proc/thread.c

@@ -68 +68 @@
  * function returns.
  *
- * cpu_priority_high() is assumed.
+ * interrupts_disable() is assumed.
  *
  */
@@ -80 +80 @@
 
         spinlock_unlock(&THREAD->lock);
-        cpu_priority_low();
+        interrupts_enable();
 
         f(arg);
@@ -113 +113 @@
         cpu_t *cpu;
         runq_t *r;
-        pri_t pri;
+        ipl_t ipl;
         int i, avg, send_ipi = 0;
 
-        pri = cpu_priority_high();
+        ipl = interrupts_disable();
 
         spinlock_lock(&t->lock);
 
-        i = (t->pri < RQ_COUNT -1) ? ++t->pri : t->pri;
+        i = (t->priority < RQ_COUNT -1) ? ++t->priority : t->priority;
         
         cpu = CPU;
@@ -149 +149 @@
         spinlock_unlock(&cpu->lock);
 
-        cpu_priority_restore(pri);
+        interrupts_restore(ipl);
 }
 
@@ -172 +172 @@
         t = (thread_t *) malloc(sizeof(thread_t));
         if (t) {
-                pri_t pri;
+                ipl_t ipl;
         
                 spinlock_initialize(&t->lock);
@@ -181 +181 @@
                 }
 
-                pri = cpu_priority_high();
+                ipl = interrupts_disable();
                 spinlock_lock(&tidlock);
                 t->tid = ++last_tid;
                 spinlock_unlock(&tidlock);
-                cpu_priority_restore(pri);
+                interrupts_restore(ipl);
                 
                 memsetb(frame_ks, THREAD_STACK_SIZE, 0);
@@ -200 +200 @@
                 the_initialize((the_t *) t->kstack);
 
-                pri = cpu_priority_high();
-                t->saved_context.pri = cpu_priority_read();
-                cpu_priority_restore(pri);
+                ipl = interrupts_disable();
+                t->saved_context.ipl = interrupts_read();
+                interrupts_restore(ipl);
                 
                 t->thread_code = func;
                 t->thread_arg = arg;
                 t->ticks = -1;
-                t->pri = -1;            /* start in rq[0] */
+                t->priority = -1;               /* start in rq[0] */
                 t->cpu = NULL;
                 t->flags = 0;
@@ -228 +228 @@
                  * Register this thread in the system-wide list.
                  */
-                pri = cpu_priority_high();              
+                ipl = interrupts_disable();             
                 spinlock_lock(&threads_lock);
                 list_append(&t->threads_link, &threads_head);
@@ -240 +240 @@
                 spinlock_unlock(&task->lock);
 
-                cpu_priority_restore(pri);
+                interrupts_restore(ipl);
         }
 
@@ -255 +255 @@
 void thread_exit(void)
 {
-        pri_t pri;
+        ipl_t ipl;
 
 restart:
-        pri = cpu_priority_high();
+        ipl = interrupts_disable();
         spinlock_lock(&THREAD->lock);
         if (THREAD->timeout_pending) { /* busy waiting for timeouts in progress */
                 spinlock_unlock(&THREAD->lock);
-                cpu_priority_restore(pri);
+                interrupts_restore(ipl);
                 goto restart;
         }
@@ -312 +312 @@
 void thread_register_call_me(void (* call_me)(void *), void *call_me_with)
 {
-        pri_t pri;
-        
-        pri = cpu_priority_high();
+        ipl_t ipl;
+        
+        ipl = interrupts_disable();
         spinlock_lock(&THREAD->lock);
         THREAD->call_me = call_me;
         THREAD->call_me_with = call_me_with;
         spinlock_unlock(&THREAD->lock);
-        cpu_priority_restore(pri);
-}
+        interrupts_restore(ipl);
+}