#include <xbt/sysdep.h>
#include <xbt/dynar.h>
+#include <xbt/dynar.hpp>
#include "src/mc/mc_comm_pattern.h"
#include "src/mc/mc_smx.h"
mc_comm_pattern_t MC_comm_pattern_dup(mc_comm_pattern_t comm)
{
- mc_comm_pattern_t res = xbt_new0(s_mc_comm_pattern_t, 1);
+ mc_comm_pattern_t res = new s_mc_comm_pattern_t();
res->index = comm->index;
res->type = comm->type;
res->comm_addr = comm->comm_addr;
- res->rdv = xbt_strdup(comm->rdv);
- res->data_size = -1;
- res->data = nullptr;
- if (comm->type == SIMIX_COMM_SEND) {
- res->src_proc = comm->src_proc;
- res->src_host = comm->src_host;
- if (comm->data != nullptr) {
- res->data_size = comm->data_size;
- res->data = xbt_malloc0(comm->data_size);
- memcpy(res->data, comm->data, comm->data_size);
- }
- } else {
- res->dst_proc = comm->dst_proc;
- res->dst_host = comm->dst_host;
- }
+ res->rdv = comm->rdv;
+ res->data = comm->data;
+ res->dst_proc = comm->dst_proc;
+ res->dst_host = comm->dst_host;
return res;
}
xbt_dynar_t MC_comm_patterns_dup(xbt_dynar_t patterns)
{
- xbt_dynar_t res = xbt_dynar_new(sizeof(mc_comm_pattern_t), MC_comm_pattern_free_voidp);
+ xbt_dynar_t res = simgrid::xbt::newDeleteDynar<s_mc_comm_pattern_t>();
mc_comm_pattern_t comm;
unsigned int cursor;
}
-void MC_comm_pattern_free(mc_comm_pattern_t p)
-{
- xbt_free(p->rdv);
- xbt_free(p->data);
- xbt_free(p);
- p = nullptr;
-}
-
-static void MC_list_comm_pattern_free(mc_list_comm_pattern_t l)
-{
- xbt_dynar_free(&(l->list));
- xbt_free(l);
- l = nullptr;
-}
-
-void MC_comm_pattern_free_voidp(void *p)
-{
- MC_comm_pattern_free((mc_comm_pattern_t) * (void **) p);
-}
-
-void MC_list_comm_pattern_free_voidp(void *p)
-{
- MC_list_comm_pattern_free((mc_list_comm_pattern_t) * (void **) p);
-}
-
}