Changeset a0b3e32 for src/libcfa/concurrency/preemption.c

Timestamp:

Jul 13, 2017, 1:50:57 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

aaron-thesis, arm-eh, 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:

35b06a8

Parents:

acb89ed

Message:

Alarmloop no longer uses signals other than SIGALRM

File:

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

src/libcfa/concurrency/preemption.c

@@ -222 +222 @@
         sigprocmask( SIG_BLOCK, &mask, NULL );
 
-        pthread_kill( alarm_thread, SIGINT );
+        sigval val = { 1 };
+        pthread_sigqueue( alarm_thread, SIGALRM, val );
         pthread_join( alarm_thread, NULL );
         LIB_DEBUG_PRINT_SAFE("Kernel : Preemption stopped\n");
@@ -281 +282 @@
         sigemptyset( &mask );
         sigaddset( &mask, SIGALRM );
-        sigaddset( &mask, SIGUSR2 );
-        sigaddset( &mask, SIGINT  );
 
         if ( pthread_sigmask( SIG_BLOCK, &mask, NULL ) == -1 ) {
@@ -289 +288 @@
 
         while( true ) {
-                int sig;
-                if( sigwait( &mask, &sig ) != 0  ) {
+                siginfo_t info;
+                int sig = sigwaitinfo( &mask, &info );
+                if( sig < 0 ) {
                         abortf( "internal error, sigwait" );
                 }
-
-                switch( sig) {
-                        case SIGALRM:
+                else if( sig == SIGALRM )
+                {
+                        LIB_DEBUG_PRINT_SAFE("Kernel : Caught signal %d (%d)\n", sig, info.si_value.sival_int );
+                        if( info.si_value.sival_int == 0 )
+                        {
                                 LIB_DEBUG_PRINT_SAFE("Kernel : Preemption thread tick\n");
                                 lock( &systemProcessor->alarm_lock DEBUG_CTX2 );
                                 tick_preemption();
                                 unlock( &systemProcessor->alarm_lock );
+                        }
+                        else if( info.si_value.sival_int == 1 )
+                        {
                                 break;
-                        case SIGUSR2:
-                                //TODO other actions
-                                break;
-                        case SIGINT:
-                                LIB_DEBUG_PRINT_SAFE("Kernel : Preemption thread stopping\n");
-                                return NULL;
-                        default:
-                                abortf( "internal error, sigwait returned sig %d", sig );
-                                break;
-                }
-        }
+                        }
+                }
+                else
+                {
+                        LIB_DEBUG_PRINT_SAFE("Kernel : Unexpected signal %d (%d)\n", sig, info.si_value.sival_int);
+                }
+        }
+
+        LIB_DEBUG_PRINT_SAFE("Kernel : Preemption thread stopping\n");
+        return NULL;
 }