Changeset 92538ab for tests/PRNG.cfa

Timestamp:

Apr 10, 2022, 2:53:18 PM (4 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum

Children:

d8e2a09

Parents:

4559b34 (diff), 6256891 (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:

Resolve conflict

File:

• tests/PRNG.cfa (modified) (4 diffs)

tests/PRNG.cfa

@@ -8 +8 @@
 // Created On       : Wed Dec 29 09:38:12 2021
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Feb 11 08:16:43 2022
-// Update Count     : 328
+// Last Modified On : Sat Apr  9 15:21:14 2022
+// Update Count     : 344
 // 
 
@@ -20 +20 @@
 #include <malloc.h>                                                                             // malloc_stats
 #include <locale.h>                                                                             // setlocale
-
-// FIX ME: spurious characters appear in output
-Duration default_preemption() { return 0; }
+#include <mutex_stmt.hfa>
 
 #ifdef TIME                                                                                             // use -O2 -nodebug
@@ -50 +48 @@
         } // for
         double std = sqrt( sum / BUCKETS );
-        sout | "trials"  | TRIALS | "buckets" | BUCKETS
-                 | "min" | min | "max" | max
-                 | "avg" | wd(0,1, avg) | "std" | wd(0,1, std) | "rstd" | wd(0,1, (avg == 0 ? 0.0 : std / avg * 100)) | "%";
+        mutex( sout ) sout | "trials"  | TRIALS | "buckets" | BUCKETS
+                | "min" | min | "max" | max
+                | "avg" | wd(0,1, avg) | "std" | wd(0,1, std) | "rstd" | wd(0,1, (avg == 0 ? 0.0 : std / avg * 100)) | "%";
 } // avgstd
 
+
 uint32_t seed = 1009;
-
 
 thread T1 {};
@@ -94 +92 @@
         unsigned int * buckets = calloc( BUCKETS );                     // too big for task stack
         for ( TRIALS ) {
-                buckets[prng( (thread$ &)th ) % BUCKETS] += 1;  // concurrent
+                buckets[prng( th ) % BUCKETS] += 1;     // concurrent
         } // for
         avgstd( buckets );