Changeset 90152a4 for tests/concurrent/signal/disjoint.c

Timestamp:

Aug 27, 2018, 4:40:34 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

b7c89aa

Parents:

f9feab8 (diff), 305581d (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 cleanup-dtors

File:

• tests/concurrent/signal/disjoint.c (moved) (moved from src/tests/concurrent/signal/disjoint.c ) (7 diffs)

tests/concurrent/signal/disjoint.c

@@ -1 @@
-#include <fstream>
-#include <kernel>
-#include <monitor>
-#include <thread>
+#include <fstream.hfa>
+#include <kernel.hfa>hfa>
+#include <monitor.hfa>
+#include <thread.hfa>
+#include <time.hfa>
 
-#include <time.h>
-
-static const unsigned long N = 10_000ul;
+#include "long_tests.h"
 
 #ifndef PREEMPTION_RATE
-#define PREEMPTION_RATE 10_000ul
+#define PREEMPTION_RATE 10`ms
 #endif
 
-unsigned int default_preemption() {
+Duration default_preemption() {
         return PREEMPTION_RATE;
 }
+
+#ifdef TEST_LONG
+static const unsigned long N = 300_000ul;
+#else
+static const unsigned long N = 10_000ul;
+#endif
 
 enum state_t { WAIT, SIGNAL, BARGE };
@@ -23 +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 {
@@ -39 +44 @@
 }
 
-void ^?{} ( global_data_t & this ) {}
+void ^?{} ( global_data_t & mutex this ) {}
 
 //------------------------------------------------------------------------------
@@ -64 +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);
 }
 
@@ -74 +80 @@
 
 void main( Waiter & this ) {
-        while( wait( mut, data ) ) { yield(); }
+        while( wait( mut, data ) ) { KICK_WATCHDOG; yield(); }
 }
 
@@ -91 +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;
@@ -109 +115 @@
 // Main loop
 int main(int argc, char* argv[]) {
-        random_seed( time( NULL ) );
+        srandom( time( NULL ) );
         all_done = false;
         processor p;