Changeset 5715d43

Timestamp:

Aug 14, 2020, 1:29:03 PM (4 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

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

Children:

762fbc1

Parents:

4c925cd

Message:

Exceptions now get their context differently with libcfathread. Added a number of tests to help test this.

Files:

• libcfa/src/concurrency/coroutine.cfa (modified) (1 diff)
• libcfa/src/concurrency/invoke.c (modified) (2 diffs)
• libcfa/src/concurrency/invoke.h (modified) (1 diff)
• libcfa/src/exception.c (modified) (1 diff)
• tests/Makefile.am (modified) (1 diff)
• tests/exceptions/.expect/conditional-threads.txt (added)
• tests/exceptions/.expect/defaults-threads.txt (added)
• tests/exceptions/.expect/finally-threads.txt (added)
• tests/exceptions/.expect/resume-threads.txt (added)
• tests/exceptions/.expect/terminate-threads.txt (added)
• tests/exceptions/terminate.cfa (modified) (1 diff)
• tests/exceptions/with-threads.hfa (added)
• tests/linking/.expect/exception-nothreads.txt (added)
• tests/linking/.expect/exception-withthreads.txt (added)
• tests/linking/exception-nothreads.cfa (added)
• tests/linking/exception-withthreads.cfa (added)
• tests/linking/withthreads.cfa (modified) (1 diff)

libcfa/src/concurrency/coroutine.cfa

@@ -215 +215 @@
                 return cor;
         }
+
+        struct $coroutine * __cfactx_cor_active(void) {
+                return active_coroutine();
+        }
 }
 

libcfa/src/concurrency/invoke.c

@@ -29 +29 @@
 // Called from the kernel when starting a coroutine or task so must switch back to user mode.
 
+extern struct $coroutine * __cfactx_cor_active(void);
 extern struct $coroutine * __cfactx_cor_finish(void);
 extern void __cfactx_cor_leave ( struct $coroutine * );
@@ -35 +36 @@
 extern void disable_interrupts() OPTIONAL_THREAD;
 extern void enable_interrupts( __cfaabi_dbg_ctx_param );
+
+struct exception_context_t * this_exception_context() {
+        return &__get_stack( __cfactx_cor_active() )->exception_context;
+}
 
 void __cfactx_invoke_coroutine(

libcfa/src/concurrency/invoke.h

@@ -98 +98 @@
         }
 
+        struct exception_context_t * this_exception_context();
+
         // struct which calls the monitor is accepting
         struct __waitfor_mask_t {

libcfa/src/exception.c

@@ -59 +59 @@
 
 
-// Temperary global exception context. Does not work with concurency.
-static struct exception_context_t shared_stack = {NULL, NULL};
-
 // Get the current exception context.
 // There can be a single global until multithreading occurs, then each stack
-// needs its own. It will have to be updated to handle that.
-struct exception_context_t * this_exception_context() {
+// needs its own. We get this from libcfathreads (no weak attribute).
+__attribute__((weak)) struct exception_context_t * this_exception_context() {
+        static struct exception_context_t shared_stack = {NULL, NULL};
         return &shared_stack;
 }

tests/Makefile.am

@@ -163 +163 @@
         $(CFACOMPILETEST) -DERR2 -c -fsyntax-only -o $(abspath ${@})
 
+# Exception Tests
+# Test with libcfathread; it changes how storage works.
+
+exceptions/%-threads : exceptions/%.cfa $(CFACCBIN)
+        $(CFACOMPILETEST) -include exceptions/with-threads.hfa -c -o $(abspath ${@}).o
+        $(CFACCLOCAL) $($(shell echo "${@}_FLAGSLD" | sed 's/-\|\//_/g')) $(abspath ${@}).o -o $(abspath ${@})
+
 #------------------------------------------------------------------------------
 # Other targets

tests/exceptions/terminate.cfa

@@ -142 +142 @@
         }
 }
-

tests/linking/withthreads.cfa

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// nothreads.cfa --
+// withthreads.cfa --
 //
 // Author           : Thierry Delisle