maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[Tsan] Fix the signal_recursive.cc test to pass on systems with high loads 

Differential Revision: http://reviews.llvm.org/D6504

llvm-svn: 224030
This commit is contained in:
Viktor Kutuzov 2014-12-11 17:42:29 +00:00
parent 71bc507c4f
commit bf3d446528
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compiler-rt/test/tsan/process_sleep.h Normal file
View File

@ -0,0 +1,7 @@
#include <time.h>
static void process_sleep(int sec) {
clock_t beg = clock();
while((clock() - beg) / CLOCKS_PER_SEC < sec)
usleep(100);
}

27
compiler-rt/test/tsan/signal_recursive.cc
View File

@ -11,6 +11,8 @@
#include <stdlib.h>
#include <stdio.h>
#include "process_sleep.h"
static const int kSigSuspend = SIGUSR1;
static const int kSigRestart = SIGUSR2;
static sigset_t g_suspend_handler_mask;
@ -59,33 +61,30 @@ static void RestartHandler(int sig) {
}
static void StopWorld(pthread_t thread) {
int result = pthread_kill(thread, kSigSuspend);
if (result != 0)
if (pthread_kill(thread, kSigSuspend) != 0)
fail("pthread_kill failed");
while ((result = sem_wait(&g_thread_suspend_ack_sem)) != 0) {
if (result != EINTR) {
while (sem_wait(&g_thread_suspend_ack_sem) != 0) {
if (errno != EINTR)
fail("sem_wait failed");
}
}
}
static void StartWorld(pthread_t thread) {
int result = pthread_kill(thread, kSigRestart);
if (result != 0)
if (pthread_kill(thread, kSigRestart) != 0)
fail("pthread_kill failed");
while ((result = sem_wait(&g_thread_suspend_ack_sem)) != 0) {
if (result != EINTR) {
while (sem_wait(&g_thread_suspend_ack_sem) != 0) {
if (errno != EINTR)
fail("sem_wait failed");
}
}
}
static void CollectGarbage(pthread_t thread) {
StopWorld(thread);
// Walk stacks
StartWorld(thread);
process_sleep(1);
StartWorld(thread);
}
static void Init() {
@ -118,9 +117,11 @@ void* BusyThread(void *arg) {
int main(int argc, const char *argv[]) {
Init();
pthread_t busy_thread;
pthread_create(&busy_thread, NULL, &BusyThread, NULL);
if (pthread_create(&busy_thread, NULL, &BusyThread, NULL) != 0)
fail("pthread_create failed");
CollectGarbage(busy_thread);
pthread_join(busy_thread, 0);
if (pthread_join(busy_thread, 0) != 0)
fail("pthread_join failed");
fprintf(stderr, "DONE\n");
return 0;
}