X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/448efb6b98d55ba423ed574da75f4c6d88135a3b..73a0ae62cf92da83e861cfaf9ba0313cacbc4825:/src/xbt/xbt_main.cpp diff --git a/src/xbt/xbt_main.cpp b/src/xbt/xbt_main.cpp index f45256509c..9443d05a42 100644 --- 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 cmdline; /* all we got in argv */ } // namespace simgrid::xbt -int sthread_inside_simgrid = 0; // whether sthread should leave pthread operations or intercept them. int xbt_initialized = 0; simgrid::config::Flag cfg_dbg_clean_atexit{ @@ -57,6 +56,8 @@ int xbt_pagebits = 0; */ 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 @@ -82,7 +83,6 @@ static BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserv static void xbt_preinit() { - sthread_inside_simgrid = 1; #ifdef _WIN32 SYSTEM_INFO si; GetSystemInfo(&si); @@ -102,7 +102,6 @@ static void xbt_preinit() xbt_log_preinit(); xbt_dict_preinit(); atexit(xbt_postexit); - sthread_inside_simgrid = 0; } static void xbt_postexit()