Changes in src/tests/concurrent/signal/block.c [0f56058:70969f8]

File:

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

src/tests/concurrent/signal/block.c

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