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

Timestamp:

Jul 13, 2017, 3:51:00 PM (7 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

File:

• src/libcfa/concurrency/preemption.c (modified) (4 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 );
@@ -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 ) {