Changeset 7522692


Ignore:
Timestamp:
Dec 17, 2020, 12:28:17 PM (9 months ago)
Author:
Colby Alexander Parsons <caparsons@…>
Branches:
arm-eh, jacob/cs343-translation, master, new-ast-unique-expr
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:
3 edited

Legend:

Unmodified
Added
Removed
  • Jenkins/tools.groovy

    r19de7864 r7522692  
    66import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
    77
    8 // Global for the stage name
    9 StageName = ''
    10 
    118// wrapper around stage declaretion to be more verbose
    129// and allow showing as skipped in the UI
    1310def BuildStage(String name, boolean run, Closure block ) {
    14         StageName = name
    15         echo " -------- ${StageName} -------- "
     11        echo " -------- ${name} -------- "
    1612        if(run) {
    1713                stage(name, block)
  • Jenkinsfile

    r19de7864 r7522692  
    5454        //attach the build log to the email
    5555        catch (Exception caughtError) {
    56                 //rethrow error later
     56                // Store the result of the build log
     57                currentBuild.result = "FAILURE"
     58
     59                // An error has occured, the build log is relevent
     60                log_needed = true
     61
     62                // rethrow error later
    5763                err = caughtError
    5864
     65                // print the error so it shows in the log
    5966                echo err.toString()
    60 
    61                 //An error has occured, the build log is relevent
    62                 log_needed = true
    63 
    64                 //Store the result of the build log
    65                 currentBuild.result = "${tools.StageName} FAILURE".trim()
    6667        }
    6768
  • libcfa/src/concurrency/kernel/startup.cfa

    r19de7864 r7522692  
    118118
    119119extern size_t __page_size;
     120extern int __map_prot;
    120121
    121122//-----------------------------------------------------------------------------
     
    725726                }
    726727        #else
     728                __cfaabi_dbg_debug_do(
     729                        // pthread has no mechanism to create the guard page in user supplied stack.
     730                        if ( mprotect( stack, __page_size, __map_prot ) == -1 ) {
     731                                abort( "mprotect : internal error, mprotect failure, error(%d) %s.", errno, strerror( errno ) );
     732                        } // if
     733                );
    727734                free( stack );
    728735        #endif
Note: See TracChangeset for help on using the changeset viewer.