Changeset 343fc179 in mainline

Timestamp:

2006-05-31T16:16:51Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

482826d

Parents:

76d7305

Message:

Allow usage of blocking synchronization primitives in functions that are also called during system initialization.

File:

• generic/src/synch/waitq.c (modified) (1 diff)

generic/src/synch/waitq.c

@@ -225 +225 @@
         ipl = interrupts_disable();
 
-        /*
-         * Busy waiting for a delayed timeout.
-         * This is an important fix for the race condition between
-         * a delayed timeout and a next call to waitq_sleep_timeout().
-         * Simply, the thread is not allowed to go to sleep if
-         * there are timeouts in progress.
-         */
-        spinlock_lock(&THREAD->lock);
-        if (THREAD->timeout_pending) {
+        if (THREAD) {   /* needed during system initiailzation */
+                /*
+                 * Busy waiting for a delayed timeout.
+                 * This is an important fix for the race condition between
+                 * a delayed timeout and a next call to waitq_sleep_timeout().
+                 * Simply, the thread is not allowed to go to sleep if
+                 * there are timeouts in progress.
+                 */
+                spinlock_lock(&THREAD->lock);
+                if (THREAD->timeout_pending) {
+                        spinlock_unlock(&THREAD->lock);
+                        interrupts_restore(ipl);
+                        goto restart;
+                }
                 spinlock_unlock(&THREAD->lock);
-                interrupts_restore(ipl);
-                goto restart;
-        }
-        spinlock_unlock(&THREAD->lock);
+        }
                                                                                                         
         spinlock_lock(&wq->lock);