Changeset d6ff3ff

Timestamp:

Jul 13, 2017, 3:51:00 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

0764cfb, 24fc196, 3d4b23fa

Parents:

35b06a8

Message:

Kernel shoud now drop preemptions during other preemptions

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) (4 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 );
@@ -248 +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 );
         }
@@ -255 +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 ) {

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