X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6708b279e302e756cca27951a03a0d0f05b62277..128ea0e762c5eb7cd5c5a4be1cb7f745592be979:/src/smpi/smpi_rma.cpp diff --git a/src/smpi/smpi_rma.cpp b/src/smpi/smpi_rma.cpp index c15a1aa5d6..a9ca5610dd 100644 --- a/src/smpi/smpi_rma.cpp +++ b/src/smpi/smpi_rma.cpp @@ -1,4 +1,3 @@ - /* Copyright (c) 2007-2015. The SimGrid Team. * All rights reserved. */ @@ -10,9 +9,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_rma, smpi, "Logging specific to SMPI (RMA operations)"); -#define RMA_TAG -1234 - -xbt_bar_t creation_bar = nullptr; +msg_bar_t creation_bar = nullptr; typedef struct s_smpi_mpi_win{ void* base; @@ -22,7 +19,7 @@ typedef struct s_smpi_mpi_win{ MPI_Info info; int assert; std::vector *requests; - xbt_bar_t bar; + msg_bar_t bar; MPI_Win* connected_wins; char* name; int opened; @@ -54,12 +51,12 @@ MPI_Win smpi_mpi_win_create( void *base, MPI_Aint size, int disp_unit, MPI_Info win->connected_wins[rank] = win; if(rank==0){ - win->bar=xbt_barrier_init(comm_size); + win->bar = MSG_barrier_init(comm_size); } mpi_coll_allgather_fun(&(win->connected_wins[rank]), sizeof(MPI_Win), MPI_BYTE, win->connected_wins, sizeof(MPI_Win), MPI_BYTE, comm); - mpi_coll_bcast_fun( &(win->bar), sizeof(xbt_bar_t), MPI_BYTE, 0, comm); + mpi_coll_bcast_fun(&(win->bar), sizeof(msg_bar_t), MPI_BYTE, 0, comm); mpi_coll_barrier_fun(comm); @@ -68,7 +65,7 @@ MPI_Win smpi_mpi_win_create( void *base, MPI_Aint size, int disp_unit, MPI_Info int smpi_mpi_win_free( MPI_Win* win){ //As per the standard, perform a barrier to ensure every async comm is finished - xbt_barrier_wait((*win)->bar); + MSG_barrier_wait((*win)->bar); delete (*win)->requests; xbt_free((*win)->connected_wins); if ((*win)->name != nullptr){ @@ -81,7 +78,7 @@ int smpi_mpi_win_free( MPI_Win* win){ mpi_coll_barrier_fun((*win)->comm); int rank=smpi_comm_rank((*win)->comm); if(rank == 0) - xbt_barrier_destroy((*win)->bar); + MSG_barrier_destroy((*win)->bar); xbt_free(*win); *win = MPI_WIN_NULL; return MPI_SUCCESS; @@ -112,13 +109,13 @@ int smpi_mpi_win_fence( int assert, MPI_Win win){ if(win->opened==0) win->opened=1; if(assert != MPI_MODE_NOPRECEDE){ - xbt_barrier_wait(win->bar); + MSG_barrier_wait(win->bar); std::vector *reqs = win->requests; int size = static_cast(reqs->size()); // start all requests that have been prepared by another process for(auto req: *reqs){ - if (req->flags & PREPARED) + if (req && (req->flags & PREPARED)) smpi_mpi_start(req); } @@ -127,7 +124,7 @@ int smpi_mpi_win_fence( int assert, MPI_Win win){ } win->assert = assert; - xbt_barrier_wait(win->bar); + MSG_barrier_wait(win->bar); XBT_DEBUG("Leaving fence "); return MPI_SUCCESS; @@ -147,11 +144,11 @@ int smpi_mpi_put( void *origin_addr, int origin_count, MPI_Datatype origin_datat if(target_rank != smpi_comm_rank(win->comm)){ //prepare send_request MPI_Request sreq = smpi_rma_send_init(origin_addr, origin_count, origin_datatype, smpi_process_index(), - smpi_group_index(smpi_comm_group(win->comm),target_rank), RMA_TAG+1, win->comm, MPI_OP_NULL); + smpi_group_index(smpi_comm_group(win->comm),target_rank), SMPI_RMA_TAG+1, win->comm, MPI_OP_NULL); //prepare receiver request MPI_Request rreq = smpi_rma_recv_init(recv_addr, target_count, target_datatype, smpi_process_index(), - smpi_group_index(smpi_comm_group(win->comm),target_rank), RMA_TAG+1, recv_win->comm, MPI_OP_NULL); + smpi_group_index(smpi_comm_group(win->comm),target_rank), SMPI_RMA_TAG+1, recv_win->comm, MPI_OP_NULL); //push request to receiver's win recv_win->requests->push_back(rreq); @@ -182,12 +179,12 @@ int smpi_mpi_get( void *origin_addr, int origin_count, MPI_Datatype origin_datat if(target_rank != smpi_comm_rank(win->comm)){ //prepare send_request MPI_Request sreq = smpi_rma_send_init(send_addr, target_count, target_datatype, - smpi_group_index(smpi_comm_group(win->comm),target_rank), smpi_process_index(), RMA_TAG+2, send_win->comm, + smpi_group_index(smpi_comm_group(win->comm),target_rank), smpi_process_index(), SMPI_RMA_TAG+2, send_win->comm, MPI_OP_NULL); //prepare receiver request MPI_Request rreq = smpi_rma_recv_init(origin_addr, origin_count, origin_datatype, - smpi_group_index(smpi_comm_group(win->comm),target_rank), smpi_process_index(), RMA_TAG+2, win->comm, + smpi_group_index(smpi_comm_group(win->comm),target_rank), smpi_process_index(), SMPI_RMA_TAG+2, win->comm, MPI_OP_NULL); //start the send, with another process than us as sender. @@ -223,11 +220,11 @@ int smpi_mpi_accumulate( void *origin_addr, int origin_count, MPI_Datatype origi //prepare send_request MPI_Request sreq = smpi_rma_send_init(origin_addr, origin_count, origin_datatype, - smpi_process_index(), smpi_group_index(smpi_comm_group(win->comm),target_rank), RMA_TAG+3, win->comm, op); + smpi_process_index(), smpi_group_index(smpi_comm_group(win->comm),target_rank), SMPI_RMA_TAG+3, win->comm, op); //prepare receiver request MPI_Request rreq = smpi_rma_recv_init(recv_addr, target_count, target_datatype, - smpi_process_index(), smpi_group_index(smpi_comm_group(win->comm),target_rank), RMA_TAG+3, recv_win->comm, op); + smpi_process_index(), smpi_group_index(smpi_comm_group(win->comm),target_rank), SMPI_RMA_TAG+3, recv_win->comm, op); //push request to receiver's win recv_win->requests->push_back(rreq); //start send @@ -260,7 +257,7 @@ int smpi_mpi_win_start(MPI_Group group, int assert, MPI_Win win){ while(j!=size){ int src=smpi_group_index(group,j); if(src!=smpi_process_index()){ - reqs[i]=smpi_irecv_init(nullptr, 0, MPI_CHAR, src,RMA_TAG+4, MPI_COMM_WORLD); + reqs[i]=smpi_irecv_init(nullptr, 0, MPI_CHAR, src,SMPI_RMA_TAG+4, MPI_COMM_WORLD); i++; } j++; @@ -287,7 +284,7 @@ int smpi_mpi_win_post(MPI_Group group, int assert, MPI_Win win){ while(j!=size){ int dst=smpi_group_index(group,j); if(dst!=smpi_process_index()){ - reqs[i]=smpi_mpi_send_init(nullptr, 0, MPI_CHAR, dst, RMA_TAG+4, MPI_COMM_WORLD); + reqs[i]=smpi_mpi_send_init(nullptr, 0, MPI_CHAR, dst, SMPI_RMA_TAG+4, MPI_COMM_WORLD); i++; } j++; @@ -318,7 +315,7 @@ int smpi_mpi_win_complete(MPI_Win win){ while(j!=size){ int dst=smpi_group_index(win->group,j); if(dst!=smpi_process_index()){ - reqs[i]=smpi_mpi_send_init(nullptr, 0, MPI_CHAR, dst, RMA_TAG+5, MPI_COMM_WORLD); + reqs[i]=smpi_mpi_send_init(nullptr, 0, MPI_CHAR, dst, SMPI_RMA_TAG+5, MPI_COMM_WORLD); i++; } j++; @@ -341,13 +338,13 @@ int smpi_mpi_win_complete(MPI_Win win){ XBT_DEBUG("Win_complete - Finishing %d RMA calls", size); // start all requests that have been prepared by another process for (auto req: *reqqs){ - if (req->flags & PREPARED) + if (req && (req->flags & PREPARED)) smpi_mpi_start(req); } MPI_Request* treqs = &(*reqqs)[0]; smpi_mpi_waitall(size,treqs,MPI_STATUSES_IGNORE); - delete reqqs; + reqqs->clear(); smpi_group_unuse(win->group); win->opened--; //we're closed for business ! return MPI_SUCCESS; @@ -363,7 +360,7 @@ int smpi_mpi_win_wait(MPI_Win win){ while(j!=size){ int src=smpi_group_index(win->group,j); if(src!=smpi_process_index()){ - reqs[i]=smpi_irecv_init(nullptr, 0, MPI_CHAR, src,RMA_TAG+5, MPI_COMM_WORLD); + reqs[i]=smpi_irecv_init(nullptr, 0, MPI_CHAR, src,SMPI_RMA_TAG+5, MPI_COMM_WORLD); i++; } j++; @@ -384,13 +381,13 @@ int smpi_mpi_win_wait(MPI_Win win){ // start all requests that have been prepared by another process for(auto req: *reqqs){ - if (req->flags & PREPARED) + if (req && (req->flags & PREPARED)) smpi_mpi_start(req); } MPI_Request* treqs = &(*reqqs)[0]; smpi_mpi_waitall(size,treqs,MPI_STATUSES_IGNORE); - delete reqqs; + reqqs->clear(); smpi_group_unuse(win->group); win->opened--; //we're opened for business ! return MPI_SUCCESS;