Changeset 7522692

Timestamp:

Dec 17, 2020, 12:28:17 PM (4 years ago)

Author:

Colby Alexander Parsons <caparsons@…>

Branches:

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

Children:

b9255d0, c9f6983

Parents:

19de7864 (diff), 9dd31e7 (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/tools.groovy (modified) (1 diff)
• Jenkinsfile (modified) (1 diff)
• libcfa/src/concurrency/kernel/startup.cfa (modified) (2 diffs)

Jenkins/tools.groovy

@@ -6 +6 @@
 import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
 
-// Global for the stage name
-StageName = ''
-
 // wrapper around stage declaretion to be more verbose
 // and allow showing as skipped in the UI
 def BuildStage(String name, boolean run, Closure block ) {
-        StageName = name
-        echo " -------- ${StageName} -------- "
+        echo " -------- ${name} -------- "
         if(run) {
                 stage(name, block)

Jenkinsfile

@@ -54 +54 @@
         //attach the build log to the email
         catch (Exception caughtError) {
-                //rethrow error later
+                // Store the result of the build log
+                currentBuild.result = "FAILURE"
+
+                // An error has occured, the build log is relevent
+                log_needed = true
+
+                // rethrow error later
                 err = caughtError
 
+                // print the error so it shows in the log
                 echo err.toString()
-
-                //An error has occured, the build log is relevent
-                log_needed = true
-
-                //Store the result of the build log
-                currentBuild.result = "${tools.StageName} FAILURE".trim()
         }
 

libcfa/src/concurrency/kernel/startup.cfa

@@ -118 +118 @@
 
 extern size_t __page_size;
+extern int __map_prot;
 
 //-----------------------------------------------------------------------------
@@ -725 +726 @@
                 }
         #else
+                __cfaabi_dbg_debug_do(
+                        // pthread has no mechanism to create the guard page in user supplied stack.
+                        if ( mprotect( stack, __page_size, __map_prot ) == -1 ) {
+                                abort( "mprotect : internal error, mprotect failure, error(%d) %s.", errno, strerror( errno ) );
+                        } // if
+                );
                 free( stack );
         #endif