Changeset 695571c for src/libcfa/concurrency

Timestamp:

Feb 7, 2018, 9:59:03 AM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

0723a57, 5f4f31f

Parents:

10f8142 (diff), a424315d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

Location:

src/libcfa/concurrency

Files:

• invoke.c (modified) (3 diffs)
• kernel.c (modified) (2 diffs)
• preemption.c (modified) (3 diffs)

src/libcfa/concurrency/invoke.c

@@ -10 +10 @@
 // Created On       : Tue Jan 17 12:27:26 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jan 23 14:04:56 2018
-// Update Count     : 2
+// Last Modified On : Tue Feb  6 23:00:57 2018
+// Update Count     : 3
 //
 
@@ -51 +51 @@
         //Final suspend, should never return
         __leave_coroutine();
-        abortf("Resumed dead coroutine");
+        abortf( "Resumed dead coroutine" );
 }
 
@@ -81 +81 @@
         //Final suspend, should never return
         __leave_thread_monitor( thrd );
-        abortf("Resumed dead thread");
+        abortf( "Resumed dead thread" );
 }
 

src/libcfa/concurrency/kernel.c

@@ -10 +10 @@
 // Created On       : Tue Jan 17 12:27:26 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Dec  8 16:23:33 2017
-// Update Count     : 3
+// Last Modified On : Tue Feb  6 21:51:26 2018
+// Update Count     : 4
 //
 
@@ -588 +588 @@
 }
 
+int kernel_abort_lastframe( void ) __attribute__ ((__nothrow__)) {
+        return get_coroutine(this_thread) == get_coroutine(mainThread) ? 4 : 2;
+}
+
 extern "C" {
         void __cfaabi_dbg_bits_acquire() {

src/libcfa/concurrency/preemption.c

@@ -10 +10 @@
 // Created On       : Mon Jun 5 14:20:42 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jan 23 17:59:30 2018
-// Update Count     : 7
+// Last Modified On : Tue Feb  6 15:00:36 2018
+// Update Count     : 10
 //
 
@@ -42 +42 @@
 void sigHandler_ctxSwitch( __CFA_SIGPARMS__ );
 void sigHandler_segv     ( __CFA_SIGPARMS__ );
+void sigHandler_ill      ( __CFA_SIGPARMS__ );
+void sigHandler_fpe      ( __CFA_SIGPARMS__ );
 void sigHandler_abort    ( __CFA_SIGPARMS__ );
 
@@ -243 +245 @@
 
         // Setup proper signal handlers
-        __kernel_sigaction( SIGUSR1, sigHandler_ctxSwitch, SA_SIGINFO | SA_RESTART );         // CtxSwitch handler
+        __cfaabi_sigaction( SIGUSR1, sigHandler_ctxSwitch, SA_SIGINFO | SA_RESTART );         // CtxSwitch handler
 
         signal_block( SIGALRM );