Changes in / [578e6037:24fc196]

Location:

src

Files:

• benchmark/create_pthrd.c (modified) (1 diff)
• libcfa/concurrency/kernel.c (modified) (1 diff)
• libcfa/concurrency/kernel_private.h (modified) (1 diff)
• libcfa/concurrency/preemption.c (modified) (6 diffs)
• tests/preempt_longrun/Makefile.am (modified) (1 diff)
• tests/preempt_longrun/Makefile.in (modified) (1 diff)
• tests/preempt_longrun/create.c (modified) (1 diff)

src/benchmark/create_pthrd.c

@@ -17 +17 @@
 
         for (size_t i = 0; i < n; i++) {
-                pthread_attr_t attr;
-                if (pthread_attr_init(&attr) < 0) {
+                pthread_t thread;
+                if (pthread_create(&thread, NULL, foo, NULL) < 0) {
                         return 1;
                 }
-                if (pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED) < 0) {
-                        return 1;
-                }
-                pthread_t thread;
-                if (pthread_create(&thread, &attr, foo, NULL) < 0) {
+
+                if (pthread_join( thread, NULL) < 0) {
                         return 1;
                 }

src/libcfa/concurrency/kernel.c

@@ -60 +60 @@
 volatile thread_local coroutine_desc * this_coroutine;
 volatile thread_local thread_desc * this_thread;
+volatile thread_local bool preemption_in_progress = 0;
 volatile thread_local unsigned short disable_preempt_count = 1;
 

src/libcfa/concurrency/kernel_private.h

@@ -79 +79 @@
 extern volatile thread_local coroutine_desc * this_coroutine;
 extern volatile thread_local thread_desc * this_thread;
+extern volatile thread_local bool preemption_in_progress;
 extern volatile thread_local unsigned short disable_preempt_count;
 

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;
 }
 

src/tests/preempt_longrun/Makefile.am

@@ -16 +16 @@
 
 repeats=10
-max_time=30
+max_time=600
 preempt=1_000ul
 

src/tests/preempt_longrun/Makefile.in

@@ -449 +449 @@
 top_srcdir = @top_srcdir@
 repeats = 10
-max_time = 30
+max_time = 600
 preempt = 1_000ul
 REPEAT = ${abs_top_srcdir}/tools/repeat -s

src/tests/preempt_longrun/create.c

@@ -15 +15 @@
 
 int main(int argc, char* argv[]) {
+        processor p;
         for(int i = 0; i < 10_000ul; i++) {
                 worker_t w[7];