Changeset 6994d8c for src

Timestamp:

Sep 18, 2017, 11:23:51 AM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

e06be49

Parents:

3e239ea (diff), 8024bc8 (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 plg2:software/cfa/cfa-cc

Location:

src/libcfa/concurrency

Files:

• coroutine.c (modified) (2 diffs)
• preemption.c (modified) (1 diff)

src/libcfa/concurrency/coroutine.c

@@ -74 +74 @@
 }
 
-void ^?{}(coStack_t& this) {
-        if ( ! this.userStack ) {
+void ^?{}(coStack_t & this) {
+        if ( ! this.userStack && this.storage ) {
                 LIB_DEBUG_DO(
                         if ( mprotect( this.storage, pageSize, PROT_READ | PROT_WRITE ) == -1 ) {
@@ -122 +122 @@
         //TEMP HACK do this on proper kernel startup
         if(pageSize == 0ul) pageSize = sysconf( _SC_PAGESIZE );
+
+        LIB_DEBUG_PRINT_SAFE("FRED");
 
         size_t cxtSize = libCeiling( sizeof(machine_context_t), 8 ); // minimum alignment

src/libcfa/concurrency/preemption.c

@@ -243 +243 @@
 
         // Setup proper signal handlers
-        __kernel_sigaction( SIGUSR1, sigHandler_ctxSwitch, SA_SIGINFO );         // CtxSwitch handler
+        __kernel_sigaction( SIGUSR1, sigHandler_ctxSwitch, SA_SIGINFO | SA_RESTART );         // CtxSwitch handler
         // __kernel_sigaction( SIGSEGV, sigHandler_segv     , SA_SIGINFO );      // Failure handler
         // __kernel_sigaction( SIGBUS , sigHandler_segv     , SA_SIGINFO );      // Failure handler