Index: tests/.expect/copyfile.txt =================================================================== --- tests/.expect/copyfile.txt (revision 24d6572fc571b2a894d56a9335edd57899c448c0) +++ tests/.expect/copyfile.txt (revision 62d62db217dc9f917346863faa9d03148d98844f) @@ -10,6 +10,6 @@ // Created On : Fri Jun 19 13:44:05 2020 // Last Modified By : Peter A. Buhr -// Last Modified On : Fri Jun 19 17:58:03 2020 -// Update Count : 4 +// Last Modified On : Mon Jun 5 21:20:07 2023 +// Update Count : 5 // @@ -30,7 +30,7 @@ exit | "Usage" | argv[0] | "[ input-file (default stdin) [ output-file (default stdout) ] ]"; } // choose - } catch( Open_Failure * ex ; ex->istream == &in ) { + } catch( open_failure * ex ; ex->istream == &in ) { exit | "Unable to open input file" | argv[1]; - } catch( Open_Failure * ex ; ex->ostream == &out ) { + } catch( open_failure * ex ; ex->ostream == &out ) { close( in ); // optional exit | "Unable to open output file" | argv[2]; Index: tests/.in/copyfile.txt =================================================================== --- tests/.in/copyfile.txt (revision 24d6572fc571b2a894d56a9335edd57899c448c0) +++ tests/.in/copyfile.txt (revision 62d62db217dc9f917346863faa9d03148d98844f) @@ -10,6 +10,6 @@ // Created On : Fri Jun 19 13:44:05 2020 // Last Modified By : Peter A. Buhr -// Last Modified On : Fri Jun 19 17:58:03 2020 -// Update Count : 4 +// Last Modified On : Mon Jun 5 21:20:07 2023 +// Update Count : 5 // @@ -30,7 +30,7 @@ exit | "Usage" | argv[0] | "[ input-file (default stdin) [ output-file (default stdout) ] ]"; } // choose - } catch( Open_Failure * ex ; ex->istream == &in ) { + } catch( open_failure * ex ; ex->istream == &in ) { exit | "Unable to open input file" | argv[1]; - } catch( Open_Failure * ex ; ex->ostream == &out ) { + } catch( open_failure * ex ; ex->ostream == &out ) { close( in ); // optional exit | "Unable to open output file" | argv[2]; Index: tests/concurrency/actors/dynamic.cfa =================================================================== --- tests/concurrency/actors/dynamic.cfa (revision 24d6572fc571b2a894d56a9335edd57899c448c0) +++ tests/concurrency/actors/dynamic.cfa (revision 62d62db217dc9f917346863faa9d03148d98844f) @@ -19,5 +19,5 @@ void ?{}( derived_msg & this ) { ((derived_msg &)this){ 0 }; } -Allocation receive( derived_actor & receiver, derived_msg & msg ) { +allocation receive( derived_actor & receiver, derived_msg & msg ) { if ( msg.cnt >= Times ) { sout | "Done"; Index: tests/concurrency/actors/executor.cfa =================================================================== --- tests/concurrency/actors/executor.cfa (revision 24d6572fc571b2a894d56a9335edd57899c448c0) +++ tests/concurrency/actors/executor.cfa (revision 62d62db217dc9f917346863faa9d03148d98844f) @@ -24,5 +24,5 @@ struct d_msg { inline message; } shared_msg; -Allocation receive( d_actor & this, d_msg & msg ) with( this ) { +allocation receive( d_actor & this, d_msg & msg ) with( this ) { if ( recs == rounds ) return Finished; if ( recs % Batch == 0 ) { Index: tests/concurrency/actors/inherit.cfa =================================================================== --- tests/concurrency/actors/inherit.cfa (revision 24d6572fc571b2a894d56a9335edd57899c448c0) +++ tests/concurrency/actors/inherit.cfa (revision 62d62db217dc9f917346863faa9d03148d98844f) @@ -15,12 +15,12 @@ void ^?{}( D_msg & this ) { mutex(sout) sout | 'A'; } -Allocation handle() { +allocation handle() { return Finished; } -Allocation receive( Server & receiver, D_msg & msg ) { return handle(); } -Allocation receive( Server & receiver, D_msg2 & msg ) { return handle(); } -Allocation receive( Server2 & receiver, D_msg & msg ) { return Delete; } -Allocation receive( Server2 & receiver, D_msg2 & msg ) { return Delete; } +allocation receive( Server & receiver, D_msg & msg ) { return handle(); } +allocation receive( Server & receiver, D_msg2 & msg ) { return handle(); } +allocation receive( Server2 & receiver, D_msg & msg ) { return Delete; } +allocation receive( Server2 & receiver, D_msg2 & msg ) { return Delete; } int main() { Index: tests/concurrency/actors/matrix.cfa =================================================================== --- tests/concurrency/actors/matrix.cfa (revision 24d6572fc571b2a894d56a9335edd57899c448c0) +++ tests/concurrency/actors/matrix.cfa (revision 62d62db217dc9f917346863faa9d03148d98844f) @@ -24,5 +24,5 @@ } -Allocation receive( derived_actor & receiver, derived_msg & msg ) { +allocation receive( derived_actor & receiver, derived_msg & msg ) { for ( unsigned int i = 0; i < yc; i += 1 ) { // multiply X_row by Y_col and sum products msg.Z[i] = 0; Index: tests/concurrency/actors/pingpong.cfa =================================================================== --- tests/concurrency/actors/pingpong.cfa (revision 24d6572fc571b2a894d56a9335edd57899c448c0) +++ tests/concurrency/actors/pingpong.cfa (revision 62d62db217dc9f917346863faa9d03148d98844f) @@ -19,9 +19,9 @@ size_t times = 100000; -Allocation receive( ping & receiver, p_msg & msg ) { +allocation receive( ping & receiver, p_msg & msg ) { msg.count++; if ( msg.count > times ) return Finished; - Allocation retval = Nodelete; + allocation retval = Nodelete; if ( msg.count == times ) retval = Finished; *po << msg; @@ -29,9 +29,9 @@ } -Allocation receive( pong & receiver, p_msg & msg ) { +allocation receive( pong & receiver, p_msg & msg ) { msg.count++; if ( msg.count > times ) return Finished; - Allocation retval = Nodelete; + allocation retval = Nodelete; if ( msg.count == times ) retval = Finished; *pi << msg; Index: tests/concurrency/actors/poison.cfa =================================================================== --- tests/concurrency/actors/poison.cfa (revision 24d6572fc571b2a894d56a9335edd57899c448c0) +++ tests/concurrency/actors/poison.cfa (revision 62d62db217dc9f917346863faa9d03148d98844f) @@ -18,5 +18,5 @@ Server s[10]; for ( i; 10 ) { - s[i] << FinishedMsg; + s[i] << finished_msg; } stop_actor_system(); @@ -29,5 +29,5 @@ Server * s = alloc(); (*s){}; - (*s) << DeleteMsg; + (*s) << delete_msg; } stop_actor_system(); @@ -39,5 +39,5 @@ Server s[10]; for ( i; 10 ) - s[i] << DestroyMsg; + s[i] << destroy_msg; stop_actor_system(); for ( i; 10 ) Index: tests/concurrency/actors/static.cfa =================================================================== --- tests/concurrency/actors/static.cfa (revision 24d6572fc571b2a894d56a9335edd57899c448c0) +++ tests/concurrency/actors/static.cfa (revision 62d62db217dc9f917346863faa9d03148d98844f) @@ -19,5 +19,5 @@ void ?{}( derived_msg & this ) { ((derived_msg &)this){ 0 }; } -Allocation receive( derived_actor & receiver, derived_msg & msg ) { +allocation receive( derived_actor & receiver, derived_msg & msg ) { if ( msg.cnt >= Times ) { sout | "Done"; Index: tests/concurrency/actors/types.cfa =================================================================== --- tests/concurrency/actors/types.cfa (revision 24d6572fc571b2a894d56a9335edd57899c448c0) +++ tests/concurrency/actors/types.cfa (revision 62d62db217dc9f917346863faa9d03148d98844f) @@ -20,5 +20,5 @@ // this isn't a valid receive routine since int is not a message type -Allocation receive( derived_actor & receiver, int i ) with( receiver ) { +allocation receive( derived_actor & receiver, int i ) with( receiver ) { mutex(sout) sout | i; counter++; @@ -27,5 +27,5 @@ } -Allocation receive( derived_actor & receiver, d_msg & msg ) { +allocation receive( derived_actor & receiver, d_msg & msg ) { return receive( receiver, msg.num ); } @@ -36,5 +36,5 @@ }; -Allocation receive( derived_actor2 & receiver, d_msg & msg ) { +allocation receive( derived_actor2 & receiver, d_msg & msg ) { mutex(sout) sout | msg.num; return Finished; @@ -48,5 +48,5 @@ }; -Allocation receive( derived_actor3 & receiver, d_msg & msg ) { +allocation receive( derived_actor3 & receiver, d_msg & msg ) { mutex(sout) sout | msg.num; if ( msg.num == -1 ) return Nodelete; @@ -54,5 +54,5 @@ } -Allocation receive( derived_actor3 & receiver, d_msg2 & msg ) { +allocation receive( derived_actor3 & receiver, d_msg2 & msg ) { mutex(sout) sout | msg.num; return Finished; Index: tests/concurrency/lockfree_stack.cfa =================================================================== --- tests/concurrency/lockfree_stack.cfa (revision 24d6572fc571b2a894d56a9335edd57899c448c0) +++ tests/concurrency/lockfree_stack.cfa (revision 62d62db217dc9f917346863faa9d03148d98844f) @@ -10,6 +10,6 @@ // Created On : Thu May 25 15:36:50 2023 // Last Modified By : Peter A. Buhr -// Last Modified On : Tue May 30 19:02:32 2023 -// Update Count : 18 +// Last Modified On : Fri Jun 9 14:01:07 2023 +// Update Count : 68 // @@ -29,5 +29,5 @@ int64_t atom; #endif // __SIZEOF_INT128__ -} __attribute__(( aligned( 16 ) )); +}; struct Node { @@ -42,5 +42,6 @@ n.next = stack; // atomic assignment unnecessary for () { // busy wait - if ( CASV( stack.atom, n.next.atom, ((Link){ &n, n.next.count + 1 }.atom) ) ) break; // attempt to update top node + Link temp{ &n, n.next.count + 1 }; + if ( CASV( s.stack.atom, n.next.atom, temp.atom ) ) break; // attempt to update top node } } @@ -50,5 +51,6 @@ for () { // busy wait if ( t.top == NULL ) return NULL; // empty stack ? - if ( CASV( stack.atom, t.atom, ((Link){ t.top->next.top, t.count }.atom) ) ) return t.top; // attempt to update top node + Link temp{ t.top->next.top, t.count }; + if ( CASV( stack.atom, t.atom, temp.atom ) ) return t.top; // attempt to update top node } } @@ -57,11 +59,5 @@ Stack stack; // global stack -enum { Times = - #if defined( __ARM_ARCH ) // ARM CASV is very slow - 10_000 - #else - 1_000_000 - #endif // __arm_64__ -}; +enum { Times = 2_000_000 }; thread Worker {}; @@ -82,6 +78,5 @@ for ( i; N ) { // push N values on stack - // storage must be 16-bytes aligned for cmpxchg16b - push( stack, *(Node *)memalign( 16, sizeof( Node ) ) ); + push( stack, *(Node *)new() ); // must be 16-byte aligned } { Index: tests/concurrency/waituntil/locks.cfa =================================================================== --- tests/concurrency/waituntil/locks.cfa (revision 24d6572fc571b2a894d56a9335edd57899c448c0) +++ tests/concurrency/waituntil/locks.cfa (revision 62d62db217dc9f917346863faa9d03148d98844f) @@ -2,4 +2,5 @@ #include #include +#include #include Index: tests/configs/.expect/parseconfig.txt =================================================================== --- tests/configs/.expect/parseconfig.txt (revision 24d6572fc571b2a894d56a9335edd57899c448c0) +++ tests/configs/.expect/parseconfig.txt (revision 62d62db217dc9f917346863faa9d03148d98844f) @@ -12,5 +12,5 @@ Maximum student trips: 3 -Open_Failure thrown when config file does not exist +open_failure thrown when config file does not exist Failed to open the config file Index: tests/configs/parseconfig.cfa =================================================================== --- tests/configs/parseconfig.cfa (revision 24d6572fc571b2a894d56a9335edd57899c448c0) +++ tests/configs/parseconfig.cfa (revision 62d62db217dc9f917346863faa9d03148d98844f) @@ -66,8 +66,8 @@ - sout | "Open_Failure thrown when config file does not exist"; + sout | "open_failure thrown when config file does not exist"; try { parse_config( xstr(IN_DIR) "doesnt-exist.txt", entries, NUM_ENTRIES, parse_tabular_config_format ); - } catch( Open_Failure * ex ) { + } catch( open_failure * ex ) { sout | "Failed to open the config file"; } Index: tests/copyfile.cfa =================================================================== --- tests/copyfile.cfa (revision 24d6572fc571b2a894d56a9335edd57899c448c0) +++ tests/copyfile.cfa (revision 62d62db217dc9f917346863faa9d03148d98844f) @@ -10,6 +10,6 @@ // Created On : Fri Jun 19 13:44:05 2020 // Last Modified By : Peter A. Buhr -// Last Modified On : Sat Aug 15 15:00:48 2020 -// Update Count : 6 +// Last Modified On : Mon Jun 5 21:20:19 2023 +// Update Count : 7 // @@ -30,7 +30,7 @@ exit | "Usage" | argv[0] | "[ input-file (default stdin) [ output-file (default stdout) ] ]"; } // choose - } catch( Open_Failure * ex ; ex->istream == &in ) { + } catch( open_failure * ex ; ex->istream == &in ) { exit | "Unable to open input file" | argv[1]; - } catch( Open_Failure * ex ; ex->ostream == &out ) { + } catch( open_failure * ex ; ex->ostream == &out ) { close( in ); // optional exit | "Unable to open output file" | argv[2]; Index: tests/rational.cfa =================================================================== --- tests/rational.cfa (revision 24d6572fc571b2a894d56a9335edd57899c448c0) +++ tests/rational.cfa (revision 62d62db217dc9f917346863faa9d03148d98844f) @@ -10,6 +10,6 @@ // Created On : Mon Mar 28 08:43:12 2016 // Last Modified By : Peter A. Buhr -// Last Modified On : Tue Jul 20 18:13:40 2021 -// Update Count : 107 +// Last Modified On : Mon Jun 5 22:58:09 2023 +// Update Count : 108 // @@ -19,5 +19,5 @@ #include -typedef Rational(int) RatInt; +typedef rational(int) rat_int; double convert( int i ) { return (double)i; } // used by narrow/widen int convert( double d ) { return (int)d; } @@ -25,24 +25,24 @@ int main() { sout | "constructor"; - RatInt a = { 3 }, b = { 4 }, c, d = 0, e = 1; + rat_int a = { 3 }, b = { 4 }, c, d = 0, e = 1; sout | "a : " | a | "b : " | b | "c : " | c | "d : " | d | "e : " | e; - a = (RatInt){ 4, 8 }; - b = (RatInt){ 5, 7 }; + a = (rat_int){ 4, 8 }; + b = (rat_int){ 5, 7 }; sout | "a : " | a | "b : " | b; - a = (RatInt){ -2, -3 }; - b = (RatInt){ 3, -2 }; + a = (rat_int){ -2, -3 }; + b = (rat_int){ 3, -2 }; sout | "a : " | a | "b : " | b; - a = (RatInt){ -2, 3 }; - b = (RatInt){ 3, 2 }; + a = (rat_int){ -2, 3 }; + b = (rat_int){ 3, 2 }; sout | "a : " | a | "b : " | b; sout | nl; sout | "comparison"; - a = (RatInt){ -2 }; - b = (RatInt){ -3, 2 }; + a = (rat_int){ -2 }; + b = (rat_int){ -3, 2 }; sout | "a : " | a | "b : " | b; - sout | "a == 0 : " | a == (Rational(int)){0}; // FIX ME - sout | "a == 1 : " | a == (Rational(int)){1}; // FIX ME + sout | "a == 0 : " | a == (rational(int)){0}; // FIX ME + sout | "a == 1 : " | a == (rational(int)){1}; // FIX ME sout | "a != 0 : " | a != 0; sout | "! a : " | ! a; @@ -73,9 +73,9 @@ sout | "conversion"; - a = (RatInt){ 3, 4 }; + a = (rat_int){ 3, 4 }; sout | widen( a ); - a = (RatInt){ 1, 7 }; + a = (rat_int){ 1, 7 }; sout | widen( a ); - a = (RatInt){ 355, 113 }; + a = (rat_int){ 355, 113 }; sout | widen( a ); sout | narrow( 0.75, 4 ); @@ -90,5 +90,5 @@ sout | "more tests"; - RatInt x = { 1, 2 }, y = { 2 }; + rat_int x = { 1, 2 }, y = { 2 }; sout | x - y; sout | x > y; @@ -96,12 +96,12 @@ sout | y | denominator( y, -2 ) | y; - RatInt z = { 0, 5 }; + rat_int z = { 0, 5 }; sout | z; sout | x | numerator( x, 0 ) | x; - x = (RatInt){ 1, MAX } + (RatInt){ 1, MAX }; + x = (rat_int){ 1, MAX } + (rat_int){ 1, MAX }; sout | x; - x = (RatInt){ 3, MAX } + (RatInt){ 2, MAX }; + x = (rat_int){ 3, MAX } + (rat_int){ 2, MAX }; sout | x; Index: tests/zombies/simplePoly.c =================================================================== --- tests/zombies/simplePoly.c (revision 24d6572fc571b2a894d56a9335edd57899c448c0) +++ (revision ) @@ -1,34 +1,0 @@ -// -// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo -// -// The contents of this file are covered under the licence agreement in the -// file "LICENCE" distributed with Cforall. -// -// simplePoly.c -- -// -// Author : Richard C. Bilson -// Created On : Wed May 27 17:56:53 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Tue Mar 8 22:06:41 2016 -// Update Count : 3 -// - -forall( T, U | { T f( T, U ); } ) -T q( T t, U u ) { - return f( t, u ); -// return t; -} - -int f( int, double* ); - -void g( void ) { - int y; - double x; -// if ( y ) - q( 3, &x ); -} - -// Local Variables: // -// tab-width: 4 // -// compile-command: "cfa simplePoly.c" // -// End: //