Changeset a2c2363 for tests/concurrency/channels/churn.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/churn.cfa (modified) (2 diffs)

tests/concurrency/channels/churn.cfa

@@ -7 +7 @@
 #include <time.hfa>
 
-size_t Processors = 1, Channels = 4, Producers = 2, Consumers = 2, ChannelSize = 128;
+ssize_t Processors = 1, Channels = 4, Producers = 2, Consumers = 2, ChannelSize = 128;
 
 owner_lock o;
@@ -90 +90 @@
       case 4:
                 if ( strcmp( argv[3], "d" ) != 0 ) {                    // default ?
-                        if ( atoi( argv[3] ) < 1 ) goto Usage;
-                        ChannelSize = atoi( argv[3] );
+                        ChannelSize = ato( argv[3] );
+                        if ( ChannelSize < 1 ) fallthru default;
                 } // if
       case 3:
                 if ( strcmp( argv[2], "d" ) != 0 ) {                    // default ?
-                        if ( atoi( argv[2] ) < 1 ) goto Usage;
-                        Channels = atoi( argv[2] );
+                        Channels = ato( argv[2] );
+                        if ( Channels < 1 ) fallthru default;
                 } // if
       case 2:
                 if ( strcmp( argv[1], "d" ) != 0 ) {                    // default ?
-                        if ( atoi( argv[1] ) < 1 ) goto Usage;
-                        Processors = atoi( argv[1] );
+                        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 ]"
              | " [ producers > 0 | d ]"
              | " [ consumers > 0 | d ]"
              | " [ channels > 0 | d ]";
-                exit( EXIT_FAILURE );
     }
     processor p[Processors - 1];