Stop trying to build on native WIN32, it's broken anyway

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

diff --git a/src/xbt/xbt_main.cpp b/src/xbt/xbt_main.cpp
index bfdf869..7825a35 100644 (file)
--- a/src/xbt/xbt_main.cpp
+++ b/src/xbt/xbt_main.cpp
@@ -1,6 +1,6 @@
 /* module handling                                                          */
 
-/* Copyright (c) 2006-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2006-2023. 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,27 +19,29 @@
 #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>
-#ifdef _WIN32
-# include <csignal> /* To silence MSVC on abort() */
-#endif
 #if HAVE_UNISTD_H
 # include <unistd.h>
 #endif
+#include <string>
+#include <vector>
 
 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) */
 
-char *xbt_binary_name = NULL;   /* Name of the system process containing us (mandatory to retrieve neat backtraces) */
-xbt_dynar_t xbt_cmdline = NULL; /* all we got in argv */
+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 simgrid::xbt
+
 
 int xbt_initialized = 0;
 simgrid::config::Flag<bool> cfg_dbg_clean_atexit{
     "debug/clean-atexit",
-    {"clean-atexit"},
     "Whether to cleanup SimGrid at exit. Disable it if your code segfaults after its end.",
     true};
 
@@ -51,50 +53,18 @@ int xbt_pagebits = 0;
  */
 static void xbt_preinit() XBT_ATTRIB_CONSTRUCTOR(200);
 static void xbt_postexit();
-
-#ifdef _WIN32
-#include <windows.h>
-
-#ifndef __GNUC__
-/* Should not be necessary but for some reason, DllMain is called twice at attachment and at detachment.*/
-static int xbt_dll_process_is_attached = 0;
-
-/* see also http://msdn.microsoft.com/en-us/library/ms682583%28VS.85%29.aspx */
-/* and http://www.microsoft.com/whdc/driver/kernel/DLL_bestprac.mspx */
-static BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
-{
-  if (fdwReason == DLL_PROCESS_ATTACH
-      && xbt_dll_process_is_attached == 0) {
-    xbt_dll_process_is_attached = 1;
-    xbt_preinit();
-  } else if (fdwReason == DLL_PROCESS_DETACH
-      && xbt_dll_process_is_attached == 1) {
-    xbt_dll_process_is_attached = 0;
-  }
-  return 1;
+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.
 }
-#endif
-
-#endif
 
 static void xbt_preinit()
 {
-#ifdef _WIN32
-  SYSTEM_INFO si;
-  GetSystemInfo(&si);
-  xbt_pagesize = si.dwPageSize;
-#elif HAVE_SYSCONF
-  xbt_pagesize = sysconf(_SC_PAGESIZE);
-#else
-# error Cannot get page size.
-#endif
-
-  xbt_pagebits = log2(xbt_pagesize);
+  xbt_pagesize = static_cast<int>(sysconf(_SC_PAGESIZE));
+  xbt_pagebits = static_cast<int>(log2(xbt_pagesize));
 
-#ifdef _TWO_DIGIT_EXPONENT
-  /* Even printf behaves differently on Windows... */
-  _set_output_format(_TWO_DIGIT_EXPONENT);
-#endif
   xbt_log_preinit();
   xbt_dict_preinit();
   atexit(xbt_postexit);
@@ -106,11 +76,7 @@ static void xbt_postexit()
     return;
   xbt_initialized--;
   xbt_dict_postexit();
-  xbt_dynar_free(&xbt_cmdline);
   xbt_log_postexit();
-#if SIMGRID_HAVE_MC
-  mmalloc_postexit();
-#endif
 }
 
 /** @brief Initialize the xbt mechanisms. */
@@ -124,10 +90,10 @@ void xbt_init(int *argc, char **argv)
 
   simgrid::xbt::install_exception_handler();
 
-  xbt_binary_name = argv[0];
-  xbt_cmdline     = xbt_dynar_new(sizeof(char*), NULL);
+  if (*argc > 0)
+    simgrid::xbt::binary_name = argv[0];
   for (int i = 0; i < *argc; i++)
-    xbt_dynar_push(xbt_cmdline,&(argv[i]));
+    simgrid::xbt::cmdline.emplace_back(argv[i]);
 
   xbt_log_init(argc, argv);
 }
@@ -150,11 +116,12 @@ void xbt_abort()
 {
   /* Call __gcov_flush on abort when compiling with coverage options. */
   coverage_checkpoint();
-#ifdef _WIN32
-  /* We said *in silence*. We don't want to see the error message printed by Microsoft's implementation of abort(). */
-  raise(SIGABRT);
-  signal(SIGABRT, SIG_DFL);
-  raise(SIGABRT);
-#endif
   abort();
 }
+
+#ifndef HAVE_SMPI
+int SMPI_is_inited()
+{
+  return false;
+}
+#endif