Index: tests/.expect/PRNG.x64.txt =================================================================== --- tests/.expect/PRNG.x64.txt (revision b797d97858476d1dd4df1a393b90d5f3ce4251f1) +++ tests/.expect/PRNG.x64.txt (revision ae7a085c8585b48815059235b608cbf4791dd8e5) @@ -1,96 +1,96 @@ - PRNG() PRNG(5) PRNG(0,5) - 861 3 0 -10137507171299805328 1 2 -12205946788447993741 4 0 -16222929371023265189 2 5 -11921944259646500358 1 1 -9511863719043198063 2 0 -18170109536749574203 0 1 -15896208456307578543 0 3 -4171113079117645375 1 4 -5535309872453329531 1 1 -13293369315461644140 2 2 -855811942427900360 1 1 -9125507373316195824 1 5 -6942856496042419510 1 5 -16774706561877323900 2 4 -17765436951300330249 4 0 -3766082030894719812 1 2 -15818141700523398820 3 5 -1244962761353699441 0 5 -4506898200126256218 1 2 + PRNG() PRNG(5) PRNG(0,5) + 8464106481 4 4 + 5215204710507639537 1 2 + 1880401021892145483 0 4 + 12503840966285181348 2 5 + 801971300205459356 0 2 + 6123812066052045228 3 1 + 7691074772031490538 4 3 + 4793575011534070065 0 0 + 10647551928893428440 1 3 + 10865128702974868079 0 3 + 530720947131684825 3 0 + 10520125295812061287 1 5 + 7539957561855178679 4 4 + 13739826796006269835 0 2 + 4289714351582916365 3 2 + 16911914987551424434 2 1 + 5327155553462670435 4 0 + 16251986870929071204 4 4 + 13394433706240223001 0 3 + 4814982023332666924 4 0 seed 1009 Sequential -trials 100000000 buckets 100000 min 875 max 1138 avg 1000.0 std 31.8 rstd 3.2% +trials 100000000 buckets 100000 min 871 max 1144 avg 1000.0 std 31.6 rstd 3.2% Concurrent -trials 100000000 buckets 100000 min 875 max 1138 avg 1000.0 std 31.8 rstd 3.2% -trials 100000000 buckets 100000 min 875 max 1138 avg 1000.0 std 31.8 rstd 3.2% -trials 100000000 buckets 100000 min 875 max 1138 avg 1000.0 std 31.8 rstd 3.2% -trials 100000000 buckets 100000 min 875 max 1138 avg 1000.0 std 31.8 rstd 3.2% +trials 100000000 buckets 100000 min 871 max 1144 avg 1000.0 std 31.6 rstd 3.2% +trials 100000000 buckets 100000 min 871 max 1144 avg 1000.0 std 31.6 rstd 3.2% +trials 100000000 buckets 100000 min 871 max 1144 avg 1000.0 std 31.6 rstd 3.2% +trials 100000000 buckets 100000 min 871 max 1144 avg 1000.0 std 31.6 rstd 3.2% - prng() prng(5) prng(0,5) - 861 3 0 -10137507171299805328 1 2 -12205946788447993741 4 0 -16222929371023265189 2 5 -11921944259646500358 1 1 -9511863719043198063 2 0 -18170109536749574203 0 1 -15896208456307578543 0 3 -4171113079117645375 1 4 -5535309872453329531 1 1 -13293369315461644140 2 2 -855811942427900360 1 1 -9125507373316195824 1 5 -6942856496042419510 1 5 -16774706561877323900 2 4 -17765436951300330249 4 0 -3766082030894719812 1 2 -15818141700523398820 3 5 -1244962761353699441 0 5 -4506898200126256218 1 2 + prng() prng(5) prng(0,5) + 8464106481 4 4 + 5215204710507639537 1 2 + 1880401021892145483 0 4 + 12503840966285181348 2 5 + 801971300205459356 0 2 + 6123812066052045228 3 1 + 7691074772031490538 4 3 + 4793575011534070065 0 0 + 10647551928893428440 1 3 + 10865128702974868079 0 3 + 530720947131684825 3 0 + 10520125295812061287 1 5 + 7539957561855178679 4 4 + 13739826796006269835 0 2 + 4289714351582916365 3 2 + 16911914987551424434 2 1 + 5327155553462670435 4 0 + 16251986870929071204 4 4 + 13394433706240223001 0 3 + 4814982023332666924 4 0 seed 1009 Sequential -trials 100000000 buckets 100000 min 875 max 1138 avg 1000.0 std 31.8 rstd 3.2% +trials 100000000 buckets 100000 min 871 max 1144 avg 1000.0 std 31.6 rstd 3.2% Concurrent -trials 100000000 buckets 100000 min 875 max 1138 avg 1000.0 std 31.8 rstd 3.2% -trials 100000000 buckets 100000 min 875 max 1138 avg 1000.0 std 31.8 rstd 3.2% -trials 100000000 buckets 100000 min 875 max 1138 avg 1000.0 std 31.8 rstd 3.2% -trials 100000000 buckets 100000 min 875 max 1138 avg 1000.0 std 31.8 rstd 3.2% +trials 100000000 buckets 100000 min 871 max 1144 avg 1000.0 std 31.6 rstd 3.2% +trials 100000000 buckets 100000 min 871 max 1144 avg 1000.0 std 31.6 rstd 3.2% +trials 100000000 buckets 100000 min 871 max 1144 avg 1000.0 std 31.6 rstd 3.2% +trials 100000000 buckets 100000 min 871 max 1144 avg 1000.0 std 31.6 rstd 3.2% - prng(t) prng(t,5) prng(t,0,5) - 861 3 0 -10137507171299805328 1 2 -12205946788447993741 4 0 -16222929371023265189 2 5 -11921944259646500358 1 1 -9511863719043198063 2 0 -18170109536749574203 0 1 -15896208456307578543 0 3 -4171113079117645375 1 4 -5535309872453329531 1 1 -13293369315461644140 2 2 -855811942427900360 1 1 -9125507373316195824 1 5 -6942856496042419510 1 5 -16774706561877323900 2 4 -17765436951300330249 4 0 -3766082030894719812 1 2 -15818141700523398820 3 5 -1244962761353699441 0 5 -4506898200126256218 1 2 + prng(t) prng(t,5) prng(t,0,5) + 8464106481 4 4 + 5215204710507639537 1 2 + 1880401021892145483 0 4 + 12503840966285181348 2 5 + 801971300205459356 0 2 + 6123812066052045228 3 1 + 7691074772031490538 4 3 + 4793575011534070065 0 0 + 10647551928893428440 1 3 + 10865128702974868079 0 3 + 530720947131684825 3 0 + 10520125295812061287 1 5 + 7539957561855178679 4 4 + 13739826796006269835 0 2 + 4289714351582916365 3 2 + 16911914987551424434 2 1 + 5327155553462670435 4 0 + 16251986870929071204 4 4 + 13394433706240223001 0 3 + 4814982023332666924 4 0 seed 1009 Sequential -trials 100000000 buckets 100000 min 875 max 1138 avg 1000.0 std 31.8 rstd 3.2% +trials 100000000 buckets 100000 min 871 max 1144 avg 1000.0 std 31.6 rstd 3.2% Concurrent -trials 100000000 buckets 100000 min 875 max 1138 avg 1000.0 std 31.8 rstd 3.2% -trials 100000000 buckets 100000 min 875 max 1138 avg 1000.0 std 31.8 rstd 3.2% -trials 100000000 buckets 100000 min 875 max 1138 avg 1000.0 std 31.8 rstd 3.2% -trials 100000000 buckets 100000 min 875 max 1138 avg 1000.0 std 31.8 rstd 3.2% +trials 100000000 buckets 100000 min 871 max 1144 avg 1000.0 std 31.6 rstd 3.2% +trials 100000000 buckets 100000 min 871 max 1144 avg 1000.0 std 31.6 rstd 3.2% +trials 100000000 buckets 100000 min 871 max 1144 avg 1000.0 std 31.6 rstd 3.2% +trials 100000000 buckets 100000 min 871 max 1144 avg 1000.0 std 31.6 rstd 3.2% Index: tests/.expect/nested_function.x64.txt =================================================================== --- tests/.expect/nested_function.x64.txt (revision b797d97858476d1dd4df1a393b90d5f3ce4251f1) +++ tests/.expect/nested_function.x64.txt (revision ae7a085c8585b48815059235b608cbf4791dd8e5) @@ -1,1 +1,1 @@ -total 80 +total 155 Index: tests/PRNG.cfa =================================================================== --- tests/PRNG.cfa (revision b797d97858476d1dd4df1a393b90d5f3ce4251f1) +++ tests/PRNG.cfa (revision ae7a085c8585b48815059235b608cbf4791dd8e5) @@ -8,6 +8,6 @@ // Created On : Wed Dec 29 09:38:12 2021 // Last Modified By : Peter A. Buhr -// Last Modified On : Tue Nov 22 22:51:12 2022 -// Update Count : 381 +// Last Modified On : Wed Dec 21 20:39:59 2022 +// Update Count : 406 // @@ -60,5 +60,5 @@ -unsigned int seed = 1009; +size_t seed = 1009; thread T1 {}; @@ -116,7 +116,11 @@ } // dummy + int main() { // causes leaked storage message -// setlocale( LC_NUMERIC, getenv( "LANG" ) ); // print digit separator + // setlocale( LC_NUMERIC, getenv( "LANG" ) ); // print digit separator + // locale_t loc = newlocale( LC_NUMERIC_MASK, getenv( "LANG" ), (locale_t)0p ); + // if ( loc == (locale_t)0p ) abort( "newlocale" ); + // uselocale( loc ); enum { TASKS = 4 }; @@ -130,9 +134,9 @@ sout | sepDisable; - sout | wd(13, "rand()" ) | wd(10, "rand(5)") | wd(13, "rand(0,5)" ); - for ( 20 ) { - sout | wd(13, rand()) | nonl; - sout | wd(10, rand() % 5) | nonl; - sout | wd(13, rand() % (5 - 0 + 1) + 0); + sout | wd(26, "rand()" ) | wd(12, "rand(5)") | wd(12, "rand(0,5)" ); + for ( 20 ) { + sout | wd(26, rand()) | nonl; + sout | wd(12, rand() % 5) | nonl; + sout | wd(12, rand() % (5 - 0 + 1) + 0); } // for sout | sepEnable; @@ -168,9 +172,9 @@ sout | sepDisable; - sout | nl | wd(13, "PRNG()" ) | wd(10, "PRNG(5)") | wd(13, "PRNG(0,5)" ); - for ( 20 ) { - sout | wd(13, prng( prng )) | nonl; // cascading => side-effect functions called in arbitary order - sout | wd(10, prng( prng, 5 )) | nonl; - sout | wd(13, prng( prng, 0, 5 )); + sout | nl | wd(26, "PRNG()" ) | wd(12, "PRNG(5)") | wd(12, "PRNG(0,5)" ); + for ( 20 ) { + sout | wd(26, prng( prng )) | nonl; // cascading => side-effect functions called in arbitary order + sout | wd(12, prng( prng, 5 )) | nonl; + sout | wd(12, prng( prng, 0, 5 )); } // for sout | sepEnable; @@ -203,9 +207,9 @@ sout | sepDisable; - sout | nl | wd(13, "prng()" ) | wd(10, "prng(5)") | wd(13, "prng(0,5)" ); - for ( 20 ) { - sout | wd(13, prng()) | nonl; // cascading => side-effect functions called in arbitary order - sout | wd(10, prng( 5 )) | nonl; - sout | wd(13, prng( 0, 5 )); + sout | nl | wd(26, "prng()" ) | wd(12, "prng(5)") | wd(12, "prng(0,5)" ); + for ( 20 ) { + sout | wd(26, prng()) | nonl; // cascading => side-effect functions called in arbitary order + sout | wd(12, prng( 5 )) | nonl; + sout | wd(12, prng( 0, 5 )); } // for sout | sepEnable; @@ -239,9 +243,9 @@ sout | sepDisable; - sout | nl | wd(13, "prng(t)" ) | wd(10, "prng(t,5)") | wd(13, "prng(t,0,5)" ); - for ( 20 ) { - sout | wd(13, prng( th )) | nonl; // cascading => side-effect functions called in arbitary order - sout | wd(10, prng( th, 5 )) | nonl; - sout | wd(13, prng( th, 0, 5 )); + sout | nl | wd(26, "prng(t)" ) | wd(12, "prng(t,5)") | wd(12, "prng(t,0,5)" ); + for ( 20 ) { + sout | wd(26, prng( th )) | nonl; // cascading => side-effect functions called in arbitary order + sout | wd(12, prng( th, 5 )) | nonl; + sout | wd(12, prng( th, 0, 5 )); } // for sout | sepEnable; @@ -266,4 +270,5 @@ #endif // 0 // malloc_stats(); + // freelocale( loc ); } // main Index: tests/concurrent/pthread/.expect/bounded_buffer.x64.txt =================================================================== --- tests/concurrent/pthread/.expect/bounded_buffer.x64.txt (revision b797d97858476d1dd4df1a393b90d5f3ce4251f1) +++ tests/concurrent/pthread/.expect/bounded_buffer.x64.txt (revision ae7a085c8585b48815059235b608cbf4791dd8e5) @@ -1,2 +1,2 @@ -producer total value is 24150 -consumer total value is 24150 +producer total value is 44280 +consumer total value is 44280