Changeset b067d9b for longrun_tests/enter.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:

• longrun_tests/enter.cfa (moved) (moved from src/tests/preempt_longrun/enter.c ) (3 diffs)

longrun_tests/enter.cfa

@@ -1 @@
-#include <kernel>
-#include <monitor>
-#include <thread>
-#include <time>
+#include <kernel.hfa>
+#include <monitor.hfa>
+#include <thread.hfa>
+#include <time.hfa>
+
+#define __kick_rate 75000ul
+#include "long_tests.hfa"
 
 #ifndef PREEMPTION_RATE
@@ -15 +18 @@
 
 monitor mon_t {};
+void foo( mon_t & mutex this ) {
+        KICK_WATCHDOG;
+}
 
 mon_t mon;
-
-void foo( mon_t & mutex this ) {}
-
 thread worker_t {};
-
 void main( worker_t & this ) {
-        for( unsigned long i = 0; i < N; i++ ) {
+        for( unsigned long i = 0; TEST(i < N); i++ ) {
                 foo( mon );
         }
-}
-
-extern "C" {
-static worker_t * workers;
 }
 
@@ -36 +34 @@
         {
                 worker_t w[7];
-                workers = w;
         }
 }