Changeset e014c6d

Timestamp:

Jun 2, 2021, 5:59:44 PM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

b303ec1

Parents:

436d7d7 (diff), ab5baab (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

Files:

• Jenkins/FullBuild (modified) (2 diffs)
• libcfa/src/concurrency/coroutine.cfa (modified) (1 diff)
• libcfa/src/concurrency/coroutine.hfa (modified) (1 diff)
• libcfa/src/concurrency/invoke.h (modified) (1 diff)
• libcfa/src/concurrency/kernel.cfa (modified) (1 diff)
• libcfa/src/concurrency/kernel/startup.cfa (modified) (1 diff)
• libcfa/src/concurrency/thread.cfa (modified) (1 diff)

Jenkins/FullBuild

@@ -32 +32 @@
                         stage('Package') {
                                 trigger_dist( commitId, currentBuild.number.toString() )
+                        }
+
+                        stage('Promote') {
+                                trigger_prom()
                         }
                 }
@@ -123 +127 @@
 }
 
+def trigger_prom() {
+        def result = build job: 'Cforall_Promote_Ref', propagate: false
+
+        echo(result.result)
+
+        if(result.result != 'SUCCESS') {
+                sh("wget -q -O - https://cforall.uwaterloo.ca/jenkins/job/Cforall_Promote_Ref/${result.number}/consoleText")
+                error(result.result)
+        }
+}
+
 //===========================================================================================================
 //Routine responsible of sending the email notification once the build is completed

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

@@ -167 +167 @@
                 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

@@ -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;