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
This structure was not necessary
[simgrid.git]
/
src
/
xbt
/
xbt_main.c
diff --git
a/src/xbt/xbt_main.c
b/src/xbt/xbt_main.c
index
65add45
..
c0cac04
100644
(file)
--- a/
src/xbt/xbt_main.c
+++ b/
src/xbt/xbt_main.c
@@
-92,7
+92,7
@@
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason,
static void xbt_preinit(void)
{
static void xbt_preinit(void)
{
-#ifdef
HAVE_MMAP
+#ifdef
MMALLOC_WANT_OVERIDE_LEGACY
mmalloc_preinit();
#endif
xbt_log_preinit();
mmalloc_preinit();
#endif
xbt_log_preinit();
@@
-123,25
+123,25
@@
static void xbt_preinit(void)
XBT_LOG_CONNECT(xbt_parmap,xbt);
XBT_LOG_CONNECT(xbt_parmap_unit,xbt_parmap);
XBT_LOG_CONNECT(xbt_parmap,xbt);
XBT_LOG_CONNECT(xbt_parmap_unit,xbt_parmap);
- xbt_fifo_preinit();
- xbt_dict_preinit();
xbt_backtrace_preinit();
xbt_os_thread_mod_preinit();
xbt_backtrace_preinit();
xbt_os_thread_mod_preinit();
+ xbt_fifo_preinit();
+ xbt_dict_preinit();
}
static void xbt_postexit(void)
{
}
static void xbt_postexit(void)
{
- xbt_os_thread_mod_postexit();
xbt_backtrace_postexit();
xbt_fifo_postexit();
xbt_dict_postexit();
xbt_log_postexit();
xbt_backtrace_postexit();
xbt_fifo_postexit();
xbt_dict_postexit();
xbt_log_postexit();
+ xbt_os_thread_mod_postexit();
free(xbt_binary_name);
free(xbt_binary_name);
-#ifdef
HAVE_MMAP
+#ifdef
MMALLOC_WANT_OVERIDE_LEGACY
mmalloc_postexit();
#endif
}
mmalloc_postexit();
#endif
}
@@
-157,7
+157,7
@@
void xbt_init(int *argc, char **argv)
xbt_binary_name = xbt_strdup(argv[0]);
srand((unsigned int) time(NULL));
xbt_binary_name = xbt_strdup(argv[0]);
srand((unsigned int) time(NULL));
-
VERB0
("Initialize XBT");
+
XBT_VERB
("Initialize XBT");
xbt_log_init(argc, argv);
}
xbt_log_init(argc, argv);
}
@@
-165,7
+165,7
@@
void xbt_init(int *argc, char **argv)
/** @brief Finalize the xbt mechanisms. */
void xbt_exit()
{
/** @brief Finalize the xbt mechanisms. */
void xbt_exit()
{
-
WARN0
("This function is deprecated, you shouldn't use it");
+
XBT_WARN
("This function is deprecated, you shouldn't use it");
}
}