From 0d3c2e1988ebc0821841127a585572e20d8e4ce6 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Thu, 6 Sep 2018 16:02:15 -0400 Subject: [PATCH] no need for a dedicated init rng --- malloc.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/malloc.c b/malloc.c index dd9b54c..f3513a2 100644 --- a/malloc.c +++ b/malloc.c @@ -614,9 +614,7 @@ COLD static void init_slow_path(void) { fatal_error("page size mismatch"); } - struct random_state rng; - random_state_init(&rng); - + random_state_init(®ions_rng); for (unsigned i = 0; i < 2; i++) { ro.regions[i] = allocate_pages(max_region_table_size, PAGE_SIZE, false); if (ro.regions[i] == NULL) { @@ -627,7 +625,6 @@ COLD static void init_slow_path(void) { if (memory_protect_rw(regions, regions_total * sizeof(struct region_info))) { fatal_error("failed to unprotect memory for regions table"); } - random_state_init(®ions_rng); ro.slab_region_start = memory_map(slab_region_size); if (ro.slab_region_start == NULL) { @@ -645,7 +642,7 @@ COLD static void init_slow_path(void) { random_state_init(&c->rng); size_t bound = (real_class_region_size - class_region_size) / PAGE_SIZE - 1; - size_t gap = (get_random_u64_uniform(&rng, bound) + 1) * PAGE_SIZE; + size_t gap = (get_random_u64_uniform(®ions_rng, bound) + 1) * PAGE_SIZE; c->class_region_start = (char *)ro.slab_region_start + real_class_region_size * class + gap; size_t size = size_classes[class];