Changeset db4062d for src/tests/concurrent/preempt.c

Timestamp:

Jun 20, 2018, 8:42:37 AM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, with_gc

Children:

4439008

Parents:

e04aec4 (diff), 270fdcf (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:

• src/tests/concurrent/preempt.c (modified) (4 diffs)

src/tests/concurrent/preempt.c

@@ -2 +2 @@
 #include <thread>
 #include <time>
+
+#include "long_tests.h"
 
 #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;
         }
 }