From d0e28d3286e2c95074db63933b0a500223d5d767 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Thu, 7 Feb 2013 02:14:02 +0100 Subject: [PATCH] Seed the random generators before the main() Otherwise, it is possible that the user set the seed s/he wants before initializing simgrid, that would then override it with another seed. That would be a *very mean* side effect of initializing simgrid :) --- src/xbt/xbt_main.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/xbt/xbt_main.c b/src/xbt/xbt_main.c index e09d03d4fb..773e3c5b67 100644 --- a/src/xbt/xbt_main.c +++ b/src/xbt/xbt_main.c @@ -8,7 +8,6 @@ #include "xbt/misc.h" #include "simgrid_config.h" /*HAVE_MMAP _XBT_WIN32 */ #include "internal_config.h" /* MMALLOC_WANT_OVERRIDE_LEGACY */ -#include "time.h" /* to seed the random generator */ #include "xbt/sysdep.h" #include "xbt/log.h" @@ -35,7 +34,6 @@ int xbt_initialized = 0; */ static void xbt_preinit(void) _XBT_GNUC_CONSTRUCTOR(200); static void xbt_postexit(void); -static unsigned int seed = 2147483647; #ifdef _XBT_WIN32 # undef _XBT_NEED_INIT_PRAGMA @@ -77,8 +75,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, #endif -static void xbt_preinit(void) -{ +static void xbt_preinit(void) { + unsigned int seed = 2147483647; + #ifdef MMALLOC_WANT_OVERRIDE_LEGACY mmalloc_preinit(); #endif @@ -87,7 +86,11 @@ static void xbt_preinit(void) xbt_os_thread_mod_preinit(); xbt_fifo_preinit(); xbt_dict_preinit(); - atexit(xbt_postexit); + + srand(seed); + srand48(seed); + + atexit(xbt_postexit); } static void xbt_postexit(void) @@ -118,9 +121,6 @@ void xbt_init(int *argc, char **argv) for (i=0;i<*argc;i++) { xbt_dynar_push(xbt_cmdline,&(argv[i])); } - - srand(seed); - srand48(seed); xbt_log_init(argc, argv); } -- 2.20.1