Changeset 43114c5 in mainline for src/time/clock.c

Timestamp:

2005-04-09T18:22:53Z (20 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.

File:

• src/time/clock.c (modified) (2 diffs)

src/time/clock.c

@@ -58 +58 @@
          * run all expired timeouts as you visit them.
          */
-        spinlock_lock(&the->cpu->timeoutlock);
-        while ((l = the->cpu->timeout_active_head.next) != &the->cpu->timeout_active_head) {
+        spinlock_lock(&CPU->timeoutlock);
+        while ((l = CPU->timeout_active_head.next) != &CPU->timeout_active_head) {
                 h = list_get_instance(l, timeout_t, link);
                 spinlock_lock(&h->lock);
@@ -71 +71 @@
                 timeout_reinitialize(h);
                 spinlock_unlock(&h->lock);      
-                spinlock_unlock(&the->cpu->timeoutlock);
+                spinlock_unlock(&CPU->timeoutlock);
 
                 f(arg);
 
-                spinlock_lock(&the->cpu->timeoutlock);
+                spinlock_lock(&CPU->timeoutlock);
         }
-        spinlock_unlock(&the->cpu->timeoutlock);
+        spinlock_unlock(&CPU->timeoutlock);
 
         /*
-         * Do CPU usage accounting and find out whether to preempt the->thread.
+         * Do CPU usage accounting and find out whether to preempt THREAD.
          */
 
-        if (the->thread) {
-                spinlock_lock(&the->cpu->lock);
-                the->cpu->needs_relink++;
-                spinlock_unlock(&the->cpu->lock);       
+        if (THREAD) {
+                spinlock_lock(&CPU->lock);
+                CPU->needs_relink++;
+                spinlock_unlock(&CPU->lock);    
         
-                spinlock_lock(&the->thread->lock);
-                if (!the->thread->ticks--) {
-                        spinlock_unlock(&the->thread->lock);
+                spinlock_lock(&THREAD->lock);
+                if (!THREAD->ticks--) {
+                        spinlock_unlock(&THREAD->lock);
                         scheduler();
                 }
                 else {
-                        spinlock_unlock(&the->thread->lock);
+                        spinlock_unlock(&THREAD->lock);
                 }
         }