X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/208547c8a823a2df7a6e945697aacd2a7a38cbaf..41626f8a47c96f54fa3b1ee61a90fb0af699dcbc:/src/mc/mc_process.h

diff --git a/src/mc/mc_process.h b/src/mc/mc_process.h
index f5fd69f976..33340965fd 100644
--- a/src/mc/mc_process.h
+++ b/src/mc/mc_process.h
@@ -18,11 +18,13 @@
 #include "xbt/mmalloc/mmprivate.h"
 
 #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()
 
@@ -38,14 +40,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;
@@ -54,13 +62,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
@@ -99,11 +116,13 @@ struct s_mc_process {
   /** The corresponding context
    */
   void* unw_underlying_context;
+
+  xbt_dynar_t checkpoint_ignore;
 };
 
 bool MC_is_process(mc_address_space_t p);
 
-void MC_process_init(mc_process_t process, pid_t pid);
+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
@@ -140,6 +159,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);
+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
@@ -159,6 +185,9 @@ 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)
 {
   if (MC_process_is_self(process))