Changeset 3f7e12cb for src/tests/sched-int-disjoint.c

Timestamp:

Nov 8, 2017, 5:43:33 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

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:

954908d

Parents:

78315272 (diff), e35f30a (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-disjoint.c (modified) (4 diffs)

src/tests/sched-int-disjoint.c

@@ -59 +59 @@
 // Waiting logic
 bool wait( global_t & mutex m, global_data_t & mutex d ) {
-        wait( &cond );
+        wait( cond );
         if( d.state != SIGNAL ) {
                 sout | "ERROR barging!" | endl;
@@ -80 +80 @@
 //------------------------------------------------------------------------------
 // Signalling logic
-void signal( condition * cond, global_t & mutex a, global_data_t & mutex b ) {
+void signal( condition & cond, global_t & mutex a, global_data_t & mutex b ) {
         b.state = SIGNAL;
         signal( cond );
@@ -86 +86 @@
 
 void logic( global_t & mutex a ) {
-        signal( &cond, a, data );
+        signal( cond, a, data );
 
-        yield( (unsigned)rand48() % 10 );
+        yield( random( 10 ) );
 
         //This is technically a mutual exclusion violation but the mutex monitor protects us
@@ -109 +109 @@
 // Main loop
 int main(int argc, char* argv[]) {
-        rand48seed( time( NULL ) );
+        random_seed( time( NULL ) );
         all_done = false;
         processor p;