Changeset b067d9b for tests/concurrent/preempt.cfa

Timestamp:

Oct 29, 2019, 4:01:24 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

773db65, 9421f3d8

Parents:

7951100 (diff), 8364209 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• tests/concurrent/preempt.cfa (moved) (moved from src/tests/concurrent/preempt.c ) (4 diffs)

tests/concurrent/preempt.cfa

@@ -1 @@
-#include <kernel>
-#include <thread>
-#include <time>
+#include <kernel.hfa>
+#include <thread.hfa>
+#include <time.hfa>
+
+#include "long_tests.hfa"
 
 #ifndef PREEMPTION_RATE
@@ -11 +13 @@
 }
 
-#ifdef LONG_TEST
+#ifdef TEST_LONG
 static const unsigned long N = 30_000ul;
 #else
@@ -30 +32 @@
 
 void main(worker_t & this) {
-        while(counter < N) {
+        while(TEST(counter < N)) {
                 __cfaabi_check_preemption();
                 if( (counter % 7) == this.value ) {
@@ -40 +42 @@
                 }
                 __cfaabi_check_preemption();
+                KICK_WATCHDOG;
         }
 }