Changeset 281806b

Timestamp:

Jan 31, 2018, 5:49:46 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, 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:

• .gitignore (modified) (1 diff)
• src/tests/preempt_longrun/Makefile.am (modified) (2 diffs)
• src/tests/preempt_longrun/Makefile.in (modified) (2 diffs)
• src/tests/preempt_longrun/block.c (modified) (1 diff)
• src/tests/preempt_longrun/create.c (modified) (1 diff)
• src/tests/preempt_longrun/disjoint.c (modified) (1 diff)
• src/tests/preempt_longrun/enter.c (modified) (1 diff)
• src/tests/preempt_longrun/enter3.c (modified) (1 diff)
• src/tests/preempt_longrun/processor.c (modified) (1 diff)
• src/tests/preempt_longrun/stack.c (modified) (1 diff)
• src/tests/preempt_longrun/wait.c (modified) (1 diff)
• src/tests/preempt_longrun/yield.c (modified) (1 diff)

.gitignore

@@ -11 +11 @@
 /Makefile
 src/**/Makefile
+tools/**/Makefile
 /version
 

src/tests/preempt_longrun/Makefile.am

@@ -19 +19 @@
 preempt=1_000ul
 
-REPEAT = ${abs_top_srcdir}/tools/repeat -s
+REPEAT = ${abs_top_srcdir}/tools/repeat
+TIME = /usr/bin/time -f "%E"
 
 BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -debug -O2 -DPREEMPTION_RATE=${preempt}
@@ -37 +38 @@
         ${AM_V_GEN}${CC} ${CFLAGS} ${<} -o ${@}
 
-%.run : %
-        @ time ${REPEAT} $(repeats) timeout ${max_time} ./${<}
+%.run : % ${REPEAT}
+        @ time ${REPEAT} -r out.log -i -s $(repeats) timeout ${max_time} ./${<}
         @ rm ${<}
         @ echo -e "${<}: SUCCESS\n"
+
+%.time : % ${REPEAT}
+        @ ${REPEAT} -i -s -- $(repeats) $(TIME) -a -o times.log ./${<}
+        @ rm ${<}
+        @ echo -e "${<}: SUCCESS\n"
+
+${REPEAT}:
+        @+make -C ${abs_top_srcdir}/tools/

src/tests/preempt_longrun/Makefile.in

@@ -451 +451 @@
 max_time = 600
 preempt = 1_000ul
-REPEAT = ${abs_top_srcdir}/tools/repeat -s
+REPEAT = ${abs_top_srcdir}/tools/repeat
+TIME = /usr/bin/time -f "%E"
 BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -debug -O2 -DPREEMPTION_RATE=${preempt}
 TESTS = block create disjoint enter enter3 processor stack wait yield
@@ -874 +875 @@
         ${AM_V_GEN}${CC} ${CFLAGS} ${<} -o ${@}
 
-%.run : %
-        @ time ${REPEAT} $(repeats) timeout ${max_time} ./${<}
+%.run : % ${REPEAT}
+        @ time ${REPEAT} -r out.log -i -s $(repeats) timeout ${max_time} ./${<}
         @ rm ${<}
         @ echo -e "${<}: SUCCESS\n"
+
+%.time : % ${REPEAT}
+        @ ${REPEAT} -i -s -- $(repeats) $(TIME) -a -o times.log ./${<}
+        @ rm ${<}
+        @ echo -e "${<}: SUCCESS\n"
+
+${REPEAT}:
+        @+make -C ${abs_top_srcdir}/tools/
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

src/tests/preempt_longrun/block.c

@@ -1 @@
-../sched-int-block.c
+../concurrent/signal/block.c

src/tests/preempt_longrun/create.c

@@ -14 +14 @@
 thread worker_t {};
 
-void main(worker_t * this) {}
+void main(worker_t & this) {}
 
 int main(int argc, char* argv[]) {

src/tests/preempt_longrun/disjoint.c

@@ -1 @@
-../sched-int-disjoint.c
+../concurrent/signal/disjoint.c

src/tests/preempt_longrun/enter.c

@@ -17 +17 @@
 mon_t mon;
 
-void foo( mon_t * mutex this ) {}
+void foo( mon_t & mutex this ) {}
 
 thread worker_t {};
 
-void main( worker_t * this ) {
+void main( worker_t & this ) {
         for( unsigned long i = 0; i < N; i++ ) {
-                foo( &mon );
+                foo( mon );
         }
 }

src/tests/preempt_longrun/enter3.c

@@ -17 +17 @@
 mon_t mon1, mon2, mon3;
 
-void foo( mon_t * mutex a, mon_t * mutex b, mon_t * mutex c ) {}
+void foo( mon_t & mutex a, mon_t & mutex b, mon_t & mutex c ) {}
 
 thread worker_t {};
 
-void main( worker_t * this ) {
+void main( worker_t & this ) {
         for( unsigned long i = 0; i < N; i++ ) {
-                foo( &mon1, &mon2, &mon3 );
+                foo( mon1, mon2, mon3 );
         }
 }

src/tests/preempt_longrun/processor.c

@@ -14 +14 @@
 thread worker_t {};
 
-void main(worker_t * this) {}
+void main(worker_t & this) {}
 
 int main(int argc, char* argv[]) {

src/tests/preempt_longrun/stack.c

@@ -14 +14 @@
 thread worker_t {};
 
-void main(worker_t * this) {
+void main(worker_t & this) {
         volatile long long p = 5_021_609ul;
         volatile long long a = 326_417ul;

src/tests/preempt_longrun/wait.c

@@ -1 @@
-../sched-int-wait.c
+../concurrent/signal/wait.c

src/tests/preempt_longrun/yield.c

@@ -14 +14 @@
 thread worker_t {};
 
-void main(worker_t * this) {
+void main(worker_t & this) {
         for(int i = 0; i < N; i++) {
                 yield();