X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/347996b4a10c4e8579080692afa60e0afb88b60a..ac24252fb1b1559060f21155ed475bedee22d53d:/src/smpi/smpi_pmpi.cpp diff --git a/src/smpi/smpi_pmpi.cpp b/src/smpi/smpi_pmpi.cpp index c4b0a3d163..78b73c6a02 100644 --- a/src/smpi/smpi_pmpi.cpp +++ b/src/smpi/smpi_pmpi.cpp @@ -8,8 +8,7 @@ #include "private.h" #include "smpi_mpi_dt_private.h" -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_pmpi, smpi, - "Logging specific to SMPI (pmpi)"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_pmpi, smpi, "Logging specific to SMPI (pmpi)"); //this function need to be here because of the calls to smpi_bench void TRACE_smpi_set_category(const char *category) @@ -28,7 +27,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(); @@ -40,6 +39,9 @@ int PMPI_Init(int *argc, char ***argv) TRACE_smpi_collective_out(rank, -1, __FUNCTION__); smpi_bench_begin(); } + + smpi_mpi_init(); + return MPI_SUCCESS; } @@ -74,8 +76,8 @@ int PMPI_Get_version (int *version,int *subversion){ int PMPI_Get_library_version (char *version,int *len){ int retval = MPI_SUCCESS; smpi_bench_end(); - snprintf(version,MPI_MAX_LIBRARY_VERSION_STRING,"SMPI Version %d.%d. Copyright The Simgrid Team 2007-2015",SIMGRID_VERSION_MAJOR, - SIMGRID_VERSION_MINOR); + snprintf(version,MPI_MAX_LIBRARY_VERSION_STRING,"SMPI Version %d.%d. Copyright The Simgrid Team 2007-2015", + SIMGRID_VERSION_MAJOR, SIMGRID_VERSION_MINOR); *len = strlen(version) > MPI_MAX_LIBRARY_VERSION_STRING ? MPI_MAX_LIBRARY_VERSION_STRING : strlen(version); smpi_bench_begin(); return retval; @@ -139,10 +141,10 @@ int PMPI_Address(void *location, MPI_Aint * address) { int retval = 0; - if (!address) { + if (address==NULL) { retval = MPI_ERR_ARG; } else { - *address = (MPI_Aint) location; + *address = reinterpret_cast(location); retval = MPI_SUCCESS; } return retval; @@ -156,12 +158,11 @@ int PMPI_Get_address(void *location, MPI_Aint * address) int PMPI_Type_free(MPI_Datatype * datatype) { int retval = 0; - /* Free a predefined datatype is an error according to the standard, and - should be checked for */ + /* Free a predefined datatype is an error according to the standard, and should be checked for */ if (*datatype == MPI_DATATYPE_NULL) { retval = MPI_ERR_ARG; } else { - smpi_datatype_free(datatype); + smpi_datatype_unuse(*datatype); retval = MPI_SUCCESS; } return retval; @@ -176,7 +177,7 @@ int PMPI_Type_size(MPI_Datatype datatype, int *size) } else if (size == NULL) { retval = MPI_ERR_ARG; } else { - *size = (int) smpi_datatype_size(datatype); + *size = static_cast(smpi_datatype_size(datatype)); retval = MPI_SUCCESS; } return retval; @@ -264,7 +265,7 @@ int PMPI_Op_create(MPI_User_function * function, int commute, MPI_Op * op) if (function == NULL || op == NULL) { retval = MPI_ERR_ARG; } else { - *op = smpi_op_new(function, commute); + *op = smpi_op_new(function, (commute!=0)); retval = MPI_SUCCESS; } return retval; @@ -330,8 +331,7 @@ int PMPI_Group_rank(MPI_Group group, int *rank) return retval; } -int PMPI_Group_translate_ranks(MPI_Group group1, int n, int *ranks1, - MPI_Group group2, int *ranks2) +int PMPI_Group_translate_ranks(MPI_Group group1, int n, int *ranks1, MPI_Group group2, int *ranks2) { int retval, i, index; if (group1 == MPI_GROUP_NULL || group2 == MPI_GROUP_NULL) { @@ -365,8 +365,7 @@ int PMPI_Group_compare(MPI_Group group1, MPI_Group group2, int *result) return retval; } -int PMPI_Group_union(MPI_Group group1, MPI_Group group2, - MPI_Group * newgroup) +int PMPI_Group_union(MPI_Group group1, MPI_Group group2, MPI_Group * newgroup) { int retval, i, proc1, proc2, size, size2; @@ -403,8 +402,7 @@ int PMPI_Group_union(MPI_Group group1, MPI_Group group2, return retval; } -int PMPI_Group_intersection(MPI_Group group1, MPI_Group group2, - MPI_Group * newgroup) +int PMPI_Group_intersection(MPI_Group group1, MPI_Group group2, MPI_Group * newgroup) { int retval, i, proc1, proc2, size; @@ -449,7 +447,8 @@ int PMPI_Group_difference(MPI_Group group1, MPI_Group group2, MPI_Group * newgro } else if (newgroup == NULL) { 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); @@ -499,10 +498,8 @@ int PMPI_Group_excl(MPI_Group group, int n, int *ranks, MPI_Group * newgroup) } else { if (n == 0) { *newgroup = group; - if(group!= smpi_comm_group(MPI_COMM_WORLD) - && group != MPI_GROUP_NULL - && group != smpi_comm_group(MPI_COMM_SELF) - && group != MPI_GROUP_EMPTY) + if(group!= smpi_comm_group(MPI_COMM_WORLD) && group != MPI_GROUP_NULL + && group != smpi_comm_group(MPI_COMM_SELF) && group != MPI_GROUP_EMPTY) smpi_group_use(group); } else if (n == smpi_group_size(group)) { *newgroup = MPI_GROUP_EMPTY; @@ -533,8 +530,7 @@ int PMPI_Group_excl(MPI_Group group, int n, int *ranks, MPI_Group * newgroup) return retval; } -int PMPI_Group_range_incl(MPI_Group group, int n, int ranges[][3], - MPI_Group * newgroup) +int PMPI_Group_range_incl(MPI_Group group, int n, int ranges[][3], MPI_Group * newgroup) { int retval, i, j, rank, size, index; @@ -594,8 +590,7 @@ int PMPI_Group_range_incl(MPI_Group group, int n, int ranges[][3], return retval; } -int PMPI_Group_range_excl(MPI_Group group, int n, int ranges[][3], - MPI_Group * newgroup) +int PMPI_Group_range_excl(MPI_Group group, int n, int ranges[][3], MPI_Group * newgroup) { int retval, i, rank, newrank,oldrank, size, index, add; @@ -606,10 +601,8 @@ int PMPI_Group_range_excl(MPI_Group group, int n, int ranges[][3], } else { if (n == 0) { *newgroup = group; - if(group!= smpi_comm_group(MPI_COMM_WORLD) - && group != MPI_GROUP_NULL - && group != smpi_comm_group(MPI_COMM_SELF) - && group != MPI_GROUP_EMPTY) + if(group!= smpi_comm_group(MPI_COMM_WORLD) && group != MPI_GROUP_NULL + && group != smpi_comm_group(MPI_COMM_SELF) && group != MPI_GROUP_EMPTY) smpi_group_use(group); } else { size = smpi_group_size(group); @@ -728,9 +721,7 @@ int PMPI_Comm_group(MPI_Comm comm, MPI_Group * group) retval = MPI_ERR_ARG; } else { *group = smpi_comm_group(comm); - if(*group!= smpi_comm_group(MPI_COMM_WORLD) - && *group != MPI_GROUP_NULL - && *group != smpi_comm_group(MPI_COMM_SELF) + if(*group!= smpi_comm_group(MPI_COMM_WORLD) && *group != MPI_GROUP_NULL && *group != MPI_GROUP_EMPTY) smpi_group_use(*group); retval = MPI_SUCCESS; @@ -750,9 +741,7 @@ int PMPI_Comm_compare(MPI_Comm comm1, MPI_Comm comm2, int *result) if (comm1 == comm2) { /* Same communicators means same groups */ *result = MPI_IDENT; } else { - *result = - smpi_group_compare(smpi_comm_group(comm1), - smpi_comm_group(comm2)); + *result = smpi_group_compare(smpi_comm_group(comm1), smpi_comm_group(comm2)); if (*result == MPI_IDENT) { *result = MPI_CONGRUENT; } @@ -790,7 +779,7 @@ int PMPI_Comm_create(MPI_Comm comm, MPI_Group group, MPI_Comm * newcomm) *newcomm= MPI_COMM_NULL; retval = MPI_SUCCESS; }else{ - + smpi_group_use(group); *newcomm = smpi_comm_new(group, NULL); retval = MPI_SUCCESS; } @@ -848,8 +837,7 @@ int PMPI_Comm_split(MPI_Comm comm, int color, int key, MPI_Comm* comm_out) return retval; } -int PMPI_Send_init(void *buf, int count, MPI_Datatype datatype, int dst, - int tag, MPI_Comm comm, MPI_Request * request) +int PMPI_Send_init(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm, MPI_Request * request) { int retval = 0; @@ -867,13 +855,12 @@ int PMPI_Send_init(void *buf, int count, MPI_Datatype datatype, int dst, retval = MPI_SUCCESS; } smpi_bench_begin(); - if (retval != MPI_SUCCESS && request) + if (retval != MPI_SUCCESS && request != NULL) *request = MPI_REQUEST_NULL; return retval; } -int PMPI_Recv_init(void *buf, int count, MPI_Datatype datatype, int src, - int tag, MPI_Comm comm, MPI_Request * request) +int PMPI_Recv_init(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm, MPI_Request * request) { int retval = 0; @@ -891,13 +878,12 @@ int PMPI_Recv_init(void *buf, int count, MPI_Datatype datatype, int src, retval = MPI_SUCCESS; } smpi_bench_begin(); - if (retval != MPI_SUCCESS && request) + if (retval != MPI_SUCCESS && request != NULL) *request = MPI_REQUEST_NULL; return retval; } -int PMPI_Ssend_init(void* buf, int count, MPI_Datatype datatype, - int dst, int tag, MPI_Comm comm, MPI_Request* request) +int PMPI_Ssend_init(void* buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm, MPI_Request* request) { int retval = 0; @@ -915,7 +901,7 @@ int PMPI_Ssend_init(void* buf, int count, MPI_Datatype datatype, retval = MPI_SUCCESS; } smpi_bench_begin(); - if (retval != MPI_SUCCESS && request) + if (retval != MPI_SUCCESS && request != NULL) *request = MPI_REQUEST_NULL; return retval; } @@ -972,8 +958,7 @@ int PMPI_Request_free(MPI_Request * request) return retval; } -int PMPI_Irecv(void *buf, int count, MPI_Datatype datatype, int src, - int tag, MPI_Comm comm, MPI_Request * request) +int PMPI_Irecv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm, MPI_Request * request) { int retval = 0; @@ -988,9 +973,7 @@ int PMPI_Irecv(void *buf, int count, MPI_Datatype datatype, int src, 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==NULL && count > 0)) { retval = MPI_ERR_COUNT; } else if (!is_datatype_valid(datatype)) { retval = MPI_ERR_TYPE; @@ -1008,7 +991,7 @@ int PMPI_Irecv(void *buf, int count, MPI_Datatype datatype, int src, 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); @@ -1021,14 +1004,13 @@ int PMPI_Irecv(void *buf, int count, MPI_Datatype datatype, int src, } smpi_bench_begin(); - if (retval != MPI_SUCCESS && request) + if (retval != MPI_SUCCESS && request != NULL) *request = MPI_REQUEST_NULL; return retval; } -int PMPI_Isend(void *buf, int count, MPI_Datatype datatype, int dst, - int tag, MPI_Comm comm, MPI_Request * request) +int PMPI_Isend(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm, MPI_Request * request) { int retval = 0; @@ -1042,9 +1024,7 @@ int PMPI_Isend(void *buf, int count, MPI_Datatype datatype, int dst, 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==NULL && count > 0)) { retval = MPI_ERR_COUNT; } else if (!is_datatype_valid(datatype)) { retval = MPI_ERR_TYPE; @@ -1061,7 +1041,7 @@ int PMPI_Isend(void *buf, int count, MPI_Datatype datatype, int dst, 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); @@ -1075,13 +1055,12 @@ int PMPI_Isend(void *buf, int count, MPI_Datatype datatype, int dst, } smpi_bench_begin(); - if (retval != MPI_SUCCESS && request) + if (retval != MPI_SUCCESS && request!=NULL) *request = MPI_REQUEST_NULL; return retval; } -int PMPI_Issend(void* buf, int count, MPI_Datatype datatype, - int dst, int tag, MPI_Comm comm, MPI_Request* request) +int PMPI_Issend(void* buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm, MPI_Request* request) { int retval = 0; @@ -1095,9 +1074,7 @@ int PMPI_Issend(void* buf, int count, MPI_Datatype datatype, 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==NULL && count > 0)) { retval = MPI_ERR_COUNT; } else if (!is_datatype_valid(datatype)) { retval = MPI_ERR_TYPE; @@ -1114,7 +1091,7 @@ int PMPI_Issend(void* buf, 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_ptp_in(rank, rank, dst_traced, __FUNCTION__, extra); @@ -1128,13 +1105,12 @@ int PMPI_Issend(void* buf, int count, MPI_Datatype datatype, } smpi_bench_begin(); - if (retval != MPI_SUCCESS && request) + if (retval != MPI_SUCCESS && request!=NULL) *request = MPI_REQUEST_NULL; return retval; } -int PMPI_Recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, - MPI_Comm comm, MPI_Status * status) +int PMPI_Recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm, MPI_Status * status) { int retval = 0; @@ -1147,9 +1123,7 @@ int PMPI_Recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, 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==NULL && count > 0)) { retval = MPI_ERR_COUNT; } else if (!is_datatype_valid(datatype)) { retval = MPI_ERR_TYPE; @@ -1165,7 +1139,7 @@ int PMPI_Recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, 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); @@ -1187,8 +1161,7 @@ int PMPI_Recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, return retval; } -int PMPI_Send(void *buf, int count, MPI_Datatype datatype, int dst, int tag, - MPI_Comm comm) +int PMPI_Send(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) { int retval = 0; @@ -1200,94 +1173,87 @@ int PMPI_Send(void *buf, int count, MPI_Datatype datatype, int dst, int tag, 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,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; - - TRACE_smpi_ptp_out(rank, rank, dst_traced, __FUNCTION__); - } + smpi_bench_end(); - smpi_bench_begin(); - return retval;} + 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==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 == 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)); + + 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; +} -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) +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) { int retval = 0; @@ -1305,9 +1271,8 @@ int PMPI_Sendrecv(void *sendbuf, int sendcount, MPI_Datatype sendtype, }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==NULL && sendcount > 0) || (recvbuf==NULL && recvcount>0)) { retval = MPI_ERR_COUNT; } else if((sendtag<0 && sendtag != MPI_ANY_TAG)||(recvtag<0 && recvtag != MPI_ANY_TAG)){ retval = MPI_ERR_TAG; @@ -1323,12 +1288,12 @@ int PMPI_Sendrecv(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; @@ -1347,11 +1312,9 @@ int PMPI_Sendrecv(void *sendbuf, int sendcount, MPI_Datatype sendtype, return retval; } -int PMPI_Sendrecv_replace(void *buf, int count, MPI_Datatype datatype, - int dst, int sendtag, int src, int recvtag, +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)) { @@ -1361,9 +1324,7 @@ int PMPI_Sendrecv_replace(void *buf, int count, MPI_Datatype datatype, } else { int size = smpi_datatype_get_extent(datatype) * count; recvbuf = xbt_new0(char, size); - retval = - MPI_Sendrecv(buf, count, datatype, dst, sendtag, recvbuf, count, - datatype, src, recvtag, comm, status); + retval = MPI_Sendrecv(buf, count, datatype, dst, sendtag, recvbuf, count, datatype, src, recvtag, comm, status); if(retval==MPI_SUCCESS){ smpi_datatype_copy(recvbuf, count, datatype, buf, count, datatype); } @@ -1380,13 +1341,11 @@ int PMPI_Test(MPI_Request * request, int *flag, MPI_Status * status) if (request == NULL || flag == NULL) { retval = MPI_ERR_ARG; } else if (*request == MPI_REQUEST_NULL) { - *flag= TRUE; + *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!=NULL && (*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; @@ -1401,8 +1360,7 @@ int PMPI_Test(MPI_Request * request, int *flag, MPI_Status * status) return retval; } -int PMPI_Testany(int count, MPI_Request requests[], int *index, int *flag, - MPI_Status * status) +int PMPI_Testany(int count, MPI_Request requests[], int *index, int *flag, MPI_Status * status) { int retval = 0; @@ -1452,19 +1410,16 @@ int PMPI_Probe(int source, int tag, MPI_Comm comm, MPI_Status* status) { return retval; } - int PMPI_Iprobe(int source, int tag, MPI_Comm comm, int* flag, MPI_Status* status) { int retval = 0; smpi_bench_end(); - if (flag == NULL) { - retval = MPI_ERR_ARG; - } else if (status == NULL) { + if ((flag == NULL) || (status == NULL)) { retval = MPI_ERR_ARG; } else if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; } else if (source == MPI_PROC_NULL) { - *flag=TRUE; + *flag=true; smpi_empty_status(status); status->MPI_SOURCE = MPI_PROC_NULL; retval = MPI_SUCCESS; @@ -1490,9 +1445,7 @@ int PMPI_Wait(MPI_Request * request, MPI_Status * status) retval = MPI_SUCCESS; } else { - int rank = request && (*request)->comm != MPI_COMM_NULL - ? smpi_process_index() - : -1; + int rank = (request!=NULL && (*request)->comm != MPI_COMM_NULL) ? smpi_process_index() : -1; int src_traced = (*request)->src; int dst_traced = (*request)->dst; @@ -1528,11 +1481,14 @@ int PMPI_Waitany(int count, MPI_Request requests[], int *index, MPI_Status * sta smpi_bench_end(); //save requests information for tracing int i; - int *srcs = xbt_new0(int, count); - int *dsts = xbt_new0(int, count); - int *recvs = xbt_new0(int, count); - MPI_Comm *comms = xbt_new0(MPI_Comm, count); - + int *srcs = NULL, *dsts = NULL, *recvs = NULL; + MPI_Comm* comms = NULL; + if(count>0){ + srcs = xbt_new0(int, count); + dsts = xbt_new0(int, count); + recvs = xbt_new0(int, count); + comms = xbt_new0(MPI_Comm, count); + } for (i = 0; i < count; i++) { MPI_Request req = requests[i]; //already received requests are no longer valid if (req) { @@ -1558,8 +1514,7 @@ int PMPI_Waitany(int count, MPI_Request requests[], int *index, MPI_Status * sta if (is_wait_for_receive) { if(srcs[*index]==MPI_ANY_SOURCE) src_traced = (status!=MPI_STATUSES_IGNORE) ? - smpi_group_rank(smpi_comm_group(comms[*index]), status->MPI_SOURCE) : - srcs[*index]; + smpi_group_rank(smpi_comm_group(comms[*index]), status->MPI_SOURCE) : srcs[*index]; TRACE_smpi_recv(rank_traced, src_traced, dst_traced); } TRACE_smpi_ptp_out(rank_traced, src_traced, dst_traced, __FUNCTION__); @@ -1575,7 +1530,6 @@ int PMPI_Waitany(int count, MPI_Request requests[], int *index, MPI_Status * sta int PMPI_Waitall(int count, MPI_Request requests[], MPI_Status status[]) { - smpi_bench_end(); //save information from requests int i; @@ -1585,7 +1539,6 @@ int PMPI_Waitall(int count, MPI_Request requests[], MPI_Status status[]) int *valid = xbt_new0(int, count); MPI_Comm *comms = xbt_new0(MPI_Comm, count); - //int valid_count = 0; for (i = 0; i < count; i++) { MPI_Request req = requests[i]; if(req!=MPI_REQUEST_NULL){ @@ -1608,7 +1561,6 @@ int PMPI_Waitall(int count, MPI_Request requests[], MPI_Status status[]) for (i = 0; i < count; i++) { if(valid[i]){ - //int src_traced = srcs[*index]; //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]; @@ -1616,8 +1568,7 @@ int PMPI_Waitall(int count, MPI_Request requests[], MPI_Status status[]) 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]; + smpi_group_rank(smpi_comm_group(comms[i]), status[i].MPI_SOURCE) : srcs[i]; TRACE_smpi_recv(rank_traced, src_traced, dst_traced); } } @@ -1633,8 +1584,7 @@ int PMPI_Waitall(int count, MPI_Request requests[], MPI_Status status[]) return retval; } -int PMPI_Waitsome(int incount, MPI_Request requests[], int *outcount, - int *indices, MPI_Status status[]) +int PMPI_Waitsome(int incount, MPI_Request requests[], int *outcount, int *indices, MPI_Status status[]) { int retval = 0; @@ -1649,8 +1599,7 @@ int PMPI_Waitsome(int incount, MPI_Request requests[], int *outcount, return retval; } -int PMPI_Testsome(int incount, MPI_Request requests[], int* outcount, - int* indices, MPI_Status status[]) +int PMPI_Testsome(int incount, MPI_Request requests[], int* outcount, int* indices, MPI_Status status[]) { int retval = 0; @@ -1686,15 +1635,15 @@ 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); - + if(smpi_comm_size(comm)>1) mpi_coll_bcast_fun(buf, count, datatype, root, comm); - retval = MPI_SUCCESS; + retval = MPI_SUCCESS; - TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__); + TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__); } smpi_bench_begin(); @@ -1725,9 +1674,8 @@ int PMPI_Barrier(MPI_Comm comm) return retval; } -int PMPI_Gather(void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPI_Comm comm) +int PMPI_Gather(void *sendbuf, int sendcount, MPI_Datatype sendtype,void *recvbuf, int recvcount, MPI_Datatype recvtype, + int root, MPI_Comm comm) { int retval = 0; @@ -1738,12 +1686,11 @@ int PMPI_Gather(void *sendbuf, int sendcount, MPI_Datatype sendtype, } else if ((( sendbuf != MPI_IN_PLACE) && (sendtype == MPI_DATATYPE_NULL)) || ((smpi_comm_rank(comm) == root) && (recvtype == MPI_DATATYPE_NULL))){ retval = MPI_ERR_TYPE; - } else if ((( sendbuf != MPI_IN_PLACE) && (sendcount <0)) || - ((smpi_comm_rank(comm) == root) && (recvcount <0))){ + } else if ((( sendbuf != MPI_IN_PLACE) && (sendcount <0)) || ((smpi_comm_rank(comm) == root) && (recvcount <0))){ 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 )) { @@ -1758,22 +1705,20 @@ int PMPI_Gather(void *sendbuf, int sendcount, MPI_Datatype sendtype, 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; TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__, extra); - mpi_coll_gather_fun(sendtmpbuf, sendtmpcount, sendtmptype, recvbuf, recvcount, - recvtype, root, comm); - + mpi_coll_gather_fun(sendtmpbuf, sendtmpcount, sendtmptype, recvbuf, recvcount, recvtype, root, comm); - retval = MPI_SUCCESS; + retval = MPI_SUCCESS; TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__); } @@ -1781,8 +1726,7 @@ int PMPI_Gather(void *sendbuf, int sendcount, MPI_Datatype sendtype, return retval; } -int PMPI_Gatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int *recvcounts, int *displs, +int PMPI_Gatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int *recvcounts, int *displs, MPI_Datatype recvtype, int root, MPI_Comm comm) { int retval = 0; @@ -1799,7 +1743,7 @@ int PMPI_Gatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, } else if (recvcounts == NULL || displs == NULL) { 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 )) { @@ -1818,12 +1762,12 @@ int PMPI_Gatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, 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); @@ -1832,8 +1776,7 @@ int PMPI_Gatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, } TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__,extra); - smpi_mpi_gatherv(sendtmpbuf, sendtmpcount, sendtmptype, recvbuf, recvcounts, - displs, recvtype, root, comm); + smpi_mpi_gatherv(sendtmpbuf, sendtmpcount, sendtmptype, recvbuf, recvcounts, displs, recvtype, root, comm); retval = MPI_SUCCESS; TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__); } @@ -1843,8 +1786,7 @@ int PMPI_Gatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, } int PMPI_Allgather(void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPI_Comm comm) + void *recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm) { int retval = 0; @@ -1860,7 +1802,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; } @@ -1870,19 +1812,18 @@ 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; TRACE_smpi_collective_in(rank, -1, __FUNCTION__, extra); - mpi_coll_allgather_fun(sendbuf, sendcount, sendtype, recvbuf, recvcount, - recvtype, comm); + mpi_coll_allgather_fun(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm); retval = MPI_SUCCESS; TRACE_smpi_collective_out(rank, -1, __FUNCTION__); } @@ -1891,8 +1832,7 @@ int PMPI_Allgather(void *sendbuf, int sendcount, MPI_Datatype sendtype, } int PMPI_Allgatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int *recvcounts, int *displs, - MPI_Datatype recvtype, MPI_Comm comm) + void *recvbuf, int *recvcounts, int *displs, MPI_Datatype recvtype, MPI_Comm comm) { int retval = 0; @@ -1910,7 +1850,7 @@ int PMPI_Allgatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, } 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; } @@ -1923,12 +1863,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 @@ -1936,8 +1876,7 @@ int PMPI_Allgatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, TRACE_smpi_collective_in(rank, -1, __FUNCTION__,extra); - mpi_coll_allgatherv_fun(sendbuf, sendcount, sendtype, recvbuf, recvcounts, - displs, recvtype, comm); + mpi_coll_allgatherv_fun(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, comm); retval = MPI_SUCCESS; TRACE_smpi_collective_out(rank, -1, __FUNCTION__); } @@ -1947,8 +1886,7 @@ int PMPI_Allgatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, } int PMPI_Scatter(void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPI_Comm comm) + void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm) { int retval = 0; @@ -1976,18 +1914,17 @@ 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); - mpi_coll_scatter_fun(sendbuf, sendcount, sendtype, recvbuf, recvcount, - recvtype, root, comm); + mpi_coll_scatter_fun(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, comm); retval = MPI_SUCCESS; TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__); } @@ -1997,8 +1934,7 @@ int PMPI_Scatter(void *sendbuf, int sendcount, MPI_Datatype sendtype, } int PMPI_Scatterv(void *sendbuf, int *sendcounts, int *displs, - MPI_Datatype sendtype, void *recvbuf, int recvcount, - MPI_Datatype recvtype, int root, MPI_Comm comm) + MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm) { int retval = 0; @@ -2027,7 +1963,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); @@ -2036,13 +1972,12 @@ 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); - smpi_mpi_scatterv(sendbuf, sendcounts, displs, sendtype, recvbuf, - recvcount, recvtype, root, comm); + smpi_mpi_scatterv(sendbuf, sendcounts, displs, sendtype, recvbuf, recvcount, recvtype, root, comm); retval = MPI_SUCCESS; TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__); @@ -2052,8 +1987,7 @@ int PMPI_Scatterv(void *sendbuf, int *sendcounts, int *displs, return retval; } -int PMPI_Reduce(void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, int root, MPI_Comm comm) +int PMPI_Reduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPI_Comm comm) { int retval = 0; @@ -2071,7 +2005,7 @@ int PMPI_Reduce(void *sendbuf, void *recvbuf, int count, 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; @@ -2088,8 +2022,7 @@ int PMPI_Reduce(void *sendbuf, void *recvbuf, int count, return retval; } -int PMPI_Reduce_local(void *inbuf, void *inoutbuf, int count, - MPI_Datatype datatype, MPI_Op op){ +int PMPI_Reduce_local(void *inbuf, void *inoutbuf, int count, MPI_Datatype datatype, MPI_Op op){ int retval = 0; smpi_bench_end(); @@ -2103,8 +2036,7 @@ int PMPI_Reduce_local(void *inbuf, void *inoutbuf, int count, return retval; } -int PMPI_Allreduce(void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) +int PMPI_Allreduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) { int retval = 0; @@ -2118,9 +2050,9 @@ int PMPI_Allreduce(void *sendbuf, void *recvbuf, int count, 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; @@ -2129,7 +2061,7 @@ int PMPI_Allreduce(void *sendbuf, void *recvbuf, int count, 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,8 +2080,7 @@ int PMPI_Allreduce(void *sendbuf, void *recvbuf, int count, return retval; } -int PMPI_Scan(void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) +int PMPI_Scan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) { int retval = 0; @@ -2168,7 +2099,7 @@ int PMPI_Scan(void *sendbuf, void *recvbuf, int count, 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; @@ -2184,8 +2115,7 @@ int PMPI_Scan(void *sendbuf, void *recvbuf, int count, return retval; } -int PMPI_Exscan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, MPI_Comm comm){ +int PMPI_Exscan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm){ int retval = 0; smpi_bench_end(); @@ -2203,7 +2133,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); @@ -2217,8 +2147,7 @@ int PMPI_Exscan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, return retval; } -int PMPI_Reduce_scatter(void *sendbuf, void *recvbuf, int *recvcounts, - MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) +int PMPI_Reduce_scatter(void *sendbuf, void *recvbuf, int *recvcounts, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) { int retval = 0; smpi_bench_end(); @@ -2241,7 +2170,7 @@ int PMPI_Reduce_scatter(void *sendbuf, void *recvbuf, int *recvcounts, 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); @@ -2253,8 +2182,7 @@ int PMPI_Reduce_scatter(void *sendbuf, void *recvbuf, int *recvcounts, if(sendbuf==MPI_IN_PLACE) sendtmpbuf=recvbuf; - mpi_coll_reduce_scatter_fun(sendtmpbuf, recvbuf, recvcounts, - datatype, op, comm); + mpi_coll_reduce_scatter_fun(sendtmpbuf, recvbuf, recvcounts, datatype, op, comm); retval = MPI_SUCCESS; TRACE_smpi_collective_out(rank, -1, __FUNCTION__); } @@ -2264,7 +2192,7 @@ int PMPI_Reduce_scatter(void *sendbuf, void *recvbuf, int *recvcounts, } int PMPI_Reduce_scatter_block(void *sendbuf, void *recvbuf, int recvcount, - MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) + MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) { int retval,i; smpi_bench_end(); @@ -2287,7 +2215,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); @@ -2296,10 +2224,10 @@ 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; @@ -2349,8 +2276,7 @@ int PMPI_Alltoall(void *sendbuf, int sendcount, MPI_Datatype sendtype, return retval; } -int PMPI_Alltoallv(void *sendbuf, int *sendcounts, int *senddisps, - MPI_Datatype sendtype, void *recvbuf, int *recvcounts, +int PMPI_Alltoallv(void *sendbuf, int *sendcounts, int *senddisps,MPI_Datatype sendtype, void *recvbuf, int *recvcounts, int *recvdisps, MPI_Datatype recvtype, MPI_Comm comm) { int retval = 0; @@ -2359,11 +2285,9 @@ int PMPI_Alltoallv(void *sendbuf, int *sendcounts, int *senddisps, if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; - } else if (sendtype == MPI_DATATYPE_NULL - || recvtype == MPI_DATATYPE_NULL) { + } 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 == NULL || senddisps == NULL || recvcounts == NULL || recvdisps == NULL) { retval = MPI_ERR_ARG; } else { int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; @@ -2378,11 +2302,11 @@ int PMPI_Alltoallv(void *sendbuf, int *sendcounts, int *senddisps, 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; @@ -2394,9 +2318,7 @@ int PMPI_Alltoallv(void *sendbuf, int *sendcounts, int *senddisps, extra->num_processes = size; TRACE_smpi_collective_in(rank, -1, __FUNCTION__,extra); - retval = - mpi_coll_alltoallv_fun(sendbuf, sendcounts, senddisps, sendtype, - recvbuf, recvcounts, recvdisps, recvtype, + retval = mpi_coll_alltoallv_fun(sendbuf, sendcounts, senddisps, sendtype, recvbuf, recvcounts, recvdisps, recvtype, comm); TRACE_smpi_collective_out(rank, -1, __FUNCTION__); } @@ -2412,11 +2334,8 @@ int PMPI_Get_processor_name(char *name, int *resultlen) 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 ); - *resultlen = - strlen(name) > - MPI_MAX_PROCESSOR_NAME ? MPI_MAX_PROCESSOR_NAME : strlen(name); + strlen(sg_host_get_name(SIMIX_host_self())) +1 : MPI_MAX_PROCESSOR_NAME - 1 ); + *resultlen = strlen(name) > MPI_MAX_PROCESSOR_NAME ? MPI_MAX_PROCESSOR_NAME : strlen(name); return retval; } @@ -2468,7 +2387,6 @@ int PMPI_Type_commit(MPI_Datatype* datatype) { return retval; } - int PMPI_Type_vector(int count, int blocklen, int stride, MPI_Datatype old_type, MPI_Datatype* new_type) { int retval = 0; @@ -2525,7 +2443,8 @@ int PMPI_Type_create_indexed(int count, int* blocklens, int* indices, MPI_Dataty return retval; } -int PMPI_Type_create_indexed_block(int count, int blocklength, int* indices, MPI_Datatype old_type, MPI_Datatype* new_type) { +int PMPI_Type_create_indexed_block(int count, int blocklength, int* indices, MPI_Datatype old_type, + MPI_Datatype* new_type) { int retval,i; if (old_type == MPI_DATATYPE_NULL) { @@ -2533,15 +2452,15 @@ 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 == NULL || periodic == NULL)) || comm_cart == NULL) { retval = MPI_ERR_ARG; } else{ retval = smpi_mpi_cart_create(comm_old, ndims, dims, periodic, reorder, comm_cart); @@ -2709,26 +2624,19 @@ int PMPI_Type_create_resized(MPI_Datatype oldtype,MPI_Aint lb, MPI_Aint extent, MPI_Aint disps[3] = { lb, 0, lb+extent }; MPI_Datatype types[3] = { MPI_LB, oldtype, MPI_UB }; - s_smpi_mpi_struct_t* subtype = smpi_datatype_struct_create( blocks, - disps, - 3, - types - ); - smpi_datatype_create(newtype,oldtype->size, lb, lb + extent, 1 , subtype, DT_FLAG_VECTOR); + s_smpi_mpi_struct_t* subtype = smpi_datatype_struct_create( blocks, disps, 3, types); + smpi_datatype_create(newtype,oldtype->size, lb, lb + extent, sizeof(s_smpi_mpi_struct_t) , subtype, DT_FLAG_VECTOR); (*newtype)->flags &= ~DT_FLAG_COMMITED; return MPI_SUCCESS; } - - int PMPI_Win_create( void *base, MPI_Aint size, int disp_unit, MPI_Info info, MPI_Comm comm, MPI_Win *win){ int retval = 0; 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 == NULL && size != 0) || disp_unit <= 0 || size < 0 ){ retval= MPI_ERR_OTHER; }else{ *win = smpi_mpi_win_create( base, size, disp_unit, info, comm); @@ -2784,6 +2692,7 @@ int PMPI_Win_get_group(MPI_Win win, MPI_Group * group){ retval = MPI_ERR_WIN; }else { smpi_mpi_win_get_group(win, group); + smpi_group_use(*group); } return retval; } @@ -2799,7 +2708,6 @@ int PMPI_Win_fence( int assert, MPI_Win win){ TRACE_smpi_collective_in(rank, -1, __FUNCTION__, NULL); retval = smpi_mpi_win_fence(assert, win); TRACE_smpi_collective_out(rank, -1, __FUNCTION__); - } smpi_bench_begin(); return retval; @@ -2817,12 +2725,10 @@ 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==NULL && origin_count > 0)){ retval = MPI_ERR_COUNT; - } else if ((!is_datatype_valid(origin_datatype)) || - (!is_datatype_valid(target_datatype))) { + } else if ((!is_datatype_valid(origin_datatype)) || (!is_datatype_valid(target_datatype))) { retval = MPI_ERR_TYPE; } else { int rank = smpi_process_index(); @@ -2831,7 +2737,8 @@ int PMPI_Get( void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int src_traced = smpi_group_index(group, target_rank); TRACE_smpi_ptp_in(rank, src_traced, rank, __FUNCTION__, NULL); - retval = smpi_mpi_get( origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, target_datatype, win); + retval = smpi_mpi_get( origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, + target_datatype, win); TRACE_smpi_ptp_out(rank, src_traced, rank, __FUNCTION__); } @@ -2851,12 +2758,10 @@ 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==NULL && origin_count > 0)){ retval = MPI_ERR_COUNT; - } else if ((!is_datatype_valid(origin_datatype)) || - (!is_datatype_valid(target_datatype))) { + } else if ((!is_datatype_valid(origin_datatype)) || (!is_datatype_valid(target_datatype))) { retval = MPI_ERR_TYPE; } else { int rank = smpi_process_index(); @@ -2866,7 +2771,8 @@ int PMPI_Put( void *origin_addr, int origin_count, MPI_Datatype origin_datatype, TRACE_smpi_ptp_in(rank, rank, dst_traced, __FUNCTION__, NULL); TRACE_smpi_send(rank, rank, dst_traced, 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); + retval = smpi_mpi_put( origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, + target_datatype, win); TRACE_smpi_ptp_out(rank, rank, dst_traced, __FUNCTION__); } @@ -2874,7 +2780,6 @@ int PMPI_Put( void *origin_addr, int origin_count, MPI_Datatype origin_datatype, return retval; } - int PMPI_Accumulate( void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Op op, MPI_Win win){ int retval = 0; @@ -2887,9 +2792,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==NULL && origin_count > 0)){ retval = MPI_ERR_COUNT; } else if ((!is_datatype_valid(origin_datatype)) || (!is_datatype_valid(target_datatype))) { @@ -2903,7 +2807,8 @@ int PMPI_Accumulate( void *origin_addr, int origin_count, MPI_Datatype origin_da int src_traced = smpi_group_index(group, target_rank); TRACE_smpi_ptp_in(rank, src_traced, rank, __FUNCTION__, NULL); - retval = smpi_mpi_accumulate( origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, target_datatype, op, win); + retval = smpi_mpi_accumulate( origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, + target_datatype, op, win); TRACE_smpi_ptp_out(rank, src_traced, rank, __FUNCTION__); } @@ -2911,7 +2816,6 @@ int PMPI_Accumulate( void *origin_addr, int origin_count, MPI_Datatype origin_da return retval; } - int PMPI_Win_post(MPI_Group group, int assert, MPI_Win win){ int retval = 0; smpi_bench_end(); @@ -2948,7 +2852,6 @@ int PMPI_Win_start(MPI_Group group, int assert, MPI_Win win){ return retval; } - int PMPI_Win_complete(MPI_Win win){ int retval = 0; smpi_bench_end(); @@ -2987,10 +2890,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==NULL) return MPI_ERR_NO_MEM; else { - *(void **)baseptr = ptr; + *static_cast(baseptr) = ptr; return MPI_SUCCESS; } } @@ -3029,7 +2932,6 @@ int PMPI_Type_get_name(MPI_Datatype datatype, char * name, int* len) return retval; } - MPI_Datatype PMPI_Type_f2c(MPI_Fint datatype){ return smpi_type_f2c(datatype); } @@ -3095,8 +2997,7 @@ int PMPI_Keyval_free(int* keyval) { } int PMPI_Attr_delete(MPI_Comm comm, int keyval) { - if(keyval == MPI_TAG_UB||keyval == MPI_HOST||keyval == MPI_IO - ||keyval == MPI_WTIME_IS_GLOBAL||keyval == MPI_APPNUM + if(keyval == MPI_TAG_UB||keyval == MPI_HOST||keyval == MPI_IO ||keyval == MPI_WTIME_IS_GLOBAL||keyval == MPI_APPNUM ||keyval == MPI_UNIVERSE_SIZE||keyval == MPI_LASTUSEDCODE) return MPI_ERR_ARG; else if (comm==MPI_COMM_NULL) @@ -3121,37 +3022,31 @@ 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); } } int PMPI_Attr_put(MPI_Comm comm, int keyval, void* attr_value) { - if(keyval == MPI_TAG_UB||keyval == MPI_HOST||keyval == MPI_IO - ||keyval == MPI_WTIME_IS_GLOBAL||keyval == MPI_APPNUM + if(keyval == MPI_TAG_UB||keyval == MPI_HOST||keyval == MPI_IO ||keyval == MPI_WTIME_IS_GLOBAL||keyval == MPI_APPNUM ||keyval == MPI_UNIVERSE_SIZE||keyval == MPI_LASTUSEDCODE) return MPI_ERR_ARG; else if (comm==MPI_COMM_NULL) @@ -3175,7 +3070,8 @@ int PMPI_Comm_delete_attr (MPI_Comm comm, int comm_keyval) return PMPI_Attr_delete(comm, comm_keyval); } -int PMPI_Comm_create_keyval(MPI_Comm_copy_attr_function* copy_fn, MPI_Comm_delete_attr_function* delete_fn, int* keyval, void* extra_state) +int PMPI_Comm_create_keyval(MPI_Comm_copy_attr_function* copy_fn, MPI_Comm_delete_attr_function* delete_fn, int* keyval, + void* extra_state) { return PMPI_Keyval_create(copy_fn, delete_fn, keyval, extra_state); } @@ -3184,7 +3080,6 @@ int PMPI_Comm_free_keyval(int* keyval) { return PMPI_Keyval_free(keyval); } - int PMPI_Type_get_attr (MPI_Datatype type, int type_keyval, void *attribute_val, int* flag) { if (type==MPI_DATATYPE_NULL) @@ -3209,7 +3104,8 @@ int PMPI_Type_delete_attr (MPI_Datatype type, int type_keyval) return smpi_type_attr_delete(type, type_keyval); } -int PMPI_Type_create_keyval(MPI_Type_copy_attr_function* copy_fn, MPI_Type_delete_attr_function* delete_fn, int* keyval, void* extra_state) +int PMPI_Type_create_keyval(MPI_Type_copy_attr_function* copy_fn, MPI_Type_delete_attr_function* delete_fn, int* keyval, + void* extra_state) { return smpi_type_keyval_create(copy_fn, delete_fn, keyval, extra_state); } @@ -3248,16 +3144,16 @@ int PMPI_Info_free( MPI_Info *info){ } int PMPI_Info_get(MPI_Info info,char *key,int valuelen, char *value, int *flag){ - *flag=FALSE; + *flag=false; if (info == NULL || key == NULL || valuelen <0) return MPI_ERR_ARG; if (value == NULL) 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){ - memcpy(value,tmpvalue, (strlen(tmpvalue) + 1 < static_cast(valuelen)) ? - strlen(tmpvalue) + 1 : valuelen); - *flag=TRUE; + memset(value, 0, valuelen); + memcpy(value,tmpvalue, (strlen(tmpvalue) + 1 < static_cast(valuelen)) ? strlen(tmpvalue) + 1 : valuelen); + *flag=true; } return MPI_SUCCESS; } @@ -3267,11 +3163,12 @@ int PMPI_Info_dup(MPI_Info info, MPI_Info *newinfo){ return MPI_ERR_ARG; *newinfo = xbt_new(s_smpi_mpi_info_t, 1); (*newinfo)->info_dict= xbt_dict_new_homogeneous(NULL); + (*newinfo)->refcount=1; xbt_dict_cursor_t cursor = NULL; 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), data, NULL); } return MPI_SUCCESS; } @@ -3306,7 +3203,8 @@ int PMPI_Info_get_nthkey( MPI_Info info, int n, char *key){ 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; } num++; @@ -3315,13 +3213,13 @@ 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 || *valuelen <0) + *flag=false; + if (info == NULL || key == NULL || valuelen==NULL) return MPI_ERR_ARG; char* tmpvalue=(char*)xbt_dict_get_or_null(info->info_dict, key); if(tmpvalue){ *valuelen=strlen(tmpvalue); - *flag=TRUE; + *flag=true; } return MPI_SUCCESS; } @@ -3359,318 +3257,3 @@ int PMPI_Pack_size(int incount, MPI_Datatype datatype, MPI_Comm comm, int* size) return MPI_SUCCESS; } - -/* The following calls are not yet implemented and will fail at runtime. */ -/* Once implemented, please move them above this notice. */ - -#define NOT_YET_IMPLEMENTED { \ - XBT_WARN("Not yet implemented : %s. Please contact the Simgrid team if support is needed", __FUNCTION__); \ - return MPI_SUCCESS; \ - } - -MPI_Errhandler PMPI_Errhandler_f2c(MPI_Fint errhandler){ - NOT_YET_IMPLEMENTED -} - -MPI_Fint PMPI_Errhandler_c2f(MPI_Errhandler errhandler){ - NOT_YET_IMPLEMENTED -} - -int PMPI_Cart_map(MPI_Comm comm_old, int ndims, int* dims, int* periods, int* newrank) { - NOT_YET_IMPLEMENTED -} - -int PMPI_Graph_create(MPI_Comm comm_old, int nnodes, int* index, int* edges, int reorder, MPI_Comm* comm_graph) { - NOT_YET_IMPLEMENTED -} - -int PMPI_Graph_get(MPI_Comm comm, int maxindex, int maxedges, int* index, int* edges) { - NOT_YET_IMPLEMENTED -} - -int PMPI_Graph_map(MPI_Comm comm_old, int nnodes, int* index, int* edges, int* newrank) { - NOT_YET_IMPLEMENTED -} - -int PMPI_Graph_neighbors(MPI_Comm comm, int rank, int maxneighbors, int* neighbors) { - NOT_YET_IMPLEMENTED -} - -int PMPI_Graph_neighbors_count(MPI_Comm comm, int rank, int* nneighbors) { - NOT_YET_IMPLEMENTED -} - -int PMPI_Graphdims_get(MPI_Comm comm, int* nnodes, int* nedges) { - NOT_YET_IMPLEMENTED -} - -int PMPI_Topo_test(MPI_Comm comm, int* top_type) { - NOT_YET_IMPLEMENTED -} - -int PMPI_Errhandler_create(MPI_Handler_function* function, MPI_Errhandler* errhandler) { - NOT_YET_IMPLEMENTED -} - -int PMPI_Errhandler_free(MPI_Errhandler* errhandler) { - NOT_YET_IMPLEMENTED -} - -int PMPI_Errhandler_get(MPI_Comm comm, MPI_Errhandler* errhandler) { - NOT_YET_IMPLEMENTED -} - -int PMPI_Error_string(int errorcode, char* string, int* resultlen) { - NOT_YET_IMPLEMENTED -} - -int PMPI_Errhandler_set(MPI_Comm comm, MPI_Errhandler errhandler) { - NOT_YET_IMPLEMENTED -} - -int PMPI_Comm_set_errhandler(MPI_Comm comm, MPI_Errhandler errhandler) { - NOT_YET_IMPLEMENTED -} - -int PMPI_Win_set_errhandler(MPI_Win win, MPI_Errhandler errhandler) { - NOT_YET_IMPLEMENTED -} - -int PMPI_Comm_get_errhandler(MPI_Comm comm, MPI_Errhandler* errhandler) { - NOT_YET_IMPLEMENTED -} - -int PMPI_Cancel(MPI_Request* request) { - NOT_YET_IMPLEMENTED -} - -int PMPI_Buffer_attach(void* buffer, int size) { - NOT_YET_IMPLEMENTED -} - -int PMPI_Buffer_detach(void* buffer, int* size) { - NOT_YET_IMPLEMENTED -} - -int PMPI_Comm_test_inter(MPI_Comm comm, int* flag) { - NOT_YET_IMPLEMENTED -} - -int PMPI_Pcontrol(const int level ) -{ - NOT_YET_IMPLEMENTED -} - - -int PMPI_Intercomm_create(MPI_Comm local_comm, int local_leader, MPI_Comm peer_comm, int remote_leader, int tag, MPI_Comm* comm_out) { - NOT_YET_IMPLEMENTED -} - -int PMPI_Intercomm_merge(MPI_Comm comm, int high, MPI_Comm* comm_out) { - NOT_YET_IMPLEMENTED -} - -int PMPI_Bsend(void* buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm) { - NOT_YET_IMPLEMENTED -} - -int PMPI_Bsend_init(void* buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm, MPI_Request* request) { - NOT_YET_IMPLEMENTED -} - -int PMPI_Ibsend(void* buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm, MPI_Request* request) { - NOT_YET_IMPLEMENTED -} - -int PMPI_Comm_remote_group(MPI_Comm comm, MPI_Group* group) { - NOT_YET_IMPLEMENTED -} - -int PMPI_Comm_remote_size(MPI_Comm comm, int* size) { - NOT_YET_IMPLEMENTED -} - -int PMPI_Rsend(void* buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm) { - NOT_YET_IMPLEMENTED -} - -int PMPI_Rsend_init(void* buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm, MPI_Request* request) { - NOT_YET_IMPLEMENTED -} - -int PMPI_Irsend(void* buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm, MPI_Request* request) { - NOT_YET_IMPLEMENTED -} - -int PMPI_Test_cancelled(MPI_Status* status, int* flag) { - NOT_YET_IMPLEMENTED -} - - - -int PMPI_Pack_external_size(char *datarep, int incount, MPI_Datatype datatype, MPI_Aint *size){ - NOT_YET_IMPLEMENTED -} - -int PMPI_Pack_external(char *datarep, void *inbuf, int incount, MPI_Datatype datatype, void *outbuf, MPI_Aint outcount, MPI_Aint *position){ - NOT_YET_IMPLEMENTED -} - -int PMPI_Unpack_external( char *datarep, void *inbuf, MPI_Aint insize, MPI_Aint *position, void *outbuf, int outcount, MPI_Datatype datatype){ - NOT_YET_IMPLEMENTED -} - -int PMPI_Get_elements(MPI_Status* status, MPI_Datatype datatype, int* elements) { - NOT_YET_IMPLEMENTED -} - - - -int PMPI_Type_get_envelope( MPI_Datatype datatype, int *num_integers, - int *num_addresses, int *num_datatypes, int *combiner){ - NOT_YET_IMPLEMENTED -} - -int PMPI_Type_get_contents(MPI_Datatype datatype, int max_integers, int max_addresses, - int max_datatypes, int* array_of_integers, MPI_Aint* array_of_addresses, - MPI_Datatype* array_of_datatypes){ - NOT_YET_IMPLEMENTED -} - -int PMPI_Type_create_darray(int size, int rank, int ndims, int* array_of_gsizes, - int* array_of_distribs, int* array_of_dargs, int* array_of_psizes, - int order, MPI_Datatype oldtype, MPI_Datatype *newtype) { - NOT_YET_IMPLEMENTED -} - -int PMPI_Type_create_subarray(int ndims,int *array_of_sizes, int *array_of_subsizes, int *array_of_starts, int order, MPI_Datatype oldtype, MPI_Datatype *newtype){ - NOT_YET_IMPLEMENTED -} - -int PMPI_Type_match_size(int typeclass,int size,MPI_Datatype *datatype){ - NOT_YET_IMPLEMENTED -} - -int PMPI_Alltoallw( void *sendbuf, int *sendcnts, int *sdispls, MPI_Datatype *sendtypes, - void *recvbuf, int *recvcnts, int *rdispls, MPI_Datatype *recvtypes, - MPI_Comm comm){ - NOT_YET_IMPLEMENTED -} - -int PMPI_Comm_set_name(MPI_Comm comm, char* name){ - NOT_YET_IMPLEMENTED -} - -int PMPI_Comm_dup_with_info(MPI_Comm comm, MPI_Info info, MPI_Comm * newcomm){ - NOT_YET_IMPLEMENTED -} - -int PMPI_Comm_split_type(MPI_Comm comm, int split_type, int key, MPI_Info info, MPI_Comm *newcomm){ - NOT_YET_IMPLEMENTED -} - -int PMPI_Comm_set_info (MPI_Comm comm, MPI_Info info){ - NOT_YET_IMPLEMENTED -} - -int PMPI_Comm_get_info (MPI_Comm comm, MPI_Info* info){ - NOT_YET_IMPLEMENTED -} - -int PMPI_Comm_create_errhandler( MPI_Comm_errhandler_fn *function, MPI_Errhandler *errhandler){ - NOT_YET_IMPLEMENTED -} - -int PMPI_Add_error_class( int *errorclass){ - NOT_YET_IMPLEMENTED -} - -int PMPI_Add_error_code( int errorclass, int *errorcode){ - NOT_YET_IMPLEMENTED -} - -int PMPI_Add_error_string( int errorcode, char *string){ - NOT_YET_IMPLEMENTED -} - -int PMPI_Comm_call_errhandler(MPI_Comm comm,int errorcode){ - NOT_YET_IMPLEMENTED -} - -int PMPI_Request_get_status( MPI_Request request, int *flag, MPI_Status *status){ - NOT_YET_IMPLEMENTED -} - -int PMPI_Grequest_start( MPI_Grequest_query_function *query_fn, MPI_Grequest_free_function *free_fn, MPI_Grequest_cancel_function *cancel_fn, void *extra_state, MPI_Request *request){ - NOT_YET_IMPLEMENTED -} - -int PMPI_Grequest_complete( MPI_Request request){ - NOT_YET_IMPLEMENTED -} - -int PMPI_Status_set_cancelled(MPI_Status *status,int flag){ - NOT_YET_IMPLEMENTED -} - -int PMPI_Status_set_elements( MPI_Status *status, MPI_Datatype datatype, int count){ - NOT_YET_IMPLEMENTED -} - -int PMPI_Comm_connect( char *port_name, MPI_Info info, int root, MPI_Comm comm, MPI_Comm *newcomm){ - NOT_YET_IMPLEMENTED -} - -int PMPI_Publish_name( char *service_name, MPI_Info info, char *port_name){ - NOT_YET_IMPLEMENTED -} - -int PMPI_Unpublish_name( char *service_name, MPI_Info info, char *port_name){ - NOT_YET_IMPLEMENTED -} - -int PMPI_Lookup_name( char *service_name, MPI_Info info, char *port_name){ - NOT_YET_IMPLEMENTED -} - -int PMPI_Comm_join( int fd, MPI_Comm *intercomm){ - NOT_YET_IMPLEMENTED -} - -int PMPI_Open_port( MPI_Info info, char *port_name){ - NOT_YET_IMPLEMENTED -} - -int PMPI_Close_port(char *port_name){ - NOT_YET_IMPLEMENTED -} - -int PMPI_Comm_accept( char *port_name, MPI_Info info, int root, MPI_Comm comm, MPI_Comm *newcomm){ - NOT_YET_IMPLEMENTED -} - -int PMPI_Comm_spawn( char *command, char **argv, int maxprocs, MPI_Info info, int root, MPI_Comm comm, MPI_Comm *intercomm, int* array_of_errcodes){ - NOT_YET_IMPLEMENTED -} - -int PMPI_Comm_spawn_multiple( int count, char **array_of_commands, char*** array_of_argv, - int* array_of_maxprocs, MPI_Info* array_of_info, int root, - MPI_Comm comm, MPI_Comm *intercomm, int* array_of_errcodes){ - NOT_YET_IMPLEMENTED -} - -int PMPI_Comm_get_parent( MPI_Comm *parent){ - NOT_YET_IMPLEMENTED -} - -int PMPI_Win_lock(int lock_type, int rank, int assert, MPI_Win win) { - NOT_YET_IMPLEMENTED -} - -int PMPI_Win_test(MPI_Win win, int *flag){ - NOT_YET_IMPLEMENTED -} - -int PMPI_Win_unlock(int rank, MPI_Win win){ - NOT_YET_IMPLEMENTED -}