Changeset 957453d for src/tests/preempt_longrun

Timestamp:

Jul 20, 2017, 2:05:44 PM (8 years ago)

Author:

Andrew Beach <ajbeach@…>

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:

c72f9fd

Parents:

d49bfa8 (diff), 8b28a52 (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

Location:

src/tests/preempt_longrun

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (2 diffs)
• barge.c (deleted)
• create.c (modified) (2 diffs)
• enter.c (modified) (1 diff)
• enter3.c (modified) (1 diff)
• processor.c (modified) (2 diffs)
• yield.c (modified) (2 diffs)

src/tests/preempt_longrun/Makefile.am

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

src/tests/preempt_longrun/Makefile.in

@@ -453 +453 @@
 REPEAT = ${abs_top_srcdir}/tools/repeat -s
 BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -debug -O2 -DPREEMPTION_RATE=${preempt}
-TESTS = barge block create disjoint enter enter3 processor stack wait yield
+TESTS = block create disjoint enter enter3 processor stack wait yield
 all: all-am
 
@@ -635 +635 @@
                 TEST_LOGS="$$log_list"; \
         exit $$?
-barge.log: barge
-        @p='barge'; \
-        b='barge'; \
-        $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-        --log-file $$b.log --trs-file $$b.trs \
-        $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-        "$$tst" $(AM_TESTS_FD_REDIRECT)
 block.log: block
         @p='block'; \

src/tests/preempt_longrun/create.c

@@ -1 +1 @@
 #include <kernel>
 #include <thread>
+
+static const unsigned long N = 2_000ul;
 
 #ifndef PREEMPTION_RATE
@@ -16 +18 @@
 int main(int argc, char* argv[]) {
         processor p;
-        for(int i = 0; i < 10_000ul; i++) {
+        for(int i = 0; i < N; i++) {
                 worker_t w[7];
         }

src/tests/preempt_longrun/enter.c

@@ -3 +3 @@
 #include <thread>
 
-#undef N
 static const unsigned long N  = 70_000ul;
 

src/tests/preempt_longrun/enter3.c

@@ -3 +3 @@
 #include <thread>
 
-#undef N
 static const unsigned long N  = 50_000ul;
 

src/tests/preempt_longrun/processor.c

@@ -1 +1 @@
 #include <kernel>
 #include <thread>
+
+static const unsigned long N = 5_000ul;
 
 #ifndef PREEMPTION_RATE
@@ -15 +17 @@
 
 int main(int argc, char* argv[]) {
-        for(int i = 0; i < 10_000ul; i++) {
+        for(int i = 0; i < N; i++) {
                 processor p;
         }

src/tests/preempt_longrun/yield.c

@@ -1 +1 @@
 #include <kernel>
 #include <thread>
+
+static const unsigned long N = 325_000ul;
 
 #ifndef PREEMPTION_RATE
@@ -13 +15 @@
 
 void main(worker_t * this) {
-        for(int i = 0; i < 325_000ul; i++) {
+        for(int i = 0; i < N; i++) {
                 yield();
         }