Changeset 34dcd3f in mainline for generic/src/synch/waitq.c

Timestamp:

2006-06-05T07:47:45Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c778c1a

Parents:

7509ddc

Message:

Update for task_kill().

File:

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

generic/src/synch/waitq.c

@@ -312 +312 @@
         spinlock_lock(&THREAD->lock);
 
-        if (THREAD->interrupted) {
-                spinlock_unlock(&THREAD->lock);
-                spinlock_unlock(&wq->lock);
-                return ESYNCH_INTERRUPTED;
-        }
-
         if (flags & SYNCH_FLAGS_INTERRUPTIBLE) {
+
+                /*
+                 * If the thread was already interrupted,
+                 * don't go to sleep at all.
+                 */
+                if (THREAD->interrupted) {
+                        spinlock_unlock(&THREAD->lock);
+                        spinlock_unlock(&wq->lock);
+                        return ESYNCH_INTERRUPTED;
+                }
+
                 /*
                  * Set context that will be restored if the sleep
@@ -329 +334 @@
                         return ESYNCH_INTERRUPTED;
                 }
+
         } else {
                 THREAD->sleep_interruptible = false;