X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f9df6a0ce7023e4e22d83bb6c50f27bd21fab329..aa3595ed3c903167f52eeeab8e636bec96b258dd:/src/smpi/smpi_pmpi.cpp diff --git a/src/smpi/smpi_pmpi.cpp b/src/smpi/smpi_pmpi.cpp index 1f4add0efb..a1a0859c65 100644 --- a/src/smpi/smpi_pmpi.cpp +++ b/src/smpi/smpi_pmpi.cpp @@ -1,10 +1,9 @@ - -/* Copyright (c) 2007-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2007-2016. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ +#include #include #include "private.h" @@ -500,7 +499,7 @@ 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 + if (group != smpi_comm_group(MPI_COMM_WORLD) && group != smpi_comm_group(MPI_COMM_SELF) && group != MPI_GROUP_EMPTY) smpi_group_use(group); } else if (n == smpi_group_size(group)) { @@ -603,7 +602,7 @@ int PMPI_Group_range_excl(MPI_Group group, int n, int ranges[][3], MPI_Group * n } else { if (n == 0) { *newgroup = group; - if(group!= smpi_comm_group(MPI_COMM_WORLD) && group != MPI_GROUP_NULL + if (group!= smpi_comm_group(MPI_COMM_WORLD) && group != smpi_comm_group(MPI_COMM_SELF) && group != MPI_GROUP_EMPTY) smpi_group_use(group); } else { @@ -1047,7 +1046,7 @@ int PMPI_Isend(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MP dt_size_send = smpi_datatype_size(datatype); extra->send_size = count*dt_size_send; TRACE_smpi_ptp_in(rank, rank, dst_traced, __FUNCTION__, extra); - TRACE_smpi_send(rank, rank, dst_traced, count*smpi_datatype_size(datatype)); + TRACE_smpi_send(rank, rank, dst_traced, tag, count*smpi_datatype_size(datatype)); *request = smpi_mpi_isend(buf, count, datatype, dst, tag, comm); retval = MPI_SUCCESS; @@ -1097,7 +1096,7 @@ int PMPI_Issend(void* buf, int count, MPI_Datatype datatype, int dst, int tag, M dt_size_send = smpi_datatype_size(datatype); extra->send_size = count*dt_size_send; TRACE_smpi_ptp_in(rank, rank, dst_traced, __FUNCTION__, extra); - TRACE_smpi_send(rank, rank, dst_traced, count*smpi_datatype_size(datatype)); + TRACE_smpi_send(rank, rank, dst_traced, tag, count*smpi_datatype_size(datatype)); *request = smpi_mpi_issend(buf, count, datatype, dst, tag, comm); retval = MPI_SUCCESS; @@ -1153,7 +1152,7 @@ int PMPI_Recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI if(status!=MPI_STATUS_IGNORE){ src_traced = smpi_group_index(smpi_comm_group(comm), status->MPI_SOURCE); if (!TRACE_smpi_view_internals()) { - TRACE_smpi_recv(rank, src_traced, rank); + TRACE_smpi_recv(rank, src_traced, rank, tag); } } TRACE_smpi_ptp_out(rank, src_traced, rank, __FUNCTION__); @@ -1197,7 +1196,7 @@ int PMPI_Send(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI extra->send_size = count*dt_size_send; TRACE_smpi_ptp_in(rank, rank, dst_traced, __FUNCTION__, extra); if (!TRACE_smpi_view_internals()) { - TRACE_smpi_send(rank, rank, dst_traced,count*smpi_datatype_size(datatype)); + TRACE_smpi_send(rank, rank, dst_traced, tag,count*smpi_datatype_size(datatype)); } smpi_mpi_send(buf, count, datatype, dst, tag, comm); @@ -1242,7 +1241,7 @@ int PMPI_Ssend(void* buf, int count, MPI_Datatype datatype, int dst, int tag, MP } extra->send_size = count*dt_size_send; TRACE_smpi_ptp_in(rank, rank, dst_traced, __FUNCTION__, extra); - TRACE_smpi_send(rank, rank, dst_traced,count*smpi_datatype_size(datatype)); + TRACE_smpi_send(rank, rank, dst_traced, tag,count*smpi_datatype_size(datatype)); smpi_mpi_ssend(buf, count, datatype, dst, tag, comm); retval = MPI_SUCCESS; @@ -1300,14 +1299,14 @@ int PMPI_Sendrecv(void *sendbuf, int sendcount, MPI_Datatype sendtype, int dst, extra->recv_size = recvcount*dt_size_recv; TRACE_smpi_ptp_in(rank, src_traced, dst_traced, __FUNCTION__, extra); - TRACE_smpi_send(rank, rank, dst_traced,sendcount*smpi_datatype_size(sendtype)); + TRACE_smpi_send(rank, rank, dst_traced, sendtag,sendcount*smpi_datatype_size(sendtype)); smpi_mpi_sendrecv(sendbuf, sendcount, sendtype, dst, sendtag, recvbuf, recvcount, recvtype, src, recvtag, comm, status); retval = MPI_SUCCESS; TRACE_smpi_ptp_out(rank, src_traced, dst_traced, __FUNCTION__); - TRACE_smpi_recv(rank, src_traced, rank); + TRACE_smpi_recv(rank, src_traced, rank, recvtag); } smpi_bench_begin(); @@ -1347,7 +1346,7 @@ int PMPI_Test(MPI_Request * request, int *flag, MPI_Status * status) smpi_empty_status(status); retval = MPI_SUCCESS; } else { - int rank = (request!=nullptr && (*request)->comm != MPI_COMM_NULL) ? smpi_process_index() : -1; + int rank = ((*request)->comm != MPI_COMM_NULL) ? smpi_process_index() : -1; instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); extra->type = TRACING_TEST; @@ -1451,6 +1450,7 @@ int PMPI_Wait(MPI_Request * request, MPI_Status * status) int src_traced = (*request)->src; int dst_traced = (*request)->dst; + int tag_traced= (*request)->tag; MPI_Comm comm = (*request)->comm; int is_wait_for_receive = (*request)->recv; instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); @@ -1467,7 +1467,7 @@ int PMPI_Wait(MPI_Request * request, MPI_Status * status) src_traced = (status!=MPI_STATUS_IGNORE) ? smpi_group_rank(smpi_comm_group(comm), status->MPI_SOURCE) : src_traced; - TRACE_smpi_recv(rank, src_traced, dst_traced); + TRACE_smpi_recv(rank, src_traced, dst_traced, tag_traced); } } @@ -1483,21 +1483,21 @@ int PMPI_Waitany(int count, MPI_Request requests[], int *index, MPI_Status * sta smpi_bench_end(); //save requests information for tracing int i; - int *srcs = nullptr, *dsts = nullptr, *recvs = nullptr; - MPI_Comm* comms = nullptr; + typedef struct { + int src; + int dst; + int recv; + int tag; + MPI_Comm comm; + } savedvalstype; + savedvalstype* savedvals=nullptr; if(count>0){ - srcs = xbt_new0(int, count); - dsts = xbt_new0(int, count); - recvs = xbt_new0(int, count); - comms = xbt_new0(MPI_Comm, count); + savedvals = xbt_new0(savedvalstype, count); } for (i = 0; i < count; i++) { MPI_Request req = requests[i]; //already received requests are no longer valid if (req) { - srcs[i] = req->src; - dsts[i] = req->dst; - recvs[i] = req->recv; - comms[i] = req->comm; + savedvals[i]=(savedvalstype){req->src, req->dst, req->recv, req->tag, req->comm}; } } int rank_traced = smpi_process_index(); @@ -1509,23 +1509,20 @@ int PMPI_Waitany(int count, MPI_Request requests[], int *index, MPI_Status * sta *index = smpi_mpi_waitany(count, requests, status); if(*index!=MPI_UNDEFINED){ - int src_traced = srcs[*index]; + int src_traced = savedvals[*index].src; //the src may not have been known at the beginning of the recv (MPI_ANY_SOURCE) - int dst_traced = dsts[*index]; - int is_wait_for_receive = recvs[*index]; + int dst_traced = savedvals[*index].dst; + int is_wait_for_receive = savedvals[*index].recv; if (is_wait_for_receive) { - if(srcs[*index]==MPI_ANY_SOURCE) + if(savedvals[*index].src==MPI_ANY_SOURCE) src_traced = (status!=MPI_STATUSES_IGNORE) ? - smpi_group_rank(smpi_comm_group(comms[*index]), status->MPI_SOURCE) : srcs[*index]; - TRACE_smpi_recv(rank_traced, src_traced, dst_traced); + smpi_group_rank(smpi_comm_group(savedvals[*index].comm), status->MPI_SOURCE) : savedvals[*index].src; + TRACE_smpi_recv(rank_traced, src_traced, dst_traced, savedvals[*index].tag); } TRACE_smpi_ptp_out(rank_traced, src_traced, dst_traced, __FUNCTION__); - xbt_free(srcs); - xbt_free(dsts); - xbt_free(recvs); - xbt_free(comms); - } + xbt_free(savedvals); + smpi_bench_begin(); return MPI_SUCCESS; } @@ -1535,22 +1532,22 @@ int PMPI_Waitall(int count, MPI_Request requests[], MPI_Status status[]) smpi_bench_end(); //save information from requests int i; - int *srcs = xbt_new0(int, count); - int *dsts = xbt_new0(int, count); - int *recvs = xbt_new0(int, count); - int *valid = xbt_new0(int, count); - MPI_Comm *comms = xbt_new0(MPI_Comm, count); + typedef struct { + int src; + int dst; + int recv; + int tag; + int valid; + MPI_Comm comm; + } savedvalstype; + savedvalstype* savedvals=xbt_new0(savedvalstype, count); for (i = 0; i < count; i++) { MPI_Request req = requests[i]; if(req!=MPI_REQUEST_NULL){ - srcs[i] = req->src; - dsts[i] = req->dst; - recvs[i] = req->recv; - comms[i] = req->comm; - valid[i]=1;; + savedvals[i]=(savedvalstype){req->src, req->dst, req->recv, req->tag, 1, req->comm}; }else{ - valid[i]=0; + savedvals[i].valid=0; } } int rank_traced = smpi_process_index(); @@ -1562,25 +1559,21 @@ int PMPI_Waitall(int count, MPI_Request requests[], MPI_Status status[]) int retval = smpi_mpi_waitall(count, requests, status); for (i = 0; i < count; i++) { - if(valid[i]){ + if(savedvals[i].valid){ //the src may not have been known at the beginning of the recv (MPI_ANY_SOURCE) - int src_traced = srcs[i]; - int dst_traced = dsts[i]; - int is_wait_for_receive = recvs[i]; + int src_traced = savedvals[i].src; + int dst_traced = savedvals[i].dst; + int is_wait_for_receive = savedvals[i].recv; if (is_wait_for_receive) { if(src_traced==MPI_ANY_SOURCE) src_traced = (status!=MPI_STATUSES_IGNORE) ? - smpi_group_rank(smpi_comm_group(comms[i]), status[i].MPI_SOURCE) : srcs[i]; - TRACE_smpi_recv(rank_traced, src_traced, dst_traced); + smpi_group_rank(smpi_comm_group(savedvals[i].comm), status[i].MPI_SOURCE) : savedvals[i].src; + TRACE_smpi_recv(rank_traced, src_traced, dst_traced,savedvals[i].tag); } } } TRACE_smpi_ptp_out(rank_traced, -1, -1, __FUNCTION__); - xbt_free(srcs); - xbt_free(dsts); - xbt_free(recvs); - xbt_free(valid); - xbt_free(comms); + xbt_free(savedvals); smpi_bench_begin(); return retval; @@ -2334,9 +2327,9 @@ int PMPI_Get_processor_name(char *name, int *resultlen) { int retval = MPI_SUCCESS; - strncpy(name, sg_host_get_name(SIMIX_host_self()), - strlen(sg_host_get_name(SIMIX_host_self())) < MPI_MAX_PROCESSOR_NAME - 1 ? - strlen(sg_host_get_name(SIMIX_host_self())) +1 : MPI_MAX_PROCESSOR_NAME - 1 ); + strncpy(name, SIMIX_host_self()->cname(), strlen(SIMIX_host_self()->cname()) < MPI_MAX_PROCESSOR_NAME - 1 + ? strlen(SIMIX_host_self()->cname()) + 1 + : MPI_MAX_PROCESSOR_NAME - 1); *resultlen = strlen(name) > MPI_MAX_PROCESSOR_NAME ? MPI_MAX_PROCESSOR_NAME : strlen(name); return retval; @@ -2771,7 +2764,7 @@ int PMPI_Put( void *origin_addr, int origin_count, MPI_Datatype origin_datatype, smpi_mpi_win_get_group(win, &group); int dst_traced = smpi_group_index(group, target_rank); TRACE_smpi_ptp_in(rank, rank, dst_traced, __FUNCTION__, nullptr); - TRACE_smpi_send(rank, rank, dst_traced, origin_count*smpi_datatype_size(origin_datatype)); + TRACE_smpi_send(rank, rank, dst_traced, SMPI_RMA_TAG, origin_count*smpi_datatype_size(origin_datatype)); retval = smpi_mpi_put( origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, target_datatype, win); @@ -3120,7 +3113,7 @@ int PMPI_Info_create( MPI_Info *info){ if (info == nullptr) return MPI_ERR_ARG; *info = xbt_new(s_smpi_mpi_info_t, 1); - (*info)->info_dict= xbt_dict_new_homogeneous(nullptr); + (*info)->info_dict= xbt_dict_new_homogeneous(xbt_free_f); (*info)->refcount=1; return MPI_SUCCESS; } @@ -3129,7 +3122,7 @@ int PMPI_Info_set( MPI_Info info, char *key, char *value){ if (info == nullptr || key == nullptr || value == nullptr) return MPI_ERR_ARG; - xbt_dict_set(info->info_dict, key, (void*)value, nullptr); + xbt_dict_set(info->info_dict, key, xbt_strdup(value), nullptr); return MPI_SUCCESS; } @@ -3164,13 +3157,13 @@ int PMPI_Info_dup(MPI_Info info, MPI_Info *newinfo){ if (info == nullptr || newinfo==nullptr) return MPI_ERR_ARG; *newinfo = xbt_new(s_smpi_mpi_info_t, 1); - (*newinfo)->info_dict= xbt_dict_new_homogeneous(nullptr); + (*newinfo)->info_dict= xbt_dict_new_homogeneous(xbt_free_f); (*newinfo)->refcount=1; xbt_dict_cursor_t cursor = nullptr; int *key; void* data; xbt_dict_foreach(info->info_dict,cursor,key,data){ - xbt_dict_set((*newinfo)->info_dict, reinterpret_cast(key), data, nullptr); + xbt_dict_set((*newinfo)->info_dict, reinterpret_cast(key), xbt_strdup(reinterpret_cast(data)), nullptr); } return MPI_SUCCESS; }