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

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

diff --git a/src/simix/ActorImpl.cpp b/src/simix/ActorImpl.cpp
index d1a7ea16b94a638d50ff572c58a48cca4ae56adf..aed56e718e16a35fedd84070b1dd61907dbd1898 100644 (file)
--- a/src/simix/ActorImpl.cpp
+++ b/src/simix/ActorImpl.cpp
@@ -104,7 +104,7 @@ void SIMIX_process_cleanup(smx_actor_t process)
   XBT_DEBUG("%p should not be run anymore",process);
   simix_global->process_list.erase(process->pid_);
   if (process->host_ && process->host_process_list_hook.is_linked())
-    simgrid::xbt::intrusive_erase(process->host_->pimpl_->process_list, *process);
+    simgrid::xbt::intrusive_erase(process->host_->pimpl_->process_list_, *process);
   if (not process->smx_destroy_list_hook.is_linked()) {
 #if SIMGRID_HAVE_MC
     xbt_dynar_push_as(simix_global->dead_actors_vector, smx_actor_t, process);
@@ -316,7 +316,7 @@ smx_actor_t SIMIX_process_create(const char* name, simgrid::simix::ActorCode cod
       process->set_property(kv.first, kv.second);
 
   /* Add the process to its host's process list */
-  host->pimpl_->process_list.push_back(*process);
+  host->pimpl_->process_list_.push_back(*process);
 
   XBT_DEBUG("Start context '%s'", process->get_cname());
 
@@ -373,7 +373,7 @@ smx_actor_t SIMIX_process_attach(const char* name, void* data, const char* hostn
       process->set_property(kv.first, kv.second);
 
   /* Add the process to it's host process list */
-  host->pimpl_->process_list.push_back(*process);
+  host->pimpl_->process_list_.push_back(*process);
 
   /* Now insert it in the global process list and in the process to run list */
   simix_global->process_list[process->pid_] = process;
@@ -439,8 +439,9 @@ void SIMIX_process_kill(smx_actor_t process, smx_actor_t issuer) {
     return;
   }
 
-  XBT_DEBUG("Actor '%s'@%s is killing actor '%s'@%s", issuer->get_cname(), issuer->host_->get_cname(),
-            process->get_cname(), process->host_->get_cname());
+  XBT_DEBUG("Actor '%s'@%s is killing actor '%s'@%s", issuer->get_cname(),
+            (issuer->host_ == nullptr ? "(null)" : issuer->host_->get_cname()), process->get_cname(),
+            process->host_->get_cname());
 
   process->context_->iwannadie = 1;
   process->blocked_           = 0;
@@ -566,9 +567,9 @@ void SIMIX_process_killall(smx_actor_t issuer)
 void SIMIX_process_change_host(smx_actor_t actor, sg_host_t dest)
 {
   xbt_assert((actor != nullptr), "Invalid parameters");
-  simgrid::xbt::intrusive_erase(actor->host_->pimpl_->process_list, *actor);
+  simgrid::xbt::intrusive_erase(actor->host_->pimpl_->process_list_, *actor);
   actor->host_ = dest;
-  dest->pimpl_->process_list.push_back(*actor);
+  dest->pimpl_->process_list_.push_back(*actor);
 }
 
 void simcall_HANDLER_process_suspend(smx_simcall_t simcall, smx_actor_t process)