Changeset 24fc196 for src/libcfa/concurrency/preemption.c

Timestamp:

Jul 13, 2017, 4:16:21 PM (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:

4b234f0, 994d080

Parents:

578e6037 (diff), d6ff3ff (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

File:

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

src/libcfa/concurrency/preemption.c

@@ -180 +180 @@
 
 static inline bool preemption_ready() {
-        return disable_preempt_count == 0;
+        return disable_preempt_count == 0 && !preemption_in_progress;
 }
 
@@ -218 +218 @@
 
 void kernel_stop_preemption() {
+        LIB_DEBUG_PRINT_SAFE("Kernel : Preemption stopping\n");
+
         sigset_t mask;
         sigfillset( &mask );
         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");
@@ -247 +250 @@
         LIB_DEBUG_DO( last_interrupt = (void *)(cxt->uc_mcontext.gregs[CFA_REG_IP]); )
         if( preemption_ready() ) {
+                preemption_in_progress = true;
                 signal_unblock( SIGUSR1 );
+                this_processor->pending_preemption = false;
+                preemption_in_progress = false;
                 BlockInternal( (thread_desc*)this_thread );
         }
@@ -254 +260 @@
         }
 }
-
-// void sigHandler_alarm( __CFA_SIGPARMS__ ) {
-//      LIB_DEBUG_DO( last_interrupt = (void *)(cxt->uc_mcontext.gregs[CFA_REG_IP]); )
-//      verify( this_processor == systemProcessor );
-
-//      if( try_lock( &systemProcessor->alarm_lock DEBUG_CTX2 ) ) {
-//              tick_preemption();
-//              systemProcessor->pending_alarm = false;
-//              unlock( &systemProcessor->alarm_lock );
-//      }
-//      else {
-//              defer_alarm();
-//      }
-
-//      signal_unblock( SIGALRM );
-
-//      if( preemption_ready() && this_processor->pending_preemption ) {
-
-//              this_processor->pending_preemption = false;
-//              BlockInternal( (thread_desc*)this_thread );
-//      }
-// }
 
 void * alarm_loop( __attribute__((unused)) void * args ) {
@@ -281 +265 @@
         sigemptyset( &mask );
         sigaddset( &mask, SIGALRM );
-        sigaddset( &mask, SIGUSR2 );
-        sigaddset( &mask, SIGINT  );
 
         if ( pthread_sigmask( SIG_BLOCK, &mask, NULL ) == -1 ) {
@@ -289 +271 @@
 
         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;
 }