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

[svn-r10140] Moved MPID RMA constants to RMA header file.

Moved RMA implementation constants from mpidimpl.h to the RMA implementation
header.  Also updated constants to use enumeration types and removed an old
fixme note, which indicated that this should be done.

Reviewer: buntinas
parent 51ccfff6
......@@ -6,6 +6,7 @@
#include "mpid_nem_impl.h"
#include "mpidimpl.h"
#include "mpidrma.h"
/* FIXME: get this from OS */
#define MPIDI_CH3_PAGESIZE ((MPI_Aint)4096)
......
......@@ -5,6 +5,7 @@
*/
#include "mpidimpl.h"
#include "mpidrma.h"
#undef FUNCNAME
......
......@@ -1140,22 +1140,6 @@ int MPIDI_CH3U_Win_allocate_shared(MPI_Aint size, MPID_Info *info_ptr, MPID_Comm
int MPIDI_CH3U_Win_create_dynamic(MPID_Info *info, MPID_Comm *comm, MPID_Win **win);
/* FIXME: These are specific to the RMA code and should be in the RMA
header file. */
#define MPIDI_RMA_PUT 23
#define MPIDI_RMA_GET 24
#define MPIDI_RMA_ACCUMULATE 25
#define MPIDI_RMA_LOCK 26
/* Special case RMA operations */
#define MPIDI_RMA_ACC_CONTIG 27
#define MPIDI_RMA_DATATYPE_BASIC 50
#define MPIDI_RMA_DATATYPE_DERIVED 51
#define MPID_LOCK_NONE 0
#define MPID_LOCK_SHARED_ALL 1
/* MPI RMA Utility functions */
int MPIDI_CH3U_Win_create_gather(void *, MPI_Aint, int, MPID_Info *, MPID_Comm *,
......
......@@ -6,6 +6,27 @@
#if !defined(MPICH_MPIDRMA_H_INCLUDED)
#define MPICH_MPIDRMA_H_INCLUDED
typedef enum MPIDI_RMA_Op_type_e {
MPIDI_RMA_PUT = 23,
MPIDI_RMA_GET = 24,
MPIDI_RMA_ACCUMULATE = 25,
MPIDI_RMA_LOCK = 26,
MPIDI_RMA_ACC_CONTIG = 27,
MPIDI_RMA_GET_ACCUMULATE = 28
} MPIDI_RMA_Op_type_t;
/* Special case RMA operations */
enum MPIDI_RMA_Datatype_e {
MPIDI_RMA_DATATYPE_BASIC = 50,
MPIDI_RMA_DATATYPE_DERIVED = 51
};
enum MPID_Lock_state_e {
MPID_LOCK_NONE = 0,
MPID_LOCK_SHARED_ALL = 1
};
/*
* RMA Declarations. We should move these into something separate from
* a Request.
......@@ -35,9 +56,7 @@ typedef struct MPIDI_RMA_ops {
least in most cases (if, as a result of the sync/ops/sync sequence,
a different packet type is needed, it can be extracted from the
information otherwise stored). */
/* FIXME: Use enum for RMA op type? */
int type; /* MPIDI_RMA_PUT, MPID_REQUEST_GET,
MPIDI_RMA_ACCUMULATE, MPIDI_RMA_LOCK */
MPIDI_RMA_Op_type_t type;
void *origin_addr;
int origin_count;
MPI_Datatype origin_datatype;
......
......@@ -5,6 +5,7 @@
*/
#include "mpidimpl.h"
#include "mpidrma.h"
/*
* This file contains the dispatch routine called by the ch3 progress
......
......@@ -5,6 +5,7 @@
*/
#include "mpidimpl.h"
#include "mpidrma.h"
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3U_Handle_send_req
......
......@@ -5,6 +5,7 @@
*/
#include "mpidimpl.h"
#include "mpidrma.h"
#ifdef USE_MPIU_INSTR
MPIU_INSTR_DURATION_EXTERN_DECL(wincreate_allgather);
......
......@@ -5,6 +5,7 @@
*/
#include "mpidimpl.h"
#include "mpidrma.h"
MPIU_THREADSAFE_INIT_DECL(initRMAoptions);
......
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