* under the terms of the license (GNU LGPL) which comes with this package. */
#include "private.h"
-#include "smpi_coll_private.h"
#include "smpi_mpi_dt_private.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_pmpi, smpi,
#ifdef HAVE_TRACING
//this function need to be here because of the calls to smpi_bench
-int TRACE_smpi_set_category(const char *category)
+void TRACE_smpi_set_category(const char *category)
{
//need to end bench otherwise categories for execution tasks are wrong
smpi_bench_end();
- int ret;
- if (!IS_TRACING){
- ret = 1;
- }else{
- if (category != NULL) {
- ret = TRACE_category(category);
- TRACE_category_set(SIMIX_process_self(), category);
- }else{
- //if category is NULL, trace of platform is disabled for this process
- TRACE_category_unset(SIMIX_process_self());
- ret = 0;
- }
- }
+ TRACE_internal_smpi_set_category (category);
//begin bench after changing process's category
smpi_bench_begin();
- return ret;
}
#endif
{
smpi_process_init(argc, argv);
#ifdef HAVE_TRACING
- TRACE_smpi_init(smpi_process_index());
+ int rank = smpi_process_index();
+ TRACE_smpi_init(rank);
+
+ TRACE_smpi_computing_init(rank);
#endif
smpi_bench_begin();
return MPI_SUCCESS;
int PMPI_Finalize(void)
{
+ smpi_process_finalize();
smpi_bench_end();
#ifdef HAVE_TRACING
+ int rank = smpi_process_index();
+ TRACE_smpi_computing_out(rank);
TRACE_smpi_finalize(smpi_process_index());
#endif
smpi_process_destroy();
{
smpi_bench_end();
smpi_process_destroy();
+#ifdef HAVE_TRACING
+ int rank = smpi_process_index();
+ TRACE_smpi_computing_out(rank);
+#endif
// FIXME: should kill all processes in comm instead
- SIMIX_req_process_kill(SIMIX_process_self());
+ simcall_process_kill(SIMIX_process_self());
return MPI_SUCCESS;
}
smpi_bench_end();
if (comm == MPI_COMM_NULL) {
retval = MPI_ERR_COMM;
+ } else if (rank == NULL) {
+ retval = MPI_ERR_ARG;
} else {
*rank = smpi_comm_rank(comm);
retval = MPI_SUCCESS;
return retval;
}
+int PMPI_Comm_get_name (MPI_Comm comm, char* name, int* len)
+{
+ int retval;
+
+ smpi_bench_end();
+ if (comm == MPI_COMM_NULL) {
+ retval = MPI_ERR_COMM;
+ } else if (name == NULL || len == NULL) {
+ retval = MPI_ERR_ARG;
+ } else {
+ smpi_comm_get_name(comm, name, len);
+ retval = MPI_SUCCESS;
+ }
+ smpi_bench_begin();
+ return retval;
+}
+
int PMPI_Comm_group(MPI_Comm comm, MPI_Group * group)
{
int retval;
return retval;
}
+int PMPI_Comm_disconnect(MPI_Comm * comm)
+{
+ /* TODO: wait until all communication in comm are done */
+ int retval;
+
+ smpi_bench_end();
+ if (comm == NULL) {
+ retval = MPI_ERR_ARG;
+ } else if (*comm == MPI_COMM_NULL) {
+ retval = MPI_ERR_COMM;
+ } else {
+ smpi_comm_destroy(*comm);
+ *comm = MPI_COMM_NULL;
+ retval = MPI_SUCCESS;
+ }
+ smpi_bench_begin();
+ return retval;
+}
+
int PMPI_Comm_split(MPI_Comm comm, int color, int key, MPI_Comm* comm_out)
{
int retval;
smpi_bench_end();
#ifdef HAVE_TRACING
int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
+ TRACE_smpi_computing_out(rank);
int dst_traced = smpi_group_rank(smpi_comm_group(comm), dst);
TRACE_smpi_ptp_in(rank, rank, dst_traced, __FUNCTION__);
TRACE_smpi_send(rank, rank, dst_traced);
#ifdef HAVE_TRACING
TRACE_smpi_ptp_out(rank, rank, dst_traced, __FUNCTION__);
(*request)->send = 1;
+ TRACE_smpi_computing_in(rank);
#endif
smpi_bench_begin();
return retval;
#ifdef HAVE_TRACING
int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
int src_traced = smpi_group_rank(smpi_comm_group(comm), src);
+ TRACE_smpi_computing_out(rank);
+
TRACE_smpi_ptp_in(rank, src_traced, rank, __FUNCTION__);
#endif
if (comm == MPI_COMM_NULL) {
#ifdef HAVE_TRACING
TRACE_smpi_ptp_out(rank, src_traced, rank, __FUNCTION__);
TRACE_smpi_recv(rank, src_traced, rank);
+ TRACE_smpi_computing_in(rank);
#endif
smpi_bench_begin();
return retval;
smpi_bench_end();
#ifdef HAVE_TRACING
int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
+ TRACE_smpi_computing_out(rank);
int dst_traced = smpi_group_rank(smpi_comm_group(comm), dst);
TRACE_smpi_ptp_in(rank, rank, dst_traced, __FUNCTION__);
TRACE_smpi_send(rank, rank, dst_traced);
}
#ifdef HAVE_TRACING
TRACE_smpi_ptp_out(rank, rank, dst_traced, __FUNCTION__);
+ TRACE_smpi_computing_in(rank);
#endif
smpi_bench_begin();
return retval;
smpi_bench_end();
#ifdef HAVE_TRACING
int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
+ TRACE_smpi_computing_out(rank);
int dst_traced = smpi_group_rank(smpi_comm_group(comm), dst);
int src_traced = smpi_group_rank(smpi_comm_group(comm), src);
TRACE_smpi_ptp_in(rank, src_traced, dst_traced, __FUNCTION__);
TRACE_smpi_ptp_out(rank, src_traced, dst_traced, __FUNCTION__);
TRACE_smpi_recv(rank, rank, dst_traced);
TRACE_smpi_recv(rank, src_traced, rank);
+ TRACE_smpi_computing_in(rank);
+
#endif
smpi_bench_begin();
return retval;
int rank = request && (*request)->comm != MPI_COMM_NULL
? smpi_comm_rank((*request)->comm)
: -1;
+ TRACE_smpi_computing_out(rank);
+
MPI_Group group = smpi_comm_group((*request)->comm);
int src_traced = smpi_group_rank(group, (*request)->src);
int dst_traced = smpi_group_rank(group, (*request)->dst);
if (is_wait_for_receive) {
TRACE_smpi_recv(rank, src_traced, dst_traced);
}
+ TRACE_smpi_computing_in(rank);
+
#endif
smpi_bench_begin();
return retval;
#ifdef HAVE_TRACING
//save requests information for tracing
int i;
- xbt_dynar_t srcs = xbt_dynar_new(sizeof(int), xbt_free);
- xbt_dynar_t dsts = xbt_dynar_new(sizeof(int), xbt_free);
- xbt_dynar_t recvs = xbt_dynar_new(sizeof(int), xbt_free);
+ xbt_dynar_t srcs = xbt_dynar_new(sizeof(int), NULL);
+ xbt_dynar_t dsts = xbt_dynar_new(sizeof(int), NULL);
+ xbt_dynar_t recvs = xbt_dynar_new(sizeof(int), NULL);
for (i = 0; i < count; i++) {
MPI_Request req = requests[i]; //already received requests are no longer valid
if (req) {
xbt_dynar_insert_at(srcs, i, asrc);
xbt_dynar_insert_at(dsts, i, adst);
xbt_dynar_insert_at(recvs, i, arecv);
+ xbt_free(asrc);
+ xbt_free(adst);
+ xbt_free(arecv);
} else {
int *t = xbt_new(int, 1);
xbt_dynar_insert_at(srcs, i, t);
xbt_dynar_insert_at(dsts, i, t);
xbt_dynar_insert_at(recvs, i, t);
+ xbt_free(t);
}
}
int rank_traced = smpi_comm_rank(MPI_COMM_WORLD);
+ TRACE_smpi_computing_out(rank_traced);
+
TRACE_smpi_ptp_in(rank_traced, -1, -1, __FUNCTION__);
+
#endif
if (index == NULL) {
retval = MPI_ERR_ARG;
}
TRACE_smpi_ptp_out(rank_traced, src_traced, dst_traced, __FUNCTION__);
//clean-up of dynars
- xbt_free(srcs);
- xbt_free(dsts);
- xbt_free(recvs);
+ xbt_dynar_free(&srcs);
+ xbt_dynar_free(&dsts);
+ xbt_dynar_free(&recvs);
+ TRACE_smpi_computing_in(rank_traced);
+
#endif
smpi_bench_begin();
return retval;
#ifdef HAVE_TRACING
//save information from requests
int i;
- xbt_dynar_t srcs = xbt_dynar_new(sizeof(int), xbt_free);
- xbt_dynar_t dsts = xbt_dynar_new(sizeof(int), xbt_free);
- xbt_dynar_t recvs = xbt_dynar_new(sizeof(int), xbt_free);
+ xbt_dynar_t srcs = xbt_dynar_new(sizeof(int), NULL);
+ xbt_dynar_t dsts = xbt_dynar_new(sizeof(int), NULL);
+ xbt_dynar_t recvs = xbt_dynar_new(sizeof(int), NULL);
for (i = 0; i < count; i++) {
MPI_Request req = requests[i]; //all req should be valid in Waitall
int *asrc = xbt_new(int, 1);
xbt_dynar_insert_at(srcs, i, asrc);
xbt_dynar_insert_at(dsts, i, adst);
xbt_dynar_insert_at(recvs, i, arecv);
+ xbt_free(asrc);
+ xbt_free(adst);
+ xbt_free(arecv);
}
int rank_traced = smpi_comm_rank (MPI_COMM_WORLD);
+ TRACE_smpi_computing_out(rank_traced);
+
TRACE_smpi_ptp_in(rank_traced, -1, -1, __FUNCTION__);
#endif
smpi_mpi_waitall(count, requests, status);
}
TRACE_smpi_ptp_out(rank_traced, -1, -1, __FUNCTION__);
//clean-up of dynars
- xbt_free(srcs);
- xbt_free(dsts);
- xbt_free(recvs);
+ xbt_dynar_free(&srcs);
+ xbt_dynar_free(&dsts);
+ xbt_dynar_free(&recvs);
+ TRACE_smpi_computing_in(rank_traced);
#endif
smpi_bench_begin();
return MPI_SUCCESS;
smpi_bench_end();
#ifdef HAVE_TRACING
int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
+ TRACE_smpi_computing_out(rank);
int root_traced = smpi_group_rank(smpi_comm_group(comm), root);
TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__);
#endif
}
#ifdef HAVE_TRACING
TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__);
+ TRACE_smpi_computing_in(rank);
#endif
smpi_bench_begin();
return retval;
smpi_bench_end();
#ifdef HAVE_TRACING
int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
+ TRACE_smpi_computing_out(rank);
TRACE_smpi_collective_in(rank, -1, __FUNCTION__);
#endif
if (comm == MPI_COMM_NULL) {
}
#ifdef HAVE_TRACING
TRACE_smpi_collective_out(rank, -1, __FUNCTION__);
+ TRACE_smpi_computing_in(rank);
#endif
smpi_bench_begin();
return retval;
smpi_bench_end();
#ifdef HAVE_TRACING
int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
+ TRACE_smpi_computing_out(rank);
int root_traced = smpi_group_rank(smpi_comm_group(comm), root);
TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__);
#endif
}
#ifdef HAVE_TRACING
TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__);
+ TRACE_smpi_computing_in(rank);
#endif
smpi_bench_begin();
return retval;
smpi_bench_end();
#ifdef HAVE_TRACING
int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
+ TRACE_smpi_computing_out(rank);
int root_traced = smpi_group_rank(smpi_comm_group(comm), root);
TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__);
#endif
}
#ifdef HAVE_TRACING
TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__);
+ TRACE_smpi_computing_in(rank);
#endif
smpi_bench_begin();
return retval;
smpi_bench_end();
#ifdef HAVE_TRACING
int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
+ TRACE_smpi_computing_out(rank);
TRACE_smpi_collective_in(rank, -1, __FUNCTION__);
#endif
if (comm == MPI_COMM_NULL) {
smpi_bench_end();
#ifdef HAVE_TRACING
int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
+ TRACE_smpi_computing_out(rank);
TRACE_smpi_collective_in(rank, -1, __FUNCTION__);
#endif
if (comm == MPI_COMM_NULL) {
}
#ifdef HAVE_TRACING
TRACE_smpi_collective_out(rank, -1, __FUNCTION__);
+ TRACE_smpi_computing_in(rank);
#endif
smpi_bench_begin();
return retval;
smpi_bench_end();
#ifdef HAVE_TRACING
int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
+ TRACE_smpi_computing_out(rank);
int root_traced = smpi_group_rank(smpi_comm_group(comm), root);
TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__);
#endif
}
#ifdef HAVE_TRACING
TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__);
+ TRACE_smpi_computing_in(rank);
#endif
smpi_bench_begin();
return retval;
smpi_bench_end();
#ifdef HAVE_TRACING
int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
+ TRACE_smpi_computing_out(rank);
int root_traced = smpi_group_rank(smpi_comm_group(comm), root);
TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__);
#endif
}
#ifdef HAVE_TRACING
TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__);
+ TRACE_smpi_computing_in(rank);
#endif
smpi_bench_begin();
return retval;
smpi_bench_end();
#ifdef HAVE_TRACING
int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
+ TRACE_smpi_computing_out(rank);
int root_traced = smpi_group_rank(smpi_comm_group(comm), root);
TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__);
#endif
}
#ifdef HAVE_TRACING
TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__);
+ TRACE_smpi_computing_in(rank);
#endif
smpi_bench_begin();
return retval;
smpi_bench_end();
#ifdef HAVE_TRACING
int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
+ TRACE_smpi_computing_out(rank);
TRACE_smpi_collective_in(rank, -1, __FUNCTION__);
#endif
if (comm == MPI_COMM_NULL) {
}
#ifdef HAVE_TRACING
TRACE_smpi_collective_out(rank, -1, __FUNCTION__);
+ TRACE_smpi_computing_in(rank);
#endif
smpi_bench_begin();
return retval;
smpi_bench_end();
#ifdef HAVE_TRACING
int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
+ TRACE_smpi_computing_out(rank);
TRACE_smpi_collective_in(rank, -1, __FUNCTION__);
#endif
if (comm == MPI_COMM_NULL) {
}
#ifdef HAVE_TRACING
TRACE_smpi_collective_out(rank, -1, __FUNCTION__);
+ TRACE_smpi_computing_in(rank);
#endif
smpi_bench_begin();
return retval;
smpi_bench_end();
#ifdef HAVE_TRACING
+ TRACE_smpi_computing_out(rank);
TRACE_smpi_collective_in(rank, -1, __FUNCTION__);
#endif
if (comm == MPI_COMM_NULL) {
}
#ifdef HAVE_TRACING
TRACE_smpi_collective_out(rank, -1, __FUNCTION__);
+ TRACE_smpi_computing_in(rank);
#endif
smpi_bench_begin();
return retval;
smpi_bench_end();
#ifdef HAVE_TRACING
int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
+ TRACE_smpi_computing_out(rank);
TRACE_smpi_collective_in(rank, -1, __FUNCTION__);
#endif
if (comm == MPI_COMM_NULL) {
}
#ifdef HAVE_TRACING
TRACE_smpi_collective_out(rank, -1, __FUNCTION__);
+ TRACE_smpi_computing_in(rank);
#endif
smpi_bench_begin();
return retval;
smpi_bench_end();
#ifdef HAVE_TRACING
int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
+ TRACE_smpi_computing_out(rank);
TRACE_smpi_collective_in(rank, -1, __FUNCTION__);
#endif
if (comm == MPI_COMM_NULL) {
}
#ifdef HAVE_TRACING
TRACE_smpi_collective_out(rank, -1, __FUNCTION__);
+ TRACE_smpi_computing_in(rank);
#endif
smpi_bench_begin();
return retval;