X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ffe8ce65fd9a8e18a0469f26f067c3ea6d5d60d4..814f0122ea0074dfb67398a79067c01267bc0b40:/src/mc/mc_comm_pattern.h

diff --git a/src/mc/mc_comm_pattern.h b/src/mc/mc_comm_pattern.h
index 667f24e529..3a4a0a6d01 100644
--- a/src/mc/mc_comm_pattern.h
+++ b/src/mc/mc_comm_pattern.h
@@ -10,6 +10,10 @@
 #include <xbt/dynar.h>
 
 #include "../simix/smx_private.h"
+#include "../smpi/private.h"
+#include <smpi/smpi.h>
+
+#include "mc_state.h"
 
 #ifndef MC_COMM_PATTERN_H
 #define MC_COMM_PATTERN_H
@@ -18,7 +22,7 @@ SG_BEGIN_DECL()
 
 typedef struct s_mc_comm_pattern{
   int num;
-  smx_synchro_t comm;
+  smx_synchro_t comm_addr;
   e_smx_comm_type_t type;
   unsigned long src_proc;
   unsigned long dst_proc;
@@ -27,6 +31,7 @@ typedef struct s_mc_comm_pattern{
   char *rdv;
   ssize_t data_size;
   void *data;
+  int tag;
   int index;
 } s_mc_comm_pattern_t, *mc_comm_pattern_t;
 
@@ -35,7 +40,14 @@ typedef struct s_mc_list_comm_pattern{
   xbt_dynar_t list;
 }s_mc_list_comm_pattern_t, *mc_list_comm_pattern_t;
 
+/**
+ *  Type: `xbt_dynar_t<mc_list_comm_pattenr_t>`
+ */
 extern xbt_dynar_t initial_communications_pattern;
+
+/**
+ *  Type: `xbt_dynar_t<xbt_dynar_t<mc_comm_pattern_t>>`
+ */
 extern xbt_dynar_t incomplete_communications_pattern;
 
 typedef enum {
@@ -50,13 +62,14 @@ typedef enum {
   NONE_DIFF,
   TYPE_DIFF,
   RDV_DIFF,
+  TAG_DIFF,
   SRC_PROC_DIFF,
   DST_PROC_DIFF,
   DATA_SIZE_DIFF,
   DATA_DIFF,
 } e_mc_comm_pattern_difference_t;
 
-static inline e_mc_call_type_t mc_get_call_type(smx_simcall_t req)
+static inline e_mc_call_type_t MC_get_call_type(smx_simcall_t req)
 {
   switch(req->call) {
   case SIMCALL_COMM_ISEND:
@@ -72,14 +85,23 @@ static inline e_mc_call_type_t mc_get_call_type(smx_simcall_t req)
   }
 }
 
-void get_comm_pattern(xbt_dynar_t communications_pattern, smx_simcall_t request, e_mc_call_type_t call_type);
-void handle_comm_pattern(e_mc_call_type_t call_type, smx_simcall_t request, int value, xbt_dynar_t current_pattern, int backtracking);
-void comm_pattern_free_voidp(void *p);
-void list_comm_pattern_free_voidp(void *p);
-void complete_comm_pattern(xbt_dynar_t list, smx_synchro_t comm, int backtracking);
-void MC_pre_modelcheck_comm_determinism(void);
+void MC_get_comm_pattern(xbt_dynar_t communications_pattern, smx_simcall_t request, e_mc_call_type_t call_type, int backtracking);
+void MC_handle_comm_pattern(e_mc_call_type_t call_type, smx_simcall_t request, int value, xbt_dynar_t current_pattern, int backtracking);
+void MC_comm_pattern_free_voidp(void *p);
+void MC_list_comm_pattern_free_voidp(void *p);
+void MC_complete_comm_pattern(xbt_dynar_t list, smx_synchro_t comm_addr, unsigned int issuer, int backtracking);
 void MC_modelcheck_comm_determinism(void);
 
+void MC_restore_communications_pattern(mc_state_t state);
+
+mc_comm_pattern_t MC_comm_pattern_dup(mc_comm_pattern_t comm);
+xbt_dynar_t MC_comm_patterns_dup(xbt_dynar_t state);
+
+void MC_state_copy_incomplete_communications_pattern(mc_state_t state);
+void MC_state_copy_index_communications_pattern(mc_state_t state);
+
+void MC_comm_pattern_free(mc_comm_pattern_t p);
+
 SG_END_DECL()
 
 #endif