Changeset d83b266 for tests/unified_locking/fast.cfa

Timestamp:

Jul 26, 2021, 2:42:34 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

0a061c0

Parents:

c86ee4c (diff), 98233b3 (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/fast.cfa (modified) (1 diff)

tests/unified_locking/fast.cfa

@@ -1 @@
-#include <fstream.hfa>
 #include <locks.hfa>
-#include <thread.hfa>
 
-const unsigned int num_times = 50;
-
-struct MutexObj {
-        fast_lock l;
-        thread$ * id;
-        uint32_t sum;
-};
-
-MutexObj mo;
-
-void trash() {
-        unsigned t[100];
-        for(i; 100) {
-                t[i] = 0xDEADBEEF;
-        }
-}
-
-uint32_t cs() {
-        thread$ * me = active_thread();
-        uint32_t value;
-        lock(mo.l);
-        {
-                uint32_t tsum = mo.sum;
-                mo.id = me;
-                yield(random(5));
-                value = ((uint32_t)random()) ^ ((uint32_t)me);
-                if(mo.id != me) sout | "Intruder!";
-                mo.sum = tsum + value;
-        }
-        unlock(mo.l);
-        return value;
-}
-
-thread LockCheck {
-        uint32_t sum;
-};
-
-void main(LockCheck & this) {
-        this.sum = 0;
-        for(num_times) {
-                trash();
-                this.sum += cs();
-                trash();
-                yield(random(10));
-        }
-}
+#define LOCK fast_lock
+#include "mutex_test.hfa"
 
 int main() {
-        uint32_t sum = -32;
-        mo.sum = -32;
-        processor p[2];
-        sout | "Starting";
-        {
-                LockCheck checkers[13];
-                for(i;13) {
-                        sum += join(checkers[i]).sum;
-                }
-        }
-        sout | "Done!";
-        if(sum == mo.sum) sout | "Match!";
-        else sout | "No Match!" | sum | "vs" | mo.sum;
+    test();
 }