dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Preempt works on non-windows, just needed a little valgrind love to complete in a reasonable time.

This commit is contained in:
Graydon Hoare 2010-07-04 21:18:47 -07:00
parent f2861448ab
commit 2a413070c6
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Makefile
View File

@ -483,9 +483,6 @@ TEST_XFAILS_LLVM := $(addprefix test/run-pass/, \
ifdef CFG_WINDOWSY
TEST_XFAILS_X86 += test/run-pass/native-mod.rc
TEST_XFAILS_LLVM += test/run-pass/native-mod.rc
else
TEST_XFAILS_X86 += test/run-pass/preempt.rs
TEST_XFAILS_LLVM += test/run-pass/preempt.rs
endif
RPASS_RC := $(wildcard test/run-pass/*.rc)

12
src/rt/rust_timer.cpp
View File

@ -1,5 +1,6 @@
#include "rust_internal.h"
#include "valgrind.h"
// The mechanism in this file is very crude; every domain (thread) spawns its
// own secondary timer thread, and that timer thread *never idles*. It
@ -32,11 +33,15 @@ timer_loop(void *ptr)
rust_timer *timer = (rust_timer *)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) {
#if defined(__WIN32__)
Sleep(TIME_SLICE_IN_MS);
Sleep(ms);
#else
usleep(TIME_SLICE_IN_MS * 1000);
usleep(ms * 1000);
#endif
dom.log(rust_log::TIMER,
"timer 0x%" PRIxPTR
@ -65,6 +70,9 @@ rust_timer::rust_timer(rust_dom &dom) : dom(dom), exit_flag(0)
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE);
pthread_create(&thread, &attr, timer_loop, (void *)this);
#endif
if (RUNNING_ON_VALGRIND) {
usleep(10000);
}
}
rust_timer::~rust_timer()