Changes in libcfa/src/concurrency/kernel.cfa [3ea8ad1:ac12f1f]

File:

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

libcfa/src/concurrency/kernel.cfa

@@ -251 +251 @@
                 /* paranoid */ verify( ! __preemption_enabled() );
                 /* paranoid */ verify( kernelTLS().this_thread == thrd_dst );
-                /* paranoid */ verify( thrd_dst->curr_cluster == this->cltr );
                 /* paranoid */ verify( thrd_dst->context.SP );
                 /* paranoid */ verify( thrd_dst->state != Halted );
@@ -268 +267 @@
                 /* paranoid */ verifyf( ((uintptr_t)thrd_dst->context.SP) < ((uintptr_t)__get_stack(thrd_dst->curr_cor)->base ), "ERROR : Destination $thread %p has been corrupted.\n StackPointer too small.\n", thrd_dst );
                 /* paranoid */ verify( thrd_dst->context.SP );
-                /* paranoid */ verify( thrd_dst->curr_cluster == this->cltr );
                 /* paranoid */ verify( kernelTLS().this_thread == thrd_dst );
                 /* paranoid */ verify( ! __preemption_enabled() );
@@ -288 +286 @@
                 }
 
-                if(unlikely(thrd_dst->state == Halting)) {
+                if(unlikely(thrd_dst->state == Halted)) {
                         // The thread has halted, it should never be scheduled/run again
                         // finish the thread
@@ -362 +360 @@
 void __schedule_thread( $thread * thrd ) {
         /* paranoid */ verify( ! __preemption_enabled() );
-        /* paranoid */ verify( kernelTLS().this_proc_id );
         /* paranoid */ verify( thrd );
         /* paranoid */ verify( thrd->state != Halted );
-        /* paranoid */ verify( thrd->curr_cluster );
+        /* paranoid */ verify( kernelTLS().this_proc_id );
         /* paranoid */ #if defined( __CFA_WITH_VERIFY__ )
         /* paranoid */  if( thrd->state == Blocked || thrd->state == Start ) assertf( thrd->preempted == __NO_PREEMPTION,
@@ -476 +473 @@
                 disable_interrupts();
 
+                thrd->state = Halted;
+                if( TICKET_RUNNING != thrd->ticket ) { abort( "Thread terminated with pending unpark" ); }
+                if( thrd != this->owner || this->recursion != 1) { abort( "Thread internal monitor has unbalanced recursion" ); }
+
+                // Leave the thread
                 /* paranoid */ verify( ! __preemption_enabled() );
-                /* paranoid */ verify( thrd->state == Active );
-                /* paranoid */ verify( 0x0D15EA5E0D15EA5Ep == thrd->canary );
-                /* paranoid */ verify( kernelTLS().this_thread == thrd );
-                /* paranoid */ verify( thrd->context.SP );
-                /* paranoid */ verifyf( ((uintptr_t)thrd->context.SP) > ((uintptr_t)__get_stack(thrd->curr_cor)->limit), "ERROR : $thread %p has been corrupted.\n StackPointer too large.\n", thrd );
-                /* paranoid */ verifyf( ((uintptr_t)thrd->context.SP) < ((uintptr_t)__get_stack(thrd->curr_cor)->base ), "ERROR : $thread %p has been corrupted.\n StackPointer too small.\n", thrd );
-
-                thrd->state = Halting;
-                if( TICKET_RUNNING != thrd->ticket ) { abort( "Thread terminated with pending unpark" ); }
-                if( thrd != this->owner ) { abort( "Thread internal monitor has incorrect owner" ); }
-                if( this->recursion != 1) { abort( "Thread internal monitor has unbalanced recursion" ); }
-
-                // Leave the thread
                 returnToKernel();
+                abort();
 
                 // Control flow should never reach here!
-                abort();
         }
 }