Changeset a9ce782 for libcfa/src/concurrency/invoke.h

Timestamp:

Feb 7, 2026, 1:40:26 PM (26 hours ago)

Author:

Matthew Au-Yeung <mw2auyeu@…>

Branches:

stuck-waitfor-destruct

Parents:

c7d106a

git-author:

Matthew Au-Yeung <mw2auyeu@…> (02/07/26 13:40:05)

git-committer:

Matthew Au-Yeung <mw2auyeu@…> (02/07/26 13:40:26)

Message:

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

File:

• libcfa/src/concurrency/invoke.h (modified) (4 diffs)

libcfa/src/concurrency/invoke.h

@@ -159 +159 @@
                 // last function that acquired monitors
                 fptr_t func;
+
+                // hash-based function identity for cross-TU matching
+                func_id_t func_id;
         };
 
@@ -288 +291 @@
                         (this.size){0};
                         (this.func){NULL};
-                }
-
-                static inline void ?{}(__monitor_group_t & this, struct monitor$ ** data, __lock_size_t size, fptr_t func) {
+                        (this.func_id){0};
+                }
+
+                static inline void ?{}(__monitor_group_t & this, struct monitor$ ** data, __lock_size_t size, fptr_t func, func_id_t func_id) {
                         (this.data){data};
                         (this.size){size};
                         (this.func){func};
+                        (this.func_id){func_id};
                 }
 
@@ -299 +304 @@
                         if( (lhs.data != 0) != (rhs.data != 0) ) return false;
                         if( lhs.size != rhs.size ) return false;
-                        if( lhs.func != rhs.func ) return false;
+                        // Use hash-based comparison when both sides have a valid func_id,
+                        // otherwise fall back to function pointer comparison (for library code
+                        // like join() that cannot compute the hash at compile time).
+                        if( lhs.func_id != 0 && rhs.func_id != 0 ) {
+                                if( lhs.func_id != rhs.func_id ) return false;
+                        } else {
+                                if( lhs.func != rhs.func ) return false;
+                        }
 
                         // Check that all the monitors match
@@ -314 +326 @@
                         lhs.size = rhs.size;
                         lhs.func = rhs.func;
+                        lhs.func_id = rhs.func_id;
                 }
         }