Changeset b067d9b for tests/concurrent/signal/block.cfa

Timestamp:

Oct 29, 2019, 4:01:24 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

773db65, 9421f3d8

Parents:

7951100 (diff), 8364209 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

tests/concurrent/signal/block.cfa

@@ -7 +7 @@
 
 
-#include <fstream>
-#include <kernel>
-#include <monitor>
-#include <stdlib>
-#include <thread>
-#include <time>
+#include <fstream.hfa>
+#include <kernel.hfa>
+#include <monitor.hfa>
+#include <stdlib.hfa>
+#include <thread.hfa>
+#include <time.hfa>
+
+#include "long_tests.hfa"
 
 #ifndef PREEMPTION_RATE
@@ -22 +24 @@
 }
 
-#ifdef LONG_TEST
+#ifdef TEST_LONG
 static const unsigned long N = 150_000ul;
 #else
@@ -55 +57 @@
 
         if(a.last_thread != a.last_signaller || b.last_thread != b.last_signaller ) {
-                sout | "ERROR Barging detected, expected" | a.last_signaller | b.last_signaller | "got" | a.last_thread | b.last_thread | endl;
+                sout | "ERROR Barging detected, expected" | a.last_signaller | b.last_signaller | "got" | a.last_thread | b.last_thread;
                 abort();
         }
@@ -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;
         }
 }
@@ -82 +85 @@
 
                 if( ! signal_block( cond ) ) {
-                        sout | "ERROR expected to be able to signal" | endl;
+                        sout | "ERROR expected to be able to signal";
                         abort();
                 }
@@ -89 +92 @@
 
                 if(a.last_thread != next || b.last_thread != next) {
-                        sout | "ERROR Barging detected, expected" | next | "got" | a.last_thread | b.last_thread | endl;
+                        sout | "ERROR Barging detected, expected" | next | "got" | a.last_thread | b.last_thread;
                         abort();
                 }
@@ -127 +130 @@
                 Signaller s[4];
                 Barger b[13];
-                sout | "Starting waiters" | endl;
+                sout | "Starting waiters";
                 {
                         Waiter w[3];
                 }
-                sout | "Waiters done" | endl;
+                sout | "Waiters done";
                 done = true;
         }