Changeset 1cdfa82 for src/tests/concurrent/signal/block.c

Timestamp:

Apr 25, 2018, 4:55:53 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

42107b4

Parents:

2efe4b8 (diff), 9d5fb67 (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 remote-tracking branch 'origin/master' into with_gc

File:

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

src/tests/concurrent/signal/block.c

@@ -12 +12 @@
 #include <stdlib>
 #include <thread>
-
-#include <time.h>
+#include <time>
 
 #ifdef LONG_TEST
@@ -22 +21 @@
 
 #ifndef PREEMPTION_RATE
-#define PREEMPTION_RATE 10_000ul
+#define PREEMPTION_RATE 10`ms
 #endif
 
-unsigned int default_preemption() {
+Duration default_preemption() {
         return PREEMPTION_RATE;
 }
@@ -51 +50 @@
 //------------------------------------------------------------------------------
 void wait_op( global_data_t & mutex a, global_data_t & mutex b, unsigned i ) {
-        wait( cond, (uintptr_t)this_thread );
+    wait( cond, (uintptr_t)active_thread() );
 
         yield( random( 10 ) );
@@ -60 +59 @@
         }
 
-        a.last_thread = b.last_thread = this_thread;
+        a.last_thread = b.last_thread = active_thread();
 
         yield( random( 10 ) );
@@ -76 +75 @@
         yield( random( 10 ) );
 
-        [a.last_thread, b.last_thread, a.last_signaller, b.last_signaller] = this_thread;
+        [a.last_thread, b.last_thread, a.last_signaller, b.last_signaller] = active_thread();
 
         if( !is_empty( cond ) ) {
@@ -106 +105 @@
 //------------------------------------------------------------------------------
 void barge_op( global_data_t & mutex a ) {
-        a.last_thread = this_thread;
+        a.last_thread = active_thread();
 }