Changeset 05e2a7ad in mainline for generic/src/synch/waitq.c

Timestamp:

2005-12-07T13:32:31Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

839470f

Parents:

253f8590

Message:

Add comments describing locking rules for some locks.
Cleanup.

File:

• generic/src/synch/waitq.c (modified) (10 diffs)

generic/src/synch/waitq.c

@@ -34 +34 @@
 #include <arch/asm.h>
 #include <arch/types.h>
+#include <typedefs.h>
 #include <time/timeout.h>
 #include <arch.h>
@@ -68 +69 @@
         thread_t *t = (thread_t *) data;
         waitq_t *wq;
-        int do_wakeup = 0;
+        bool do_wakeup = false;
 
         spinlock_lock(&threads_lock);
@@ -76 +77 @@
 grab_locks:
         spinlock_lock(&t->lock);
-        if (wq = t->sleep_queue) {
+        if (wq = t->sleep_queue) {              /* assignment */
                 if (!spinlock_trylock(&wq->lock)) {
                         spinlock_unlock(&t->lock);
-                        goto grab_locks; /* avoid deadlock */
+                        goto grab_locks;        /* avoid deadlock */
                 }
 
                 list_remove(&t->wq_link);
                 t->saved_context = t->sleep_timeout_context;
-                do_wakeup = 1;
+                do_wakeup = true;
                 
                 spinlock_unlock(&wq->lock);
@@ -90 +91 @@
         }
         
-        t->timeout_pending = 0;
+        t->timeout_pending = false;
         spinlock_unlock(&t->lock);
         
-        if (do_wakeup) thread_ready(t);
+        if (do_wakeup)
+                thread_ready(t);
 
 out:
@@ -194 +196 @@
                         return ESYNCH_TIMEOUT;
                 }
-                THREAD->timeout_pending = 1;
+                THREAD->timeout_pending = true;
                 timeout_register(&THREAD->sleep_timeout, (__u64) usec, waitq_interrupted_sleep, THREAD);
         }
@@ -228 +230 @@
  *        will be woken up and missed count will be zeroed.
  */
-void waitq_wakeup(waitq_t *wq, int all)
+void waitq_wakeup(waitq_t *wq, bool all)
 {
         ipl_t ipl;
@@ -251 +253 @@
  *        will be woken up and missed count will be zeroed.
  */
-void _waitq_wakeup_unsafe(waitq_t *wq, int all)
+void _waitq_wakeup_unsafe(waitq_t *wq, bool all)
 {
         thread_t *t;
@@ -258 +260 @@
         if (list_empty(&wq->head)) {
                 wq->missed_wakeups++;
-                if (all) wq->missed_wakeups = 0;
+                if (all)
+                        wq->missed_wakeups = 0;
                 return;
         }
@@ -267 +270 @@
         spinlock_lock(&t->lock);
         if (t->timeout_pending && timeout_unregister(&t->sleep_timeout))
-                t->timeout_pending = 0;
+                t->timeout_pending = false;
         t->sleep_queue = NULL;
         spinlock_unlock(&t->lock);
@@ -273 +276 @@
         thread_ready(t);
 
-        if (all) goto loop;
-}
+        if (all)
+                goto loop;
+}