Changes in tests/concurrent/preempt.cfa [7b2c8c3c:b200492]

File:

• tests/concurrent/preempt.cfa (modified) (4 diffs)

tests/concurrent/preempt.cfa

@@ -1 @@
-#include <clock.hfa>
 #include <fstream.hfa>
 #include <kernel.hfa>
@@ -23 +22 @@
 extern void __cfaabi_check_preemption();
 
-static struct {
-        volatile int counter;
-        volatile Time prev;
-        Duration durations[6];
-} globals;
+static volatile int counter = 0;
 
 thread worker_t {
         int value;
-        unsigned long long spin;
+        unsigned spin;
 };
 
@@ -40 +35 @@
 
 void main(worker_t & this) {
-        while(TEST(globals.counter < N)) {
-                if(this.spin > 50_000_000_000) abort | "Worker" | this.value | "has been spinning too long! (" | this.spin | ")";
+        while(TEST(counter < N)) {
+                if(this.spin > 100_000_000) abort | "Worker" | this.value | "has been spinning too long! (" | this.spin | ")";
                 __cfaabi_check_preemption();
-                if( (globals.counter % 7) == this.value ) {
+                if( (counter % 7) == this.value ) {
                         __cfaabi_check_preemption();
-                        #if !defined(TEST_LONG)
-                                Time now = timeHiRes();
-                                Duration diff = now - globals.prev;
-                                globals.prev = now;
-                        #endif
-                        int next = __atomic_add_fetch( &globals.counter, 1, __ATOMIC_SEQ_CST );
+                        int next = __atomic_add_fetch( &counter, 1, __ATOMIC_SEQ_CST );
                         __cfaabi_check_preemption();
-                        if( (next % 100) == 0 ) {
-                                #if !defined(TEST_LONG)
-                                        unsigned idx = next / 100;
-                                        if (idx >= 6) abort | "Idx from next is invalid: " | idx | "vs" | next;
-                                        globals.durations[idx] = diff;
-                                        if(diff > 12`s) serr | "Duration suspiciously large:" | diff;
-                                #endif
-                                printf("%d\n", (int)next);
-
-                        }
+                        if( (next % 100) == 0 ) printf("%d\n", (int)next);
                         __cfaabi_check_preemption();
                         this.spin = 0;
@@ -73 +54 @@
 int main(int argc, char* argv[]) {
         processor p;
-        globals.counter = 0;
-        globals.durations[0] = 0;
-        globals.durations[1] = 0;
-        globals.durations[2] = 0;
-        globals.durations[3] = 0;
-        globals.durations[4] = 0;
-        globals.durations[5] = 0;
         {
-                globals.prev = timeHiRes();
                 worker_t w0 = 0;
                 worker_t w1 = 1;