Changeset 86601a5

Timestamp:

Jun 21, 2022, 11:56:57 AM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

b0be3713

Parents:

5a96b36 (diff), 1dbbef6 (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/unified_locking/mutex_test.hfa (modified) (4 diffs)

tests/unified_locking/mutex_test.hfa

@@ -22 +22 @@
 }
 
-uint32_t cs() {
+uint32_t cs(uint32_t & entries) {
         thread$ * me = active_thread();
         uint32_t value;
         lock(mo.l);
         {
+                entries++;
                 uint32_t tsum = mo.sum;
                 uint32_t cnt = mo.cnt;
@@ -42 +43 @@
 thread LockCheck {
         uint32_t sum;
+        uint32_t entries;
 };
 
 void main(LockCheck & this) {
         this.sum = 0;
+        this.entries = 0;
         for(num_times) {
                 trash();
-                this.sum += cs();
+                this.sum += cs( this.entries );
                 trash();
                 yield(random(10));
@@ -58 +61 @@
         mo.sum = -32;
         mo.cnt = 0;
+        uint32_t real_entries = 0;
         processor p[2];
         sout | "Starting";
@@ -63 +67 @@
                 LockCheck checkers[13];
                 for(i;13) {
-                        sum += join(checkers[i]).sum;
+                        LockCheck & curr = join(checkers[i]);
+                        sum += curr.sum;
+                        real_entries += curr.entries;
                 }
         }
         sout | "Done!";
-        if(mo.cnt != (13 * num_times)) sout | "Invalid cs count!" | mo.cnt | "vs "| (13 * num_times) | "(13 *" | num_times | ')';
+        if(real_entries != (13 * num_times)) sout | "Invalid real cs count!" | mo.cnt | "vs "| (13 * num_times) | "(13 *" | num_times | ')';
+        if(mo.cnt != (13 * num_times)) sout | "Invalid concurrent cs count!" | mo.cnt | "vs "| (13 * num_times) | "(13 *" | num_times | ')';
         if(sum == mo.sum) sout | "Match!";
         else sout | "No Match!" | sum | "vs" | mo.sum;