X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a8a66c743439c94d5de5bcb8a3e50dcd207b6d2f..6fbcdfade89b3812c24152c86f8aa3be510df7f2:/src/kernel/EngineImpl.cpp

diff --git a/src/kernel/EngineImpl.cpp b/src/kernel/EngineImpl.cpp
index 99304a9393..2d8208f144 100644
--- a/src/kernel/EngineImpl.cpp
+++ b/src/kernel/EngineImpl.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016-2022. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2016-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. */
@@ -22,11 +22,7 @@
 #include "xbt/xbt_modinter.h" /* whether initialization was already done */
 
 #include <boost/algorithm/string/predicate.hpp>
-#ifndef _WIN32
 #include <dlfcn.h>
-#endif /* _WIN32 */
-
-extern int xbt_log_no_loc;
 
 #if SIMGRID_HAVE_MC
 #include "src/mc/remote/AppSide.hpp"
@@ -70,7 +66,7 @@ static inline std::string contexts_list()
 }
 
 static config::Flag<std::string> context_factory_name("contexts/factory",
-                                                      (std::string("Possible values: ") + contexts_list()).c_str(),
+                                                      ("Possible values: " + contexts_list()).c_str(),
                                                       context_factories.begin()->first);
 
 } // namespace simgrid::kernel
@@ -87,7 +83,6 @@ XBT_ATTRIB_NORETURN static void inthandler(int)
   exit(1);
 }
 
-#ifndef _WIN32
 static void segvhandler(int signum, siginfo_t* siginfo, void* /*context*/)
 {
   if ((siginfo->si_signo == SIGSEGV && siginfo->si_code == SEGV_ACCERR) || siginfo->si_signo == SIGBUS) {
@@ -121,8 +116,8 @@ static void segvhandler(int signum, siginfo_t* siginfo, void* /*context*/)
 }
 
 /**
- * Install signal handler for SIGSEGV.  Check that nobody has already installed
- * its own handler.  For example, the Java VM does this.
+ * Install signal handler for SIGSEGV.  Check that nobody has already installed its own handler.
+ * Historically, the Java VM did that but this could maybe removed now that Java is gone (TODO)
  */
 static void install_segvhandler()
 {
@@ -158,8 +153,6 @@ static void install_segvhandler()
   }
 }
 
-#endif /* _WIN32 */
-
 namespace simgrid::kernel {
 
 EngineImpl::~EngineImpl()
@@ -206,10 +199,7 @@ void EngineImpl::initialize(int* argc, char** argv)
 
   /* Prepare to display some more info when dying on Ctrl-C pressing */
   std::signal(SIGINT, inthandler);
-
-#ifndef _WIN32
   install_segvhandler();
-#endif
 
   /* register a function to be called by SURF after the environment creation */
   sg_platf_init();
@@ -240,11 +230,6 @@ void EngineImpl::context_mod_init() const
   }
 #endif
 
-  /* select the context factory to use to create the contexts */
-  if (context::ContextFactory::initializer) { // Give Java a chance to hijack the factory mechanism
-    instance_->set_context_factory(context::ContextFactory::initializer());
-    return;
-  }
   /* use the factory specified by --cfg=contexts/factory:value */
   for (auto const& [factory_name, factory] : context_factories)
     if (context_factory_name == factory_name) {
@@ -270,7 +255,7 @@ void EngineImpl::context_mod_init() const
     XBT_ERROR("  (boost was disabled at compilation time on this machine -- check configure logs for details. Did you "
               "install the libboost-context-dev package?)");
 #endif
-    XBT_ERROR("  thread: slow portability layer using pthreads as provided by gcc");
+    XBT_ERROR("  thread: slow portability layer using standard threads as provided by libstdc");
     xbt_die("Please use a valid factory.");
   }
 }
@@ -326,9 +311,6 @@ void EngineImpl::load_platform(const std::string& platf)
 {
   double start = xbt_os_time();
   if (boost::algorithm::ends_with(platf, ".so") || boost::algorithm::ends_with(platf, ".dylib")) {
-#ifdef _WIN32
-    xbt_die("loading platform through shared library isn't supported on windows");
-#else
     void* handle = dlopen(platf.c_str(), RTLD_LAZY);
     xbt_assert(handle, "Impossible to open platform file: %s", platf.c_str());
     platf_handle_           = std::unique_ptr<void, std::function<int(void*)>>(handle, dlclose);
@@ -337,7 +319,6 @@ void EngineImpl::load_platform(const std::string& platf)
     const char* dlsym_error = dlerror();
     xbt_assert(not dlsym_error, "Error: %s", dlsym_error);
     callable(*simgrid::s4u::Engine::get_instance());
-#endif /* _WIN32 */
   } else {
     parse_platform_file(platf);
   }