Changeset 3f7e12cb for src/tests/sched-ext.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-ext.c (modified) (5 diffs)

src/tests/sched-ext.c

@@ -26 +26 @@
 volatile bool done;
 
-unsigned rand10() {
-        return (unsigned)rand48() % 10;
-}
-
 //----------------------------------------------------------------------------------------------------
 // Acceptor
@@ -36 +32 @@
 void do_wait( global_t * mutex a ) {
         sout | "Waiting to accept" | endl;
-        yield( rand10() );
+        yield( random( 10 ) );
 
         sout | "Accepting" | endl;
@@ -45 +41 @@
         acceptable.monitors      = &a;
 
-        __accept_internal( 1, &acceptable );
+        __waitfor_internal( 1, &acceptable );
 
         sout | "Accepted" | endl;
-        yield( rand10() );
+        yield( random( 10 ) );
 }
 
@@ -68 +64 @@
 void main( Acceptee* this ) {
         while( !done ) {
-                yield( rand10() );
+                yield( random( 10 ) );
                 do_notify( &globalA );
-                yield( rand10() );
+                yield( random( 10 ) );
         }
 }
@@ -78 +74 @@
 int main(int argc, char* argv[]) {
         done = false;
-        rand48seed( time( NULL ) );
+        random_seed( time( NULL ) );
         printf("%p\n", &globalA);
         sout | "Starting" | endl;