X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0b7d1f86375fc32d181c2ab574eed9dadee72db6..6050383ef0dc59e1ca54d02bcf6bccb993593add:/src/mc/Process.cpp

diff --git a/src/mc/Process.cpp b/src/mc/Process.cpp
index 3f06a40b42..12a1499d48 100644
--- a/src/mc/Process.cpp
+++ b/src/mc/Process.cpp
@@ -24,7 +24,6 @@
 #include <libunwind.h>
 #include <libunwind-ptrace.h>
 
-#include <xbt/dynar.h>
 #include <xbt/log.h>
 #include <xbt/base.h>
 #include <xbt/mmalloc.h>
@@ -226,9 +225,10 @@ void Process::init()
 
   this->smx_process_infos.clear();
   this->smx_old_process_infos.clear();
-  this->unw_addr_space = unw_create_addr_space(&mc_unw_accessors  , __BYTE_ORDER);
-  this->unw_underlying_addr_space = unw_create_addr_space(&mc_unw_vmread_accessors, __BYTE_ORDER);
-  this->unw_underlying_context = _UPT_create(this->pid_);
+  this->unw_addr_space = simgrid::mc::UnwindContext::createUnwindAddressSpace();
+  this->unw_underlying_addr_space = simgrid::unw::create_addr_space();
+  this->unw_underlying_context = simgrid::unw::create_context(
+    this->unw_underlying_addr_space, this->pid_);
 }
 
 Process::~Process()
@@ -256,13 +256,12 @@ Process::~Process()
  */
 void Process::refresh_heap()
 {
-  xbt_assert(mc_mode == MC_MODE_SERVER);
   // Read/dereference/refresh the std_heap pointer:
   if (!this->heap)
     this->heap = std::unique_ptr<s_xbt_mheap_t>(new s_xbt_mheap_t());
   this->read_bytes(this->heap.get(), sizeof(struct mdesc),
     remote(this->heap_address), simgrid::mc::ProcessIndexDisabled);
-  this->cache_flags |= MC_PROCESS_CACHE_FLAG_HEAP;
+  this->cache_flags_ |= Process::cache_heap;
 }
 
 /** Refresh the information about the process
@@ -272,16 +271,15 @@ void Process::refresh_heap()
  * */
 void Process::refresh_malloc_info()
 {
-  xbt_assert(mc_mode == MC_MODE_SERVER);
-  if (!(this->cache_flags & MC_PROCESS_CACHE_FLAG_HEAP))
-    this->refresh_heap();
   // Refresh process->heapinfo:
+  if (this->cache_flags_ & Process::cache_malloc)
+    return;
   size_t count = this->heap->heaplimit + 1;
   if (this->heap_info.size() < count)
     this->heap_info.resize(count);
   this->read_bytes(this->heap_info.data(), count * sizeof(malloc_info),
     remote(this->heap->heapinfo), simgrid::mc::ProcessIndexDisabled);
-  this->cache_flags |= MC_PROCESS_CACHE_FLAG_MALLOC_INFO;
+  this->cache_flags_ |= Process::cache_malloc;
 }
 
 /** @brief Finds the range of the different memory segments and binary paths */
@@ -672,14 +670,12 @@ void Process::ignore_local_variable(const char *var_name, const char *frame_name
 
 std::vector<simgrid::mc::SimixProcessInformation>& Process::simix_processes()
 {
-  xbt_assert(mc_mode != MC_MODE_CLIENT);
   this->refresh_simix();
   return smx_process_infos;
 }
 
 std::vector<simgrid::mc::SimixProcessInformation>& Process::old_simix_processes()
 {
-  xbt_assert(mc_mode != MC_MODE_CLIENT);
   this->refresh_simix();
   return smx_old_process_infos;
 }