Changeset f5a51db for tests/concurrent/preempt.cfa

Timestamp:

Feb 8, 2022, 11:53:13 AM (4 years ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum

Children:

cc7bbe6

Parents:

97c215f (diff), 1cf8a9f (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 (modified) (3 diffs)

tests/concurrent/preempt.cfa

@@ +1 @@
+#include <clock.hfa>
+#include <fstream.hfa>
 #include <kernel.hfa>
 #include <thread.hfa>
@@ -21 +23 @@
 extern void __cfaabi_check_preemption();
 
-static volatile int counter = 0;
+static struct {
+        volatile int counter;
+        volatile Time prev;
+        Duration durations[6];
+} globals;
 
 thread worker_t {
         int value;
+        unsigned long long spin;
 };
 
 void ?{}( worker_t & this, int value ) {
         this.value = value;
+        this.spin = 0;
 }
 
 void main(worker_t & this) {
-        while(TEST(counter < N)) {
+        while(TEST(globals.counter < N)) {
+                if(this.spin > 50_000_000_000) abort | "Worker" | this.value | "has been spinning too long! (" | this.spin | ")";
                 __cfaabi_check_preemption();
-                if( (counter % 7) == this.value ) {
+                if( (globals.counter % 7) == this.value ) {
                         __cfaabi_check_preemption();
-                        int next = __atomic_add_fetch( &counter, 1, __ATOMIC_SEQ_CST );
+                        #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 );
                         __cfaabi_check_preemption();
-                        if( (next % 100) == 0 ) printf("%d\n", (int)next);
+                        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);
+
+                        }
                         __cfaabi_check_preemption();
+                        this.spin = 0;
                 }
                 __cfaabi_check_preemption();
                 KICK_WATCHDOG;
+                this.spin++;
         }
 }
@@ -48 +73 @@
 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;