-/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-2019. 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 "private.hpp"
#include "smpi_comm.hpp"
#include "smpi_datatype.hpp"
-#include "smpi_process.hpp"
#include "smpi_request.hpp"
+#include "src/smpi/include/smpi_actor.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(smpi_pmpi);
int my_proc_id = simgrid::s4u::this_actor::get_pid();
TRACE_smpi_comm_in(my_proc_id, __func__,
- new simgrid::instr::Pt2PtTIData("Irecv", src,
+ new simgrid::instr::Pt2PtTIData("irecv", src,
datatype->is_replayable() ? count : count * datatype->size(),
tag, simgrid::smpi::Datatype::encode(datatype)));
int my_proc_id = simgrid::s4u::this_actor::get_pid();
int trace_dst = getPid(comm, dst);
TRACE_smpi_comm_in(my_proc_id, __func__,
- new simgrid::instr::Pt2PtTIData("Isend", dst,
+ new simgrid::instr::Pt2PtTIData("isend", dst,
datatype->is_replayable() ? count : count * datatype->size(),
tag, simgrid::smpi::Datatype::encode(datatype)));
} else {
int my_proc_id = ((*request)->comm() != MPI_COMM_NULL) ? simgrid::s4u::this_actor::get_pid() : -1;
- TRACE_smpi_testing_in(my_proc_id);
-
+ TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("test"));
+
*flag = simgrid::smpi::Request::test(request,status);
- TRACE_smpi_testing_out(my_proc_id);
+ TRACE_smpi_comm_out(my_proc_id);
retval = MPI_SUCCESS;
}
smpi_bench_begin();
if (index == nullptr || flag == nullptr) {
retval = MPI_ERR_ARG;
} else {
+ int my_proc_id = simgrid::s4u::this_actor::get_pid();
+ TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("testany"));
*flag = simgrid::smpi::Request::testany(count, requests, index, status);
+ TRACE_smpi_comm_out(my_proc_id);
retval = MPI_SUCCESS;
}
smpi_bench_begin();
if (flag == nullptr) {
retval = MPI_ERR_ARG;
} else {
+ int my_proc_id = simgrid::s4u::this_actor::get_pid();
+ TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("testall"));
*flag = simgrid::smpi::Request::testall(count, requests, statuses);
+ TRACE_smpi_comm_out(my_proc_id);
retval = MPI_SUCCESS;
}
smpi_bench_begin();
return retval;
}
+int PMPI_Testsome(int incount, MPI_Request requests[], int* outcount, int* indices, MPI_Status status[])
+{
+ int retval = 0;
+
+ smpi_bench_end();
+ if (outcount == nullptr) {
+ retval = MPI_ERR_ARG;
+ } else {
+ int my_proc_id = simgrid::s4u::this_actor::get_pid();
+ TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("testsome"));
+ *outcount = simgrid::smpi::Request::testsome(incount, requests, indices, status);
+ TRACE_smpi_comm_out(my_proc_id);
+ retval = MPI_SUCCESS;
+ }
+ smpi_bench_begin();
+ return retval;
+}
+
int PMPI_Probe(int source, int tag, MPI_Comm comm, MPI_Status* status) {
int retval = 0;
smpi_bench_end();
int dst_traced = req->dst();
if (req->flags() & MPI_REQ_RECV) { // Is this request a wait for RECV?
if (src_traced == MPI_ANY_SOURCE)
- src_traced = (status != MPI_STATUSES_IGNORE) ? req->comm()->group()->rank(status->MPI_SOURCE) : req->src();
+ src_traced = (status != MPI_STATUS_IGNORE) ? req->comm()->group()->rank(status->MPI_SOURCE) : req->src();
TRACE_smpi_recv(src_traced, dst_traced, req->tag());
}
}
} else if (*request == MPI_REQUEST_NULL) {
retval = MPI_SUCCESS;
} else {
+ //for tracing, save the handle which might get overriden before we can use the helper on it
+ MPI_Request savedreq = *request;
+ if (savedreq != MPI_REQUEST_NULL && not(savedreq->flags() & MPI_REQ_FINISHED))
+ savedreq->ref();//don't erase te handle in Request::wait, we'll need it later
+ else
+ savedreq = MPI_REQUEST_NULL;
+
int my_proc_id = (*request)->comm() != MPI_COMM_NULL
? simgrid::s4u::this_actor::get_pid()
: -1; // TODO: cheinrich: Check if this correct or if it should be MPI_UNDEFINED
-
- TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("wait"));
+ TRACE_smpi_comm_in(my_proc_id, __func__,
+ new simgrid::instr::WaitTIData((*request)->src(), (*request)->dst(), (*request)->tag()));
simgrid::smpi::Request::wait(request, status);
retval = MPI_SUCCESS;
//the src may not have been known at the beginning of the recv (MPI_ANY_SOURCE)
TRACE_smpi_comm_out(my_proc_id);
- trace_smpi_recv_helper(request, status);
+ trace_smpi_recv_helper(&savedreq, status);
+ if (savedreq != MPI_REQUEST_NULL)
+ simgrid::smpi::Request::unref(&savedreq);
}
smpi_bench_begin();
return MPI_SUCCESS;
smpi_bench_end();
+ //for tracing, save the handles which might get overriden before we can use the helper on it
+ std::vector<MPI_Request> savedreqs(requests, requests + count);
+ for (MPI_Request& req : savedreqs) {
+ if (req != MPI_REQUEST_NULL && not(req->flags() & MPI_REQ_FINISHED))
+ req->ref();
+ else
+ req = MPI_REQUEST_NULL;
+ }
int rank_traced = simgrid::s4u::this_actor::get_pid(); // FIXME: In PMPI_Wait, we check if the comm is null?
TRACE_smpi_comm_in(rank_traced, __func__, new simgrid::instr::CpuTIData("waitAny", static_cast<double>(count)));
*index = simgrid::smpi::Request::waitany(count, requests, status);
if(*index!=MPI_UNDEFINED){
- trace_smpi_recv_helper(&requests[*index], status);
+ trace_smpi_recv_helper(&savedreqs[*index], status);
TRACE_smpi_comm_out(rank_traced);
}
+ for (MPI_Request& req : savedreqs)
+ if (req != MPI_REQUEST_NULL)
+ simgrid::smpi::Request::unref(&req);
+
smpi_bench_begin();
return MPI_SUCCESS;
}
{
smpi_bench_end();
+ //for tracing, save the handles which might get overriden before we can use the helper on it
+ std::vector<MPI_Request> savedreqs(requests, requests + count);
+ for (MPI_Request& req : savedreqs) {
+ if (req != MPI_REQUEST_NULL && not(req->flags() & MPI_REQ_FINISHED))
+ req->ref();
+ else
+ req = MPI_REQUEST_NULL;
+ }
+
int rank_traced = simgrid::s4u::this_actor::get_pid(); // FIXME: In PMPI_Wait, we check if the comm is null?
- TRACE_smpi_comm_in(rank_traced, __func__, new simgrid::instr::CpuTIData("waitAll", static_cast<double>(count)));
+ TRACE_smpi_comm_in(rank_traced, __func__, new simgrid::instr::CpuTIData("waitall", static_cast<double>(count)));
int retval = simgrid::smpi::Request::waitall(count, requests, status);
for (int i = 0; i < count; i++) {
- trace_smpi_recv_helper(&requests[i], &status[i]);
+ trace_smpi_recv_helper(&savedreqs[i], status!=MPI_STATUSES_IGNORE ? &status[i]: MPI_STATUS_IGNORE);
}
TRACE_smpi_comm_out(rank_traced);
+ for (MPI_Request& req : savedreqs)
+ if (req != MPI_REQUEST_NULL)
+ simgrid::smpi::Request::unref(&req);
+
smpi_bench_begin();
return retval;
}
return retval;
}
-int PMPI_Testsome(int incount, MPI_Request requests[], int* outcount, int* indices, MPI_Status status[])
-{
- int retval = 0;
-
- smpi_bench_end();
- if (outcount == nullptr) {
- retval = MPI_ERR_ARG;
- } else {
- *outcount = simgrid::smpi::Request::testsome(incount, requests, indices, status);
- retval = MPI_SUCCESS;
- }
- smpi_bench_begin();
- return retval;
-}
-
int PMPI_Cancel(MPI_Request* request)
{
int retval = 0;
