Changeset 50f6afb for libcfa/src/concurrency/thread.cfa

Timestamp:

Apr 24, 2021, 11:32:49 AM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

424dfc4, 986cb99

Parents:

fec63b2 (diff), 8edbe40 (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/thread.cfa (modified) (5 diffs)

libcfa/src/concurrency/thread.cfa

@@ -61 +61 @@
 }
 
-EHM_VIRTUAL_TABLE(SomeThreadCancelled, std_thread_cancelled);
-
 forall(T &)
 void copy(ThreadCancelled(T) * dst, ThreadCancelled(T) * src) {
@@ -81 +79 @@
 }
 
-static void default_thread_cancel_handler(SomeThreadCancelled & ) {
-        // Improve this error message, can I do formatting?
-        abort( "Unhandled thread cancellation.\n" );
-}
-
-forall(T & | is_thread(T) | IS_EXCEPTION(SomeThreadCancelled))
+forall(T & | is_thread(T) | IS_EXCEPTION(ThreadCancelled, (T))
+    | { _EHM_VTABLE_TYPE(ThreadCancelled)(T) & const _default_vtable; })
 void ?{}( thread_dtor_guard_t & this,
-                T & thrd, void(*cancelHandler)(SomeThreadCancelled &)) {
+                T & thrd, void(*cancelHandler)(ThreadCancelled(T) &)) {
         $monitor * m = get_monitor(thrd);
         $thread * desc = get_thread(thrd);
@@ -94 +88 @@
         // Setup the monitor guard
         void (*dtor)(T& mutex this) = ^?{};
-        bool join = cancelHandler != (void(*)(SomeThreadCancelled&))0;
+        bool join = cancelHandler != (void(*)(ThreadCancelled(T)&))0;
         (this.mg){&m, (void(*)())dtor, join};
 
@@ -108 +102 @@
         }
         desc->state = Cancelled;
-        void(*defaultResumptionHandler)(SomeThreadCancelled &) =
+        void(*defaultResumptionHandler)(ThreadCancelled(T) &) =
                 join ? cancelHandler : default_thread_cancel_handler;
 
         // TODO: Remove explitate vtable set once trac#186 is fixed.
-        SomeThreadCancelled except;
-        except.virtual_table = &std_thread_cancelled;
+        ThreadCancelled(T) except;
+        except.virtual_table = &_default_vtable;
         except.the_thread = &thrd;
         except.the_exception = __cfaehm_cancellation_exception( cancellation );
         // Why is this cast required?
-        throwResume (SomeThreadCancelled &)except;
+        throwResume (ThreadCancelled(T) &)except;
 
         except.the_exception->virtual_table->free( except.the_exception );
@@ -164 +158 @@
 
 //-----------------------------------------------------------------------------
-forall(T & | is_thread(T) | IS_RESUMPTION_EXCEPTION(SomeThreadCancelled))
+forall(T & | is_thread(T) | IS_RESUMPTION_EXCEPTION(ThreadCancelled, (T))
+    | { _EHM_VTABLE_TYPE(ThreadCancelled)(T) & const _default_vtable; })
 T & join( T & this ) {
         thread_dtor_guard_t guard = { this, defaultResumptionHandler };