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
Add explicit initialization for the f77 field.
[simgrid.git]
/
src
/
xbt
/
xbt_main.c
diff --git
a/src/xbt/xbt_main.c
b/src/xbt/xbt_main.c
index
653546a
..
30c1a84
100644
(file)
--- a/
src/xbt/xbt_main.c
+++ b/
src/xbt/xbt_main.c
@@
-1,15
+1,15
@@
/* module handling */
/* module handling */
-/* Copyright (c) 2006-2012. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-2014. The SimGrid Team.
+ * All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "xbt/misc.h"
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#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 "simgrid_config.h" /* _XBT_WIN32 */
+#include "internal_config.h" /* MMALLOC_WANT_OVERRIDE_LEGACY */
+#include "portable.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
#include "xbt/dynar.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
#include "xbt/dynar.h"
@@
-19,6
+19,10
@@
#include "xbt_modinter.h" /* prototype of other module's init/exit in XBT */
#include "xbt_modinter.h" /* prototype of other module's init/exit in XBT */
+#include "simgrid/sg_config.h"
+
+#include <stdio.h>
+
XBT_LOG_NEW_CATEGORY(xbt, "All XBT categories (simgrid toolbox)");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(module, xbt, "module handling");
XBT_LOG_NEW_CATEGORY(xbt, "All XBT categories (simgrid toolbox)");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(module, xbt, "module handling");
@@
-29,13
+33,9
@@
char *xbt_binary_name = NULL; /* Name of the system process containing us (man
xbt_dynar_t xbt_cmdline = NULL; /* all we got in argv */
int xbt_initialized = 0;
xbt_dynar_t xbt_cmdline = NULL; /* all we got in argv */
int xbt_initialized = 0;
+int _sg_do_clean_atexit = 1;
-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;
+int xbt_pagesize;
/* 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,21
+83,35
@@
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason,
#endif
#endif
-static void xbt_preinit(void)
-{
+static void xbt_preinit(void) {
+ unsigned int seed = 2147483647;
+
+ xbt_pagesize = sysconf(_SC_PAGESIZE);
+
#ifdef MMALLOC_WANT_OVERRIDE_LEGACY
mmalloc_preinit();
#ifdef MMALLOC_WANT_OVERRIDE_LEGACY
mmalloc_preinit();
+#endif
+#ifdef _TWO_DIGIT_EXPONENT
+ /* Even printf behaves differently on Windows... */
+ _set_output_format(_TWO_DIGIT_EXPONENT);
#endif
xbt_log_preinit();
xbt_backtrace_preinit();
xbt_os_thread_mod_preinit();
xbt_fifo_preinit();
xbt_dict_preinit();
#endif
xbt_log_preinit();
xbt_backtrace_preinit();
xbt_os_thread_mod_preinit();
xbt_fifo_preinit();
xbt_dict_preinit();
+
+ srand(seed);
+#ifndef _WIN32
+ srand48(seed);
+#endif
+
atexit(xbt_postexit);
}
static void xbt_postexit(void)
{
atexit(xbt_postexit);
}
static void xbt_postexit(void)
{
+ if(!_sg_do_clean_atexit) return;
xbt_backtrace_postexit();
xbt_fifo_postexit();
xbt_dict_postexit();
xbt_backtrace_postexit();
xbt_fifo_postexit();
xbt_dict_postexit();
@@
-124,9
+138,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);
}