Changeset 28f3a19 for src/tests/concurrent/signal/block.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/block.c (modified) (4 diffs)

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