diff options
| author | Graydon Hoare <[email protected]> | 2010-07-22 15:05:35 -0700 |
|---|---|---|
| committer | Graydon Hoare <[email protected]> | 2010-07-22 15:05:35 -0700 |
| commit | 0f220ecae921f961f0c40395218de86cc2b33849 (patch) | |
| tree | e575036b7ab1d6b0031268aa854f52f55261d7c4 /src/rt/rust_upcall.cpp | |
| parent | Re-introduce bits of vec-lib test that blocked on now-fixed issue #108. (diff) | |
| download | rust-0f220ecae921f961f0c40395218de86cc2b33849.tar.xz rust-0f220ecae921f961f0c40395218de86cc2b33849.zip | |
Beat up on the preempt test a bit more, as it keeps hanging under valgrind.
Diffstat (limited to 'src/rt/rust_upcall.cpp')
| -rw-r--r-- | src/rt/rust_upcall.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/rt/rust_upcall.cpp b/src/rt/rust_upcall.cpp index 1aaf89fb..e931fc9b 100644 --- a/src/rt/rust_upcall.cpp +++ b/src/rt/rust_upcall.cpp @@ -1,21 +1,24 @@ #include "rust_internal.h" +#include "valgrind.h" // Upcalls. #ifdef __GNUC__ #define LOG_UPCALL_ENTRY(task) \ + YIELD_C_THREAD_IF_ON_VALGRIND; \ (task)->dom->get_log().reset_indent(0); \ (task)->log(rust_log::UPCALL, \ "> UPCALL %s - task: 0x%" PRIxPTR \ - " retpc: x%" PRIxPTR, \ + " retpc: x%" PRIxPTR, \ __FUNCTION__, \ (task), __builtin_return_address(0)); \ (task)->dom->get_log().indent(); #else #define LOG_UPCALL_ENTRY(task) \ + YIELD_C_THREAD_IF_ON_VALGRIND; \ (task)->dom->get_log().reset_indent(0); \ (task)->log(rust_log::UPCALL, \ - "> UPCALL task: x%" PRIxPTR (task)); \ + "> UPCALL task: x%" PRIxPTR (task)); \ (task)->dom->get_log().indent(); #endif |