Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

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

diff --git a/src/kernel/activity/SynchroExec.cpp b/src/kernel/activity/SynchroExec.cpp
index 31ad7d1..a9d0656 100644 (file)
--- a/src/kernel/activity/SynchroExec.cpp
+++ b/src/kernel/activity/SynchroExec.cpp
@@ -9,12 +9,14 @@
 #include "src/surf/surf_interface.hpp"
 #include "src/simix/smx_host_private.h"
 
-simgrid::kernel::activity::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::kernel::activity::Exec::~Exec()
@@ -26,12 +28,14 @@ simgrid::kernel::activity::Exec::~Exec()
 }
 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::kernel::activity::Exec::resume()
 {
+  XBT_VERB("This exec is resumed (remain: %f)", surf_exec->getRemains());
   if (surf_exec)
     surf_exec->resume();
 }
@@ -46,7 +50,7 @@ double simgrid::kernel::activity::Exec::remains()
 
 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;