Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Introduce a SwappedContextFactory to further reduce code duplication, working WIP
[simgrid.git] / src / kernel / context / ContextRaw.cpp
index 423f13d..38f0191 100644 (file)
@@ -186,57 +186,25 @@ namespace context {
 
 // RawContextFactory
 
-RawContextFactory::RawContextFactory() : ContextFactory("RawContextFactory"), parallel_(SIMIX_context_is_parallel())
-{
-  RawContext::setMaestro(nullptr);
-  if (parallel_) {
-#if HAVE_THREAD_CONTEXTS
-    // TODO: choose dynamically when SIMIX_context_get_parallel_threshold() > 1
-    ParallelRawContext::initialize();
-#else
-    xbt_die("You asked for a parallel execution, but you don't have any threads.");
-#endif
-  }
-}
+RawContextFactory::RawContextFactory() : SwappedContextFactory("RawContextFactory") {}
 
-RawContextFactory::~RawContextFactory()
-{
-#if HAVE_THREAD_CONTEXTS
-  if (parallel_)
-    ParallelRawContext::finalize();
-#endif
-}
+RawContextFactory::~RawContextFactory() = default;
 
 Context* RawContextFactory::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<ParallelRawContext>(std::move(code), cleanup_func, process);
-#endif
-
-  return this->new_context<SerialRawContext>(std::move(code), cleanup_func, process);
-}
-
-void RawContextFactory::run_all()
-{
-#if HAVE_THREAD_CONTEXTS
   if (parallel_)
-    ParallelRawContext::run_all();
-  else
-#endif
-    SerialRawContext::run_all();
+    return this->new_context<ParallelRawContext>(std::move(code), cleanup_func, process, this);
+  return this->new_context<RawContext>(std::move(code), cleanup_func, process, this);
 }
 
 // RawContext
 
-RawContext* RawContext::maestro_context_ = nullptr;
-
-RawContext::RawContext(std::function<void()> code, void_pfn_smxprocess_t cleanup, smx_actor_t process)
-    : Context(std::move(code), cleanup, process)
+RawContext::RawContext(std::function<void()> code, void_pfn_smxprocess_t cleanup, smx_actor_t process,
+                       SwappedContextFactory* factory)
+    : SwappedContext(std::move(code), cleanup, process, factory)
 {
    if (has_code()) {
-     this->stack_ = SIMIX_context_stack_new();
 #if PTH_STACKGROWTH == -1
      ASAN_ONLY(this->asan_stack_ = static_cast<char*>(this->stack_) + smx_context_usable_stack_size);
 #else
@@ -244,17 +212,16 @@ RawContext::RawContext(std::function<void()> code, void_pfn_smxprocess_t cleanup
 #endif
      this->stack_top_ = raw_makecontext(this->stack_, smx_context_usable_stack_size, RawContext::wrapper, this);
    } else {
-     if (process != nullptr && maestro_context_ == nullptr)
-       maestro_context_ = this;
-     if (MC_is_active())
-       MC_ignore_heap(&maestro_context_->stack_top_, sizeof(maestro_context_->stack_top_));
+     if (process != nullptr && get_maestro() == nullptr)
+       set_maestro(this);
+     if (MC_is_active()) {
+       XBT_ATTRIB_UNUSED RawContext* maestro = static_cast<RawContext*>(get_maestro());
+       MC_ignore_heap(&maestro->stack_top_, sizeof(maestro->stack_top_));
+     }
    }
 }
 
-RawContext::~RawContext()
-{
-  SIMIX_context_stack_delete(this->stack_);
-}
+RawContext::~RawContext() = default;
 
 void RawContext::wrapper(void* arg)
 {
@@ -274,12 +241,13 @@ void RawContext::wrapper(void* arg)
   context->suspend();
 }
 
-inline void RawContext::swap(RawContext* from, RawContext* to)
+void RawContext::swap_into(SwappedContext* to_)
 {
+  RawContext* to = static_cast<RawContext*>(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_);
-  raw_swapcontext(&from->stack_top_, to->stack_top_);
+  raw_swapcontext(&this->stack_top_, to->stack_top_);
   ASAN_FINISH_SWITCH(fake_stack, &from->asan_ctx_->asan_stack_, &from->asan_ctx_->asan_stack_size_);
 }
 
@@ -289,68 +257,8 @@ void RawContext::stop()
   throw StopRequest();
 }
 
-// SerialRawContext
-
-unsigned long SerialRawContext::process_index_; /* index of the next process to run in the list of runnable processes */
-
-void SerialRawContext::suspend()
-{
-  /* determine the next context */
-  SerialRawContext* 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<SerialRawContext*>(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<SerialRawContext*>(RawContext::getMaestro());
-  }
-  SIMIX_context_set_current(next_context);
-  RawContext::swap(this, next_context);
-}
-
-void SerialRawContext::resume()
-{
-  SIMIX_context_set_current(this);
-  RawContext::swap(RawContext::getMaestro(), this);
-}
-
-void SerialRawContext::run_all()
-{
-  if (simix_global->process_to_run.empty())
-    return;
-  smx_actor_t first_process = simix_global->process_to_run.front();
-  process_index_            = 1;
-  static_cast<SerialRawContext*>(first_process->context_)->resume();
-}
-
 // ParallelRawContext
 
-#if HAVE_THREAD_CONTEXTS
-
-simgrid::xbt::Parmap<smx_actor_t>* ParallelRawContext::parmap_;
-std::atomic<uintptr_t> ParallelRawContext::threads_working_; /* number of threads that have started their work */
-uintptr_t thread_local ParallelRawContext::worker_id_;       /* thread-specific storage for the thread id */
-std::vector<ParallelRawContext*> ParallelRawContext::workers_context_; /* space to save the worker context
-                                                                          in each thread */
-
-void ParallelRawContext::initialize()
-{
-  parmap_ = nullptr;
-  workers_context_.clear();
-  workers_context_.resize(SIMIX_context_get_nthreads(), nullptr);
-}
-
-void ParallelRawContext::finalize()
-{
-  delete parmap_;
-  parmap_ = nullptr;
-  workers_context_.clear();
-}
-
 void ParallelRawContext::run_all()
 {
   threads_working_ = 0;
@@ -368,7 +276,7 @@ void ParallelRawContext::suspend()
 {
   /* determine the next context */
   boost::optional<smx_actor_t> next_work = parmap_->next();
-  ParallelRawContext* next_context;
+  SwappedContext* next_context;
   if (next_work) {
     /* there is a next process to resume */
     XBT_DEBUG("Run next process");
@@ -380,22 +288,20 @@ void ParallelRawContext::suspend()
     XBT_DEBUG("Restoring worker stack %zu (working threads = %zu)", worker_id_, threads_working_.load());
   }
 
-  SIMIX_context_set_current(next_context);
-  RawContext::swap(this, next_context);
+  Context::set_current(next_context);
+  this->swap_into(next_context);
 }
 
 void ParallelRawContext::resume()
 {
-  worker_id_                         = threads_working_.fetch_add(1, std::memory_order_relaxed);
-  ParallelRawContext* worker_context = static_cast<ParallelRawContext*>(SIMIX_context_self());
-  workers_context_[worker_id_]       = worker_context;
+  worker_id_                     = threads_working_.fetch_add(1, std::memory_order_relaxed);
+  SwappedContext* worker_context = static_cast<SwappedContext*>(self());
+  workers_context_[worker_id_]   = worker_context;
   XBT_DEBUG("Saving worker stack %zu", worker_id_);
-  SIMIX_context_set_current(this);
-  RawContext::swap(worker_context, this);
+  Context::set_current(this);
+  worker_context->swap_into(this);
 }
 
-#endif
-
 ContextFactory* raw_factory()
 {
   XBT_VERB("Using raw contexts. Because the glibc is just not good enough for us.");