From 6d3145c04b2f6be505c44589fdb8ecbe952b4b85 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Sat, 9 May 2009 19:36:30 +0000 Subject: [PATCH] Fixed more troubles with test_cpu_pulse(). git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@964 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- src/include/threads.h | 2 +- test/test.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/include/threads.h b/src/include/threads.h index e7c56d3c7..8e3f7a782 100644 --- a/src/include/threads.h +++ b/src/include/threads.h @@ -51,7 +51,7 @@ struct Thread { cnt_t p_locks; /**< Number of nested locks.*/ #endif #if CH_DBG_THREADS_PROFILING - systime_t p_time; /**< Consumed time. + volatile systime_t p_time; /**< Consumed time. @note This field can overflow.*/ #endif /* diff --git a/test/test.c b/test/test.c index aeb2b4058..7d4e3f2b0 100644 --- a/test/test.c +++ b/test/test.c @@ -177,13 +177,18 @@ void test_wait_threads(void) { #if CH_DBG_THREADS_PROFILING void test_cpu_pulse(unsigned duration) { + systime_t start, end, now; - systime_t end = chThdSelf()->p_time + MS2ST(duration); - while (chThdSelf()->p_time < end) { + start = chThdSelf()->p_time; + end = start + MS2ST(duration); + do { + now = chThdSelf()->p_time; #if defined(WIN32) ChkIntSources(); #endif } + while (end > start ? (now >= start) && (now < end) : + (now >= start) || (now < end)); } #endif