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
kill obsolete code
[simgrid.git]
/
src
/
xbt
/
xbt_main.c
diff --git
a/src/xbt/xbt_main.c
b/src/xbt/xbt_main.c
index
43e903f
..
026641b
100644
(file)
--- a/
src/xbt/xbt_main.c
+++ b/
src/xbt/xbt_main.c
@@
-50,14
+50,6
@@
int xbt_pagebits = 0;
static void xbt_preinit(void) _XBT_GNUC_CONSTRUCTOR(200);
static void xbt_postexit(void);
static void xbt_preinit(void) _XBT_GNUC_CONSTRUCTOR(200);
static void xbt_postexit(void);
-#ifdef _WIN32
-# undef _XBT_NEED_INIT_PRAGMA
-#endif
-
-#ifdef _XBT_NEED_INIT_PRAGMA
-#pragma init (xbt_preinit)
-#endif
-
#ifdef _WIN32
#include <windows.h>
#ifdef _WIN32
#include <windows.h>
@@
-137,6
+129,8
@@
static void xbt_postexit(void)
/** @brief Initialize the xbt mechanisms. */
void xbt_init(int *argc, char **argv)
{
/** @brief Initialize the xbt mechanisms. */
void xbt_init(int *argc, char **argv)
{
+ xbt_set_terminate();
+
if (xbt_initialized++) {
XBT_DEBUG("XBT was initialized %d times.", xbt_initialized);
return;
if (xbt_initialized++) {
XBT_DEBUG("XBT was initialized %d times.", xbt_initialized);
return;
@@
-144,22
+138,12
@@
void xbt_init(int *argc, char **argv)
xbt_binary_name = xbt_strdup(argv[0]);
xbt_cmdline = xbt_dynar_new(sizeof(char*),NULL);
xbt_binary_name = xbt_strdup(argv[0]);
xbt_cmdline = xbt_dynar_new(sizeof(char*),NULL);
- int i;
- for (i=0;i<*argc;i++) {
+ for (int i=0;i<*argc;i++)
xbt_dynar_push(xbt_cmdline,&(argv[i]));
xbt_dynar_push(xbt_cmdline,&(argv[i]));
- }
xbt_log_init(argc, argv);
}
xbt_log_init(argc, argv);
}
-/** @brief Finalize the xbt mechanisms.
- * @warning this function is deprecated. Just don't call it, there is nothing more to do to finalize xbt*/
-void xbt_exit()
-{
- XBT_WARN("This function is deprecated, you shouldn't use it");
-}
-
-
/* these two functions belong to xbt/sysdep.h, which have no corresponding .c file */
/** @brief like free, but you can be sure that it is a function */
void xbt_free_f(void *p)
/* these two functions belong to xbt/sysdep.h, which have no corresponding .c file */
/** @brief like free, but you can be sure that it is a function */
void xbt_free_f(void *p)