Changeset 281806b


Ignore:
Timestamp:
Jan 31, 2018, 5:49:46 PM (4 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, with_gc
Children:
23c27039, cc344be, e2e7330
Parents:
5ff188f (diff), 4ab3d68e (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 plg2:software/cfa/cfa-cc

Files:
12 edited

Legend:

Unmodified
Added
Removed
  • .gitignore

    r5ff188f r281806b  
    1111/Makefile
    1212src/**/Makefile
     13tools/**/Makefile
    1314/version
    1415
  • src/tests/preempt_longrun/Makefile.am

    r5ff188f r281806b  
    1919preempt=1_000ul
    2020
    21 REPEAT = ${abs_top_srcdir}/tools/repeat -s
     21REPEAT = ${abs_top_srcdir}/tools/repeat
     22TIME = /usr/bin/time -f "%E"
    2223
    2324BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -debug -O2 -DPREEMPTION_RATE=${preempt}
     
    3738        ${AM_V_GEN}${CC} ${CFLAGS} ${<} -o ${@}
    3839
    39 %.run : %
    40         @ time ${REPEAT} $(repeats) timeout ${max_time} ./${<}
     40%.run : % ${REPEAT}
     41        @ time ${REPEAT} -r out.log -i -s $(repeats) timeout ${max_time} ./${<}
    4142        @ rm ${<}
    4243        @ echo -e "${<}: SUCCESS\n"
     44
     45%.time : % ${REPEAT}
     46        @ ${REPEAT} -i -s -- $(repeats) $(TIME) -a -o times.log ./${<}
     47        @ rm ${<}
     48        @ echo -e "${<}: SUCCESS\n"
     49
     50${REPEAT}:
     51        @+make -C ${abs_top_srcdir}/tools/
  • src/tests/preempt_longrun/Makefile.in

    r5ff188f r281806b  
    451451max_time = 600
    452452preempt = 1_000ul
    453 REPEAT = ${abs_top_srcdir}/tools/repeat -s
     453REPEAT = ${abs_top_srcdir}/tools/repeat
     454TIME = /usr/bin/time -f "%E"
    454455BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -debug -O2 -DPREEMPTION_RATE=${preempt}
    455456TESTS = block create disjoint enter enter3 processor stack wait yield
     
    874875        ${AM_V_GEN}${CC} ${CFLAGS} ${<} -o ${@}
    875876
    876 %.run : %
    877         @ time ${REPEAT} $(repeats) timeout ${max_time} ./${<}
     877%.run : % ${REPEAT}
     878        @ time ${REPEAT} -r out.log -i -s $(repeats) timeout ${max_time} ./${<}
    878879        @ rm ${<}
    879880        @ echo -e "${<}: SUCCESS\n"
     881
     882%.time : % ${REPEAT}
     883        @ ${REPEAT} -i -s -- $(repeats) $(TIME) -a -o times.log ./${<}
     884        @ rm ${<}
     885        @ echo -e "${<}: SUCCESS\n"
     886
     887${REPEAT}:
     888        @+make -C ${abs_top_srcdir}/tools/
    880889
    881890# Tell versions [3.59,3.63) of GNU make to not export all variables.
  • src/tests/preempt_longrun/block.c

    r5ff188f r281806b  
    1 ../sched-int-block.c
     1../concurrent/signal/block.c
  • src/tests/preempt_longrun/create.c

    r5ff188f r281806b  
    1414thread worker_t {};
    1515
    16 void main(worker_t * this) {}
     16void main(worker_t & this) {}
    1717
    1818int main(int argc, char* argv[]) {
  • src/tests/preempt_longrun/disjoint.c

    r5ff188f r281806b  
    1 ../sched-int-disjoint.c
     1../concurrent/signal/disjoint.c
  • src/tests/preempt_longrun/enter.c

    r5ff188f r281806b  
    1717mon_t mon;
    1818
    19 void foo( mon_t * mutex this ) {}
     19void foo( mon_t & mutex this ) {}
    2020
    2121thread worker_t {};
    2222
    23 void main( worker_t * this ) {
     23void main( worker_t & this ) {
    2424        for( unsigned long i = 0; i < N; i++ ) {
    25                 foo( &mon );
     25                foo( mon );
    2626        }
    2727}
  • src/tests/preempt_longrun/enter3.c

    r5ff188f r281806b  
    1717mon_t mon1, mon2, mon3;
    1818
    19 void foo( mon_t * mutex a, mon_t * mutex b, mon_t * mutex c ) {}
     19void foo( mon_t & mutex a, mon_t & mutex b, mon_t & mutex c ) {}
    2020
    2121thread worker_t {};
    2222
    23 void main( worker_t * this ) {
     23void main( worker_t & this ) {
    2424        for( unsigned long i = 0; i < N; i++ ) {
    25                 foo( &mon1, &mon2, &mon3 );
     25                foo( mon1, mon2, mon3 );
    2626        }
    2727}
  • src/tests/preempt_longrun/processor.c

    r5ff188f r281806b  
    1414thread worker_t {};
    1515
    16 void main(worker_t * this) {}
     16void main(worker_t & this) {}
    1717
    1818int main(int argc, char* argv[]) {
  • src/tests/preempt_longrun/stack.c

    r5ff188f r281806b  
    1414thread worker_t {};
    1515
    16 void main(worker_t * this) {
     16void main(worker_t & this) {
    1717        volatile long long p = 5_021_609ul;
    1818        volatile long long a = 326_417ul;
  • src/tests/preempt_longrun/wait.c

    r5ff188f r281806b  
    1 ../sched-int-wait.c
     1../concurrent/signal/wait.c
  • src/tests/preempt_longrun/yield.c

    r5ff188f r281806b  
    1414thread worker_t {};
    1515
    16 void main(worker_t * this) {
     16void main(worker_t & this) {
    1717        for(int i = 0; i < N; i++) {
    1818                yield();
Note: See TracChangeset for help on using the changeset viewer.