Changeset b4b63e8

Timestamp:

Oct 1, 2020, 2:41:30 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

dd53f75

Parents:

e235429

Message:

Fixed missing changes to park/unpark.
Added canary to threads to check when the thread was destroyed

Location:

libcfa/src/concurrency

Files:

• invoke.h (modified) (1 diff)
• io.cfa (modified) (1 diff)
• kernel.cfa (modified) (3 diffs)
• kernel/startup.cfa (modified) (1 diff)
• thread.cfa (modified) (2 diffs)

libcfa/src/concurrency/invoke.h

@@ -190 +190 @@
                 } node;
 
-                #ifdef __CFA_DEBUG__
+                #if defined( __CFA_WITH_VERIFY__ )
                         unsigned long long canary;
                 #endif

libcfa/src/concurrency/io.cfa

@@ -97 +97 @@
 
                 if(nextt) {
-                        unpark( nextt __cfaabi_dbg_ctx2 );
+                        unpark( nextt );
                         enable_interrupts( __cfaabi_dbg_ctx );
                         return true;

libcfa/src/concurrency/kernel.cfa

@@ -251 +251 @@
                 /* paranoid */ verify( ! kernelTLS.preemption_state.enabled );
                 /* paranoid */ verify( kernelTLS.this_thread == thrd_dst );
+                /* paranoid */ verify( thrd_dst->context.SP );
                 /* paranoid */ verifyf( ((uintptr_t)thrd_dst->context.SP) < ((uintptr_t)__get_stack(thrd_dst->curr_cor)->base ) || thrd_dst->curr_cor == proc_cor, "ERROR : Destination $thread %p has been corrupted.\n StackPointer too small.\n", thrd_dst ); // add escape condition if we are setting up the processor
                 /* paranoid */ verifyf( ((uintptr_t)thrd_dst->context.SP) > ((uintptr_t)__get_stack(thrd_dst->curr_cor)->limit) || thrd_dst->curr_cor == proc_cor, "ERROR : Destination $thread %p has been corrupted.\n StackPointer too large.\n", thrd_dst ); // add escape condition if we are setting up the processor
+                /* paranoid */ verify( 0x0D15EA5E0D15EA5E == thrd_dst->canary );
+
 
 
                 // set context switch to the thread that the processor is executing
-                verify( thrd_dst->context.SP );
                 __cfactx_switch( &proc_cor->context, &thrd_dst->context );
                 // when __cfactx_switch returns we are back in the processor coroutine
 
+                /* paranoid */ verify( 0x0D15EA5E0D15EA5E == thrd_dst->canary );
                 /* paranoid */ verifyf( ((uintptr_t)thrd_dst->context.SP) > ((uintptr_t)__get_stack(thrd_dst->curr_cor)->limit), "ERROR : Destination $thread %p has been corrupted.\n StackPointer too large.\n", thrd_dst );
                 /* 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( kernelTLS.this_thread == thrd_dst );
                 /* paranoid */ verify( ! kernelTLS.preemption_state.enabled );
@@ -330 +334 @@
                         __x87_store;
                 #endif
-                verify( proc_cor->context.SP );
+                /* paranoid */ verify( proc_cor->context.SP );
+                /* paranoid */ verify( 0x0D15EA5E0D15EA5E == thrd_src->canary );
                 __cfactx_switch( &thrd_src->context, &proc_cor->context );
+                /* paranoid */ verify( 0x0D15EA5E0D15EA5E == thrd_src->canary );
                 #if defined( __i386 ) || defined( __x86_64 )
                         __x87_load;
@@ -363 +369 @@
         /* paranoid */ #endif
         /* paranoid */ verifyf( thrd->link.next == 0p, "Expected null got %p", thrd->link.next );
+        /* paranoid */ verify( 0x0D15EA5E0D15EA5E == thrd->canary );
+
 
         if (thrd->preempted == __NO_PREEMPTION) thrd->state = Ready;

libcfa/src/concurrency/kernel/startup.cfa

@@ -451 +451 @@
         link.next = 0p;
         link.prev = 0p;
+        #if defined( __CFA_WITH_VERIFY__ )
+                canary = 0x0D15EA5E0D15EA5E;
+        #endif
 
         node.next = 0p;

libcfa/src/concurrency/thread.cfa

@@ -39 +39 @@
         link.prev = 0p;
         link.preferred = -1;
+        #if defined( __CFA_WITH_VERIFY__ )
+                canary = 0x0D15EA5E0D15EA5E;
+        #endif
 
         node.next = 0p;
@@ -48 +51 @@
 
 void ^?{}($thread& this) with( this ) {
+        #if defined( __CFA_WITH_VERIFY__ )
+                canary = 0xDEADDEADDEADDEAD;
+        #endif
         unregister(curr_cluster, this);
         ^self_cor{};