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

Timestamp:

Aug 27, 2018, 4:40:34 PM (7 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

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/wait.c (moved) (moved from src/tests/concurrent/signal/wait.c ) (6 diffs)

tests/concurrent/signal/wait.c

@@ -5 +5 @@
 
 
-#include <fstream>
-#include <kernel>
-#include <monitor>
-#include <stdlib>
-#include <thread>
+#include <fstream.hfa>
+#include <kernel.hfa>hfa>
+#include <monitor.hfa>
+#include <stdlib.hfa>
+#include <thread.hfa>
+#include <time.hfa>
 
-#include <time.h>
-
-static const unsigned long N = 2_500ul;
+#define __kick_rate 12000ul
+#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 = 375_000ul;
+#else
+static const unsigned long N = 2_500ul;
+#endif
 
 monitor global_t {};
@@ -87 +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;
         }
 
@@ -97 +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;
         }
 
@@ -107 +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;
         }
 
@@ -117 +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;
         }
 
@@ -127 +137 @@
 // Main
 int main(int argc, char* argv[]) {
-        random_seed( time( NULL ) );
+        srandom( time( NULL ) );
         waiter_left = 4;
         processor p[2];