folly: futexWaitUntilImpl: avoid abort triggered via tao/queues tests

Summary: * folly/test/DeterministicSchedule.cpp (folly): Tao/queues tests exposed an unhandled case in this code: when (futex->data == expected) happens, we would call futexErrnoToFutexResult with a futexErrno value of 0, which would cause an abort (unhandled valued in switch). Here's a stack trace from the abort: https://phabricator.fb.com/P12558008 showing the invalid futexErrno value in frame #4. Test Plan: fbconfig -r --platform-all=gcc-4.8.1-glibc-2.17 --sanitize=address tao/queues:TimeoutWorkQueueTests _bin/tao/queues/WorkQueueTests -fbunit_test_regexp '^mt\_stress\_deterministic$' Reviewed By: [email protected] FB internal diff: D1404572 Tasks: 4494871
facebook · Jun 27, 2014 · b27ed0f · b27ed0f
1 parent 8ee3ba5
commit b27ed0f
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/folly/test/DeterministicSchedule.cpp b/folly/test/DeterministicSchedule.cpp
@@ -294,6 +294,8 @@ FutexResult futexWaitUntilImpl(Futex<DeterministicAtomic>* futex,
         break;
       }
     }
+  } else {
+    futexErrno = EWOULDBLOCK;
   }
   futexLock.unlock();
   DeterministicSchedule::afterSharedAccess();