-
-/* 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"
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 = static_cast<MPI_Count>(smpi_datatype_size(datatype));
+ retval = MPI_SUCCESS;
+ }
+ return retval;
+}
+
int PMPI_Type_get_extent(MPI_Datatype datatype, MPI_Aint * lb, MPI_Aint * extent)
{
int retval = 0;
} 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)) {
} 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 {
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;
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;
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__);
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));
+ TRACE_smpi_send(rank, rank, dst_traced, tag,count*smpi_datatype_size(datatype));
}
smpi_mpi_send(buf, count, datatype, dst, tag, comm);
}
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));
smpi_mpi_ssend(buf, count, datatype, dst, tag, comm);
retval = MPI_SUCCESS;
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();
smpi_empty_status(status);
retval = MPI_SUCCESS;
} else {
- int rank = (request!=nullptr && (*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 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);
}
}
smpi_bench_end();
//save requests information for tracing
int i;
- int *srcs = nullptr, *dsts = nullptr, *recvs = nullptr;
- MPI_Comm* comms = nullptr;
+ 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);
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]){
+ 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;
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();
{
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;
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__, nullptr);
- TRACE_smpi_send(rank, rank, dst_traced, origin_count*smpi_datatype_size(origin_datatype));
+ 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);
