Make sthread_inside_simgrid static into libsthread in the (vain) hope that it'll...

[simgrid.git] / src / xbt / xbt_main.cpp

diff --git a/src/xbt/xbt_main.cpp b/src/xbt/xbt_main.cpp
index f59533e..9443d05 100644 (file)
--- a/src/xbt/xbt_main.cpp
+++ b/src/xbt/xbt_main.cpp
@@ -1,6 +1,6 @@
 /* module handling                                                          */
 
-/* Copyright (c) 2006-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2006-2022. 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. */
@@ -10,7 +10,7 @@
 #include "simgrid/config.h"
 #include "simgrid/sg_config.hpp"
 #include "src/internal_config.h"
-#include "src/xbt_modinter.h" /* prototype of other module's init/exit in XBT */
+#include "src/sthread/sthread.h" // sthread_inside_simgrid
 #include "xbt/config.hpp"
 #include "xbt/coverage.h"
 #include "xbt/dynar.h"
@@ -19,6 +19,7 @@
 #include "xbt/misc.h"
 #include "xbt/module.h" /* this module */
 #include "xbt/sysdep.h"
+#include "xbt/xbt_modinter.h" /* prototype of other module's init/exit in XBT */
 
 #include <cmath>
 #include <cstdio>
@@ -35,12 +36,11 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(module, xbt, "module handling");
 
 XBT_LOG_NEW_CATEGORY(smpi, "All SMPI categories"); /* lives here even if that's a bit odd to solve linking issues: this is used in xbt_log_file_appender to detect whether SMPI is used (and thus whether we should unbench the writing to disk) */
 
-namespace simgrid {
-namespace xbt {
+namespace simgrid::xbt {
 std::string binary_name;          /* Name of the system process containing us (mandatory to retrieve neat backtraces) */
 std::vector<std::string> cmdline; /* all we got in argv */
-} // namespace xbt
-} // namespace simgrid
+} // namespace simgrid::xbt
+
 
 int xbt_initialized = 0;
 simgrid::config::Flag<bool> cfg_dbg_clean_atexit{
@@ -56,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 <windows.h>
@@ -125,7 +127,8 @@ void xbt_init(int *argc, char **argv)
 
   simgrid::xbt::install_exception_handler();
 
-  simgrid::xbt::binary_name = argv[0];
+  if (*argc > 0)
+    simgrid::xbt::binary_name = argv[0];
   for (int i = 0; i < *argc; i++)
     simgrid::xbt::cmdline.emplace_back(argv[i]);
 
@@ -158,3 +161,10 @@ void xbt_abort()
 #endif
   abort();
 }
+
+#ifndef HAVE_SMPI
+int SMPI_is_inited()
+{
+  return false;
+}
+#endif
\ No newline at end of file