Changes in src/libcfa/concurrency/preemption.c [a0b3e32:f2b12406]

File:

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

src/libcfa/concurrency/preemption.c

@@ -222 +222 @@
         sigprocmask( SIG_BLOCK, &mask, NULL );
 
-        sigval val = { 1 };
-        pthread_sigqueue( alarm_thread, SIGALRM, val );
+        pthread_kill( alarm_thread, SIGINT );
         pthread_join( alarm_thread, NULL );
         LIB_DEBUG_PRINT_SAFE("Kernel : Preemption stopped\n");
@@ -282 +281 @@
         sigemptyset( &mask );
         sigaddset( &mask, SIGALRM );
+        sigaddset( &mask, SIGUSR2 );
+        sigaddset( &mask, SIGINT  );
 
         if ( pthread_sigmask( SIG_BLOCK, &mask, NULL ) == -1 ) {
@@ -288 +289 @@
 
         while( true ) {
-                siginfo_t info;
-                int sig = sigwaitinfo( &mask, &info );
-                if( sig < 0 ) {
+                int sig;
+                if( sigwait( &mask, &sig ) != 0  ) {
                         abortf( "internal error, sigwait" );
                 }
-                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 )
-                        {
+
+                switch( sig) {
+                        case SIGALRM:
                                 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;
-                        }
-                }
-                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;
+                        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;
+                }
+        }
 }