Changeset 342be43 for libcfa/src/concurrency/thread.cfa

Timestamp:

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

cb25fc9

Parents:

ab8c6a6

Message:

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

File:

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

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;
 }