Changeset 74e58ea3

Timestamp:

Jun 23, 2017, 4:22:53 PM (7 years ago)

Author:

Aaron Moss <a3moss@…>

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:

6ce3ae9, f7b9faf

Parents:

376ccadc (diff), 4c03e63 (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:

• src/tests/preempt_longrun/Makefile.am (modified) (1 diff)
• src/tests/preempt_longrun/Makefile.in (modified) (1 diff)
• src/tests/preempt_longrun/barge.c (added)
• src/tests/preempt_longrun/block.c (added)
• src/tests/preempt_longrun/disjoint.c (added)
• src/tests/preempt_longrun/wait.c (added)
• src/tests/sched-int-block.c (modified) (1 diff)
• src/tests/sched-int-disjoint.c (modified) (1 diff)
• src/tests/sched-int-wait.c (modified) (1 diff)
• tools/repeat (modified) (1 diff)

src/tests/preempt_longrun/Makefile.am

@@ -26 +26 @@
 CC = @CFA_BINDIR@/@CFA_NAME@
 
-TESTS = create stack yield
+TESTS = barge block create disjoint processor stack wait yield
 
 .INTERMEDIATE: ${TESTS}

src/tests/preempt_longrun/Makefile.in

@@ -183 +183 @@
 REPEAT = ${abs_top_srcdir}/tools/repeat -s
 BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -debug -O2 -DN=${N} -DPREEMPTION_RATE=${preempt}
-TESTS = create stack yield
+TESTS = barge block create disjoint processor stack wait yield
 all: all-am
 

src/tests/sched-int-block.c

@@ -5 +5 @@
 #include <thread>
 
-static const unsigned N = 100_000;
+#ifndef N
+#define N 100_000
+#endif
 
 enum state_t { WAITED, SIGNAL, BARGE };

src/tests/sched-int-disjoint.c

@@ -4 +4 @@
 #include <thread>
 
+#ifndef N
 #define N 100_000
+#endif
 
 enum state_t { WAIT, SIGNAL, BARGE };

src/tests/sched-int-wait.c

@@ -5 +5 @@
 #include <thread>
 
-static const int N = 10_000;
+#ifndef N
+#define N 10_000
+#endif
 
 monitor global_t {};

tools/repeat

@@ -20 +20 @@
 for (( i = 0; i < ITERATION; i ++ )); do
         echo -ne "\r$i / $ITERATION"
-        $@ &
+        $@ > /dev/null &
         child=$! 
         wait "$child"