Changeset a2c2363 for tests/concurrency/channels/daisy_chain.cfa

Timestamp:

Sep 18, 2023, 10:21:29 AM (2 years ago)

Author:

caparsons <caparson@…>

Branches:

master

Children:

e4c3819

Parents:

e3784a50 (diff), 7edf912 (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:

• tests/concurrency/channels/daisy_chain.cfa (modified) (3 diffs)

tests/concurrency/channels/daisy_chain.cfa

@@ -8 +8 @@
 
 size_t total_operations = 0;
-size_t Processors = 1, Tasks = 4;
+ssize_t Processors = 1, Tasks = 4;                                              // must be signed
 
 owner_lock o;
@@ -37 +37 @@
           case 3:
                 if ( strcmp( argv[2], "d" ) != 0 ) {                    // default ?
-                        Tasks = atoi( argv[2] );
-            if ( Tasks < 1 ) goto Usage;
+                        Tasks = ato( argv[2] );
+            if ( Tasks < 1 ) fallthru default;
                 } // if
           case 2:
                 if ( strcmp( argv[1], "d" ) != 0 ) {                    // default ?
-                        Processors = atoi( argv[1] );
-                        if ( Processors < 1 ) goto Usage;
+                        Processors = ato( argv[1] );
+                        if ( Processors < 1 ) fallthru default;
                 } // if
           case 1:                                                                                       // use defaults
                 break;
           default:
-          Usage:
-                sout | "Usage: " | argv[0]
+                exit | "Usage: " | argv[0]
              | " [ processors (> 0) | 'd' (default " | Processors
                          | ") ] [ channel size (>= 0) | 'd' (default " | Tasks
                          | ") ]" ;
-                exit( EXIT_FAILURE );
         } // switch
     processor proc[Processors - 1];
@@ -71 +69 @@
     // sout | total_operations;
     sout | "done";
-
-    return 0;
 }