Changeset 27434e9 for libcfa

Timestamp:

Jun 23, 2021, 5:19:38 PM (4 years ago)

Author:

m3zulfiq <m3zulfiq@…>

Branches:

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

Children:

b6f39aa

Parents:

2b910f9 (diff), 1d71208 (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:

libcfa/src

Files:

• concurrency/locks.hfa (modified) (1 diff)
• concurrency/ready_queue.cfa (modified) (2 diffs)
• containers/array.hfa (modified) (1 diff)

libcfa/src/concurrency/locks.hfa

@@ -174 +174 @@
 };
 
+static inline void ?{}(fast_lock & this) { this.owner = 0p; }
+
 static inline bool $try_lock(fast_lock & this, $thread * thrd) {
     $thread * exp = 0p;

libcfa/src/concurrency/ready_queue.cfa

@@ -20 +20 @@
 
 
-// #define USE_RELAXED_FIFO
+#define USE_RELAXED_FIFO
 // #define USE_WORK_STEALING
-#define USE_CPU_WORK_STEALING
+// #define USE_CPU_WORK_STEALING
 
 #include "bits/defs.hfa"
@@ -760 +760 @@
                 for(i; lanes.count) {
                         unsigned long long tsc1 = ts(lanes.data[i]);
-                        unsigned long long tsc2 = rdtscl()
+                        unsigned long long tsc2 = rdtscl();
                         lanes.tscs[i].tv = min(tsc1, tsc2);
                 }

libcfa/src/containers/array.hfa

@@ -137 +137 @@
 // Base
 forall( [Nq], Sq & | sized(Sq), Tbase & )
-static inline tag(arpk(Nq, Sq, Tbase, Tbase)) enq_( tag(Tbase), tag(Nq), tag(Sq), tag(Tbase) ) {}
+static inline tag(arpk(Nq, Sq, Tbase, Tbase)) enq_( tag(Tbase), tag(Nq), tag(Sq), tag(Tbase) ) {
+    tag(arpk(Nq, Sq, Tbase, Tbase)) ret;
+    return ret;
+}
 
 // Rec
 forall( [Nq], Sq & | sized(Sq), [N], S & | sized(S), recq &, recr &, Tbase & | { tag(recr) enq_( tag(Tbase), tag(Nq), tag(Sq), tag(recq) ); } )
-static inline tag(arpk(N, S, recr, Tbase)) enq_( tag(Tbase), tag(Nq), tag(Sq), tag(arpk(N, S, recq, Tbase)) ) {}
+static inline tag(arpk(N, S, recr, Tbase)) enq_( tag(Tbase), tag(Nq), tag(Sq), tag(arpk(N, S, recq, Tbase)) ) {
+    tag(arpk(N, S, recr, Tbase)) ret;
+    return ret;
+}
 
 // Wrapper