-
-/* 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 <simgrid/s4u/host.hpp>
+#include <xbt/ex.hpp>
+
#include "private.h"
#include "smpi_mpi_dt_private.h"
// 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();
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();
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);
{
int retval = 0;
- if (provided == NULL) {
+ if (provided == nullptr) {
retval = MPI_ERR_ARG;
} else {
*provided = MPI_THREAD_SINGLE;
{
int retval = 0;
- if (flag == NULL) {
+ if (flag == nullptr) {
retval = MPI_ERR_ARG;
} else {
*flag = smpi_process_index() == 0;
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;
}
{
int retval = 0;
- if (!address) {
+ if (address==nullptr) {
retval = MPI_ERR_ARG;
} else {
- *address = (MPI_Aint) location;
+ *address = reinterpret_cast<MPI_Aint>(location);
retval = MPI_SUCCESS;
}
return retval;
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<int>(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<MPI_Count>(smpi_datatype_size(datatype));
retval = MPI_SUCCESS;
}
return retval;
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);
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);
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);
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);
{
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;
{
int retval = 0;
- if (op == NULL) {
+ if (op == nullptr) {
retval = MPI_ERR_ARG;
} else if (*op == MPI_OP_NULL) {
retval = MPI_ERR_OP;
{
int retval = 0;
- if (group == NULL) {
+ if (group == nullptr) {
retval = MPI_ERR_ARG;
} else {
smpi_group_destroy(*group);
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);
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());
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);
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);
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);
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);
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);
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)) {
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) {
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 {
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);
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);
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);
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);
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 */
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);
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;
{
int retval = 0;
- if (comm == NULL) {
+ if (comm == nullptr) {
retval = MPI_ERR_ARG;
} else if (*comm == MPI_COMM_NULL) {
retval = MPI_ERR_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;
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;
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;
retval = MPI_SUCCESS;
}
smpi_bench_begin();
- if (retval != MPI_SUCCESS && request)
+ if (retval != MPI_SUCCESS && request != nullptr)
*request = MPI_REQUEST_NULL;
return retval;
}
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;
retval = MPI_SUCCESS;
}
smpi_bench_begin();
- if (retval != MPI_SUCCESS && request)
+ if (retval != MPI_SUCCESS && request != nullptr)
*request = MPI_REQUEST_NULL;
return retval;
}
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;
retval = MPI_SUCCESS;
}
smpi_bench_begin();
- if (retval != MPI_SUCCESS && request)
+ if (retval != MPI_SUCCESS && request != nullptr)
*request = MPI_REQUEST_NULL;
return retval;
}
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);
int retval;
int i = 0;
smpi_bench_end();
- if (requests == NULL) {
+ if (requests == nullptr) {
retval = MPI_ERR_ARG;
} else {
retval = MPI_SUCCESS;
smpi_bench_end();
- if (request == NULL) {
+ if (request == nullptr) {
retval = MPI_ERR_ARG;
} else if (comm == MPI_COMM_NULL) {
retval = MPI_ERR_COMM;
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;
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);
}
smpi_bench_begin();
- if (retval != MPI_SUCCESS && request)
+ if (retval != MPI_SUCCESS && request != nullptr)
*request = MPI_REQUEST_NULL;
return retval;
}
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;
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;
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;
}
smpi_bench_begin();
- if (retval != MPI_SUCCESS && request)
+ if (retval != MPI_SUCCESS && request!=nullptr)
*request = MPI_REQUEST_NULL;
return retval;
}
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;
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;
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;
}
smpi_bench_begin();
- if (retval != MPI_SUCCESS && request)
+ if (retval != MPI_SUCCESS && request!=nullptr)
*request = MPI_REQUEST_NULL;
return retval;
}
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;
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);
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__);
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)
}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;
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();
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)) {
{
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;
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);
int retval = 0;
smpi_bench_end();
- if (flag == NULL) {
+ if (flag == nullptr) {
retval = MPI_ERR_ARG;
} else {
*flag = smpi_mpi_testall(count, requests, statuses);
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;
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;
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);
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);
}
}
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();
*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;
}
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();
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;
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);
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);
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 (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();
retval = MPI_ERR_COUNT;
} else {
- char* sendtmpbuf = (char*) sendbuf;
+ char* sendtmpbuf = static_cast<char*>(sendbuf);
int sendtmpcount = sendcount;
MPI_Datatype sendtmptype = sendtype;
if( (smpi_comm_rank(comm) == root) && (sendbuf == MPI_IN_PLACE )) {
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;
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<char*>(sendbuf);
int sendtmpcount = sendcount;
MPI_Datatype sendtmptype = sendtype;
if( (smpi_comm_rank(comm) == root) && (sendbuf == MPI_IN_PLACE )) {
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);
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<char*>(recvbuf)+smpi_datatype_get_extent(recvtype)*recvcount*smpi_comm_rank(comm);
sendcount=recvcount;
sendtype=recvtype;
}
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;
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<char*>(recvbuf)+smpi_datatype_get_extent(recvtype)*displs[smpi_comm_rank(comm)];
sendcount=recvcounts[smpi_comm_rank(comm)];
sendtype=recvtype;
}
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
|| ((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 {
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);
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))) {
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);
}
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);
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;
retval = MPI_ERR_OP;
} else {
- char* sendtmpbuf = (char*) sendbuf;
+ char* sendtmpbuf = static_cast<char*>(sendbuf);
if( sendbuf == MPI_IN_PLACE ) {
- sendtmpbuf = (char *)xbt_malloc(count*smpi_datatype_get_extent(datatype));
+ sendtmpbuf = static_cast<char*>(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;
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;
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;
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);
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;
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);
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);
TRACE_smpi_collective_in(rank, -1, __FUNCTION__,extra);
- int* recvcounts=(int*)xbt_malloc(count);
- for (i=0; i<count;i++)recvcounts[i]=recvcount;
+ int* recvcounts=static_cast<int*>(xbt_malloc(count));
+ for (i=0; i<count;i++)
+ recvcounts[i]=recvcount;
mpi_coll_reduce_scatter_fun(sendbuf, recvbuf, recvcounts, datatype, op, comm);
xbt_free(recvcounts);
retval = MPI_SUCCESS;
extra->type = 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;
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;
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;
{
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;
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;
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);
} else if (count<0){
retval = MPI_ERR_COUNT;
} else {
- int* blocklens=(int*)xbt_malloc(blocklength*count);
- for (i=0; i<count;i++)blocklens[i]=blocklength;
+ int* blocklens=static_cast<int*>(xbt_malloc(blocklength*count));
+ for (i=0; i<count;i++)
+ blocklens[i]=blocklength;
retval = smpi_datatype_indexed(count, blocklens, indices, old_type, new_type);
xbt_free(blocklens);
}
return MPI_SUCCESS;
}
-/* The topo part of MPI_COMM_WORLD should always be NULL. When other topologies will be implemented, not only should we
- * check if the topology is NULL, but we should check if it is the good topology type (so we have to add a
+/* The topo part of MPI_COMM_WORLD should always be nullptr. When other topologies will be implemented, not only should we
+ * check if the topology is nullptr, but we should check if it is the good topology type (so we have to add a
* MPIR_Topo_Type field, and replace the MPI_Topology field by an union)*/
int PMPI_Cart_create(MPI_Comm comm_old, int ndims, int* dims, int* periodic, int reorder, MPI_Comm* comm_cart) {
int retval = 0;
if (comm_old == MPI_COMM_NULL){
retval = MPI_ERR_COMM;
- } else if (ndims < 0 || (ndims > 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);
}
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)) {
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) {
}
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);
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);
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);
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);
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);
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__);
}
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;
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);
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;
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);
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))) {
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);
}
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__);
}
}
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__);
}
}
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);
}
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);
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<void**>(baseptr) = ptr;
return MPI_SUCCESS;
}
}
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);
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);
case MPI_IO:
case MPI_APPNUM:
*flag = 1;
- *(int**)attr_value = &zero;
+ *static_cast<int**>(attr_value) = &zero;
return MPI_SUCCESS;
case MPI_UNIVERSE_SIZE:
*flag = 1;
- *(int**)attr_value = &smpi_universe_size;
+ *static_cast<int**>(attr_value) = &smpi_universe_size;
return MPI_SUCCESS;
case MPI_LASTUSEDCODE:
*flag = 1;
- *(int**)attr_value = &last_used_code;
+ *static_cast<int**>(attr_value) = &last_used_code;
return MPI_SUCCESS;
case MPI_TAG_UB:
*flag=1;
- *(int**)attr_value = &tag_ub;
+ *static_cast<int**>(attr_value) = &tag_ub;
return MPI_SUCCESS;
case MPI_WTIME_IS_GLOBAL:
*flag = 1;
- *(int**)attr_value = &one;
+ *static_cast<int**>(attr_value) = &one;
return MPI_SUCCESS;
default:
return smpi_comm_attr_get(comm, keyval, attr_value, flag);
}
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){
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<char*>(xbt_dict_get_or_null(info->info_dict, key));
if(tmpvalue){
memset(value, 0, valuelen);
memcpy(value,tmpvalue, (strlen(tmpvalue) + 1 < static_cast<size_t>(valuelen)) ? strlen(tmpvalue) + 1 : valuelen);
}
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<char*>(key), xbt_strdup(reinterpret_cast<char*>(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;
}
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){
}
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;
}
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;
