Inline SIMIX_context_get_current()

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

diff --git a/src/simix/smx_context.cpp b/src/simix/smx_context.cpp
index 6f32bb1..14a36f9 100644 (file)
--- a/src/simix/smx_context.cpp
+++ b/src/simix/smx_context.cpp
@@ -40,9 +40,7 @@ static std::pair<const char*, simgrid::kernel::context::ContextFactoryInitialize
 #if HAVE_BOOST_CONTEXTS
   { "boost", &simgrid::kernel::context::boost_factory },
 #endif
-#if HAVE_THREAD_CONTEXTS
   { "thread", &simgrid::kernel::context::thread_factory },
-#endif
 };
 
 static_assert(sizeof(context_factories) != 0, "No context factories are enabled for this build");
@@ -69,8 +67,6 @@ unsigned smx_context_stack_size;
 int smx_context_stack_size_was_set = 0;
 unsigned smx_context_guard_size;
 int smx_context_guard_size_was_set = 0;
-static thread_local smx_context_t smx_current_context_parallel;
-static smx_context_t smx_current_context_serial;
 static int smx_parallel_contexts = 1;
 static int smx_parallel_threshold = 2;
 static e_xbt_parmap_mode_t smx_parallel_synchronization_mode = XBT_PARMAP_DEFAULT;
@@ -251,9 +247,6 @@ void SIMIX_context_set_nthreads(int nb_threads) {
     nb_threads = std::thread::hardware_concurrency();
     XBT_INFO("Auto-setting contexts/nthreads to %d", nb_threads);
   }
-#if !HAVE_THREAD_CONTEXTS
-  xbt_assert(nb_threads == 1, "Parallel runs are impossible when the pthreads are missing.");
-#endif
   smx_parallel_contexts = nb_threads;
 }
 
@@ -300,31 +293,3 @@ e_xbt_parmap_mode_t SIMIX_context_get_parallel_mode() {
 void SIMIX_context_set_parallel_mode(e_xbt_parmap_mode_t mode) {
   smx_parallel_synchronization_mode = mode;
 }
-
-/**
- * @brief Returns the current context of this thread.
- * @return the current context of this thread
- */
-smx_context_t SIMIX_context_get_current()
-{
-  if (SIMIX_context_is_parallel()) {
-    return smx_current_context_parallel;
-  }
-  else {
-    return smx_current_context_serial;
-  }
-}
-
-/**
- * @brief Sets the current context of this thread.
- * @param context the context to set
- */
-void SIMIX_context_set_current(smx_context_t context)
-{
-  if (SIMIX_context_is_parallel()) {
-    smx_current_context_parallel = context;
-  }
-  else {
-    smx_current_context_serial = context;
-  }
-}