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
useless cosmetics around NS3 long routes
[simgrid.git]
/
src
/
xbt
/
xbt_main.cpp
diff --git
a/src/xbt/xbt_main.cpp
b/src/xbt/xbt_main.cpp
index
d90feb1
..
ce2bc71
100644
(file)
--- a/
src/xbt/xbt_main.cpp
+++ b/
src/xbt/xbt_main.cpp
@@
-1,7
+1,6
@@
/* module handling */
/* module handling */
-/* Copyright (c) 2006-2014. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2006-2017. 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. */
/* 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. */
@@
-95,11
+94,9
@@
static void xbt_preinit(void) {
_set_output_format(_TWO_DIGIT_EXPONENT);
#endif
xbt_log_preinit();
_set_output_format(_TWO_DIGIT_EXPONENT);
#endif
xbt_log_preinit();
- xbt_backtrace_preinit();
xbt_os_thread_mod_preinit();
xbt_os_thread_mod_preinit();
- xbt_fifo_preinit();
xbt_dict_preinit();
xbt_dict_preinit();
-
+
srand(seed);
#ifndef _WIN32
srand48(seed);
srand(seed);
#ifndef _WIN32
srand48(seed);
@@
-109,16
+106,15
@@
static void xbt_preinit(void) {
static void xbt_postexit(void)
{
static void xbt_postexit(void)
{
- if(!_sg_do_clean_atexit) return;
+ if (!_sg_do_clean_atexit)
+ return;
xbt_initialized--;
xbt_initialized--;
- xbt_backtrace_postexit();
- xbt_fifo_postexit();
xbt_dict_postexit();
xbt_os_thread_mod_postexit();
xbt_dynar_free(&xbt_cmdline);
xbt_log_postexit();
free(xbt_binary_name);
xbt_dict_postexit();
xbt_os_thread_mod_postexit();
xbt_dynar_free(&xbt_cmdline);
xbt_log_postexit();
free(xbt_binary_name);
-#if HAVE_MC
+#if
SIMGRID_
HAVE_MC
mmalloc_postexit();
#endif
}
mmalloc_postexit();
#endif
}
@@
-128,14
+124,15
@@
void xbt_init(int *argc, char **argv)
{
simgrid::xbt::installExceptionHandler();
{
simgrid::xbt::installExceptionHandler();
- if (xbt_initialized++) {
- XBT_DEBUG("XBT was initialized %d times.", xbt_initialized);
+ if (xbt_initialized) {
+ xbt_initialized++;
+ XBT_DEBUG("XBT has been initialized %d times.", xbt_initialized);
return;
}
xbt_binary_name = xbt_strdup(argv[0]);
return;
}
xbt_binary_name = xbt_strdup(argv[0]);
- xbt_cmdline
= xbt_dynar_new(sizeof(char*),
NULL);
- for (int i
=0;i<*argc;
i++)
+ xbt_cmdline
= xbt_dynar_new(sizeof(char*),
NULL);
+ for (int i
= 0; i < *argc;
i++)
xbt_dynar_push(xbt_cmdline,&(argv[i]));
xbt_log_init(argc, argv);
xbt_dynar_push(xbt_cmdline,&(argv[i]));
xbt_log_init(argc, argv);
@@
-163,8
+160,7
@@
void xbt_abort(void)
__gcov_flush();
#endif
#ifdef _WIN32
__gcov_flush();
#endif
#ifdef _WIN32
- /* It was said *in silence*. We don't want to see the error message printed
- * by the Microsoft's implementation of abort(). */
+ /* We said *in silence*. We don't want to see the error message printed by Microsoft's implementation of abort(). */
raise(SIGABRT);
signal(SIGABRT, SIG_DFL);
raise(SIGABRT);
raise(SIGABRT);
signal(SIGABRT, SIG_DFL);
raise(SIGABRT);