Commit d45a8f45 authored by James Dinan's avatar James Dinan
Browse files

[svn-r10593] Renamed EPOCH_GAT to PSCW

parent 5510107a
......@@ -204,7 +204,7 @@ enum MPIDI_Win_info_arg_vals_accumulate_ops {
enum MPIDI_Win_epoch_states {
MPIDI_EPOCH_NONE = 0,
MPIDI_EPOCH_FENCE,
MPIDI_EPOCH_GAT, /* Generalized active target (Post, Start, ...) */
MPIDI_EPOCH_PSCW, /* Post/Complete, Start/Wait */
MPIDI_EPOCH_LOCK,
MPIDI_EPOCH_LOCK_ALL
};
......
......@@ -291,7 +291,7 @@ static inline MPIDI_RMA_Ops_list_t *MPIDI_CH3I_RMA_Get_ops_list(MPID_Win *win_pt
int target)
{
if (win_ptr->epoch_state == MPIDI_EPOCH_FENCE ||
win_ptr->epoch_state == MPIDI_EPOCH_GAT)
win_ptr->epoch_state == MPIDI_EPOCH_PSCW)
{
return &win_ptr->at_rma_ops_list;
}
......
......@@ -1273,11 +1273,11 @@ int MPIDI_Win_post(MPID_Group *post_grp_ptr, int assert, MPID_Win *win_ptr)
active target calls? E.g. post must precede start, start/complete may
be called once, etc? */
MPIU_ERR_CHKANDJUMP(win_ptr->epoch_state != MPIDI_EPOCH_NONE &&
win_ptr->epoch_state != MPIDI_EPOCH_GAT,
win_ptr->epoch_state != MPIDI_EPOCH_PSCW,
mpi_errno, MPI_ERR_RMA_SYNC, "**rmasync");
/* Track access epoch state */
win_ptr->epoch_state = MPIDI_EPOCH_GAT;
win_ptr->epoch_state = MPIDI_EPOCH_PSCW;
win_ptr->epoch_count++;
/* Even though we would want to reset the fence counter to keep
......@@ -1423,11 +1423,11 @@ int MPIDI_Win_start(MPID_Group *group_ptr, int assert, MPID_Win *win_ptr)
MPIDI_RMA_FUNC_ENTER(MPID_STATE_MPIDI_WIN_START);
MPIU_ERR_CHKANDJUMP(win_ptr->epoch_state != MPIDI_EPOCH_NONE &&
win_ptr->epoch_state != MPIDI_EPOCH_GAT,
win_ptr->epoch_state != MPIDI_EPOCH_PSCW,
mpi_errno, MPI_ERR_RMA_SYNC, "**rmasync");
/* Track access epoch state */
win_ptr->epoch_state = MPIDI_EPOCH_GAT;
win_ptr->epoch_state = MPIDI_EPOCH_PSCW;
win_ptr->epoch_count++;
/* Even though we would want to reset the fence counter to keep
......@@ -1498,7 +1498,7 @@ int MPIDI_Win_complete(MPID_Win *win_ptr)
MPIDI_RMA_FUNC_ENTER(MPID_STATE_MPIDI_WIN_COMPLETE);
MPIU_ERR_CHKANDJUMP(win_ptr->epoch_state != MPIDI_EPOCH_GAT,
MPIU_ERR_CHKANDJUMP(win_ptr->epoch_state != MPIDI_EPOCH_PSCW,
mpi_errno, MPI_ERR_RMA_SYNC, "**rmasync");
/* Track access epoch state */
......@@ -1752,7 +1752,7 @@ int MPIDI_Win_wait(MPID_Win *win_ptr)
MPIDI_RMA_FUNC_ENTER(MPID_STATE_MPIDI_WIN_WAIT);
MPIU_ERR_CHKANDJUMP(win_ptr->epoch_state != MPIDI_EPOCH_GAT,
MPIU_ERR_CHKANDJUMP(win_ptr->epoch_state != MPIDI_EPOCH_PSCW,
mpi_errno, MPI_ERR_RMA_SYNC, "**rmasync");
/* Track access epoch state */
......@@ -1805,7 +1805,7 @@ int MPIDI_Win_test(MPID_Win *win_ptr, int *flag)
MPIDI_RMA_FUNC_ENTER(MPID_STATE_MPIDI_WIN_TEST);
MPIU_ERR_CHKANDJUMP(win_ptr->epoch_state != MPIDI_EPOCH_GAT,
MPIU_ERR_CHKANDJUMP(win_ptr->epoch_state != MPIDI_EPOCH_PSCW,
mpi_errno, MPI_ERR_RMA_SYNC, "**rmasync");
mpi_errno = MPID_Progress_test();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment