Changeset 28e58fd for src/tests/sched-int-barge.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-barge.c (modified) (4 diffs)

src/tests/sched-int-barge.c

@@ -28 +28 @@
 };
 
-void ?{} ( global_data_t * this ) {
-        this->done = false;
-        this->counter = 0;
-        this->state = BARGE;
+void ?{} ( global_data_t & this ) {
+        this.done = false;
+        this.counter = 0;
+        this.state = BARGE;
 
-        this->do_signal = 6;
-        this->do_wait1  = 1;
-        this->do_wait2  = 3;
+        this.do_signal = 6;
+        this.do_wait1  = 1;
+        this.do_wait2  = 3;
 }
 
-void ^?{} ( global_data_t * this ) {}
+void ^?{} ( global_data_t & this ) {}
 
 global_t globalA;
@@ -48 +48 @@
 thread Threads {};
 
-bool logicC( global_t * mutex a, global_t * mutex b, global_data_t * mutex c ) {
-        c->counter++;
+bool logicC( global_t & mutex a, global_t & mutex b, global_data_t & mutex c ) {
+        c.counter++;
 
-        if( (c->counter % 1000) == 0 ) sout | c->counter | endl;
+        if( (c.counter % 1000) == 0 ) sout | c.counter | endl;
 
-        int action = c->counter % 10;
+        int action = c.counter % 10;
 
         if( action == 0 ) {
-                c->do_signal = max( ((unsigned)rand48()) % 10, 1);
-                c->do_wait1 = ((unsigned)rand48()) % (c->do_signal);
-                c->do_wait2 = ((unsigned)rand48()) % (c->do_signal);
+                c.do_signal = max( ((unsigned)rand48()) % 10, 1);
+                c.do_wait1 = ((unsigned)rand48()) % (c.do_signal);
+                c.do_wait2 = ((unsigned)rand48()) % (c.do_signal);
 
-                if(c->do_wait1 == c->do_wait2) sout | "Same" | endl;
+                if(c.do_wait1 == c.do_wait2) sout | "Same" | endl;
         }
 
-        if( action == c->do_wait1 || action == c->do_wait2 ) {
-                c->state = WAIT;
+        if( action == c.do_wait1 || action == c.do_wait2 ) {
+                c.state = WAIT;
                 wait( &cond );
 
-                if(c->state != SIGNAL) {
-                        sout | "ERROR Barging detected" | c->counter | endl;
+                if(c.state != SIGNAL) {
+                        sout | "ERROR Barging detected" | c.counter | endl;
                         abort();
                 }
         }
-        else if( action == c->do_signal ) {
-                c->state = SIGNAL;
+        else if( action == c.do_signal ) {
+                c.state = SIGNAL;
 
                 signal( &cond );
@@ -79 +79 @@
         }
         else {
-                c->state = BARGE;
+                c.state = BARGE;
         }
 
-        if( c->counter >= N ) c->done = true;
-        return !c->done;
+        if( c.counter >= N ) c.done = true;
+        return !c.done;
 }
 
-bool logicB( global_t * mutex a, global_t * mutex b ) {
-        return logicC(a, b, &globalC);
+bool logicB( global_t & mutex a, global_t & mutex b ) {
+        return logicC(a, b, globalC);
 }
 
-bool logicA( global_t * mutex a ) {
-        return logicB(a, &globalB);
+bool logicA( global_t & mutex a ) {
+        return logicB(a, globalB);
 }
 
-void main( Threads* this ) {
-        while( logicA(&globalA) ) { yield(); };
+void main( Threads & this ) {
+        while( logicA(globalA) ) { yield(); };
 }
 
@@ -101 +101 @@
 
 int main(int argc, char* argv[]) {
-        rand48seed(0);
-        processor p;
-        {
-                Threads t[17];
-                the_threads = (thread_desc*)t;
-        }
+        rand48seed(0);
+        processor p;
+        {
+                Threads t[17];
+                the_threads = (thread_desc*)t;
+        }
 }