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

Timestamp:

Feb 25, 2026, 12:56:30 AM (2 days 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/thread.cfa (modified) (4 diffs)

libcfa/src/concurrency/thread.cfa

@@ -61 +61 @@
 
         doregister(curr_cluster, this);
-        monitors{ &self_mon_p, 1, (fptr_t)0, (func_id_t)0 };
+        monitors{ &self_mon_p, 1, (fptr_t)0 };
 }
 
@@ -93 +93 @@
     | { EHM_DEFAULT_VTABLE(ThreadCancelled(T)); })
 void ?{}( thread_dtor_guard_t & this,
-                T & thrd, func_id_t func_id, void(*cancelHandler)(ThreadCancelled(T) &)) {
+                T & thrd, void(*cancelHandler)(ThreadCancelled(T) &)) {
         monitor$ * m = get_monitor(thrd);
         thread$ * desc = get_thread(thrd);
@@ -100 +100 @@
         void (*dtor)(T& mutex this) = ^?{};
         bool join = cancelHandler != (void(*)(ThreadCancelled(T)&))0;
-        this.func_id = func_id;
-        (this.mg){&m, (void(*)())dtor, func_id, join};
+        (this.mg){&m, (void(*)())dtor, join};
 
 
@@ -173 +172 @@
         | { EHM_DEFAULT_VTABLE(ThreadCancelled(T)); })
 T & join( T & this ) {
-        thread_dtor_guard_t guard = { this, (func_id_t)0, defaultResumptionHandler };
+        thread_dtor_guard_t guard = { this, defaultResumptionHandler };
         return this;
 }