Changeset 44940ee for libcfa/src/concurrency/monitor.cfa

Timestamp:

Feb 25, 2026, 12:56:30 AM (27 hours ago)

Author:

Matthew Au-Yeung <mw2auyeu@…>

Branches:

stuck-waitfor-destruct

Children:

88bb0b4

Parents:

a0548c2

Message:

Revert "Add a generated hash to fix stuck waitfor comparing static inline mutex destructors"

This reverts commit a30fceb1a73c4ef2bbee39a2b5406da881f51111.

File:

• libcfa/src/concurrency/monitor.cfa (modified) (7 diffs)

libcfa/src/concurrency/monitor.cfa

@@ -140 +140 @@
 }
 
-static void __dtor_enter( monitor$ * this, fptr_t func, func_id_t func_id, bool join ) {
+static void __dtor_enter( monitor$ * this, fptr_t func, bool join ) {
         thread$ * thrd = active_thread();
         #if defined( __CFA_WITH_VERIFY__ )
@@ -190 +190 @@
         __lock_size_t count = 1;
         monitor$ ** monitors = &this;
-        __monitor_group_t group = { &this, 1, func, func_id };
+        __monitor_group_t group = { &this, 1, func };
         if ( is_accepted( this, group) ) {
                 __cfaabi_dbg_print_safe( "Kernel : mon accepts dtor, block and signal it \n" );
@@ -341 +341 @@
 // Ctor for monitor guard
 // Sorts monitors before entering
-void ?{}( monitor_guard_t & this, monitor$ * m [], __lock_size_t count, fptr_t func, func_id_t func_id ) libcfa_public {
+void ?{}( monitor_guard_t & this, monitor$ * m [], __lock_size_t count, fptr_t func ) libcfa_public {
         thread$ * thrd = active_thread();
 
@@ -355 +355 @@
 
         // Update thread context (needed for conditions)
-        (thrd->monitors){m, count, func, func_id};
+        (thrd->monitors){m, count, func};
 
         // __cfaabi_dbg_print_safe( "MGUARD : enter %d\n", count);
 
         // Enter the monitors in order
-        __monitor_group_t group = {this.m, this.count, func, func_id};
+        __monitor_group_t group = {this.m, this.count, func};
         enter( group );
 
@@ -367 +367 @@
 
 void ?{}( monitor_guard_t & this, monitor$ * m [], __lock_size_t count ) libcfa_public {
-        this{ m, count, 0p, 0 };
+        this{ m, count, 0p };
 }
 
@@ -386 +386 @@
 // Ctor for monitor guard
 // Sorts monitors before entering
-void ?{}( monitor_dtor_guard_t & this, monitor$ * m [], fptr_t func, func_id_t func_id, bool join ) libcfa_public {
+void ?{}( monitor_dtor_guard_t & this, monitor$ * m [], fptr_t func, bool join ) libcfa_public {
         // optimization
         thread$ * thrd = active_thread();
@@ -400 +400 @@
 
         // Update thread context (needed for conditions)
-        (thrd->monitors){m, 1, func, func_id};
-
-        __dtor_enter( this.m, func, func_id, join );
+        (thrd->monitors){m, 1, func};
+
+        __dtor_enter( this.m, func, join );
 }