#include <stdio.h>
#include <xbt.h>
#include <xbt/replay.h>
+#include <unordered_map>
+#include <vector>
#define KEY_SIZE (sizeof(int) * 2 + 1)
int communicator_size = 0;
static int active_processes = 0;
-xbt_dict_t reqq = NULL;
+std::unordered_map<int,std::vector<MPI_Request>*> reqq;
MPI_Datatype MPI_DEFAULT_TYPE;
MPI_Datatype MPI_CURRENT_TYPE;
static int sendbuffer_size=0;
-char* sendbuffer=NULL;
+char* sendbuffer=nullptr;
static int recvbuffer_size=0;
-char* recvbuffer=NULL;
+char* recvbuffer=nullptr;
static void log_timed_action (const char *const *action, double clock){
if (XBT_LOG_ISENABLED(smpi_replay, xbt_log_priority_verbose)){
char *name = xbt_str_join_array(action, " ");
XBT_VERB("%s %f", name, smpi_process_simulated_elapsed()-clock);
- free(name);
+ xbt_free(name);
}
}
-static xbt_dynar_t get_reqq_self()
+static std::vector<MPI_Request>* get_reqq_self()
{
- char * key = bprintf("%d", smpi_process_index());
- xbt_dynar_t dynar_mpi_request = (xbt_dynar_t) xbt_dict_get(reqq, key);
- free(key);
-
- return dynar_mpi_request;
+ return reqq.at(smpi_process_index());
}
-static void set_reqq_self(xbt_dynar_t mpi_request)
+static void set_reqq_self(std::vector<MPI_Request> *mpi_request)
{
- char * key = bprintf("%d", smpi_process_index());
- xbt_dict_set(reqq, key, mpi_request, free);
- free(key);
+ reqq.insert({smpi_process_index(), mpi_request});
}
//allocate a single buffer for all sends, growing it if needed
{
//default type for output is set to MPI_BYTE
// MPI_DEFAULT_TYPE is not set for output, use directly MPI_BYTE
- if(known)*known=1;
+ if(known!=nullptr)
+ *known=1;
if (datatype==MPI_BYTE){
return "";
}
if(datatype==MPI_FLOAT)
return "5";
//tell that the datatype is not handled by replay, and that its size should be measured and replayed as size*MPI_BYTE
- if(known)*known=0;
+ if(known!=nullptr)
+ *known=0;
// default - not implemented.
// do not warn here as we pass in this function even for other trace formats
return "-1";
#define CHECK_ACTION_PARAMS(action, mandatory, optional) {\
int i=0;\
- while(action[i]!=NULL)\
+ while(action[i]!=nullptr)\
i++;\
if(i<mandatory+2) \
THROWF(arg_error, 0, "%s replay failed.\n" \
static void action_init(const char *const *action)
{
XBT_DEBUG("Initialize the counters");
- CHECK_ACTION_PARAMS(action, 0, 1);
- if(action[2]) MPI_DEFAULT_TYPE= MPI_DOUBLE; // default MPE dataype
+ CHECK_ACTION_PARAMS(action, 0, 1)
+ if(action[2])
+ MPI_DEFAULT_TYPE=MPI_DOUBLE; // default MPE dataype
else MPI_DEFAULT_TYPE= MPI_BYTE; // default TAU datatype
/* start a simulated timer */
/*initialize the number of active processes */
active_processes = smpi_process_count();
- if (!reqq) {
- reqq = xbt_dict_new();
- }
-
- set_reqq_self(xbt_dynar_new(sizeof(MPI_Request),&xbt_free_ref));
+ set_reqq_self(new std::vector<MPI_Request>);
}
static void action_finalize(const char *const *action)
{
+ /* do nothing */
}
static void action_comm_size(const char *const *action)
static void action_compute(const char *const *action)
{
- CHECK_ACTION_PARAMS(action, 1, 0);
+ CHECK_ACTION_PARAMS(action, 1, 0)
double clock = smpi_process_simulated_elapsed();
double flops= parse_double(action[2]);
int rank = smpi_process_index();
static void action_send(const char *const *action)
{
- CHECK_ACTION_PARAMS(action, 2, 1);
+ CHECK_ACTION_PARAMS(action, 2, 1)
int to = atoi(action[2]);
double size=parse_double(action[3]);
double clock = smpi_process_simulated_elapsed();
- if(action[4]) {
+ if(action[4])
MPI_CURRENT_TYPE=decode_datatype(action[4]);
- } else {
+ else
MPI_CURRENT_TYPE= MPI_DEFAULT_TYPE;
- }
int rank = smpi_process_index();
extra->send_size = size;
extra->src = rank;
extra->dst = dst_traced;
- extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, NULL);
+ extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, nullptr);
TRACE_smpi_ptp_in(rank, rank, dst_traced, __FUNCTION__, extra);
if (!TRACE_smpi_view_internals()) {
- TRACE_smpi_send(rank, rank, dst_traced, size*smpi_datatype_size(MPI_CURRENT_TYPE));
+ TRACE_smpi_send(rank, rank, dst_traced, 0, size*smpi_datatype_size(MPI_CURRENT_TYPE));
}
- smpi_mpi_send(NULL, size, MPI_CURRENT_TYPE, to , 0, MPI_COMM_WORLD);
+ smpi_mpi_send(nullptr, size, MPI_CURRENT_TYPE, to , 0, MPI_COMM_WORLD);
log_timed_action (action, clock);
static void action_Isend(const char *const *action)
{
- CHECK_ACTION_PARAMS(action, 2, 1);
+ CHECK_ACTION_PARAMS(action, 2, 1)
int to = atoi(action[2]);
double size=parse_double(action[3]);
double clock = smpi_process_simulated_elapsed();
MPI_Request request;
- if(action[4]) MPI_CURRENT_TYPE=decode_datatype(action[4]);
- else MPI_CURRENT_TYPE= MPI_DEFAULT_TYPE;
+ if(action[4])
+ MPI_CURRENT_TYPE=decode_datatype(action[4]);
+ else
+ MPI_CURRENT_TYPE= MPI_DEFAULT_TYPE;
int rank = smpi_process_index();
int dst_traced = smpi_group_rank(smpi_comm_group(MPI_COMM_WORLD), to);
extra->send_size = size;
extra->src = rank;
extra->dst = dst_traced;
- extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, NULL);
+ extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, nullptr);
TRACE_smpi_ptp_in(rank, rank, dst_traced, __FUNCTION__, extra);
if (!TRACE_smpi_view_internals()) {
- TRACE_smpi_send(rank, rank, dst_traced, size*smpi_datatype_size(MPI_CURRENT_TYPE));
+ TRACE_smpi_send(rank, rank, dst_traced, 0, size*smpi_datatype_size(MPI_CURRENT_TYPE));
}
- request = smpi_mpi_isend(NULL, size, MPI_CURRENT_TYPE, to, 0,MPI_COMM_WORLD);
+ request = smpi_mpi_isend(nullptr, size, MPI_CURRENT_TYPE, to, 0,MPI_COMM_WORLD);
TRACE_smpi_ptp_out(rank, rank, dst_traced, __FUNCTION__);
request->send = 1;
- xbt_dynar_push(get_reqq_self(),&request);
+ get_reqq_self()->push_back(request);
log_timed_action (action, clock);
}
static void action_recv(const char *const *action) {
- CHECK_ACTION_PARAMS(action, 2, 1);
+ CHECK_ACTION_PARAMS(action, 2, 1)
int from = atoi(action[2]);
double size=parse_double(action[3]);
double clock = smpi_process_simulated_elapsed();
MPI_Status status;
- if(action[4]) MPI_CURRENT_TYPE=decode_datatype(action[4]);
- else MPI_CURRENT_TYPE= MPI_DEFAULT_TYPE;
+ if(action[4])
+ MPI_CURRENT_TYPE=decode_datatype(action[4]);
+ else
+ MPI_CURRENT_TYPE= MPI_DEFAULT_TYPE;
int rank = smpi_process_index();
int src_traced = smpi_group_rank(smpi_comm_group(MPI_COMM_WORLD), from);
extra->send_size = size;
extra->src = src_traced;
extra->dst = rank;
- extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, NULL);
+ extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, nullptr);
TRACE_smpi_ptp_in(rank, src_traced, rank, __FUNCTION__, extra);
- //unknow size from the receiver pov
- if(size==-1){
- smpi_mpi_probe(from, 0, MPI_COMM_WORLD, &status);
- size=status.count;
+ //unknown size from the receiver point of view
+ if(size<=0.0){
+ smpi_mpi_probe(from, 0, MPI_COMM_WORLD, &status);
+ size=status.count;
}
- smpi_mpi_recv(NULL, size, MPI_CURRENT_TYPE, from, 0, MPI_COMM_WORLD, &status);
+ smpi_mpi_recv(nullptr, size, MPI_CURRENT_TYPE, from, 0, MPI_COMM_WORLD, &status);
TRACE_smpi_ptp_out(rank, src_traced, rank, __FUNCTION__);
if (!TRACE_smpi_view_internals()) {
- TRACE_smpi_recv(rank, src_traced, rank);
+ TRACE_smpi_recv(rank, src_traced, rank, 0);
}
log_timed_action (action, clock);
static void action_Irecv(const char *const *action)
{
- CHECK_ACTION_PARAMS(action, 2, 1);
+ CHECK_ACTION_PARAMS(action, 2, 1)
int from = atoi(action[2]);
double size=parse_double(action[3]);
double clock = smpi_process_simulated_elapsed();
MPI_Request request;
- if(action[4]) MPI_CURRENT_TYPE=decode_datatype(action[4]);
- else MPI_CURRENT_TYPE= MPI_DEFAULT_TYPE;
+ if(action[4])
+ MPI_CURRENT_TYPE=decode_datatype(action[4]);
+ else
+ MPI_CURRENT_TYPE= MPI_DEFAULT_TYPE;
int rank = smpi_process_index();
int src_traced = smpi_group_rank(smpi_comm_group(MPI_COMM_WORLD), from);
extra->send_size = size;
extra->src = src_traced;
extra->dst = rank;
- extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, NULL);
+ extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, nullptr);
TRACE_smpi_ptp_in(rank, src_traced, rank, __FUNCTION__, extra);
MPI_Status status;
//unknow size from the receiver pov
- if(size==-1){
+ if(size<=0.0){
smpi_mpi_probe(from, 0, MPI_COMM_WORLD, &status);
size=status.count;
}
- request = smpi_mpi_irecv(NULL, size, MPI_CURRENT_TYPE, from, 0, MPI_COMM_WORLD);
+ request = smpi_mpi_irecv(nullptr, size, MPI_CURRENT_TYPE, from, 0, MPI_COMM_WORLD);
TRACE_smpi_ptp_out(rank, src_traced, rank, __FUNCTION__);
request->recv = 1;
- xbt_dynar_push(get_reqq_self(),&request);
+ get_reqq_self()->push_back(request);
log_timed_action (action, clock);
}
static void action_test(const char *const *action){
- CHECK_ACTION_PARAMS(action, 0, 0);
+ CHECK_ACTION_PARAMS(action, 0, 0)
double clock = smpi_process_simulated_elapsed();
- MPI_Request request;
MPI_Status status;
int flag = true;
- request = xbt_dynar_pop_as(get_reqq_self(),MPI_Request);
+ MPI_Request request = get_reqq_self()->back();
+ get_reqq_self()->pop_back();
//if request is null here, this may mean that a previous test has succeeded
//Different times in traced application and replayed version may lead to this
//In this case, ignore the extra calls.
- if(request){
+ if(request!=nullptr){
int rank = smpi_process_index();
instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1);
extra->type=TRACING_TEST;
flag = smpi_mpi_test(&request, &status);
XBT_DEBUG("MPI_Test result: %d", flag);
- /* push back request in dynar to be caught by a subsequent wait. if the test did succeed, the request is now NULL.*/
- xbt_dynar_push_as(get_reqq_self(),MPI_Request, request);
+ /* push back request in vector to be caught by a subsequent wait. if the test did succeed, the request is now nullptr.*/
+ get_reqq_self()->push_back(request);
TRACE_smpi_testing_out(rank);
}
}
static void action_wait(const char *const *action){
- CHECK_ACTION_PARAMS(action, 0, 0);
+ CHECK_ACTION_PARAMS(action, 0, 0)
double clock = smpi_process_simulated_elapsed();
- MPI_Request request;
MPI_Status status;
- xbt_assert(xbt_dynar_length(get_reqq_self()),
- "action wait not preceded by any irecv or isend: %s",
+ xbt_assert(get_reqq_self()->size(), "action wait not preceded by any irecv or isend: %s",
xbt_str_join_array(action," "));
- request = xbt_dynar_pop_as(get_reqq_self(),MPI_Request);
+ MPI_Request request = get_reqq_self()->back();
+ get_reqq_self()->pop_back();
- if (!request){
+ if (request==nullptr){
/* Assume that the trace is well formed, meaning the comm might have been caught by a MPI_test. Then just return.*/
return;
}
TRACE_smpi_ptp_out(rank, src_traced, dst_traced, __FUNCTION__);
if (is_wait_for_receive)
- TRACE_smpi_recv(rank, src_traced, dst_traced);
+ TRACE_smpi_recv(rank, src_traced, dst_traced, 0);
log_timed_action (action, clock);
}
static void action_waitall(const char *const *action){
- CHECK_ACTION_PARAMS(action, 0, 0);
+ CHECK_ACTION_PARAMS(action, 0, 0)
double clock = smpi_process_simulated_elapsed();
- int count_requests=0;
- unsigned int i=0;
-
- count_requests=xbt_dynar_length(get_reqq_self());
+ unsigned int count_requests=get_reqq_self()->size();
if (count_requests>0) {
- MPI_Request requests[count_requests];
MPI_Status status[count_requests];
- /* The reqq is an array of dynars. Its index corresponds to the rank.
- Thus each rank saves its own requests to the array request. */
- xbt_dynar_foreach(get_reqq_self(),i,requests[i]);
-
- //save information from requests
- xbt_dynar_t srcs = xbt_dynar_new(sizeof(int), NULL);
- xbt_dynar_t dsts = xbt_dynar_new(sizeof(int), NULL);
- xbt_dynar_t recvs = xbt_dynar_new(sizeof(int), NULL);
- for (i = 0; (int)i < count_requests; i++) {
- if(requests[i]){
- int *asrc = xbt_new(int, 1);
- int *adst = xbt_new(int, 1);
- int *arecv = xbt_new(int, 1);
- *asrc = requests[i]->src;
- *adst = requests[i]->dst;
- *arecv = requests[i]->recv;
- xbt_dynar_insert_at(srcs, i, asrc);
- xbt_dynar_insert_at(dsts, i, adst);
- xbt_dynar_insert_at(recvs, i, arecv);
- xbt_free(asrc);
- xbt_free(adst);
- xbt_free(arecv);
- }else {
- int *t = xbt_new(int, 1);
- xbt_dynar_insert_at(srcs, i, t);
- xbt_dynar_insert_at(dsts, i, t);
- xbt_dynar_insert_at(recvs, i, t);
- xbt_free(t);
- }
- }
int rank_traced = smpi_process_index();
instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1);
extra->type = TRACING_WAITALL;
extra->send_size=count_requests;
TRACE_smpi_ptp_in(rank_traced, -1, -1, __FUNCTION__,extra);
+ int* recvs_snd= xbt_new0(int,count_requests);
+ int* recvs_rcv= xbt_new0(int,count_requests);
+ unsigned int i=0;
+ for (auto req : *(get_reqq_self())){
+ if (req && req->recv){
+ recvs_snd[i]=req->src;
+ recvs_rcv[i]=req->dst;
+ }else
+ recvs_snd[i]=-100;
+ i++;
+ }
+ smpi_mpi_waitall(count_requests, &(*get_reqq_self())[0], status);
- smpi_mpi_waitall(count_requests, requests, status);
-
- for (i = 0; (int)i < count_requests; i++) {
- int src_traced, dst_traced, is_wait_for_receive;
- xbt_dynar_get_cpy(srcs, i, &src_traced);
- xbt_dynar_get_cpy(dsts, i, &dst_traced);
- xbt_dynar_get_cpy(recvs, i, &is_wait_for_receive);
- if (is_wait_for_receive) {
- TRACE_smpi_recv(rank_traced, src_traced, dst_traced);
- }
+ for (i=0; i<count_requests;i++){
+ if (recvs_snd[i]!=-100)
+ TRACE_smpi_recv(rank_traced, recvs_snd[i], recvs_rcv[i],0);
}
+ xbt_free(recvs_rcv);
+ xbt_free(recvs_snd);
TRACE_smpi_ptp_out(rank_traced, -1, -1, __FUNCTION__);
- //clean-up of dynars
- xbt_dynar_free(&srcs);
- xbt_dynar_free(&dsts);
- xbt_dynar_free(&recvs);
-
- //TODO xbt_dynar_free_container(get_reqq_self());
- set_reqq_self(xbt_dynar_new(sizeof(MPI_Request),&xbt_free_ref));
}
log_timed_action (action, clock);
}
static void action_bcast(const char *const *action)
{
- CHECK_ACTION_PARAMS(action, 1, 2);
+ CHECK_ACTION_PARAMS(action, 1, 2)
double size = parse_double(action[2]);
double clock = smpi_process_simulated_elapsed();
int root=0;
extra->type = TRACING_BCAST;
extra->send_size = size;
extra->root = root_traced;
- extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, NULL);
+ extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, nullptr);
TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__, extra);
void *sendbuf = smpi_get_tmp_sendbuffer(size* smpi_datatype_size(MPI_CURRENT_TYPE));
static void action_reduce(const char *const *action)
{
- CHECK_ACTION_PARAMS(action, 2, 2);
+ CHECK_ACTION_PARAMS(action, 2, 2)
double comm_size = parse_double(action[2]);
double comp_size = parse_double(action[3]);
double clock = smpi_process_simulated_elapsed();
extra->type = TRACING_REDUCE;
extra->send_size = comm_size;
extra->comp_size = comp_size;
- extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, NULL);
+ extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, nullptr);
extra->root = root_traced;
TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__,extra);
}
static void action_allReduce(const char *const *action) {
- CHECK_ACTION_PARAMS(action, 2, 1);
+ CHECK_ACTION_PARAMS(action, 2, 1)
double comm_size = parse_double(action[2]);
double comp_size = parse_double(action[3]);
- if(action[4]) MPI_CURRENT_TYPE=decode_datatype(action[4]);
- else MPI_CURRENT_TYPE= MPI_DEFAULT_TYPE;
+ if(action[4])
+ MPI_CURRENT_TYPE=decode_datatype(action[4]);
+ else
+ MPI_CURRENT_TYPE= MPI_DEFAULT_TYPE;
double clock = smpi_process_simulated_elapsed();
int rank = smpi_process_index();
extra->type = TRACING_ALLREDUCE;
extra->send_size = comm_size;
extra->comp_size = comp_size;
- extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, NULL);
+ extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, nullptr);
TRACE_smpi_collective_in(rank, -1, __FUNCTION__,extra);
void *recvbuf = smpi_get_tmp_sendbuffer(comm_size* smpi_datatype_size(MPI_CURRENT_TYPE));
}
static void action_allToAll(const char *const *action) {
- CHECK_ACTION_PARAMS(action, 2, 2); //two mandatory (send and recv volumes)
+ CHECK_ACTION_PARAMS(action, 2, 2) //two mandatory (send and recv volumes)
//two optional (corresponding datatypes)
double clock = smpi_process_simulated_elapsed();
int comm_size = smpi_comm_size(MPI_COMM_WORLD);
extra->type = TRACING_ALLTOALL;
extra->send_size = send_size;
extra->recv_size = recv_size;
- extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, NULL);
- extra->datatype2 = encode_datatype(MPI_CURRENT_TYPE2, NULL);
+ extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, nullptr);
+ extra->datatype2 = encode_datatype(MPI_CURRENT_TYPE2, nullptr);
TRACE_smpi_collective_in(rank, -1, __FUNCTION__,extra);
4) 0 is the send datatype id, see decode_datatype()
5) 0 is the recv datatype id, see decode_datatype()
*/
- CHECK_ACTION_PARAMS(action, 2, 3);
+ CHECK_ACTION_PARAMS(action, 2, 3)
double clock = smpi_process_simulated_elapsed();
int comm_size = smpi_comm_size(MPI_COMM_WORLD);
int send_size = parse_double(action[2]);
MPI_CURRENT_TYPE2=MPI_DEFAULT_TYPE;
}
void *send = smpi_get_tmp_sendbuffer(send_size* smpi_datatype_size(MPI_CURRENT_TYPE));
- void *recv = NULL;
+ void *recv = nullptr;
int root=0;
if(action[4])
root=atoi(action[4]);
extra->send_size = send_size;
extra->recv_size = recv_size;
extra->root = root;
- extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, NULL);
- extra->datatype2 = encode_datatype(MPI_CURRENT_TYPE2, NULL);
+ extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, nullptr);
+ extra->datatype2 = encode_datatype(MPI_CURRENT_TYPE2, nullptr);
TRACE_smpi_collective_in(smpi_process_index(), root, __FUNCTION__, extra);
double clock = smpi_process_simulated_elapsed();
int comm_size = smpi_comm_size(MPI_COMM_WORLD);
- CHECK_ACTION_PARAMS(action, comm_size+1, 2);
+ CHECK_ACTION_PARAMS(action, comm_size+1, 2)
int send_size = parse_double(action[2]);
int *disps = xbt_new0(int, comm_size);
int *recvcounts = xbt_new0(int, comm_size);
MPI_CURRENT_TYPE2=MPI_DEFAULT_TYPE;
}
void *send = smpi_get_tmp_sendbuffer(send_size* smpi_datatype_size(MPI_CURRENT_TYPE));
- void *recv = NULL;
+ void *recv = nullptr;
for(i=0;i<comm_size;i++) {
recvcounts[i] = atoi(action[i+3]);
recv_sum=recv_sum+recvcounts[i];
}
int root=atoi(action[3+comm_size]);
- int rank = smpi_comm_rank(MPI_COMM_WORLD);;
+ int rank = smpi_comm_rank(MPI_COMM_WORLD);
if(rank==root)
recv = smpi_get_tmp_recvbuffer(recv_sum* smpi_datatype_size(MPI_CURRENT_TYPE2));
extra->recvcounts[i] = recvcounts[i];
extra->root = root;
extra->num_processes = comm_size;
- extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, NULL);
- extra->datatype2 = encode_datatype(MPI_CURRENT_TYPE2, NULL);
+ extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, nullptr);
+ extra->datatype2 = encode_datatype(MPI_CURRENT_TYPE2, nullptr);
TRACE_smpi_collective_in(smpi_process_index(), root, __FUNCTION__, extra);
We analyze a MPI_Reduce_scatter call to one MPI_Reduce and one MPI_Scatterv. */
double clock = smpi_process_simulated_elapsed();
int comm_size = smpi_comm_size(MPI_COMM_WORLD);
- CHECK_ACTION_PARAMS(action, comm_size+1, 1);
+ CHECK_ACTION_PARAMS(action, comm_size+1, 1)
int comp_size = parse_double(action[2+comm_size]);
int *recvcounts = xbt_new0(int, comm_size);
int *disps = xbt_new0(int, comm_size);
extra->recvcounts= xbt_new(int, comm_size);
for(i=0; i< comm_size; i++)//copy data to avoid bad free
extra->recvcounts[i] = recvcounts[i];
- extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, NULL);
+ extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, nullptr);
extra->comp_size = comp_size;
extra->num_processes = comm_size;
3) No more values mean that the datatype for sent and receive buffer is the default one, see decode_datatype(). */
double clock = smpi_process_simulated_elapsed();
- CHECK_ACTION_PARAMS(action, 2, 2);
+ CHECK_ACTION_PARAMS(action, 2, 2)
int sendcount=atoi(action[2]);
int recvcount=atoi(action[3]);
extra->type = TRACING_ALLGATHER;
extra->send_size = sendcount;
extra->recv_size= recvcount;
- extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, NULL);
- extra->datatype2 = encode_datatype(MPI_CURRENT_TYPE2, NULL);
+ extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, nullptr);
+ extra->datatype2 = encode_datatype(MPI_CURRENT_TYPE2, nullptr);
extra->num_processes = smpi_comm_size(MPI_COMM_WORLD);
TRACE_smpi_collective_in(rank, -1, __FUNCTION__,extra);
double clock = smpi_process_simulated_elapsed();
int comm_size = smpi_comm_size(MPI_COMM_WORLD);
- CHECK_ACTION_PARAMS(action, comm_size+1, 2);
+ CHECK_ACTION_PARAMS(action, comm_size+1, 2)
int i=0;
int sendcount=atoi(action[2]);
int *recvcounts = xbt_new0(int, comm_size);
extra->recvcounts= xbt_new(int, comm_size);
for(i=0; i< comm_size; i++)//copy data to avoid bad free
extra->recvcounts[i] = recvcounts[i];
- extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, NULL);
- extra->datatype2 = encode_datatype(MPI_CURRENT_TYPE2, NULL);
+ extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, nullptr);
+ extra->datatype2 = encode_datatype(MPI_CURRENT_TYPE2, nullptr);
extra->num_processes = comm_size;
TRACE_smpi_collective_in(rank, -1, __FUNCTION__,extra);
double clock = smpi_process_simulated_elapsed();
int comm_size = smpi_comm_size(MPI_COMM_WORLD);
- CHECK_ACTION_PARAMS(action, 2*comm_size+2, 2);
- int send_buf_size=0,recv_buf_size=0,i=0;
+ CHECK_ACTION_PARAMS(action, 2*comm_size+2, 2)
int *sendcounts = xbt_new0(int, comm_size);
int *recvcounts = xbt_new0(int, comm_size);
int *senddisps = xbt_new0(int, comm_size);
MPI_Datatype MPI_CURRENT_TYPE2;
- send_buf_size=parse_double(action[2]);
- recv_buf_size=parse_double(action[3+comm_size]);
+ int send_buf_size=parse_double(action[2]);
+ int recv_buf_size=parse_double(action[3+comm_size]);
if(action[4+2*comm_size] && action[5+2*comm_size]) {
MPI_CURRENT_TYPE=decode_datatype(action[4+2*comm_size]);
MPI_CURRENT_TYPE2=decode_datatype(action[5+2*comm_size]);
void *sendbuf = smpi_get_tmp_sendbuffer(send_buf_size* smpi_datatype_size(MPI_CURRENT_TYPE));
void *recvbuf = smpi_get_tmp_recvbuffer(recv_buf_size* smpi_datatype_size(MPI_CURRENT_TYPE2));
- for(i=0;i<comm_size;i++) {
+ for(int i=0;i<comm_size;i++) {
sendcounts[i] = atoi(action[i+3]);
recvcounts[i] = atoi(action[i+4+comm_size]);
}
extra->sendcounts= xbt_new(int, comm_size);
extra->num_processes = comm_size;
- for(i=0; i< comm_size; i++){//copy data to avoid bad free
+ for(int i=0; i< comm_size; i++){//copy data to avoid bad free
extra->send_size += sendcounts[i];
extra->sendcounts[i] = sendcounts[i];
extra->recv_size += recvcounts[i];
extra->recvcounts[i] = recvcounts[i];
}
- extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, NULL);
- extra->datatype2 = encode_datatype(MPI_CURRENT_TYPE2, NULL);
+ extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE, nullptr);
+ extra->datatype2 = encode_datatype(MPI_CURRENT_TYPE2, nullptr);
TRACE_smpi_collective_in(rank, -1, __FUNCTION__,extra);
/* First initializes everything */
smpi_process_init(argc, argv);
smpi_process_mark_as_initialized();
- smpi_process_set_replaying(1);
+ smpi_process_set_replaying(true);
int rank = smpi_process_index();
TRACE_smpi_init(rank);
char *operation =bprintf("%s_init",__FUNCTION__);
TRACE_smpi_collective_in(rank, -1, operation, extra);
TRACE_smpi_collective_out(rank, -1, operation);
- free(operation);
+ xbt_free(operation);
- if (!_xbt_replay_action_init()) {
+ if (_xbt_replay_action_init()==0) {
xbt_replay_action_register("init", action_init);
xbt_replay_action_register("finalize", action_finalize);
xbt_replay_action_register("comm_size", action_comm_size);
/* and now, finalize everything */
double sim_time= 1.;
/* One active process will stop. Decrease the counter*/
- XBT_DEBUG("There are %lu elements in reqq[*]", xbt_dynar_length(get_reqq_self()));
- if (!xbt_dynar_is_empty(get_reqq_self())){
- int count_requests=xbt_dynar_length(get_reqq_self());
+ XBT_DEBUG("There are %zu elements in reqq[*]", get_reqq_self()->size());
+ if (!get_reqq_self()->empty()){
+ unsigned int count_requests=get_reqq_self()->size();
MPI_Request requests[count_requests];
MPI_Status status[count_requests];
- unsigned int i;
+ unsigned int i=0;
- xbt_dynar_foreach(get_reqq_self(),i,requests[i]);
+ for (auto req: *get_reqq_self()){
+ requests[i] = req;
+ i++;
+ }
smpi_mpi_waitall(count_requests, requests, status);
active_processes--;
} else {
active_processes--;
}
- if(!active_processes){
+ if(active_processes==0){
/* Last process alive speaking */
/* end the simulated timer */
sim_time = smpi_process_simulated_elapsed();
- }
-
- //TODO xbt_dynar_free_container(get_reqq_self()));
-
- if(!active_processes){
XBT_INFO("Simulation time %f", sim_time);
_xbt_replay_action_exit();
xbt_free(sendbuffer);
xbt_free(recvbuffer);
- //xbt_free(reqq);
- xbt_dict_free(&reqq); //not need, data have been freed ???
- reqq = NULL;
}
instr_extra_data extra_fin = xbt_new0(s_instr_extra_data_t,1);
TRACE_smpi_collective_out(rank, -1, operation);
TRACE_smpi_finalize(smpi_process_index());
smpi_process_destroy();
- free(operation);
+ xbt_free(operation);
}