X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b82c39e1bcdca7cad4c88dd56a131d2b4268166a..59da8fcd5344f65ef28eb1106233049c126e2c18:/src/xbt/xbt_main.c diff --git a/src/xbt/xbt_main.c b/src/xbt/xbt_main.c index 93c8e5c25a..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" @@ -30,13 +29,6 @@ xbt_dynar_t xbt_cmdline = NULL; /* all we got in argv */ int xbt_initialized = 0; -int _surf_do_model_check = 0; -int _surf_mc_checkpoint=0; -char* _surf_mc_property_file=NULL; -int _surf_mc_timeout=0; -int _surf_mc_max_depth=1000; -int _surf_mc_visited=0; - /* Declare xbt_preinit and xbt_postexit as constructor/destructor of the library. * This is crude and rather compiler-specific, unfortunately. */ @@ -83,34 +75,33 @@ 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 xbt_log_preinit(); - xbt_backtrace_preinit(); xbt_os_thread_mod_preinit(); xbt_fifo_preinit(); xbt_dict_preinit(); + + srand(seed); + srand48(seed); - atexit(xbt_postexit); + atexit(xbt_postexit); } static void xbt_postexit(void) { xbt_backtrace_postexit(); - xbt_fifo_postexit(); xbt_dict_postexit(); - - xbt_log_postexit(); xbt_os_thread_mod_postexit(); - - free(xbt_binary_name); xbt_dynar_free(&xbt_cmdline); - + xbt_log_postexit(); + free(xbt_binary_name); #ifdef MMALLOC_WANT_OVERRIDE_LEGACY mmalloc_postexit(); #endif @@ -130,9 +121,7 @@ void xbt_init(int *argc, char **argv) for (i=0;i<*argc;i++) { xbt_dynar_push(xbt_cmdline,&(argv[i])); } - - srand((unsigned int) time(NULL)); - + xbt_log_init(argc, argv); }