Changes in src/libcfa/concurrency/kernel.c [2e9aed4:b158d8f]

File:

• src/libcfa/concurrency/kernel.c (modified) (7 diffs)

src/libcfa/concurrency/kernel.c

@@ -242 +242 @@
 void finishRunning(processor * this) {
         if( this->finish.action_code == Release ) {
-                verify( disable_preempt_count > 1 );
                 unlock( *this->finish.lock );
         }
@@ -249 +248 @@
         }
         else if( this->finish.action_code == Release_Schedule ) {
-                verify( disable_preempt_count > 1 );
                 unlock( *this->finish.lock );
                 ScheduleThread( this->finish.thrd );
         }
         else if( this->finish.action_code == Release_Multi ) {
-                verify( disable_preempt_count > this->finish.lock_count );
                 for(int i = 0; i < this->finish.lock_count; i++) {
                         unlock( *this->finish.locks[i] );
@@ -260 +257 @@
         }
         else if( this->finish.action_code == Release_Multi_Schedule ) {
-                verify( disable_preempt_count > this->finish.lock_count );
                 for(int i = 0; i < this->finish.lock_count; i++) {
                         unlock( *this->finish.locks[i] );
@@ -367 +363 @@
         this_processor->finish.lock = lock;
 
-        verify( disable_preempt_count > 1 );
+        verify( disable_preempt_count > 0 );
         suspend();
         verify( disable_preempt_count > 0 );
@@ -395 +391 @@
         this_processor->finish.thrd = thrd;
 
-        verify( disable_preempt_count > 1 );
+        verify( disable_preempt_count > 0 );
         suspend();
         verify( disable_preempt_count > 0 );
@@ -519 +515 @@
         __cfaabi_dbg_print_safe("Kernel : Shutdown complete\n");
 }
-
-//=============================================================================================
-// Unexpected Terminating logic
-//=============================================================================================
-
 
 static __spinlock_t kernel_abort_lock;
@@ -620 +611 @@
 }
 
-//-----------------------------------------------------------------------------
-// Debug
-__cfaabi_dbg_debug_do(
-        struct {
-                thread_desc * tail;
-        } __cfaabi_dbg_thread_list = { NULL };
-
-        void __cfaabi_dbg_thread_register( thread_desc * thrd ) {
-                if( !__cfaabi_dbg_thread_list.tail ) {
-                        __cfaabi_dbg_thread_list.tail = thrd;
-                        return;
-                }
-                __cfaabi_dbg_thread_list.tail->dbg_next = thrd;
-                thrd->dbg_prev = __cfaabi_dbg_thread_list.tail;
-                __cfaabi_dbg_thread_list.tail = thrd;
-        }
-
-        void __cfaabi_dbg_thread_unregister( thread_desc * thrd ) {
-                thread_desc * prev = thrd->dbg_prev;
-                thread_desc * next = thrd->dbg_next;
-
-                if( next ) { next->dbg_prev = prev; }
-                else       {
-                        assert( __cfaabi_dbg_thread_list.tail == thrd );
-                        __cfaabi_dbg_thread_list.tail = prev;
-                }
-
-                if( prev ) { prev->dbg_next = next; }
-
-                thrd->dbg_prev = NULL;
-                thrd->dbg_next = NULL;
-        }
-)
 // Local Variables: //
 // mode: c //