Changeset 41b8ea4 for libcfa/src/concurrency/mutex.cfa

Timestamp:

Oct 7, 2020, 5:10:45 PM (4 years ago)

Author:

Fangren Yu <f37yu@…>

Branches:

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

Children:

490fb92e, 69c5c00

Parents:

2fb35df (diff), 848439f (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 into master

File:

• libcfa/src/concurrency/mutex.cfa (modified) (8 diffs)

libcfa/src/concurrency/mutex.cfa

@@ -42 +42 @@
                 append( blocked_threads, kernelTLS.this_thread );
                 unlock( lock );
-                park( __cfaabi_dbg_ctx );
+                park();
         }
         else {
@@ -65 +65 @@
         this.is_locked = (this.blocked_threads != 0);
         unpark(
-                pop_head( this.blocked_threads ) __cfaabi_dbg_ctx2
+                pop_head( this.blocked_threads )
         );
         unlock( this.lock );
@@ -97 +97 @@
                 append( blocked_threads, kernelTLS.this_thread );
                 unlock( lock );
-                park( __cfaabi_dbg_ctx );
+                park();
         }
 }
@@ -124 +124 @@
                 owner = thrd;
                 recursion_count = (thrd ? 1 : 0);
-                unpark( thrd __cfaabi_dbg_ctx2 );
+                unpark( thrd );
         }
         unlock( lock );
@@ -142 +142 @@
         lock( lock __cfaabi_dbg_ctx2 );
         unpark(
-                pop_head( this.blocked_threads ) __cfaabi_dbg_ctx2
+                pop_head( this.blocked_threads )
         );
         unlock( lock );
@@ -151 +151 @@
         while(this.blocked_threads) {
                 unpark(
-                        pop_head( this.blocked_threads ) __cfaabi_dbg_ctx2
+                        pop_head( this.blocked_threads )
                 );
         }
@@ -161 +161 @@
         append( this.blocked_threads, kernelTLS.this_thread );
         unlock( this.lock );
-        park( __cfaabi_dbg_ctx );
+        park();
 }
 
@@ -170 +170 @@
         unlock(l);
         unlock(this.lock);
-        park( __cfaabi_dbg_ctx );
+        park();
         lock(l);
 }