-
/* Copyright (c) 2007-2015. The SimGrid Team.
* All rights reserved. */
#define RMA_TAG -1234
-xbt_bar_t creation_bar = nullptr;
+msg_bar_t creation_bar = nullptr;
typedef struct s_smpi_mpi_win{
void* base;
MPI_Info info;
int assert;
std::vector<MPI_Request> *requests;
- xbt_bar_t bar;
+ msg_bar_t bar;
MPI_Win* connected_wins;
char* name;
int opened;
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);
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){
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;
if(win->opened==0)
win->opened=1;
if(assert != MPI_MODE_NOPRECEDE){
- xbt_barrier_wait(win->bar);
+ MSG_barrier_wait(win->bar);
std::vector<MPI_Request> *reqs = win->requests;
int size = static_cast<int>(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);
}
}
win->assert = assert;
- xbt_barrier_wait(win->bar);
+ MSG_barrier_wait(win->bar);
XBT_DEBUG("Leaving fence ");
return MPI_SUCCESS;
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;
// 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;