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 15d9a21..5528f86 100644 (file)
--- a/src/kernel/activity/SynchroExec.cpp
+++ b/src/kernel/activity/SynchroExec.cpp
@@ -1,9 +1,9 @@
-/* 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"
@@ -11,12 +11,12 @@
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process);
 
-simgrid::kernel::activity::Exec::Exec(const char*name, sg_host_t hostarg)
+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()
@@ -50,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;