Changeset 971d9f2 for src/tests/concurrent/examples

Timestamp:

Dec 6, 2017, 8:01:23 AM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

16988e8

Parents:

65197c2

Message:

add "with" clause to test programs

Location:

src/tests/concurrent/examples

Files:

• .expect/datingService.txt (modified) (1 diff)
• boundedBuffer.c (modified) (2 diffs)
• datingService.c (modified) (5 diffs)
• matrixSum.c (modified) (2 diffs)

src/tests/concurrent/examples/.expect/datingService.txt

@@ +1 @@
+Girl:17 is dating Boy at 2 with ccode 17
+ Boy:2 is dating Girl 17 with ccode 17
+ Boy:14 is dating Girl 5 with ccode 5
+Girl:5 is dating Boy at 14 with ccode 5
+ Boy:9 is dating Girl 10 with ccode 10
+Girl:10 is dating Boy at 9 with ccode 10
+ Boy:1 is dating Girl 18 with ccode 18
+Girl:18 is dating Boy at 1 with ccode 18
+ Boy:16 is dating Girl 3 with ccode 3
+Girl:3 is dating Boy at 16 with ccode 3
+ Boy:5 is dating Girl 14 with ccode 14
+Girl:14 is dating Boy at 5 with ccode 14
+ Boy:15 is dating Girl 4 with ccode 4
+Girl:4 is dating Boy at 15 with ccode 4
+Girl:0 is dating Boy at 19 with ccode 0
+ Boy:19 is dating Girl 0 with ccode 0
+Girl:9 is dating Boy at 10 with ccode 9
+ Boy:10 is dating Girl 9 with ccode 9
+Girl:11 is dating Boy at 8 with ccode 11
+ Boy:8 is dating Girl 11 with ccode 11
+ Boy:12 is dating Girl 7 with ccode 7
+Girl:7 is dating Boy at 12 with ccode 7
+ Boy:11 is dating Girl 8 with ccode 8
+Girl:8 is dating Boy at 11 with ccode 8
+Girl:16 is dating Boy at 3 with ccode 16
+ Boy:3 is dating Girl 16 with ccode 16
+Girl:15 is dating Boy at 4 with ccode 15
+ Boy:4 is dating Girl 15 with ccode 15
+Girl:19 is dating Boy at 0 with ccode 19
+ Boy:0 is dating Girl 19 with ccode 19
+Girl:2 is dating Boy at 17 with ccode 2
+ Boy:17 is dating Girl 2 with ccode 2
+ Boy:13 is dating Girl 6 with ccode 6
+Girl:6 is dating Boy at 13 with ccode 6
+ Boy:7 is dating Girl 12 with ccode 12
+Girl:12 is dating Boy at 7 with ccode 12
+Girl:13 is dating Boy at 6 with ccode 13
+ Boy:6 is dating Girl 13 with ccode 13
+Girl:1 is dating Boy at 18 with ccode 1
+ Boy:18 is dating Girl 1 with ccode 1

src/tests/concurrent/examples/boundedBuffer.c

@@ -8 +8 @@
 // Created On       : Mon Oct 30 12:45:13 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Oct 30 23:02:46 2017
-// Update Count     : 9
+// Last Modified On : Tue Dec  5 23:01:51 2017
+// Update Count     : 10
 //
 
@@ -30 +30 @@
 int query( Buffer & buffer ) { return buffer.count; }
 
-void insert( Buffer & mutex buffer, int elem ) {
-        if ( buffer.count == 20 ) wait( buffer.empty );
-        buffer.elements[buffer.back] = elem;
-        buffer.back = ( buffer.back + 1 ) % 20;
-        buffer.count += 1;
-        signal( buffer.full );
+void insert( Buffer & mutex buffer, int elem ) with( buffer ) {
+        if ( count == 20 ) wait( empty );
+        elements[back] = elem;
+        back = ( back + 1 ) % 20;
+        count += 1;
+        signal( full );
 }
-int remove( Buffer & mutex buffer ) {
-        if ( buffer.count == 0 ) wait( buffer.full );
-        int elem = buffer.elements[buffer.front];
-        buffer.front = ( buffer.front + 1 ) % 20;
-        buffer.count -= 1;
-        signal( buffer.empty );
+int remove( Buffer & mutex buffer ) with( buffer ) {
+        if ( count == 0 ) wait( full );
+        int elem = elements[front];
+        front = ( front + 1 ) % 20;
+        count -= 1;
+        signal( empty );
         return elem;
 }

src/tests/concurrent/examples/datingService.c

@@ -9 +9 @@
 // Created On       : Mon Oct 30 12:56:20 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Oct 30 23:02:11 2017
-// Update Count     : 15
+// Last Modified On : Tue Dec  5 23:06:40 2017
+// Update Count     : 18
 //
 
@@ -26 +26 @@
 }; // DatingService
 
-unsigned int girl( DatingService & mutex ds, unsigned int PhoneNo, unsigned int ccode ) {
-        if ( is_empty( ds.Boys[ccode] ) ) {
-                wait( ds.Girls[ccode] );
-                ds.GirlPhoneNo = PhoneNo;
+unsigned int girl( DatingService & mutex ds, unsigned int PhoneNo, unsigned int ccode ) with( ds ) {
+        if ( is_empty( Boys[ccode] ) ) {
+                wait( Girls[ccode] );
+                GirlPhoneNo = PhoneNo;
         } else {
-                ds.GirlPhoneNo = PhoneNo;
-                signal_block( ds.Boys[ccode] );
+                GirlPhoneNo = PhoneNo;
+                signal_block( Boys[ccode] );
         } // if
-        return ds.BoyPhoneNo;
+        return BoyPhoneNo;
 } // DatingService girl
 
-unsigned int boy( DatingService & mutex ds, unsigned int PhoneNo, unsigned int ccode ) {
-        if ( is_empty( ds.Girls[ccode] ) ) {
-                wait( ds.Boys[ccode] );
-                ds.BoyPhoneNo = PhoneNo;
+unsigned int boy( DatingService & mutex ds, unsigned int PhoneNo, unsigned int ccode ) with( ds ) {
+        if ( is_empty( Girls[ccode] ) ) {
+                wait( Boys[ccode] );
+                BoyPhoneNo = PhoneNo;
         } else {
-                ds.BoyPhoneNo = PhoneNo;
-                signal_block( ds.Girls[ccode] );
+                BoyPhoneNo = PhoneNo;
+                signal_block( Girls[ccode] );
         } // if
-        return ds.GirlPhoneNo;
+        return GirlPhoneNo;
 } // DatingService boy
 
@@ -59 +59 @@
         yield( random( 100 ) );                                                         // don't all start at the same time
         unsigned int partner = girl( g.TheExchange, g.id, g.ccode );
-        //sout | "Girl:" | g.id | "is dating Boy at" | partner | "with ccode" | g.ccode | endl;
+        sout | "Girl:" | g.id | "is dating Boy at" | partner | "with ccode" | g.ccode | endl;
         girlck[g.id] = partner;
 } // Girl main
@@ -77 +77 @@
         yield( random( 100 ) );                                                         // don't all start at the same time
         unsigned int partner = boy( b.TheExchange, b.id, b.ccode );
-        //sout | " Boy:" | b.id | "is dating Girl" | partner | "with ccode" | b.ccode | endl;
+        sout | " Boy:" | b.id | "is dating Girl" | partner | "with ccode" | b.ccode | endl;
         boyck[b.id] = partner;
 } // Boy main
@@ -92 +92 @@
         Boy  *boys[NoOfPairs];
 
-        random_seed( getpid() );
+        random_seed( /*getpid()*/ 103 );
 
         for ( unsigned int i = 0; i < NoOfPairs; i += 1 ) {

src/tests/concurrent/examples/matrixSum.c

@@ -11 +11 @@
 // Created On       : Mon Oct  9 08:29:28 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Oct 29 21:08:48 2017
-// Update Count     : 2
+// Last Modified On : Tue Dec  5 22:56:46 2017
+// Update Count     : 4
 // 
 
@@ -29 +29 @@
 }
 
-void main( Adder & adder ) {
-    *adder.subtotal = 0;
-    for ( int c = 0; c < adder.cols; c += 1 ) {
-                *adder.subtotal += adder.row[c];
+void main( Adder & adder ) with( adder ) {
+    *subtotal = 0;
+    for ( int c = 0; c < cols; c += 1 ) {
+                *subtotal += row[c];
     } // for
 }