Changes in libcfa/src/concurrency/preemption.cfa [adf34b3:bfcf6b9]

File:

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

libcfa/src/concurrency/preemption.cfa

@@ -354 +354 @@
 }
 
-//-----------------------------------------------------------------------------
-// Kernel Signal Debug
-void __cfaabi_check_preemption() {
-        bool ready = __preemption_enabled();
-        if(!ready) { abort("Preemption should be ready"); }
-
-        __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);
-}
-
-#ifdef __CFA_WITH_VERIFY__
-bool __cfaabi_dbg_in_kernel() {
-        return !__preemption_enabled();
-}
-#endif
-
 #undef __cfaasm_label
-
-//-----------------------------------------------------------------------------
-// Signal handling
 
 // sigprocmask wrapper : unblock a single signal
@@ -516 +479 @@
         __cfaasm_label( check  );
         __cfaasm_label( dsable );
-        __cfaasm_label( debug  );
 
         // Check if preemption is safe
@@ -523 +485 @@
         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( !__cfaabi_tls.preemption_state.enabled) { ready = false; goto EXIT; };
         if( __cfaabi_tls.preemption_state.in_progress ) { ready = false; goto EXIT; };
@@ -575 +536 @@
         // Wait for the preemption thread to finish
 
-        pthread_join( alarm_thread, 0p );
-        free( alarm_stack );
+        __destroy_pthread( alarm_thread, alarm_stack, 0p );
 
         // Preemption is now fully stopped
@@ -736 +696 @@
 }
 
+//=============================================================================================
+// Kernel Signal Debug
+//=============================================================================================
+
+void __cfaabi_check_preemption() {
+        bool ready = __preemption_enabled();
+        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"); }
+}
+
+#ifdef __CFA_WITH_VERIFY__
+bool __cfaabi_dbg_in_kernel() {
+        return !__preemption_enabled();
+}
+#endif
+
 // Local Variables: //
 // mode: c //