Changeset ab8c6a6 for libcfa/src/concurrency/thread.cfa

Timestamp:

Oct 26, 2020, 12:17:28 PM (6 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

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

Children:

342be43

Parents:

912cc7d7

Message:

Thread Cancellation, a test for it and a required fix to Specialization.

File:

• libcfa/src/concurrency/thread.cfa (modified) (3 diffs)

libcfa/src/concurrency/thread.cfa

@@ -19 +19 @@
 
 #include "kernel_private.hfa"
+#include "exception.hfa"
 
 #define __CFA_INVOKE_PRIVATE__
@@ -58 +59 @@
 }
 
+FORALL_DATA_INSTANCE(ThreadCancelled, (dtype thread_t), (thread_t))
+
+forall(dtype T)
+void copy(ThreadCancelled(T) * dst, ThreadCancelled(T) * src) {
+        dst->virtual_table = src->virtual_table;
+        dst->the_thread = src->the_thread;
+        dst->the_exception = src->the_exception;
+}
+
+forall(dtype T)
+const char * msg(ThreadCancelled(T) *) {
+        return "ThreadCancelled";
+}
+
+struct __cfaehm_node {
+        struct _Unwind_Exception unwind_exception;
+        struct __cfaehm_node * next;
+        int handler_index;
+};
+
+forall(dtype T)
+static void default_thread_cancel_handler(ThreadCancelled(T) & ) {
+        abort( "Unhandled thread cancellation.\n" );
+}
+
+forall(dtype T | is_thread(T) | IS_EXCEPTION(ThreadCancelled, (T)))
+void ?{}( thread_dtor_guard_t & this,
+                T & thrd, void(*defaultResumptionHandler)(ThreadCancelled(T) &)) {
+        $monitor * m = get_monitor(thrd);
+        void (*dtor)(T& mutex this) = ^?{};
+        bool join = defaultResumptionHandler != (void(*)(ThreadCancelled(T)&))0;
+        (this.mg){&m, (void(*)())dtor, join};
+        {
+                $thread * desc = get_thread(thrd);
+                struct _Unwind_Exception * cancellation = desc->self_cor.cancellation;
+                if ( likely(0p == cancellation) ) {
+                        return;
+                } else if ( Cancelled == desc->state ) {
+                        return;
+                }
+                desc->state = Cancelled;
+                if (!join) {
+                        defaultResumptionHandler = default_thread_cancel_handler;
+                }
+                ThreadCancelled(T) except;
+                // TODO: Remove explitate vtable set once trac#186 is fixed.
+                except.virtual_table = &get_exception_vtable(&except);
+                except.the_thread = &thrd;
+                except.the_exception = (exception_t *)(1 + (__cfaehm_node *)cancellation);
+                throwResume except;
+
+                except.the_exception->virtual_table->free( except.the_exception );
+                free( cancellation );
+                desc->self_cor.cancellation = 0p;
+        }
+}
+
+void ^?{}( thread_dtor_guard_t & this ) {
+        ^(this.mg){};
+}
+
 //-----------------------------------------------------------------------------
 // Starting and stopping threads
@@ -93 +155 @@
 }
 
+//-----------------------------------------------------------------------------
+forall(dtype T | is_thread(T) | IS_RESUMPTION_EXCEPTION(ThreadCancelled, (T)))
+T & join( T & this ) {
+        thread_dtor_guard_t guard = { this, defaultResumptionHandler };
+        return this;
+}
+
 // Local Variables: //
 // mode: c //