Changes in src/libcfa/concurrency/preemption.c [b68fc85:7958e67]

File:

• src/libcfa/concurrency/preemption.c (modified) (3 diffs)

src/libcfa/concurrency/preemption.c

@@ -149 +149 @@
         // Disable interrupts by incrementing the counter
         void disable_interrupts() {
-                with( TL_GET( preemption_state ) ) {
-                        enabled = false;
-                        __attribute__((unused)) unsigned short new_val = disable_count + 1;
-                        disable_count = new_val;
-                        verify( new_val < 65_000u );              // If this triggers someone is disabling interrupts without enabling them
-                }
+                TL_GET( preemption_state ).enabled = false;
+                __attribute__((unused)) unsigned short new_val = TL_GET( preemption_state ).disable_count + 1;
+                TL_GET( preemption_state ).disable_count = new_val;
+                verify( new_val < 65_000u );              // If this triggers someone is disabling interrupts without enabling them
         }
 
@@ -163 +161 @@
                 thread_desc * thrd = TL_GET( this_thread );       // Cache the thread now since interrupts can start happening after the atomic add
 
-                with( TL_GET( preemption_state ) ){
-                        unsigned short prev = disable_count;
-                        disable_count -= 1;
-                        verify( prev != 0u );                     // If this triggers someone is enabled already enabled interruptsverify( prev != 0u );
-
-                        // Check if we need to prempt the thread because an interrupt was missed
-                        if( prev == 1 ) {
-                                enabled = true;
-                                if( proc->pending_preemption ) {
-                                        proc->pending_preemption = false;
-                                        BlockInternal( thrd );
-                                }
+                unsigned short prev = TL_GET( preemption_state ).disable_count;
+                TL_GET( preemption_state ).disable_count -= 1;
+                verify( prev != 0u );                     // If this triggers someone is enabled already enabled interruptsverify( prev != 0u );
+
+                // Check if we need to prempt the thread because an interrupt was missed
+                if( prev == 1 ) {
+                        TL_GET( preemption_state ).enabled = true;
+                        if( proc->pending_preemption ) {
+                                proc->pending_preemption = false;
+                                BlockInternal( thrd );
                         }
                 }
@@ -404 +400 @@
 }
 
-//=============================================================================================
-// Kernel Signal Debug
-//=============================================================================================
-
-void __cfaabi_check_preemption() {
-        bool ready = TL_GET( preemption_state ).enabled;
-        if(!ready) { abort("Preemption should be ready"); }
-
-        sigset_t oldset;
-        int ret;
-        ret = sigprocmask(0, NULL, &oldset);
-        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"); }
-}
-
 // Local Variables: //
 // mode: c //