X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3580c1f2e5172b721449d0e79c72241bd012152a..c641d112f8a557b61ff14c261931077773f21fbd:/src/kernel/context/ContextRaw.cpp

diff --git a/src/kernel/context/ContextRaw.cpp b/src/kernel/context/ContextRaw.cpp
index 38f01918b0..8d320a164c 100644
--- a/src/kernel/context/ContextRaw.cpp
+++ b/src/kernel/context/ContextRaw.cpp
@@ -186,15 +186,9 @@ namespace context {
 
 // RawContextFactory
 
-RawContextFactory::RawContextFactory() : SwappedContextFactory("RawContextFactory") {}
-
-RawContextFactory::~RawContextFactory() = default;
-
 Context* RawContextFactory::create_context(std::function<void()> code, void_pfn_smxprocess_t cleanup_func,
                                            smx_actor_t process)
 {
-  if (parallel_)
-    return this->new_context<ParallelRawContext>(std::move(code), cleanup_func, process, this);
   return this->new_context<RawContext>(std::move(code), cleanup_func, process, this);
 }
 
@@ -212,17 +206,12 @@ 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 && 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_));
-     }
+     set_maestro(this); // save maestro for run_all()
+     if (MC_is_active())
+       MC_ignore_heap(&stack_top_, sizeof(stack_top_));
    }
 }
 
-RawContext::~RawContext() = default;
-
 void RawContext::wrapper(void* arg)
 {
   RawContext* context = static_cast<RawContext*>(arg);
@@ -251,57 +240,6 @@ void RawContext::swap_into(SwappedContext* to_)
   ASAN_FINISH_SWITCH(fake_stack, &from->asan_ctx_->asan_stack_, &from->asan_ctx_->asan_stack_size_);
 }
 
-void RawContext::stop()
-{
-  Context::stop();
-  throw StopRequest();
-}
-
-// ParallelRawContext
-
-void ParallelRawContext::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) {
-        ParallelRawContext* context = static_cast<ParallelRawContext*>(process->context_);
-        context->resume();
-      },
-      simix_global->process_to_run);
-}
-
-void ParallelRawContext::suspend()
-{
-  /* determine the next context */
-  boost::optional<smx_actor_t> next_work = parmap_->next();
-  SwappedContext* next_context;
-  if (next_work) {
-    /* there is a next process to resume */
-    XBT_DEBUG("Run next process");
-    next_context = static_cast<ParallelRawContext*>(next_work.get()->context_);
-  } else {
-    /* all processes were run, go to the barrier */
-    XBT_DEBUG("No more processes to run");
-    next_context = workers_context_[worker_id_];
-    XBT_DEBUG("Restoring worker stack %zu (working threads = %zu)", worker_id_, threads_working_.load());
-  }
-
-  Context::set_current(next_context);
-  this->swap_into(next_context);
-}
-
-void ParallelRawContext::resume()
-{
-  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_);
-  Context::set_current(this);
-  worker_context->swap_into(this);
-}
-
 ContextFactory* raw_factory()
 {
   XBT_VERB("Using raw contexts. Because the glibc is just not good enough for us.");