Changeset 28f3a19 for src/tests/preempt_longrun/enter.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/preempt_longrun/enter.c (modified) (3 diffs)

src/tests/preempt_longrun/enter.c

@@ -3 +3 @@
 #include <thread>
 #include <time>
+
+#define __kick_rate 75000ul
+#include "long_tests.h"
 
 #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;
         }
 }