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
Convert last bits from the xbt/config C interface.
[simgrid.git]
/
src
/
xbt
/
xbt_main.cpp
diff --git
a/src/xbt/xbt_main.cpp
b/src/xbt/xbt_main.cpp
index
f1736ce
..
3faed87
100644
(file)
--- a/
src/xbt/xbt_main.cpp
+++ b/
src/xbt/xbt_main.cpp
@@
-1,6
+1,6
@@
/* module handling */
/* module handling */
-/* Copyright (c) 2006-201
7
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-201
8
. 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. */
@@
-8,7
+8,7
@@
#define XBT_LOG_LOCALLY_DEFINE_XBT_CHANNEL /* MSVC don't want it to be declared extern in headers and local here */
#include "simgrid_config.h"
#define XBT_LOG_LOCALLY_DEFINE_XBT_CHANNEL /* MSVC don't want it to be declared extern in headers and local here */
#include "simgrid_config.h"
-#include "xbt/config.h"
+#include "xbt/config.h
pp
"
#include "xbt/dynar.h"
#include "xbt/log.h"
#include "xbt/log.hpp"
#include "xbt/dynar.h"
#include "xbt/log.h"
#include "xbt/log.hpp"
@@
-20,7
+20,7
@@
#include "src/xbt_modinter.h" /* prototype of other module's init/exit in XBT */
#include "src/xbt_modinter.h" /* prototype of other module's init/exit in XBT */
-#include "simgrid/sg_config.h"
+#include "simgrid/sg_config.h
pp
"
#include "src/internal_config.h"
#include <cstdio>
#include "src/internal_config.h"
#include <cstdio>
@@
-39,7
+39,7
@@
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
;
+
bool _sg_do_clean_atexit = true
;
int xbt_pagesize;
int xbt_pagebits = 0;
int xbt_pagesize;
int xbt_pagebits = 0;
@@
-47,7
+47,7
@@
int xbt_pagebits = 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.
*/
-static void xbt_preinit()
_XBT_GNUC
_CONSTRUCTOR(200);
+static void xbt_preinit()
XBT_ATTRIB
_CONSTRUCTOR(200);
static void xbt_postexit();
#ifdef _WIN32
static void xbt_postexit();
#ifdef _WIN32
@@
-114,7
+114,6
@@
static void xbt_postexit()
xbt_os_thread_mod_postexit();
xbt_dynar_free(&xbt_cmdline);
xbt_log_postexit();
xbt_os_thread_mod_postexit();
xbt_dynar_free(&xbt_cmdline);
xbt_log_postexit();
- free(xbt_binary_name);
#if SIMGRID_HAVE_MC
mmalloc_postexit();
#endif
#if SIMGRID_HAVE_MC
mmalloc_postexit();
#endif
@@
-125,13
+124,13
@@
void xbt_init(int *argc, char **argv)
{
simgrid::xbt::installExceptionHandler();
{
simgrid::xbt::installExceptionHandler();
- if (xbt_initialized) {
- xbt_initialized++;
+ xbt_initialized++;
+ if (xbt_initialized > 1) {
XBT_DEBUG("XBT has been initialized %d times.", xbt_initialized);
return;
}
XBT_DEBUG("XBT has been initialized %d times.", xbt_initialized);
return;
}
- xbt_binary_name =
xbt_strdup(argv[0])
;
+ xbt_binary_name =
argv[0]
;
xbt_cmdline = xbt_dynar_new(sizeof(char*), NULL);
for (int i = 0; i < *argc; i++)
xbt_dynar_push(xbt_cmdline,&(argv[i]));
xbt_cmdline = xbt_dynar_new(sizeof(char*), NULL);
for (int i = 0; i < *argc; i++)
xbt_dynar_push(xbt_cmdline,&(argv[i]));
@@
-140,16
+139,16
@@
void xbt_init(int *argc, char **argv)
}
/* these two functions belong to xbt/sysdep.h, which have no corresponding .c file */
}
/* 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 */
+/** @brief like
xbt_
free, but you can be sure that it is a function */
void xbt_free_f(void *p)
{
void xbt_free_f(void *p)
{
- free(p);
+
xbt_
free(p);
}
/** @brief should be given a pointer to pointer, and frees the second one */
void xbt_free_ref(void *d)
{
}
/** @brief should be given a pointer to pointer, and frees the second one */
void xbt_free_ref(void *d)
{
-
free(*(void **)
d);
+
xbt_free(*(void**)
d);
}
/** @brief Kill the program in silence */
}
/** @brief Kill the program in silence */