basename -> xbt_basename

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

diff --git a/src/mc/Process.cpp b/src/mc/Process.cpp
index 665e29e..3ffcd23 100644 (file)
--- a/src/mc/Process.cpp
+++ b/src/mc/Process.cpp
@@ -27,11 +27,11 @@
 
 #include <xbt/mmalloc.h>
 
-#include "mc_object_info.h"
-#include "mc_unw.h"
-#include "mc_snapshot.h"
-#include "mc_ignore.h"
-#include "mc_smx.h"
+#include "src/mc/mc_object_info.h"
+#include "src/mc/mc_unw.h"
+#include "src/mc/mc_snapshot.h"
+#include "src/mc/mc_ignore.h"
+#include "src/mc/mc_smx.h"
 
 #include "src/mc/Process.hpp"
 #include "src/mc/AddressSpace.hpp"
@@ -100,7 +100,7 @@ struct s_mc_memory_map_re {
 
 static char* MC_get_lib_name(const char* pathname, struct s_mc_memory_map_re* res)
 {
-  const char* map_basename = basename((char*) pathname);
+  const char* map_basename = xbt_basename((char*) pathname);
 
   regmatch_t match;
   if(regexec(&res->so_re, map_basename, 1, &match, 0))
@@ -506,7 +506,7 @@ char* Process::read_string(remote_ptr<void> address) const
 
 const void *Process::read_bytes(void* buffer, std::size_t size,
   remote_ptr<void> address, int process_index,
-  AddressSpace::ReadMode mode) const
+  ReadOptions options) const
 {
   if (process_index != simgrid::mc::ProcessIndexDisabled) {
     std::shared_ptr<simgrid::mc::ObjectInformation> const& info =
@@ -698,5 +698,14 @@ void Process::unignore_heap(void *address, size_t size)
   }
 }
 
+void Process::ignore_local_variable(const char *var_name, const char *frame_name)
+{
+  if (frame_name != nullptr && strcmp(frame_name, "*") == 0)
+    frame_name = nullptr;
+  for (std::shared_ptr<simgrid::mc::ObjectInformation> const& info :
+      this->object_infos)
+    info->remove_local_variable(var_name, frame_name);
+}
+
 }
 }