Changes in libcfa/src/concurrency/exception.cfa [c960331:1c01c58]

File:

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

libcfa/src/concurrency/exception.cfa

@@ -10 +10 @@
 // Created On       : Mon Aug 17 10:41:00 2020
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed Oct 28 14:34:00 2020
-// Update Count     : 1
+// Last Modified On : Tue Aug 25 14:41:00 2020
+// Update Count     : 0
 //
 
-#define __cforall_thread__
+extern "C" {
+// use this define to make unwind.h play nice, definitely a hack
+#define HIDE_EXPORTS
+#include <unwind.h>
+#undef HIDE_EXPORTS
+}
 
+#include "invoke.h"
 #include "exception.hfa"
-
 #include "coroutine.hfa"
 
 extern struct $thread * mainThread;
-extern "C" {
-extern void __cfactx_thrd_leave();
-}
 
 // Common pattern for all the stop functions, wait until the end then act.
@@ -50 +52 @@
 
 STOP_AT_END_FUNCTION(thread_cancelstop,
-        __cfactx_thrd_leave();
-        __cabi_abort( "Resumed cancelled thread" );
+        // TODO: Instead pass information to the joiner.
+        abort();
 )
 
@@ -83 +85 @@
                 stop_param = (void *)0x22;
         } else {
-                this_thread->self_cor.cancellation = unwind_exception;
-
                 stop_func = thread_cancelstop;
                 stop_param = this_thread;