Changes in kernel/generic/src/synch/waitq.c [df58e44:1d432f9] in mainline

File:

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

kernel/generic/src/synch/waitq.c

@@ -127 +127 @@
 /** Interrupt sleeping thread.
  *
- * This routine attempts to interrupt a thread from its sleep in
- * a waitqueue. If the thread is not found sleeping, no action
- * is taken.
- *
- * The threads_lock must be already held and interrupts must be
- * disabled upon calling this function.
+ * This routine attempts to interrupt a thread from its sleep in a waitqueue.
+ * If the thread is not found sleeping, no action is taken.
  *
  * @param thread Thread to be interrupted.
@@ -142 +138 @@
         DEADLOCK_PROBE_INIT(p_wqlock);
         
-        /*
-         * The thread is quaranteed to exist because
-         * threads_lock is held.
-         */
+        irq_spinlock_lock(&threads_lock, true);
+        if (!thread_exists(thread))
+                goto out;
         
 grab_locks:
@@ -155 +150 @@
                         /*
                          * The sleep cannot be interrupted.
+                         *
                          */
                         irq_spinlock_unlock(&thread->lock, false);
-                        return;
+                        goto out;
                 }
                 
                 if (!irq_spinlock_trylock(&wq->lock)) {
-                        /* Avoid deadlock */
                         irq_spinlock_unlock(&thread->lock, false);
                         DEADLOCK_PROBE(p_wqlock, DEADLOCK_THRESHOLD);
+                        /* Avoid deadlock */
                         goto grab_locks;
                 }
@@ -177 +173 @@
                 irq_spinlock_unlock(&wq->lock, false);
         }
-        
         irq_spinlock_unlock(&thread->lock, false);
         
         if (do_wakeup)
                 thread_ready(thread);
+        
+out:
+        irq_spinlock_unlock(&threads_lock, true);
 }
 
@@ -372 +370 @@
                  * If the thread was already interrupted,
                  * don't go to sleep at all.
+                 *
                  */
                 if (THREAD->interrupted) {
@@ -382 +381 @@
                  * Set context that will be restored if the sleep
                  * of this thread is ever interrupted.
+                 *
                  */
                 THREAD->sleep_interruptible = true;