X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e993852fadf35937e44a7b37eaecad48588b5a2e..ab1a94e98438ed2d29533aca9e613d667237c3d0:/src/smpi/smpi_replay.cpp diff --git a/src/smpi/smpi_replay.cpp b/src/smpi/smpi_replay.cpp index 1024d3decb..08e9998dad 100644 --- a/src/smpi/smpi_replay.cpp +++ b/src/smpi/smpi_replay.cpp @@ -15,30 +15,29 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_replay,smpi,"Trace Replay with SMPI"); int communicator_size = 0; static int active_processes = 0; -xbt_dict_t reqq = NULL; +xbt_dict_t reqq = nullptr; 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() { char * key = bprintf("%d", smpi_process_index()); - xbt_dynar_t dynar_mpi_request = (xbt_dynar_t) xbt_dict_get(reqq, key); - free(key); + xbt_dynar_t dynar_mpi_request = static_cast(xbt_dict_get(reqq, key)); + xbt_free(key); return dynar_mpi_request; } @@ -47,10 +46,9 @@ static void set_reqq_self(xbt_dynar_t mpi_request) { char * key = bprintf("%d", smpi_process_index()); xbt_dict_set(reqq, key, mpi_request, free); - free(key); + xbt_free(key); } - //allocate a single buffer for all sends, growing it if needed void* smpi_get_tmp_sendbuffer(int size) { @@ -62,6 +60,7 @@ void* smpi_get_tmp_sendbuffer(int size) } return sendbuffer; } + //allocate a single buffer for all recv void* smpi_get_tmp_recvbuffer(int size){ if (!smpi_process_get_replaying()) @@ -92,9 +91,7 @@ static double parse_double(const char *string) static MPI_Datatype decode_datatype(const char *const action) { // Declared datatypes, - - switch(atoi(action)) - { + switch(atoi(action)) { case 0: MPI_CURRENT_TYPE=MPI_DOUBLE; break; @@ -118,7 +115,6 @@ static MPI_Datatype decode_datatype(const char *const action) break; default: MPI_CURRENT_TYPE=MPI_DEFAULT_TYPE; - } return MPI_CURRENT_TYPE; } @@ -126,10 +122,10 @@ static MPI_Datatype decode_datatype(const char *const action) const char* encode_datatype(MPI_Datatype datatype, int* known) { - //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 ""; } @@ -146,7 +142,8 @@ const char* encode_datatype(MPI_Datatype datatype, int* known) 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"; @@ -154,7 +151,7 @@ const char* encode_datatype(MPI_Datatype datatype, int* known) #define CHECK_ACTION_PARAMS(action, mandatory, optional) {\ int i=0;\ - while(action[i]!=NULL)\ + while(action[i]!=nullptr)\ i++;\ if(isend_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)); } - 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); @@ -271,14 +259,16 @@ static void action_send(const char *const *action) 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); @@ -287,13 +277,13 @@ static void action_Isend(const char *const *action) 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)); } - 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; @@ -304,14 +294,16 @@ static void action_Isend(const char *const *action) } 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); @@ -321,16 +313,16 @@ static void action_recv(const char *const *action) { 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){ + 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()) { @@ -342,14 +334,16 @@ static void action_recv(const char *const *action) { 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); @@ -358,16 +352,16 @@ static void action_Irecv(const char *const *action) 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; @@ -377,17 +371,17 @@ static void action_Irecv(const char *const *action) } 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; + int flag = true; request = xbt_dynar_pop_as(get_reqq_self(),MPI_Request); //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; @@ -396,9 +390,7 @@ static void action_test(const char *const *action){ 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. - */ + /* push back request in dynar to be caught by a subsequent wait. if the test did succeed, the request is now nullptr.*/ xbt_dynar_push_as(get_reqq_self(),MPI_Request, request); TRACE_smpi_testing_out(rank); @@ -407,7 +399,7 @@ static void action_test(const char *const *action){ } 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; @@ -417,16 +409,12 @@ static void action_wait(const char *const *action){ xbt_str_join_array(action," ")); request = xbt_dynar_pop_as(get_reqq_self(),MPI_Request); - if (!request){ - /* Assuming that the trace is well formed, this mean the comm might have - * been caught by a MPI_test. Then just return. - */ + 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; } - int rank = request->comm != MPI_COMM_NULL - ? smpi_comm_rank(request->comm) - : -1; + int rank = request->comm != MPI_COMM_NULL ? smpi_comm_rank(request->comm) : -1; MPI_Group group = smpi_comm_group(request->comm); int src_traced = smpi_group_rank(group, request->src); @@ -445,7 +433,7 @@ static void action_wait(const char *const *action){ } 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; @@ -461,11 +449,10 @@ static void action_waitall(const char *const *action){ 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++) { + xbt_dynar_t srcs = xbt_dynar_new(sizeof(int), nullptr); + xbt_dynar_t dsts = xbt_dynar_new(sizeof(int), nullptr); + xbt_dynar_t recvs = xbt_dynar_new(sizeof(int), nullptr); + for (i = 0; static_cast(i) < count_requests; i++) { if(requests[i]){ int *asrc = xbt_new(int, 1); int *adst = xbt_new(int, 1); @@ -495,7 +482,7 @@ static void action_waitall(const char *const *action){ smpi_mpi_waitall(count_requests, requests, status); - for (i = 0; (int)i < count_requests; i++) { + for (i = 0; static_cast(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); @@ -509,8 +496,6 @@ static void action_waitall(const char *const *action){ 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); @@ -529,17 +514,13 @@ static void action_barrier(const char *const *action){ 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; - /* - * Initialize MPI_CURRENT_TYPE in order to decrease - * the number of the checks - * */ + /* Initialize MPI_CURRENT_TYPE in order to decrease the number of the checks */ MPI_CURRENT_TYPE= MPI_DEFAULT_TYPE; if(action[3]) { @@ -556,7 +537,7 @@ static void action_bcast(const char *const *action) 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)); @@ -568,7 +549,7 @@ static void action_bcast(const char *const *action) 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(); @@ -581,8 +562,6 @@ static void action_reduce(const char *const *action) MPI_CURRENT_TYPE=decode_datatype(action[5]); } } - - int rank = smpi_process_index(); int root_traced = smpi_group_rank(smpi_comm_group(MPI_COMM_WORLD), root); @@ -590,27 +569,29 @@ static void action_reduce(const char *const *action) 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); void *recvbuf = smpi_get_tmp_sendbuffer(comm_size* smpi_datatype_size(MPI_CURRENT_TYPE)); void *sendbuf = smpi_get_tmp_sendbuffer(comm_size* smpi_datatype_size(MPI_CURRENT_TYPE)); - mpi_coll_reduce_fun(sendbuf, recvbuf, comm_size, MPI_CURRENT_TYPE, MPI_OP_NULL, root, MPI_COMM_WORLD); - smpi_execute_flops(comp_size); + mpi_coll_reduce_fun(sendbuf, recvbuf, comm_size, MPI_CURRENT_TYPE, MPI_OP_NULL, root, MPI_COMM_WORLD); + smpi_execute_flops(comp_size); TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__); log_timed_action (action, clock); } 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(); @@ -618,7 +599,7 @@ static void action_allReduce(const char *const *action) { 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)); @@ -631,7 +612,7 @@ static void action_allReduce(const char *const *action) { } 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); @@ -656,8 +637,8 @@ static void action_allToAll(const char *const *action) { 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); @@ -667,11 +648,8 @@ static void action_allToAll(const char *const *action) { log_timed_action (action, clock); } - static void action_gather(const char *const *action) { - /* - The structure of the gather action for the rank 0 (total 4 processes) - is the following: + /* The structure of the gather action for the rank 0 (total 4 processes) is the following: 0 gather 68 68 0 0 0 where: @@ -681,7 +659,7 @@ static void action_gather(const char *const *action) { 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]); @@ -695,7 +673,7 @@ static void action_gather(const char *const *action) { 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]); @@ -709,25 +687,19 @@ static void action_gather(const char *const *action) { 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); - mpi_coll_gather_fun(send, send_size, MPI_CURRENT_TYPE, - recv, recv_size, MPI_CURRENT_TYPE2, - root, MPI_COMM_WORLD); + mpi_coll_gather_fun(send, send_size, MPI_CURRENT_TYPE, recv, recv_size, MPI_CURRENT_TYPE2, root, MPI_COMM_WORLD); TRACE_smpi_collective_out(smpi_process_index(), -1, __FUNCTION__); log_timed_action (action, clock); } - - static void action_gatherv(const char *const *action) { - /* - The structure of the gatherv action for the rank 0 (total 4 processes) - is the following: + /* The structure of the gatherv action for the rank 0 (total 4 processes) is the following: 0 gather 68 68 10 10 10 0 0 0 where: @@ -740,7 +712,7 @@ static void action_gatherv(const char *const *action) { 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); @@ -755,7 +727,7 @@ static void action_gatherv(const char *const *action) { 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;irecvcounts[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); - smpi_mpi_gatherv(send, send_size, MPI_CURRENT_TYPE, - recv, recvcounts, disps, MPI_CURRENT_TYPE2, - root, MPI_COMM_WORLD); + smpi_mpi_gatherv(send, send_size, MPI_CURRENT_TYPE, recv, recvcounts, disps, MPI_CURRENT_TYPE2, root, MPI_COMM_WORLD); TRACE_smpi_collective_out(smpi_process_index(), -1, __FUNCTION__); log_timed_action (action, clock); @@ -792,10 +762,7 @@ static void action_gatherv(const char *const *action) { } static void action_reducescatter(const char *const *action) { - - /* - The structure of the reducescatter action for the rank 0 (total 4 processes) - is the following: + /* The structure of the reducescatter action for the rank 0 (total 4 processes) is the following: 0 reduceScatter 275427 275427 275427 204020 11346849 0 where: @@ -803,13 +770,10 @@ static void action_reducescatter(const char *const *action) { 2) The value 11346849 is the amount of instructions 3) The last value corresponds to the datatype, see decode_datatype(). - We analyze a MPI_Reduce_scatter call to one MPI_Reduce and one MPI_Scatterv. - - */ - + 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); @@ -833,7 +797,7 @@ static void action_reducescatter(const char *const *action) { 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; @@ -842,11 +806,9 @@ static void action_reducescatter(const char *const *action) { void *sendbuf = smpi_get_tmp_sendbuffer(size* smpi_datatype_size(MPI_CURRENT_TYPE)); void *recvbuf = smpi_get_tmp_recvbuffer(size* smpi_datatype_size(MPI_CURRENT_TYPE)); - mpi_coll_reduce_scatter_fun(sendbuf, recvbuf, recvcounts, MPI_CURRENT_TYPE, MPI_OP_NULL, - MPI_COMM_WORLD); + mpi_coll_reduce_scatter_fun(sendbuf, recvbuf, recvcounts, MPI_CURRENT_TYPE, MPI_OP_NULL, MPI_COMM_WORLD); smpi_execute_flops(comp_size); - TRACE_smpi_collective_out(rank, -1, __FUNCTION__); xbt_free(recvcounts); xbt_free(disps); @@ -854,22 +816,16 @@ static void action_reducescatter(const char *const *action) { } static void action_allgather(const char *const *action) { - /* - The structure of the allgather action for the rank 0 (total 4 processes) - is the following: + /* The structure of the allgather action for the rank 0 (total 4 processes) is the following: 0 allGather 275427 275427 where: 1) 275427 is the sendcount 2) 275427 is the recvcount - 3) No more values mean that the datatype for sent and receive buffer - is the default one, see decode_datatype(). - - */ - + 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]); @@ -880,7 +836,7 @@ static void action_allgather(const char *const *action) { MPI_CURRENT_TYPE2 = decode_datatype(action[5]); } else { MPI_CURRENT_TYPE = MPI_DEFAULT_TYPE; - MPI_CURRENT_TYPE2 = MPI_DEFAULT_TYPE; + MPI_CURRENT_TYPE2 = MPI_DEFAULT_TYPE; } void *sendbuf = smpi_get_tmp_sendbuffer(sendcount* smpi_datatype_size(MPI_CURRENT_TYPE)); void *recvbuf = smpi_get_tmp_recvbuffer(recvcount* smpi_datatype_size(MPI_CURRENT_TYPE2)); @@ -890,8 +846,8 @@ static void action_allgather(const char *const *action) { 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); @@ -903,24 +859,18 @@ static void action_allgather(const char *const *action) { } static void action_allgatherv(const char *const *action) { - - /* - The structure of the allgatherv action for the rank 0 (total 4 processes) - is the following: + /* The structure of the allgatherv action for the rank 0 (total 4 processes) is the following: 0 allGatherV 275427 275427 275427 275427 204020 where: 1) 275427 is the sendcount 2) The next four elements declare the recvcounts array 3) No more values mean that the datatype for sent and receive buffer - is the default one, see decode_datatype(). - - */ - + is the default one, see decode_datatype(). */ 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); @@ -950,13 +900,14 @@ static void action_allgatherv(const char *const *action) { 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); - mpi_coll_allgatherv_fun(sendbuf, sendcount, MPI_CURRENT_TYPE, recvbuf, recvcounts, disps, MPI_CURRENT_TYPE2, MPI_COMM_WORLD); + mpi_coll_allgatherv_fun(sendbuf, sendcount, MPI_CURRENT_TYPE, recvbuf, recvcounts, disps, MPI_CURRENT_TYPE2, + MPI_COMM_WORLD); TRACE_smpi_collective_out(rank, -1, __FUNCTION__); log_timed_action (action, clock); @@ -965,24 +916,18 @@ static void action_allgatherv(const char *const *action) { } static void action_allToAllv(const char *const *action) { - /* - The structure of the allToAllV action for the rank 0 (total 4 processes) - is the following: + /* The structure of the allToAllV action for the rank 0 (total 4 processes) is the following: 0 allToAllV 100 1 7 10 12 100 1 70 10 5 where: 1) 100 is the size of the send buffer *sizeof(int), 2) 1 7 10 12 is the sendcounts array 3) 100*sizeof(int) is the size of the receiver buffer - 4) 1 70 10 5 is the recvcounts array - - */ - - + 4) 1 70 10 5 is the recvcounts array */ double clock = smpi_process_simulated_elapsed(); int comm_size = smpi_comm_size(MPI_COMM_WORLD); - CHECK_ACTION_PARAMS(action, 2*comm_size+2, 2); + CHECK_ACTION_PARAMS(action, 2*comm_size+2, 2) int send_buf_size=0,recv_buf_size=0,i=0; int *sendcounts = xbt_new0(int, comm_size); int *recvcounts = xbt_new0(int, comm_size); @@ -1010,7 +955,6 @@ static void action_allToAllv(const char *const *action) { recvcounts[i] = atoi(action[i+4+comm_size]); } - int rank = smpi_process_index(); instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); extra->type = TRACING_ALLTOALLV; @@ -1024,14 +968,13 @@ static void action_allToAllv(const char *const *action) { 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); - mpi_coll_alltoallv_fun(sendbuf, sendcounts, senddisps, MPI_CURRENT_TYPE, - recvbuf, recvcounts, recvdisps, MPI_CURRENT_TYPE, - MPI_COMM_WORLD); + mpi_coll_alltoallv_fun(sendbuf, sendcounts, senddisps, MPI_CURRENT_TYPE,recvbuf, recvcounts, recvdisps, + MPI_CURRENT_TYPE, MPI_COMM_WORLD); TRACE_smpi_collective_out(rank, -1, __FUNCTION__); log_timed_action (action, clock); @@ -1045,7 +988,7 @@ void smpi_replay_run(int *argc, char***argv){ /* 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); @@ -1055,9 +998,9 @@ void smpi_replay_run(int *argc, char***argv){ 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); @@ -1083,7 +1026,7 @@ void smpi_replay_run(int *argc, char***argv){ xbt_replay_action_register("reduceScatter", action_reducescatter); xbt_replay_action_register("compute", action_compute); } - + //if we have a delayed start, sleep here. if(*argc>2){ char *endptr; @@ -1097,16 +1040,15 @@ void smpi_replay_run(int *argc, char***argv){ XBT_DEBUG("Force context switch by smpi_execute_flops - Sleeping for 0.0 flops "); smpi_execute_flops(0.0); } - + /* Actually run the replay */ xbt_replay_action_runner(*argc, *argv); /* 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())){ + XBT_DEBUG("There are %lu elements in reqq[*]", xbt_dynar_length(get_reqq_self())); + if (xbt_dynar_is_empty(get_reqq_self())==0){ int count_requests=xbt_dynar_length(get_reqq_self()); MPI_Request requests[count_requests]; MPI_Status status[count_requests]; @@ -1119,25 +1061,18 @@ void smpi_replay_run(int *argc, char***argv){ 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; + reqq = nullptr; } - + instr_extra_data extra_fin = xbt_new0(s_instr_extra_data_t,1); extra_fin->type = TRACING_FINALIZE; operation =bprintf("%s_finalize",__FUNCTION__); @@ -1148,5 +1083,5 @@ void smpi_replay_run(int *argc, char***argv){ TRACE_smpi_collective_out(rank, -1, operation); TRACE_smpi_finalize(smpi_process_index()); smpi_process_destroy(); - free(operation); + xbt_free(operation); }