Changeset 28e58fd for src/tests/sched-int-block.c

Timestamp:

Aug 25, 2017, 10:38:34 AM (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, resolv-new, with_gc

Children:

800d275

Parents:

af08051 (diff), 3eab308c (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:

• src/tests/sched-int-block.c (modified) (5 diffs)

src/tests/sched-int-block.c

@@ -24 +24 @@
 };
 
-void ?{} ( global_data_t * this ) {
-        this->last_thread = NULL;
-        this->last_signaller = NULL;
+void ?{} ( global_data_t & this ) {
+        this.last_thread = NULL;
+        this.last_signaller = NULL;
 }
 
-void ^?{} ( global_data_t * this ) {}
+void ^?{} ( global_data_t & this ) {}
 
 global_data_t globalA, globalB;
@@ -38 +38 @@
 
 //------------------------------------------------------------------------------
-void wait_op( global_data_t * mutex a, global_data_t * mutex b, unsigned i ) {
+void wait_op( global_data_t & mutex a, global_data_t & mutex b, unsigned i ) {
         wait( &cond, (uintptr_t)this_thread );
 
         yield( ((unsigned)rand48()) % 10 );
 
-        if(a->last_thread != a->last_signaller || b->last_thread != b->last_signaller ) {
-                sout | "ERROR Barging detected, expected" | a->last_signaller | b->last_signaller | "got" | a->last_thread | b->last_thread | endl;
+        if(a.last_thread != a.last_signaller || b.last_thread != b.last_signaller ) {
+                sout | "ERROR Barging detected, expected" | a.last_signaller | b.last_signaller | "got" | a.last_thread | b.last_thread | endl;
                 abort();
         }
 
-        a->last_thread = b->last_thread = this_thread;
+        a.last_thread = b.last_thread = this_thread;
 
         yield( ((unsigned)rand48()) % 10 );
@@ -54 +54 @@
 
 thread Waiter {};
-void main( Waiter* this ) {
+void main( Waiter & this ) {
         for( int i = 0; i < N; i++ ) {
-                wait_op( &globalA, &globalB, i );
+                wait_op( globalA, globalB, i );
         }
 }
 
 //------------------------------------------------------------------------------
-void signal_op( global_data_t * mutex a, global_data_t * mutex b ) {
+void signal_op( global_data_t & mutex a, global_data_t & mutex b ) {
         yield( ((unsigned)rand48()) % 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] = this_thread;
 
         if( !is_empty( &cond ) ) {
@@ -77 +77 @@
                 yield( ((unsigned)rand48()) % 10 );
 
-                if(a->last_thread != next || b->last_thread != next) {
-                        sout | "ERROR Barging detected, expected" | next | "got" | a->last_thread | b->last_thread | endl;
+                if(a.last_thread != next || b.last_thread != next) {
+                        sout | "ERROR Barging detected, expected" | next | "got" | a.last_thread | b.last_thread | endl;
                         abort();
                 }
@@ -86 +86 @@
 
 thread Signaller {};
-void main( Signaller* this ) {
+void main( Signaller & this ) {
         while( !done ) {
-                signal_op( &globalA, &globalB );
+                signal_op( globalA, globalB );
         }
 }
 
 //------------------------------------------------------------------------------
-void barge_op( global_data_t * mutex a ) {
-        a->last_thread = this_thread;
+void barge_op( global_data_t & mutex a ) {
+        a.last_thread = this_thread;
 }
 
 thread Barger {};
-void main( Barger* this ) {
+void main( Barger & this ) {
         for( unsigned i = 0; !done; i++ ) {
                 //Choose some monitor to barge into with some irregular pattern
                 bool choose_a = (i % 13) > (i % 17);
-                barge_op( choose_a ? &globalA : &globalB );
+                if ( choose_a ) barge_op( globalA );
+                else barge_op( globalB );
         }
 }