Merge branch 'master' into mc-process

[simgrid.git] / src / mc / mc_process.h

diff --git a/src/mc/mc_process.h b/src/mc/mc_process.h
index 84d90cd..5e2175c 100644 (file)
--- a/src/mc/mc_process.h
+++ b/src/mc/mc_process.h
@@ -15,7 +15,10 @@
 #include <sys/types.h>
 
 #include <xbt/mmalloc.h>
+
+#ifdef HAVE_MC
 #include "xbt/mmalloc/mmprivate.h"
+#endif
 
 #include "simix/popping_private.h"
 #include "simix/smx_private.h"
@@ -159,11 +162,12 @@ const void* MC_process_read(mc_process_t process,
   void* local, const void* remote, size_t len,
   int process_index);
 
+// Simplified versions/wrappers (whould be moved in mc_address_space):
 const void* MC_process_read_simple(mc_process_t process,
   void* local, const void* remote, size_t len);
-
 const void* MC_process_read_dynar_element(mc_process_t process,
-  void* local, const void* remote_dynar, size_t i);
+  void* local, const void* remote_dynar, size_t i, size_t len);
+unsigned long MC_process_read_dynar_length(mc_process_t process, const void* remote_dynar);
 
 /** Write data to a process memory
  *
@@ -185,6 +189,7 @@ mc_object_info_t MC_process_find_object_info_rw(mc_process_t process, const void
 dw_frame_t MC_process_find_function(mc_process_t process, const void* ip);
 
 void MC_process_read_variable(mc_process_t process, const char* name, void* target, size_t size);
+char* MC_process_read_string(mc_process_t, void* address);
 
 static inline xbt_mheap_t MC_process_get_heap(mc_process_t process)
 {