From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Fri, 8 Feb 2019 13:41:37 +0000 (+0100)
Subject: handle SleepImpl more like other activities
X-Git-Tag: v3_22~374
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/791d2a621277a221aa84be5602565208ca441f44?hp=15680fe35081dbdd307c437b750dd2da906ba9f8

handle SleepImpl more like other activities
---

diff --git a/src/kernel/activity/SleepImpl.cpp b/src/kernel/activity/SleepImpl.cpp
index e5477aaac1..ea0fe2d2ee 100644
--- a/src/kernel/activity/SleepImpl.cpp
+++ b/src/kernel/activity/SleepImpl.cpp
@@ -13,17 +13,36 @@
 #include "src/simix/ActorImpl.hpp"
 #include "src/simix/popping_private.hpp"
 #include "src/simix/smx_private.hpp"
+#include "src/surf/cpu_interface.hpp"
 #include "src/surf/surf_interface.hpp"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process);
+namespace simgrid {
+namespace kernel {
+namespace activity {
 
-void simgrid::kernel::activity::SleepImpl::post()
+SleepImpl::~SleepImpl()
+{
+  if (surf_action_)
+    surf_action_->unref();
+  XBT_DEBUG("Destroy activity %p", this);
+}
+
+SleepImpl* SleepImpl::start(double duration)
+{
+  surf_action_ = host_->pimpl_cpu->sleep(duration);
+  surf_action_->set_data(this);
+  XBT_DEBUG("Create sleep synchronization %p", this);
+  return this;
+}
+
+void SleepImpl::post()
 {
   while (not simcalls_.empty()) {
     smx_simcall_t simcall = simcalls_.front();
     simcalls_.pop_front();
     e_smx_state_t result;
-    if (host && host->is_off()) {
+    if (host_ && host_->is_off()) {
       /* If the host running the synchro failed, notice it. This way, the asking
        * actor can be killed if it runs on that host itself */
       result = SIMIX_SRC_HOST_FAILURE;
@@ -32,12 +51,12 @@ void simgrid::kernel::activity::SleepImpl::post()
     }
 
     switch (surf_action_->get_state()) {
-      case simgrid::kernel::resource::Action::State::FAILED:
+      case resource::Action::State::FAILED:
         simcall->issuer->context_->iwannadie = true;
         result                               = SIMIX_FAILED;
         break;
 
-      case simgrid::kernel::resource::Action::State::FINISHED:
+      case resource::Action::State::FINISHED:
         result = SIMIX_DONE;
         break;
 
@@ -61,3 +80,7 @@ void simgrid::kernel::activity::SleepImpl::post()
 
   SIMIX_process_sleep_destroy(this);
 }
+
+} // namespace activity
+} // namespace kernel
+} // namespace simgrid
diff --git a/src/kernel/activity/SleepImpl.hpp b/src/kernel/activity/SleepImpl.hpp
index 2f094079c3..eab5d22de5 100644
--- a/src/kernel/activity/SleepImpl.hpp
+++ b/src/kernel/activity/SleepImpl.hpp
@@ -14,10 +14,14 @@ namespace kernel {
 namespace activity {
 
 class XBT_PUBLIC SleepImpl : public ActivityImpl {
+  ~SleepImpl() override;
+
 public:
+  explicit SleepImpl(std::string name, s4u::Host* host) : ActivityImpl(name), host_(host) {}
   void post() override;
+  SleepImpl* start(double duration);
 
-  sg_host_t host                 = nullptr;
+  sg_host_t host_ = nullptr;
 };
 }
 }
diff --git a/src/simix/ActorImpl.cpp b/src/simix/ActorImpl.cpp
index 79f201672e..b01c51aab2 100644
--- a/src/simix/ActorImpl.cpp
+++ b/src/simix/ActorImpl.cpp
@@ -206,13 +206,8 @@ smx_activity_t ActorImpl::sleep(double duration)
     throw_exception(std::make_exception_ptr(simgrid::HostFailureException(
         XBT_THROW_POINT, std::string("Host ") + std::string(host_->get_cname()) + " failed, you cannot sleep there.")));
 
-  simgrid::kernel::activity::SleepImpl* synchro = new simgrid::kernel::activity::SleepImpl();
-  synchro->host                                 = host_;
-  synchro->surf_action_                         = host_->pimpl_cpu->sleep(duration);
-  synchro->surf_action_->set_data(synchro);
-  XBT_DEBUG("Create sleep synchronization %p", synchro);
-
-  return synchro;
+  return simgrid::kernel::activity::SleepImplPtr(new simgrid::kernel::activity::SleepImpl("sleep", host_))
+      ->start(duration);
 }
 
 void ActorImpl::throw_exception(std::exception_ptr e)