Changeset 32cab5b for src/tests/concurrent/signal

Timestamp:

Apr 17, 2018, 12:01:09 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct, with_gc

Children:

3265399

Parents:

b2fe1c9 (diff), 81bb114 (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

Location:

src/tests/concurrent/signal

Files:

• barge.c (modified) (1 diff)
• block.c (modified) (6 diffs)
• disjoint.c (modified) (2 diffs)
• wait.c (modified) (2 diffs)

src/tests/concurrent/signal/barge.c

@@ -16 +16 @@
 
 #ifndef PREEMPTION_RATE
-#define PREEMPTION_RATE 10_000ul
+#define PREEMPTION_RATE 10`ms
 #endif
 
-unsigned int default_preemption() {
+Duration default_preemption() {
         return 0;
 }

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();
 }
 

src/tests/concurrent/signal/disjoint.c

@@ -3 +3 @@
 #include <monitor>
 #include <thread>
-
-#include <time.h>
+#include <time>
 
 #ifdef LONG_TEST
@@ -13 +12 @@
 
 #ifndef PREEMPTION_RATE
-#define PREEMPTION_RATE 10_000ul
+#define PREEMPTION_RATE 10`ms
 #endif
 
-unsigned int default_preemption() {
+Duration default_preemption() {
         return PREEMPTION_RATE;
 }

src/tests/concurrent/signal/wait.c

@@ -10 +10 @@
 #include <stdlib>
 #include <thread>
-
-#include <time.h>
+#include <time>
 
 #ifdef LONG_TEST
@@ -20 +19 @@
 
 #ifndef PREEMPTION_RATE
-#define PREEMPTION_RATE 10_000ul
+#define PREEMPTION_RATE 10`ms
 #endif
 
-unsigned int default_preemption() {
+Duration default_preemption() {
         return PREEMPTION_RATE;
 }