X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b1582ff6bf8de060a1b55924cda0b887bf398e24..ac58039b1a8b9328b70a7809e30daa0284c5b72e:/src/smpi/smpi_pmpi.c diff --git a/src/smpi/smpi_pmpi.c b/src/smpi/smpi_pmpi.c index 69de4f4c97..0d93e9c38a 100644 --- a/src/smpi/smpi_pmpi.c +++ b/src/smpi/smpi_pmpi.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team. +/* Copyright (c) 2007-2013. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -27,6 +27,7 @@ void TRACE_smpi_set_category(const char *category) int PMPI_Init(int *argc, char ***argv) { smpi_process_init(argc, argv); + smpi_process_mark_as_initialized(); #ifdef HAVE_TRACING int rank = smpi_process_index(); TRACE_smpi_init(rank); @@ -82,7 +83,7 @@ int PMPI_Init_thread(int *argc, char ***argv, int required, int *provided) int PMPI_Query_thread(int *provided) { - int retval; + int retval = 0; smpi_bench_end(); if (provided == NULL) { @@ -97,7 +98,7 @@ int PMPI_Query_thread(int *provided) int PMPI_Is_thread_main(int *flag) { - int retval; + int retval = 0; smpi_bench_end(); if (flag == NULL) { @@ -126,12 +127,16 @@ int PMPI_Abort(MPI_Comm comm, int errorcode) double PMPI_Wtime(void) { double time; - - smpi_bench_end(); - time = SIMIX_get_clock(); - smpi_bench_begin(); + if (smpi_process_initialized() && !smpi_process_finalized() && !smpi_sample_is_running) { + smpi_bench_end(); + time = SIMIX_get_clock(); + smpi_bench_begin(); + } else { + time = SIMIX_get_clock(); + } return time; } + extern double sg_maxmin_precision; double PMPI_Wtick(void) { @@ -140,7 +145,7 @@ double PMPI_Wtick(void) int PMPI_Address(void *location, MPI_Aint * address) { - int retval; + int retval = 0; smpi_bench_end(); if (!address) { @@ -160,7 +165,7 @@ int PMPI_Get_address(void *location, MPI_Aint * address) int PMPI_Type_free(MPI_Datatype * datatype) { - int retval; + int retval = 0; smpi_bench_end(); if (!datatype) { @@ -175,7 +180,7 @@ int PMPI_Type_free(MPI_Datatype * datatype) int PMPI_Type_size(MPI_Datatype datatype, int *size) { - int retval; + int retval = 0; smpi_bench_end(); if (datatype == MPI_DATATYPE_NULL) { @@ -192,7 +197,7 @@ int PMPI_Type_size(MPI_Datatype datatype, int *size) int PMPI_Type_get_extent(MPI_Datatype datatype, MPI_Aint * lb, MPI_Aint * extent) { - int retval; + int retval = 0; smpi_bench_end(); if (datatype == MPI_DATATYPE_NULL) { @@ -213,7 +218,7 @@ int PMPI_Type_get_true_extent(MPI_Datatype datatype, MPI_Aint * lb, MPI_Aint * e int PMPI_Type_extent(MPI_Datatype datatype, MPI_Aint * extent) { - int retval; + int retval = 0; smpi_bench_end(); if (datatype == MPI_DATATYPE_NULL) { @@ -230,7 +235,7 @@ int PMPI_Type_extent(MPI_Datatype datatype, MPI_Aint * extent) int PMPI_Type_lb(MPI_Datatype datatype, MPI_Aint * disp) { - int retval; + int retval = 0; smpi_bench_end(); if (datatype == MPI_DATATYPE_NULL) { @@ -247,7 +252,7 @@ int PMPI_Type_lb(MPI_Datatype datatype, MPI_Aint * disp) int PMPI_Type_ub(MPI_Datatype datatype, MPI_Aint * disp) { - int retval; + int retval = 0; smpi_bench_end(); if (datatype == MPI_DATATYPE_NULL) { @@ -264,7 +269,7 @@ int PMPI_Type_ub(MPI_Datatype datatype, MPI_Aint * disp) int PMPI_Op_create(MPI_User_function * function, int commute, MPI_Op * op) { - int retval; + int retval = 0; smpi_bench_end(); if (function == NULL || op == NULL) { @@ -279,7 +284,7 @@ int PMPI_Op_create(MPI_User_function * function, int commute, MPI_Op * op) int PMPI_Op_free(MPI_Op * op) { - int retval; + int retval = 0; smpi_bench_end(); if (op == NULL) { @@ -297,13 +302,12 @@ int PMPI_Op_free(MPI_Op * op) int PMPI_Group_free(MPI_Group * group) { - int retval; + int retval = 0; smpi_bench_end(); if (group == NULL) { retval = MPI_ERR_ARG; } else { - if(*group!= smpi_comm_group(MPI_COMM_WORLD))// do not free the group of the comm_world smpi_group_destroy(*group); *group = MPI_GROUP_NULL; retval = MPI_SUCCESS; @@ -314,7 +318,7 @@ int PMPI_Group_free(MPI_Group * group) int PMPI_Group_size(MPI_Group group, int *size) { - int retval; + int retval = 0; smpi_bench_end(); if (group == MPI_GROUP_NULL) { @@ -331,7 +335,7 @@ int PMPI_Group_size(MPI_Group group, int *size) int PMPI_Group_rank(MPI_Group group, int *rank) { - int retval; + int retval = 0; smpi_bench_end(); if (group == MPI_GROUP_NULL) { @@ -370,7 +374,7 @@ int PMPI_Group_translate_ranks(MPI_Group group1, int n, int *ranks1, int PMPI_Group_compare(MPI_Group group1, MPI_Group group2, int *result) { - int retval; + int retval = 0; smpi_bench_end(); if (group1 == MPI_GROUP_NULL || group2 == MPI_GROUP_NULL) { @@ -419,7 +423,6 @@ int PMPI_Group_union(MPI_Group group1, MPI_Group group2, smpi_group_set_mapping(*newgroup, proc2, i); } } - smpi_group_use(*newgroup); retval = MPI_SUCCESS; } smpi_bench_begin(); @@ -459,7 +462,6 @@ int PMPI_Group_intersection(MPI_Group group1, MPI_Group group2, } } } - smpi_group_use(*newgroup); retval = MPI_SUCCESS; } smpi_bench_begin(); @@ -496,7 +498,6 @@ int PMPI_Group_difference(MPI_Group group1, MPI_Group group2, MPI_Group * newgro } } } - smpi_group_use(*newgroup); retval = MPI_SUCCESS; } smpi_bench_begin(); @@ -517,6 +518,11 @@ int PMPI_Group_incl(MPI_Group group, int n, int *ranks, MPI_Group * newgroup) *newgroup = MPI_GROUP_EMPTY; } else if (n == smpi_group_size(group)) { *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) + smpi_group_use(group); } else { *newgroup = smpi_group_new(n); for (i = 0; i < n; i++) { @@ -524,7 +530,6 @@ int PMPI_Group_incl(MPI_Group group, int n, int *ranks, MPI_Group * newgroup) smpi_group_set_mapping(*newgroup, index, i); } } - smpi_group_use(*newgroup); retval = MPI_SUCCESS; } smpi_bench_begin(); @@ -543,6 +548,11 @@ 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) + smpi_group_use(group); } else if (n == smpi_group_size(group)) { *newgroup = MPI_GROUP_EMPTY; } else { @@ -567,7 +577,6 @@ int PMPI_Group_excl(MPI_Group group, int n, int *ranks, MPI_Group * newgroup) xbt_free(to_exclude); } - smpi_group_use(*newgroup); retval = MPI_SUCCESS; } smpi_bench_begin(); @@ -626,7 +635,6 @@ int PMPI_Group_range_incl(MPI_Group group, int n, int ranges[][3], } } } - smpi_group_use(*newgroup); retval = MPI_SUCCESS; } smpi_bench_begin(); @@ -646,6 +654,11 @@ 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) + smpi_group_use(group); } else { size = smpi_group_size(group); for (i = 0; i < n; i++) { @@ -699,7 +712,6 @@ int PMPI_Group_range_excl(MPI_Group group, int n, int ranges[][3], } } } - smpi_group_use(*newgroup); retval = MPI_SUCCESS; } @@ -709,7 +721,7 @@ int PMPI_Group_range_excl(MPI_Group group, int n, int ranges[][3], int PMPI_Comm_rank(MPI_Comm comm, int *rank) { - int retval; + int retval = 0; smpi_bench_end(); if (comm == MPI_COMM_NULL) { @@ -726,7 +738,7 @@ int PMPI_Comm_rank(MPI_Comm comm, int *rank) int PMPI_Comm_size(MPI_Comm comm, int *size) { - int retval; + int retval = 0; smpi_bench_end(); if (comm == MPI_COMM_NULL) { @@ -743,7 +755,7 @@ int PMPI_Comm_size(MPI_Comm comm, int *size) int PMPI_Comm_get_name (MPI_Comm comm, char* name, int* len) { - int retval; + int retval = 0; smpi_bench_end(); if (comm == MPI_COMM_NULL) { @@ -760,7 +772,7 @@ int PMPI_Comm_get_name (MPI_Comm comm, char* name, int* len) int PMPI_Comm_group(MPI_Comm comm, MPI_Group * group) { - int retval; + int retval = 0; smpi_bench_end(); if (comm == MPI_COMM_NULL) { @@ -769,6 +781,11 @@ 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) + && *group != MPI_GROUP_EMPTY) + smpi_group_use(*group); retval = MPI_SUCCESS; } smpi_bench_begin(); @@ -777,7 +794,7 @@ int PMPI_Comm_group(MPI_Comm comm, MPI_Group * group) int PMPI_Comm_compare(MPI_Comm comm1, MPI_Comm comm2, int *result) { - int retval; + int retval = 0; smpi_bench_end(); if (comm1 == MPI_COMM_NULL || comm2 == MPI_COMM_NULL) { @@ -803,7 +820,7 @@ int PMPI_Comm_compare(MPI_Comm comm1, MPI_Comm comm2, int *result) int PMPI_Comm_dup(MPI_Comm comm, MPI_Comm * newcomm) { - int retval; + int retval = 0; smpi_bench_end(); if (comm == MPI_COMM_NULL) { @@ -820,7 +837,7 @@ int PMPI_Comm_dup(MPI_Comm comm, MPI_Comm * newcomm) int PMPI_Comm_create(MPI_Comm comm, MPI_Group group, MPI_Comm * newcomm) { - int retval; + int retval = 0; smpi_bench_end(); if (comm == MPI_COMM_NULL) { @@ -843,7 +860,7 @@ int PMPI_Comm_create(MPI_Comm comm, MPI_Group group, MPI_Comm * newcomm) int PMPI_Comm_free(MPI_Comm * comm) { - int retval; + int retval = 0; smpi_bench_end(); if (comm == NULL) { @@ -862,7 +879,7 @@ int PMPI_Comm_free(MPI_Comm * comm) int PMPI_Comm_disconnect(MPI_Comm * comm) { /* TODO: wait until all communication in comm are done */ - int retval; + int retval = 0; smpi_bench_end(); if (comm == NULL) { @@ -880,7 +897,7 @@ int PMPI_Comm_disconnect(MPI_Comm * comm) int PMPI_Comm_split(MPI_Comm comm, int color, int key, MPI_Comm* comm_out) { - int retval; + int retval = 0; smpi_bench_end(); if (comm_out == NULL) { @@ -896,9 +913,9 @@ int PMPI_Comm_split(MPI_Comm comm, int color, int key, MPI_Comm* comm_out) } int PMPI_Send_init(void *buf, int count, MPI_Datatype datatype, int dst, - int tag, MPI_Comm comm, MPI_Request * request) + int tag, MPI_Comm comm, MPI_Request * request) { - int retval; + int retval = 0; smpi_bench_end(); if (request == NULL) { @@ -912,13 +929,15 @@ int PMPI_Send_init(void *buf, int count, MPI_Datatype datatype, int dst, retval = MPI_SUCCESS; } smpi_bench_begin(); + if (retval != MPI_SUCCESS && request) + *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 tag, MPI_Comm comm, MPI_Request * request) { - int retval; + int retval = 0; smpi_bench_end(); if (request == NULL) { @@ -926,36 +945,42 @@ int PMPI_Recv_init(void *buf, int count, MPI_Datatype datatype, int src, } else if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; } else if (src == MPI_PROC_NULL) { - retval = MPI_SUCCESS; + retval = MPI_SUCCESS; } else { *request = smpi_mpi_recv_init(buf, count, datatype, src, tag, comm); retval = MPI_SUCCESS; } smpi_bench_begin(); + if (retval != MPI_SUCCESS && request) + *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 retval; +int PMPI_Ssend_init(void* buf, int count, MPI_Datatype datatype, + int dst, int tag, MPI_Comm comm, MPI_Request* request) +{ + int retval = 0; - smpi_bench_end(); - if (request == NULL) { - retval = MPI_ERR_ARG; - } else if (comm == MPI_COMM_NULL) { - retval = MPI_ERR_COMM; - } else if (dst == MPI_PROC_NULL) { - retval = MPI_SUCCESS; - } else { - *request = smpi_mpi_ssend_init(buf, count, datatype, dst, tag, comm); - retval = MPI_SUCCESS; - } - smpi_bench_begin(); - return retval; + smpi_bench_end(); + if (request == NULL) { + retval = MPI_ERR_ARG; + } else if (comm == MPI_COMM_NULL) { + retval = MPI_ERR_COMM; + } else if (dst == MPI_PROC_NULL) { + retval = MPI_SUCCESS; + } else { + *request = smpi_mpi_ssend_init(buf, count, datatype, dst, tag, comm); + retval = MPI_SUCCESS; + } + smpi_bench_begin(); + if (retval != MPI_SUCCESS && request) + *request = MPI_REQUEST_NULL; + return retval; } int PMPI_Start(MPI_Request * request) { - int retval; + int retval = 0; smpi_bench_end(); if (request == NULL || *request == MPI_REQUEST_NULL) { @@ -970,7 +995,7 @@ int PMPI_Start(MPI_Request * request) int PMPI_Startall(int count, MPI_Request * requests) { - int retval; + int retval = 0; smpi_bench_end(); if (requests == NULL) { @@ -985,7 +1010,7 @@ int PMPI_Startall(int count, MPI_Request * requests) int PMPI_Request_free(MPI_Request * request) { - int retval; + int retval = 0; smpi_bench_end(); if (*request == MPI_REQUEST_NULL) { @@ -1000,9 +1025,9 @@ int PMPI_Request_free(MPI_Request * request) } int PMPI_Irecv(void *buf, int count, MPI_Datatype datatype, int src, - int tag, MPI_Comm comm, MPI_Request * request) + int tag, MPI_Comm comm, MPI_Request * request) { - int retval; + int retval = 0; smpi_bench_end(); @@ -1026,29 +1051,31 @@ int PMPI_Irecv(void *buf, int count, MPI_Datatype datatype, int src, } else { #ifdef HAVE_TRACING - int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; - int src_traced = smpi_group_index(smpi_comm_group(comm), src); - TRACE_smpi_ptp_in(rank, src_traced, rank, __FUNCTION__); + int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; + int src_traced = smpi_group_index(smpi_comm_group(comm), src); + TRACE_smpi_ptp_in(rank, src_traced, rank, __FUNCTION__, count*smpi_datatype_size(datatype)); #endif *request = smpi_mpi_irecv(buf, count, datatype, src, tag, comm); retval = MPI_SUCCESS; #ifdef HAVE_TRACING - TRACE_smpi_ptp_out(rank, src_traced, rank, __FUNCTION__); - (*request)->recv = 1; + TRACE_smpi_ptp_out(rank, src_traced, rank, __FUNCTION__); + (*request)->recv = 1; #endif } smpi_bench_begin(); + if (retval != MPI_SUCCESS && request) + *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 tag, MPI_Comm comm, MPI_Request * request) { - int retval; + int retval = 0; smpi_bench_end(); if (request == NULL) { @@ -1071,29 +1098,33 @@ int PMPI_Isend(void *buf, int count, MPI_Datatype datatype, int dst, } else { #ifdef HAVE_TRACING - int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; - TRACE_smpi_computing_out(rank); - int dst_traced = smpi_group_index(smpi_comm_group(comm), dst); - TRACE_smpi_ptp_in(rank, rank, dst_traced, __FUNCTION__); - TRACE_smpi_send(rank, rank, dst_traced); + int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; + TRACE_smpi_computing_out(rank); + int dst_traced = smpi_group_index(smpi_comm_group(comm), dst); + TRACE_smpi_ptp_in(rank, rank, dst_traced, __FUNCTION__, count*smpi_datatype_size(datatype)); + TRACE_smpi_send(rank, rank, dst_traced, count*smpi_datatype_size(datatype)); #endif *request = smpi_mpi_isend(buf, count, datatype, dst, tag, comm); retval = MPI_SUCCESS; #ifdef HAVE_TRACING - TRACE_smpi_ptp_out(rank, rank, dst_traced, __FUNCTION__); - (*request)->send = 1; - TRACE_smpi_computing_in(rank); + TRACE_smpi_ptp_out(rank, rank, dst_traced, __FUNCTION__); + (*request)->send = 1; + TRACE_smpi_computing_in(rank); #endif } smpi_bench_begin(); + if (retval != MPI_SUCCESS && request) + *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 retval; +int PMPI_Issend(void* buf, int count, MPI_Datatype datatype, + int dst, int tag, MPI_Comm comm, MPI_Request* request) +{ + int retval = 0; smpi_bench_end(); if (request == NULL) { @@ -1116,31 +1147,33 @@ int PMPI_Issend(void* buf, int count, MPI_Datatype datatype, int dst, int tag, M } else { #ifdef HAVE_TRACING - int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; - TRACE_smpi_computing_out(rank); - int dst_traced = smpi_group_index(smpi_comm_group(comm), dst); - TRACE_smpi_ptp_in(rank, rank, dst_traced, __FUNCTION__); - TRACE_smpi_send(rank, rank, dst_traced); + int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; + TRACE_smpi_computing_out(rank); + int dst_traced = smpi_group_index(smpi_comm_group(comm), dst); + TRACE_smpi_ptp_in(rank, rank, dst_traced, __FUNCTION__, count*smpi_datatype_size(datatype)); + TRACE_smpi_send(rank, rank, dst_traced, count*smpi_datatype_size(datatype)); #endif *request = smpi_mpi_issend(buf, count, datatype, dst, tag, comm); retval = MPI_SUCCESS; #ifdef HAVE_TRACING - TRACE_smpi_ptp_out(rank, rank, dst_traced, __FUNCTION__); - (*request)->send = 1; - TRACE_smpi_computing_in(rank); + TRACE_smpi_ptp_out(rank, rank, dst_traced, __FUNCTION__); + (*request)->send = 1; + TRACE_smpi_computing_in(rank); #endif } smpi_bench_begin(); + if (retval != MPI_SUCCESS && request) + *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 retval; + int retval = 0; smpi_bench_end(); if (comm == MPI_COMM_NULL) { @@ -1164,8 +1197,7 @@ int PMPI_Recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; int src_traced = smpi_group_index(smpi_comm_group(comm), src); TRACE_smpi_computing_out(rank); - - TRACE_smpi_ptp_in(rank, src_traced, rank, __FUNCTION__); + TRACE_smpi_ptp_in(rank, src_traced, rank, __FUNCTION__, count*smpi_datatype_size(datatype)); #endif smpi_mpi_recv(buf, count, datatype, src, tag, comm, status); @@ -1187,7 +1219,7 @@ int PMPI_Recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, int PMPI_Send(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) { - int retval; + int retval = 0; smpi_bench_end(); @@ -1211,8 +1243,8 @@ int PMPI_Send(void *buf, int count, MPI_Datatype datatype, int dst, int tag, int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; TRACE_smpi_computing_out(rank); int dst_traced = smpi_group_index(smpi_comm_group(comm), dst); - TRACE_smpi_ptp_in(rank, rank, dst_traced, __FUNCTION__); - TRACE_smpi_send(rank, rank, dst_traced); + TRACE_smpi_ptp_in(rank, rank, dst_traced, __FUNCTION__, count*smpi_datatype_size(datatype)); + TRACE_smpi_send(rank, rank, dst_traced,count*smpi_datatype_size(datatype)); #endif smpi_mpi_send(buf, count, datatype, dst, tag, comm); @@ -1231,7 +1263,7 @@ int PMPI_Send(void *buf, int count, MPI_Datatype datatype, int dst, int tag, int PMPI_Ssend(void* buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) { - int retval; + int retval = 0; smpi_bench_end(); @@ -1255,8 +1287,8 @@ int PMPI_Ssend(void* buf, int count, MPI_Datatype datatype, int dst, int tag, MP int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; TRACE_smpi_computing_out(rank); int dst_traced = smpi_group_index(smpi_comm_group(comm), dst); - TRACE_smpi_ptp_in(rank, rank, dst_traced, __FUNCTION__); - TRACE_smpi_send(rank, rank, dst_traced); + TRACE_smpi_ptp_in(rank, rank, dst_traced, __FUNCTION__, count*smpi_datatype_size(datatype)); + TRACE_smpi_send(rank, rank, dst_traced,count*smpi_datatype_size(datatype)); #endif smpi_mpi_ssend(buf, count, datatype, dst, tag, comm); @@ -1277,7 +1309,7 @@ int PMPI_Sendrecv(void *sendbuf, int sendcount, MPI_Datatype sendtype, MPI_Datatype recvtype, int src, int recvtag, MPI_Comm comm, MPI_Status * status) { - int retval; + int retval = 0; smpi_bench_end(); @@ -1306,8 +1338,8 @@ int PMPI_Sendrecv(void *sendbuf, int sendcount, MPI_Datatype sendtype, TRACE_smpi_computing_out(rank); int dst_traced = smpi_group_index(smpi_comm_group(comm), dst); int src_traced = smpi_group_index(smpi_comm_group(comm), src); - TRACE_smpi_ptp_in(rank, src_traced, dst_traced, __FUNCTION__); - TRACE_smpi_send(rank, rank, dst_traced); + TRACE_smpi_ptp_in(rank, src_traced, dst_traced, __FUNCTION__, sendcount*smpi_datatype_size(sendtype)); + TRACE_smpi_send(rank, rank, dst_traced,sendcount*smpi_datatype_size(sendtype)); #endif @@ -1333,7 +1365,7 @@ int PMPI_Sendrecv_replace(void *buf, int count, MPI_Datatype datatype, { //TODO: suboptimal implementation void *recvbuf; - int retval; + int retval = 0; if (datatype == MPI_DATATYPE_NULL) { retval = MPI_ERR_TYPE; } else if (count < 0) { @@ -1355,13 +1387,14 @@ int PMPI_Sendrecv_replace(void *buf, int count, MPI_Datatype datatype, int PMPI_Test(MPI_Request * request, int *flag, MPI_Status * status) { - int retval; + int retval = 0; smpi_bench_end(); - if (request == MPI_REQUEST_NULL || flag == NULL) { + if (request == NULL || flag == NULL) { retval = MPI_ERR_ARG; } else if (*request == MPI_REQUEST_NULL) { *flag= TRUE; + smpi_empty_status(status); retval = MPI_ERR_REQUEST; } else { *flag = smpi_mpi_test(request, status); @@ -1374,7 +1407,7 @@ int PMPI_Test(MPI_Request * request, int *flag, MPI_Status * status) int PMPI_Testany(int count, MPI_Request requests[], int *index, int *flag, MPI_Status * status) { - int retval; + int retval = 0; smpi_bench_end(); if (index == NULL || flag == NULL) { @@ -1389,7 +1422,7 @@ int PMPI_Testany(int count, MPI_Request requests[], int *index, int *flag, int PMPI_Testall(int count, MPI_Request* requests, int* flag, MPI_Status* statuses) { - int retval; + int retval = 0; smpi_bench_end(); if (flag == NULL) { @@ -1403,7 +1436,7 @@ int PMPI_Testall(int count, MPI_Request* requests, int* flag, MPI_Status* status } int PMPI_Probe(int source, int tag, MPI_Comm comm, MPI_Status* status) { - int retval; + int retval = 0; smpi_bench_end(); if (status == NULL) { @@ -1424,7 +1457,7 @@ int PMPI_Probe(int source, int tag, MPI_Comm comm, MPI_Status* status) { int PMPI_Iprobe(int source, int tag, MPI_Comm comm, int* flag, MPI_Status* status) { - int retval; + int retval = 0; smpi_bench_end(); if (flag == NULL) { @@ -1434,6 +1467,7 @@ int PMPI_Iprobe(int source, int tag, MPI_Comm comm, int* flag, MPI_Status* statu } else if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; } else if (source == MPI_PROC_NULL) { + *flag=TRUE; smpi_empty_status(status); status->MPI_SOURCE = MPI_PROC_NULL; retval = MPI_SUCCESS; @@ -1447,10 +1481,12 @@ int PMPI_Iprobe(int source, int tag, MPI_Comm comm, int* flag, MPI_Status* statu int PMPI_Wait(MPI_Request * request, MPI_Status * status) { - int retval; + int retval = 0; smpi_bench_end(); + smpi_empty_status(status); + if (request == NULL) { retval = MPI_ERR_ARG; } else if (*request == MPI_REQUEST_NULL) { @@ -1458,26 +1494,32 @@ int PMPI_Wait(MPI_Request * request, MPI_Status * status) } else { #ifdef HAVE_TRACING - int rank = request && (*request)->comm != MPI_COMM_NULL + int rank = request && (*request)->comm != MPI_COMM_NULL ? smpi_process_index() : -1; - TRACE_smpi_computing_out(rank); + TRACE_smpi_computing_out(rank); - int src_traced = (*request)->src; - int dst_traced = (*request)->dst; - int is_wait_for_receive = (*request)->recv; - TRACE_smpi_ptp_in(rank, src_traced, dst_traced, __FUNCTION__); + int src_traced = (*request)->src; + int dst_traced = (*request)->dst; + MPI_Comm comm = (*request)->comm; + int is_wait_for_receive = (*request)->recv; + TRACE_smpi_ptp_in(rank, src_traced, dst_traced, __FUNCTION__,-1); #endif smpi_mpi_wait(request, status); retval = MPI_SUCCESS; #ifdef HAVE_TRACING - TRACE_smpi_ptp_out(rank, src_traced, dst_traced, __FUNCTION__); - if (is_wait_for_receive) { - TRACE_smpi_recv(rank, src_traced, dst_traced); - } - TRACE_smpi_computing_in(rank); + //the src may not have been known at the beginning of the recv (MPI_ANY_SOURCE) + TRACE_smpi_ptp_out(rank, src_traced, dst_traced, __FUNCTION__); + if (is_wait_for_receive) { + if(src_traced==MPI_ANY_SOURCE) + 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_computing_in(rank); #endif } @@ -1488,7 +1530,7 @@ int PMPI_Wait(MPI_Request * request, MPI_Status * status) int PMPI_Waitany(int count, MPI_Request requests[], int *index, MPI_Status * status) { - int retval; + int retval = 0; smpi_bench_end(); #ifdef HAVE_TRACING @@ -1497,18 +1539,21 @@ int PMPI_Waitany(int count, MPI_Request requests[], int *index, MPI_Status * sta int *srcs = xbt_new(int, count); int *dsts = xbt_new(int, count); int *recvs = xbt_new(int, count); + MPI_Comm *comms = xbt_new(MPI_Comm, 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; } } int rank_traced = smpi_process_index(); TRACE_smpi_computing_out(rank_traced); - TRACE_smpi_ptp_in(rank_traced, -1, -1, __FUNCTION__); + TRACE_smpi_ptp_in(rank_traced, -1, -1, __FUNCTION__,count); #endif if (index == NULL) { @@ -1520,15 +1565,22 @@ int PMPI_Waitany(int count, MPI_Request requests[], int *index, MPI_Status * sta #ifdef HAVE_TRACING if(*index!=MPI_UNDEFINED){ int src_traced = srcs[*index]; + //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]; 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]; TRACE_smpi_recv(rank_traced, src_traced, dst_traced); } TRACE_smpi_ptp_out(rank_traced, src_traced, dst_traced, __FUNCTION__); xbt_free(srcs); xbt_free(dsts); xbt_free(recvs); + xbt_free(comms); + } TRACE_smpi_computing_in(rank_traced); #endif @@ -1546,35 +1598,52 @@ int PMPI_Waitall(int count, MPI_Request requests[], MPI_Status status[]) int *srcs = xbt_new(int, count); int *dsts = xbt_new(int, count); int *recvs = xbt_new(int, count); - int valid_count = 0; + int *valid = xbt_new(int, count); + MPI_Comm *comms = xbt_new(MPI_Comm, count); + + //int valid_count = 0; for (i = 0; i < count; i++) { MPI_Request req = requests[i]; if(req!=MPI_REQUEST_NULL){ - srcs[valid_count] = req->src; - dsts[valid_count] = req->dst; - recvs[valid_count] = req->recv; - valid_count++; + srcs[i] = req->src; + dsts[i] = req->dst; + recvs[i] = req->recv; + comms[i] = req->comm; + valid[i]=1;; + }else{ + valid[i]=0; } } int rank_traced = smpi_process_index(); TRACE_smpi_computing_out(rank_traced); - TRACE_smpi_ptp_in(rank_traced, -1, -1, __FUNCTION__); + TRACE_smpi_ptp_in(rank_traced, -1, -1, __FUNCTION__,count); #endif int retval = smpi_mpi_waitall(count, requests, status); #ifdef HAVE_TRACING - for (i = 0; i < valid_count; i++) { - int src_traced = srcs[i]; - int dst_traced = dsts[i]; - int is_wait_for_receive = recvs[i]; - if (is_wait_for_receive) { - TRACE_smpi_recv(rank_traced, src_traced, dst_traced); + 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]; + int is_wait_for_receive = recvs[i]; + 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); + } } } TRACE_smpi_ptp_out(rank_traced, -1, -1, __FUNCTION__); xbt_free(srcs); xbt_free(dsts); xbt_free(recvs); + xbt_free(valid); + xbt_free(comms); + TRACE_smpi_computing_in(rank_traced); #endif smpi_bench_begin(); @@ -1584,7 +1653,7 @@ int PMPI_Waitall(int count, MPI_Request requests[], MPI_Status status[]) int PMPI_Waitsome(int incount, MPI_Request requests[], int *outcount, int *indices, MPI_Status status[]) { - int retval; + int retval = 0; smpi_bench_end(); if (outcount == NULL) { @@ -1600,7 +1669,7 @@ int PMPI_Waitsome(int incount, MPI_Request requests[], int *outcount, int PMPI_Testsome(int incount, MPI_Request requests[], int* outcount, int* indices, MPI_Status status[]) { - int retval; + int retval = 0; smpi_bench_end(); if (outcount == NULL) { @@ -1616,49 +1685,53 @@ int PMPI_Testsome(int incount, MPI_Request requests[], int* outcount, int PMPI_Bcast(void *buf, int count, MPI_Datatype datatype, int root, MPI_Comm comm) { - int retval; + int retval = 0; smpi_bench_end(); + + if (comm == MPI_COMM_NULL) { + retval = MPI_ERR_COMM; + } else { #ifdef HAVE_TRACING int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; TRACE_smpi_computing_out(rank); int root_traced = smpi_group_index(smpi_comm_group(comm), root); - TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__); + TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__, count*smpi_datatype_size(datatype)); #endif - if (comm == MPI_COMM_NULL) { - retval = MPI_ERR_COMM; - } else { mpi_coll_bcast_fun(buf, count, datatype, root, comm); retval = MPI_SUCCESS; - } #ifdef HAVE_TRACING TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__); TRACE_smpi_computing_in(rank); #endif + } + smpi_bench_begin(); return retval; } int PMPI_Barrier(MPI_Comm comm) { - int retval; + int retval = 0; smpi_bench_end(); + + if (comm == MPI_COMM_NULL) { + retval = MPI_ERR_COMM; + } else { #ifdef HAVE_TRACING int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; TRACE_smpi_computing_out(rank); - TRACE_smpi_collective_in(rank, -1, __FUNCTION__); + TRACE_smpi_collective_in(rank, -1, __FUNCTION__, smpi_comm_size(comm)); #endif - if (comm == MPI_COMM_NULL) { - retval = MPI_ERR_COMM; - } else { mpi_coll_barrier_fun(comm); retval = MPI_SUCCESS; - } #ifdef HAVE_TRACING TRACE_smpi_collective_out(rank, -1, __FUNCTION__); TRACE_smpi_computing_in(rank); #endif + } + smpi_bench_begin(); return retval; } @@ -1667,15 +1740,10 @@ int PMPI_Gather(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm) { - int retval; + int retval = 0; smpi_bench_end(); -#ifdef HAVE_TRACING - int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; - TRACE_smpi_computing_out(rank); - int root_traced = smpi_group_index(smpi_comm_group(comm), root); - TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__); -#endif + if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; } else if ((( sendbuf != MPI_IN_PLACE) && (sendtype == MPI_DATATYPE_NULL)) || @@ -1693,17 +1761,23 @@ int PMPI_Gather(void *sendbuf, int sendcount, MPI_Datatype sendtype, sendtmpcount=0; sendtmptype=recvtype; } - +#ifdef HAVE_TRACING + int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; + TRACE_smpi_computing_out(rank); + int root_traced = smpi_group_index(smpi_comm_group(comm), root); + TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__,sendcount*smpi_datatype_size(sendtmptype)); +#endif mpi_coll_gather_fun(sendtmpbuf, sendtmpcount, sendtmptype, recvbuf, recvcount, recvtype, root, comm); retval = MPI_SUCCESS; - } #ifdef HAVE_TRACING TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__); TRACE_smpi_computing_in(rank); #endif + } + smpi_bench_begin(); return retval; } @@ -1712,15 +1786,10 @@ 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; + int retval = 0; smpi_bench_end(); -#ifdef HAVE_TRACING - int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; - TRACE_smpi_computing_out(rank); - int root_traced = smpi_group_index(smpi_comm_group(comm), root); - TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__); -#endif + if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; } else if ((( sendbuf != MPI_IN_PLACE) && (sendtype == MPI_DATATYPE_NULL)) || @@ -1731,7 +1800,6 @@ 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; int sendtmpcount = sendcount; MPI_Datatype sendtmptype = sendtype; @@ -1740,14 +1808,21 @@ int PMPI_Gatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, sendtmptype=recvtype; } +#ifdef HAVE_TRACING + int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; + TRACE_smpi_computing_out(rank); + int root_traced = smpi_group_index(smpi_comm_group(comm), root); + TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__,sendcount*smpi_datatype_size(sendtmptype)); +#endif smpi_mpi_gatherv(sendtmpbuf, sendtmpcount, sendtmptype, recvbuf, recvcounts, displs, recvtype, root, comm); retval = MPI_SUCCESS; - } #ifdef HAVE_TRACING TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__); TRACE_smpi_computing_in(rank); #endif + } + smpi_bench_begin(); return retval; } @@ -1756,14 +1831,10 @@ int PMPI_Allgather(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm) { - int retval; + int retval = 0; smpi_bench_end(); -#ifdef HAVE_TRACING - int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; - TRACE_smpi_computing_out(rank); - TRACE_smpi_collective_in(rank, -1, __FUNCTION__); -#endif + if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; } else if ((( sendbuf != MPI_IN_PLACE) && (sendtype == MPI_DATATYPE_NULL)) || @@ -1773,20 +1844,24 @@ int PMPI_Allgather(void *sendbuf, int sendcount, MPI_Datatype sendtype, (recvcount <0)){ retval = MPI_ERR_COUNT; } else { - if(sendbuf == MPI_IN_PLACE) { sendbuf=((char*)recvbuf)+smpi_datatype_get_extent(recvtype)*recvcount*smpi_comm_rank(comm); sendcount=recvcount; sendtype=recvtype; } - +#ifdef HAVE_TRACING + int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; + TRACE_smpi_computing_out(rank); + TRACE_smpi_collective_in(rank, -1, __FUNCTION__,sendcount*smpi_datatype_size(sendtype)); +#endif mpi_coll_allgather_fun(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm); retval = MPI_SUCCESS; - } + #ifdef HAVE_TRACING TRACE_smpi_collective_out(rank, -1, __FUNCTION__); #endif + } smpi_bench_begin(); return retval; } @@ -1795,14 +1870,10 @@ int PMPI_Allgatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int *recvcounts, int *displs, MPI_Datatype recvtype, MPI_Comm comm) { - int retval; + int retval = 0; smpi_bench_end(); -#ifdef HAVE_TRACING - int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; - TRACE_smpi_computing_out(rank); - TRACE_smpi_collective_in(rank, -1, __FUNCTION__); -#endif + if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; } else if ((( sendbuf != MPI_IN_PLACE) && (sendtype == MPI_DATATYPE_NULL)) || @@ -1819,15 +1890,20 @@ int PMPI_Allgatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, sendcount=recvcounts[smpi_comm_rank(comm)]; sendtype=recvtype; } - +#ifdef HAVE_TRACING + int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; + TRACE_smpi_computing_out(rank); + TRACE_smpi_collective_in(rank, -1, __FUNCTION__,sendcount*smpi_datatype_size(sendtype)); +#endif mpi_coll_allgatherv_fun(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, comm); retval = MPI_SUCCESS; - } #ifdef HAVE_TRACING TRACE_smpi_collective_out(rank, -1, __FUNCTION__); TRACE_smpi_computing_in(rank); #endif + } + smpi_bench_begin(); return retval; } @@ -1836,16 +1912,10 @@ int PMPI_Scatter(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm) { - int retval; + int retval = 0; smpi_bench_end(); -#ifdef HAVE_TRACING - int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; - TRACE_smpi_computing_out(rank); - int root_traced = smpi_group_index(smpi_comm_group(comm), root); - TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__); -#endif if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; } else if (((smpi_comm_rank(comm)==root) && (sendtype == MPI_DATATYPE_NULL)) @@ -1853,17 +1923,26 @@ int PMPI_Scatter(void *sendbuf, int sendcount, MPI_Datatype sendtype, retval = MPI_ERR_TYPE; } else { - if(recvbuf==MPI_IN_PLACE){ - recvcount=0; + if (recvbuf == MPI_IN_PLACE) { + recvtype=sendtype; + recvcount=sendcount; } +#ifdef HAVE_TRACING + int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; + TRACE_smpi_computing_out(rank); + int root_traced = smpi_group_index(smpi_comm_group(comm), root); + + TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__,sendcount*smpi_datatype_size(recvtype)); +#endif mpi_coll_scatter_fun(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, comm); retval = MPI_SUCCESS; - } #ifdef HAVE_TRACING TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__); TRACE_smpi_computing_in(rank); #endif + } + smpi_bench_begin(); return retval; } @@ -1872,15 +1951,10 @@ int PMPI_Scatterv(void *sendbuf, int *sendcounts, int *displs, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm) { - int retval; + int retval = 0; smpi_bench_end(); -#ifdef HAVE_TRACING - int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; - TRACE_smpi_computing_out(rank); - int root_traced = smpi_group_index(smpi_comm_group(comm), root); - TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__); -#endif + if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; } else if (sendcounts == NULL || displs == NULL) { @@ -1889,19 +1963,27 @@ int PMPI_Scatterv(void *sendbuf, int *sendcounts, int *displs, || ((recvbuf !=MPI_IN_PLACE) && (recvtype == MPI_DATATYPE_NULL))) { retval = MPI_ERR_TYPE; } else { - - if(recvbuf==MPI_IN_PLACE){ - recvcount=0; + if (recvbuf == MPI_IN_PLACE) { + recvtype=sendtype; + recvcount=sendcounts[smpi_comm_rank(comm)]; } - +#ifdef HAVE_TRACING + int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; + TRACE_smpi_computing_out(rank); + int root_traced = smpi_group_index(smpi_comm_group(comm), root); + int count=0, i; + for(i=0; i