Changeset 054514d for src/tests/concurrent/examples

Timestamp:

May 29, 2018, 3:26:31 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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, stuck-waitfor-destruct, with_gc

Children:

3530f39a

Parents:

96812c0 (diff), da60c631 (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:/u/cforall/software/cfa/cfa-cc

Location:

src/tests/concurrent/examples

Files:

• datingService.c (modified) (4 diffs)
• matrixSum.c (modified) (2 diffs)

src/tests/concurrent/examples/datingService.c

@@ -8 +8 @@
 // Created On       : Mon Oct 30 12:56:20 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar 14 22:48:40 2018
-// Update Count     : 23
+// Last Modified On : Sun May 27 09:05:18 2018
+// Update Count     : 26
 //
 
@@ -18 +18 @@
 #include <unistd.h>                                                                             // getpid
 
-enum { NoOfPairs = 20 };
+enum { CompCodes = 20 };                                                                // number of compatibility codes
 
 monitor DatingService {
-        condition Girls[NoOfPairs], Boys[NoOfPairs];
+        condition Girls[CompCodes], Boys[CompCodes];
         unsigned int GirlPhoneNo, BoyPhoneNo;
 }; // DatingService
@@ -47 +47 @@
 } // DatingService boy
 
-unsigned int girlck[NoOfPairs];
-unsigned int boyck[NoOfPairs];
+unsigned int girlck[CompCodes];
+unsigned int boyck[CompCodes];
 
 thread Girl {
@@ -88 +88 @@
 int main() {
         DatingService TheExchange;
-        Girl * girls[NoOfPairs];
-        Boy  * boys[NoOfPairs];
+        Girl * girls[CompCodes];
+        Boy  * boys[CompCodes];
 
         srandom( /*getpid()*/ 103 );
 
-        for ( unsigned int i = 0; i < NoOfPairs; i += 1 ) {
+        for ( unsigned int i = 0; i < CompCodes; i += 1 ) {
                 girls[i] = new( &TheExchange, i, i );
-                boys[i]  = new( &TheExchange, i, NoOfPairs - ( i + 1 ) );
+                boys[i]  = new( &TheExchange, i, CompCodes - ( i + 1 ) );
         } // for
 
-        for ( unsigned int i = 0; i < NoOfPairs; i += 1 ) {
+        for ( unsigned int i = 0; i < CompCodes; i += 1 ) {
                 delete( boys[i] );
                 delete( girls[i] );
         } // for
 
-        for ( unsigned int i = 0; i < NoOfPairs; i += 1 ) {
+        for ( unsigned int i = 0; i < CompCodes; i += 1 ) {
                 if ( girlck[ boyck[i] ] != boyck[ girlck[i] ] ) abort();
         } // for

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 : Tue Dec  5 22:56:46 2017
-// Update Count     : 4
+// Last Modified On : Fri May 25 09:34:27 2018
+// Update Count     : 10
 // 
 
@@ -20 +20 @@
 
 thread Adder {
-    int * row, cols, * subtotal;                                                // communication
+        int * row, cols, & subtotal;                                            // communication
 };
 
 void ?{}( Adder & adder, int row[], int cols, int & subtotal ) {
-    adder.row = row;
-    adder.cols = cols;
-    adder.subtotal = &subtotal;
+        adder.[ row, cols ] = [ row, cols ];                            // expression disallowed in multi-member access
+        &adder.subtotal = &subtotal;
 }
 
-void main( Adder & adder ) with( adder ) {
-    *subtotal = 0;
-    for ( int c = 0; c < cols; c += 1 ) {
-                *subtotal += row[c];
-    } // for
+void main( Adder & adder ) with( adder ) {                              // thread starts here
+        subtotal = 0;
+        for ( int c = 0; c < cols; c += 1 ) {
+                subtotal += row[c];
+        } // for
 }
 
 int main() {
-    const int rows = 10, cols = 1000;
-    int matrix[rows][cols], subtotals[rows], total = 0;
-    processor p;                                                                                // extra kernel thread
+        const int rows = 10, cols = 1000;
+        int matrix[rows][cols], subtotals[rows], total = 0;
+        processor p;                                                                            // add kernel thread
 
-    for ( int r = 0; r < rows; r += 1 ) {
+        for ( int r = 0; r < rows; r += 1 ) {
                 for ( int c = 0; c < cols; c += 1 ) {
                         matrix[r][c] = 1;
                 } // for
-    } // for
-    Adder * adders[rows];
-    for ( int r = 0; r < rows; r += 1 ) {                               // start threads to sum rows
+        } // for
+        Adder * adders[rows];
+        for ( int r = 0; r < rows; r += 1 ) {                           // start threads to sum rows
                 adders[r] = &(*malloc()){ matrix[r], cols, subtotals[r] };
 //              adders[r] = new( matrix[r], cols, &subtotals[r] );
-    } // for
-    for ( int r = 0; r < rows; r += 1 ) {                               // wait for threads to finish
+        } // for
+        for ( int r = 0; r < rows; r += 1 ) {                           // wait for threads to finish
                 delete( adders[r] );
                 total += subtotals[r];                                                  // total subtotals
-    } // for
-    sout | total | endl;
+        } // for
+        sout | total | endl;
 }