X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7a955948edf1a0c37594d87693315dfc2dac9a8f..4d02714ee138a3bd9b02e0064b7a2aa26407e9e8:/src/kernel/context/Context.cpp

diff --git a/src/kernel/context/Context.cpp b/src/kernel/context/Context.cpp
index 2b846cfe66..dedbf2c147 100644
--- a/src/kernel/context/Context.cpp
+++ b/src/kernel/context/Context.cpp
@@ -13,20 +13,6 @@
 
 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 {
@@ -55,7 +41,7 @@ void Context::declare_context(std::size_t size)
 #endif
 }
 
-Context* ContextFactory::attach(void_pfn_smxprocess_t, smx_actor_t)
+Context* ContextFactory::attach(smx_actor_t)
 {
   xbt_die("Cannot attach with this ContextFactory.\n"
     "Try using --cfg=contexts/factory:thread instead.\n");
@@ -67,8 +53,7 @@ Context* ContextFactory::create_maestro(std::function<void()>, smx_actor_t)
     "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, smx_actor_t 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 */
@@ -86,14 +71,12 @@ 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 (actor_->has_to_auto_restart() && not actor_->get_host()->is_on()) {
+    XBT_DEBUG("Insert host %s to watched_hosts because it's off and %s needs to restart",
+              actor_->get_host()->get_cname(), actor_->get_cname());
+    watched_hosts.insert(actor_->get_host()->get_name());
   }
 
-  actor_->finished_ = true;
-
   // Execute the termination callbacks
   smx_process_exit_status_t exit_status = (actor_->context_->iwannadie) ? SMX_EXIT_FAILURE : SMX_EXIT_SUCCESS;
   while (not actor_->on_exit.empty()) {
@@ -108,10 +91,9 @@ void Context::stop()
   actor_->comms.clear();
 
   XBT_DEBUG("%s@%s(%ld) should not run anymore", actor_->get_cname(), actor_->iface()->get_host()->get_cname(),
-            actor_->pid_);
+            actor_->get_pid());
 
-  if (this->cleanup_func_)
-    this->cleanup_func_(this->actor_);
+  this->actor_->cleanup();
 
   this->iwannadie = false; // don't let the simcall's yield() do a Context::stop(), because that's me
   simgrid::simix::simcall([this] {
@@ -119,36 +101,17 @@ void Context::stop()
 
     /* Unregister from the kill timer if any */
     if (actor_->kill_timer != nullptr) {
-      SIMIX_timer_remove(actor_->kill_timer);
+      actor_->kill_timer->remove();
       actor_->kill_timer = nullptr;
     }
 
-    SIMIX_process_cleanup(actor_);
+    actor_->cleanup();
   });
   this->iwannadie = true;
 }
 
 AttachContext::~AttachContext() = default;
 
-StopRequest::~StopRequest() = default;
-
-void StopRequest::do_throw()
-{
-  throw StopRequest();
-}
-
-bool StopRequest::try_n_catch(std::function<void(void)> try_block)
-{
-  bool res;
-  try {
-    try_block();
-    res = true;
-  } catch (StopRequest const&) {
-    XBT_DEBUG("Caught a StopRequest");
-    res = false;
-  }
-  return res;
-}
 }}}
 
 /** @brief Executes all the processes to run (in parallel if possible). */