Index: tests/concurrency/actors/dynamic.cfa =================================================================== --- tests/concurrency/actors/dynamic.cfa (revision 697c957be6bf6545b625badf5b5dcf7f766e5f9d) +++ tests/concurrency/actors/dynamic.cfa (revision 50be8af55788ecaebbb85845d1e11234cd6a5cb6) @@ -36,21 +36,19 @@ case 2: if ( strcmp( argv[1], "d" ) != 0 ) { // default ? - Times = atoi( argv[1] ); - if ( Times < 1 ) goto Usage; + Times = ato( argv[1] ); + if ( Times < 1 ) fallthru default; } // if case 1: // use defaults break; default: - Usage: - sout | "Usage: " | argv[0] | " [ times (> 0) ]"; - exit( EXIT_FAILURE ); + exit | "Usage: " | argv[0] | " [ times (> 0) ]"; } // switch - printf("starting\n"); + sout | "starting"; executor e{ 0, 1, 1, false }; start_actor_system( e ); - printf("started\n"); + sout | "started"; derived_msg * d_msg = alloc(); @@ -60,9 +58,9 @@ *d_actor | *d_msg; - printf("stopping\n"); + sout | "stopping"; stop_actor_system(); - printf("stopped\n"); + sout | "stopped"; return 0; Index: tests/concurrency/actors/executor.cfa =================================================================== --- tests/concurrency/actors/executor.cfa (revision 697c957be6bf6545b625badf5b5dcf7f766e5f9d) +++ tests/concurrency/actors/executor.cfa (revision 50be8af55788ecaebbb85845d1e11234cd6a5cb6) @@ -40,37 +40,36 @@ 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,14 +79,13 @@ | ") ] [ 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,9 +95,9 @@ } // for - printf("stopping\n"); + sout | "stopping"; stop_actor_system(); - printf("stopped\n"); + sout | "stopped"; return 0; Index: tests/concurrency/actors/matrix.cfa =================================================================== --- tests/concurrency/actors/matrix.cfa (revision 697c957be6bf6545b625badf5b5dcf7f766e5f9d) +++ tests/concurrency/actors/matrix.cfa (revision 50be8af55788ecaebbb85845d1e11234cd6a5cb6) @@ -5,5 +5,5 @@ #include -unsigned int xr = 500, xc = 500, yc = 500, Processors = 1; // default values +int xr = 500, xc = 500, yc = 500, Processors = 1; // default values, must be signed struct derived_actor { inline actor; }; @@ -38,27 +38,26 @@ 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 ? - xr = atoi( argv[3] ); - if ( xr < 1 ) goto Usage; + xr = ato( argv[3] ); + if ( xr < 1 ) fallthru default; } // if case 3: if ( strcmp( argv[2], "d" ) != 0 ) { // default ? - xc = atoi( argv[2] ); - if ( xc < 1 ) goto Usage; + xc = ato( argv[2] ); + if ( xc < 1 ) fallthru default; } // if case 2: if ( strcmp( argv[1], "d" ) != 0 ) { // default ? - yc = atoi( argv[1] ); - if ( yc < 1 ) goto Usage; + yc = ato( argv[1] ); + if ( yc < 1 ) fallthru default; } // if case 1: // use defaults break; default: - Usage: - sout | "Usage: " | argv[0] + exit | "Usage: " | argv[0] | " [ yc (> 0) | 'd' (default " | yc | ") ] [ xc (> 0) | 'd' (default " | xc @@ -66,5 +65,4 @@ | ") ] [ processors (> 0) | 'd' (default " | Processors | ") ]" ; - exit( EXIT_FAILURE ); } // switch @@ -90,9 +88,9 @@ executor e{ Processors, Processors, Processors == 1 ? 1 : Processors * 16, true }; - printf("starting\n"); + sout | "starting"; start_actor_system( e ); - printf("started\n"); + sout | "started"; derived_msg messages[xr]; @@ -108,9 +106,9 @@ } // for - printf("stopping\n"); + sout | "stopping"; stop_actor_system(); - printf("stopped\n"); + sout | "stopped"; for ( r = 0; r < xr; r += 1 ) { // deallocate X and Z matrices @@ -121,5 +119,3 @@ free( Y[r] ); } // for - - return 0; } Index: tests/concurrency/actors/pingpong.cfa =================================================================== --- tests/concurrency/actors/pingpong.cfa (revision 697c957be6bf6545b625badf5b5dcf7f766e5f9d) +++ tests/concurrency/actors/pingpong.cfa (revision 50be8af55788ecaebbb85845d1e11234cd6a5cb6) @@ -42,5 +42,5 @@ int main( int argc, char * argv[] ) { - printf("start\n"); + sout | "start"; processor p[Processors - 1]; @@ -56,5 +56,4 @@ stop_actor_system(); - printf("end\n"); - return 0; + sout | "end"; } Index: tests/concurrency/actors/static.cfa =================================================================== --- tests/concurrency/actors/static.cfa (revision 697c957be6bf6545b625badf5b5dcf7f766e5f9d) +++ tests/concurrency/actors/static.cfa (revision 50be8af55788ecaebbb85845d1e11234cd6a5cb6) @@ -33,21 +33,19 @@ case 2: if ( strcmp( argv[1], "d" ) != 0 ) { // default ? - Times = atoi( argv[1] ); - if ( Times < 1 ) goto Usage; + Times = ato( argv[1] ); + if ( Times < 1 ) fallthru default; } // if case 1: // use defaults break; default: - Usage: - sout | "Usage: " | argv[0] | " [ times (> 0) ]"; - exit( EXIT_FAILURE ); + exit | "Usage: " | argv[0] | " [ times (> 0) ]"; } // switch - printf("starting\n"); + sout | "starting"; executor e{ 0, 1, 1, false }; start_actor_system( e ); - printf("started\n"); + sout | "started"; derived_msg msg; @@ -57,9 +55,9 @@ actor | msg; - printf("stopping\n"); + sout | "stopping"; stop_actor_system(); - printf("stopped\n"); + sout | "stopped"; return 0; Index: tests/concurrency/actors/types.cfa =================================================================== --- tests/concurrency/actors/types.cfa (revision 697c957be6bf6545b625badf5b5dcf7f766e5f9d) +++ tests/concurrency/actors/types.cfa (revision 50be8af55788ecaebbb85845d1e11234cd6a5cb6) @@ -62,9 +62,9 @@ int main( int argc, char * argv[] ) { - printf("start\n"); + sout | "start"; processor p[Processors - 1]; - printf("basic test\n"); + sout | "basic test"; start_actor_system( Processors ); // test passing number of processors derived_actor a; @@ -75,5 +75,5 @@ stop_actor_system(); - printf("same message and different actors test\n"); + sout | "same message and different actors test"; start_actor_system(); // let system detect # of processors derived_actor2 d_ac2_0, d_ac2_1; @@ -86,5 +86,5 @@ { - printf("same message and different actor types test\n"); + sout | "same message and different actor types test"; executor e{ 0, Processors, Processors == 1 ? 1 : Processors * 4, false }; start_actor_system( e ); // pass an explicit executor @@ -99,5 +99,5 @@ { - printf("different message types, one actor test\n"); + sout | "different message types, one actor test"; executor e{ 1, Processors, Processors == 1 ? 1 : Processors * 4, true }; start_actor_system( Processors ); @@ -112,5 +112,5 @@ { - printf("nested inheritance actor test\n"); + sout | "nested inheritance actor test"; executor e{ 1, Processors, Processors == 1 ? 1 : Processors * 4, true }; start_actor_system( Processors ); @@ -124,5 +124,4 @@ } // RAII to clean up executor - printf("end\n"); - return 0; + sout | "end"; } Index: tests/concurrency/channels/barrier.cfa =================================================================== --- tests/concurrency/channels/barrier.cfa (revision 697c957be6bf6545b625badf5b5dcf7f766e5f9d) +++ tests/concurrency/channels/barrier.cfa (revision 50be8af55788ecaebbb85845d1e11234cd6a5cb6) @@ -8,5 +8,5 @@ size_t total_operations = 0; -int Processors = 1, Tasks = 5, BarrierSize = 2; +ssize_t Processors = 1, Tasks = 5, BarrierSize = 2; // must be signed typedef channel( int ) Channel; @@ -65,21 +65,19 @@ case 3: if ( strcmp( argv[2], "d" ) != 0 ) { // default ? - BarrierSize = atoi( argv[2] ); - if ( Processors < 1 ) goto Usage; + BarrierSize = ato( argv[2] ); + if ( Processors < 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 | ") ] [ BarrierSize (> 0) | 'd' (default " | BarrierSize | ") ]" ; - exit( EXIT_FAILURE ); } // switch if ( Tasks < BarrierSize ) Index: tests/concurrency/channels/big_elems.cfa =================================================================== --- tests/concurrency/channels/big_elems.cfa (revision 697c957be6bf6545b625badf5b5dcf7f766e5f9d) +++ tests/concurrency/channels/big_elems.cfa (revision 50be8af55788ecaebbb85845d1e11234cd6a5cb6) @@ -2,5 +2,5 @@ #include "parallel_harness.hfa" -size_t Processors = 10, Channels = 10, Producers = 40, Consumers = 40, ChannelSize = 128; +ssize_t Processors = 10, Channels = 10, Producers = 40, Consumers = 40, ChannelSize = 128; int main() { Index: tests/concurrency/channels/churn.cfa =================================================================== --- tests/concurrency/channels/churn.cfa (revision 697c957be6bf6545b625badf5b5dcf7f766e5f9d) +++ tests/concurrency/channels/churn.cfa (revision 50be8af55788ecaebbb85845d1e11234cd6a5cb6) @@ -7,5 +7,5 @@ #include -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,27 +90,25 @@ 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]; Index: tests/concurrency/channels/contend.cfa =================================================================== --- tests/concurrency/channels/contend.cfa (revision 697c957be6bf6545b625badf5b5dcf7f766e5f9d) +++ tests/concurrency/channels/contend.cfa (revision 50be8af55788ecaebbb85845d1e11234cd6a5cb6) @@ -127,21 +127,21 @@ case 3: if ( strcmp( argv[2], "d" ) != 0 ) { // default ? - ChannelSize = atoi( argv[2] ); + ChannelSize = ato( argv[2] ); + if ( ChannelSize < 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 " | ChannelSize | ") ]" ; - exit( EXIT_FAILURE ); } // switch + test(Processors, Channels, Producers, Consumers, ChannelSize); } Index: tests/concurrency/channels/daisy_chain.cfa =================================================================== --- tests/concurrency/channels/daisy_chain.cfa (revision 697c957be6bf6545b625badf5b5dcf7f766e5f9d) +++ tests/concurrency/channels/daisy_chain.cfa (revision 50be8af55788ecaebbb85845d1e11234cd6a5cb6) @@ -8,5 +8,5 @@ size_t total_operations = 0; -size_t Processors = 1, Tasks = 4; +ssize_t Processors = 1, Tasks = 4; // must be signed owner_lock o; @@ -37,21 +37,19 @@ 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,5 +69,3 @@ // sout | total_operations; sout | "done"; - - return 0; } Index: tests/concurrency/channels/hot_potato.cfa =================================================================== --- tests/concurrency/channels/hot_potato.cfa (revision 697c957be6bf6545b625badf5b5dcf7f766e5f9d) +++ tests/concurrency/channels/hot_potato.cfa (revision 50be8af55788ecaebbb85845d1e11234cd6a5cb6) @@ -8,5 +8,5 @@ size_t total_operations = 0; -size_t Processors = 1, Tasks = 4; +ssize_t Processors = 1, Tasks = 4; // must be signed owner_lock o; @@ -38,27 +38,25 @@ } - int main( int argc, char * argv[] ) { switch ( argc ) { 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]; Index: tests/concurrency/channels/pub_sub.cfa =================================================================== --- tests/concurrency/channels/pub_sub.cfa (revision 697c957be6bf6545b625badf5b5dcf7f766e5f9d) +++ tests/concurrency/channels/pub_sub.cfa (revision 50be8af55788ecaebbb85845d1e11234cd6a5cb6) @@ -87,21 +87,19 @@ 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 | ") ] [ Tasks (> 0) | 'd' (default " | Tasks | ") ]" ; - exit( EXIT_FAILURE ); } // switch BarrierSize = Tasks; Index: tests/concurrency/examples/matrixSum.cfa =================================================================== --- tests/concurrency/examples/matrixSum.cfa (revision 697c957be6bf6545b625badf5b5dcf7f766e5f9d) +++ tests/concurrency/examples/matrixSum.cfa (revision 50be8af55788ecaebbb85845d1e11234cd6a5cb6) @@ -10,10 +10,9 @@ // Created On : Mon Oct 9 08:29:28 2017 // Last Modified By : Peter A. Buhr -// Last Modified On : Wed Feb 20 08:37:53 2019 -// Update Count : 16 +// Last Modified On : Fri Sep 8 19:05:34 2023 +// Update Count : 19 // #include -#include #include @@ -35,18 +34,20 @@ int main() { - /* const */ int rows = 10, cols = 1000; + const int rows = 10, cols = 1000; int matrix[rows][cols], subtotals[rows], total = 0; processor p; // add kernel thread - for ( r; rows ) { + for ( r; rows ) { // initialize for ( c; cols ) { matrix[r][c] = 1; } // for } // for + Adder * adders[rows]; for ( r; rows ) { // start threads to sum rows adders[r] = &(*malloc()){ matrix[r], cols, subtotals[r] }; -// adders[r] = new( matrix[r], cols, &subtotals[r] ); + // adders[r] = new( matrix[r], cols, subtotals[r] ); } // for + for ( r; rows ) { // wait for threads to finish delete( adders[r] ); @@ -57,5 +58,4 @@ // Local Variables: // -// tab-width: 4 // // compile-command: "cfa matrixSum.cfa" // // End: // Index: tests/concurrency/unified_locking/locks.cfa =================================================================== --- tests/concurrency/unified_locking/locks.cfa (revision 697c957be6bf6545b625badf5b5dcf7f766e5f9d) +++ tests/concurrency/unified_locking/locks.cfa (revision 50be8af55788ecaebbb85845d1e11234cd6a5cb6) @@ -1,4 +1,4 @@ #include -#include "locks.hfa" +#include #include #include Index: tests/concurrency/unified_locking/pthread_locks.cfa =================================================================== --- tests/concurrency/unified_locking/pthread_locks.cfa (revision 697c957be6bf6545b625badf5b5dcf7f766e5f9d) +++ tests/concurrency/unified_locking/pthread_locks.cfa (revision 50be8af55788ecaebbb85845d1e11234cd6a5cb6) @@ -1,4 +1,4 @@ #include -#include "locks.hfa" +#include #include #include Index: tests/concurrency/unified_locking/test_debug.cfa =================================================================== --- tests/concurrency/unified_locking/test_debug.cfa (revision 697c957be6bf6545b625badf5b5dcf7f766e5f9d) +++ tests/concurrency/unified_locking/test_debug.cfa (revision 50be8af55788ecaebbb85845d1e11234cd6a5cb6) @@ -1,3 +1,3 @@ -#include "locks.hfa" +#include fast_block_lock f; Index: tests/concurrency/unified_locking/thread_test.cfa =================================================================== --- tests/concurrency/unified_locking/thread_test.cfa (revision 697c957be6bf6545b625badf5b5dcf7f766e5f9d) +++ tests/concurrency/unified_locking/thread_test.cfa (revision 50be8af55788ecaebbb85845d1e11234cd6a5cb6) @@ -1,4 +1,4 @@ #include -#include "locks.hfa" +#include #include #include