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

[simgrid.git] / src / mc / inspect / mc_unw_vmread.cpp

diff --git a/src/mc/inspect/mc_unw_vmread.cpp b/src/mc/inspect/mc_unw_vmread.cpp
index 6588e36..7241da9 100644 (file)
--- a/src/mc/inspect/mc_unw_vmread.cpp
+++ b/src/mc/inspect/mc_unw_vmread.cpp
@@ -1,10 +1,12 @@
-/* Copyright (c) 2015-2022. The SimGrid Team. All rights reserved.          */
+/** \file  Libunwind namespace implementation using process_vm_readv.       */
+
+/* Copyright (c) 2015-2023. 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. */
 
 #include "src/mc/inspect/mc_unw.hpp"
-#include "src/mc/remote/RemoteProcess.hpp"
+#include "src/mc/sosp/RemoteProcessMemory.hpp"
 
 #include <sys/types.h>
 #include <sys/uio.h>
@@ -13,9 +15,6 @@
 #include <libunwind-ptrace.h>
 #include <libunwind.h>
 
-/** \file
- *  Libunwind namespace implementation using process_vm_readv.
- */
 
 /** Partial structure of libunwind-ptrace context in order to get the PID
  *
@@ -28,21 +27,13 @@ struct _UPT_info {
   // Other things...
 };
 
-/** Get the PID of a `libunwind-ptrace` context
- */
-static inline pid_t _UPT_getpid(void* arg)
-{
-  const _UPT_info* info = static_cast<_UPT_info*>(arg);
-  return info->pid;
-}
-
 /** Read from the memory, avoid using `ptrace` (libunwind method) */
 static int access_mem(const unw_addr_space_t as, const unw_word_t addr, unw_word_t* const valp, const int write,
                       void* const arg)
 {
   if (write)
     return -UNW_EINVAL;
-  pid_t pid   = _UPT_getpid(arg);
+  pid_t pid   = static_cast<_UPT_info*>(arg)->pid;
   size_t size = sizeof(unw_word_t);
 
 #if HAVE_PROCESS_VM_READV /* linux but not freebsd */
@@ -66,7 +57,7 @@ static int access_mem(const unw_addr_space_t as, const unw_word_t addr, unw_word
   // On older kernels, it is necessary to ptrace the target process.
   size_t count = size;
   auto off     = static_cast<off_t>(addr);
-  auto* buf    = reinterpret_cast<char*>(valp);
+  auto* buf    = reinterpret_cast<std::byte*>(valp);
   int fd       = simgrid::mc::open_vm(pid, O_RDONLY);
   if (fd < 0)
     return -UNW_EINVAL;
@@ -90,8 +81,7 @@ static int access_mem(const unw_addr_space_t as, const unw_word_t addr, unw_word
   return 0;
 }
 
-namespace simgrid {
-namespace unw {
+namespace simgrid::unw {
 
 unw_addr_space_t create_addr_space()
 {
@@ -108,9 +98,8 @@ unw_addr_space_t create_addr_space()
    */
   // TODO, we could get rid of this if we properly stop the model-checked
   // process before reading the memory.
-  unw_accessors_t accessors = {&_UPT_find_proc_info, &_UPT_put_unwind_info, &_UPT_get_dyn_info_list_addr,
-                               &access_mem,          &_UPT_access_reg,      &_UPT_access_fpreg,
-                               &_UPT_resume,         &_UPT_get_proc_name};
+  unw_accessors_t accessors = _UPT_accessors;
+  accessors.access_mem      = &access_mem;
   return unw_create_addr_space(&accessors, BYTE_ORDER);
 }
 
@@ -119,5 +108,4 @@ void* create_context(unw_addr_space_t /*as*/, pid_t pid)
   return _UPT_create(pid);
 }
 
-} // namespace unw
-} // namespace simgrid
+} // namespace simgrid::unw