commit 1f4f300301689e4d4838327e2b84b66307244148
author bart <bart@a5019735-40e9-0310-863c-91ae7b9d1cf9> Fri Jul 29 06:30:23 2011 +0000
committer bart <bart@a5019735-40e9-0310-863c-91ae7b9d1cf9> Fri Jul 29 06:30:23 2011 +0000
tree 351f62b04ec30fd9572fa284cea55aeec252b07d
parent 9e7188556ee1a1fe8ca26f05f75e184d57f00514

drd: Remove a too strict assert() statement

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11937 a5019735-40e9-0310-863c-91ae7b9d1cf9

drd/drd_pthread_intercepts.c

diff --git a/drd/drd_pthread_intercepts.c b/drd/drd_pthread_intercepts.c
index b3fa771..856092f 100644
--- a/drd/drd_pthread_intercepts.c
+++ b/drd/drd_pthread_intercepts.c
@@ -196,12 +196,10 @@
    while (sema->counter == 0) {
 #if defined(__linux__) && defined(__NR_futex)
       if (syscall(__NR_futex, (UWord)&sema->counter,
-                  FUTEX_WAIT | FUTEX_PRIVATE_FLAG, 0) == 0) {
+                  FUTEX_WAIT | FUTEX_PRIVATE_FLAG, 0) == 0)
          res = 0;
-      } else {
+      else
          res = errno;
-         assert(res == EWOULDBLOCK || res == ENOSYS);
-      }
 #endif
       /*
        * Invoke sched_yield() on non-Linux systems, if the futex syscall has
@@ -209,7 +207,7 @@
        * where __NR_futex is defined and is run on a Linux system that does
        * not support the futex syscall.
        */
-      if (res == ENOSYS)
+      if (res != 0 && res != EWOULDBLOCK)
          sched_yield();
    }
    sema->counter--;