move surf::As to s4u::As

[simgrid.git] / src / simix / smx_context.cpp

diff --git a/src/simix/smx_context.cpp b/src/simix/smx_context.cpp
index ace2095..e88b271 100644 (file)
--- a/src/simix/smx_context.cpp
+++ b/src/simix/smx_context.cpp
@@ -11,12 +11,13 @@
 #include "xbt/swag.h"
 #include "xbt/xbt_os_thread.h"
 #include "smx_private.h"
+#include "smx_private.hpp"
 #include "simgrid/sg_config.h"
 #include "src/internal_config.h"
 #include "simgrid/modelchecker.h"
 
 
-#ifdef _WIN32
+#ifdef _XBT_WIN32
 #include <windows.h>
 #include <malloc.h>
 #else
@@ -36,7 +37,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_context, simix,
                                 "Context switching mechanism");
 
 char* smx_context_factory_name = NULL; /* factory name specified by --cfg=contexts/factory:value */
-smx_ctx_factory_initializer_t smx_factory_initializer_to_use = NULL;
 int smx_context_stack_size;
 int smx_context_stack_size_was_set = 0;
 int smx_context_guard_size;
@@ -56,54 +56,47 @@ static e_xbt_parmap_mode_t smx_parallel_synchronization_mode = XBT_PARMAP_DEFAUL
  */
 void SIMIX_context_mod_init(void)
 {
-#if defined(CONTEXT_THREADS) && !defined(HAVE_THREAD_LOCAL_STORAGE)
+#if defined(HAVE_THREAD_CONTEXTS) && !defined(HAVE_THREAD_LOCAL_STORAGE)
   /* the __thread storage class is not available on this platform:
    * use getspecific/setspecific instead to store the current context in each thread */
   xbt_os_thread_key_create(&smx_current_context_key);
 #endif
   if (!simix_global->context_factory) {
     /* select the context factory to use to create the contexts */
-    if (smx_factory_initializer_to_use) {
-      smx_factory_initializer_to_use(&simix_global->context_factory);
-    }
+    if (simgrid::simix::factory_initializer)
+      simix_global->context_factory = simgrid::simix::factory_initializer();
     else { /* use the factory specified by --cfg=contexts/factory:value */
-
-
-      if (!strcmp(smx_context_factory_name, "thread")) {
-        /* use os threads (either pthreads or windows ones) */
-        SIMIX_ctx_thread_factory_init(&simix_global->context_factory);
-      }
-#ifdef CONTEXT_UCONTEXT
-      else if (!strcmp(smx_context_factory_name, "ucontext")) {
-        /* use ucontext */
-        SIMIX_ctx_sysv_factory_init(&simix_global->context_factory);
-      }
+#if defined(HAVE_THREAD_CONTEXTS)
+      if (!strcmp(smx_context_factory_name, "thread"))
+        simix_global->context_factory = simgrid::simix::thread_factory();
+#else
+      if (0);
 #endif
-#ifdef HAVE_RAWCTX
-      else if (!strcmp(smx_context_factory_name, "raw")) {
-        /* use raw contexts */
-        SIMIX_ctx_raw_factory_init(&simix_global->context_factory);
-      }
+#ifdef HAVE_UCONTEXT_CONTEXTS
+      else if (!strcmp(smx_context_factory_name, "ucontext"))
+        simix_global->context_factory = simgrid::simix::sysv_factory();
 #endif
-#ifdef HAVE_BOOST_CONTEXT
-      else if (!strcmp(smx_context_factory_name, "boost")) {
-        /* use Boost.Context */
-        SIMIX_ctx_boost_factory_init(&simix_global->context_factory);
-      }
+#ifdef HAVE_RAW_CONTEXTS
+      else if (!strcmp(smx_context_factory_name, "raw"))
+        simix_global->context_factory = simgrid::simix::raw_factory();
+#endif
+#ifdef HAVE_BOOST_CONTEXTS
+      else if (!strcmp(smx_context_factory_name, "boost"))
+        simix_global->context_factory = simgrid::simix::boost_factory();
 #endif
       else {
         XBT_ERROR("Invalid context factory specified. Valid factories on this machine:");
-#ifdef HAVE_RAWCTX
+#ifdef HAVE_RAW_CONTEXTS
         XBT_ERROR("  raw: high performance context factory implemented specifically for SimGrid");
 #else
         XBT_ERROR("  (raw contexts were disabled at compilation time on this machine -- check configure logs for details)");
 #endif
-#ifdef CONTEXT_UCONTEXT
+#ifdef HAVE_UCONTEXT_CONTEXTS
         XBT_ERROR("  ucontext: classical system V contexts (implemented with makecontext, swapcontext and friends)");
 #else
         XBT_ERROR("  (ucontext was disabled at compilation time on this machine -- check configure logs for details)");
 #endif
-#ifdef HAVE_BOOST_CONTEXT
+#ifdef HAVE_BOOST_CONTEXTS
         XBT_ERROR("  boost: this uses the boost libraries context implementation");
 #else
         XBT_ERROR("  (boost was disabled at compilation time on this machine -- check configure logs for details. Did you install the libboost-context-dev package?)");
@@ -120,14 +113,8 @@ void SIMIX_context_mod_init(void)
  */
 void SIMIX_context_mod_exit(void)
 {
-  if (simix_global->context_factory) {
-    smx_pfn_context_factory_finalize_t finalize_factory;
-
-    /* finalize the context factory */
-    finalize_factory = simix_global->context_factory->finalize;
-    finalize_factory(&simix_global->context_factory);
-  }
-  xbt_dict_remove((xbt_dict_t) _sg_cfg_set,"contexts/factory");
+  delete simix_global->context_factory;
+  simix_global->context_factory = nullptr;
 }
 
 void *SIMIX_context_stack_new(void)
@@ -153,7 +140,7 @@ void *SIMIX_context_stack_new(void)
 #ifdef HAVE_MC
     /* Cannot use posix_memalign when HAVE_MC. Align stack by hand, and save the
      * pointer returned by xbt_malloc0. */
-    char *alloc = xbt_malloc0(size + xbt_pagesize);
+    char *alloc = (char*)xbt_malloc0(size + xbt_pagesize);
     stack = alloc - ((uintptr_t)alloc & (xbt_pagesize - 1)) + xbt_pagesize;
     *((void **)stack - 1) = alloc;
 #elif !defined(_XBT_WIN32)
@@ -250,7 +237,7 @@ void SIMIX_context_set_nthreads(int nb_threads) {
   }   
   
   if (nb_threads > 1) {
-#ifndef CONTEXT_THREADS
+#ifndef HAVE_THREAD_CONTEXTS
     THROWF(arg_error, 0, "The thread factory cannot be run in parallel");
 #endif
   }