2008-05-27 Neal H. Walfield <neal@gnu.org>

	* pthread/pt-internal.h (__pthread_queue_iterate): Before
	returning the current element, save its next pointer.
	(__pthread_dequeuing_iterate): Likewise.

	* sysdeps/l4/hurd/pt-wakeup.c (__pthread_wakeup): Loop until we
	successfully wake THREAD.

1 files changed, 16 insertions, 2 deletions

diff --git a/sysdeps/l4/hurd/pt-wakeup.c b/sysdeps/l4/hurd/pt-wakeup.c
index 2225cca0..e568a6f9 100644
--- a/sysdeps/l4/hurd/pt-wakeup.c
+++ b/sysdeps/l4/hurd/pt-wakeup.c
@@ -27,6 +27,20 @@
 void
 __pthread_wakeup (struct __pthread *thread)
 {
-  long ret = futex_wake (&thread->threadid, INT_MAX);
-  assert (ret == 1);
+  /* We need to loop here as the blocked thread may not yet be
+     blocked!  Here's what happens when a thread blocks: it registers
+     itself as blocked, drops the relevant lock and then actually
+     blocks (via __pthread_block).  This means that after dropping the
+     lock and before blocking, it may be interrupted and another
+     thread may try to wake it.  */
+  long ret;
+  do
+    {
+      ret = futex_wake (&thread->threadid, INT_MAX);
+      assertx (ret <= 1, "tid: %x, ret: %d", thread->threadid, ret);
+
+      if (ret == 0)
+	l4_thread_switch (thread->threadid);
+    }
+  while (ret == 0);
 }