mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge timer loop functions, fix win32 build broken by logger change.

Browse Source
This commit is contained in:
Graydon Hoare 2010-06-24 08:52:52 -07:00
parent 0016473117
commit 4a1f86ccd7
1 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/rt/rust_timer.cpp
View File

@ -21,55 +21,49 @@
#if defined(__WIN32__) #if defined(__WIN32__)
static DWORD WINAPI static DWORD WINAPI
win32_timer_loop(void *ptr) #elif defined(__GNUC__)
static void *
#else
#error "Platform not supported"
#endif
timer_loop(void *ptr)
{ {
// We were handed the rust_timer that owns us. // We were handed the rust_timer that owns us.
rust_timer *timer = (rust_timer *)ptr; rust_timer *timer = (rust_timer *)ptr;
rust_dom &dom = timer->dom; rust_dom &dom = timer->dom;
dom.log(LOG_TIMER, "in timer 0x%" PRIxPTR, (uintptr_t)timer); dom.log(rust_log::TIMER, "in timer 0x%" PRIxPTR, (uintptr_t)timer);
while (!timer->exit_flag) { while (!timer->exit_flag) {
#if defined(__WIN32__)
Sleep(TIME_SLICE_IN_MS); Sleep(TIME_SLICE_IN_MS);
dom.log(LOG_TIMER, #else
usleep(TIME_SLICE_IN_MS * 1000);
#endif
dom.log(rust_log::TIMER,
"timer 0x%" PRIxPTR "timer 0x%" PRIxPTR
" interrupting domain 0x%" PRIxPTR, " interrupting domain 0x%" PRIxPTR,
(uintptr_t)timer, (uintptr_t)timer,
(uintptr_t)&dom); (uintptr_t)&dom);
dom.interrupt_flag = 1; dom.interrupt_flag = 1;
} }
#if defined(__WIN32__)
ExitThread(0); ExitThread(0);
return 0;
}
#elif defined(__GNUC__)
static void *
pthread_timer_loop(void *ptr)
{
// We were handed the rust_timer that owns us.
rust_timer *timer = (rust_timer *)ptr;
rust_dom &dom(timer->dom);
while (!timer->exit_flag) {
usleep(TIME_SLICE_IN_MS * 1000);
dom.interrupt_flag = 1;
}
pthread_exit(NULL);
return 0;
}
#else #else
#error "Platform not supported" pthread_exit(NULL);
#endif #endif
return 0;
}
rust_timer::rust_timer(rust_dom &dom) : dom(dom), exit_flag(0) rust_timer::rust_timer(rust_dom &dom) : dom(dom), exit_flag(0)
{ {
dom.log(rust_log::TIMER, "creating timer for domain 0x%" PRIxPTR, &dom); dom.log(rust_log::TIMER, "creating timer for domain 0x%" PRIxPTR, &dom);
#if defined(__WIN32__) #if defined(__WIN32__)
thread = CreateThread(NULL, 0, win32_timer_loop, this, 0, NULL); thread = CreateThread(NULL, 0, timer_loop, this, 0, NULL);
dom.win32_require("CreateThread", thread != NULL); dom.win32_require("CreateThread", thread != NULL);
#else #else
pthread_attr_init(&attr); pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE); pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE);
pthread_create(&thread, &attr, pthread_timer_loop, (void *)this); pthread_create(&thread, &attr, timer_loop, (void *)this);
#endif #endif
} }