Merge branch 'master' of framagit.org:simgrid/simgrid

[simgrid.git] / teshsuite / mc / dwarf / dwarf.cpp

diff --git a/teshsuite/mc/dwarf/dwarf.cpp b/teshsuite/mc/dwarf/dwarf.cpp
index 6548c50..d4d513e 100644 (file)
--- a/teshsuite/mc/dwarf/dwarf.cpp
+++ b/teshsuite/mc/dwarf/dwarf.cpp
@@ -7,16 +7,16 @@
 #undef NDEBUG
 #endif
 
-#include <mc/mc.h>
 #include <simgrid/s4u/Engine.hpp>
 
-#include "mc/datatypes.h"
+#include "src/mc/datatypes.h"
+#include "src/mc/mc.h"
 #include "src/mc/mc_private.hpp"
 
 #include "src/mc/inspect/ObjectInformation.hpp"
 #include "src/mc/inspect/Type.hpp"
 #include "src/mc/inspect/Variable.hpp"
-#include "src/mc/remote/RemoteProcess.hpp"
+#include "src/mc/sosp/RemoteProcessMemory.hpp"
 
 #include <cassert>
 #include <cstring>
@@ -78,7 +78,7 @@ static void test_local_variable(simgrid::mc::ObjectInformation* info, const char
   xbt_assert(location.address() == address, "Bad resolution of local variable %s of %s", variable, function);
 }
 
-static const simgrid::mc::Variable* test_global_variable(const simgrid::mc::RemoteProcess& process,
+static const simgrid::mc::Variable* test_global_variable(const simgrid::mc::RemoteProcessMemory& process,
                                                          simgrid::mc::ObjectInformation* info, const char* name,
                                                          void* address, long byte_size)
 {
@@ -96,9 +96,9 @@ static const simgrid::mc::Variable* test_global_variable(const simgrid::mc::Remo
   return variable;
 }
 
-static simgrid::mc::Member* find_member(simgrid::mc::Type& type, const char* name)
+static const simgrid::mc::Member* find_member(const simgrid::mc::Type& type, const char* name)
 {
-  for (simgrid::mc::Member& member : type.members)
+  for (const simgrid::mc::Member& member : type.members)
     if(member.name == name)
       return &member;
   return nullptr;
@@ -110,7 +110,7 @@ struct s_foo {
   int i;
 };
 
-static void test_type_by_name(const simgrid::mc::RemoteProcess& process, s_foo /*my_foo*/)
+static void test_type_by_name(const simgrid::mc::RemoteProcessMemory& process, s_foo /*my_foo*/)
 {
   assert(process.binary_info->full_types_by_name.find("struct s_foo") != process.binary_info->full_types_by_name.end());
 }
@@ -120,10 +120,9 @@ int main(int argc, char** argv)
   simgrid::s4u::Engine::get_instance(&argc, argv);
 
   const simgrid::mc::Variable* var;
-  simgrid::mc::Type* type;
+  const simgrid::mc::Type* type;
 
-  simgrid::mc::RemoteProcess process(getpid());
-  process.init(nullptr, nullptr);
+  simgrid::mc::RemoteProcessMemory process(getpid(), nullptr);
 
   test_global_variable(process, process.binary_info.get(), "some_local_variable", &some_local_variable, sizeof(int));