Changeset 90152a4 for tests/concurrent/preempt.c

Timestamp:

Aug 27, 2018, 4:40:34 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

b7c89aa

Parents:

f9feab8 (diff), 305581d (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' into cleanup-dtors

File:

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

tests/concurrent/preempt.c

@@ -1 @@
-#include <kernel>
-#include <thread>
+#include <kernel.hfa>hfa>
+#include <thread.hfa>
+#include <time.hfa>
+
+#include "long_tests.h"
 
 #ifndef PREEMPTION_RATE
-#define PREEMPTION_RATE 10_000ul
+#define PREEMPTION_RATE 10`ms
 #endif
 
-unsigned int default_preemption() {
+Duration default_preemption() {
         return PREEMPTION_RATE;
 }
+
+#ifdef TEST_LONG
+static const unsigned long N = 30_000ul;
+#else
+static const unsigned long N = 500ul;
+#endif
+
+extern void __cfaabi_check_preemption();
 
 static volatile int counter = 0;
@@ -21 +32 @@
 
 void main(worker_t & this) {
-        while(counter < 1000) {
+        while(TEST(counter < N)) {
+                __cfaabi_check_preemption();
                 if( (counter % 7) == this.value ) {
+                        __cfaabi_check_preemption();
                         int next = __atomic_add_fetch_4(&counter, 1, __ATOMIC_SEQ_CST);
+                        __cfaabi_check_preemption();
                         if( (next % 100) == 0 ) printf("%d\n", (int)next);
+                        __cfaabi_check_preemption();
                 }
+                __cfaabi_check_preemption();
+                KICK_WATCHDOG;
         }
 }