Convert prng module to use C11-style atomics
This commit is contained in:
committed by
David Goldblatt
parent
492e9f301e
commit
7da04a6b09
@@ -2,31 +2,32 @@
|
||||
|
||||
static void
|
||||
test_prng_lg_range_u32(bool atomic) {
|
||||
uint32_t sa, sb, ra, rb;
|
||||
atomic_u32_t sa, sb;
|
||||
uint32_t ra, rb;
|
||||
unsigned lg_range;
|
||||
|
||||
sa = 42;
|
||||
atomic_store_u32(&sa, 42, ATOMIC_RELAXED);
|
||||
ra = prng_lg_range_u32(&sa, 32, atomic);
|
||||
sa = 42;
|
||||
atomic_store_u32(&sa, 42, ATOMIC_RELAXED);
|
||||
rb = prng_lg_range_u32(&sa, 32, atomic);
|
||||
assert_u32_eq(ra, rb,
|
||||
"Repeated generation should produce repeated results");
|
||||
|
||||
sb = 42;
|
||||
atomic_store_u32(&sb, 42, ATOMIC_RELAXED);
|
||||
rb = prng_lg_range_u32(&sb, 32, atomic);
|
||||
assert_u32_eq(ra, rb,
|
||||
"Equivalent generation should produce equivalent results");
|
||||
|
||||
sa = 42;
|
||||
atomic_store_u32(&sa, 42, ATOMIC_RELAXED);
|
||||
ra = prng_lg_range_u32(&sa, 32, atomic);
|
||||
rb = prng_lg_range_u32(&sa, 32, atomic);
|
||||
assert_u32_ne(ra, rb,
|
||||
"Full-width results must not immediately repeat");
|
||||
|
||||
sa = 42;
|
||||
atomic_store_u32(&sa, 42, ATOMIC_RELAXED);
|
||||
ra = prng_lg_range_u32(&sa, 32, atomic);
|
||||
for (lg_range = 31; lg_range > 0; lg_range--) {
|
||||
sb = 42;
|
||||
atomic_store_u32(&sb, 42, ATOMIC_RELAXED);
|
||||
rb = prng_lg_range_u32(&sb, lg_range, atomic);
|
||||
assert_u32_eq((rb & (UINT32_C(0xffffffff) << lg_range)),
|
||||
0, "High order bits should be 0, lg_range=%u", lg_range);
|
||||
@@ -74,32 +75,33 @@ test_prng_lg_range_u64(void) {
|
||||
|
||||
static void
|
||||
test_prng_lg_range_zu(bool atomic) {
|
||||
size_t sa, sb, ra, rb;
|
||||
atomic_zu_t sa, sb;
|
||||
size_t ra, rb;
|
||||
unsigned lg_range;
|
||||
|
||||
sa = 42;
|
||||
atomic_store_zu(&sa, 42, ATOMIC_RELAXED);
|
||||
ra = prng_lg_range_zu(&sa, ZU(1) << (3 + LG_SIZEOF_PTR), atomic);
|
||||
sa = 42;
|
||||
atomic_store_zu(&sa, 42, ATOMIC_RELAXED);
|
||||
rb = prng_lg_range_zu(&sa, ZU(1) << (3 + LG_SIZEOF_PTR), atomic);
|
||||
assert_zu_eq(ra, rb,
|
||||
"Repeated generation should produce repeated results");
|
||||
|
||||
sb = 42;
|
||||
atomic_store_zu(&sb, 42, ATOMIC_RELAXED);
|
||||
rb = prng_lg_range_zu(&sb, ZU(1) << (3 + LG_SIZEOF_PTR), atomic);
|
||||
assert_zu_eq(ra, rb,
|
||||
"Equivalent generation should produce equivalent results");
|
||||
|
||||
sa = 42;
|
||||
atomic_store_zu(&sa, 42, ATOMIC_RELAXED);
|
||||
ra = prng_lg_range_zu(&sa, ZU(1) << (3 + LG_SIZEOF_PTR), atomic);
|
||||
rb = prng_lg_range_zu(&sa, ZU(1) << (3 + LG_SIZEOF_PTR), atomic);
|
||||
assert_zu_ne(ra, rb,
|
||||
"Full-width results must not immediately repeat");
|
||||
|
||||
sa = 42;
|
||||
atomic_store_zu(&sa, 42, ATOMIC_RELAXED);
|
||||
ra = prng_lg_range_zu(&sa, ZU(1) << (3 + LG_SIZEOF_PTR), atomic);
|
||||
for (lg_range = (ZU(1) << (3 + LG_SIZEOF_PTR)) - 1; lg_range > 0;
|
||||
lg_range--) {
|
||||
sb = 42;
|
||||
atomic_store_zu(&sb, 42, ATOMIC_RELAXED);
|
||||
rb = prng_lg_range_zu(&sb, lg_range, atomic);
|
||||
assert_zu_eq((rb & (SIZE_T_MAX << lg_range)),
|
||||
0, "High order bits should be 0, lg_range=%u", lg_range);
|
||||
@@ -142,10 +144,10 @@ test_prng_range_u32(bool atomic) {
|
||||
#define NREPS 10
|
||||
|
||||
for (range = 2; range < MAX_RANGE; range += RANGE_STEP) {
|
||||
uint32_t s;
|
||||
atomic_u32_t s;
|
||||
unsigned rep;
|
||||
|
||||
s = range;
|
||||
atomic_store_u32(&s, range, ATOMIC_RELAXED);
|
||||
for (rep = 0; rep < NREPS; rep++) {
|
||||
uint32_t r = prng_range_u32(&s, range, atomic);
|
||||
|
||||
@@ -182,10 +184,10 @@ test_prng_range_zu(bool atomic) {
|
||||
#define NREPS 10
|
||||
|
||||
for (range = 2; range < MAX_RANGE; range += RANGE_STEP) {
|
||||
size_t s;
|
||||
atomic_zu_t s;
|
||||
unsigned rep;
|
||||
|
||||
s = range;
|
||||
atomic_store_zu(&s, range, ATOMIC_RELAXED);
|
||||
for (rep = 0; rep < NREPS; rep++) {
|
||||
size_t r = prng_range_zu(&s, range, atomic);
|
||||
|
||||
|
Reference in New Issue
Block a user