Rely on template argument deduction (sonar, c++17).

[simgrid.git] / src / mc / mc_smx.cpp

diff --git a/src/mc/mc_smx.cpp b/src/mc/mc_smx.cpp
index ce5800f2e0adbfe3ed6002cd2de12a79e40f22f7..dd88147d6b535219070392628b697ffb03196ef0 100644 (file)
--- a/src/mc/mc_smx.cpp
+++ b/src/mc/mc_smx.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2015-2022. 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. */
@@ -16,10 +16,7 @@ using simgrid::mc::remote;
  *  This is implemented by:
  *
  *   - `model_checker->process.smx_process_infos`
- *      (copy of `simix_global->process_list`);
- *
- *   - `model_checker->process.smx_old_process_infos`
- *      (copy of `simix_global->actors_to_destroy`);
+ *      (copy of `EngineImpl::actor_list_`);
  *
  *   - `model_checker->hostnames`.
  *
@@ -32,7 +29,7 @@ using simgrid::mc::remote;
 /** Load the remote list of processes into a vector
  *
  *  @param process      MCed process
- *  @param target       Local vector (to be filled with copies of `s_smx_actor_t`)
+ *  @param target       Local vector (to be filled with `simgrid::mc::ActorInformation`)
  *  @param remote_dynar Address of the process dynar in the remote list
  */
 static void MC_process_refresh_simix_actor_dynar(const simgrid::mc::RemoteProcess* process,
@@ -44,7 +41,7 @@ static void MC_process_refresh_simix_actor_dynar(const simgrid::mc::RemoteProces
   s_xbt_dynar_t dynar;
   process->read_bytes(&dynar, sizeof(dynar), remote_dynar);
 
-  auto* data = static_cast<smx_actor_t*>(::operator new(dynar.elmsize * dynar.used));
+  auto* data = static_cast<simgrid::kernel::actor::ActorImpl**>(::operator new(dynar.elmsize * dynar.used));
   process->read_bytes(data, dynar.elmsize * dynar.used, simgrid::mc::RemotePtr<void>(dynar.data));
 
   // Load each element of the vector from the MCed process:
@@ -52,7 +49,6 @@ static void MC_process_refresh_simix_actor_dynar(const simgrid::mc::RemoteProces
     simgrid::mc::ActorInformation info;
 
     info.address  = simgrid::mc::RemotePtr<simgrid::kernel::actor::ActorImpl>(data[i]);
-    info.hostname = nullptr;
     process->read_bytes(&info.copy, sizeof(info.copy), remote(data[i]));
     target.push_back(std::move(info));
   }
@@ -67,7 +63,6 @@ void RemoteProcess::refresh_simix()
     return;
 
   MC_process_refresh_simix_actor_dynar(this, this->smx_actors_infos, actors_addr_);
-  MC_process_refresh_simix_actor_dynar(this, this->smx_dead_actors_infos, dead_actors_addr_);
 
   this->cache_flags_ |= RemoteProcess::cache_simix_processes;
 }