Merge branch 'master' of https://github.com/mpoquet/simgrid

[simgrid.git] / src / kernel / activity / SynchroExec.cpp

diff --git a/src/kernel/activity/SynchroExec.cpp b/src/kernel/activity/SynchroExec.cpp
index 6ec1d18..15d9a21 100644 (file)
--- a/src/kernel/activity/SynchroExec.cpp
+++ b/src/kernel/activity/SynchroExec.cpp
@@ -9,7 +9,9 @@
 #include "src/surf/surf_interface.hpp"
 #include "src/simix/smx_host_private.h"
 
-simgrid::simix::Exec::Exec(const char*name, sg_host_t hostarg)
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process);
+
+simgrid::kernel::activity::Exec::Exec(const char*name, sg_host_t hostarg)
 {
   if (name)
     this->name = name;
@@ -17,24 +19,28 @@ simgrid::simix::Exec::Exec(const char*name, sg_host_t hostarg)
   this->host = hostarg;
 }
 
-simgrid::simix::Exec::~Exec()
+simgrid::kernel::activity::Exec::~Exec()
 {
   if (surf_exec)
     surf_exec->unref();
+  if (timeoutDetector)
+    timeoutDetector->unref();
 }
-void simgrid::simix::Exec::suspend()
+void simgrid::kernel::activity::Exec::suspend()
 {
+  XBT_VERB("This exec is suspended (remain: %f)", surf_exec->getRemains());
   if (surf_exec)
     surf_exec->suspend();
 }
 
-void simgrid::simix::Exec::resume()
+void simgrid::kernel::activity::Exec::resume()
 {
+  XBT_VERB("This exec is resumed (remain: %f)", surf_exec->getRemains());
   if (surf_exec)
     surf_exec->resume();
 }
 
-double simgrid::simix::Exec::remains()
+double simgrid::kernel::activity::Exec::remains()
 {
   if (state == SIMIX_RUNNING)
     return surf_exec->getRemains();
@@ -42,7 +48,7 @@ double simgrid::simix::Exec::remains()
   return 0;
 }
 
-void simgrid::simix::Exec::post()
+void simgrid::kernel::activity::Exec::post()
 {
   if (host && host->isOff()) {/* FIMXE: handle resource failure for parallel tasks too */
     /* If the host running the synchro failed, notice it. This way, the asking
@@ -51,6 +57,8 @@ void simgrid::simix::Exec::post()
   } else if (surf_exec->getState() == simgrid::surf::Action::State::failed) {
     /* If the host running the synchro didn't fail, then the synchro was canceled */
     state = SIMIX_CANCELED;
+  } else if (timeoutDetector && timeoutDetector->getState() == simgrid::surf::Action::State::done) {
+    state = SIMIX_TIMEOUT;
   } else {
     state = SIMIX_DONE;
   }
@@ -59,6 +67,10 @@ void simgrid::simix::Exec::post()
     surf_exec->unref();
     surf_exec = nullptr;
   }
+  if (timeoutDetector) {
+    timeoutDetector->unref();
+    timeoutDetector = nullptr;
+  }
 
   /* If there are simcalls associated with the synchro, then answer them */
   if (!simcalls.empty())