Changeset 43114c5 in mainline for src/synch

Timestamp:

2005-04-09T18:22:53Z (21 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8262010

Parents:

e6ba9a3f

Message:

Introduce macros CPU, THREAD, TASK and use them to replace the→cpu, the→thread, the→task.
Later on, this will make it possible to reference *current* cpu, thread and/or task without the aid from virtual memory.

Location:

src/synch

Files:

• rwlock.c (modified) (2 diffs)
• spinlock.c (modified) (1 diff)
• waitq.c (modified) (2 diffs)

src/synch/rwlock.c

@@ -81 +81 @@
         
         pri = cpu_priority_high();
-        spinlock_lock(&the->thread->lock);
-        the->thread->rwlock_holder_type = RWLOCK_WRITER;
-        spinlock_unlock(&the->thread->lock);    
+        spinlock_lock(&THREAD->lock);
+        THREAD->rwlock_holder_type = RWLOCK_WRITER;
+        spinlock_unlock(&THREAD->lock); 
         cpu_priority_restore(pri);
 
@@ -121 +121 @@
         
         pri = cpu_priority_high();
-        spinlock_lock(&the->thread->lock);
-        the->thread->rwlock_holder_type = RWLOCK_READER;
-        spinlock_unlock(&the->thread->lock);    
+        spinlock_lock(&THREAD->lock);
+        THREAD->rwlock_holder_type = RWLOCK_READER;
+        spinlock_unlock(&THREAD->lock); 
 
         spinlock_lock(&rwl->lock);

src/synch/spinlock.c

@@ -50 +50 @@
         while (test_and_set(&sl->val)) {
                 if (i++ > 300000) {
-                        printf("cpu%d: looping on spinlock %X, caller=%X\n", the->cpu->id, sl, caller);
+                        printf("cpu%d: looping on spinlock %X, caller=%X\n", CPU->id, sl, caller);
                         i = 0;
                 }

src/synch/waitq.c

@@ -130 +130 @@
          * there are timeouts in progress.
          */
-        spinlock_lock(&the->thread->lock);
-        if (the->thread->timeout_pending) {
-                spinlock_unlock(&the->thread->lock);
+        spinlock_lock(&THREAD->lock);
+        if (THREAD->timeout_pending) {
+                spinlock_unlock(&THREAD->lock);
                 cpu_priority_restore(pri);              
                 goto restart;
         }
-        spinlock_unlock(&the->thread->lock);
+        spinlock_unlock(&THREAD->lock);
         
         spinlock_lock(&wq->lock);
@@ -160 +160 @@
          * Now we are firmly decided to go to sleep.
          */
-        spinlock_lock(&the->thread->lock);
+        spinlock_lock(&THREAD->lock);
         if (usec) {
                 /* We use the timeout variant. */
-                if (!context_save(&the->thread->sleep_timeout_context)) {
+                if (!context_save(&THREAD->sleep_timeout_context)) {
                         /*
                          * Short emulation of scheduler() return code.
                          */
-                        spinlock_unlock(&the->thread->lock);
+                        spinlock_unlock(&THREAD->lock);
                         cpu_priority_restore(pri);
                         return ESYNCH_TIMEOUT;
                 }
-                the->thread->timeout_pending = 1;
-                timeout_register(&the->thread->sleep_timeout, (__u64) usec, waitq_interrupted_sleep, the->thread);
-        }
-
-        list_append(&the->thread->wq_link, &wq->head);
+                THREAD->timeout_pending = 1;
+                timeout_register(&THREAD->sleep_timeout, (__u64) usec, waitq_interrupted_sleep, THREAD);
+        }
+
+        list_append(&THREAD->wq_link, &wq->head);
 
         /*
          * Suspend execution.
          */
-        the->thread->state = Sleeping;
-        the->thread->sleep_queue = wq;
-
-        spinlock_unlock(&the->thread->lock);
+        THREAD->state = Sleeping;
+        THREAD->sleep_queue = wq;
+
+        spinlock_unlock(&THREAD->lock);
 
         scheduler();    /* wq->lock is released in scheduler_separated_stack() */