From 0f220ecae921f961f0c40395218de86cc2b33849 Mon Sep 17 00:00:00 2001 From: Graydon Hoare Date: Thu, 22 Jul 2010 15:05:35 -0700 Subject: Beat up on the preempt test a bit more, as it keeps hanging under valgrind. --- src/rt/rust_timer.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/rt/rust_timer.cpp') diff --git a/src/rt/rust_timer.cpp b/src/rt/rust_timer.cpp index bf4d18e8..9427ec67 100644 --- a/src/rt/rust_timer.cpp +++ b/src/rt/rust_timer.cpp @@ -32,10 +32,9 @@ timer_loop(void *ptr) { rust_dom *dom = timer->dom; dom->log(rust_log::TIMER, "in timer 0x%" PRIxPTR, (uintptr_t)timer); size_t ms = TIME_SLICE_IN_MS; - if (!RUNNING_ON_VALGRIND) - ms = 1; while (!timer->exit_flag) { + YIELD_C_THREAD_IF_ON_VALGRIND; #if defined(__WIN32__) Sleep(ms); #else @@ -66,8 +65,6 @@ rust_timer::rust_timer(rust_dom *dom) : pthread_attr_init(&attr); pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE); pthread_create(&thread, &attr, timer_loop, (void *)this); - if (RUNNING_ON_VALGRIND) - usleep(10000); #endif } -- cgit v1.2.3