uppercase the s4u header files (+cleanups)

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

diff --git a/src/kernel/activity/SynchroExec.cpp b/src/kernel/activity/SynchroExec.cpp
index 6ec1d18..5528f86 100644 (file)
--- a/src/kernel/activity/SynchroExec.cpp
+++ b/src/kernel/activity/SynchroExec.cpp
@@ -1,40 +1,46 @@
-/* Copyright (c) 2007-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include <simgrid/s4u/host.hpp>
+#include "simgrid/s4u/Host.hpp"
 
 #include "src/kernel/activity/SynchroExec.hpp"
 #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 host) :
+    host_(host)
 {
   if (name)
     this->name = name;
   this->state = SIMIX_RUNNING;
-  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,15 +48,17 @@ 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 (host_ && host_->isOff()) {/* FIXME: handle resource failure for parallel tasks too */
     /* If the host running the synchro failed, notice it. This way, the asking
      * process can be killed if it runs on that host itself */
     state = SIMIX_FAILED;
   } 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())