align file position to the C++ namespaces

[simgrid.git] / src / simix / smx_host.cpp

diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp
index 8c42e6c27c49b0eb22147103307cf40e66477999..df906bb256ca54e55c545536663aade80bdaabf9 100644 (file)
--- a/src/simix/smx_host.cpp
+++ b/src/simix/smx_host.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2019. 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. */
@@ -38,9 +38,11 @@ simgrid::kernel::activity::ExecImplPtr SIMIX_execution_start(std::string name, s
   }
 
   simgrid::kernel::activity::ExecImplPtr exec = simgrid::kernel::activity::ExecImplPtr(
-      new simgrid::kernel::activity::ExecImpl(name, surf_action, /*timeout_detector*/ nullptr, host));
+      new simgrid::kernel::activity::ExecImpl(name, category, /*timeout_detector*/ nullptr, host));
+
+  exec->surf_action_ = surf_action;
+  exec->surf_action_->set_data(exec.get());
 
-  exec->set_category(category);
   XBT_DEBUG("Create execute synchro %p: %s", exec.get(), exec->name_.c_str());
   simgrid::kernel::activity::ExecImpl::on_creation(exec);
 
@@ -70,7 +72,9 @@ simgrid::kernel::activity::ExecImplPtr SIMIX_execution_parallel_start(std::strin
   }
 
   simgrid::kernel::activity::ExecImplPtr exec = simgrid::kernel::activity::ExecImplPtr(
-      new simgrid::kernel::activity::ExecImpl(name, surf_action, timeout_detector, nullptr));
+      new simgrid::kernel::activity::ExecImpl(name, "", timeout_detector, nullptr));
+  exec->surf_action_ = surf_action;
+  exec->surf_action_->set_data(exec.get());
 
   XBT_DEBUG("Create parallel execute synchro %p", exec.get());
 
@@ -126,7 +130,7 @@ void SIMIX_execution_finish(smx_activity_t synchro)
 
       case SIMIX_FAILED:
         XBT_DEBUG("SIMIX_execution_finished: host '%s' failed", simcall->issuer->host_->get_cname());
-        simcall->issuer->context_->iwannadie = 1;
+        simcall->issuer->context_->iwannadie = true;
         simcall->issuer->exception =
             std::make_exception_ptr(simgrid::HostFailureException(XBT_THROW_POINT, "Host failed"));
         break;
@@ -146,7 +150,7 @@ void SIMIX_execution_finish(smx_activity_t synchro)
     }
     /* Fail the process if the host is down */
     if (simcall->issuer->host_->is_off())
-      simcall->issuer->context_->iwannadie = 1;
+      simcall->issuer->context_->iwannadie = true;
 
     simcall->issuer->waiting_synchro = nullptr;
     simcall_execution_wait__set__result(simcall, exec->state_);
@@ -169,6 +173,6 @@ void SIMIX_set_category(smx_activity_t synchro, std::string category)
   simgrid::kernel::activity::CommImplPtr comm =
       boost::dynamic_pointer_cast<simgrid::kernel::activity::CommImpl>(synchro);
   if (comm != nullptr) {
-    comm->surfAction_->set_category(category);
+    comm->surf_action_->set_category(category);
   }
 }