Fix spurious wakeup causing thread to exit early on 32-bit Windows

This commit is contained in:
Kevin Wojniak 2016-06-19 17:33:28 -07:00
parent 685a681b7e
commit a143f3d408
1 changed files with 8 additions and 4 deletions

View File

@ -12,8 +12,8 @@ using namespace std;
uiMultilineEntry *e; uiMultilineEntry *e;
condition_variable cv; condition_variable cv;
mutex m; mutex m;
unique_lock<mutex> ourlock(m);
thread *timeThread; thread *timeThread;
bool quitting = false;
void sayTime(void *data) void sayTime(void *data)
{ {
@ -25,12 +25,16 @@ void sayTime(void *data)
void threadproc(void) void threadproc(void)
{ {
ourlock.lock(); while (!quitting) {
while (cv.wait_for(ourlock, chrono::seconds(1)) == cv_status::timeout) {
time_t t; time_t t;
char *base; char *base;
char *s; char *s;
{
unique_lock<mutex> ourlock(m);
(void)cv.wait_for(ourlock, chrono::seconds(1));
}
t = time(NULL); t = time(NULL);
base = ctime(&t); base = ctime(&t);
s = new char[strlen(base) + 1]; s = new char[strlen(base) + 1];
@ -41,6 +45,7 @@ void threadproc(void)
int onClosing(uiWindow *w, void *data) int onClosing(uiWindow *w, void *data)
{ {
quitting = true;
cv.notify_all(); cv.notify_all();
// C++ throws a hissy fit if you don't do this // C++ throws a hissy fit if you don't do this
// we might as well, to ensure no uiQueueMain() gets in after uiQuit() // we might as well, to ensure no uiQueueMain() gets in after uiQuit()
@ -82,7 +87,6 @@ int main(void)
uiBoxAppend(b, uiControl(e), 1); uiBoxAppend(b, uiControl(e), 1);
// timeThread needs to lock ourlock itself - see http://stackoverflow.com/a/34121629/3408572 // timeThread needs to lock ourlock itself - see http://stackoverflow.com/a/34121629/3408572
ourlock.unlock();
timeThread = new thread(threadproc); timeThread = new thread(threadproc);
uiWindowOnClosing(w, onClosing, NULL); uiWindowOnClosing(w, onClosing, NULL);