#ifndef SIMGRID_MC_COMM_PATTERN_H
#define SIMGRID_MC_COMM_PATTERN_H
-#include <stddef.h>
+#include <cstddef>
+#include <cstring>
+
+#include <string>
+#include <vector>
#include <simgrid_config.h>
#include <xbt/dynar.h>
-#include "../simix/smx_private.h"
-#include "../smpi/private.h"
+#include "src/simix/smx_private.h"
+#include "src/smpi/private.h"
#include <smpi/smpi.h>
-#include "mc_state.h"
+#include "src/mc/mc_state.h"
-SG_BEGIN_DECL()
+namespace simgrid {
+namespace mc {
-typedef struct s_mc_comm_pattern{
- int num;
+struct PatternCommunication {
+ int num = 0;
smx_synchro_t comm_addr;
- e_smx_comm_type_t type;
- unsigned long src_proc;
- unsigned long dst_proc;
- const char *src_host;
- const char *dst_host;
- char *rdv;
- ssize_t data_size;
- void *data;
- int tag;
- int index;
-} s_mc_comm_pattern_t, *mc_comm_pattern_t;
-
-typedef struct s_mc_list_comm_pattern{
- unsigned int index_comm;
- xbt_dynar_t list;
-}s_mc_list_comm_pattern_t, *mc_list_comm_pattern_t;
+ e_smx_comm_type_t type = SIMIX_COMM_SEND;
+ unsigned long src_proc = 0;
+ unsigned long dst_proc = 0;
+ const char *src_host = nullptr;
+ const char *dst_host = nullptr;
+ std::string rdv;
+ std::vector<char> data;
+ int tag = 0;
+ int index = 0;
+
+ PatternCommunication()
+ {
+ std::memset(&comm_addr, 0, sizeof(comm_addr));
+ }
+
+ PatternCommunication dup() const
+ {
+ simgrid::mc::PatternCommunication res;
+ // num?
+ res.comm_addr = this->comm_addr;
+ res.type = this->type;
+ // src_proc?
+ // dst_proc?
+ res.dst_proc = this->dst_proc;
+ res.dst_host = this->dst_host;
+ res.rdv = this->rdv;
+ res.data = this->data;
+ // tag?
+ res.index = this->index;
+ return res;
+ }
+
+};
+
+struct PatternCommunicationList {
+ unsigned int index_comm = 0;
+ xbt_dynar_t list = nullptr;
+
+ PatternCommunicationList() {}
+ ~PatternCommunicationList()
+ {
+ xbt_dynar_free(&(this->list));
+ }
+};
+
+}
+}
+
+SG_BEGIN_DECL()
/**
* Type: `xbt_dynar_t<mc_list_comm_pattenr_t>`
extern XBT_PRIVATE xbt_dynar_t initial_communications_pattern;
/**
- * Type: `xbt_dynar_t<xbt_dynar_t<mc_comm_pattern_t>>`
+ * Type: `xbt_dynar_t<xbt_dynar_t<simgrid::mc::PatternCommunication*>>`
*/
extern XBT_PRIVATE xbt_dynar_t incomplete_communications_pattern;
XBT_PRIVATE void MC_get_comm_pattern(xbt_dynar_t communications_pattern, smx_simcall_t request, e_mc_call_type_t call_type, int backtracking);
XBT_PRIVATE 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);
-XBT_PRIVATE void MC_comm_pattern_free_voidp(void *p);
-XBT_PRIVATE void MC_list_comm_pattern_free_voidp(void *p);
XBT_PRIVATE 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);
-
-XBT_PRIVATE void MC_restore_communications_pattern(mc_state_t state);
-
-XBT_PRIVATE mc_comm_pattern_t MC_comm_pattern_dup(mc_comm_pattern_t comm);
-XBT_PRIVATE xbt_dynar_t MC_comm_patterns_dup(xbt_dynar_t state);
-XBT_PRIVATE void MC_state_copy_incomplete_communications_pattern(mc_state_t state);
-XBT_PRIVATE void MC_state_copy_index_communications_pattern(mc_state_t state);
+XBT_PRIVATE void MC_restore_communications_pattern(simgrid::mc::State* state);
-XBT_PRIVATE void MC_comm_pattern_free(mc_comm_pattern_t p);
+XBT_PRIVATE void MC_state_copy_incomplete_communications_pattern(simgrid::mc::State* state);
+XBT_PRIVATE void MC_state_copy_index_communications_pattern(simgrid::mc::State* state);
SG_END_DECL()