Changeset f3c1737

Timestamp:

Jul 6, 2017, 4:19:42 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

3873b5a1

Parents:

955d27e9

Message:

Update longrun test to have consistent times and added missing tests

Location:

src/tests

Files:

• preempt_longrun/Makefile.am (modified) (3 diffs)
• preempt_longrun/Makefile.in (modified) (2 diffs)
• preempt_longrun/create.c (modified) (1 diff)
• preempt_longrun/enter.c (modified) (1 diff)
• preempt_longrun/processor.c (modified) (1 diff)
• preempt_longrun/yield.c (modified) (1 diff)
• sched-int-block.c (modified) (1 diff)
• sched-int-wait.c (modified) (2 diffs)
• thread.c (modified) (3 diffs)

src/tests/preempt_longrun/Makefile.am

@@ -10 +10 @@
 ## Author           : Thierry Delisle
 ## Created On       : Fri Jun 16 10:57:34 2017
-## Last Modified By : 
-## Last Modified On : 
+## Last Modified By :
+## Last Modified On :
 ## Update Count     : 0
 ###############################################################################
@@ -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

@@ -15 +15 @@
 
 int main(int argc, char* argv[]) {
-        for(int i = 0; i < 100_000ul; i++) {
+        for(int i = 0; i < 250_000ul; i++) {
                 Worker w;
         }

src/tests/preempt_longrun/enter.c

@@ -4 +4 @@
 
 #undef N
-static const unsigned long N  = 50_000ul;
+static const unsigned long N  = 70_000ul;
 
 #ifndef PREEMPTION_RATE

src/tests/preempt_longrun/processor.c

@@ -15 +15 @@
 
 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/yield.c

@@ -13 +13 @@
 
 void main(Worker * this) {
-        for(int i = 0; i < 100_000ul; i++) {
+        for(int i = 0; i < 325_000ul; i++) {
                 yield();
         }

src/tests/sched-int-block.c

@@ -6 +6 @@
 
 #ifndef N
-#define N 100_000
+#define N 10_000
 #endif
 

src/tests/sched-int-wait.c

@@ -50 +50 @@
                 unsigned action = (unsigned)rand48() % 4;
                 switch( action ) {
-                        case 0: 
+                        case 0:
                                 signal( &condABC, &globalA, &globalB, &globalC );
                                 break;
-                        case 1: 
+                        case 1:
                                 signal( &condAB , &globalA, &globalB );
                                 break;
-                        case 2: 
+                        case 2:
                                 signal( &condBC , &globalB, &globalC );
                                 break;
-                        case 3: 
+                        case 3:
                                 signal( &condAC , &globalA, &globalC );
                                 break;
@@ -67 +67 @@
                 }
                 yield();
-        }       
+        }
 }
 

src/tests/thread.c

@@ -4 +4 @@
 #include <thread>
 
-// thread First;
-// void main(First* this);
+thread First  { semaphore* lock; };
+thread Second { semaphore* lock; };
 
-// thread Second;
-// void main(Second* this);
-
-thread First  { signal_once* lock; };
-thread Second { signal_once* lock; };
-
-void ?{}( First * this, signal_once* lock ) { this->lock = lock; }
-void ?{}( Second * this, signal_once* lock ) { this->lock = lock; }
+void ?{}( First * this, semaphore* lock ) { this->lock = lock; }
+void ?{}( Second * this, semaphore* lock ) { this->lock = lock; }
 
 void main(First* this) {
@@ -21 +15 @@
                 yield();
         }
-        signal(this->lock);
+        V(this->lock);
 }
 
 void main(Second* this) {
-        wait(this->lock);
+        P(this->lock);
         for(int i = 0; i < 10; i++) {
                 sout | "Second : Suspend No." | i + 1 | endl;
@@ -34 +28 @@
 
 int main(int argc, char* argv[]) {
-        signal_once lock;
+        semaphore lock = { 0 };
         sout | "User main begin" | endl;
         {