Changes in tests/concurrent/preempt.cfa [8e5e945:b200492]

File:

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

tests/concurrent/preempt.cfa

@@ -1 @@
-#include <clock.hfa>
 #include <fstream.hfa>
 #include <kernel.hfa>
@@ -19 +18 @@
 #else
 static const unsigned long N = 500ul;
-static volatile Time prev;
-static Duration preempt_durations[6] = { 0 };
 #endif
 
@@ -29 +26 @@
 thread worker_t {
         int value;
-        unsigned long long spin;
+        unsigned spin;
 };
 
@@ -39 +36 @@
 void main(worker_t & this) {
         while(TEST(counter < N)) {
-                if(this.spin > 50_000_000_000) abort | "Worker" | this.value | "has been spinning too long! (" | this.spin | ")";
+                if(this.spin > 100_000_000) abort | "Worker" | this.value | "has been spinning too long! (" | this.spin | ")";
                 __cfaabi_check_preemption();
                 if( (counter % 7) == this.value ) {
                         __cfaabi_check_preemption();
-                        #if !defined(TEST_LONG)
-                                Time now = timeHiRes();
-                                Duration diff = now - prev;
-                                prev = now;
-                        #endif
                         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;
-                                        preempt_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;
@@ -72 +55 @@
         processor p;
         {
-                prev = timeHiRes();
                 worker_t w0 = 0;
                 worker_t w1 = 1;