Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Cosmetics in contexts
[simgrid.git] / src / kernel / context / ContextBoost.cpp
index 5673295..37a3481 100644 (file)
@@ -5,6 +5,7 @@
 
 #include "ContextBoost.hpp"
 #include "context_private.hpp"
+#include "simgrid/Exception.hpp"
 #include "src/simix/smx_private.hpp"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
@@ -14,60 +15,23 @@ namespace kernel {
 namespace context {
 
 // BoostContextFactory
-
-BoostContextFactory::BoostContextFactory()
-    : ContextFactory("BoostContextFactory"), parallel_(SIMIX_context_is_parallel())
-{
-  BoostContext::setMaestro(nullptr);
-  if (parallel_) {
-#if HAVE_THREAD_CONTEXTS
-    ParallelBoostContext::initialize();
-#else
-    xbt_die("No thread support for parallel context execution");
-#endif
-  }
-}
-
-BoostContextFactory::~BoostContextFactory()
-{
-#if HAVE_THREAD_CONTEXTS
-  if (parallel_)
-    ParallelBoostContext::finalize();
-#endif
-}
-
 smx_context_t BoostContextFactory::create_context(std::function<void()> code, void_pfn_smxprocess_t cleanup_func,
                                                   smx_actor_t process)
 {
-#if HAVE_THREAD_CONTEXTS
-  if (parallel_)
-    return this->new_context<ParallelBoostContext>(std::move(code), cleanup_func, process);
-#endif
-
-  return this->new_context<SerialBoostContext>(std::move(code), cleanup_func, process);
-}
-
-void BoostContextFactory::run_all()
-{
-#if HAVE_THREAD_CONTEXTS
   if (parallel_)
-    ParallelBoostContext::run_all();
-  else
-#endif
-    SerialBoostContext::run_all();
+    return this->new_context<ParallelBoostContext>(std::move(code), cleanup_func, process, this);
+  return this->new_context<BoostContext>(std::move(code), cleanup_func, process, this);
 }
 
 // BoostContext
 
-BoostContext* BoostContext::maestro_context_ = nullptr;
-
-BoostContext::BoostContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process)
-    : Context(std::move(code), cleanup_func, process)
+BoostContext::BoostContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process,
+                           SwappedContextFactory* factory)
+    : SwappedContext(std::move(code), cleanup_func, process, factory)
 {
 
   /* if the user provided a function for the process then use it, otherwise it is the context for maestro */
   if (has_code()) {
-    this->stack_ = SIMIX_context_stack_new();
     /* We need to pass the bottom of the stack to make_fcontext,
        depending on the stack direction it may be the lower or higher address: */
 #if PTH_STACKGROWTH == -1
@@ -85,8 +49,8 @@ BoostContext::BoostContext(std::function<void()> code, void_pfn_smxprocess_t cle
 #if BOOST_VERSION < 105600
     this->fc_ = new boost::context::fcontext_t();
 #endif
-    if (BoostContext::maestro_context_ == nullptr)
-      BoostContext::maestro_context_ = this;
+    if (get_maestro() == nullptr)
+      set_maestro(this);
   }
 }
 
@@ -96,9 +60,8 @@ BoostContext::~BoostContext()
   if (not this->stack_)
     delete this->fc_;
 #endif
-  if (this == maestro_context_)
-    maestro_context_ = nullptr;
-  SIMIX_context_stack_delete(this->stack_);
+  if (this == get_maestro())
+    set_maestro(nullptr);
 }
 
 void BoostContext::wrapper(BoostContext::arg_type arg)
@@ -113,22 +76,26 @@ void BoostContext::wrapper(BoostContext::arg_type arg)
 #endif
   try {
     (*context)();
-    context->Context::stop();
   } catch (StopRequest const&) {
     XBT_DEBUG("Caught a StopRequest");
+  } catch (simgrid::Exception const& e) {
+    XBT_INFO("Actor killed by an uncatched exception %s", simgrid::xbt::demangle(typeid(e).name()).get());
+    throw;
   }
+  context->Context::stop();
   ASAN_ONLY(context->asan_stop_ = true);
   context->suspend();
 }
 
-inline void BoostContext::swap(BoostContext* from, BoostContext* to)
+void BoostContext::swap_into(SwappedContext* to_)
 {
+  BoostContext* to = static_cast<BoostContext*>(to_);
 #if BOOST_VERSION < 105600
-  boost::context::jump_fcontext(from->fc_, to->fc_, reinterpret_cast<intptr_t>(to));
+  boost::context::jump_fcontext(this->fc_, to->fc_, reinterpret_cast<intptr_t>(to));
 #elif BOOST_VERSION < 106100
-  boost::context::jump_fcontext(&from->fc_, to->fc_, reinterpret_cast<intptr_t>(to));
+  boost::context::jump_fcontext(&this->fc_, to->fc_, reinterpret_cast<intptr_t>(to));
 #else
-  BoostContext* ctx[2] = {from, to};
+  BoostContext* ctx[2] = {this, to};
   ASAN_ONLY(void* fake_stack = nullptr);
   ASAN_ONLY(to->asan_ctx_ = from);
   ASAN_START_SWITCH(from->asan_stop_ ? nullptr : &fake_stack, to->asan_stack_, to->asan_stack_size_);
@@ -139,120 +106,34 @@ inline void BoostContext::swap(BoostContext* from, BoostContext* to)
 #endif
 }
 
-void BoostContext::stop()
-{
-  Context::stop();
-  throw StopRequest();
-}
-
-// SerialBoostContext
-
-unsigned long SerialBoostContext::process_index_;
-
-void SerialBoostContext::suspend()
-{
-  /* determine the next context */
-  SerialBoostContext* next_context;
-  unsigned long int i = process_index_;
-  process_index_++;
-
-  if (i < simix_global->process_to_run.size()) {
-    /* execute the next process */
-    XBT_DEBUG("Run next process");
-    next_context = static_cast<SerialBoostContext*>(simix_global->process_to_run[i]->context);
-  } else {
-    /* all processes were run, return to maestro */
-    XBT_DEBUG("No more process to run");
-    next_context = static_cast<SerialBoostContext*>(BoostContext::getMaestro());
-  }
-  SIMIX_context_set_current(next_context);
-  BoostContext::swap(this, next_context);
-}
-
-void SerialBoostContext::resume()
-{
-  SIMIX_context_set_current(this);
-  BoostContext::swap(BoostContext::getMaestro(), this);
-}
-
-void SerialBoostContext::run_all()
-{
-  if (simix_global->process_to_run.empty())
-    return;
-  smx_actor_t first_process = simix_global->process_to_run.front();
-  process_index_            = 1;
-  /* execute the first process */
-  static_cast<SerialBoostContext*>(first_process->context)->resume();
-}
-
 // ParallelBoostContext
-
-#if HAVE_THREAD_CONTEXTS
-
-simgrid::xbt::Parmap<smx_actor_t>* ParallelBoostContext::parmap_;
-std::atomic<uintptr_t> ParallelBoostContext::threads_working_;
-xbt_os_thread_key_t ParallelBoostContext::worker_id_key_;
-std::vector<ParallelBoostContext*> ParallelBoostContext::workers_context_;
-
-void ParallelBoostContext::initialize()
-{
-  parmap_ = nullptr;
-  workers_context_.clear();
-  workers_context_.resize(SIMIX_context_get_nthreads(), nullptr);
-  xbt_os_thread_key_create(&worker_id_key_);
-}
-
-void ParallelBoostContext::finalize()
-{
-  delete parmap_;
-  parmap_ = nullptr;
-  workers_context_.clear();
-  xbt_os_thread_key_destroy(worker_id_key_);
-}
-
-void ParallelBoostContext::run_all()
-{
-  threads_working_ = 0;
-  if (parmap_ == nullptr)
-    parmap_ = new simgrid::xbt::Parmap<smx_actor_t>(SIMIX_context_get_nthreads(), SIMIX_context_get_parallel_mode());
-  parmap_->apply(
-      [](smx_actor_t process) {
-        ParallelBoostContext* context = static_cast<ParallelBoostContext*>(process->context);
-        context->resume();
-      },
-      simix_global->process_to_run);
-}
-
 void ParallelBoostContext::suspend()
 {
   boost::optional<smx_actor_t> next_work = parmap_->next();
-  ParallelBoostContext* next_context;
+  SwappedContext* next_context;
   if (next_work) {
     XBT_DEBUG("Run next process");
-    next_context = static_cast<ParallelBoostContext*>(next_work.get()->context);
+    next_context = static_cast<ParallelBoostContext*>(next_work.get()->context_);
   } else {
     XBT_DEBUG("No more processes to run");
-    uintptr_t worker_id = reinterpret_cast<uintptr_t>(xbt_os_thread_get_specific(worker_id_key_));
-    next_context        = workers_context_[worker_id];
+    next_context = workers_context_[worker_id_];
   }
 
-  SIMIX_context_set_current(next_context);
-  BoostContext::swap(this, next_context);
+  Context::set_current(next_context);
+  this->swap_into(next_context);
 }
 
 void ParallelBoostContext::resume()
 {
-  uintptr_t worker_id = threads_working_.fetch_add(1, std::memory_order_relaxed);
-  xbt_os_thread_set_specific(worker_id_key_, reinterpret_cast<void*>(worker_id));
+  worker_id_ = threads_working_.fetch_add(1, std::memory_order_relaxed);
 
-  ParallelBoostContext* worker_context = static_cast<ParallelBoostContext*>(SIMIX_context_self());
-  workers_context_[worker_id]          = worker_context;
+  SwappedContext* worker_context = static_cast<SwappedContext*>(self());
+  workers_context_[worker_id_]   = worker_context;
 
-  SIMIX_context_set_current(this);
-  BoostContext::swap(worker_context, this);
+  Context::set_current(this);
+  worker_context->swap_into(this);
 }
 
-#endif
 
 XBT_PRIVATE ContextFactory* boost_factory()
 {