Changes in libcfa/src/concurrency/preemption.cfa [250583e:e84ab3d]

File:

• libcfa/src/concurrency/preemption.cfa (modified) (7 diffs)

libcfa/src/concurrency/preemption.cfa

@@ -251 +251 @@
         bool enabled = __cfaabi_tls.preemption_state.enabled;
 
-        // Check if there is a pending preemption
-        processor   * proc = __cfaabi_tls.this_processor;
-        bool pending = proc ? proc->pending_preemption : false;
-        if( enabled && pending ) proc->pending_preemption = false;
-
         // create a assembler label after
         // marked as clobber all to avoid movement
         __cfaasm_label(check, after);
-
-        // If we can preempt and there is a pending one
-        // this is a good time to yield
-        if( enabled && pending ) {
-                force_yield( __POLL_PREEMPTION );
-        }
         return enabled;
 }
@@ -293 +282 @@
         // marked as clobber all to avoid movement
         __cfaasm_label(get, after);
-
-        // This is used everywhere, to avoid cost, we DO NOT poll pending preemption
         return val;
 }
@@ -371 +358 @@
         if(!ready) { abort("Preemption should be ready"); }
 
-        sigset_t oldset;
-        int ret;
-        ret = pthread_sigmask(0, ( const sigset_t * ) 0p, &oldset);  // workaround trac#208: cast should be unnecessary
-        if(ret != 0) { abort("ERROR sigprocmask returned %d", ret); }
-
-        ret = sigismember(&oldset, SIGUSR1);
-        if(ret <  0) { abort("ERROR sigismember returned %d", ret); }
-        if(ret == 1) { abort("ERROR SIGUSR1 is disabled"); }
-
-        ret = sigismember(&oldset, SIGALRM);
-        if(ret <  0) { abort("ERROR sigismember returned %d", ret); }
-        if(ret == 0) { abort("ERROR SIGALRM is enabled"); }
-
-        ret = sigismember(&oldset, SIGTERM);
-        if(ret <  0) { abort("ERROR sigismember returned %d", ret); }
-        if(ret == 1) { abort("ERROR SIGTERM is disabled"); }
+        __cfaasm_label(debug, before);
+
+                sigset_t oldset;
+                int ret;
+                ret = pthread_sigmask(0, ( const sigset_t * ) 0p, &oldset);  // workaround trac#208: cast should be unnecessary
+                if(ret != 0) { abort("ERROR sigprocmask returned %d", ret); }
+
+                ret = sigismember(&oldset, SIGUSR1);
+                if(ret <  0) { abort("ERROR sigismember returned %d", ret); }
+                if(ret == 1) { abort("ERROR SIGUSR1 is disabled"); }
+
+                ret = sigismember(&oldset, SIGALRM);
+                if(ret <  0) { abort("ERROR sigismember returned %d", ret); }
+                if(ret == 0) { abort("ERROR SIGALRM is enabled"); }
+
+                ret = sigismember(&oldset, SIGTERM);
+                if(ret <  0) { abort("ERROR sigismember returned %d", ret); }
+                if(ret == 1) { abort("ERROR SIGTERM is disabled"); }
+
+        __cfaasm_label(debug, after);
 }
 
@@ -557 +548 @@
         __cfaasm_label( check  );
         __cfaasm_label( dsable );
-        // __cfaasm_label( debug  );
+        __cfaasm_label( debug  );
 
         // Check if preemption is safe
@@ -564 +555 @@
         if( __cfaasm_in( ip, check  ) ) { ready = false; goto EXIT; };
         if( __cfaasm_in( ip, dsable ) ) { ready = false; goto EXIT; };
-        // if( __cfaasm_in( ip, debug  ) ) { ready = false; goto EXIT; };
+        if( __cfaasm_in( ip, debug  ) ) { ready = false; goto EXIT; };
         if( !__cfaabi_tls.preemption_state.enabled) { ready = false; goto EXIT; };
         if( __cfaabi_tls.preemption_state.in_progress ) { ready = false; goto EXIT; };
@@ -670 +661 @@
 
         // Check if it is safe to preempt here
-        if( !preemption_ready( ip ) ) {
-                #if !defined(__CFA_NO_STATISTICS__)
-                        __cfaabi_tls.this_stats->ready.threads.preempt.rllfwd++;
-                #endif
-                return;
-        }
+        if( !preemption_ready( ip ) ) { return; }
 
         __cfaabi_dbg_print_buffer_decl( " KERNEL: preempting core %p (%p @ %p).\n", __cfaabi_tls.this_processor, __cfaabi_tls.this_thread, (void *)(cxt->uc_mcontext.CFA_REG_IP) );
@@ -694 +680 @@
 
         // Preemption can occur here
-
-        #if !defined(__CFA_NO_STATISTICS__)
-                __cfaabi_tls.this_stats->ready.threads.preempt.yield++;
-        #endif
 
         force_yield( __ALARM_PREEMPTION ); // Do the actual __cfactx_switch