Changeset 28f3a19 for src/tests/concurrent/signal/wait.c

Timestamp:

Jun 27, 2018, 3:28:41 PM (7 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

File:

• src/tests/concurrent/signal/wait.c (modified) (6 diffs)

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;
         }