Changeset 50be8af for tests/concurrency/actors/executor.cfa

Timestamp:

Sep 17, 2023, 11:19:08 AM (13 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

7edf912

Parents:

697c957

Message:

clean up command-line handling and I/O

File:

• tests/concurrency/actors/executor.cfa (modified) (3 diffs)

tests/concurrency/actors/executor.cfa

@@ -40 +40 @@
           case 7:
                 if ( strcmp( argv[6], "d" ) != 0 ) {                    // default ?
-                        BufSize = atoi( argv[6] );
-                        if ( BufSize < 0 ) goto Usage;
+                        BufSize = ato( argv[6] );
+                        if ( BufSize < 0 ) fallthru default;
                 } // if
           case 6:
                 if ( strcmp( argv[5], "d" ) != 0 ) {                    // default ?
-                        Batch = atoi( argv[5] );
-                        if ( Batch < 1 ) goto Usage;
+                        Batch = ato( argv[5] );
+                        if ( Batch < 1 ) fallthru default;
                 } // if
           case 5:
                 if ( strcmp( argv[4], "d" ) != 0 ) {                    // default ?
-                        Processors = atoi( argv[4] );
-                        if ( Processors < 1 ) goto Usage;
+                        Processors = ato( argv[4] );
+                        if ( Processors < 1 ) fallthru default;
                 } // if
           case 4:
                 if ( strcmp( argv[3], "d" ) != 0 ) {                    // default ?
-                        Rounds = atoi( argv[3] );
-                        if ( Rounds < 1 ) goto Usage;
+                        Rounds = ato( argv[3] );
+                        if ( Rounds < 1 ) fallthru default;
                 } // if
           case 3:
                 if ( strcmp( argv[2], "d" ) != 0 ) {                    // default ?
-                        Set = atoi( argv[2] );
-                        if ( Set < 1 ) goto Usage;
+                        Set = ato( argv[2] );
+                        if ( Set < 1 ) fallthru default;
                 } // if
           case 2:
                 if ( strcmp( argv[1], "d" ) != 0 ) {                    // default ?
-                        Actors = atoi( argv[1] );
-                        if ( Actors < 1 || Actors <= Set || Actors % Set != 0 ) goto Usage;
+                        Actors = ato( argv[1] );
+                        if ( Actors < 1 || Actors <= Set || Actors % Set != 0 ) fallthru default;
                 } // if
           case 1:                                                                                       // use defaults
                 break;
           default:
-          Usage:
-                sout | "Usage: " | argv[0]
+                exit | "Usage: " | argv[0]
              | " [ actors (> 0 && > set && actors % set == 0 ) | 'd' (default " | Actors
                          | ") ] [ set (> 0) | 'd' (default " | Set
@@ -80 +79 @@
                          | ") ] [ buffer size (>= 0) | 'd' (default " | BufSize
                          | ") ]" ;
-                exit( EXIT_FAILURE );
         } // switch
 
     executor e{ Processors, Processors, Processors == 1 ? 1 : Processors * 512, true };
 
-    printf("starting\n");
+    sout | "starting";
 
     start_actor_system( e );
 
-    printf("started\n");
+    sout | "started";
 
     d_actor actors[ Actors ];
@@ -97 +95 @@
         } // for
 
-    printf("stopping\n");
+    sout | "stopping";
 
     stop_actor_system();
 
-    printf("stopped\n");
+    sout | "stopped";
 
     return 0;