Changeset 28f3a19 for src/tests/concurrent

Timestamp:

Jun 27, 2018, 3:28:41 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

b21c77a

Parents:

0182bfa (diff), 63238a4 (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' into with_gc

Location:

src/tests/concurrent

Files:

• coroutineYield.c (modified) (4 diffs)
• examples/datingService.c (modified) (4 diffs)
• preempt.c (modified) (4 diffs)
• signal/barge.c (deleted)
• signal/block.c (modified) (4 diffs)
• signal/disjoint.c (modified) (7 diffs)
• signal/wait.c (modified) (6 diffs)

src/tests/concurrent/coroutineYield.c

@@ -4 +4 @@
 #include <thread>
 #include <time>
+
+#define __kick_rate 150000ul
+#include "long_tests.h"
 
 #ifndef PREEMPTION_RATE
@@ -13 +16 @@
 }
 
-#ifdef LONG_TEST
+#ifdef TEST_LONG
 static const unsigned long N = 600_000ul;
 #else
@@ -23 +26 @@
 void main(Coroutine& this) {
         while(true) {
-                sout | "Coroutine 1" | endl;
+                #if !defined(TEST_FOREVER)
+                        sout | "Coroutine 1" | endl;
+                #endif
                 yield();
-                sout | "Coroutine 2" | endl;
+                #if !defined(TEST_FOREVER)
+                        sout | "Coroutine 2" | endl;
+                #endif
                 suspend();
         }
@@ -33 +40 @@
 int main(int argc, char* argv[]) {
         Coroutine c;
-        for(int i = 0; i < N; i++) {
-                sout | "Thread 1" | endl;
+        for(int i = 0; TEST(i < N); i++) {
+                #if !defined(TEST_FOREVER)
+                        sout | "Thread 1" | endl;
+                #endif
                 resume(c);
-                sout | "Thread 2" | endl;
+                #if !defined(TEST_FOREVER)
+                        sout | "Thread 2" | endl;
+                #endif
                 yield();
+                KICK_WATCHDOG;
         }
 }

src/tests/concurrent/examples/datingService.c

@@ -8 +8 @@
 // Created On       : Mon Oct 30 12:56:20 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar 14 22:48:40 2018
-// Update Count     : 23
+// Last Modified On : Sun May 27 09:05:18 2018
+// Update Count     : 26
 //
 
@@ -18 +18 @@
 #include <unistd.h>                                                                             // getpid
 
-enum { NoOfPairs = 20 };
+enum { CompCodes = 20 };                                                                // number of compatibility codes
 
 monitor DatingService {
-        condition Girls[NoOfPairs], Boys[NoOfPairs];
+        condition Girls[CompCodes], Boys[CompCodes];
         unsigned int GirlPhoneNo, BoyPhoneNo;
 }; // DatingService
@@ -47 +47 @@
 } // DatingService boy
 
-unsigned int girlck[NoOfPairs];
-unsigned int boyck[NoOfPairs];
+unsigned int girlck[CompCodes];
+unsigned int boyck[CompCodes];
 
 thread Girl {
@@ -88 +88 @@
 int main() {
         DatingService TheExchange;
-        Girl * girls[NoOfPairs];
-        Boy  * boys[NoOfPairs];
+        Girl * girls[CompCodes];
+        Boy  * boys[CompCodes];
 
         srandom( /*getpid()*/ 103 );
 
-        for ( unsigned int i = 0; i < NoOfPairs; i += 1 ) {
+        for ( unsigned int i = 0; i < CompCodes; i += 1 ) {
                 girls[i] = new( &TheExchange, i, i );
-                boys[i]  = new( &TheExchange, i, NoOfPairs - ( i + 1 ) );
+                boys[i]  = new( &TheExchange, i, CompCodes - ( i + 1 ) );
         } // for
 
-        for ( unsigned int i = 0; i < NoOfPairs; i += 1 ) {
+        for ( unsigned int i = 0; i < CompCodes; i += 1 ) {
                 delete( boys[i] );
                 delete( girls[i] );
         } // for
 
-        for ( unsigned int i = 0; i < NoOfPairs; i += 1 ) {
+        for ( unsigned int i = 0; i < CompCodes; i += 1 ) {
                 if ( girlck[ boyck[i] ] != boyck[ girlck[i] ] ) abort();
         } // for

src/tests/concurrent/preempt.c

@@ -2 +2 @@
 #include <thread>
 #include <time>
+
+#include "long_tests.h"
 
 #ifndef PREEMPTION_RATE
@@ -11 +13 @@
 }
 
-#ifdef LONG_TEST
+#ifdef TEST_LONG
 static const unsigned long N = 30_000ul;
 #else
@@ -30 +32 @@
 
 void main(worker_t & this) {
-        while(counter < N) {
+        while(TEST(counter < N)) {
                 __cfaabi_check_preemption();
                 if( (counter % 7) == this.value ) {
@@ -40 +42 @@
                 }
                 __cfaabi_check_preemption();
+                KICK_WATCHDOG;
         }
 }

src/tests/concurrent/signal/block.c

@@ -14 +14 @@
 #include <time>
 
+#include "long_tests.h"
+
 #ifndef PREEMPTION_RATE
 #define PREEMPTION_RATE 10`ms
@@ -22 +24 @@
 }
 
-#ifdef LONG_TEST
+#ifdef TEST_LONG
 static const unsigned long N = 150_000ul;
 #else
@@ -40 +42 @@
 }
 
-void ^?{} ( global_data_t & this ) {}
+void ^?{} ( global_data_t & mutex this ) {}
 
 global_data_t globalA, globalB;
@@ -66 +68 @@
 thread Waiter {};
 void main( Waiter & this ) {
-        for( int i = 0; i < N; i++ ) {
+        for( int i = 0; TEST(i < N); i++ ) {
                 wait_op( globalA, globalB, i );
+                KICK_WATCHDOG;
         }
 }

src/tests/concurrent/signal/disjoint.c

@@ -4 +4 @@
 #include <thread>
 #include <time>
+
+#include "long_tests.h"
 
 #ifndef PREEMPTION_RATE
@@ -13 +15 @@
 }
 
-#ifdef LONG_TEST
+#ifdef TEST_LONG
 static const unsigned long N = 300_000ul;
 #else
@@ -26 +28 @@
 monitor global_data_t;
 void ?{}( global_data_t & this );
-void ^?{} ( global_data_t & this );
+void ^?{} ( global_data_t & mutex this );
 
 monitor global_data_t {
@@ -42 +44 @@
 }
 
-void ^?{} ( global_data_t & this ) {}
+void ^?{} ( global_data_t & mutex this ) {}
 
 //------------------------------------------------------------------------------
@@ -67 +69 @@
         }
 
-        d.counter++;
+        #if !defined(TEST_FOREVER)
+                d.counter++;
+                if( (d.counter % 1000) == 0 ) sout | d.counter | endl;
+        #endif
 
-        if( (d.counter % 1000) == 0 ) sout | d.counter | endl;
-
-        return d.counter < N;
+        return TEST(d.counter < N);
 }
 
@@ -77 +80 @@
 
 void main( Waiter & this ) {
-        while( wait( mut, data ) ) { yield(); }
+        while( wait( mut, data ) ) { KICK_WATCHDOG; yield(); }
 }
 
@@ -94 +97 @@
 
         //This is technically a mutual exclusion violation but the mutex monitor protects us
-        bool running = data.counter < N && data.counter > 0;
+        bool running = TEST(data.counter < N) && data.counter > 0;
         if( data.state != SIGNAL && running ) {
                 sout | "ERROR Eager signal" | data.state | endl;

src/tests/concurrent/signal/wait.c

@@ -12 +12 @@
 #include <time>
 
+#define __kick_rate 12000ul
+#include "long_tests.h"
+
 #ifndef PREEMPTION_RATE
 #define PREEMPTION_RATE 10`ms
@@ -20 +23 @@
 }
 
-#ifdef LONG_TEST
+#ifdef TEST_LONG
 static const unsigned long N = 375_000ul;
 #else
@@ -90 +93 @@
 // Waiter ABC
 void main( WaiterABC & this ) {
-        for( int i = 0; i < N; i++ ) {
+        for( int i = 0; TEST(i < N); i++ ) {
                 wait( condABC, globalA, globalB, globalC );
+                KICK_WATCHDOG;
         }
 
@@ -100 +104 @@
 // Waiter AB
 void main( WaiterAB & this ) {
-        for( int i = 0; i < N; i++ ) {
+        for( int i = 0; TEST(i < N); i++ ) {
                 wait( condAB , globalA, globalB );
+                KICK_WATCHDOG;
         }
 
@@ -110 +115 @@
 // Waiter AC
 void main( WaiterAC & this ) {
-        for( int i = 0; i < N; i++ ) {
+        for( int i = 0; TEST(i < N); i++ ) {
                 wait( condAC , globalA, globalC );
+                KICK_WATCHDOG;
         }
 
@@ -120 +126 @@
 // Waiter BC
 void main( WaiterBC & this ) {
-        for( int i = 0; i < N; i++ ) {
+        for( int i = 0; TEST(i < N); i++ ) {
                 wait( condBC , globalB, globalC );
+                KICK_WATCHDOG;
         }