X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e1e50fa3f7c4b7b6bcb94dba4d4032f4d69260b9..a0b1f7cf8921843f639d0bdfe6969486fcdb2116:/src/smpi/smpi_pmpi.c diff --git a/src/smpi/smpi_pmpi.c b/src/smpi/smpi_pmpi.c index 70c1d2605f..1339144ef2 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,11 +27,15 @@ 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); - TRACE_smpi_computing_init(rank); + instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); + extra->type = TRACING_INIT; + TRACE_smpi_collective_in(rank, -1, __FUNCTION__, extra); + TRACE_smpi_collective_out(rank, -1, __FUNCTION__); #endif smpi_bench_begin(); return MPI_SUCCESS; @@ -39,11 +43,16 @@ int PMPI_Init(int *argc, char ***argv) int PMPI_Finalize(void) { - smpi_process_finalize(); smpi_bench_end(); #ifdef HAVE_TRACING int rank = smpi_process_index(); - TRACE_smpi_computing_out(rank); + instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); + extra->type = TRACING_FINALIZE; + TRACE_smpi_collective_in(rank, -1, __FUNCTION__, extra); +#endif + smpi_process_finalize(); +#ifdef HAVE_TRACING + TRACE_smpi_collective_out(rank, -1, __FUNCTION__); TRACE_smpi_finalize(smpi_process_index()); #endif smpi_process_destroy(); @@ -82,7 +91,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 +106,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) { @@ -114,10 +123,6 @@ int PMPI_Abort(MPI_Comm comm, int errorcode) { 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 simcall_process_kill(SIMIX_process_self()); return MPI_SUCCESS; @@ -126,12 +131,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_process_get_sampling()) { + 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 +149,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 +169,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 +184,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 +201,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 +222,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 +239,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 +256,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 +273,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 +288,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 +306,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 +322,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 +339,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) { @@ -350,14 +358,17 @@ int PMPI_Group_translate_ranks(MPI_Group group1, int n, int *ranks1, MPI_Group group2, int *ranks2) { int retval, i, index; - smpi_bench_end(); if (group1 == MPI_GROUP_NULL || group2 == MPI_GROUP_NULL) { retval = MPI_ERR_GROUP; } else { for (i = 0; i < n; i++) { - index = smpi_group_index(group1, ranks1[i]); - ranks2[i] = smpi_group_rank(group2, index); + if(ranks1[i]==MPI_PROC_NULL){ + ranks2[i]=MPI_PROC_NULL; + }else{ + index = smpi_group_index(group1, ranks1[i]); + ranks2[i] = smpi_group_rank(group2, index); + } } retval = MPI_SUCCESS; } @@ -367,7 +378,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) { @@ -416,7 +427,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(); @@ -456,7 +466,6 @@ int PMPI_Group_intersection(MPI_Group group1, MPI_Group group2, } } } - smpi_group_use(*newgroup); retval = MPI_SUCCESS; } smpi_bench_begin(); @@ -493,7 +502,6 @@ int PMPI_Group_difference(MPI_Group group1, MPI_Group group2, MPI_Group * newgro } } } - smpi_group_use(*newgroup); retval = MPI_SUCCESS; } smpi_bench_begin(); @@ -514,6 +522,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++) { @@ -521,7 +534,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(); @@ -540,6 +552,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 { @@ -547,7 +564,7 @@ int PMPI_Group_excl(MPI_Group group, int n, int *ranks, MPI_Group * newgroup) newsize = oldsize - n; *newgroup = smpi_group_new(newsize); - int* to_exclude=xbt_new(int, smpi_group_size(group)); + int* to_exclude=xbt_new0(int, smpi_group_size(group)); for(i=0; i= 0 && rank <= ranges[i][1]; /* Last */ - rank += ranges[i][2] /* Stride */ ) { + rank >= 0; /* Last */ + ) { size++; + + rank += ranges[i][2]; /* Stride */ + if (ranges[i][0] ranges[i][1]) + break; + }else{ + if(rank < ranges[i][1]) + break; + } } } - if (size == smpi_group_size(group)) { - *newgroup = group; - } else { - *newgroup = smpi_group_new(size); - j = 0; - for (i = 0; i < n; i++) { - for (rank = ranges[i][0]; /* First */ - rank >= 0 && rank <= ranges[i][1]; /* Last */ - rank += ranges[i][2] /* Stride */ ) { - index = smpi_group_index(group, rank); - smpi_group_set_mapping(*newgroup, index, j); - j++; - } + + *newgroup = smpi_group_new(size); + j = 0; + for (i = 0; i < n; i++) { + for (rank = ranges[i][0]; /* First */ + rank >= 0; /* Last */ + ) { + index = smpi_group_index(group, rank); + smpi_group_set_mapping(*newgroup, index, j); + j++; + rank += ranges[i][2]; /* Stride */ + if (ranges[i][0] ranges[i][1]) + break; + }else{ + if(rank < ranges[i][1]) + break; + } } } } - smpi_group_use(*newgroup); retval = MPI_SUCCESS; } smpi_bench_begin(); @@ -619,7 +648,7 @@ int PMPI_Group_range_incl(MPI_Group group, int n, int ranges[][3], int PMPI_Group_range_excl(MPI_Group group, int n, int ranges[][3], MPI_Group * newgroup) { - int retval, i, newrank, rank, size, index, add; + int retval, i, rank, newrank,oldrank, size, index, add; smpi_bench_end(); if (group == MPI_GROUP_NULL) { @@ -629,41 +658,65 @@ 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++) { for (rank = ranges[i][0]; /* First */ - rank >= 0 && rank <= ranges[i][1]; /* Last */ - rank += ranges[i][2] /* Stride */ ) { + rank >= 0; /* Last */ + ) { size--; + + rank += ranges[i][2]; /* Stride */ + if (ranges[i][0] ranges[i][1]) + break; + }else{ + if(rank < ranges[i][1]) + break; + } } } if (size == 0) { *newgroup = MPI_GROUP_EMPTY; } else { *newgroup = smpi_group_new(size); - newrank = 0; + newrank=0; + oldrank=0; while (newrank < size) { + add=1; for (i = 0; i < n; i++) { - add = 1; - for (rank = ranges[i][0]; /* First */ - rank >= 0 && rank <= ranges[i][1]; /* Last */ - rank += ranges[i][2] /* Stride */ ) { - if (rank == newrank) { - add = 0; - break; + for (rank = ranges[i][0];rank >= 0;){ + if(rank==oldrank){ + add=0; + break; + } + + rank += ranges[i][2]; /* Stride */ + + if (ranges[i][0] ranges[i][1]) + break; + }else{ + if(rank < ranges[i][1]) + break; } - } - if (add == 1) { - index = smpi_group_index(group, newrank); - smpi_group_set_mapping(*newgroup, index, newrank); } } - newrank++; //added to avoid looping, need to be checked .. + if(add==1){ + index = smpi_group_index(group, oldrank); + smpi_group_set_mapping(*newgroup, index, newrank); + newrank++; + } + oldrank++; } } } - smpi_group_use(*newgroup); + retval = MPI_SUCCESS; } smpi_bench_begin(); @@ -672,7 +725,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) { @@ -689,7 +742,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) { @@ -706,7 +759,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) { @@ -723,7 +776,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) { @@ -732,6 +785,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(); @@ -740,7 +798,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) { @@ -766,7 +824,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) { @@ -783,7 +841,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) { @@ -792,7 +850,11 @@ int PMPI_Comm_create(MPI_Comm comm, MPI_Group group, MPI_Comm * newcomm) retval = MPI_ERR_GROUP; } else if (newcomm == NULL) { retval = MPI_ERR_ARG; - } else { + } else if(smpi_group_rank(group,smpi_process_index())==MPI_UNDEFINED){ + *newcomm= MPI_COMM_NULL; + retval = MPI_SUCCESS; + }else{ + *newcomm = smpi_comm_new(group); retval = MPI_SUCCESS; } @@ -802,7 +864,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) { @@ -821,7 +883,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) { @@ -839,7 +901,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) { @@ -855,9 +917,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) { @@ -871,13 +933,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) { @@ -885,36 +949,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) { @@ -929,7 +999,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) { @@ -944,7 +1014,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) { @@ -959,9 +1029,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(); @@ -985,29 +1055,38 @@ 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); + + instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); + extra->type = TRACING_IRECV; + extra->send_size = count; + extra->src = src_traced; + extra->dst = rank; + extra->datatype1 = encode_datatype(datatype); + TRACE_smpi_ptp_in(rank, src_traced, rank, __FUNCTION__, extra); #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) { @@ -1030,29 +1109,38 @@ 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; + 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_ISEND; + extra->send_size = count; + extra->src = rank; + extra->dst = dst_traced; + extra->datatype1 = encode_datatype(datatype); + TRACE_smpi_ptp_in(rank, rank, dst_traced, __FUNCTION__, extra); + 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; #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) { @@ -1075,31 +1163,37 @@ 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; + 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_ISSEND; + extra->send_size = count; + extra->src = rank; + extra->dst = dst_traced; + extra->datatype1 = encode_datatype(datatype); + TRACE_smpi_ptp_in(rank, rank, dst_traced, __FUNCTION__, extra); + 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; #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) { @@ -1122,9 +1216,13 @@ int PMPI_Recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, #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_computing_out(rank); - - TRACE_smpi_ptp_in(rank, src_traced, rank, __FUNCTION__); + instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); + extra->type = TRACING_RECV; + extra->send_size = count; + extra->src = src_traced; + extra->dst = rank; + extra->datatype1 = encode_datatype(datatype); + TRACE_smpi_ptp_in(rank, src_traced, rank, __FUNCTION__, extra); #endif smpi_mpi_recv(buf, count, datatype, src, tag, comm, status); @@ -1135,7 +1233,6 @@ int PMPI_Recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, if(status!=MPI_STATUS_IGNORE)src_traced = smpi_group_index(smpi_comm_group(comm), status->MPI_SOURCE); TRACE_smpi_ptp_out(rank, src_traced, rank, __FUNCTION__); TRACE_smpi_recv(rank, src_traced, rank); - TRACE_smpi_computing_in(rank); #endif } @@ -1146,7 +1243,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(); @@ -1168,10 +1265,15 @@ int PMPI_Send(void *buf, int count, MPI_Datatype datatype, int dst, int tag, #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); + instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); + extra->type = TRACING_SEND; + extra->send_size = count; + extra->src = rank; + extra->dst = dst_traced; + extra->datatype1 = encode_datatype(datatype); + TRACE_smpi_ptp_in(rank, rank, dst_traced, __FUNCTION__, extra); + TRACE_smpi_send(rank, rank, dst_traced,count*smpi_datatype_size(datatype)); #endif smpi_mpi_send(buf, count, datatype, dst, tag, comm); @@ -1179,7 +1281,6 @@ int PMPI_Send(void *buf, int count, MPI_Datatype datatype, int dst, int tag, #ifdef HAVE_TRACING TRACE_smpi_ptp_out(rank, rank, dst_traced, __FUNCTION__); - TRACE_smpi_computing_in(rank); #endif } @@ -1190,7 +1291,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(); @@ -1212,10 +1313,14 @@ int PMPI_Ssend(void* buf, int count, MPI_Datatype datatype, int dst, int tag, MP #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); + instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); + extra->type = TRACING_SSEND; + extra->send_size = count; + extra->src = rank; + extra->dst = dst_traced; + extra->datatype1 = encode_datatype(datatype); + TRACE_smpi_ptp_in(rank, rank, dst_traced, __FUNCTION__, extra); TRACE_smpi_send(rank, rank, dst_traced,count*smpi_datatype_size(datatype)); #endif smpi_mpi_ssend(buf, count, datatype, dst, tag, comm); @@ -1223,7 +1328,6 @@ int PMPI_Ssend(void* buf, int count, MPI_Datatype datatype, int dst, int tag, MP #ifdef HAVE_TRACING TRACE_smpi_ptp_out(rank, rank, dst_traced, __FUNCTION__); - TRACE_smpi_computing_in(rank); #endif } @@ -1236,7 +1340,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(); @@ -1262,11 +1366,19 @@ int PMPI_Sendrecv(void *sendbuf, int sendcount, MPI_Datatype sendtype, #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); 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); + instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); + extra->type = TRACING_SENDRECV; + extra->send_size = sendcount; + extra->recv_size = recvcount; + extra->src = src_traced; + extra->dst = dst_traced; + extra->datatype1 = encode_datatype(sendtype); + extra->datatype2 = encode_datatype(recvtype); + + TRACE_smpi_ptp_in(rank, src_traced, dst_traced, __FUNCTION__, extra); + TRACE_smpi_send(rank, rank, dst_traced,sendcount*smpi_datatype_size(sendtype)); #endif @@ -1277,7 +1389,6 @@ int PMPI_Sendrecv(void *sendbuf, int sendcount, MPI_Datatype sendtype, #ifdef HAVE_TRACING TRACE_smpi_ptp_out(rank, src_traced, dst_traced, __FUNCTION__); TRACE_smpi_recv(rank, src_traced, rank); - TRACE_smpi_computing_in(rank); #endif } @@ -1292,14 +1403,14 @@ 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) { retval = MPI_ERR_COUNT; } else { int size = smpi_datatype_get_extent(datatype) * count; - recvbuf = xbt_new(char, size); + recvbuf = xbt_new0(char, size); retval = MPI_Sendrecv(buf, count, datatype, dst, sendtag, recvbuf, count, datatype, src, recvtag, comm, status); @@ -1314,13 +1425,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); @@ -1333,7 +1445,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) { @@ -1348,7 +1460,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) { @@ -1362,7 +1474,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) { @@ -1383,7 +1495,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) { @@ -1393,6 +1505,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; @@ -1406,10 +1519,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) { @@ -1417,26 +1532,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); - 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; + instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); + extra->type = TRACING_WAIT; + TRACE_smpi_ptp_in(rank, src_traced, dst_traced, __FUNCTION__, extra); #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); + } #endif } @@ -1447,27 +1568,31 @@ 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 //save requests information for tracing int i; - int *srcs = xbt_new(int, count); - int *dsts = xbt_new(int, count); - int *recvs = xbt_new(int, count); + int *srcs = xbt_new0(int, count); + int *dsts = xbt_new0(int, count); + int *recvs = xbt_new0(int, count); + MPI_Comm *comms = xbt_new0(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__); + instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); + extra->type = TRACING_WAITANY; + extra->send_size=count; + TRACE_smpi_ptp_in(rank_traced, -1, -1, __FUNCTION__,extra); #endif if (index == NULL) { @@ -1479,17 +1604,23 @@ 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 smpi_bench_begin(); return retval; @@ -1502,39 +1633,56 @@ int PMPI_Waitall(int count, MPI_Request requests[], MPI_Status status[]) #ifdef HAVE_TRACING //save information from requests int i; - int *srcs = xbt_new(int, count); - int *dsts = xbt_new(int, count); - int *recvs = xbt_new(int, count); - int valid_count = 0; + 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); + + //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__); + instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); + extra->type = TRACING_WAITALL; + extra->send_size=count; + TRACE_smpi_ptp_in(rank_traced, -1, -1, __FUNCTION__,extra); #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); - TRACE_smpi_computing_in(rank_traced); + xbt_free(valid); + xbt_free(comms); + #endif smpi_bench_begin(); return retval; @@ -1543,10 +1691,10 @@ 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 || indices == NULL) { + if (outcount == NULL) { retval = MPI_ERR_ARG; } else { *outcount = smpi_mpi_waitsome(incount, requests, indices, status); @@ -1559,10 +1707,10 @@ 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 || indices == NULL) { + if (outcount == NULL) { retval = MPI_ERR_ARG; } else { *outcount = smpi_mpi_testsome(incount, requests, indices, status); @@ -1575,49 +1723,58 @@ 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__); + + instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); + extra->type = TRACING_BCAST; + extra->send_size = count; + extra->root = root_traced; + extra->datatype1 = encode_datatype(datatype); + TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__, extra); + #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(); -#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 { +#ifdef HAVE_TRACING + 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); +#endif 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; } @@ -1626,29 +1783,50 @@ 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 (sendtype == MPI_DATATYPE_NULL - || recvtype == MPI_DATATYPE_NULL) { + } else if ((( sendbuf != MPI_IN_PLACE) && (sendtype == MPI_DATATYPE_NULL)) || + ((smpi_comm_rank(comm) == root) && (recvtype == MPI_DATATYPE_NULL))){ retval = MPI_ERR_TYPE; + } else if ((( sendbuf != MPI_IN_PLACE) && (sendcount <0)) || + ((smpi_comm_rank(comm) == root) && (recvcount <0))){ + retval = MPI_ERR_COUNT; } else { - mpi_coll_gather_fun(sendbuf, sendcount, sendtype, recvbuf, recvcount, + + char* sendtmpbuf = (char*) sendbuf; + int sendtmpcount = sendcount; + MPI_Datatype sendtmptype = sendtype; + if( (smpi_comm_rank(comm) == root) && (sendbuf == MPI_IN_PLACE )) { + sendtmpcount=0; + sendtmptype=recvtype; + } +#ifdef HAVE_TRACING + int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; + int root_traced = smpi_group_index(smpi_comm_group(comm), root); + instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); + extra->type = TRACING_GATHER; + extra->send_size = sendtmpcount; + extra->recv_size = recvcount; + extra->root = root_traced; + extra->datatype1 = encode_datatype(sendtmptype); + extra->datatype2 = encode_datatype(recvtype); + + TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__, extra); +#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; } @@ -1657,31 +1835,54 @@ 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 (sendtype == MPI_DATATYPE_NULL - || recvtype == MPI_DATATYPE_NULL) { + } else if ((( sendbuf != MPI_IN_PLACE) && (sendtype == MPI_DATATYPE_NULL)) || + ((smpi_comm_rank(comm) == root) && (recvtype == MPI_DATATYPE_NULL))){ retval = MPI_ERR_TYPE; + } else if (( sendbuf != MPI_IN_PLACE) && (sendcount <0)){ + retval = MPI_ERR_COUNT; } else if (recvcounts == NULL || displs == NULL) { retval = MPI_ERR_ARG; } else { - smpi_mpi_gatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, + char* sendtmpbuf = (char*) sendbuf; + int sendtmpcount = sendcount; + MPI_Datatype sendtmptype = sendtype; + if( (smpi_comm_rank(comm) == root) && (sendbuf == MPI_IN_PLACE )) { + sendtmpcount=0; + sendtmptype=recvtype; + } + +#ifdef HAVE_TRACING + int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; + int root_traced = smpi_group_index(smpi_comm_group(comm), root); + int i=0; + int size = smpi_comm_size(comm); + instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); + extra->type = TRACING_GATHERV; + extra->send_size = sendtmpcount; + extra->recvcounts= xbt_malloc(size*sizeof(int)); + for(i=0; i< size; i++)//copy data to avoid bad free + extra->recvcounts[i] = recvcounts[i]; + extra->num_processes = size; + extra->root = root_traced; + extra->datatype1 = encode_datatype(sendtmptype); + extra->datatype2 = encode_datatype(recvtype); + + TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__,extra); +#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; } @@ -1690,27 +1891,43 @@ 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 (sendtype == MPI_DATATYPE_NULL - || recvtype == MPI_DATATYPE_NULL) { + } else if ((( sendbuf != MPI_IN_PLACE) && (sendtype == MPI_DATATYPE_NULL)) || + (recvtype == MPI_DATATYPE_NULL)){ retval = MPI_ERR_TYPE; + } else if ((( sendbuf != MPI_IN_PLACE) && (sendcount <0)) || + (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; + instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); + extra->type = TRACING_ALLGATHER; + extra->send_size = sendcount; + extra->recv_size = recvcount; + extra->datatype1 = encode_datatype(sendtype); + extra->datatype2 = encode_datatype(recvtype); + + TRACE_smpi_collective_in(rank, -1, __FUNCTION__, extra); +#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; } @@ -1719,30 +1936,50 @@ 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 (sendtype == MPI_DATATYPE_NULL - || recvtype == MPI_DATATYPE_NULL) { + } else if ((( sendbuf != MPI_IN_PLACE) && (sendtype == MPI_DATATYPE_NULL)) || + (recvtype == MPI_DATATYPE_NULL)){ retval = MPI_ERR_TYPE; + } else if (( sendbuf != MPI_IN_PLACE) && (sendcount <0)){ + retval = MPI_ERR_COUNT; } else if (recvcounts == NULL || displs == NULL) { retval = MPI_ERR_ARG; } else { + + if(sendbuf == MPI_IN_PLACE) { + sendbuf=((char*)recvbuf)+smpi_datatype_get_extent(recvtype)*displs[smpi_comm_rank(comm)]; + sendcount=recvcounts[smpi_comm_rank(comm)]; + sendtype=recvtype; + } +#ifdef HAVE_TRACING + int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; + int i=0; + int size = smpi_comm_size(comm); + instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); + extra->type = TRACING_ALLGATHERV; + extra->send_size = sendcount; + extra->recvcounts= xbt_malloc(size*sizeof(int)); + for(i=0; i< size; i++)//copy data to avoid bad free + extra->recvcounts[i] = recvcounts[i]; + extra->num_processes = size; + extra->datatype1 = encode_datatype(sendtype); + extra->datatype2 = encode_datatype(recvtype); + + TRACE_smpi_collective_in(rank, -1, __FUNCTION__,extra); +#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; } @@ -1751,30 +1988,42 @@ 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 (sendtype == MPI_DATATYPE_NULL - || recvtype == MPI_DATATYPE_NULL) { + } else if (((smpi_comm_rank(comm)==root) && (sendtype == MPI_DATATYPE_NULL)) + || ((recvbuf !=MPI_IN_PLACE) && (recvtype == MPI_DATATYPE_NULL))) { retval = MPI_ERR_TYPE; } else { + + if (recvbuf == MPI_IN_PLACE) { + recvtype=sendtype; + recvcount=sendcount; + } +#ifdef HAVE_TRACING + int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; + int root_traced = smpi_group_index(smpi_comm_group(comm), root); + instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); + extra->type = TRACING_SCATTER; + extra->send_size = sendcount; + extra->recv_size= recvcount; + extra->root = root_traced; + extra->datatype1 = encode_datatype(sendtype); + extra->datatype2 = encode_datatype(recvtype); + + TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__,extra); +#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; } @@ -1783,31 +2032,49 @@ 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 (sendtype == MPI_DATATYPE_NULL - || recvtype == MPI_DATATYPE_NULL) { - retval = MPI_ERR_TYPE; } else if (sendcounts == NULL || displs == NULL) { retval = MPI_ERR_ARG; + } else if (((smpi_comm_rank(comm)==root) && (sendtype == MPI_DATATYPE_NULL)) + || ((recvbuf !=MPI_IN_PLACE) && (recvtype == MPI_DATATYPE_NULL))) { + retval = MPI_ERR_TYPE; } else { + 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; + int root_traced = smpi_group_index(smpi_comm_group(comm), root); + int i=0; + int size = smpi_comm_size(comm); + instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); + extra->type = TRACING_SCATTERV; + extra->recv_size = recvcount; + extra->sendcounts= xbt_malloc(size*sizeof(int)); + for(i=0; i< size; i++)//copy data to avoid bad free + extra->sendcounts[i] = sendcounts[i]; + extra->num_processes = size; + extra->root = root_traced; + extra->datatype1 = encode_datatype(sendtype); + extra->datatype2 = encode_datatype(recvtype); + + TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__,extra); + +#endif smpi_mpi_scatterv(sendbuf, sendcounts, displs, 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; } @@ -1815,34 +2082,41 @@ int PMPI_Scatterv(void *sendbuf, int *sendcounts, int *displs, int PMPI_Reduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, 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 (datatype == MPI_DATATYPE_NULL || op == MPI_OP_NULL) { retval = MPI_ERR_ARG; } else { +#ifdef HAVE_TRACING + int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; + int root_traced = smpi_group_index(smpi_comm_group(comm), root); + instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); + extra->type = TRACING_REDUCE; + extra->send_size = count; + extra->datatype1 = encode_datatype(datatype); + extra->root = root_traced; + + TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__,extra); +#endif mpi_coll_reduce_fun(sendbuf, recvbuf, count, datatype, op, 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_Reduce_local(void *inbuf, void *inoutbuf, int count, MPI_Datatype datatype, MPI_Op op){ - int retval; + int retval = 0; smpi_bench_end(); if (datatype == MPI_DATATYPE_NULL || op == MPI_OP_NULL) { @@ -1858,14 +2132,10 @@ int PMPI_Reduce_local(void *inbuf, void *inoutbuf, int count, int PMPI_Allreduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, 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 (datatype == MPI_DATATYPE_NULL) { @@ -1873,13 +2143,33 @@ int PMPI_Allreduce(void *sendbuf, void *recvbuf, int count, } else if (op == MPI_OP_NULL) { retval = MPI_ERR_OP; } else { - mpi_coll_allreduce_fun(sendbuf, recvbuf, count, datatype, op, comm); + + char* sendtmpbuf = (char*) sendbuf; + if( sendbuf == MPI_IN_PLACE ) { + sendtmpbuf = (char *)xbt_malloc(count*smpi_datatype_get_extent(datatype)); + smpi_datatype_copy(recvbuf, count, datatype,sendtmpbuf, count, datatype); + } +#ifdef HAVE_TRACING + 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_ALLREDUCE; + extra->send_size = count; + extra->datatype1 = encode_datatype(datatype); + + TRACE_smpi_collective_in(rank, -1, __FUNCTION__,extra); +#endif + mpi_coll_allreduce_fun(sendtmpbuf, recvbuf, count, datatype, op, comm); + + if( sendbuf == MPI_IN_PLACE ) { + xbt_free(sendtmpbuf); + } + retval = MPI_SUCCESS; - } #ifdef HAVE_TRACING TRACE_smpi_collective_out(rank, -1, __FUNCTION__); - TRACE_smpi_computing_in(rank); #endif + } + smpi_bench_begin(); return retval; } @@ -1887,14 +2177,43 @@ int PMPI_Allreduce(void *sendbuf, void *recvbuf, int count, int PMPI_Scan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) { - int retval; + int retval = 0; smpi_bench_end(); + + if (comm == MPI_COMM_NULL) { + retval = MPI_ERR_COMM; + } else if (datatype == MPI_DATATYPE_NULL) { + retval = MPI_ERR_TYPE; + } else if (op == MPI_OP_NULL) { + retval = MPI_ERR_OP; + } 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__); + instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); + extra->type = TRACING_SCAN; + extra->send_size = count; + extra->datatype1 = encode_datatype(datatype); + + TRACE_smpi_collective_in(rank, -1, __FUNCTION__,extra); +#endif + smpi_mpi_scan(sendbuf, recvbuf, count, datatype, op, comm); + retval = MPI_SUCCESS; +#ifdef HAVE_TRACING + TRACE_smpi_collective_out(rank, -1, __FUNCTION__); #endif + } + + smpi_bench_begin(); + return retval; +} + +int PMPI_Exscan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, + MPI_Op op, MPI_Comm comm){ + int retval = 0; + + smpi_bench_end(); + if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; } else if (datatype == MPI_DATATYPE_NULL) { @@ -1902,13 +2221,22 @@ int PMPI_Scan(void *sendbuf, void *recvbuf, int count, } else if (op == MPI_OP_NULL) { retval = MPI_ERR_OP; } else { - smpi_mpi_scan(sendbuf, recvbuf, count, datatype, op, comm); +#ifdef HAVE_TRACING + 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_EXSCAN; + extra->send_size = count; + extra->datatype1 = encode_datatype(datatype); + + TRACE_smpi_collective_in(rank, -1, __FUNCTION__,extra); +#endif + smpi_mpi_exscan(sendbuf, recvbuf, count, datatype, op, 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; } @@ -1916,13 +2244,9 @@ int PMPI_Scan(void *sendbuf, void *recvbuf, int count, int PMPI_Reduce_scatter(void *sendbuf, void *recvbuf, int *recvcounts, MPI_Datatype datatype, MPI_Op op, 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 (datatype == MPI_DATATYPE_NULL) { @@ -1932,15 +2256,34 @@ int PMPI_Reduce_scatter(void *sendbuf, void *recvbuf, int *recvcounts, } else if (recvcounts == NULL) { retval = MPI_ERR_ARG; } else { +#ifdef HAVE_TRACING + int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; + int i=0; + int size = smpi_comm_size(comm); + instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); + extra->type = TRACING_REDUCE_SCATTER; + extra->send_size = 0; + extra->recvcounts= xbt_malloc(size*sizeof(int)); + for(i=0; i< size; i++)//copy data to avoid bad free + extra->recvcounts[i] = recvcounts[i]; + extra->num_processes = size; + extra->datatype1 = encode_datatype(datatype); + + TRACE_smpi_collective_in(rank, -1, __FUNCTION__,extra); +#endif + void* sendtmpbuf=sendbuf; + if(sendbuf==MPI_IN_PLACE){ + sendtmpbuf=recvbuf; + } - mpi_coll_reduce_scatter_fun(sendbuf, recvbuf, recvcounts, + mpi_coll_reduce_scatter_fun(sendtmpbuf, recvbuf, recvcounts, datatype, op, 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; } @@ -1950,11 +2293,7 @@ int PMPI_Reduce_scatter_block(void *sendbuf, void *recvbuf, int recvcount, { int retval,i; 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 (datatype == MPI_DATATYPE_NULL) { @@ -1965,17 +2304,31 @@ int PMPI_Reduce_scatter_block(void *sendbuf, void *recvbuf, int recvcount, retval = MPI_ERR_ARG; } else { int count=smpi_comm_size(comm); + +#ifdef HAVE_TRACING + 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_REDUCE_SCATTER; + extra->send_size = 0; + extra->recvcounts= xbt_malloc(count*sizeof(int)); + for(i=0; i< count; i++)//copy data to avoid bad free + extra->recvcounts[i] = recvcount; + extra->num_processes = count; + extra->datatype1 = encode_datatype(datatype); + + TRACE_smpi_collective_in(rank, -1, __FUNCTION__,extra); +#endif int* recvcounts=(int*)xbt_malloc(count); for (i=0; itype = TRACING_ALLTOALL; + extra->send_size = sendcount; + extra->recv_size = recvcount; + extra->datatype1 = encode_datatype(sendtype); + extra->datatype2 = encode_datatype(recvtype); + + TRACE_smpi_collective_in(rank, -1, __FUNCTION__,extra); +#endif retval = mpi_coll_alltoall_fun(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm); - } #ifdef HAVE_TRACING TRACE_smpi_collective_out(rank, -1, __FUNCTION__); - TRACE_smpi_computing_in(rank); #endif + } + smpi_bench_begin(); return retval; } @@ -2012,14 +2372,10 @@ int PMPI_Alltoallv(void *sendbuf, int *sendcounts, int *senddisps, MPI_Datatype sendtype, void *recvbuf, int *recvcounts, int *recvdisps, 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 (sendtype == MPI_DATATYPE_NULL @@ -2029,15 +2385,40 @@ int PMPI_Alltoallv(void *sendbuf, int *sendcounts, int *senddisps, || recvdisps == NULL) { retval = MPI_ERR_ARG; } else { +#ifdef HAVE_TRACING + int rank = comm != MPI_COMM_NULL ? smpi_process_index() : -1; + int i=0; + int size = smpi_comm_size(comm); + instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); + extra->type = TRACING_ALLTOALLV; + extra->send_size = 0; + extra->recv_size = 0; + extra->recvcounts= xbt_malloc(size*sizeof(int)); + extra->sendcounts= xbt_malloc(size*sizeof(int)); + + for(i=0; i< size; i++){//copy data to avoid bad free + extra->send_size += sendcounts[i]; + extra->recv_size += recvcounts[i]; + + extra->sendcounts[i] = sendcounts[i]; + extra->recvcounts[i] = recvcounts[i]; + } + extra->num_processes = size; + + extra->datatype1 = encode_datatype(sendtype); + extra->datatype2 = encode_datatype(recvtype); + + TRACE_smpi_collective_in(rank, -1, __FUNCTION__,extra); +#endif retval = mpi_coll_alltoallv_fun(sendbuf, sendcounts, senddisps, sendtype, recvbuf, recvcounts, recvdisps, recvtype, comm); - } #ifdef HAVE_TRACING TRACE_smpi_collective_out(rank, -1, __FUNCTION__); - TRACE_smpi_computing_in(rank); #endif + } + smpi_bench_begin(); return retval; } @@ -2085,7 +2466,7 @@ int PMPI_Get_count(MPI_Status * status, MPI_Datatype datatype, int *count) } int PMPI_Type_contiguous(int count, MPI_Datatype old_type, MPI_Datatype* new_type) { - int retval; + int retval = 0; smpi_bench_end(); if (old_type == MPI_DATATYPE_NULL) { @@ -2100,10 +2481,10 @@ int PMPI_Type_contiguous(int count, MPI_Datatype old_type, MPI_Datatype* new_typ } int PMPI_Type_commit(MPI_Datatype* datatype) { - int retval; + int retval = 0; smpi_bench_end(); - if (datatype == MPI_DATATYPE_NULL) { + if (datatype == NULL || *datatype == MPI_DATATYPE_NULL) { retval = MPI_ERR_TYPE; } else { smpi_datatype_commit(datatype); @@ -2115,7 +2496,7 @@ int PMPI_Type_commit(MPI_Datatype* datatype) { int PMPI_Type_vector(int count, int blocklen, int stride, MPI_Datatype old_type, MPI_Datatype* new_type) { - int retval; + int retval = 0; smpi_bench_end(); if (old_type == MPI_DATATYPE_NULL) { @@ -2130,7 +2511,7 @@ int PMPI_Type_vector(int count, int blocklen, int stride, MPI_Datatype old_type, } int PMPI_Type_hvector(int count, int blocklen, MPI_Aint stride, MPI_Datatype old_type, MPI_Datatype* new_type) { - int retval; + int retval = 0; smpi_bench_end(); if (old_type == MPI_DATATYPE_NULL) { @@ -2149,7 +2530,22 @@ int PMPI_Type_create_hvector(int count, int blocklen, MPI_Aint stride, MPI_Datat } int PMPI_Type_indexed(int count, int* blocklens, int* indices, MPI_Datatype old_type, MPI_Datatype* new_type) { - int retval; + int retval = 0; + + smpi_bench_end(); + if (old_type == MPI_DATATYPE_NULL) { + retval = MPI_ERR_TYPE; + } else if (count<0){ + retval = MPI_ERR_COUNT; + } else { + retval = smpi_datatype_indexed(count, blocklens, indices, old_type, new_type); + } + smpi_bench_begin(); + return retval; +} + +int PMPI_Type_create_indexed(int count, int* blocklens, int* indices, MPI_Datatype old_type, MPI_Datatype* new_type) { + int retval = 0; smpi_bench_end(); if (old_type == MPI_DATATYPE_NULL) { @@ -2183,7 +2579,7 @@ int PMPI_Type_create_indexed_block(int count, int blocklength, int* indices, MPI int PMPI_Type_hindexed(int count, int* blocklens, MPI_Aint* indices, MPI_Datatype old_type, MPI_Datatype* new_type) { - int retval; + int retval = 0; smpi_bench_end(); if (old_type == MPI_DATATYPE_NULL) { @@ -2197,6 +2593,10 @@ int PMPI_Type_hindexed(int count, int* blocklens, MPI_Aint* indices, MPI_Datatyp return retval; } +int PMPI_Type_create_hindexed(int count, int* blocklens, MPI_Aint* indices, MPI_Datatype old_type, MPI_Datatype* new_type) { + return PMPI_Type_hindexed(count, blocklens,indices,old_type,new_type); +} + int PMPI_Type_create_hindexed_block(int count, int blocklength, MPI_Aint* indices, MPI_Datatype old_type, MPI_Datatype* new_type) { int retval,i; @@ -2217,7 +2617,7 @@ int PMPI_Type_create_hindexed_block(int count, int blocklength, MPI_Aint* indice int PMPI_Type_struct(int count, int* blocklens, MPI_Aint* indices, MPI_Datatype* old_types, MPI_Datatype* new_type) { - int retval; + int retval = 0; smpi_bench_end(); if (count<0){ @@ -2242,481 +2642,476 @@ int PMPI_Error_class(int errorcode, int* errorclass) { int PMPI_Initialized(int* flag) { - *flag=(smpi_process_data()!=NULL); + *flag=smpi_process_initialized(); return MPI_SUCCESS; } /* The following calls are not yet implemented and will fail at runtime. */ /* Once implemented, please move them above this notice. */ -static inline int not_yet_implemented(void) { - XBT_WARN("Not yet implemented : line %d in %s", __LINE__, __FUNCTION__); - return MPI_SUCCESS; -} +#define NOT_YET_IMPLEMENTED {\ + XBT_WARN("Not yet implemented : %s. Please contact the Simgrid team if support is needed", __FUNCTION__);\ + return MPI_SUCCESS;\ + } int PMPI_Type_dup(MPI_Datatype datatype, MPI_Datatype *newtype){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Type_set_name(MPI_Datatype datatype, char * name) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Type_get_name(MPI_Datatype datatype, char * name, int* len) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Pack_size(int incount, MPI_Datatype datatype, MPI_Comm comm, int* size) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Cart_coords(MPI_Comm comm, int rank, int maxdims, int* coords) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Cart_create(MPI_Comm comm_old, int ndims, int* dims, int* periods, int reorder, MPI_Comm* comm_cart) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Cart_get(MPI_Comm comm, int maxdims, int* dims, int* periods, int* coords) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Cart_map(MPI_Comm comm_old, int ndims, int* dims, int* periods, int* newrank) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Cart_rank(MPI_Comm comm, int* coords, int* rank) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Cart_shift(MPI_Comm comm, int direction, int displ, int* source, int* dest) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Cart_sub(MPI_Comm comm, int* remain_dims, MPI_Comm* comm_new) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Cartdim_get(MPI_Comm comm, int* ndims) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Graph_create(MPI_Comm comm_old, int nnodes, int* index, int* edges, int reorder, MPI_Comm* comm_graph) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Graph_get(MPI_Comm comm, int maxindex, int maxedges, int* index, int* edges) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Graph_map(MPI_Comm comm_old, int nnodes, int* index, int* edges, int* newrank) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Graph_neighbors(MPI_Comm comm, int rank, int maxneighbors, int* neighbors) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Graph_neighbors_count(MPI_Comm comm, int rank, int* nneighbors) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Graphdims_get(MPI_Comm comm, int* nnodes, int* nedges) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Topo_test(MPI_Comm comm, int* top_type) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Errhandler_create(MPI_Handler_function* function, MPI_Errhandler* errhandler) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Errhandler_free(MPI_Errhandler* errhandler) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Errhandler_get(MPI_Comm comm, MPI_Errhandler* errhandler) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Error_string(int errorcode, char* string, int* resultlen) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Errhandler_set(MPI_Comm comm, MPI_Errhandler errhandler) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Comm_set_errhandler(MPI_Comm comm, MPI_Errhandler errhandler) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED +} + +int PMPI_Comm_get_errhandler(MPI_Comm comm, MPI_Errhandler* errhandler) { + NOT_YET_IMPLEMENTED } int PMPI_Cancel(MPI_Request* request) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Buffer_attach(void* buffer, int size) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Buffer_detach(void* buffer, int* size) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Comm_test_inter(MPI_Comm comm, int* flag) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Comm_get_attr (MPI_Comm comm, int comm_keyval, void *attribute_val, int *flag) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Comm_set_attr (MPI_Comm comm, int comm_keyval, void *attribute_val) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Comm_delete_attr (MPI_Comm comm, int comm_keyval) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Comm_create_keyval(MPI_Comm_copy_attr_function* copy_fn, MPI_Comm_delete_attr_function* delete_fn, int* keyval, void* extra_state) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Comm_free_keyval(int* keyval) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Pcontrol(const int level ) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Unpack(void* inbuf, int insize, int* position, void* outbuf, int outcount, MPI_Datatype type, MPI_Comm comm) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Type_get_attr (MPI_Datatype type, int type_keyval, void *attribute_val, int* flag) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Type_set_attr (MPI_Datatype type, int type_keyval, void *attribute_val) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Type_delete_attr (MPI_Datatype type, int comm_keyval) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Type_create_keyval(MPI_Type_copy_attr_function* copy_fn, MPI_Type_delete_attr_function* delete_fn, int* keyval, void* extra_state) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Type_free_keyval(int* keyval) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Intercomm_create(MPI_Comm local_comm, int local_leader, MPI_Comm peer_comm, int remote_leader, int tag, MPI_Comm* comm_out) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Intercomm_merge(MPI_Comm comm, int high, MPI_Comm* comm_out) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Bsend(void* buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Bsend_init(void* buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm, MPI_Request* request) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Ibsend(void* buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm, MPI_Request* request) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Comm_remote_group(MPI_Comm comm, MPI_Group* group) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Comm_remote_size(MPI_Comm comm, int* size) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Attr_delete(MPI_Comm comm, int keyval) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Attr_get(MPI_Comm comm, int keyval, void* attr_value, int* flag) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Attr_put(MPI_Comm comm, int keyval, void* attr_value) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Rsend(void* buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Rsend_init(void* buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm, MPI_Request* request) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Irsend(void* buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm, MPI_Request* request) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Keyval_create(MPI_Copy_function* copy_fn, MPI_Delete_function* delete_fn, int* keyval, void* extra_state) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Keyval_free(int* keyval) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Test_cancelled(MPI_Status* status, int* flag) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Pack(void* inbuf, int incount, MPI_Datatype type, void* outbuf, int outcount, int* position, MPI_Comm comm) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Pack_external_size(char *datarep, int incount, MPI_Datatype datatype, MPI_Aint *size){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Pack_external(char *datarep, void *inbuf, int incount, MPI_Datatype datatype, void *outbuf, MPI_Aint outcount, MPI_Aint *position){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Unpack_external( char *datarep, void *inbuf, MPI_Aint insize, MPI_Aint *position, void *outbuf, int outcount, MPI_Datatype datatype){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Get_elements(MPI_Status* status, MPI_Datatype datatype, int* elements) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Dims_create(int nnodes, int ndims, int* dims) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Win_fence( int assert, MPI_Win win){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Win_free( MPI_Win* win){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Win_create( void *base, MPI_Aint size, int disp_unit, MPI_Info info, MPI_Comm comm, MPI_Win *win){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Info_create( MPI_Info *info){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Info_set( MPI_Info info, char *key, char *value){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Info_free( MPI_Info *info){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Get( void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Win win){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Type_get_envelope( MPI_Datatype datatype, int *num_integers, int *num_addresses, int *num_datatypes, int *combiner){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Type_get_contents(MPI_Datatype datatype, int max_integers, int max_addresses, int max_datatypes, int* array_of_integers, MPI_Aint* array_of_addresses, MPI_Datatype* array_of_datatypes){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Type_create_darray(int size, int rank, int ndims, int* array_of_gsizes, int* array_of_distribs, int* array_of_dargs, int* array_of_psizes, int order, MPI_Datatype oldtype, MPI_Datatype *newtype) { - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Type_create_resized(MPI_Datatype oldtype,MPI_Aint lb, MPI_Aint extent, MPI_Datatype *newtype){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Type_create_subarray(int ndims,int *array_of_sizes, int *array_of_subsizes, int *array_of_starts, int order, MPI_Datatype oldtype, MPI_Datatype *newtype){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Type_match_size(int typeclass,int size,MPI_Datatype *datatype){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Alltoallw( void *sendbuf, int *sendcnts, int *sdispls, MPI_Datatype *sendtypes, void *recvbuf, int *recvcnts, int *rdispls, MPI_Datatype *recvtypes, MPI_Comm comm){ - return not_yet_implemented(); -} - -int PMPI_Exscan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, MPI_Comm comm){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Comm_set_name(MPI_Comm comm, char* name){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Comm_dup_with_info(MPI_Comm comm, MPI_Info info, MPI_Comm * newcomm){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Comm_split_type(MPI_Comm comm, int split_type, int key, MPI_Info info, MPI_Comm *newcomm){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Comm_set_info (MPI_Comm comm, MPI_Info info){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Comm_get_info (MPI_Comm comm, MPI_Info* info){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Info_get(MPI_Info info,char *key,int valuelen, char *value, int *flag){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Comm_create_errhandler( MPI_Comm_errhandler_fn *function, MPI_Errhandler *errhandler){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Add_error_class( int *errorclass){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Add_error_code( int errorclass, int *errorcode){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Add_error_string( int errorcode, char *string){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Comm_call_errhandler(MPI_Comm comm,int errorcode){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Info_dup(MPI_Info info, MPI_Info *newinfo){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Info_delete(MPI_Info info, char *key){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Info_get_nkeys( MPI_Info info, int *nkeys){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Info_get_nthkey( MPI_Info info, int n, char *key){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Info_get_valuelen( MPI_Info info, char *key, int *valuelen, int *flag){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Request_get_status( MPI_Request request, int *flag, MPI_Status *status){ - return not_yet_implemented(); -} - -int MPI_Request_get_status( MPI_Request request, int *flag, MPI_Status *status){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Grequest_start( MPI_Grequest_query_function *query_fn, MPI_Grequest_free_function *free_fn, MPI_Grequest_cancel_function *cancel_fn, void *extra_state, MPI_Request *request){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Grequest_complete( MPI_Request request){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Status_set_cancelled(MPI_Status *status,int flag){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Status_set_elements( MPI_Status *status, MPI_Datatype datatype, int count){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Comm_connect( char *port_name, MPI_Info info, int root, MPI_Comm comm, MPI_Comm *newcomm){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Publish_name( char *service_name, MPI_Info info, char *port_name){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Unpublish_name( char *service_name, MPI_Info info, char *port_name){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Lookup_name( char *service_name, MPI_Info info, char *port_name){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Comm_join( int fd, MPI_Comm *intercomm){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Open_port( MPI_Info info, char *port_name){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Close_port(char *port_name){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Comm_accept( char *port_name, MPI_Info info, int root, MPI_Comm comm, MPI_Comm *newcomm){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Comm_spawn( char *command, char **argv, int maxprocs, MPI_Info info, int root, MPI_Comm comm, MPI_Comm *intercomm, int* array_of_errcodes){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Comm_spawn_multiple( int count, char **array_of_commands, char*** array_of_argv, int* array_of_maxprocs, MPI_Info* array_of_info, int root, MPI_Comm comm, MPI_Comm *intercomm, int* array_of_errcodes){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED } int PMPI_Comm_get_parent( MPI_Comm *parent){ - return not_yet_implemented(); + NOT_YET_IMPLEMENTED }