X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d0e93a6a4400978f6473c813eb434437ab540b2d..417ed3b671abe3a71fa4106d23d0a432084cc207:/src/xbt/xbt_main.cpp

diff --git a/src/xbt/xbt_main.cpp b/src/xbt/xbt_main.cpp
index 8ee72a4f07..4d41e07467 100644
--- a/src/xbt/xbt_main.cpp
+++ b/src/xbt/xbt_main.cpp
@@ -1,6 +1,6 @@
 /* module handling                                                          */
 
-/* Copyright (c) 2006-2022. 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. */
@@ -23,9 +23,6 @@
 
 #include <cmath>
 #include <cstdio>
-#ifdef _WIN32
-# include <csignal> /* To silence MSVC on abort() */
-#endif
 #if HAVE_UNISTD_H
 # include <unistd.h>
 #endif
@@ -48,61 +45,25 @@ simgrid::config::Flag<bool> cfg_dbg_clean_atexit{
     "Whether to cleanup SimGrid at exit. Disable it if your code segfaults after its end.",
     true};
 
-int xbt_pagesize;
-int xbt_pagebits = 0;
+const int xbt_pagesize = static_cast<int>(sysconf(_SC_PAGESIZE));
+const int xbt_pagebits = static_cast<int>(log2(xbt_pagesize));
 
 /* 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_ATTRIB_CONSTRUCTOR(200);
 static void xbt_postexit();
-void sthread_enable()
+XBT_ATTRIB_NOINLINE void sthread_enable()
 { // These symbols are used from ContextSwapped in any case, but they are only useful
+  asm("");
 }
-void sthread_disable()
+XBT_ATTRIB_NOINLINE void sthread_disable()
 { //  when libsthread is LD_PRELOADED. In this case, sthread's implem gets used instead.
+  asm("");
 }
 
-#ifdef _WIN32
-#include <windows.h>
-
-#ifndef __GNUC__
-/* Should not be necessary but for some reason, DllMain is called twice at attachment and at detachment.*/
-/* 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)
-{
-  static bool xbt_dll_process_is_attached = false;
-  if (fdwReason == DLL_PROCESS_ATTACH && not xbt_dll_process_is_attached) {
-    xbt_dll_process_is_attached = true;
-    xbt_preinit();
-  } else if (fdwReason == DLL_PROCESS_DETACH && xbt_dll_process_is_attached) {
-    xbt_dll_process_is_attached = false;
-  }
-  return 1;
-}
-#endif
-
-#endif
-
 static void xbt_preinit()
 {
-#ifdef _WIN32
-  SYSTEM_INFO si;
-  GetSystemInfo(&si);
-  xbt_pagesize = si.dwPageSize;
-#elif HAVE_SYSCONF
-  xbt_pagesize = static_cast<int>(sysconf(_SC_PAGESIZE));
-#else
-# error Cannot get page size.
-#endif
-
-  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);
@@ -115,9 +76,6 @@ static void xbt_postexit()
   xbt_initialized--;
   xbt_dict_postexit();
   xbt_log_postexit();
-#if SIMGRID_HAVE_MC
-  mmalloc_postexit();
-#endif
 }
 
 /** @brief Initialize the xbt mechanisms. */
@@ -157,12 +115,6 @@ 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();
 }