X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4b95f054f8e620b68676f19b9db38002889538c6..bcb5cde966bef9e174da1c93cdb2158c0880a613:/src/mc/mc_comm_pattern.h diff --git a/src/mc/mc_comm_pattern.h b/src/mc/mc_comm_pattern.h index 67f321b731..b5ac8410dd 100644 --- a/src/mc/mc_comm_pattern.h +++ b/src/mc/mc_comm_pattern.h @@ -1,5 +1,4 @@ -/* Copyright (c) 2007-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -7,18 +6,10 @@ #ifndef SIMGRID_MC_COMM_PATTERN_H #define SIMGRID_MC_COMM_PATTERN_H -#include -#include - -#include #include -#include -#include - -#include "src/simix/smx_private.h" -#include "src/smpi/private.h" -#include +#include "smpi/smpi.h" +#include "xbt/dynar.h" #include "src/mc/mc_state.h" @@ -27,13 +18,7 @@ namespace mc { struct PatternCommunicationList { unsigned int index_comm = 0; - xbt_dynar_t list = nullptr; - - PatternCommunicationList() {} - ~PatternCommunicationList() - { - xbt_dynar_free(&(this->list)); - } + std::vector> list; }; } @@ -42,7 +27,7 @@ struct PatternCommunicationList { SG_BEGIN_DECL() /** - * Type: `xbt_dynar_t` + * Type: `xbt_dynar_t` */ extern XBT_PRIVATE xbt_dynar_t initial_communications_pattern; @@ -86,9 +71,7 @@ static inline e_mc_call_type_t MC_get_call_type(smx_simcall_t req) } } -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_complete_comm_pattern(xbt_dynar_t list, smx_synchro_t comm_addr, unsigned int issuer, int backtracking); XBT_PRIVATE void MC_restore_communications_pattern(simgrid::mc::State* state);