A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
freebsd compatibility
[simgrid.git]
/
src
/
xbt
/
xbt_main.c
diff --git
a/src/xbt/xbt_main.c
b/src/xbt/xbt_main.c
index
653546a
..
773e3c5
100644
(file)
--- 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 "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"
#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 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.
*/
/* Declare xbt_preinit and xbt_postexit as constructor/destructor of the library.
* This is crude and rather compiler-specific, unfortunately.
*/
@@
-83,8
+75,9
@@
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason,
#endif
#endif
-static void xbt_preinit(void)
-{
+static void xbt_preinit(void) {
+ unsigned int seed = 2147483647;
+
#ifdef MMALLOC_WANT_OVERRIDE_LEGACY
mmalloc_preinit();
#endif
#ifdef MMALLOC_WANT_OVERRIDE_LEGACY
mmalloc_preinit();
#endif
@@
-93,7
+86,11
@@
static void xbt_preinit(void)
xbt_os_thread_mod_preinit();
xbt_fifo_preinit();
xbt_dict_preinit();
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)
}
static void xbt_postexit(void)
@@
-124,9
+121,7
@@
void xbt_init(int *argc, char **argv)
for (i=0;i<*argc;i++) {
xbt_dynar_push(xbt_cmdline,&(argv[i]));
}
for (i=0;i<*argc;i++) {
xbt_dynar_push(xbt_cmdline,&(argv[i]));
}
-
- srand((unsigned int) time(NULL));
-
+
xbt_log_init(argc, argv);
}
xbt_log_init(argc, argv);
}