Changeset 8dbedfc for src/tests/concurrent

Timestamp:

May 25, 2018, 1:37:38 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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, with_gc

Children:

58e822a

Parents:

13073be (diff), 34ca532 (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

Location:

src/tests/concurrent

Files:

• coroutineYield.c (modified) (1 diff)
• examples/matrixSum.c (modified) (2 diffs)
• signal/block.c (modified) (2 diffs)
• signal/disjoint.c (modified) (2 diffs)
• signal/wait.c (modified) (2 diffs)

src/tests/concurrent/coroutineYield.c

@@ -3 +3 @@
 #include <stdlib>
 #include <thread>
+#include <time>
+
+#ifndef PREEMPTION_RATE
+#define PREEMPTION_RATE 10`ms
+#endif
+
+Duration default_preemption() {
+        return PREEMPTION_RATE;
+}
 
 #ifdef LONG_TEST

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;
 }
 

src/tests/concurrent/signal/block.c

@@ -14 +14 @@
 #include <time>
 
-#ifdef LONG_TEST
-static const unsigned long N = 150_000ul;
-#else
-static const unsigned long N = 5_000ul;
-#endif
-
 #ifndef PREEMPTION_RATE
 #define PREEMPTION_RATE 10`ms
@@ -27 +21 @@
         return PREEMPTION_RATE;
 }
+
+#ifdef LONG_TEST
+static const unsigned long N = 150_000ul;
+#else
+static const unsigned long N = 5_000ul;
+#endif
 
 enum state_t { WAITED, SIGNAL, BARGE };

src/tests/concurrent/signal/disjoint.c

@@ -4 +4 @@
 #include <thread>
 #include <time>
-
-#ifdef LONG_TEST
-static const unsigned long N = 300_000ul;
-#else
-static const unsigned long N = 10_000ul;
-#endif
 
 #ifndef PREEMPTION_RATE
@@ -18 +12 @@
         return PREEMPTION_RATE;
 }
+
+#ifdef LONG_TEST
+static const unsigned long N = 300_000ul;
+#else
+static const unsigned long N = 10_000ul;
+#endif
 
 enum state_t { WAIT, SIGNAL, BARGE };

src/tests/concurrent/signal/wait.c

@@ -12 +12 @@
 #include <time>
 
-#ifdef LONG_TEST
-static const unsigned long N = 375_000ul;
-#else
-static const unsigned long N = 2_500ul;
-#endif
-
 #ifndef PREEMPTION_RATE
 #define PREEMPTION_RATE 10`ms
@@ -25 +19 @@
         return PREEMPTION_RATE;
 }
+
+#ifdef LONG_TEST
+static const unsigned long N = 375_000ul;
+#else
+static const unsigned long N = 2_500ul;
+#endif
 
 monitor global_t {};