Changeset e5d9274 for libcfa/src/concurrency/locks.cfa

Timestamp:

Jun 2, 2022, 3:11:21 PM (23 months ago)

Author:

caparsons <caparson@…>

Branches:

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

Children:

ced5e2a

Parents:

015925a (diff), fc134a48 (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:

• libcfa/src/concurrency/locks.cfa (modified) (9 diffs)

libcfa/src/concurrency/locks.cfa

@@ -24 +24 @@
 #include <stdlib.hfa>
 
+#pragma GCC visibility push(default)
+
 //-----------------------------------------------------------------------------
 // info_thread
@@ -116 +118 @@
 }
 
-void pop_and_set_new_owner( blocking_lock & this ) with( this ) {
+static void pop_and_set_new_owner( blocking_lock & this ) with( this ) {
         thread$ * t = &try_pop_front( blocked_threads );
         owner = t;
@@ -264 +266 @@
         void ^?{}( alarm_node_wrap(L) & this ) { }
 
-        void timeout_handler ( alarm_node_wrap(L) & this ) with( this ) {
+        static void timeout_handler ( alarm_node_wrap(L) & this ) with( this ) {
                 // This condition_variable member is called from the kernel, and therefore, cannot block, but it can spin.
                 lock( cond->lock __cfaabi_dbg_ctx2 );
@@ -288 +290 @@
 
         // this casts the alarm node to our wrapped type since we used type erasure
-        void alarm_node_wrap_cast( alarm_node_t & a ) { timeout_handler( (alarm_node_wrap(L) &)a ); }
+        static void alarm_node_wrap_cast( alarm_node_t & a ) { timeout_handler( (alarm_node_wrap(L) &)a ); }
 }
 
@@ -305 +307 @@
         void ^?{}( condition_variable(L) & this ){ }
 
-        void process_popped( condition_variable(L) & this, info_thread(L) & popped ) with( this ) {
+        static void process_popped( condition_variable(L) & this, info_thread(L) & popped ) with( this ) {
                 if(&popped != 0p) {
                         popped.signalled = true;
@@ -350 +352 @@
         int counter( condition_variable(L) & this ) with(this) { return count; }
 
-        size_t queue_and_get_recursion( condition_variable(L) & this, info_thread(L) * i ) with(this) {
+        static size_t queue_and_get_recursion( condition_variable(L) & this, info_thread(L) * i ) with(this) {
                 // add info_thread to waiting queue
                 insert_last( blocked_threads, *i );
@@ -363 +365 @@
 
         // helper for wait()'s' with no timeout
-        void queue_info_thread( condition_variable(L) & this, info_thread(L) & i ) with(this) {
+        static void queue_info_thread( condition_variable(L) & this, info_thread(L) & i ) with(this) {
                 lock( lock __cfaabi_dbg_ctx2 );
                 size_t recursion_count = queue_and_get_recursion(this, &i);
@@ -380 +382 @@
 
         // helper for wait()'s' with a timeout
-        void queue_info_thread_timeout( condition_variable(L) & this, info_thread(L) & info, Duration t, Alarm_Callback callback ) with(this) {
+        static void queue_info_thread_timeout( condition_variable(L) & this, info_thread(L) & info, Duration t, Alarm_Callback callback ) with(this) {
                 lock( lock __cfaabi_dbg_ctx2 );
                 size_t recursion_count = queue_and_get_recursion(this, &info);
@@ -415 +417 @@
         // fast_cond_var
         void  ?{}( fast_cond_var(L) & this ){
-                this.blocked_threads{}; 
+                this.blocked_threads{};
                 #ifdef __CFA_DEBUG__
                 this.lock_used = 0p;