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
Reduce the amount of header files loading xbt/string.hpp
[simgrid.git]
/
src
/
xbt
/
xbt_main.cpp
diff --git
a/src/xbt/xbt_main.cpp
b/src/xbt/xbt_main.cpp
index 194479b17948fb2de30c4d3ae3eebe5d229f479f..15a59595650986e54e3f14e25bf4c920c009fc50 100644
(file)
--- a/
src/xbt/xbt_main.cpp
+++ b/
src/xbt/xbt_main.cpp
@@
-41,7
+41,6
@@
std::string binary_name; /* Name of the system process containing us (m
std::vector<std::string> cmdline; /* all we got in argv */
} // namespace simgrid::xbt
std::vector<std::string> cmdline; /* all we got in argv */
} // namespace simgrid::xbt
-int sthread_inside_simgrid = 1; // whether sthread should leave pthread operations or intercept them.
int xbt_initialized = 0;
simgrid::config::Flag<bool> cfg_dbg_clean_atexit{
int xbt_initialized = 0;
simgrid::config::Flag<bool> cfg_dbg_clean_atexit{
@@
-57,6
+56,12
@@
int xbt_pagebits = 0;
*/
static void xbt_preinit() XBT_ATTRIB_CONSTRUCTOR(200);
static void xbt_postexit();
*/
static void xbt_preinit() XBT_ATTRIB_CONSTRUCTOR(200);
static void xbt_postexit();
+void sthread_enable()
+{ // These symbols are used from ContextSwapped in any case, but they are only useful
+}
+void sthread_disable()
+{ // when libsthread is LD_PRELOADED. In this case, sthread's implem gets used instead.
+}
#ifdef _WIN32
#include <windows.h>
#ifdef _WIN32
#include <windows.h>
@@
-110,9
+115,6
@@
static void xbt_postexit()
xbt_initialized--;
xbt_dict_postexit();
xbt_log_postexit();
xbt_initialized--;
xbt_dict_postexit();
xbt_log_postexit();
-#if SIMGRID_HAVE_MC
- mmalloc_postexit();
-#endif
}
/** @brief Initialize the xbt mechanisms. */
}
/** @brief Initialize the xbt mechanisms. */
@@
-166,4
+168,4
@@
int SMPI_is_inited()
{
return false;
}
{
return false;
}
-#endif
\ No newline at end of file
+#endif