Changes in src/tests/concurrent/examples/matrixSum.c [c107f4ec:971d9f2]

File:

• src/tests/concurrent/examples/matrixSum.c (modified) (2 diffs)

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