X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ec1ff601331bbc2a69a3d7501f468e2238be2a5e..1f32679abc2f9c0cae9e27951b643a0f70d71b3a:/src/smpi/smpi_pmpi.cpp diff --git a/src/smpi/smpi_pmpi.cpp b/src/smpi/smpi_pmpi.cpp index 729c51a3fd..62ca0f186c 100644 --- a/src/smpi/smpi_pmpi.cpp +++ b/src/smpi/smpi_pmpi.cpp @@ -1,10 +1,11 @@ - -/* Copyright (c) 2007-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2007-2016. 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. */ +#include +#include + #include "private.h" #include "smpi_mpi_dt_private.h" @@ -27,7 +28,7 @@ int PMPI_Init(int *argc, char ***argv) // PMPI_Init is call only one time by only by SMPI process int already_init; MPI_Initialized(&already_init); - if(!(already_init)){ + if(already_init == 0){ smpi_process_init(argc, argv); smpi_process_mark_as_initialized(); int rank = smpi_process_index(); @@ -39,10 +40,13 @@ int PMPI_Init(int *argc, char ***argv) TRACE_smpi_collective_out(rank, -1, __FUNCTION__); smpi_bench_begin(); } + + smpi_mpi_init(); + return MPI_SUCCESS; } -int PMPI_Finalize(void) +int PMPI_Finalize() { smpi_bench_end(); int rank = smpi_process_index(); @@ -82,7 +86,7 @@ int PMPI_Get_library_version (char *version,int *len){ int PMPI_Init_thread(int *argc, char ***argv, int required, int *provided) { - if (provided != NULL) { + if (provided != nullptr) { *provided = MPI_THREAD_SINGLE; } return MPI_Init(argc, argv); @@ -92,7 +96,7 @@ int PMPI_Query_thread(int *provided) { int retval = 0; - if (provided == NULL) { + if (provided == nullptr) { retval = MPI_ERR_ARG; } else { *provided = MPI_THREAD_SINGLE; @@ -105,7 +109,7 @@ int PMPI_Is_thread_main(int *flag) { int retval = 0; - if (flag == NULL) { + if (flag == nullptr) { retval = MPI_ERR_ARG; } else { *flag = smpi_process_index() == 0; @@ -123,13 +127,13 @@ int PMPI_Abort(MPI_Comm comm, int errorcode) return MPI_SUCCESS; } -double PMPI_Wtime(void) +double PMPI_Wtime() { return smpi_mpi_wtime(); } extern double sg_maxmin_precision; -double PMPI_Wtick(void) +double PMPI_Wtick() { return sg_maxmin_precision; } @@ -138,10 +142,10 @@ int PMPI_Address(void *location, MPI_Aint * address) { int retval = 0; - if (!address) { + if (address==nullptr) { retval = MPI_ERR_ARG; } else { - *address = (MPI_Aint) location; + *address = reinterpret_cast(location); retval = MPI_SUCCESS; } return retval; @@ -171,10 +175,25 @@ int PMPI_Type_size(MPI_Datatype datatype, int *size) if (datatype == MPI_DATATYPE_NULL) { retval = MPI_ERR_TYPE; - } else if (size == NULL) { + } else if (size == nullptr) { + retval = MPI_ERR_ARG; + } else { + *size = static_cast(smpi_datatype_size(datatype)); + retval = MPI_SUCCESS; + } + return retval; +} + +int PMPI_Type_size_x(MPI_Datatype datatype, MPI_Count *size) +{ + int retval = 0; + + if (datatype == MPI_DATATYPE_NULL) { + retval = MPI_ERR_TYPE; + } else if (size == nullptr) { retval = MPI_ERR_ARG; } else { - *size = (int) smpi_datatype_size(datatype); + *size = static_cast(smpi_datatype_size(datatype)); retval = MPI_SUCCESS; } return retval; @@ -186,7 +205,7 @@ int PMPI_Type_get_extent(MPI_Datatype datatype, MPI_Aint * lb, MPI_Aint * extent if (datatype == MPI_DATATYPE_NULL) { retval = MPI_ERR_TYPE; - } else if (lb == NULL || extent == NULL) { + } else if (lb == nullptr || extent == nullptr) { retval = MPI_ERR_ARG; } else { retval = smpi_datatype_extent(datatype, lb, extent); @@ -205,7 +224,7 @@ int PMPI_Type_extent(MPI_Datatype datatype, MPI_Aint * extent) if (datatype == MPI_DATATYPE_NULL) { retval = MPI_ERR_TYPE; - } else if (extent == NULL) { + } else if (extent == nullptr) { retval = MPI_ERR_ARG; } else { *extent = smpi_datatype_get_extent(datatype); @@ -220,7 +239,7 @@ int PMPI_Type_lb(MPI_Datatype datatype, MPI_Aint * disp) if (datatype == MPI_DATATYPE_NULL) { retval = MPI_ERR_TYPE; - } else if (disp == NULL) { + } else if (disp == nullptr) { retval = MPI_ERR_ARG; } else { *disp = smpi_datatype_lb(datatype); @@ -235,7 +254,7 @@ int PMPI_Type_ub(MPI_Datatype datatype, MPI_Aint * disp) if (datatype == MPI_DATATYPE_NULL) { retval = MPI_ERR_TYPE; - } else if (disp == NULL) { + } else if (disp == nullptr) { retval = MPI_ERR_ARG; } else { *disp = smpi_datatype_ub(datatype); @@ -259,10 +278,10 @@ int PMPI_Op_create(MPI_User_function * function, int commute, MPI_Op * op) { int retval = 0; - if (function == NULL || op == NULL) { + if (function == nullptr || op == nullptr) { retval = MPI_ERR_ARG; } else { - *op = smpi_op_new(function, commute); + *op = smpi_op_new(function, (commute!=0)); retval = MPI_SUCCESS; } return retval; @@ -272,7 +291,7 @@ int PMPI_Op_free(MPI_Op * op) { int retval = 0; - if (op == NULL) { + if (op == nullptr) { retval = MPI_ERR_ARG; } else if (*op == MPI_OP_NULL) { retval = MPI_ERR_OP; @@ -288,7 +307,7 @@ int PMPI_Group_free(MPI_Group * group) { int retval = 0; - if (group == NULL) { + if (group == nullptr) { retval = MPI_ERR_ARG; } else { smpi_group_destroy(*group); @@ -304,7 +323,7 @@ int PMPI_Group_size(MPI_Group group, int *size) if (group == MPI_GROUP_NULL) { retval = MPI_ERR_GROUP; - } else if (size == NULL) { + } else if (size == nullptr) { retval = MPI_ERR_ARG; } else { *size = smpi_group_size(group); @@ -319,7 +338,7 @@ int PMPI_Group_rank(MPI_Group group, int *rank) if (group == MPI_GROUP_NULL) { retval = MPI_ERR_GROUP; - } else if (rank == NULL) { + } else if (rank == nullptr) { retval = MPI_ERR_ARG; } else { *rank = smpi_group_rank(group, smpi_process_index()); @@ -353,7 +372,7 @@ int PMPI_Group_compare(MPI_Group group1, MPI_Group group2, int *result) if (group1 == MPI_GROUP_NULL || group2 == MPI_GROUP_NULL) { retval = MPI_ERR_GROUP; - } else if (result == NULL) { + } else if (result == nullptr) { retval = MPI_ERR_ARG; } else { *result = smpi_group_compare(group1, group2); @@ -368,7 +387,7 @@ int PMPI_Group_union(MPI_Group group1, MPI_Group group2, MPI_Group * newgroup) if (group1 == MPI_GROUP_NULL || group2 == MPI_GROUP_NULL) { retval = MPI_ERR_GROUP; - } else if (newgroup == NULL) { + } else if (newgroup == nullptr) { retval = MPI_ERR_ARG; } else { size = smpi_group_size(group1); @@ -405,7 +424,7 @@ int PMPI_Group_intersection(MPI_Group group1, MPI_Group group2, MPI_Group * newg if (group1 == MPI_GROUP_NULL || group2 == MPI_GROUP_NULL) { retval = MPI_ERR_GROUP; - } else if (newgroup == NULL) { + } else if (newgroup == nullptr) { retval = MPI_ERR_ARG; } else { size = smpi_group_size(group2); @@ -441,10 +460,11 @@ int PMPI_Group_difference(MPI_Group group1, MPI_Group group2, MPI_Group * newgro if (group1 == MPI_GROUP_NULL || group2 == MPI_GROUP_NULL) { retval = MPI_ERR_GROUP; - } else if (newgroup == NULL) { + } else if (newgroup == nullptr) { retval = MPI_ERR_ARG; } else { - size = size2 = smpi_group_size(group1); + size = smpi_group_size(group1); + size2 = size; for (i = 0; i < size2; i++) { proc1 = smpi_group_index(group1, i); proc2 = smpi_group_rank(group2, proc1); @@ -475,7 +495,7 @@ int PMPI_Group_incl(MPI_Group group, int n, int *ranks, MPI_Group * newgroup) if (group == MPI_GROUP_NULL) { retval = MPI_ERR_GROUP; - } else if (newgroup == NULL) { + } else if (newgroup == nullptr) { retval = MPI_ERR_ARG; } else { retval = smpi_group_incl(group, n, ranks, newgroup); @@ -489,12 +509,12 @@ int PMPI_Group_excl(MPI_Group group, int n, int *ranks, MPI_Group * newgroup) if (group == MPI_GROUP_NULL) { retval = MPI_ERR_GROUP; - } else if (newgroup == NULL) { + } else if (newgroup == nullptr) { retval = MPI_ERR_ARG; } else { if (n == 0) { *newgroup = group; - if(group!= smpi_comm_group(MPI_COMM_WORLD) && group != MPI_GROUP_NULL + if (group != smpi_comm_group(MPI_COMM_WORLD) && group != smpi_comm_group(MPI_COMM_SELF) && group != MPI_GROUP_EMPTY) smpi_group_use(group); } else if (n == smpi_group_size(group)) { @@ -532,7 +552,7 @@ int PMPI_Group_range_incl(MPI_Group group, int n, int ranges[][3], MPI_Group * n if (group == MPI_GROUP_NULL) { retval = MPI_ERR_GROUP; - } else if (newgroup == NULL) { + } else if (newgroup == nullptr) { retval = MPI_ERR_ARG; } else { if (n == 0) { @@ -592,12 +612,12 @@ int PMPI_Group_range_excl(MPI_Group group, int n, int ranges[][3], MPI_Group * n if (group == MPI_GROUP_NULL) { retval = MPI_ERR_GROUP; - } else if (newgroup == NULL) { + } else if (newgroup == nullptr) { retval = MPI_ERR_ARG; } else { if (n == 0) { *newgroup = group; - if(group!= smpi_comm_group(MPI_COMM_WORLD) && group != MPI_GROUP_NULL + if (group!= smpi_comm_group(MPI_COMM_WORLD) && group != smpi_comm_group(MPI_COMM_SELF) && group != MPI_GROUP_EMPTY) smpi_group_use(group); } else { @@ -669,7 +689,7 @@ int PMPI_Comm_rank(MPI_Comm comm, int *rank) int retval = 0; if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; - } else if (rank == NULL) { + } else if (rank == nullptr) { retval = MPI_ERR_ARG; } else { *rank = smpi_comm_rank(comm); @@ -683,7 +703,7 @@ int PMPI_Comm_size(MPI_Comm comm, int *size) int retval = 0; if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; - } else if (size == NULL) { + } else if (size == nullptr) { retval = MPI_ERR_ARG; } else { *size = smpi_comm_size(comm); @@ -698,7 +718,7 @@ int PMPI_Comm_get_name (MPI_Comm comm, char* name, int* len) if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; - } else if (name == NULL || len == NULL) { + } else if (name == nullptr || len == nullptr) { retval = MPI_ERR_ARG; } else { smpi_comm_get_name(comm, name, len); @@ -713,7 +733,7 @@ int PMPI_Comm_group(MPI_Comm comm, MPI_Group * group) if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; - } else if (group == NULL) { + } else if (group == nullptr) { retval = MPI_ERR_ARG; } else { *group = smpi_comm_group(comm); @@ -731,7 +751,7 @@ int PMPI_Comm_compare(MPI_Comm comm1, MPI_Comm comm2, int *result) if (comm1 == MPI_COMM_NULL || comm2 == MPI_COMM_NULL) { retval = MPI_ERR_COMM; - } else if (result == NULL) { + } else if (result == nullptr) { retval = MPI_ERR_ARG; } else { if (comm1 == comm2) { /* Same communicators means same groups */ @@ -753,7 +773,7 @@ int PMPI_Comm_dup(MPI_Comm comm, MPI_Comm * newcomm) if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; - } else if (newcomm == NULL) { + } else if (newcomm == nullptr) { retval = MPI_ERR_ARG; } else { retval = smpi_comm_dup(comm, newcomm); @@ -769,14 +789,14 @@ int PMPI_Comm_create(MPI_Comm comm, MPI_Group group, MPI_Comm * newcomm) retval = MPI_ERR_COMM; } else if (group == MPI_GROUP_NULL) { retval = MPI_ERR_GROUP; - } else if (newcomm == NULL) { + } else if (newcomm == nullptr) { retval = MPI_ERR_ARG; } else if(smpi_group_rank(group,smpi_process_index())==MPI_UNDEFINED){ *newcomm= MPI_COMM_NULL; retval = MPI_SUCCESS; }else{ smpi_group_use(group); - *newcomm = smpi_comm_new(group, NULL); + *newcomm = smpi_comm_new(group, nullptr); retval = MPI_SUCCESS; } return retval; @@ -786,7 +806,7 @@ int PMPI_Comm_free(MPI_Comm * comm) { int retval = 0; - if (comm == NULL) { + if (comm == nullptr) { retval = MPI_ERR_ARG; } else if (*comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; @@ -803,7 +823,7 @@ int PMPI_Comm_disconnect(MPI_Comm * comm) /* TODO: wait until all communication in comm are done */ int retval = 0; - if (comm == NULL) { + if (comm == nullptr) { retval = MPI_ERR_ARG; } else if (*comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; @@ -820,7 +840,7 @@ int PMPI_Comm_split(MPI_Comm comm, int color, int key, MPI_Comm* comm_out) int retval = 0; smpi_bench_end(); - if (comm_out == NULL) { + if (comm_out == nullptr) { retval = MPI_ERR_ARG; } else if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; @@ -838,7 +858,7 @@ int PMPI_Send_init(void *buf, int count, MPI_Datatype datatype, int dst, int tag int retval = 0; smpi_bench_end(); - if (request == NULL) { + if (request == nullptr) { retval = MPI_ERR_ARG; } else if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; @@ -851,7 +871,7 @@ int PMPI_Send_init(void *buf, int count, MPI_Datatype datatype, int dst, int tag retval = MPI_SUCCESS; } smpi_bench_begin(); - if (retval != MPI_SUCCESS && request) + if (retval != MPI_SUCCESS && request != nullptr) *request = MPI_REQUEST_NULL; return retval; } @@ -861,7 +881,7 @@ int PMPI_Recv_init(void *buf, int count, MPI_Datatype datatype, int src, int tag int retval = 0; smpi_bench_end(); - if (request == NULL) { + if (request == nullptr) { retval = MPI_ERR_ARG; } else if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; @@ -874,7 +894,7 @@ int PMPI_Recv_init(void *buf, int count, MPI_Datatype datatype, int src, int tag retval = MPI_SUCCESS; } smpi_bench_begin(); - if (retval != MPI_SUCCESS && request) + if (retval != MPI_SUCCESS && request != nullptr) *request = MPI_REQUEST_NULL; return retval; } @@ -884,7 +904,7 @@ int PMPI_Ssend_init(void* buf, int count, MPI_Datatype datatype, int dst, int ta int retval = 0; smpi_bench_end(); - if (request == NULL) { + if (request == nullptr) { retval = MPI_ERR_ARG; } else if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; @@ -897,7 +917,7 @@ int PMPI_Ssend_init(void* buf, int count, MPI_Datatype datatype, int dst, int ta retval = MPI_SUCCESS; } smpi_bench_begin(); - if (retval != MPI_SUCCESS && request) + if (retval != MPI_SUCCESS && request != nullptr) *request = MPI_REQUEST_NULL; return retval; } @@ -907,7 +927,7 @@ int PMPI_Start(MPI_Request * request) int retval = 0; smpi_bench_end(); - if (request == NULL || *request == MPI_REQUEST_NULL) { + if (request == nullptr || *request == MPI_REQUEST_NULL) { retval = MPI_ERR_REQUEST; } else { smpi_mpi_start(*request); @@ -922,7 +942,7 @@ int PMPI_Startall(int count, MPI_Request * requests) int retval; int i = 0; smpi_bench_end(); - if (requests == NULL) { + if (requests == nullptr) { retval = MPI_ERR_ARG; } else { retval = MPI_SUCCESS; @@ -960,7 +980,7 @@ int PMPI_Irecv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MP smpi_bench_end(); - if (request == NULL) { + if (request == nullptr) { retval = MPI_ERR_ARG; } else if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; @@ -969,9 +989,7 @@ int PMPI_Irecv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MP retval = MPI_SUCCESS; } else if (src!=MPI_ANY_SOURCE && (src >= smpi_group_size(smpi_comm_group(comm)) || src <0)){ retval = MPI_ERR_RANK; - } else if (count < 0) { - retval = MPI_ERR_COUNT; - } else if (buf==NULL && count > 0) { + } else if ((count < 0) || (buf==nullptr && count > 0)) { retval = MPI_ERR_COUNT; } else if (!is_datatype_valid(datatype)) { retval = MPI_ERR_TYPE; @@ -989,7 +1007,7 @@ int PMPI_Irecv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MP int known=0; extra->datatype1 = encode_datatype(datatype, &known); int dt_size_send = 1; - if(!known) + if(known==0) dt_size_send = smpi_datatype_size(datatype); extra->send_size = count*dt_size_send; TRACE_smpi_ptp_in(rank, src_traced, rank, __FUNCTION__, extra); @@ -1002,7 +1020,7 @@ int PMPI_Irecv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MP } smpi_bench_begin(); - if (retval != MPI_SUCCESS && request) + if (retval != MPI_SUCCESS && request != nullptr) *request = MPI_REQUEST_NULL; return retval; } @@ -1013,7 +1031,7 @@ int PMPI_Isend(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MP int retval = 0; smpi_bench_end(); - if (request == NULL) { + if (request == nullptr) { retval = MPI_ERR_ARG; } else if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; @@ -1022,9 +1040,7 @@ int PMPI_Isend(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MP retval = MPI_SUCCESS; } else if (dst >= smpi_group_size(smpi_comm_group(comm)) || dst <0){ retval = MPI_ERR_RANK; - } else if (count < 0) { - retval = MPI_ERR_COUNT; - } else if (buf==NULL && count > 0) { + } else if ((count < 0) || (buf==nullptr && count > 0)) { retval = MPI_ERR_COUNT; } else if (!is_datatype_valid(datatype)) { retval = MPI_ERR_TYPE; @@ -1041,11 +1057,11 @@ int PMPI_Isend(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MP int known=0; extra->datatype1 = encode_datatype(datatype, &known); int dt_size_send = 1; - if(!known) + if(known==0) dt_size_send = smpi_datatype_size(datatype); extra->send_size = count*dt_size_send; TRACE_smpi_ptp_in(rank, rank, dst_traced, __FUNCTION__, extra); - TRACE_smpi_send(rank, rank, dst_traced, count*smpi_datatype_size(datatype)); + TRACE_smpi_send(rank, rank, dst_traced, tag, count*smpi_datatype_size(datatype)); *request = smpi_mpi_isend(buf, count, datatype, dst, tag, comm); retval = MPI_SUCCESS; @@ -1055,7 +1071,7 @@ int PMPI_Isend(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MP } smpi_bench_begin(); - if (retval != MPI_SUCCESS && request) + if (retval != MPI_SUCCESS && request!=nullptr) *request = MPI_REQUEST_NULL; return retval; } @@ -1065,7 +1081,7 @@ int PMPI_Issend(void* buf, int count, MPI_Datatype datatype, int dst, int tag, M int retval = 0; smpi_bench_end(); - if (request == NULL) { + if (request == nullptr) { retval = MPI_ERR_ARG; } else if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; @@ -1074,9 +1090,7 @@ int PMPI_Issend(void* buf, int count, MPI_Datatype datatype, int dst, int tag, M retval = MPI_SUCCESS; } else if (dst >= smpi_group_size(smpi_comm_group(comm)) || dst <0){ retval = MPI_ERR_RANK; - } else if (count < 0) { - retval = MPI_ERR_COUNT; - } else if (buf==NULL && count > 0) { + } else if ((count < 0)|| (buf==nullptr && count > 0)) { retval = MPI_ERR_COUNT; } else if (!is_datatype_valid(datatype)) { retval = MPI_ERR_TYPE; @@ -1093,11 +1107,11 @@ int PMPI_Issend(void* buf, int count, MPI_Datatype datatype, int dst, int tag, M int known=0; extra->datatype1 = encode_datatype(datatype, &known); int dt_size_send = 1; - if(!known) + if(known==0) dt_size_send = smpi_datatype_size(datatype); extra->send_size = count*dt_size_send; TRACE_smpi_ptp_in(rank, rank, dst_traced, __FUNCTION__, extra); - TRACE_smpi_send(rank, rank, dst_traced, count*smpi_datatype_size(datatype)); + TRACE_smpi_send(rank, rank, dst_traced, tag, count*smpi_datatype_size(datatype)); *request = smpi_mpi_issend(buf, count, datatype, dst, tag, comm); retval = MPI_SUCCESS; @@ -1107,7 +1121,7 @@ int PMPI_Issend(void* buf, int count, MPI_Datatype datatype, int dst, int tag, M } smpi_bench_begin(); - if (retval != MPI_SUCCESS && request) + if (retval != MPI_SUCCESS && request!=nullptr) *request = MPI_REQUEST_NULL; return retval; } @@ -1125,9 +1139,7 @@ int PMPI_Recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI retval = MPI_SUCCESS; } else if (src!=MPI_ANY_SOURCE && (src >= smpi_group_size(smpi_comm_group(comm)) || src <0)){ retval = MPI_ERR_RANK; - } else if (count < 0) { - retval = MPI_ERR_COUNT; - } else if (buf==NULL && count > 0) { + } else if ((count < 0) || (buf==nullptr && count > 0)) { retval = MPI_ERR_COUNT; } else if (!is_datatype_valid(datatype)) { retval = MPI_ERR_TYPE; @@ -1143,7 +1155,7 @@ int PMPI_Recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI int known=0; extra->datatype1 = encode_datatype(datatype, &known); int dt_size_send = 1; - if(!known) + if(known==0) dt_size_send = smpi_datatype_size(datatype); extra->send_size = count*dt_size_send; TRACE_smpi_ptp_in(rank, src_traced, rank, __FUNCTION__, extra); @@ -1155,7 +1167,7 @@ int PMPI_Recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI if(status!=MPI_STATUS_IGNORE){ src_traced = smpi_group_index(smpi_comm_group(comm), status->MPI_SOURCE); if (!TRACE_smpi_view_internals()) { - TRACE_smpi_recv(rank, src_traced, rank); + TRACE_smpi_recv(rank, src_traced, rank, tag); } } TRACE_smpi_ptp_out(rank, src_traced, rank, __FUNCTION__); @@ -1177,89 +1189,84 @@ int PMPI_Send(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI retval = MPI_SUCCESS; } else if (dst >= smpi_group_size(smpi_comm_group(comm)) || dst <0){ retval = MPI_ERR_RANK; - } else if (count < 0) { - retval = MPI_ERR_COUNT; - } else if (buf==NULL && count > 0) { + } else if ((count < 0) || (buf == nullptr && count > 0)) { retval = MPI_ERR_COUNT; } else if (!is_datatype_valid(datatype)) { - retval = MPI_ERR_TYPE; - } else if(tag<0 && tag != MPI_ANY_TAG){ + retval = MPI_ERR_TYPE; + } else if(tag < 0 && tag != MPI_ANY_TAG){ retval = MPI_ERR_TAG; } else { - - int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; - int dst_traced = smpi_group_index(smpi_comm_group(comm), dst); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type = TRACING_SEND; - extra->src = rank; - extra->dst = dst_traced; - int known=0; - extra->datatype1 = encode_datatype(datatype, &known); - int dt_size_send = 1; - if(!known) - dt_size_send = smpi_datatype_size(datatype); - extra->send_size = count*dt_size_send; - TRACE_smpi_ptp_in(rank, rank, dst_traced, __FUNCTION__, extra); - if (!TRACE_smpi_view_internals()) { - TRACE_smpi_send(rank, rank, dst_traced,count*smpi_datatype_size(datatype)); - } + int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; + int dst_traced = smpi_group_index(smpi_comm_group(comm), dst); + instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); + extra->type = TRACING_SEND; + extra->src = rank; + extra->dst = dst_traced; + int known = 0; + extra->datatype1 = encode_datatype(datatype, &known); + int dt_size_send = 1; + if (known == 0) { + dt_size_send = smpi_datatype_size(datatype); + } + extra->send_size = count*dt_size_send; + TRACE_smpi_ptp_in(rank, rank, dst_traced, __FUNCTION__, extra); + if (!TRACE_smpi_view_internals()) { + TRACE_smpi_send(rank, rank, dst_traced, tag,count*smpi_datatype_size(datatype)); + } smpi_mpi_send(buf, count, datatype, dst, tag, comm); retval = MPI_SUCCESS; - TRACE_smpi_ptp_out(rank, rank, dst_traced, __FUNCTION__); + TRACE_smpi_ptp_out(rank, rank, dst_traced, __FUNCTION__); } smpi_bench_begin(); return retval; } - - int PMPI_Ssend(void* buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) { int retval = 0; - smpi_bench_end(); - - if (comm == MPI_COMM_NULL) { - retval = MPI_ERR_COMM; - } else if (dst == MPI_PROC_NULL) { - retval = MPI_SUCCESS; - } else if (dst >= smpi_group_size(smpi_comm_group(comm)) || dst <0){ - retval = MPI_ERR_RANK; - } else if (count < 0) { - retval = MPI_ERR_COUNT; - } else if (buf==NULL && count > 0) { - retval = MPI_ERR_COUNT; - } else if (!is_datatype_valid(datatype)){ - retval = MPI_ERR_TYPE; - } else if(tag<0 && tag != MPI_ANY_TAG){ - retval = MPI_ERR_TAG; - } else { - - int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; - int dst_traced = smpi_group_index(smpi_comm_group(comm), dst); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type = TRACING_SSEND; - extra->src = rank; - extra->dst = dst_traced; - int known=0; - extra->datatype1 = encode_datatype(datatype, &known); - int dt_size_send = 1; - if(!known) - dt_size_send = smpi_datatype_size(datatype); - extra->send_size = count*dt_size_send; - TRACE_smpi_ptp_in(rank, rank, dst_traced, __FUNCTION__, extra); - TRACE_smpi_send(rank, rank, dst_traced,count*smpi_datatype_size(datatype)); - - smpi_mpi_ssend(buf, count, datatype, dst, tag, comm); - retval = MPI_SUCCESS; + smpi_bench_end(); - TRACE_smpi_ptp_out(rank, rank, dst_traced, __FUNCTION__); - } + if (comm == MPI_COMM_NULL) { + retval = MPI_ERR_COMM; + } else if (dst == MPI_PROC_NULL) { + retval = MPI_SUCCESS; + } else if (dst >= smpi_group_size(smpi_comm_group(comm)) || dst <0){ + retval = MPI_ERR_RANK; + } else if ((count < 0) || (buf==nullptr && count > 0)) { + retval = MPI_ERR_COUNT; + } else if (!is_datatype_valid(datatype)){ + retval = MPI_ERR_TYPE; + } else if(tag<0 && tag != MPI_ANY_TAG){ + retval = MPI_ERR_TAG; + } else { + int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; + int dst_traced = smpi_group_index(smpi_comm_group(comm), dst); + instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); + extra->type = TRACING_SSEND; + extra->src = rank; + extra->dst = dst_traced; + int known = 0; + extra->datatype1 = encode_datatype(datatype, &known); + int dt_size_send = 1; + if(known == 0) { + dt_size_send = smpi_datatype_size(datatype); + } + extra->send_size = count*dt_size_send; + TRACE_smpi_ptp_in(rank, rank, dst_traced, __FUNCTION__, extra); + TRACE_smpi_send(rank, rank, dst_traced, tag,count*smpi_datatype_size(datatype)); + + smpi_mpi_ssend(buf, count, datatype, dst, tag, comm); + retval = MPI_SUCCESS; + + TRACE_smpi_ptp_out(rank, rank, dst_traced, __FUNCTION__); + } - smpi_bench_begin(); - return retval;} + smpi_bench_begin(); + return retval; +} int PMPI_Sendrecv(void *sendbuf, int sendcount, MPI_Datatype sendtype, int dst, int sendtag, void *recvbuf, int recvcount, MPI_Datatype recvtype, int src, int recvtag, MPI_Comm comm, MPI_Status * status) @@ -1280,9 +1287,8 @@ int PMPI_Sendrecv(void *sendbuf, int sendcount, MPI_Datatype sendtype, int dst, }else if (dst >= smpi_group_size(smpi_comm_group(comm)) || dst <0 || (src!=MPI_ANY_SOURCE && (src >= smpi_group_size(smpi_comm_group(comm)) || src <0))){ retval = MPI_ERR_RANK; - } else if (sendcount < 0 || recvcount<0) { - retval = MPI_ERR_COUNT; - } else if ((sendbuf==NULL && sendcount > 0)||(recvbuf==NULL && recvcount>0)) { + } else if ((sendcount < 0 || recvcount<0) || + (sendbuf==nullptr && sendcount > 0) || (recvbuf==nullptr && recvcount>0)) { retval = MPI_ERR_COUNT; } else if((sendtag<0 && sendtag != MPI_ANY_TAG)||(recvtag<0 && recvtag != MPI_ANY_TAG)){ retval = MPI_ERR_TAG; @@ -1298,24 +1304,24 @@ int PMPI_Sendrecv(void *sendbuf, int sendcount, MPI_Datatype sendtype, int dst, int known=0; extra->datatype1 = encode_datatype(sendtype, &known); int dt_size_send = 1; - if(!known) + if(known==0) dt_size_send = smpi_datatype_size(sendtype); extra->send_size = sendcount*dt_size_send; extra->datatype2 = encode_datatype(recvtype, &known); int dt_size_recv = 1; - if(!known) + if(known==0) dt_size_recv = smpi_datatype_size(recvtype); extra->recv_size = recvcount*dt_size_recv; TRACE_smpi_ptp_in(rank, src_traced, dst_traced, __FUNCTION__, extra); - TRACE_smpi_send(rank, rank, dst_traced,sendcount*smpi_datatype_size(sendtype)); + TRACE_smpi_send(rank, rank, dst_traced, sendtag,sendcount*smpi_datatype_size(sendtype)); smpi_mpi_sendrecv(sendbuf, sendcount, sendtype, dst, sendtag, recvbuf, recvcount, recvtype, src, recvtag, comm, status); retval = MPI_SUCCESS; TRACE_smpi_ptp_out(rank, src_traced, dst_traced, __FUNCTION__); - TRACE_smpi_recv(rank, src_traced, rank); + TRACE_smpi_recv(rank, src_traced, rank, recvtag); } smpi_bench_begin(); @@ -1325,7 +1331,6 @@ int PMPI_Sendrecv(void *sendbuf, int sendcount, MPI_Datatype sendtype, int dst, int PMPI_Sendrecv_replace(void *buf, int count, MPI_Datatype datatype, int dst, int sendtag, int src, int recvtag, MPI_Comm comm, MPI_Status * status) { - //TODO: suboptimal implementation void *recvbuf; int retval = 0; if (!is_datatype_valid(datatype)) { @@ -1349,14 +1354,14 @@ int PMPI_Test(MPI_Request * request, int *flag, MPI_Status * status) { int retval = 0; smpi_bench_end(); - if (request == NULL || flag == NULL) { + if (request == nullptr || flag == nullptr) { retval = MPI_ERR_ARG; } else if (*request == MPI_REQUEST_NULL) { *flag= true; smpi_empty_status(status); retval = MPI_SUCCESS; } else { - int rank = request && (*request)->comm != MPI_COMM_NULL ? smpi_process_index() : -1; + int rank = ((*request)->comm != MPI_COMM_NULL) ? smpi_process_index() : -1; instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); extra->type = TRACING_TEST; @@ -1376,7 +1381,7 @@ int PMPI_Testany(int count, MPI_Request requests[], int *index, int *flag, MPI_S int retval = 0; smpi_bench_end(); - if (index == NULL || flag == NULL) { + if (index == nullptr || flag == nullptr) { retval = MPI_ERR_ARG; } else { *flag = smpi_mpi_testany(count, requests, index, status); @@ -1391,7 +1396,7 @@ int PMPI_Testall(int count, MPI_Request* requests, int* flag, MPI_Status* status int retval = 0; smpi_bench_end(); - if (flag == NULL) { + if (flag == nullptr) { retval = MPI_ERR_ARG; } else { *flag = smpi_mpi_testall(count, requests, statuses); @@ -1405,7 +1410,7 @@ int PMPI_Probe(int source, int tag, MPI_Comm comm, MPI_Status* status) { int retval = 0; smpi_bench_end(); - if (status == NULL) { + if (status == nullptr) { retval = MPI_ERR_ARG; } else if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; @@ -1425,9 +1430,7 @@ int PMPI_Iprobe(int source, int tag, MPI_Comm comm, int* flag, MPI_Status* statu int retval = 0; smpi_bench_end(); - if (flag == NULL) { - retval = MPI_ERR_ARG; - } else if (status == NULL) { + if ((flag == nullptr) || (status == nullptr)) { retval = MPI_ERR_ARG; } else if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; @@ -1452,16 +1455,17 @@ int PMPI_Wait(MPI_Request * request, MPI_Status * status) smpi_empty_status(status); - if (request == NULL) { + if (request == nullptr) { retval = MPI_ERR_ARG; } else if (*request == MPI_REQUEST_NULL) { retval = MPI_SUCCESS; } else { - int rank = request && (*request)->comm != MPI_COMM_NULL ? smpi_process_index() : -1; + int rank = (request!=nullptr && (*request)->comm != MPI_COMM_NULL) ? smpi_process_index() : -1; int src_traced = (*request)->src; int dst_traced = (*request)->dst; + int tag_traced= (*request)->tag; MPI_Comm comm = (*request)->comm; int is_wait_for_receive = (*request)->recv; instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); @@ -1478,7 +1482,7 @@ int PMPI_Wait(MPI_Request * request, MPI_Status * status) src_traced = (status!=MPI_STATUS_IGNORE) ? smpi_group_rank(smpi_comm_group(comm), status->MPI_SOURCE) : src_traced; - TRACE_smpi_recv(rank, src_traced, dst_traced); + TRACE_smpi_recv(rank, src_traced, dst_traced, tag_traced); } } @@ -1488,27 +1492,27 @@ int PMPI_Wait(MPI_Request * request, MPI_Status * status) int PMPI_Waitany(int count, MPI_Request requests[], int *index, MPI_Status * status) { - if (index == NULL) + if (index == nullptr) return MPI_ERR_ARG; smpi_bench_end(); //save requests information for tracing int i; - int *srcs = NULL, *dsts = NULL, *recvs = NULL; - MPI_Comm* comms = NULL; + typedef struct { + int src; + int dst; + int recv; + int tag; + MPI_Comm comm; + } savedvalstype; + savedvalstype* savedvals=nullptr; if(count>0){ - srcs = xbt_new0(int, count); - dsts = xbt_new0(int, count); - recvs = xbt_new0(int, count); - comms = xbt_new0(MPI_Comm, count); + savedvals = xbt_new0(savedvalstype, count); } for (i = 0; i < count; i++) { MPI_Request req = requests[i]; //already received requests are no longer valid if (req) { - srcs[i] = req->src; - dsts[i] = req->dst; - recvs[i] = req->recv; - comms[i] = req->comm; + savedvals[i]=(savedvalstype){req->src, req->dst, req->recv, req->tag, req->comm}; } } int rank_traced = smpi_process_index(); @@ -1520,23 +1524,20 @@ int PMPI_Waitany(int count, MPI_Request requests[], int *index, MPI_Status * sta *index = smpi_mpi_waitany(count, requests, status); if(*index!=MPI_UNDEFINED){ - int src_traced = srcs[*index]; + int src_traced = savedvals[*index].src; //the src may not have been known at the beginning of the recv (MPI_ANY_SOURCE) - int dst_traced = dsts[*index]; - int is_wait_for_receive = recvs[*index]; + int dst_traced = savedvals[*index].dst; + int is_wait_for_receive = savedvals[*index].recv; if (is_wait_for_receive) { - if(srcs[*index]==MPI_ANY_SOURCE) + if(savedvals[*index].src==MPI_ANY_SOURCE) src_traced = (status!=MPI_STATUSES_IGNORE) ? - smpi_group_rank(smpi_comm_group(comms[*index]), status->MPI_SOURCE) : srcs[*index]; - TRACE_smpi_recv(rank_traced, src_traced, dst_traced); + smpi_group_rank(smpi_comm_group(savedvals[*index].comm), status->MPI_SOURCE) : savedvals[*index].src; + TRACE_smpi_recv(rank_traced, src_traced, dst_traced, savedvals[*index].tag); } TRACE_smpi_ptp_out(rank_traced, src_traced, dst_traced, __FUNCTION__); - xbt_free(srcs); - xbt_free(dsts); - xbt_free(recvs); - xbt_free(comms); - } + xbt_free(savedvals); + smpi_bench_begin(); return MPI_SUCCESS; } @@ -1546,23 +1547,22 @@ int PMPI_Waitall(int count, MPI_Request requests[], MPI_Status status[]) smpi_bench_end(); //save information from requests int i; - int *srcs = xbt_new0(int, count); - int *dsts = xbt_new0(int, count); - int *recvs = xbt_new0(int, count); - int *valid = xbt_new0(int, count); - MPI_Comm *comms = xbt_new0(MPI_Comm, count); + typedef struct { + int src; + int dst; + int recv; + int tag; + int valid; + MPI_Comm comm; + } savedvalstype; + savedvalstype* savedvals=xbt_new0(savedvalstype, count); - //int valid_count = 0; for (i = 0; i < count; i++) { MPI_Request req = requests[i]; if(req!=MPI_REQUEST_NULL){ - srcs[i] = req->src; - dsts[i] = req->dst; - recvs[i] = req->recv; - comms[i] = req->comm; - valid[i]=1;; + savedvals[i]=(savedvalstype){req->src, req->dst, req->recv, req->tag, 1, req->comm}; }else{ - valid[i]=0; + savedvals[i].valid=0; } } int rank_traced = smpi_process_index(); @@ -1574,26 +1574,21 @@ int PMPI_Waitall(int count, MPI_Request requests[], MPI_Status status[]) int retval = smpi_mpi_waitall(count, requests, status); for (i = 0; i < count; i++) { - if(valid[i]){ - //int src_traced = srcs[*index]; + if(savedvals[i].valid){ //the src may not have been known at the beginning of the recv (MPI_ANY_SOURCE) - int src_traced = srcs[i]; - int dst_traced = dsts[i]; - int is_wait_for_receive = recvs[i]; + int src_traced = savedvals[i].src; + int dst_traced = savedvals[i].dst; + int is_wait_for_receive = savedvals[i].recv; if (is_wait_for_receive) { if(src_traced==MPI_ANY_SOURCE) src_traced = (status!=MPI_STATUSES_IGNORE) ? - smpi_group_rank(smpi_comm_group(comms[i]), status[i].MPI_SOURCE) : srcs[i]; - TRACE_smpi_recv(rank_traced, src_traced, dst_traced); + smpi_group_rank(smpi_comm_group(savedvals[i].comm), status[i].MPI_SOURCE) : savedvals[i].src; + TRACE_smpi_recv(rank_traced, src_traced, dst_traced,savedvals[i].tag); } } } TRACE_smpi_ptp_out(rank_traced, -1, -1, __FUNCTION__); - xbt_free(srcs); - xbt_free(dsts); - xbt_free(recvs); - xbt_free(valid); - xbt_free(comms); + xbt_free(savedvals); smpi_bench_begin(); return retval; @@ -1604,7 +1599,7 @@ int PMPI_Waitsome(int incount, MPI_Request requests[], int *outcount, int *indic int retval = 0; smpi_bench_end(); - if (outcount == NULL) { + if (outcount == nullptr) { retval = MPI_ERR_ARG; } else { *outcount = smpi_mpi_waitsome(incount, requests, indices, status); @@ -1619,7 +1614,7 @@ int PMPI_Testsome(int incount, MPI_Request requests[], int* outcount, int* indic int retval = 0; smpi_bench_end(); - if (outcount == NULL) { + if (outcount == nullptr) { retval = MPI_ERR_ARG; } else { *outcount = smpi_mpi_testsome(incount, requests, indices, status); @@ -1650,7 +1645,7 @@ int PMPI_Bcast(void *buf, int count, MPI_Datatype datatype, int root, MPI_Comm c int known=0; extra->datatype1 = encode_datatype(datatype, &known); int dt_size_send = 1; - if(!known) + if(known==0) dt_size_send = smpi_datatype_size(datatype); extra->send_size = count*dt_size_send; TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__, extra); @@ -1674,15 +1669,15 @@ int PMPI_Barrier(MPI_Comm comm) if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; } else { - int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type = TRACING_BARRIER; - TRACE_smpi_collective_in(rank, -1, __FUNCTION__, extra); + int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; + instr_extra_data extra = xbt_new0(s_instr_extra_data_t, 1); + extra->type = TRACING_BARRIER; + TRACE_smpi_collective_in(rank, -1, __FUNCTION__, extra); - mpi_coll_barrier_fun(comm); - retval = MPI_SUCCESS; + mpi_coll_barrier_fun(comm); + retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank, -1, __FUNCTION__); + TRACE_smpi_collective_out(rank, -1, __FUNCTION__); } smpi_bench_begin(); @@ -1705,7 +1700,7 @@ int PMPI_Gather(void *sendbuf, int sendcount, MPI_Datatype sendtype,void *recvbu retval = MPI_ERR_COUNT; } else { - char* sendtmpbuf = (char*) sendbuf; + char* sendtmpbuf = static_cast(sendbuf); int sendtmpcount = sendcount; MPI_Datatype sendtmptype = sendtype; if( (smpi_comm_rank(comm) == root) && (sendbuf == MPI_IN_PLACE )) { @@ -1720,12 +1715,12 @@ int PMPI_Gather(void *sendbuf, int sendcount, MPI_Datatype sendtype,void *recvbu int known=0; extra->datatype1 = encode_datatype(sendtmptype, &known); int dt_size_send = 1; - if(!known) + if(known==0) dt_size_send = smpi_datatype_size(sendtmptype); extra->send_size = sendtmpcount*dt_size_send; extra->datatype2 = encode_datatype(recvtype, &known); int dt_size_recv = 1; - if((smpi_comm_rank(comm)==root) && !known) + if((smpi_comm_rank(comm)==root) && known==0) dt_size_recv = smpi_datatype_size(recvtype); extra->recv_size = recvcount*dt_size_recv; @@ -1755,10 +1750,10 @@ int PMPI_Gatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recv retval = MPI_ERR_TYPE; } else if (( sendbuf != MPI_IN_PLACE) && (sendcount <0)){ retval = MPI_ERR_COUNT; - } else if (recvcounts == NULL || displs == NULL) { + } else if (recvcounts == nullptr || displs == nullptr) { retval = MPI_ERR_ARG; } else { - char* sendtmpbuf = (char*) sendbuf; + char* sendtmpbuf = static_cast(sendbuf); int sendtmpcount = sendcount; MPI_Datatype sendtmptype = sendtype; if( (smpi_comm_rank(comm) == root) && (sendbuf == MPI_IN_PLACE )) { @@ -1777,12 +1772,12 @@ int PMPI_Gatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recv int known=0; extra->datatype1 = encode_datatype(sendtmptype, &known); int dt_size_send = 1; - if(!known) + if(known==0) dt_size_send = smpi_datatype_size(sendtype); extra->send_size = sendtmpcount*dt_size_send; extra->datatype2 = encode_datatype(recvtype, &known); int dt_size_recv = 1; - if(!known) + if(known==0) dt_size_recv = smpi_datatype_size(recvtype); if((smpi_comm_rank(comm)==root)){ extra->recvcounts= xbt_new(int,size); @@ -1817,7 +1812,7 @@ int PMPI_Allgather(void *sendbuf, int sendcount, MPI_Datatype sendtype, retval = MPI_ERR_COUNT; } else { if(sendbuf == MPI_IN_PLACE) { - sendbuf=((char*)recvbuf)+smpi_datatype_get_extent(recvtype)*recvcount*smpi_comm_rank(comm); + sendbuf=static_cast(recvbuf)+smpi_datatype_get_extent(recvtype)*recvcount*smpi_comm_rank(comm); sendcount=recvcount; sendtype=recvtype; } @@ -1827,12 +1822,12 @@ int PMPI_Allgather(void *sendbuf, int sendcount, MPI_Datatype sendtype, int known=0; extra->datatype1 = encode_datatype(sendtype, &known); int dt_size_send = 1; - if(!known) + if(known==0) dt_size_send = smpi_datatype_size(sendtype); extra->send_size = sendcount*dt_size_send; extra->datatype2 = encode_datatype(recvtype, &known); int dt_size_recv = 1; - if(!known) + if(known==0) dt_size_recv = smpi_datatype_size(recvtype); extra->recv_size = recvcount*dt_size_recv; @@ -1860,12 +1855,12 @@ int PMPI_Allgatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, retval = MPI_ERR_TYPE; } else if (( sendbuf != MPI_IN_PLACE) && (sendcount <0)){ retval = MPI_ERR_COUNT; - } else if (recvcounts == NULL || displs == NULL) { + } else if (recvcounts == nullptr || displs == nullptr) { retval = MPI_ERR_ARG; } else { if(sendbuf == MPI_IN_PLACE) { - sendbuf=((char*)recvbuf)+smpi_datatype_get_extent(recvtype)*displs[smpi_comm_rank(comm)]; + sendbuf=static_cast(recvbuf)+smpi_datatype_get_extent(recvtype)*displs[smpi_comm_rank(comm)]; sendcount=recvcounts[smpi_comm_rank(comm)]; sendtype=recvtype; } @@ -1878,12 +1873,12 @@ int PMPI_Allgatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, int known=0; extra->datatype1 = encode_datatype(sendtype, &known); int dt_size_send = 1; - if(!known) + if(known==0) dt_size_send = smpi_datatype_size(sendtype); extra->send_size = sendcount*dt_size_send; extra->datatype2 = encode_datatype(recvtype, &known); int dt_size_recv = 1; - if(!known) + if(known==0) dt_size_recv = smpi_datatype_size(recvtype); extra->recvcounts= xbt_new(int, size); for(i=0; i< size; i++)//copy data to avoid bad free @@ -1913,7 +1908,7 @@ int PMPI_Scatter(void *sendbuf, int sendcount, MPI_Datatype sendtype, || ((recvbuf !=MPI_IN_PLACE) && (!is_datatype_valid(recvtype)))){ retval = MPI_ERR_TYPE; } else if ((sendbuf == recvbuf) || - ((smpi_comm_rank(comm)==root) && sendcount>0 && (sendbuf == NULL))){ + ((smpi_comm_rank(comm)==root) && sendcount>0 && (sendbuf == nullptr))){ retval = MPI_ERR_BUFFER; }else { @@ -1929,12 +1924,12 @@ int PMPI_Scatter(void *sendbuf, int sendcount, MPI_Datatype sendtype, int known=0; extra->datatype1 = encode_datatype(sendtype, &known); int dt_size_send = 1; - if((smpi_comm_rank(comm)==root) && !known) + if((smpi_comm_rank(comm)==root) && known==0) dt_size_send = smpi_datatype_size(sendtype); extra->send_size = sendcount*dt_size_send; extra->datatype2 = encode_datatype(recvtype, &known); int dt_size_recv = 1; - if(!known) + if(known==0) dt_size_recv = smpi_datatype_size(recvtype); extra->recv_size = recvcount*dt_size_recv; TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__,extra); @@ -1957,7 +1952,7 @@ int PMPI_Scatterv(void *sendbuf, int *sendcounts, int *displs, if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; - } else if (sendcounts == NULL || displs == NULL) { + } else if (sendcounts == nullptr || displs == nullptr) { retval = MPI_ERR_ARG; } else if (((smpi_comm_rank(comm)==root) && (sendtype == MPI_DATATYPE_NULL)) || ((recvbuf !=MPI_IN_PLACE) && (recvtype == MPI_DATATYPE_NULL))) { @@ -1978,7 +1973,7 @@ int PMPI_Scatterv(void *sendbuf, int *sendcounts, int *displs, int known=0; extra->datatype1 = encode_datatype(sendtype, &known); int dt_size_send = 1; - if(!known) + if(known==0) dt_size_send = smpi_datatype_size(sendtype); if((smpi_comm_rank(comm)==root)){ extra->sendcounts= xbt_new(int, size); @@ -1987,7 +1982,7 @@ int PMPI_Scatterv(void *sendbuf, int *sendcounts, int *displs, } extra->datatype2 = encode_datatype(recvtype, &known); int dt_size_recv = 1; - if(!known) + if(known==0) dt_size_recv = smpi_datatype_size(recvtype); extra->recv_size = recvcount*dt_size_recv; TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__,extra); @@ -2020,7 +2015,7 @@ int PMPI_Reduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, int known=0; extra->datatype1 = encode_datatype(datatype, &known); int dt_size_send = 1; - if(!known) + if(known==0) dt_size_send = smpi_datatype_size(datatype); extra->send_size = count*dt_size_send; extra->root = root_traced; @@ -2065,9 +2060,9 @@ int PMPI_Allreduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatyp retval = MPI_ERR_OP; } else { - char* sendtmpbuf = (char*) sendbuf; + char* sendtmpbuf = static_cast(sendbuf); if( sendbuf == MPI_IN_PLACE ) { - sendtmpbuf = (char *)xbt_malloc(count*smpi_datatype_get_extent(datatype)); + sendtmpbuf = static_cast(xbt_malloc(count*smpi_datatype_get_extent(datatype))); smpi_datatype_copy(recvbuf, count, datatype,sendtmpbuf, count, datatype); } int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; @@ -2076,7 +2071,7 @@ int PMPI_Allreduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatyp int known=0; extra->datatype1 = encode_datatype(datatype, &known); int dt_size_send = 1; - if(!known) + if(known==0) dt_size_send = smpi_datatype_size(datatype); extra->send_size = count*dt_size_send; @@ -2114,7 +2109,7 @@ int PMPI_Scan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MP int known=0; extra->datatype1 = encode_datatype(datatype, &known); int dt_size_send = 1; - if(!known) + if(known==0) dt_size_send = smpi_datatype_size(datatype); extra->send_size = count*dt_size_send; @@ -2148,7 +2143,7 @@ int PMPI_Exscan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, int known=0; extra->datatype1 = encode_datatype(datatype, &known); int dt_size_send = 1; - if(!known) + if(known==0) dt_size_send = smpi_datatype_size(datatype); extra->send_size = count*dt_size_send; TRACE_smpi_collective_in(rank, -1, __FUNCTION__,extra); @@ -2173,7 +2168,7 @@ int PMPI_Reduce_scatter(void *sendbuf, void *recvbuf, int *recvcounts, MPI_Datat retval = MPI_ERR_TYPE; } else if (op == MPI_OP_NULL) { retval = MPI_ERR_OP; - } else if (recvcounts == NULL) { + } else if (recvcounts == nullptr) { retval = MPI_ERR_ARG; } else { int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; @@ -2185,7 +2180,7 @@ int PMPI_Reduce_scatter(void *sendbuf, void *recvbuf, int *recvcounts, MPI_Datat int known=0; extra->datatype1 = encode_datatype(datatype, &known); int dt_size_send = 1; - if(!known) + if(known==0) dt_size_send = smpi_datatype_size(datatype); extra->send_size = 0; extra->recvcounts= xbt_new(int, size); @@ -2230,7 +2225,7 @@ int PMPI_Reduce_scatter_block(void *sendbuf, void *recvbuf, int recvcount, int known=0; extra->datatype1 = encode_datatype(datatype, &known); int dt_size_send = 1; - if(!known) + if(known==0) dt_size_send = smpi_datatype_size(datatype); extra->send_size = 0; extra->recvcounts= xbt_new(int, count); @@ -2239,8 +2234,9 @@ int PMPI_Reduce_scatter_block(void *sendbuf, void *recvbuf, int recvcount, TRACE_smpi_collective_in(rank, -1, __FUNCTION__,extra); - int* recvcounts=(int*)xbt_malloc(count); - for (i=0; i(xbt_malloc(count)); + for (i=0; itype = TRACING_ALLTOALL; int known=0; extra->datatype1 = encode_datatype(sendtype, &known); - if(!known) + if(known==0) extra->send_size = sendcount*smpi_datatype_size(sendtype); else extra->send_size = sendcount; extra->datatype2 = encode_datatype(recvtype, &known); - if(!known) + if(known==0) extra->recv_size = recvcount*smpi_datatype_size(recvtype); else extra->recv_size = recvcount; @@ -2301,7 +2297,7 @@ int PMPI_Alltoallv(void *sendbuf, int *sendcounts, int *senddisps,MPI_Datatype s retval = MPI_ERR_COMM; } else if (sendtype == MPI_DATATYPE_NULL || recvtype == MPI_DATATYPE_NULL) { retval = MPI_ERR_TYPE; - } else if (sendcounts == NULL || senddisps == NULL || recvcounts == NULL || recvdisps == NULL) { + } else if (sendcounts == nullptr || senddisps == nullptr || recvcounts == nullptr || recvdisps == nullptr) { retval = MPI_ERR_ARG; } else { int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; @@ -2316,11 +2312,11 @@ int PMPI_Alltoallv(void *sendbuf, int *sendcounts, int *senddisps,MPI_Datatype s int known=0; extra->datatype1 = encode_datatype(sendtype, &known); int dt_size_send = 1; - if(!known) + if(known==0) dt_size_send = smpi_datatype_size(sendtype); int dt_size_recv = 1; extra->datatype2 = encode_datatype(recvtype, &known); - if(!known) + if(known==0) dt_size_recv = smpi_datatype_size(recvtype); for(i=0; i< size; i++){//copy data to avoid bad free extra->send_size += sendcounts[i]*dt_size_send; @@ -2346,9 +2342,9 @@ int PMPI_Get_processor_name(char *name, int *resultlen) { int retval = MPI_SUCCESS; - strncpy(name, sg_host_get_name(SIMIX_host_self()), - strlen(sg_host_get_name(SIMIX_host_self())) < MPI_MAX_PROCESSOR_NAME - 1 ? - strlen(sg_host_get_name(SIMIX_host_self())) +1 : MPI_MAX_PROCESSOR_NAME - 1 ); + strncpy(name, SIMIX_host_self()->cname(), strlen(SIMIX_host_self()->cname()) < MPI_MAX_PROCESSOR_NAME - 1 + ? strlen(SIMIX_host_self()->cname()) + 1 + : MPI_MAX_PROCESSOR_NAME - 1); *resultlen = strlen(name) > MPI_MAX_PROCESSOR_NAME ? MPI_MAX_PROCESSOR_NAME : strlen(name); return retval; @@ -2359,7 +2355,7 @@ int PMPI_Get_count(MPI_Status * status, MPI_Datatype datatype, int *count) int retval = MPI_SUCCESS; size_t size; - if (status == NULL || count == NULL) { + if (status == nullptr || count == nullptr) { retval = MPI_ERR_ARG; } else if (!is_datatype_valid(datatype)) { retval = MPI_ERR_TYPE; @@ -2392,7 +2388,7 @@ int PMPI_Type_contiguous(int count, MPI_Datatype old_type, MPI_Datatype* new_typ int PMPI_Type_commit(MPI_Datatype* datatype) { int retval = 0; - if (datatype == NULL || *datatype == MPI_DATATYPE_NULL) { + if (datatype == nullptr || *datatype == MPI_DATATYPE_NULL) { retval = MPI_ERR_TYPE; } else { smpi_datatype_commit(datatype); @@ -2466,8 +2462,9 @@ int PMPI_Type_create_indexed_block(int count, int blocklength, int* indices, MPI } else if (count<0){ retval = MPI_ERR_COUNT; } else { - int* blocklens=(int*)xbt_malloc(blocklength*count); - for (i=0; i(xbt_malloc(blocklength*count)); + for (i=0; i 0 && (dims == NULL || periodic == NULL)) || comm_cart == NULL) { + } else if (ndims < 0 || (ndims > 0 && (dims == nullptr || periodic == nullptr)) || comm_cart == nullptr) { retval = MPI_ERR_ARG; } else{ retval = smpi_mpi_cart_create(comm_old, ndims, dims, periodic, reorder, comm_cart); @@ -2553,27 +2550,27 @@ int PMPI_Cart_create(MPI_Comm comm_old, int ndims, int* dims, int* periodic, int } int PMPI_Cart_rank(MPI_Comm comm, int* coords, int* rank) { - if(comm == MPI_COMM_NULL || smpi_comm_topo(comm) == NULL) { + if(comm == MPI_COMM_NULL || smpi_comm_topo(comm) == nullptr) { return MPI_ERR_TOPOLOGY; } - if (coords == NULL) { + if (coords == nullptr) { return MPI_ERR_ARG; } return smpi_mpi_cart_rank(comm, coords, rank); } int PMPI_Cart_shift(MPI_Comm comm, int direction, int displ, int* source, int* dest) { - if(comm == MPI_COMM_NULL || smpi_comm_topo(comm) == NULL) { + if(comm == MPI_COMM_NULL || smpi_comm_topo(comm) == nullptr) { return MPI_ERR_TOPOLOGY; } - if (source == NULL || dest == NULL || direction < 0 ) { + if (source == nullptr || dest == nullptr || direction < 0 ) { return MPI_ERR_ARG; } return smpi_mpi_cart_shift(comm, direction, displ, source, dest); } int PMPI_Cart_coords(MPI_Comm comm, int rank, int maxdims, int* coords) { - if(comm == MPI_COMM_NULL || smpi_comm_topo(comm) == NULL) { + if(comm == MPI_COMM_NULL || smpi_comm_topo(comm) == nullptr) { return MPI_ERR_TOPOLOGY; } if (rank < 0 || rank >= smpi_comm_size(comm)) { @@ -2582,34 +2579,34 @@ int PMPI_Cart_coords(MPI_Comm comm, int rank, int maxdims, int* coords) { if (maxdims <= 0) { return MPI_ERR_ARG; } - if(coords == NULL) { + if(coords == nullptr) { return MPI_ERR_ARG; } return smpi_mpi_cart_coords(comm, rank, maxdims, coords); } int PMPI_Cart_get(MPI_Comm comm, int maxdims, int* dims, int* periods, int* coords) { - if(comm == NULL || smpi_comm_topo(comm) == NULL) { + if(comm == nullptr || smpi_comm_topo(comm) == nullptr) { return MPI_ERR_TOPOLOGY; } - if(maxdims <= 0 || dims == NULL || periods == NULL || coords == NULL) { + if(maxdims <= 0 || dims == nullptr || periods == nullptr || coords == nullptr) { return MPI_ERR_ARG; } return smpi_mpi_cart_get(comm, maxdims, dims, periods, coords); } int PMPI_Cartdim_get(MPI_Comm comm, int* ndims) { - if (comm == MPI_COMM_NULL || smpi_comm_topo(comm) == NULL) { + if (comm == MPI_COMM_NULL || smpi_comm_topo(comm) == nullptr) { return MPI_ERR_TOPOLOGY; } - if (ndims == NULL) { + if (ndims == nullptr) { return MPI_ERR_ARG; } return smpi_mpi_cartdim_get(comm, ndims); } int PMPI_Dims_create(int nnodes, int ndims, int* dims) { - if(dims == NULL) { + if(dims == nullptr) { return MPI_ERR_ARG; } if (ndims < 1 || nnodes < 1) { @@ -2620,10 +2617,10 @@ int PMPI_Dims_create(int nnodes, int ndims, int* dims) { } int PMPI_Cart_sub(MPI_Comm comm, int* remain_dims, MPI_Comm* comm_new) { - if(comm == MPI_COMM_NULL || smpi_comm_topo(comm) == NULL) { + if(comm == MPI_COMM_NULL || smpi_comm_topo(comm) == nullptr) { return MPI_ERR_TOPOLOGY; } - if (comm_new == NULL) { + if (comm_new == nullptr) { return MPI_ERR_ARG; } return smpi_mpi_cart_sub(comm, remain_dims, comm_new); @@ -2649,7 +2646,7 @@ int PMPI_Win_create( void *base, MPI_Aint size, int disp_unit, MPI_Info info, MP smpi_bench_end(); if (comm == MPI_COMM_NULL) { retval= MPI_ERR_COMM; - }else if ((base == NULL && size != 0) || disp_unit <= 0 || size < 0 ){ + }else if ((base == nullptr && size != 0) || disp_unit <= 0 || size < 0 ){ retval= MPI_ERR_OTHER; }else{ *win = smpi_mpi_win_create( base, size, disp_unit, info, comm); @@ -2662,7 +2659,7 @@ int PMPI_Win_create( void *base, MPI_Aint size, int disp_unit, MPI_Info info, MP int PMPI_Win_free( MPI_Win* win){ int retval = 0; smpi_bench_end(); - if (win == NULL || *win == MPI_WIN_NULL) { + if (win == nullptr || *win == MPI_WIN_NULL) { retval = MPI_ERR_WIN; }else{ retval=smpi_mpi_win_free(win); @@ -2676,7 +2673,7 @@ int PMPI_Win_set_name(MPI_Win win, char * name) int retval = 0; if (win == MPI_WIN_NULL) { retval = MPI_ERR_TYPE; - } else if (name == NULL) { + } else if (name == nullptr) { retval = MPI_ERR_ARG; } else { smpi_mpi_win_set_name(win, name); @@ -2691,7 +2688,7 @@ int PMPI_Win_get_name(MPI_Win win, char * name, int* len) if (win == MPI_WIN_NULL) { retval = MPI_ERR_WIN; - } else if (name == NULL) { + } else if (name == nullptr) { retval = MPI_ERR_ARG; } else { smpi_mpi_win_get_name(win, name, len); @@ -2718,7 +2715,7 @@ int PMPI_Win_fence( int assert, MPI_Win win){ retval = MPI_ERR_WIN; } else { int rank = smpi_process_index(); - TRACE_smpi_collective_in(rank, -1, __FUNCTION__, NULL); + TRACE_smpi_collective_in(rank, -1, __FUNCTION__, nullptr); retval = smpi_mpi_win_fence(assert, win); TRACE_smpi_collective_out(rank, -1, __FUNCTION__); } @@ -2738,9 +2735,8 @@ int PMPI_Get( void *origin_addr, int origin_count, MPI_Datatype origin_datatype, retval = MPI_ERR_RANK; } else if (target_disp <0){ retval = MPI_ERR_ARG; - } else if (origin_count < 0 || target_count < 0) { - retval = MPI_ERR_COUNT; - } else if (origin_addr==NULL && origin_count > 0){ + } else if ((origin_count < 0 || target_count < 0) || + (origin_addr==nullptr && origin_count > 0)){ retval = MPI_ERR_COUNT; } else if ((!is_datatype_valid(origin_datatype)) || (!is_datatype_valid(target_datatype))) { retval = MPI_ERR_TYPE; @@ -2749,7 +2745,7 @@ int PMPI_Get( void *origin_addr, int origin_count, MPI_Datatype origin_datatype, MPI_Group group; smpi_mpi_win_get_group(win, &group); int src_traced = smpi_group_index(group, target_rank); - TRACE_smpi_ptp_in(rank, src_traced, rank, __FUNCTION__, NULL); + TRACE_smpi_ptp_in(rank, src_traced, rank, __FUNCTION__, nullptr); retval = smpi_mpi_get( origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, target_datatype, win); @@ -2772,9 +2768,8 @@ int PMPI_Put( void *origin_addr, int origin_count, MPI_Datatype origin_datatype, retval = MPI_ERR_RANK; } else if (target_disp <0){ retval = MPI_ERR_ARG; - } else if (origin_count < 0 || target_count < 0) { - retval = MPI_ERR_COUNT; - } else if (origin_addr==NULL && origin_count > 0){ + } else if ((origin_count < 0 || target_count < 0) || + (origin_addr==nullptr && origin_count > 0)){ retval = MPI_ERR_COUNT; } else if ((!is_datatype_valid(origin_datatype)) || (!is_datatype_valid(target_datatype))) { retval = MPI_ERR_TYPE; @@ -2783,8 +2778,8 @@ int PMPI_Put( void *origin_addr, int origin_count, MPI_Datatype origin_datatype, MPI_Group group; smpi_mpi_win_get_group(win, &group); int dst_traced = smpi_group_index(group, target_rank); - TRACE_smpi_ptp_in(rank, rank, dst_traced, __FUNCTION__, NULL); - TRACE_smpi_send(rank, rank, dst_traced, origin_count*smpi_datatype_size(origin_datatype)); + TRACE_smpi_ptp_in(rank, rank, dst_traced, __FUNCTION__, nullptr); + TRACE_smpi_send(rank, rank, dst_traced, SMPI_RMA_TAG, origin_count*smpi_datatype_size(origin_datatype)); retval = smpi_mpi_put( origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, target_datatype, win); @@ -2807,9 +2802,8 @@ int PMPI_Accumulate( void *origin_addr, int origin_count, MPI_Datatype origin_da retval = MPI_ERR_RANK; } else if (target_disp <0){ retval = MPI_ERR_ARG; - } else if (origin_count < 0 || target_count < 0) { - retval = MPI_ERR_COUNT; - } else if (origin_addr==NULL && origin_count > 0){ + } else if ((origin_count < 0 || target_count < 0) || + (origin_addr==nullptr && origin_count > 0)){ retval = MPI_ERR_COUNT; } else if ((!is_datatype_valid(origin_datatype)) || (!is_datatype_valid(target_datatype))) { @@ -2821,7 +2815,7 @@ int PMPI_Accumulate( void *origin_addr, int origin_count, MPI_Datatype origin_da MPI_Group group; smpi_mpi_win_get_group(win, &group); int src_traced = smpi_group_index(group, target_rank); - TRACE_smpi_ptp_in(rank, src_traced, rank, __FUNCTION__, NULL); + TRACE_smpi_ptp_in(rank, src_traced, rank, __FUNCTION__, nullptr); retval = smpi_mpi_accumulate( origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, target_datatype, op, win); @@ -2842,7 +2836,7 @@ int PMPI_Win_post(MPI_Group group, int assert, MPI_Win win){ } else { int rank = smpi_process_index(); - TRACE_smpi_collective_in(rank, -1, __FUNCTION__, NULL); + TRACE_smpi_collective_in(rank, -1, __FUNCTION__, nullptr); retval = smpi_mpi_win_post(group,assert,win); TRACE_smpi_collective_out(rank, -1, __FUNCTION__); } @@ -2860,7 +2854,7 @@ int PMPI_Win_start(MPI_Group group, int assert, MPI_Win win){ } else { int rank = smpi_process_index(); - TRACE_smpi_collective_in(rank, -1, __FUNCTION__, NULL); + TRACE_smpi_collective_in(rank, -1, __FUNCTION__, nullptr); retval = smpi_mpi_win_start(group,assert,win); TRACE_smpi_collective_out(rank, -1, __FUNCTION__); } @@ -2876,7 +2870,7 @@ int PMPI_Win_complete(MPI_Win win){ } else { int rank = smpi_process_index(); - TRACE_smpi_collective_in(rank, -1, __FUNCTION__, NULL); + TRACE_smpi_collective_in(rank, -1, __FUNCTION__, nullptr); retval = smpi_mpi_win_complete(win); @@ -2894,7 +2888,7 @@ int PMPI_Win_wait(MPI_Win win){ } else { int rank = smpi_process_index(); - TRACE_smpi_collective_in(rank, -1, __FUNCTION__, NULL); + TRACE_smpi_collective_in(rank, -1, __FUNCTION__, nullptr); retval = smpi_mpi_win_wait(win); @@ -2906,10 +2900,10 @@ int PMPI_Win_wait(MPI_Win win){ int PMPI_Alloc_mem(MPI_Aint size, MPI_Info info, void *baseptr){ void *ptr = xbt_malloc(size); - if(!ptr) + if(ptr==nullptr) return MPI_ERR_NO_MEM; else { - *(void **)baseptr = ptr; + *static_cast(baseptr) = ptr; return MPI_SUCCESS; } } @@ -2924,7 +2918,7 @@ int PMPI_Type_set_name(MPI_Datatype datatype, char * name) int retval = 0; if (datatype == MPI_DATATYPE_NULL) { retval = MPI_ERR_TYPE; - } else if (name == NULL) { + } else if (name == nullptr) { retval = MPI_ERR_ARG; } else { smpi_datatype_set_name(datatype, name); @@ -2939,7 +2933,7 @@ int PMPI_Type_get_name(MPI_Datatype datatype, char * name, int* len) if (datatype == MPI_DATATYPE_NULL) { retval = MPI_ERR_TYPE; - } else if (name == NULL) { + } else if (name == nullptr) { retval = MPI_ERR_ARG; } else { smpi_datatype_get_name(datatype, name, len); @@ -3038,23 +3032,23 @@ int PMPI_Attr_get(MPI_Comm comm, int keyval, void* attr_value, int* flag) { case MPI_IO: case MPI_APPNUM: *flag = 1; - *(int**)attr_value = &zero; + *static_cast(attr_value) = &zero; return MPI_SUCCESS; case MPI_UNIVERSE_SIZE: *flag = 1; - *(int**)attr_value = &smpi_universe_size; + *static_cast(attr_value) = &smpi_universe_size; return MPI_SUCCESS; case MPI_LASTUSEDCODE: *flag = 1; - *(int**)attr_value = &last_used_code; + *static_cast(attr_value) = &last_used_code; return MPI_SUCCESS; case MPI_TAG_UB: *flag=1; - *(int**)attr_value = &tag_ub; + *static_cast(attr_value) = &tag_ub; return MPI_SUCCESS; case MPI_WTIME_IS_GLOBAL: *flag = 1; - *(int**)attr_value = &one; + *static_cast(attr_value) = &one; return MPI_SUCCESS; default: return smpi_comm_attr_get(comm, keyval, attr_value, flag); @@ -3131,24 +3125,24 @@ int PMPI_Type_free_keyval(int* keyval) { } int PMPI_Info_create( MPI_Info *info){ - if (info == NULL) + if (info == nullptr) return MPI_ERR_ARG; *info = xbt_new(s_smpi_mpi_info_t, 1); - (*info)->info_dict= xbt_dict_new_homogeneous(NULL); + (*info)->info_dict= xbt_dict_new_homogeneous(xbt_free_f); (*info)->refcount=1; return MPI_SUCCESS; } int PMPI_Info_set( MPI_Info info, char *key, char *value){ - if (info == NULL || key == NULL || value == NULL) + if (info == nullptr || key == nullptr || value == nullptr) return MPI_ERR_ARG; - xbt_dict_set(info->info_dict, key, (void*)value, NULL); + xbt_dict_set(info->info_dict, key, xbt_strdup(value), nullptr); return MPI_SUCCESS; } int PMPI_Info_free( MPI_Info *info){ - if (info == NULL || *info==NULL) + if (info == nullptr || *info==nullptr) return MPI_ERR_ARG; (*info)->refcount--; if((*info)->refcount==0){ @@ -3161,11 +3155,11 @@ int PMPI_Info_free( MPI_Info *info){ int PMPI_Info_get(MPI_Info info,char *key,int valuelen, char *value, int *flag){ *flag=false; - if (info == NULL || key == NULL || valuelen <0) + if (info == nullptr || key == nullptr || valuelen <0) return MPI_ERR_ARG; - if (value == NULL) + if (value == nullptr) return MPI_ERR_INFO_VALUE; - char* tmpvalue=(char*)xbt_dict_get_or_null(info->info_dict, key); + char* tmpvalue=static_cast(xbt_dict_get_or_null(info->info_dict, key)); if(tmpvalue){ memset(value, 0, valuelen); memcpy(value,tmpvalue, (strlen(tmpvalue) + 1 < static_cast(valuelen)) ? strlen(tmpvalue) + 1 : valuelen); @@ -3175,51 +3169,50 @@ int PMPI_Info_get(MPI_Info info,char *key,int valuelen, char *value, int *flag){ } int PMPI_Info_dup(MPI_Info info, MPI_Info *newinfo){ - if (info == NULL || newinfo==NULL) + if (info == nullptr || newinfo==nullptr) return MPI_ERR_ARG; *newinfo = xbt_new(s_smpi_mpi_info_t, 1); - (*newinfo)->info_dict= xbt_dict_new_homogeneous(NULL); + (*newinfo)->info_dict= xbt_dict_new_homogeneous(xbt_free_f); (*newinfo)->refcount=1; - xbt_dict_cursor_t cursor = NULL; + xbt_dict_cursor_t cursor = nullptr; int *key; void* data; xbt_dict_foreach(info->info_dict,cursor,key,data){ - xbt_dict_set((*newinfo)->info_dict, (char*)key, data, NULL); + xbt_dict_set((*newinfo)->info_dict, reinterpret_cast(key), xbt_strdup(reinterpret_cast(data)), nullptr); } return MPI_SUCCESS; } int PMPI_Info_delete(MPI_Info info, char *key){ - xbt_ex_t e; - if (info == NULL || key==NULL) + if (info == nullptr || key==nullptr) return MPI_ERR_ARG; - TRY { + try { xbt_dict_remove(info->info_dict, key); - }CATCH(e){ - xbt_ex_free(e); + } + catch(xbt_ex& e){ return MPI_ERR_INFO_NOKEY; } return MPI_SUCCESS; } int PMPI_Info_get_nkeys( MPI_Info info, int *nkeys){ - if (info == NULL || nkeys==NULL) + if (info == nullptr || nkeys==nullptr) return MPI_ERR_ARG; *nkeys=xbt_dict_size(info->info_dict); return MPI_SUCCESS; } int PMPI_Info_get_nthkey( MPI_Info info, int n, char *key){ - if (info == NULL || key==NULL || n<0 || n> MPI_MAX_INFO_KEY) + if (info == nullptr || key==nullptr || n<0 || n> MPI_MAX_INFO_KEY) return MPI_ERR_ARG; - xbt_dict_cursor_t cursor = NULL; + xbt_dict_cursor_t cursor = nullptr; char *keyn; void* data; int num=0; xbt_dict_foreach(info->info_dict,cursor,keyn,data){ if(num==n){ - strcpy(key,keyn); + strncpy(key,keyn,strlen(keyn)+1); xbt_dict_cursor_free(&cursor); return MPI_SUCCESS; } @@ -3230,7 +3223,7 @@ int PMPI_Info_get_nthkey( MPI_Info info, int n, char *key){ int PMPI_Info_get_valuelen( MPI_Info info, char *key, int *valuelen, int *flag){ *flag=false; - if (info == NULL || key == NULL || valuelen==NULL) + if (info == nullptr || key == nullptr || valuelen==nullptr) return MPI_ERR_ARG; char* tmpvalue=(char*)xbt_dict_get_or_null(info->info_dict, key); if(tmpvalue){ @@ -3241,7 +3234,7 @@ int PMPI_Info_get_valuelen( MPI_Info info, char *key, int *valuelen, int *flag){ } int PMPI_Unpack(void* inbuf, int incount, int* position, void* outbuf, int outcount, MPI_Datatype type, MPI_Comm comm) { - if(incount<0 || outcount < 0 || inbuf==NULL || outbuf==NULL) + if(incount<0 || outcount < 0 || inbuf==nullptr || outbuf==nullptr) return MPI_ERR_ARG; if(!is_datatype_valid(type)) return MPI_ERR_TYPE; @@ -3251,7 +3244,7 @@ int PMPI_Unpack(void* inbuf, int incount, int* position, void* outbuf, int outco } int PMPI_Pack(void* inbuf, int incount, MPI_Datatype type, void* outbuf, int outcount, int* position, MPI_Comm comm) { - if(incount<0 || outcount < 0|| inbuf==NULL || outbuf==NULL) + if(incount<0 || outcount < 0|| inbuf==nullptr || outbuf==nullptr) return MPI_ERR_ARG; if(!is_datatype_valid(type)) return MPI_ERR_TYPE;