[compiler-rt] r275946 - [esan] Fix sideline thread flaky assert

[Derek Bruening via llvm-commits]

Author: bruening
Date: Tue Jul 19 00:03:38 2016
New Revision: 275946

URL: http://llvm.org/viewvc/llvm-project?rev=275946&view=rev
Log:
[esan] Fix sideline thread flaky assert

Fixes an esan sideline thread CHECK that failed to account for the sideline
thread reaching its code before the internal_clone() return value was
assigned in the parent.

Modified:
    compiler-rt/trunk/lib/esan/esan_sideline_linux.cpp

Modified: compiler-rt/trunk/lib/esan/esan_sideline_linux.cpp
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/esan/esan_sideline_linux.cpp?rev=275946&r1=275945&r2=275946&view=diff
==============================================================================
--- compiler-rt/trunk/lib/esan/esan_sideline_linux.cpp (original)
+++ compiler-rt/trunk/lib/esan/esan_sideline_linux.cpp Tue Jul 19 00:03:38 2016
@@ -31,6 +31,7 @@ namespace __esan {
 
 static const int SigAltStackSize = 4*1024;
 static const int SidelineStackSize = 4*1024;
+static const uptr SidelineIdUninitialized = 1;
 
 // FIXME: we'll need some kind of TLS (can we trust that a pthread key will
 // work in our non-POSIX thread?) to access our data in our signal handler
@@ -113,6 +114,10 @@ bool SidelineThread::launchThread(Sideli
 
   // We do without a guard page.
   Stack = static_cast<char*>(MmapOrDie(SidelineStackSize, "SidelineStack"));
+  // We need to handle the return value from internal_clone() not having been
+  // assigned yet (for our CHECK in adjustTimer()) so we ensure this has a
+  // sentinel value.
+  SidelineId = SidelineIdUninitialized;
   // By omitting CLONE_THREAD, the child is in its own thread group and will not
   // receive any of the application's signals.
   SidelineId = internal_clone(
@@ -151,7 +156,9 @@ bool SidelineThread::joinThread() {
 
 // Must be called from the sideline thread itself.
 bool SidelineThread::adjustTimer(u32 FreqMilliSec) {
-  CHECK(internal_getpid() == SidelineId);
+  // The return value of internal_clone() may not have been assigned yet:
+  CHECK(internal_getpid() == SidelineId ||
+        SidelineId == SidelineIdUninitialized);
   Freq = FreqMilliSec;
   struct itimerval TimerVal;
   TimerVal.it_interval.tv_sec = (time_t) Freq / 1000;