WebSVN – HelenOS-historic – Diff – /kernel/trunk/generic/src/synch/waitq.c

     /*
      * Now we are firmly decided to go to sleep.
      */
     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
          * of this thread is ever interrupted.
          */
         THREAD->sleep_interruptible = true;
         if (!context_save(&THREAD->sleep_interruption_context)) {
             /* Short emulation of scheduler() return code. */
             spinlock_unlock(&THREAD->lock);
             return ESYNCH_INTERRUPTED;
+        }
     } else {
         THREAD->sleep_interruptible = false;
+    }
     if (usec) {

Subversion Repositories HelenOS-historic