Changeset ef6851a for src/tests/preempt_longrun

Timestamp:

Jul 12, 2017, 9:50:58 PM (9 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, stuck-waitfor-destruct, with_gc

Children:

1a6e855

Parents:

8b47e50 (diff), acb89ed2 (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

Location:

src/tests/preempt_longrun

Files:

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

src/tests/preempt_longrun/Makefile.am

@@ -17 +17 @@
 repeats=10
 max_time=30
-preempt=10_000ul
+preempt=1_000ul
 
 REPEAT = ${abs_top_srcdir}/tools/repeat -s
@@ -25 +25 @@
 CC = @CFA_BINDIR@/@CFA_NAME@
 
-TESTS = barge block create disjoint processor stack wait yield
+TESTS = barge block create disjoint enter enter3 processor stack wait yield
 
 .INTERMEDIATE: ${TESTS}

src/tests/preempt_longrun/Makefile.in

@@ -450 +450 @@
 repeats = 10
 max_time = 30
-preempt = 10_000ul
+preempt = 1_000ul
 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 processor stack wait yield
+TESTS = barge block create disjoint enter enter3 processor stack wait yield
 all: all-am
 
@@ -663 +663 @@
         $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
         "$$tst" $(AM_TESTS_FD_REDIRECT)
+enter.log: enter
+        @p='enter'; \
+        b='enter'; \
+        $(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)
+enter3.log: enter3
+        @p='enter3'; \
+        b='enter3'; \
+        $(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)
 processor.log: processor
         @p='processor'; \

src/tests/preempt_longrun/create.c

@@ -10 +10 @@
 }
 
-thread Worker {};
+thread worker_t {};
 
-void main(Worker * this) {}
+void main(worker_t * this) {}
 
 int main(int argc, char* argv[]) {
-        for(int i = 0; i < 100_000ul; i++) {
-                Worker w;
+        for(int i = 0; i < 10_000ul; i++) {
+                worker_t w[7];
         }
 }

src/tests/preempt_longrun/processor.c

@@ -10 +10 @@
 }
 
-thread Worker {};
+thread worker_t {};
 
-void main(Worker * this) {}
+void main(worker_t * this) {}
 
 int main(int argc, char* argv[]) {
-        for(int i = 0; i < 100_000ul; i++) {
+        for(int i = 0; i < 10_000ul; i++) {
                 processor p;
         }

src/tests/preempt_longrun/stack.c

@@ -12 +12 @@
 }
 
-thread Worker {};
+thread worker_t {};
 
-void main(Worker * this) {
+void main(worker_t * this) {
         volatile long p = 5_021_609ul;
         volatile long a = 326_417ul;
         volatile long n = 1l;
-        for (volatile long i = 0; i < p; i++) { 
-                n *= a; 
-                n %= p; 
+        for (volatile long i = 0; i < p; i++) {
+                n *= a;
+                n %= p;
         }
-                
+
         if( n != a ) {
                 abort();
@@ -28 +28 @@
 }
 
+extern "C" {
+static worker_t * workers;
+}
+
 int main(int argc, char* argv[]) {
         processor p;
         {
-                Worker w[7];
+                worker_t w[7];
+                workers = w;
         }
 }

src/tests/preempt_longrun/yield.c

@@ -10 +10 @@
 }
 
-thread Worker {};
+thread worker_t {};
 
-void main(Worker * this) {
-        for(int i = 0; i < 100_000ul; i++) {
+void main(worker_t * this) {
+        for(int i = 0; i < 325_000ul; i++) {
                 yield();
         }
+}
+
+extern "C" {
+static worker_t * workers;
 }
 
@@ -21 +25 @@
         processor p;
         {
-                Worker w[7];
+                worker_t w[7];
+                workers = w;
         }
 }