Changeset bae0d35 for libcfa/src/concurrency

Timestamp:

Jun 7, 2021, 2:09:12 PM (3 years ago)

Author:

caparsons <caparson@…>

Branches:

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

Children:

5a46e09

Parents:

82f4063 (diff), 53692b3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

libcfa/src/concurrency

Files:

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

libcfa/src/concurrency/coroutine.cfa

@@ -267 +267 @@
                 struct $coroutine * cor = active_coroutine();
 
+                // get the active thread once
+                $thread * athrd = active_thread();
+
+                /* paranoid */ verify( athrd->corctx_flag );
+                athrd->corctx_flag = false;
+
                 if(cor->state == Primed) {
                         __cfactx_suspend();

libcfa/src/concurrency/coroutine.hfa

@@ -86 +86 @@
         src->state = src->state == Halted ? Halted : Blocked;
 
+        // get the active thread once
+        $thread * athrd = active_thread();
+
+        // Mark the coroutine
+        /* paranoid */ verify( !athrd->corctx_flag );
+        athrd->corctx_flag = true;
+
         // set new coroutine that task is executing
-        active_thread()->curr_cor = dst;
+        athrd->curr_cor = dst;
 
         // context switch to specified coroutine
-        verify( dst->context.SP );
+        /* paranoid */ verify( dst->context.SP );
         __cfactx_switch( &src->context, &dst->context );
         // when __cfactx_switch returns we are back in the src coroutine
+
+        /* paranoid */ verify( athrd->corctx_flag );
+        athrd->corctx_flag = false;
 
         // set state of new coroutine to active

libcfa/src/concurrency/invoke.h

@@ -168 +168 @@
                 enum __Preemption_Reason preempted:8;
 
+                bool corctx_flag;
+
                 //SKULLDUGGERY errno is not save in the thread data structure because returnToKernel appears to be the only function to require saving and restoring it
 

libcfa/src/concurrency/kernel.cfa

@@ -413 +413 @@
                 /* paranoid */ verify( thrd_dst->context.SP );
                 /* paranoid */ verify( thrd_dst->state != Halted );
-                /* 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 */ verifyf( ((uintptr_t)thrd_dst->context.SP) < ((uintptr_t)__get_stack(thrd_dst->curr_cor)->base ) || thrd_dst->curr_cor == proc_cor || thrd_dst->corctx_flag, "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 || thrd_dst->corctx_flag, "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( 0x0D15EA5E0D15EA5Ep == thrd_dst->canary );
 
@@ -424 +424 @@
 
                 /* paranoid */ verify( 0x0D15EA5E0D15EA5Ep == 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 */ verifyf( ((uintptr_t)thrd_dst->context.SP) > ((uintptr_t)__get_stack(thrd_dst->curr_cor)->limit) || thrd_dst->corctx_flag, "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 ) || thrd_dst->corctx_flag, "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 );

libcfa/src/concurrency/kernel/startup.cfa

@@ -397 +397 @@
         // make sure the current state is still correct
         /* paranoid */ verify(src->state == Ready);
+        src->corctx_flag = true;
 
         // context switch to specified coroutine

libcfa/src/concurrency/thread.cfa

@@ -32 +32 @@
         state = Start;
         preempted = __NO_PREEMPTION;
+        corctx_flag = false;
         curr_cor = &self_cor;
         self_mon.owner = &this;