Changeset 3f7e12cb for src/libcfa/concurrency/preemption.c

Timestamp:

Nov 8, 2017, 5:43:33 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

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:

954908d

Parents:

78315272 (diff), e35f30a (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:software/cfa/cfa-cc

File:

• src/libcfa/concurrency/preemption.c (modified) (3 diffs)

src/libcfa/concurrency/preemption.c

@@ -328 +328 @@
                 siginfo_t info;
                 int sig = sigwaitinfo( &mask, &info );
+
+                if( sig < 0 ) {
+                        //Error!
+                        int err = errno;
+                        switch( err ) {
+                                case EAGAIN :
+                                case EINTR :
+                                        continue;
+                        case EINVAL :
+                                        abortf("Timeout was invalid.");
+                                default:
+                                        abortf("Unhandled error %d", err);
+                        }
+                }
 
                 // If another signal arrived something went wrong
@@ -366 +380 @@
 
         if ( sigaction( sig, &act, NULL ) == -1 ) {
-                LIB_DEBUG_PRINT_BUFFER_DECL( STDERR_FILENO,
+                LIB_DEBUG_PRINT_BUFFER_DECL(
                         " __kernel_sigaction( sig:%d, handler:%p, flags:%d ), problem installing signal handler, error(%d) %s.\n",
                         sig, handler, flags, errno, strerror( errno )
@@ -383 +397 @@
 
         if ( sigaction( sig, &act, NULL ) == -1 ) {
-                LIB_DEBUG_PRINT_BUFFER_DECL( STDERR_FILENO,
+                LIB_DEBUG_PRINT_BUFFER_DECL(
                         " __kernel_sigdefault( sig:%d ), problem reseting signal handler, error(%d) %s.\n",
                         sig, errno, strerror( errno )