a few process to actor changes

diff --git a/src/kernel/actor/ActorImpl.cpp b/src/kernel/actor/ActorImpl.cpp
index 1e5e15e..821db95 100644 (file)
--- a/src/kernel/actor/ActorImpl.cpp
+++ b/src/kernel/actor/ActorImpl.cpp
@@ -82,10 +82,10 @@ ActorImplPtr ActorImpl::attach(const std::string& name, void* data, s4u::Host* h
 {
   // This is mostly a copy/paste from create(), it'd be nice to share some code between those two functions.
 
 {
   // This is mostly a copy/paste from create(), it'd be nice to share some code between those two functions.
 

-  XBT_DEBUG("Attach process %s on host '%s'", name.c_str(), host->get_cname());
+  XBT_DEBUG("Attach actor %s on host '%s'", name.c_str(), host->get_cname());

 
   if (not host->is_on()) {
 
   if (not host->is_on()) {

-    XBT_WARN("Cannot launch process '%s' on failed host '%s'", name.c_str(), host->get_cname());
+    XBT_WARN("Cannot attach actor '%s' on failed host '%s'", name.c_str(), host->get_cname());

     throw HostFailureException(XBT_THROW_POINT, "Cannot attach actor on failed host.");
   }
 
     throw HostFailureException(XBT_THROW_POINT, "Cannot attach actor on failed host.");
   }
 


@@ -102,10 +102,10 @@ ActorImplPtr ActorImpl::attach(const std::string& name, void* data, s4u::Host* h
   if (properties != nullptr)
     actor->set_properties(*properties);
 
   if (properties != nullptr)
     actor->set_properties(*properties);
 

-  /* Add the process to it's host process list */
+  /* Add the actor to it's host actor list */

   host->pimpl_->add_actor(actor);
 
   host->pimpl_->add_actor(actor);
 

-  /* Now insert it in the global process list and in the process to run list */
+  /* Now insert it in the global actor list and in the actors to run list */

   simix_global->process_list[actor->get_pid()] = actor;
   XBT_DEBUG("Inserting [%p] %s(%s) in the to_run list", actor, actor->get_cname(), host->get_cname());
   simix_global->actors_to_run.push_back(actor);
   simix_global->process_list[actor->get_pid()] = actor;
   XBT_DEBUG("Inserting [%p] %s(%s) in the to_run list", actor, actor->get_cname(), host->get_cname());
   simix_global->actors_to_run.push_back(actor);

diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp
index 0765a88..e9c5984 100644 (file)
--- a/src/surf/HostImpl.cpp
+++ b/src/surf/HostImpl.cpp
@@ -34,11 +34,11 @@ HostImpl::HostImpl(s4u::Host* host) : piface_(host)
 
 HostImpl::~HostImpl()
 {
 
 HostImpl::~HostImpl()
 {

-  /* All processes should be gone when the host is turned off (by the end of the simulation). */
+  /* All actors should be gone when the host is turned off (by the end of the simulation). */

   if (not actor_list_.empty()) {
     std::string msg = std::string("Shutting down host, but it's not empty:");
   if (not actor_list_.empty()) {
     std::string msg = std::string("Shutting down host, but it's not empty:");

-    for (auto const& process : actor_list_)
-      msg += "\n\t" + std::string(process.get_name());
+    for (auto const& actor : actor_list_)
+      msg += "\n\t" + std::string(actor.get_name());

 
     SIMIX_display_process_status();
     xbt_die("%s", msg.c_str());
 
     SIMIX_display_process_status();
     xbt_die("%s", msg.c_str());