X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2e3c0670f37a0c37487fc75c73956290dc086c50..9932a0c0d2c44e34633c97a827b2b04d615cb4e9:/src/mc/mc_process.h

diff --git a/src/mc/mc_process.h b/src/mc/mc_process.h
index 05ba9b0a11..5e2175c716 100644
--- a/src/mc/mc_process.h
+++ b/src/mc/mc_process.h
@@ -8,23 +8,31 @@
 #define MC_PROCESS_H
 
 #include <stdbool.h>
+#include <sys/types.h>
 
 #include "simgrid_config.h"
 
 #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"
 
 #include "mc_forward.h"
 #include "mc_mmalloc.h" // std_heap
 #include "mc_memory_map.h"
 #include "mc_address_space.h"
+#include "mc_protocol.h"
 
 SG_BEGIN_DECL()
 
+int MC_process_vm_open(pid_t pid, int flags);
+
 typedef enum {
   MC_PROCESS_NO_FLAG = 0,
   MC_PROCESS_SELF_FLAG = 1,
@@ -35,14 +43,20 @@ typedef enum {
 typedef enum {
   MC_PROCESS_CACHE_FLAG_HEAP = 1,
   MC_PROCESS_CACHE_FLAG_MALLOC_INFO = 2,
+  MC_PROCESS_CACHE_FLAG_SIMIX_PROCESSES = 4,
 } e_mc_process_cache_flags_t ;
 
+typedef struct s_mc_smx_process_info s_mc_smx_process_info_t, *mc_smx_process_info_t;
+
 /** Representation of a process
  */
 struct s_mc_process {
   s_mc_address_space_t address_space;
   e_mc_process_flags_t process_flags;
   pid_t pid;
+  int socket;
+  int status;
+  bool running;
   memory_map_t memory_map;
   void *maestro_stack_start, *maestro_stack_end;
   mc_object_info_t libsimgrid_info;
@@ -51,13 +65,22 @@ struct s_mc_process {
   size_t object_infos_size;
   int memory_file;
 
-  // Cache: don't use those fields directly but with the getters
-  // which ensure that proper synchronisation has been done.
+  /** Copy of `simix_global->process_list`
+   *
+   *  See mc_smx.c.
+   */
+  xbt_dynar_t smx_process_infos;
 
+  /** Copy of `simix_global->process_to_destroy`
+   *
+   *  See mc_smx.c.
+   */
+  xbt_dynar_t smx_old_process_infos;
+
+  /** State of the cache (which variables are up to date) */
   e_mc_process_cache_flags_t cache_flags;
 
-  /** Address of the heap structure in the target process.
-   */
+  /** Address of the heap structure in the MCed process. */
   void* heap_address;
 
   /** Copy of the heap structure of the process
@@ -75,9 +98,34 @@ struct s_mc_process {
    *  use `MC_process_get_malloc_info` in order to use it.
    */
   malloc_info* heap_info;
+
+  // ***** Libunwind-data
+
+  /** Full-featured MC-aware libunwind address space for the process
+   *
+   *  This address space is using a mc_unw_context_t
+   *  (with mc_process_t/mc_address_space_t and unw_context_t).
+   */
+  unw_addr_space_t unw_addr_space;
+
+  /** Underlying libunwind addres-space
+   *
+   *  The `find_proc_info`, `put_unwind_info`, `get_dyn_info_list_addr`
+   *  operations of the native MC address space is currently delegated
+   *  to this address space (either the local or a ptrace unwinder).
+   */
+  unw_addr_space_t unw_underlying_addr_space;
+
+  /** The corresponding context
+   */
+  void* unw_underlying_context;
+
+  xbt_dynar_t checkpoint_ignore;
 };
 
-void MC_process_init(mc_process_t process, pid_t pid);
+bool MC_is_process(mc_address_space_t p);
+
+void MC_process_init(mc_process_t process, pid_t pid, int sockfd);
 void MC_process_clear(mc_process_t process);
 
 /** Refresh the information about the process
@@ -114,6 +162,13 @@ 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, size_t len);
+unsigned long MC_process_read_dynar_length(mc_process_t process, const void* remote_dynar);
+
 /** Write data to a process memory
  *
  *  @param process the process
@@ -123,10 +178,18 @@ const void* MC_process_read(mc_process_t process,
  */
 void MC_process_write(mc_process_t process, const void* local, void* remote, size_t len);
 
+void MC_process_clear_memory(mc_process_t process, void* remote, size_t len);
+
 /* Functions, variables of the process: */
 
-mc_object_info_t MC_process_find_object_info(mc_process_t process, void* ip);
-dw_frame_t MC_process_find_function(mc_process_t process, void* ip);
+mc_object_info_t MC_process_find_object_info(mc_process_t process, const void* addr);
+mc_object_info_t MC_process_find_object_info_exec(mc_process_t process, const void* addr);
+mc_object_info_t MC_process_find_object_info_rw(mc_process_t process, const void* addr);
+
+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)
 {