Changeset 342be43

Timestamp:

Oct 26, 2020, 5:10:02 PM (4 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

Children:

cb25fc9

Parents:

ab8c6a6

Message:

Some exception clean-up that did not require any drastic changes.

Location:

libcfa/src

Files:

• concurrency/coroutine.cfa (modified) (3 diffs)
• concurrency/exception.cfa (modified) (1 diff)
• concurrency/exception.hfa (modified) (2 diffs)
• concurrency/thread.cfa (modified) (2 diffs)
• exception.c (modified) (2 diffs)

libcfa/src/concurrency/coroutine.cfa

@@ -49 +49 @@
 FORALL_DATA_INSTANCE(CoroutineCancelled, (dtype coroutine_t), (coroutine_t))
 
-struct __cfaehm_node {
-        struct _Unwind_Exception unwind_exception;
-        struct __cfaehm_node * next;
-        int handler_index;
-};
-
 forall(dtype T)
 void mark_exception(CoroutineCancelled(T) *) {}
@@ -60 +54 @@
 forall(dtype T)
 void copy(CoroutineCancelled(T) * dst, CoroutineCancelled(T) * src) {
+        dst->virtual_table = src->virtual_table;
         dst->the_coroutine = src->the_coroutine;
         dst->the_exception = src->the_exception;
@@ -74 +69 @@
         verify( desc->cancellation );
         desc->state = Cancelled;
-        exception_t * except = (exception_t *)(1 + (__cfaehm_node *)desc->cancellation);
+        exception_t * except = __cfaehm_cancellation_exception( desc->cancellation );
 
         // TODO: Remove explitate vtable set once trac#186 is fixed.

libcfa/src/concurrency/exception.cfa

@@ -54 +54 @@
 
 STOP_AT_END_FUNCTION(thread_cancelstop,
-    __cfactx_thrd_leave();
-    __cabi_abort( "Resumed cancelled thread" );
+        __cfactx_thrd_leave();
+        __cabi_abort( "Resumed cancelled thread" );
 )
 

libcfa/src/concurrency/exception.hfa

@@ -16 +16 @@
 #pragma once
 
+// This is an internal bridge between the two modes and must be C compatable.
+
 #include "bits/defs.hfa"
 #include "invoke.h"
@@ -31 +33 @@
                 struct _Unwind_Exception * unwind_exception ) OPTIONAL_THREAD;
 
+struct __cfaehm_node {
+        struct _Unwind_Exception unwind_exception;
+        struct __cfaehm_node * next;
+        int handler_index;
+};
+
+static inline exception_t * __cfaehm_cancellation_exception(
+                struct _Unwind_Exception * unwind_exception ) {
+        return (exception_t *)(1 + (struct __cfaehm_node *)unwind_exception);
+}
+
 #ifdef __cforall
 #undef HIDE_EXPORTS

libcfa/src/concurrency/thread.cfa

@@ -73 +73 @@
 }
 
-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) & ) {
@@ -91 +85 @@
         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;
+        // After the guard set-up and any wait, check for cancellation.
+        $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 = __cfaehm_cancellation_exception( cancellation );
+        throwResume except;
+
+        except.the_exception->virtual_table->free( except.the_exception );
+        free( cancellation );
+        desc->self_cor.cancellation = 0p;
 }
 

libcfa/src/exception.c

@@ -24 +24 @@
 #include <bits/debug.hfa>
 #include "concurrency/invoke.h"
+#include "concurrency/exception.hfa"
 #include "stdhdr/assert.h"
 
@@ -113 +114 @@
 
 // MEMORY MANAGEMENT =========================================================
-
-struct __cfaehm_node {
-        struct _Unwind_Exception unwind_exception;
-        struct __cfaehm_node * next;
-        int handler_index;
-};
 
 #define NODE_TO_EXCEPT(node) ((exception_t *)(1 + (node)))