diff options
Diffstat (limited to 'src/usr/testcore')
| -rw-r--r-- | src/usr/testcore/kernel/taskwaittest.H | 7 | ||||
| -rw-r--r-- | src/usr/testcore/lib/synctest.H | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/src/usr/testcore/kernel/taskwaittest.H b/src/usr/testcore/kernel/taskwaittest.H index 8c59aedc7..0595d2961 100644 --- a/src/usr/testcore/kernel/taskwaittest.H +++ b/src/usr/testcore/kernel/taskwaittest.H @@ -31,9 +31,6 @@ #include <kernel/console.H> #include <kernel/timemgr.H> -#define NS_PER_SEC (1000000ull) -#define TEN_CTX_SWITCHES ((NS_PER_SEC/TimeManager::TIMESLICE_PER_SEC)*10) - class TaskWaitTest : public CxxTest::TestSuite { public: @@ -153,13 +150,13 @@ class TaskWaitTest : public CxxTest::TestSuite static void WaitSomeTime(void* retval) { - nanosleep(0,TEN_CTX_SWITCHES); + nanosleep(0,TEN_CTX_SWITCHES_NS); if (retval) task_end2(retval); } static void WaitSomeLongerTime(void* retval) { - nanosleep(0, 2*TEN_CTX_SWITCHES); + nanosleep(0, 2*TEN_CTX_SWITCHES_NS); if (retval) task_end2(retval); } diff --git a/src/usr/testcore/lib/synctest.H b/src/usr/testcore/lib/synctest.H index e8b0ef1e0..e1de74843 100644 --- a/src/usr/testcore/lib/synctest.H +++ b/src/usr/testcore/lib/synctest.H @@ -35,9 +35,6 @@ #include <kernel/timemgr.H> -#define NS_PER_SEC (1000000ull) -#define TEN_CTX_SWITCHES ((NS_PER_SEC/TimeManager::TIMESLICE_PER_SEC)*10) - class SyncTest: public CxxTest::TestSuite { public: @@ -66,7 +63,7 @@ class SyncTest: public CxxTest::TestSuite mutex_lock(&mutex); task_create(func2, this); task_create(func2, this); - nanosleep(0,TEN_CTX_SWITCHES); + nanosleep(0,TEN_CTX_SWITCHES_NS); mutex_unlock(&mutex); barrier_wait(&barrier); TS_TRACE("ALL THREADS ENDED"); @@ -95,7 +92,7 @@ class SyncTest: public CxxTest::TestSuite barrier_t * barrier = &(my->barrier); mutex_lock(mutex); - for(int i = 0; i < 100000; ++i); + nanosleep(0,TEN_CTX_SWITCHES_NS); TS_TRACE("ME FIRST"); mutex_unlock(mutex); barrier_wait(barrier); |
