Changeset 97fed44 for tests/concurrent

Timestamp:

Jan 25, 2022, 4:54:35 PM (3 years ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

6b2d444, a488783, f681823

Parents:

f57f6ea0 (diff), 4fcbf26 (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

Location:

tests/concurrent

Files:

• .expect/ctor-check.txt (modified) (1 diff)
• .expect/semaphore.txt (deleted)
• .expect/spinaphore.txt (deleted)
• preempt.cfa (modified) (3 diffs)
• semaphore.cfa (deleted)
• spinaphore.cfa (deleted)

tests/concurrent/.expect/ctor-check.txt

@@ -2 +2 @@
 ?{}: function
 ... with parameters
-  lvalue reference to instance of struct Empty with body
+  this: lvalue reference to instance of struct Empty with body
 ... returning nothing
  with body

tests/concurrent/preempt.cfa

@@ +1 @@
+#include <fstream.hfa>
 #include <kernel.hfa>
 #include <thread.hfa>
@@ -25 +26 @@
 thread worker_t {
         int value;
+        unsigned spin;
 };
 
 void ?{}( worker_t & this, int value ) {
         this.value = value;
+        this.spin = 0;
 }
 
 void main(worker_t & this) {
         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( (counter % 7) == this.value ) {
@@ -40 +44 @@
                         if( (next % 100) == 0 ) printf("%d\n", (int)next);
                         __cfaabi_check_preemption();
+                        this.spin = 0;
                 }
                 __cfaabi_check_preemption();
                 KICK_WATCHDOG;
+                this.spin++;
         }
 }