X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c290f6e5704d8d1e227fc32720676a2613d5d51c..3ae6123aa28d3dd81f94623705f692d0cde6de57:/src/kernel/context/Context.cpp

diff --git a/src/kernel/context/Context.cpp b/src/kernel/context/Context.cpp
index 7b828c1b1b..145e1e1cfe 100644
--- a/src/kernel/context/Context.cpp
+++ b/src/kernel/context/Context.cpp
@@ -6,26 +6,13 @@
 #include "mc/mc.h"
 
 #include "simgrid/s4u/Host.hpp"
+#include "src/kernel/activity/CommImpl.hpp"
 #include "src/kernel/context/Context.hpp"
 #include "src/simix/smx_private.hpp"
 #include "src/surf/surf_interface.hpp"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
 
-/**
- * @brief creates a new context for a user level process
- * @param code a main function
- * @param cleanup_func the function to call when the context stops
- * @param simix_process
- */
-smx_context_t SIMIX_context_new(
-  std::function<void()> code,
-  void_pfn_smxprocess_t cleanup_func,
-  smx_actor_t simix_process)
-{
-  return simix_global->context_factory->create_context(
-    std::move(code), cleanup_func, simix_process);
-}
 
 namespace simgrid {
 namespace kernel {
@@ -35,7 +22,7 @@ ContextFactoryInitializer factory_initializer = nullptr;
 
 ContextFactory::~ContextFactory() = default;
 
-static thread_local smx_context_t smx_current_context = nullptr;
+static thread_local Context* smx_current_context = nullptr;
 Context* Context::self()
 {
   return smx_current_context;
@@ -54,20 +41,19 @@ void Context::declare_context(std::size_t size)
 #endif
 }
 
-Context* ContextFactory::attach(void_pfn_smxprocess_t, smx_actor_t)
+Context* ContextFactory::attach(actor::ActorImpl*)
 {
   xbt_die("Cannot attach with this ContextFactory.\n"
     "Try using --cfg=contexts/factory:thread instead.\n");
 }
 
-Context* ContextFactory::create_maestro(std::function<void()>, smx_actor_t)
+Context* ContextFactory::create_maestro(std::function<void()>&&, actor::ActorImpl*)
 {
   xbt_die("Cannot create_maestro with this ContextFactory.\n"
     "Try using --cfg=contexts/factory:thread instead.\n");
 }
 
-Context::Context(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t actor)
-    : code_(std::move(code)), cleanup_func_(cleanup_func), actor_(actor)
+Context::Context(std::function<void()>&& code, actor::ActorImpl* actor) : code_(std::move(code)), actor_(actor)
 {
   /* If no function was provided, this is the context for maestro
    * and we should set it as the current context */
@@ -83,42 +69,14 @@ Context::~Context()
 
 void Context::stop()
 {
-  actor_->finished_ = true;
-
-  if (actor_->auto_restart_ && actor_->host_->is_off()) {
-    XBT_DEBUG("Insert host %s to watched_hosts because it's off and %s needs to restart", actor_->host_->get_cname(),
-              actor_->get_cname());
-    watched_hosts.insert(actor_->host_->get_cname());
-  }
-
-  if (this->cleanup_func_)
-    this->cleanup_func_(this->actor_);
-
-  this->iwannadie = false; // don't let the yield call ourself -- Context::stop()
-  simgrid::simix::simcall([this] { SIMIX_process_cleanup(this->actor_); });
-  this->iwannadie = true;
+  this->actor_->cleanup();
 }
 
 AttachContext::~AttachContext() = default;
 
-void throw_stoprequest()
-{
-  throw Context::StopRequest();
-}
-
-bool try_n_catch_stoprequest(std::function<void(void)> try_block)
-{
-  bool res;
-  try {
-    try_block();
-    res = true;
-  } catch (Context::StopRequest const&) {
-    XBT_DEBUG("Caught a StopRequest");
-    res = false;
-  }
-  return res;
-}
-}}}
+} // namespace context
+} // namespace kernel
+} // namespace simgrid
 
 /** @brief Executes all the processes to run (in parallel if possible). */
 void SIMIX_context_runall()