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

src/tests/sched-int-wait.c

@@ +1 @@
+//---------------------------------------------------------
+// Multi wait test
+// Ensures that no deadlock from waiting/signalling conditions
+//---------------------------------------------------------
+
+
 #include <fstream>
 #include <kernel>
@@ -35 +41 @@
 //----------------------------------------------------------------------------------------------------
 // Tools
-void signal( condition * cond, global_t & mutex a, global_t & mutex b ) {
+void signal( condition & cond, global_t & mutex a, global_t & mutex b ) {
         signal( cond );
 }
 
-void signal( condition * cond, global_t & mutex a, global_t & mutex b, global_t & mutex c ) {
+void signal( condition & cond, global_t & mutex a, global_t & mutex b, global_t & mutex c ) {
         signal( cond );
 }
 
-void wait( condition * cond, global_t & mutex a, global_t & mutex b ) {
+void wait( condition & cond, global_t & mutex a, global_t & mutex b ) {
         wait( cond );
 }
 
-void wait( condition * cond, global_t & mutex a, global_t & mutex b, global_t & mutex c ) {
+void wait( condition & cond, global_t & mutex a, global_t & mutex b, global_t & mutex c ) {
         wait( cond );
 }
@@ -56 +62 @@
 
         while( waiter_left != 0 ) {
-                unsigned action = (unsigned)rand48() % 4;
+                unsigned action = random( 4 );
                 switch( action ) {
                         case 0:
-                                signal( &condABC, globalA, globalB, globalC );
+                                signal( condABC, globalA, globalB, globalC );
                                 break;
                         case 1:
-                                signal( &condAB , globalA, globalB );
+                                signal( condAB , globalA, globalB );
                                 break;
                         case 2:
-                                signal( &condBC , globalB, globalC );
+                                signal( condBC , globalB, globalC );
                                 break;
                         case 3:
-                                signal( &condAC , globalA, globalC );
+                                signal( condAC , globalA, globalC );
                                 break;
                         default:
@@ -82 +88 @@
 void main( WaiterABC & this ) {
         for( int i = 0; i < N; i++ ) {
-                wait( &condABC, globalA, globalB, globalC );
+                wait( condABC, globalA, globalB, globalC );
         }
 
@@ -92 +98 @@
 void main( WaiterAB & this ) {
         for( int i = 0; i < N; i++ ) {
-                wait( &condAB , globalA, globalB );
+                wait( condAB , globalA, globalB );
         }
 
@@ -102 +108 @@
 void main( WaiterAC & this ) {
         for( int i = 0; i < N; i++ ) {
-                wait( &condAC , globalA, globalC );
+                wait( condAC , globalA, globalC );
         }
 
@@ -112 +118 @@
 void main( WaiterBC & this ) {
         for( int i = 0; i < N; i++ ) {
-                wait( &condBC , globalB, globalC );
+                wait( condBC , globalB, globalC );
         }
 
@@ -121 +127 @@
 // Main
 int main(int argc, char* argv[]) {
-        rand48seed( time( NULL ) );
+        random_seed( time( NULL ) );
         waiter_left = 4;
         processor p[2];