April 2016 - commits - mailman3.cels.anl.gov

[mpich] MPICH primary repository branch, master, updated. v3.2-293-g7d51143
by noreply＠mpich.org 26 Apr '16

26 Apr '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 7d511439295df1c3ef918022a4954930288ccf6b (commit) from 636ba185897e059084a8f9f414800f78cc29eb35 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/7d511439295df1c3ef918022a49549302… commit 7d511439295df1c3ef918022a4954930288ccf6b Author: Halim Amer <aamer(a)anl.gov> Date: Sat Mar 19 13:47:45 2016 -0500 Fixed missing top_srcdir in logging/common/Makefile.mk Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/util/logging/common/Makefile.mk b/src/util/logging/common/Makefile.mk index 1efddcc..efcb1e4 100644 --- a/src/util/logging/common/Makefile.mk +++ b/src/util/logging/common/Makefile.mk @@ -10,7 +10,7 @@ ##mpi_core_sources += \ ## describe_states.c -AM_CPPFLAGS += -Isrc/util/logging/common +AM_CPPFLAGS += -I$(top_srcdir)/src/util/logging/common # FIXME XXX DJG this file is autogenerated, right? how do we correctly express # the dependency on the "extractstates" generator code? ----------------------------------------------------------------------- Summary of changes: src/util/logging/common/Makefile.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2-292-g636ba18
by noreply＠mpich.org 26 Apr '16

26 Apr '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 636ba185897e059084a8f9f414800f78cc29eb35 (commit) from 81c1290e34122331dd44a41afd75347450c91256 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/636ba185897e059084a8f9f414800f78c… commit 636ba185897e059084a8f9f414800f78cc29eb35 Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Fri Apr 22 11:45:49 2016 -0500 Undo overagressive search/replace The MPID_Op -> MPIR_Op replacement accidentally grabbed MPID_Open_port, which needed to be reverted. Signed-off-by: Wesley Bland <wesley.bland(a)intel.com> diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index 1cb8a12..38d1b38 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -2781,7 +2781,7 @@ int MPID_Finalize(void); int MPID_Abort( MPIR_Comm *comm, int mpi_errno, int exit_code, const char *error_msg ); -int MPIR_Open_port(MPIR_Info *, char *); +int MPID_Open_port(MPIR_Info *, char *); int MPID_Close_port(const char *); /*@ diff --git a/src/mpi/spawn/open_port.c b/src/mpi/spawn/open_port.c index 79aa456..f7d212a 100644 --- a/src/mpi/spawn/open_port.c +++ b/src/mpi/spawn/open_port.c @@ -26,7 +26,7 @@ int MPI_Open_port(MPI_Info info, char *port_name) __attribute__((weak,alias("PMP int MPIR_Open_port_impl(MPIR_Info *info_ptr, char *port_name) { - return MPIR_Open_port(info_ptr, port_name); + return MPID_Open_port(info_ptr, port_name); } #endif diff --git a/src/mpid/ch3/src/ch3u_comm_spawn_multiple.c b/src/mpid/ch3/src/ch3u_comm_spawn_multiple.c index 8346c76..b451ee6 100644 --- a/src/mpid/ch3/src/ch3u_comm_spawn_multiple.c +++ b/src/mpid/ch3/src/ch3u_comm_spawn_multiple.c @@ -135,7 +135,7 @@ int MPIDI_Comm_spawn_multiple(int count, char **commands, /* Open a port for the spawned processes to connect to */ /* FIXME: info may be needed for port name */ - mpi_errno = MPIR_Open_port(NULL, port_name); + mpi_errno = MPID_Open_port(NULL, port_name); /* --BEGIN ERROR HANDLING-- */ if (mpi_errno) MPIR_ERR_POP(mpi_errno); /* --END ERROR HANDLING-- */ diff --git a/src/mpid/ch3/src/mpid_port.c b/src/mpid/ch3/src/mpid_port.c index e206634..7940c8d 100644 --- a/src/mpid/ch3/src/mpid_port.c +++ b/src/mpid/ch3/src/mpid_port.c @@ -23,7 +23,7 @@ static MPIDI_PortFns portFns = { 0, 0, 0, 0 }; #endif /*@ - MPIR_Open_port - Open an MPI Port + MPID_Open_port - Open an MPI Port Input Arguments: . MPI_Info info - info @@ -38,10 +38,10 @@ static MPIDI_PortFns portFns = { 0, 0, 0, 0 }; .N MPI_ERR_OTHER @*/ #undef FUNCNAME -#define FUNCNAME MPIR_Open_port +#define FUNCNAME MPID_Open_port #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Open_port(MPIR_Info *info_ptr, char *port_name) +int MPID_Open_port(MPIR_Info *info_ptr, char *port_name) { int mpi_errno=MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPIR_OPEN_PORT); ----------------------------------------------------------------------- Summary of changes: src/include/mpiimpl.h | 2 +- src/mpi/spawn/open_port.c | 2 +- src/mpid/ch3/src/ch3u_comm_spawn_multiple.c | 2 +- src/mpid/ch3/src/mpid_port.c | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2-291-g81c1290
by noreply＠mpich.org 22 Apr '16

22 Apr '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 81c1290e34122331dd44a41afd75347450c91256 (commit) from 50641f630389063aae7c14635791aa7c6cd9f953 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/81c1290e34122331dd44a41afd7534745… commit 81c1290e34122331dd44a41afd75347450c91256 Author: Yanfei Guo <yguo(a)anl.gov> Date: Fri Apr 22 15:38:25 2016 -0500 Revert "Use 64-bit int in MPIR_Group." This reverts commit 50641f630389063aae7c14635791aa7c6cd9f953. diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index 3381dfb..1cb8a12 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -1003,7 +1003,7 @@ typedef struct MPIR_Attribute { /* This structure is used to implement the group operations such as MPI_Group_translate_ranks */ typedef struct MPIR_Group_pmap_t { - int64_t lpid; /* local process id, from VCONN */ + int lpid; /* local process id, from VCONN */ int next_lpid; /* Index of next lpid (in lpid order) */ int flag; /* marker, used to implement group operations */ } MPIR_Group_pmap_t; @@ -3795,7 +3795,7 @@ int MPID_Get_universe_size(int * universe_size); to which it is connected. These are local process ids because different processes may use different ids to identify the same target process @*/ -int MPID_Comm_get_lpid(MPIR_Comm *comm_ptr, int idx, int64_t * lpid_ptr, MPIU_BOOL is_remote); +int MPID_Comm_get_lpid(MPIR_Comm *comm_ptr, int idx, int * lpid_ptr, MPIU_BOOL is_remote); /* prototypes and declarations for the MPID_Sched interface for nonblocking * collectives */ diff --git a/src/mpi/comm/comm_create.c b/src/mpi/comm/comm_create.c index 0aac5d8..f52467c 100644 --- a/src/mpi/comm/comm_create.c +++ b/src/mpi/comm/comm_create.c @@ -122,7 +122,7 @@ int MPIR_Comm_create_calculate_mapping(MPIR_Group *group_ptr, /* FIXME : BUBBLE SORT */ mapping[i] = -1; for (j=0; j<comm_ptr->local_size; j++) { - int64_t comm_lpid; + int comm_lpid; MPID_Comm_get_lpid( comm_ptr, j, &comm_lpid, FALSE ); if (comm_lpid == group_ptr->lrank_to_lpid[i].lpid) { mapping[i] = j; diff --git a/src/mpi/comm/comm_group.c b/src/mpi/comm/comm_group.c index 437302c..4af1e6d 100644 --- a/src/mpi/comm/comm_group.c +++ b/src/mpi/comm/comm_group.c @@ -33,8 +33,7 @@ int MPI_Comm_group(MPI_Comm comm, MPI_Group *group) __attribute__((weak,alias("P int MPIR_Comm_group_impl(MPIR_Comm *comm_ptr, MPIR_Group **group_ptr) { int mpi_errno = MPI_SUCCESS; - int i, n; - int64_t lpid; + int i, lpid, n; int comm_world_size = MPIR_Process.comm_world->local_size; MPID_MPI_STATE_DECL(MPID_STATE_MPIR_COMM_GROUP_IMPL); @@ -49,7 +48,7 @@ int MPIR_Comm_group_impl(MPIR_Comm *comm_ptr, MPIR_Group **group_ptr) (*group_ptr)->is_local_dense_monotonic = TRUE; for (i=0; i<n; i++) { (void) MPID_Comm_get_lpid( comm_ptr, i, &lpid, FALSE ); - (*group_ptr)->lrank_to_lpid[i].lpid = lpid; + (*group_ptr)->lrank_to_lpid[i].lpid = lpid; if (lpid > comm_world_size || (i > 0 && (*group_ptr)->lrank_to_lpid[i-1].lpid != (lpid-1))) { diff --git a/src/mpi/comm/comm_remote_group.c b/src/mpi/comm/comm_remote_group.c index 4dfaa5f..bfb28ad 100644 --- a/src/mpi/comm/comm_remote_group.c +++ b/src/mpi/comm/comm_remote_group.c @@ -33,8 +33,7 @@ int MPI_Comm_remote_group(MPI_Comm comm, MPI_Group *group) __attribute__((weak,a int MPIR_Comm_remote_group_impl(MPIR_Comm *comm_ptr, MPIR_Group **group_ptr) { int mpi_errno = MPI_SUCCESS; - int i, n; - int64_t lpid; + int i, lpid, n; MPID_MPI_STATE_DECL(MPID_STATE_MPIR_COMM_REMOTE_GROUP_IMPL); MPID_MPI_FUNC_ENTER(MPID_STATE_MPIR_COMM_REMOTE_GROUP_IMPL); @@ -46,7 +45,7 @@ int MPIR_Comm_remote_group_impl(MPIR_Comm *comm_ptr, MPIR_Group **group_ptr) for (i=0; i<n; i++) { (void) MPID_Comm_get_lpid( comm_ptr, i, &lpid, TRUE ); - (*group_ptr)->lrank_to_lpid[i].lpid = lpid; + (*group_ptr)->lrank_to_lpid[i].lpid = lpid; /* TODO calculate is_local_dense_monotonic */ } (*group_ptr)->size = n; diff --git a/src/mpi/comm/intercomm_create.c b/src/mpi/comm/intercomm_create.c index fba778c..807b06a 100644 --- a/src/mpi/comm/intercomm_create.c +++ b/src/mpi/comm/intercomm_create.c @@ -26,10 +26,10 @@ int MPI_Intercomm_create(MPI_Comm local_comm, int local_leader, MPI_Comm peer_co /* Define MPICH_MPI_FROM_PMPI if weak symbols are not supported to build the MPI routines */ #ifdef HAVE_ERROR_CHECKING -PMPI_LOCAL int MPIR_CheckDisjointLpids( int64_t [], int, int64_t [], int ); +PMPI_LOCAL int MPIR_CheckDisjointLpids( int [], int, int [], int ); #endif /* HAVE_ERROR_CHECKING */ PMPI_LOCAL int MPID_LPID_GetAllInComm( MPIR_Comm *comm_ptr, int local_size, - int64_t local_lpids[] ); + int local_lpids[] ); #ifndef MPICH_MPI_FROM_PMPI #undef MPI_Intercomm_create @@ -42,8 +42,8 @@ PMPI_LOCAL int MPID_LPID_GetAllInComm( MPIR_Comm *comm_ptr, int local_size, #define FUNCNAME MPIR_CheckDisjointLpids #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -PMPI_LOCAL int MPIR_CheckDisjointLpids( int64_t lpids1[], int n1, - int64_t lpids2[], int n2 ) +PMPI_LOCAL int MPIR_CheckDisjointLpids( int lpids1[], int n1, + int lpids2[], int n2 ) { int i, mask_size, idx, bit, maxlpid = -1; int mpi_errno = MPI_SUCCESS; @@ -103,7 +103,7 @@ PMPI_LOCAL int MPIR_CheckDisjointLpids( int64_t lpids1[], int n1, #endif /* HAVE_ERROR_CHECKING */ PMPI_LOCAL int MPID_LPID_GetAllInComm( MPIR_Comm *comm_ptr, int local_size, - int64_t local_lpids[] ) + int local_lpids[] ) { int i; @@ -125,8 +125,8 @@ int MPIR_Intercomm_create_impl(MPIR_Comm *local_comm_ptr, int local_leader, { int mpi_errno = MPI_SUCCESS; MPIU_Context_id_t final_context_id, recvcontext_id; - int remote_size, local_size, singlePG; - int64_t *remote_lpids = 0, *local_lpids = 0; + int remote_size, *remote_lpids=0, singlePG; + int local_size,*local_lpids=0; MPIR_Gpid *local_gpids=NULL, *remote_gpids=NULL; int comm_info[3]; int is_low_group = 0; @@ -178,9 +178,9 @@ int MPIR_Intercomm_create_impl(MPIR_Comm *local_comm_ptr, int local_leader, /* With this information, we can now send and receive the global process ids from the peer. */ MPIU_CHKLMEM_MALLOC(remote_gpids,MPIR_Gpid*,remote_size*sizeof(MPIR_Gpid), mpi_errno,"remote_gpids"); - MPIU_CHKLMEM_MALLOC(remote_lpids,int64_t*,remote_size*sizeof(int64_t), mpi_errno,"remote_lpids"); + MPIU_CHKLMEM_MALLOC(remote_lpids,int*,remote_size*sizeof(int), mpi_errno,"remote_lpids"); MPIU_CHKLMEM_MALLOC(local_gpids,MPIR_Gpid*,local_size*sizeof(MPIR_Gpid), mpi_errno,"local_gpids"); - MPIU_CHKLMEM_MALLOC(local_lpids,int64_t*,local_size*sizeof(int64_t), mpi_errno,"local_lpids"); + MPIU_CHKLMEM_MALLOC(local_lpids,int*,local_size*sizeof(int), mpi_errno,"local_lpids"); mpi_errno = MPID_GPID_GetAllInComm( local_comm_ptr, local_size, local_gpids, &singlePG ); if (mpi_errno) MPIR_ERR_POP(mpi_errno); @@ -278,7 +278,7 @@ int MPIR_Intercomm_create_impl(MPIR_Comm *local_comm_ptr, int local_leader, MPIR_ERR_CHKANDJUMP(errflag, mpi_errno, MPI_ERR_OTHER, "**coll_fail"); remote_size = comm_info[0]; MPIU_CHKLMEM_MALLOC(remote_gpids,MPIR_Gpid*,remote_size*sizeof(MPIR_Gpid), mpi_errno,"remote_gpids"); - MPIU_CHKLMEM_MALLOC(remote_lpids,int64_t*,remote_size*sizeof(int64_t), mpi_errno,"remote_lpids"); + MPIU_CHKLMEM_MALLOC(remote_lpids,int*,remote_size*sizeof(int), mpi_errno,"remote_lpids"); mpi_errno = MPID_Bcast( remote_gpids, remote_size*sizeof(MPIR_Gpid), MPI_BYTE, local_leader, local_comm_ptr, &errflag ); if (mpi_errno) MPIR_ERR_POP(mpi_errno); diff --git a/src/mpi/group/grouputil.c b/src/mpi/group/grouputil.c index 9e249dd..735c889 100644 --- a/src/mpi/group/grouputil.c +++ b/src/mpi/group/grouputil.c @@ -376,8 +376,7 @@ int MPIR_Group_check_valid_ranges( MPIR_Group *group_ptr, int MPIR_Group_check_subset( MPIR_Group *group_ptr, MPIR_Comm *comm_ptr ) { int mpi_errno = MPI_SUCCESS; - int64_t l1_pid, l2_pid; - int g1_idx, g2_idx, i; + int g1_idx, g2_idx, l1_pid, l2_pid, i; MPIR_Group_pmap_t *vmap=0; int vsize = comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM ? comm_ptr->local_size : comm_ptr->remote_size; @@ -403,7 +402,7 @@ int MPIR_Group_check_subset( MPIR_Group *group_ptr, MPIR_Comm *comm_ptr ) l1_pid = group_ptr->lrank_to_lpid[g1_idx].lpid; l2_pid = vmap[g2_idx].lpid; MPL_DBG_MSG_FMT(MPIR_DBG_COMM,VERBOSE,(MPL_DBG_FDEST, - "Lpids are %" PRId64 ", %" PRId64 "\n", l1_pid, l2_pid )); + "Lpids are %d, %d\n", l1_pid, l2_pid )); if (l1_pid < l2_pid) { /* If we have to advance g1, we didn't find a match, so that's an error. */ diff --git a/src/mpid/ch3/include/mpidpost.h b/src/mpid/ch3/include/mpidpost.h index 119ef5a..cc3ecbe 100644 --- a/src/mpid/ch3/include/mpidpost.h +++ b/src/mpid/ch3/include/mpidpost.h @@ -178,10 +178,10 @@ int MPIDI_CH3_Comm_connect(char * port_name, int root, MPIR_Comm * comm_ptr, int MPID_GPID_GetAllInComm( MPIR_Comm *comm_ptr, int local_size, MPIR_Gpid local_gpids[], int *singlePG ); int MPID_GPID_Get( MPIR_Comm *comm_ptr, int rank, MPIR_Gpid *gpid ); -int MPID_GPID_ToLpidArray( int size, MPIR_Gpid gpid[], int64_t lpid[] ); +int MPID_GPID_ToLpidArray( int size, MPIR_Gpid gpid[], int lpid[] ); int MPID_Create_intercomm_from_lpids( MPIR_Comm *newcomm_ptr, - int size, const int64_t lpids[] ); -int MPID_PG_ForwardPGInfo( MPIR_Comm *peer_ptr, MPID_Comm *comm_ptr, + int size, const int lpids[] ); +int MPID_PG_ForwardPGInfo( MPIR_Comm *peer_ptr, MPIR_Comm *comm_ptr, int nPGids, const MPIR_Gpid gpids[], int root ); /* PG_ForwardPGInfo is used as the implementation of the intercomm-create diff --git a/src/mpid/ch3/src/mpid_vc.c b/src/mpid/ch3/src/mpid_vc.c index 378a1c4..3541876 100644 --- a/src/mpid/ch3/src/mpid_vc.c +++ b/src/mpid/ch3/src/mpid_vc.c @@ -300,18 +300,18 @@ int MPIDI_VCR_Dup(MPIDI_VCR orig_vcr, MPIDI_VCR * new_vcr) #define FUNCNAME MPID_Comm_get_lpid #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Comm_get_lpid(MPIR_Comm *comm_ptr, int idx, int64_t * lpid_ptr, MPIU_BOOL is_remote) +int MPID_Comm_get_lpid(MPIR_Comm *comm_ptr, int idx, int * lpid_ptr, MPIU_BOOL is_remote) { MPIDI_STATE_DECL(MPID_STATE_MPID_VCR_GET_LPID); MPIDI_FUNC_ENTER(MPID_STATE_MPID_VCR_GET_LPID); if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) - *lpid_ptr = (int64_t) comm_ptr->dev.vcrt->vcr_table[idx]->lpid; + *lpid_ptr = comm_ptr->dev.vcrt->vcr_table[idx]->lpid; else if (is_remote) - *lpid_ptr = (int64_t) comm_ptr->dev.vcrt->vcr_table[idx]->lpid; + *lpid_ptr = comm_ptr->dev.vcrt->vcr_table[idx]->lpid; else - *lpid_ptr = (int64_t) comm_ptr->dev.local_vcrt->vcr_table[idx]->lpid; + *lpid_ptr = comm_ptr->dev.local_vcrt->vcr_table[idx]->lpid; MPIDI_FUNC_EXIT(MPID_STATE_MPID_VCR_GET_LPID); return MPI_SUCCESS; @@ -394,7 +394,7 @@ int MPID_GPID_Get( MPIR_Comm *comm_ptr, int rank, MPIR_Gpid *in_gpid ) #define FUNCNAME MPID_GPID_ToLpidArray #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_GPID_ToLpidArray( int size, MPIR_Gpid in_gpid[], int64_t lpid[] ) +int MPID_GPID_ToLpidArray( int size, MPIR_Gpid in_gpid[], int lpid[] ) { int i, mpi_errno = MPI_SUCCESS; int pgid; @@ -428,7 +428,7 @@ int MPID_GPID_ToLpidArray( int size, MPIR_Gpid in_gpid[], int64_t lpid[] ) this process group */ /* Sanity check on size */ if (pg->size > gpid[1]) { - lpid[i] = (int64_t) pg->vct[gpid[1]].lpid; + lpid[i] = pg->vct[gpid[1]].lpid; } else { /* --BEGIN ERROR HANDLING-- */ @@ -463,7 +463,7 @@ int MPID_GPID_ToLpidArray( int size, MPIR_Gpid in_gpid[], int64_t lpid[] ) #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_Create_intercomm_from_lpids( MPIR_Comm *newcomm_ptr, - int size, const int64_t lpids[] ) + int size, const int lpids[] ) { int mpi_errno = MPI_SUCCESS; MPIR_Comm *commworld_ptr; @@ -504,7 +504,7 @@ int MPID_Create_intercomm_from_lpids( MPIR_Comm *newcomm_ptr, /*printf( "Checking lpid %d against %d in pg %s\n", lpids[i], pg->vct[j].lpid, (char *)pg->id ); fflush(stdout); */ - if (pg->vct[j].lpid == (int) lpids[i]) { + if (pg->vct[j].lpid == lpids[i]) { vc = &pg->vct[j]; /*printf( "found vc %x for lpid = %d in another pg\n", (int)vc, lpids[i] );*/ ----------------------------------------------------------------------- Summary of changes: src/include/mpiimpl.h | 4 ++-- src/mpi/comm/comm_create.c | 2 +- src/mpi/comm/comm_group.c | 5 ++--- src/mpi/comm/comm_remote_group.c | 5 ++--- src/mpi/comm/intercomm_create.c | 20 ++++++++++---------- src/mpi/group/grouputil.c | 5 ++--- src/mpid/ch3/include/mpidpost.h | 6 +++--- src/mpid/ch3/src/mpid_vc.c | 16 ++++++++-------- 8 files changed, 30 insertions(+), 33 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2-290-g50641f6
by noreply＠mpich.org 22 Apr '16

22 Apr '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 50641f630389063aae7c14635791aa7c6cd9f953 (commit) from 2ce01cab749661faa315b8d4a9eb0b392d41044c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/50641f630389063aae7c14635791aa7c6… commit 50641f630389063aae7c14635791aa7c6cd9f953 Author: Yanfei Guo <yguo(a)anl.gov> Date: Wed Apr 20 15:31:21 2016 -0500 Use 64-bit int in MPIR_Group. New LPID/GPID model uses 64-bit to store the combination of AV table id and lpid in MPIR_Group. This patch changes MPI layer and make CH3 compatible with new model. No reviewer. diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index 1cb8a12..3381dfb 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -1003,7 +1003,7 @@ typedef struct MPIR_Attribute { /* This structure is used to implement the group operations such as MPI_Group_translate_ranks */ typedef struct MPIR_Group_pmap_t { - int lpid; /* local process id, from VCONN */ + int64_t lpid; /* local process id, from VCONN */ int next_lpid; /* Index of next lpid (in lpid order) */ int flag; /* marker, used to implement group operations */ } MPIR_Group_pmap_t; @@ -3795,7 +3795,7 @@ int MPID_Get_universe_size(int * universe_size); to which it is connected. These are local process ids because different processes may use different ids to identify the same target process @*/ -int MPID_Comm_get_lpid(MPIR_Comm *comm_ptr, int idx, int * lpid_ptr, MPIU_BOOL is_remote); +int MPID_Comm_get_lpid(MPIR_Comm *comm_ptr, int idx, int64_t * lpid_ptr, MPIU_BOOL is_remote); /* prototypes and declarations for the MPID_Sched interface for nonblocking * collectives */ diff --git a/src/mpi/comm/comm_create.c b/src/mpi/comm/comm_create.c index f52467c..0aac5d8 100644 --- a/src/mpi/comm/comm_create.c +++ b/src/mpi/comm/comm_create.c @@ -122,7 +122,7 @@ int MPIR_Comm_create_calculate_mapping(MPIR_Group *group_ptr, /* FIXME : BUBBLE SORT */ mapping[i] = -1; for (j=0; j<comm_ptr->local_size; j++) { - int comm_lpid; + int64_t comm_lpid; MPID_Comm_get_lpid( comm_ptr, j, &comm_lpid, FALSE ); if (comm_lpid == group_ptr->lrank_to_lpid[i].lpid) { mapping[i] = j; diff --git a/src/mpi/comm/comm_group.c b/src/mpi/comm/comm_group.c index 4af1e6d..437302c 100644 --- a/src/mpi/comm/comm_group.c +++ b/src/mpi/comm/comm_group.c @@ -33,7 +33,8 @@ int MPI_Comm_group(MPI_Comm comm, MPI_Group *group) __attribute__((weak,alias("P int MPIR_Comm_group_impl(MPIR_Comm *comm_ptr, MPIR_Group **group_ptr) { int mpi_errno = MPI_SUCCESS; - int i, lpid, n; + int i, n; + int64_t lpid; int comm_world_size = MPIR_Process.comm_world->local_size; MPID_MPI_STATE_DECL(MPID_STATE_MPIR_COMM_GROUP_IMPL); @@ -48,7 +49,7 @@ int MPIR_Comm_group_impl(MPIR_Comm *comm_ptr, MPIR_Group **group_ptr) (*group_ptr)->is_local_dense_monotonic = TRUE; for (i=0; i<n; i++) { (void) MPID_Comm_get_lpid( comm_ptr, i, &lpid, FALSE ); - (*group_ptr)->lrank_to_lpid[i].lpid = lpid; + (*group_ptr)->lrank_to_lpid[i].lpid = lpid; if (lpid > comm_world_size || (i > 0 && (*group_ptr)->lrank_to_lpid[i-1].lpid != (lpid-1))) { diff --git a/src/mpi/comm/comm_remote_group.c b/src/mpi/comm/comm_remote_group.c index bfb28ad..4dfaa5f 100644 --- a/src/mpi/comm/comm_remote_group.c +++ b/src/mpi/comm/comm_remote_group.c @@ -33,7 +33,8 @@ int MPI_Comm_remote_group(MPI_Comm comm, MPI_Group *group) __attribute__((weak,a int MPIR_Comm_remote_group_impl(MPIR_Comm *comm_ptr, MPIR_Group **group_ptr) { int mpi_errno = MPI_SUCCESS; - int i, lpid, n; + int i, n; + int64_t lpid; MPID_MPI_STATE_DECL(MPID_STATE_MPIR_COMM_REMOTE_GROUP_IMPL); MPID_MPI_FUNC_ENTER(MPID_STATE_MPIR_COMM_REMOTE_GROUP_IMPL); @@ -45,7 +46,7 @@ int MPIR_Comm_remote_group_impl(MPIR_Comm *comm_ptr, MPIR_Group **group_ptr) for (i=0; i<n; i++) { (void) MPID_Comm_get_lpid( comm_ptr, i, &lpid, TRUE ); - (*group_ptr)->lrank_to_lpid[i].lpid = lpid; + (*group_ptr)->lrank_to_lpid[i].lpid = lpid; /* TODO calculate is_local_dense_monotonic */ } (*group_ptr)->size = n; diff --git a/src/mpi/comm/intercomm_create.c b/src/mpi/comm/intercomm_create.c index 807b06a..fba778c 100644 --- a/src/mpi/comm/intercomm_create.c +++ b/src/mpi/comm/intercomm_create.c @@ -26,10 +26,10 @@ int MPI_Intercomm_create(MPI_Comm local_comm, int local_leader, MPI_Comm peer_co /* Define MPICH_MPI_FROM_PMPI if weak symbols are not supported to build the MPI routines */ #ifdef HAVE_ERROR_CHECKING -PMPI_LOCAL int MPIR_CheckDisjointLpids( int [], int, int [], int ); +PMPI_LOCAL int MPIR_CheckDisjointLpids( int64_t [], int, int64_t [], int ); #endif /* HAVE_ERROR_CHECKING */ PMPI_LOCAL int MPID_LPID_GetAllInComm( MPIR_Comm *comm_ptr, int local_size, - int local_lpids[] ); + int64_t local_lpids[] ); #ifndef MPICH_MPI_FROM_PMPI #undef MPI_Intercomm_create @@ -42,8 +42,8 @@ PMPI_LOCAL int MPID_LPID_GetAllInComm( MPIR_Comm *comm_ptr, int local_size, #define FUNCNAME MPIR_CheckDisjointLpids #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -PMPI_LOCAL int MPIR_CheckDisjointLpids( int lpids1[], int n1, - int lpids2[], int n2 ) +PMPI_LOCAL int MPIR_CheckDisjointLpids( int64_t lpids1[], int n1, + int64_t lpids2[], int n2 ) { int i, mask_size, idx, bit, maxlpid = -1; int mpi_errno = MPI_SUCCESS; @@ -103,7 +103,7 @@ PMPI_LOCAL int MPIR_CheckDisjointLpids( int lpids1[], int n1, #endif /* HAVE_ERROR_CHECKING */ PMPI_LOCAL int MPID_LPID_GetAllInComm( MPIR_Comm *comm_ptr, int local_size, - int local_lpids[] ) + int64_t local_lpids[] ) { int i; @@ -125,8 +125,8 @@ int MPIR_Intercomm_create_impl(MPIR_Comm *local_comm_ptr, int local_leader, { int mpi_errno = MPI_SUCCESS; MPIU_Context_id_t final_context_id, recvcontext_id; - int remote_size, *remote_lpids=0, singlePG; - int local_size,*local_lpids=0; + int remote_size, local_size, singlePG; + int64_t *remote_lpids = 0, *local_lpids = 0; MPIR_Gpid *local_gpids=NULL, *remote_gpids=NULL; int comm_info[3]; int is_low_group = 0; @@ -178,9 +178,9 @@ int MPIR_Intercomm_create_impl(MPIR_Comm *local_comm_ptr, int local_leader, /* With this information, we can now send and receive the global process ids from the peer. */ MPIU_CHKLMEM_MALLOC(remote_gpids,MPIR_Gpid*,remote_size*sizeof(MPIR_Gpid), mpi_errno,"remote_gpids"); - MPIU_CHKLMEM_MALLOC(remote_lpids,int*,remote_size*sizeof(int), mpi_errno,"remote_lpids"); + MPIU_CHKLMEM_MALLOC(remote_lpids,int64_t*,remote_size*sizeof(int64_t), mpi_errno,"remote_lpids"); MPIU_CHKLMEM_MALLOC(local_gpids,MPIR_Gpid*,local_size*sizeof(MPIR_Gpid), mpi_errno,"local_gpids"); - MPIU_CHKLMEM_MALLOC(local_lpids,int*,local_size*sizeof(int), mpi_errno,"local_lpids"); + MPIU_CHKLMEM_MALLOC(local_lpids,int64_t*,local_size*sizeof(int64_t), mpi_errno,"local_lpids"); mpi_errno = MPID_GPID_GetAllInComm( local_comm_ptr, local_size, local_gpids, &singlePG ); if (mpi_errno) MPIR_ERR_POP(mpi_errno); @@ -278,7 +278,7 @@ int MPIR_Intercomm_create_impl(MPIR_Comm *local_comm_ptr, int local_leader, MPIR_ERR_CHKANDJUMP(errflag, mpi_errno, MPI_ERR_OTHER, "**coll_fail"); remote_size = comm_info[0]; MPIU_CHKLMEM_MALLOC(remote_gpids,MPIR_Gpid*,remote_size*sizeof(MPIR_Gpid), mpi_errno,"remote_gpids"); - MPIU_CHKLMEM_MALLOC(remote_lpids,int*,remote_size*sizeof(int), mpi_errno,"remote_lpids"); + MPIU_CHKLMEM_MALLOC(remote_lpids,int64_t*,remote_size*sizeof(int64_t), mpi_errno,"remote_lpids"); mpi_errno = MPID_Bcast( remote_gpids, remote_size*sizeof(MPIR_Gpid), MPI_BYTE, local_leader, local_comm_ptr, &errflag ); if (mpi_errno) MPIR_ERR_POP(mpi_errno); diff --git a/src/mpi/group/grouputil.c b/src/mpi/group/grouputil.c index 735c889..9e249dd 100644 --- a/src/mpi/group/grouputil.c +++ b/src/mpi/group/grouputil.c @@ -376,7 +376,8 @@ int MPIR_Group_check_valid_ranges( MPIR_Group *group_ptr, int MPIR_Group_check_subset( MPIR_Group *group_ptr, MPIR_Comm *comm_ptr ) { int mpi_errno = MPI_SUCCESS; - int g1_idx, g2_idx, l1_pid, l2_pid, i; + int64_t l1_pid, l2_pid; + int g1_idx, g2_idx, i; MPIR_Group_pmap_t *vmap=0; int vsize = comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM ? comm_ptr->local_size : comm_ptr->remote_size; @@ -402,7 +403,7 @@ int MPIR_Group_check_subset( MPIR_Group *group_ptr, MPIR_Comm *comm_ptr ) l1_pid = group_ptr->lrank_to_lpid[g1_idx].lpid; l2_pid = vmap[g2_idx].lpid; MPL_DBG_MSG_FMT(MPIR_DBG_COMM,VERBOSE,(MPL_DBG_FDEST, - "Lpids are %d, %d\n", l1_pid, l2_pid )); + "Lpids are %" PRId64 ", %" PRId64 "\n", l1_pid, l2_pid )); if (l1_pid < l2_pid) { /* If we have to advance g1, we didn't find a match, so that's an error. */ diff --git a/src/mpid/ch3/include/mpidpost.h b/src/mpid/ch3/include/mpidpost.h index cc3ecbe..119ef5a 100644 --- a/src/mpid/ch3/include/mpidpost.h +++ b/src/mpid/ch3/include/mpidpost.h @@ -178,10 +178,10 @@ int MPIDI_CH3_Comm_connect(char * port_name, int root, MPIR_Comm * comm_ptr, int MPID_GPID_GetAllInComm( MPIR_Comm *comm_ptr, int local_size, MPIR_Gpid local_gpids[], int *singlePG ); int MPID_GPID_Get( MPIR_Comm *comm_ptr, int rank, MPIR_Gpid *gpid ); -int MPID_GPID_ToLpidArray( int size, MPIR_Gpid gpid[], int lpid[] ); +int MPID_GPID_ToLpidArray( int size, MPIR_Gpid gpid[], int64_t lpid[] ); int MPID_Create_intercomm_from_lpids( MPIR_Comm *newcomm_ptr, - int size, const int lpids[] ); -int MPID_PG_ForwardPGInfo( MPIR_Comm *peer_ptr, MPIR_Comm *comm_ptr, + int size, const int64_t lpids[] ); +int MPID_PG_ForwardPGInfo( MPIR_Comm *peer_ptr, MPID_Comm *comm_ptr, int nPGids, const MPIR_Gpid gpids[], int root ); /* PG_ForwardPGInfo is used as the implementation of the intercomm-create diff --git a/src/mpid/ch3/src/mpid_vc.c b/src/mpid/ch3/src/mpid_vc.c index 3541876..378a1c4 100644 --- a/src/mpid/ch3/src/mpid_vc.c +++ b/src/mpid/ch3/src/mpid_vc.c @@ -300,18 +300,18 @@ int MPIDI_VCR_Dup(MPIDI_VCR orig_vcr, MPIDI_VCR * new_vcr) #define FUNCNAME MPID_Comm_get_lpid #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Comm_get_lpid(MPIR_Comm *comm_ptr, int idx, int * lpid_ptr, MPIU_BOOL is_remote) +int MPID_Comm_get_lpid(MPIR_Comm *comm_ptr, int idx, int64_t * lpid_ptr, MPIU_BOOL is_remote) { MPIDI_STATE_DECL(MPID_STATE_MPID_VCR_GET_LPID); MPIDI_FUNC_ENTER(MPID_STATE_MPID_VCR_GET_LPID); if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) - *lpid_ptr = comm_ptr->dev.vcrt->vcr_table[idx]->lpid; + *lpid_ptr = (int64_t) comm_ptr->dev.vcrt->vcr_table[idx]->lpid; else if (is_remote) - *lpid_ptr = comm_ptr->dev.vcrt->vcr_table[idx]->lpid; + *lpid_ptr = (int64_t) comm_ptr->dev.vcrt->vcr_table[idx]->lpid; else - *lpid_ptr = comm_ptr->dev.local_vcrt->vcr_table[idx]->lpid; + *lpid_ptr = (int64_t) comm_ptr->dev.local_vcrt->vcr_table[idx]->lpid; MPIDI_FUNC_EXIT(MPID_STATE_MPID_VCR_GET_LPID); return MPI_SUCCESS; @@ -394,7 +394,7 @@ int MPID_GPID_Get( MPIR_Comm *comm_ptr, int rank, MPIR_Gpid *in_gpid ) #define FUNCNAME MPID_GPID_ToLpidArray #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_GPID_ToLpidArray( int size, MPIR_Gpid in_gpid[], int lpid[] ) +int MPID_GPID_ToLpidArray( int size, MPIR_Gpid in_gpid[], int64_t lpid[] ) { int i, mpi_errno = MPI_SUCCESS; int pgid; @@ -428,7 +428,7 @@ int MPID_GPID_ToLpidArray( int size, MPIR_Gpid in_gpid[], int lpid[] ) this process group */ /* Sanity check on size */ if (pg->size > gpid[1]) { - lpid[i] = pg->vct[gpid[1]].lpid; + lpid[i] = (int64_t) pg->vct[gpid[1]].lpid; } else { /* --BEGIN ERROR HANDLING-- */ @@ -463,7 +463,7 @@ int MPID_GPID_ToLpidArray( int size, MPIR_Gpid in_gpid[], int lpid[] ) #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_Create_intercomm_from_lpids( MPIR_Comm *newcomm_ptr, - int size, const int lpids[] ) + int size, const int64_t lpids[] ) { int mpi_errno = MPI_SUCCESS; MPIR_Comm *commworld_ptr; @@ -504,7 +504,7 @@ int MPID_Create_intercomm_from_lpids( MPIR_Comm *newcomm_ptr, /*printf( "Checking lpid %d against %d in pg %s\n", lpids[i], pg->vct[j].lpid, (char *)pg->id ); fflush(stdout); */ - if (pg->vct[j].lpid == lpids[i]) { + if (pg->vct[j].lpid == (int) lpids[i]) { vc = &pg->vct[j]; /*printf( "found vc %x for lpid = %d in another pg\n", (int)vc, lpids[i] );*/ ----------------------------------------------------------------------- Summary of changes: src/include/mpiimpl.h | 4 ++-- src/mpi/comm/comm_create.c | 2 +- src/mpi/comm/comm_group.c | 5 +++-- src/mpi/comm/comm_remote_group.c | 5 +++-- src/mpi/comm/intercomm_create.c | 20 ++++++++++---------- src/mpi/group/grouputil.c | 5 +++-- src/mpid/ch3/include/mpidpost.h | 6 +++--- src/mpid/ch3/src/mpid_vc.c | 16 ++++++++-------- 8 files changed, 33 insertions(+), 30 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2-289-g2ce01ca
by noreply＠mpich.org 21 Apr '16

21 Apr '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 2ce01cab749661faa315b8d4a9eb0b392d41044c (commit) via 22e559dfc7f6fd9d19840780cb32eca08f5ac9e5 (commit) via 3e5afcb2e1e9237dd496b53a1e3145c1a4550fff (commit) via a1ecf0ad7e3ae6092d9fd9d06a2afa91f20c79b5 (commit) via 601e7efa64e7fd38ef09c77c7d5cfdeadb7fefa1 (commit) via 845aafae660ddfa82a135ce5ac0a9b1377c103e9 (commit) via de6110fb16445529264f4bb456a235df67c52464 (commit) via cfd8c8855619a325919155b19c32744dba5fe718 (commit) via c14976d66dbd57f92776471a51110d0ea942700b (commit) via 46008f6384b41c5308546406b0da7cf2bb6860f9 (commit) via ceb3cb52fc212972111f61a8088057126de188da (commit) via dd20be4e8d3b41fdbd666f0139f1b1f98261eaf1 (commit) via 3b418a958be32f22412961c41995b29b5c0eb14c (commit) via 4459b29de71916d1df6663e943b0df767f34dd84 (commit) via cff297b0a46908c9d4f40975eafb5337f19155e5 (commit) via cb35f608b18c3045245db44eebee66a7a472ebeb (commit) via 19e8742ad7662dfe1f715b172461b0bfd4db5947 (commit) via b01017cb2a613d1a58742ebae169db5713195ef4 (commit) via 78f7074624c37834587b8fb9940a8d52137e01c2 (commit) via 5439a3232b586c420431b73907f35a5add593527 (commit) via e1e8c2299ad759d2f451fdaa4e304cb4736b12d8 (commit) via 0cd266b04a5f556cd011dad228a4f6d26baafa7e (commit) via 0d8882e5623014f1c0fecc412c00eb403f36455f (commit) via 3c8943305b900b51d8e2f6df95bf920b50ba9841 (commit) via 97591cb606b6baa764a2b461e68b72e8f6c6ee28 (commit) via 0da7aa4adc6af2771e03a1f9fa0cdf09c89990d5 (commit) via 6f61e8c0a7fb6eca45d09ec20775419b9577f1c6 (commit) via 85143b2644b68b5afabe15c7be6a71c2f4ce0d20 (commit) via 51a88997b68e28f9ec3372fba57e3f424ef71681 (commit) via 300493e0da2c63073652aff0f776142eed807329 (commit) via c255813a99e9c68f94b0c5c9bc1b1399fb6f173e (commit) via fb7b7c65bc70561de65883911e9ed1366507aa2d (commit) via 906f12ad953876376fcbbbe373b558dae3741c63 (commit) via f322bec7a3e54802f55f0840728403651baf9ce2 (commit) via a2091e6d99da355ef5d2134ec9456ee60f00f8be (commit) via 5a002ef7a80ddac35c3f7ee1eb0d804a1f9158e3 (commit) via e347dd59ec4b0d3ac630f961a0eecfdd24fce5a8 (commit) via 415e17b1c909c0c37178d94349a47cedecc54832 (commit) from a94a4b4596115cb60c94581ec57f824ce0638002 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/2ce01cab749661faa315b8d4a9eb0b392… commit 2ce01cab749661faa315b8d4a9eb0b392d41044c Author: Pavan Balaji <balaji(a)anl.gov> Date: Thu Apr 21 11:46:19 2016 -0500 Simplify lightweight request creation in ch3:ofi The lightweight request creation API duplicated the CH3/MPI-level functionality for request creation, which is unnecessary. We should simply call the request_create API and then override whatever values we do not like. A good compiler will see two consecutive stores and discard the earlier ones, so it should not add any additional instructions. Signed-off-by: Charles J Archer <charles.j.archer(a)intel.com> diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h index 1492ac7..9934d76 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h @@ -263,32 +263,13 @@ static inline int MPID_nem_ofi_create_req_lw(MPIR_Request ** request, int refcnt int mpi_errno = MPI_SUCCESS; MPIR_Request *req; - req = (MPIR_Request *) MPIU_Handle_obj_alloc(&MPIR_Request_mem); - if (req == NULL) - MPID_Abort(NULL, MPI_ERR_NO_SPACE, -1, "Cannot allocate Request"); + MPID_nem_ofi_create_req(&req, refcnt); - MPIU_Assert(req != NULL); - MPIU_Assert(HANDLE_GET_MPI_KIND(req->handle) == MPIR_REQUEST); - - MPIU_Object_set_ref(req, refcnt); + /* resetting the kind and cc here should not add additional + * instructions since a good compiler will discard the kind and cc + * setting in the above request create anyway */ req->kind = MPIR_REQUEST_KIND__SEND; MPIR_cc_set(&req->cc, 0); // request is already completed - req->cc_ptr = &req->cc; - req->status.MPI_ERROR = MPI_SUCCESS; - MPIR_STATUS_SET_CANCEL_BIT(req->status, FALSE); - req->comm = NULL; - req->greq_fns = NULL; - req->errflag = MPIR_ERR_NONE; - req->request_completed_cb = NULL; - req->dev.state = 0; - req->dev.datatype_ptr = NULL; - req->dev.segment_ptr = NULL; - req->dev.flags = MPIDI_CH3_PKT_FLAG_NONE; - req->dev.OnDataAvail = NULL; - req->dev.ext_hdr_ptr = NULL; - MPIDI_Request_clear_dbg(req); - - MPID_nem_ofi_init_req(req); *request = req; return mpi_errno; http://git.mpich.org/mpich.git/commitdiff/22e559dfc7f6fd9d19840780cb32eca08… commit 22e559dfc7f6fd9d19840780cb32eca08f5ac9e5 Author: Pavan Balaji <balaji(a)anl.gov> Date: Wed Apr 20 20:48:42 2016 -0500 Namespace MPIR_MPI_State_t elements. Signed-off-by: Wesley Bland <wesley.bland(a)intel.com> diff --git a/src/include/mpierrs.h b/src/include/mpierrs.h index 2dee4a8..efc2915 100644 --- a/src/include/mpierrs.h +++ b/src/include/mpierrs.h @@ -839,8 +839,8 @@ cvars: #ifdef HAVE_ERROR_CHECKING #define MPIR_ERRTEST_INITIALIZED_ORDIE() \ do { \ - if (OPA_load_int(&MPIR_Process.mpich_state) == MPICH_PRE_INIT || \ - OPA_load_int(&MPIR_Process.mpich_state) == MPICH_POST_FINALIZED) \ + if (OPA_load_int(&MPIR_Process.mpich_state) == MPICH_MPI_STATE__PRE_INIT || \ + OPA_load_int(&MPIR_Process.mpich_state) == MPICH_MPI_STATE__POST_FINALIZED) \ { \ MPIR_Err_preOrPostInit(); \ } \ diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index 6741c12..1cb8a12 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -2294,10 +2294,10 @@ extern struct MPIR_Commops *MPIR_Comm_fns; /* Communicator creation functions * /* Per process data */ typedef enum MPIR_MPI_State_t { - MPICH_PRE_INIT=0, - MPICH_IN_INIT, - MPICH_POST_INIT, - MPICH_POST_FINALIZED + MPICH_MPI_STATE__PRE_INIT=0, + MPICH_MPI_STATE__IN_INIT, + MPICH_MPI_STATE__POST_INIT, + MPICH_MPI_STATE__POST_FINALIZED } MPIR_MPI_State_t; typedef struct PreDefined_attrs { diff --git a/src/mpi/errhan/errutil.c b/src/mpi/errhan/errutil.c index a876bb8..5c41389 100644 --- a/src/mpi/errhan/errutil.c +++ b/src/mpi/errhan/errutil.c @@ -210,10 +210,10 @@ void MPIR_Errhandler_set_fc( MPI_Errhandler errhand ) /* --BEGIN ERROR HANDLING-- */ void MPIR_Err_preOrPostInit( void ) { - if (OPA_load_int(&MPIR_Process.mpich_state) == MPICH_PRE_INIT) { + if (OPA_load_int(&MPIR_Process.mpich_state) == MPICH_MPI_STATE__PRE_INIT) { MPL_error_printf("Attempting to use an MPI routine before initializing MPICH\n"); } - else if (OPA_load_int(&MPIR_Process.mpich_state) == MPICH_POST_FINALIZED) { + else if (OPA_load_int(&MPIR_Process.mpich_state) == MPICH_MPI_STATE__POST_FINALIZED) { MPL_error_printf("Attempting to use an MPI routine after finalizing MPICH\n"); } else { @@ -243,8 +243,8 @@ int MPIR_Err_return_comm( MPIR_Comm *comm_ptr, const char fcname[], checkValidErrcode( error_class, fcname, &errcode ); /* --BEGIN ERROR HANDLING-- */ - if (OPA_load_int(&MPIR_Process.mpich_state) == MPICH_PRE_INIT || - OPA_load_int(&MPIR_Process.mpich_state) == MPICH_POST_FINALIZED) + if (OPA_load_int(&MPIR_Process.mpich_state) == MPICH_MPI_STATE__PRE_INIT || + OPA_load_int(&MPIR_Process.mpich_state) == MPICH_MPI_STATE__POST_FINALIZED) { /* for whatever reason, we aren't initialized (perhaps error during MPI_Init) */ diff --git a/src/mpi/init/finalize.c b/src/mpi/init/finalize.c index 846d074..e25e286 100644 --- a/src/mpi/init/finalize.c +++ b/src/mpi/init/finalize.c @@ -78,8 +78,8 @@ void MPIR_Add_finalize( int (*f)( void * ), void *extra_data, int priority ) MPIR_Process.mpich_state to decide how to signal the error */ (void)MPL_internal_error_printf( "overflow in finalize stack! " "Is MAX_FINALIZE_FUNC too small?\n" ); - if (OPA_load_int(&MPIR_Process.mpich_state) == MPICH_IN_INIT || - OPA_load_int(&MPIR_Process.mpich_state) == MPICH_POST_INIT) + if (OPA_load_int(&MPIR_Process.mpich_state) == MPICH_MPI_STATE__IN_INIT || + OPA_load_int(&MPIR_Process.mpich_state) == MPICH_MPI_STATE__POST_INIT) { MPID_Abort( NULL, MPI_SUCCESS, 13, NULL ); } @@ -258,7 +258,7 @@ int MPI_Finalize( void ) finalize callbacks */ MPID_THREAD_CS_EXIT(GLOBAL, MPIR_THREAD_GLOBAL_ALLFUNC_MUTEX); - OPA_store_int(&MPIR_Process.mpich_state, MPICH_POST_FINALIZED); + OPA_store_int(&MPIR_Process.mpich_state, MPICH_MPI_STATE__POST_FINALIZED); #if defined(MPICH_IS_THREADED) MPIR_Thread_CS_Finalize(); @@ -318,7 +318,7 @@ int MPI_Finalize( void ) } # endif mpi_errno = MPIR_Err_return_comm( 0, FCNAME, mpi_errno ); - if (OPA_load_int(&MPIR_Process.mpich_state) < MPICH_POST_FINALIZED) { + if (OPA_load_int(&MPIR_Process.mpich_state) < MPICH_MPI_STATE__POST_FINALIZED) { MPID_THREAD_CS_EXIT(GLOBAL, MPIR_THREAD_GLOBAL_ALLFUNC_MUTEX); } goto fn_exit; diff --git a/src/mpi/init/finalized.c b/src/mpi/init/finalized.c index e4c2cd2..53a4014 100644 --- a/src/mpi/init/finalized.c +++ b/src/mpi/init/finalized.c @@ -69,7 +69,7 @@ int MPI_Finalized( int *flag ) /* ... body of routine ... */ - *flag = (OPA_load_int(&MPIR_Process.mpich_state) >= MPICH_POST_FINALIZED); + *flag = (OPA_load_int(&MPIR_Process.mpich_state) >= MPICH_MPI_STATE__POST_FINALIZED); /* ... end of body of routine ... */ @@ -82,8 +82,8 @@ int MPI_Finalized( int *flag ) /* --BEGIN ERROR HANDLING-- */ # ifdef HAVE_ERROR_CHECKING fn_fail: - if (OPA_load_int(&MPIR_Process.mpich_state) == MPICH_IN_INIT || - OPA_load_int(&MPIR_Process.mpich_state) == MPICH_POST_INIT) + if (OPA_load_int(&MPIR_Process.mpich_state) == MPICH_MPI_STATE__IN_INIT || + OPA_load_int(&MPIR_Process.mpich_state) == MPICH_MPI_STATE__POST_INIT) { { mpi_errno = MPIR_Err_create_code( diff --git a/src/mpi/init/init.c b/src/mpi/init/init.c index b15489f..91a8f0e 100644 --- a/src/mpi/init/init.c +++ b/src/mpi/init/init.c @@ -135,7 +135,7 @@ int MPI_Init( int *argc, char ***argv ) { MPID_BEGIN_ERROR_CHECKS; { - if (OPA_load_int(&MPIR_Process.mpich_state) != MPICH_PRE_INIT) { + if (OPA_load_int(&MPIR_Process.mpich_state) != MPICH_MPI_STATE__PRE_INIT) { mpi_errno = MPIR_Err_create_code( MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_OTHER, "**inittwice", NULL ); } diff --git a/src/mpi/init/initialized.c b/src/mpi/init/initialized.c index 0108a9f..b8938e2 100644 --- a/src/mpi/init/initialized.c +++ b/src/mpi/init/initialized.c @@ -69,7 +69,7 @@ int MPI_Initialized( int *flag ) /* ... body of routine ... */ - *flag = (OPA_load_int(&MPIR_Process.mpich_state) >= MPICH_POST_INIT); + *flag = (OPA_load_int(&MPIR_Process.mpich_state) >= MPICH_MPI_STATE__POST_INIT); /* ... end of body of routine ... */ @@ -82,8 +82,8 @@ int MPI_Initialized( int *flag ) /* --BEGIN ERROR HANDLING-- */ # ifdef HAVE_ERROR_CHECKING fn_fail: - if (OPA_load_int(&MPIR_Process.mpich_state) == MPICH_IN_INIT || - OPA_load_int(&MPIR_Process.mpich_state) == MPICH_POST_INIT) + if (OPA_load_int(&MPIR_Process.mpich_state) == MPICH_MPI_STATE__IN_INIT || + OPA_load_int(&MPIR_Process.mpich_state) == MPICH_MPI_STATE__POST_INIT) { { mpi_errno = MPIR_Err_create_code( diff --git a/src/mpi/init/initthread.c b/src/mpi/init/initthread.c index fb619db..922576e 100644 --- a/src/mpi/init/initthread.c +++ b/src/mpi/init/initthread.c @@ -82,7 +82,7 @@ int MPI_Init_thread(int *argc, char ***argv, int required, int *provided) __attr /* Any internal routines can go here. Make them static if possible */ /* Global variables can be initialized here */ -MPICH_PerProcess_t MPIR_Process = { OPA_INT_T_INITIALIZER(MPICH_PRE_INIT) }; +MPICH_PerProcess_t MPIR_Process = { OPA_INT_T_INITIALIZER(MPICH_MPI_STATE__PRE_INIT) }; /* all other fields in MPIR_Process are irrelevant */ MPIR_Thread_info_t MPIR_ThreadInfo = { 0 }; @@ -484,7 +484,7 @@ int MPIR_Init_thread(int * argc, char ***argv, int required, int * provided) /* define MPI as initialized so that we can use MPI functions within MPID_Init if necessary */ - OPA_store_int(&MPIR_Process.mpich_state, MPICH_IN_INIT); + OPA_store_int(&MPIR_Process.mpich_state, MPICH_MPI_STATE__IN_INIT); /* We can't acquire any critical sections until this point. Any * earlier the basic data structures haven't been initialized */ @@ -595,13 +595,13 @@ fn_exit: /* Make fields of MPIR_Process global visible and set mpich_state atomically so that MPI_Initialized() etc. are thread safe */ OPA_write_barrier(); - OPA_store_int(&MPIR_Process.mpich_state, MPICH_POST_INIT); + OPA_store_int(&MPIR_Process.mpich_state, MPICH_MPI_STATE__POST_INIT); return mpi_errno; fn_fail: /* --BEGIN ERROR HANDLING-- */ /* signal to error handling routines that core services are unavailable */ - OPA_store_int(&MPIR_Process.mpich_state, MPICH_PRE_INIT); + OPA_store_int(&MPIR_Process.mpich_state, MPICH_MPI_STATE__PRE_INIT); if (exit_init_cs_on_failure) { MPID_THREAD_CS_EXIT(GLOBAL, MPIR_THREAD_GLOBAL_ALLFUNC_MUTEX); @@ -673,7 +673,7 @@ int MPI_Init_thread( int *argc, char ***argv, int required, int *provided ) { MPID_BEGIN_ERROR_CHECKS; { - if (OPA_load_int(&MPIR_Process.mpich_state) != MPICH_PRE_INIT) { + if (OPA_load_int(&MPIR_Process.mpich_state) != MPICH_MPI_STATE__PRE_INIT) { mpi_errno = MPIR_Err_create_code( MPI_SUCCESS, MPIR_ERR_RECOVERABLE, "MPI_Init_thread", __LINE__, MPI_ERR_OTHER, "**inittwice", 0 ); } http://git.mpich.org/mpich.git/commitdiff/3e5afcb2e1e9237dd496b53a1e3145c1a… commit 3e5afcb2e1e9237dd496b53a1e3145c1a4550fff Author: Pavan Balaji <balaji(a)anl.gov> Date: Wed Apr 20 20:47:30 2016 -0500 Namespace MPIR_Op_kind_t elements. Signed-off-by: Wesley Bland <wesley.bland(a)intel.com> diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index 95ccf96..6741c12 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -2024,23 +2024,23 @@ int MPID_Mem_was_alloced( void *ptr ); /* brad : this isn't used or implemented Collective-DS E*/ typedef enum MPIR_Op_kind { - MPIR_OP_NULL=0, - MPIR_OP_MAX=1, - MPIR_OP_MIN=2, - MPIR_OP_SUM=3, - MPIR_OP_PROD=4, - MPIR_OP_LAND=5, - MPIR_OP_BAND=6, - MPIR_OP_LOR=7, - MPIR_OP_BOR=8, - MPIR_OP_LXOR=9, - MPIR_OP_BXOR=10, - MPIR_OP_MAXLOC=11, - MPIR_OP_MINLOC=12, - MPIR_OP_REPLACE=13, - MPIR_OP_NO_OP=14, - MPIR_OP_USER_NONCOMMUTE=32, - MPIR_OP_USER=33 + MPIR_OP_KIND__NULL=0, + MPIR_OP_KIND__MAX=1, + MPIR_OP_KIND__MIN=2, + MPIR_OP_KIND__SUM=3, + MPIR_OP_KIND__PROD=4, + MPIR_OP_KIND__LAND=5, + MPIR_OP_KIND__BAND=6, + MPIR_OP_KIND__LOR=7, + MPIR_OP_KIND__BOR=8, + MPIR_OP_KIND__LXOR=9, + MPIR_OP_KIND__BXOR=10, + MPIR_OP_KIND__MAXLOC=11, + MPIR_OP_KIND__MINLOC=12, + MPIR_OP_KIND__REPLACE=13, + MPIR_OP_KIND__NO_OP=14, + MPIR_OP_KIND__USER_NONCOMMUTE=32, + MPIR_OP_KIND__USER=33 } MPIR_Op_kind; /*S diff --git a/src/mpi/coll/collutil.h b/src/mpi/coll/collutil.h index be16930..8fc26d3 100644 --- a/src/mpi/coll/collutil.h +++ b/src/mpi/coll/collutil.h @@ -38,7 +38,7 @@ static inline int MPIR_Op_is_commutative(MPI_Op op) } else { MPIR_Op_get_ptr(op, op_ptr); - if (op_ptr->kind == MPIR_OP_USER_NONCOMMUTE) + if (op_ptr->kind == MPIR_OP_KIND__USER_NONCOMMUTE) return FALSE; else return TRUE; diff --git a/src/mpi/coll/exscan.c b/src/mpi/coll/exscan.c index 89a12b7..4c7620f 100644 --- a/src/mpi/coll/exscan.c +++ b/src/mpi/coll/exscan.c @@ -124,7 +124,7 @@ int MPIR_Exscan ( } else { MPIR_Op_get_ptr(op, op_ptr); - if (op_ptr->kind == MPIR_OP_USER_NONCOMMUTE) + if (op_ptr->kind == MPIR_OP_KIND__USER_NONCOMMUTE) is_commutative = 0; else is_commutative = 1; diff --git a/src/mpi/coll/op_commutative.c b/src/mpi/coll/op_commutative.c index 81dded3..773e416 100644 --- a/src/mpi/coll/op_commutative.c +++ b/src/mpi/coll/op_commutative.c @@ -82,7 +82,7 @@ int MPI_Op_commutative(MPI_Op op, int *commute) *commute = 1; } else { - if (op_ptr->kind == MPIR_OP_USER_NONCOMMUTE) + if (op_ptr->kind == MPIR_OP_KIND__USER_NONCOMMUTE) *commute = 0; else *commute = 1; diff --git a/src/mpi/coll/op_create.c b/src/mpi/coll/op_create.c index f05c87f..e163311 100644 --- a/src/mpi/coll/op_create.c +++ b/src/mpi/coll/op_create.c @@ -124,7 +124,7 @@ int MPI_Op_create(MPI_User_function *user_fn, int commute, MPI_Op *op) /* --END ERROR HANDLING-- */ op_ptr->language = MPIR_LANG__C; - op_ptr->kind = commute ? MPIR_OP_USER : MPIR_OP_USER_NONCOMMUTE; + op_ptr->kind = commute ? MPIR_OP_KIND__USER : MPIR_OP_KIND__USER_NONCOMMUTE; op_ptr->function.c_function = (void (*)(const void *, void *, const int *, const MPI_Datatype *))user_fn; MPIU_Object_set_ref(op_ptr,1); diff --git a/src/mpi/coll/op_free.c b/src/mpi/coll/op_free.c index 9307de5..cfc5445 100644 --- a/src/mpi/coll/op_free.c +++ b/src/mpi/coll/op_free.c @@ -74,7 +74,7 @@ int MPI_Op_free(MPI_Op *op) { MPIR_Op_valid_ptr( op_ptr, mpi_errno ); if (!mpi_errno) { - if (op_ptr->kind < MPIR_OP_USER_NONCOMMUTE) { + if (op_ptr->kind < MPIR_OP_KIND__USER_NONCOMMUTE) { mpi_errno = MPIR_Err_create_code( MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_OP, "**permop", 0 ); diff --git a/src/mpi/coll/red_scat.c b/src/mpi/coll/red_scat.c index 63aa171..2f4c35c 100644 --- a/src/mpi/coll/red_scat.c +++ b/src/mpi/coll/red_scat.c @@ -280,7 +280,7 @@ int MPIR_Reduce_scatter_intra(const void *sendbuf, void *recvbuf, const int recv } else { MPIR_Op_get_ptr(op, op_ptr); - if (op_ptr->kind == MPIR_OP_USER_NONCOMMUTE) + if (op_ptr->kind == MPIR_OP_KIND__USER_NONCOMMUTE) is_commutative = 0; else is_commutative = 1; diff --git a/src/mpi/coll/red_scat_block.c b/src/mpi/coll/red_scat_block.c index 4afefd5..0d6f058 100644 --- a/src/mpi/coll/red_scat_block.c +++ b/src/mpi/coll/red_scat_block.c @@ -284,7 +284,7 @@ int MPIR_Reduce_scatter_block_intra ( } else { MPIR_Op_get_ptr(op, op_ptr); - if (op_ptr->kind == MPIR_OP_USER_NONCOMMUTE) + if (op_ptr->kind == MPIR_OP_KIND__USER_NONCOMMUTE) is_commutative = 0; else is_commutative = 1; diff --git a/src/mpi/coll/reduce.c b/src/mpi/coll/reduce.c index 81b8202..9083bd2 100644 --- a/src/mpi/coll/reduce.c +++ b/src/mpi/coll/reduce.c @@ -753,7 +753,7 @@ int MPIR_Reduce_intra ( is_commutative = 1; else { MPIR_Op_get_ptr(op, op_ptr); - is_commutative = (op_ptr->kind == MPIR_OP_USER_NONCOMMUTE) ? 0 : 1; + is_commutative = (op_ptr->kind == MPIR_OP_KIND__USER_NONCOMMUTE) ? 0 : 1; } MPID_Datatype_get_size_macro(datatype, type_size); diff --git a/src/mpi/coll/scan.c b/src/mpi/coll/scan.c index e4ebda1..1b14c0e 100644 --- a/src/mpi/coll/scan.c +++ b/src/mpi/coll/scan.c @@ -112,7 +112,7 @@ static int MPIR_Scan_generic ( } else { MPIR_Op_get_ptr(op, op_ptr); - if (op_ptr->kind == MPIR_OP_USER_NONCOMMUTE) + if (op_ptr->kind == MPIR_OP_KIND__USER_NONCOMMUTE) is_commutative = 0; else is_commutative = 1; http://git.mpich.org/mpich.git/commitdiff/a1ecf0ad7e3ae6092d9fd9d06a2afa91f… commit a1ecf0ad7e3ae6092d9fd9d06a2afa91f20c79b5 Author: Pavan Balaji <balaji(a)anl.gov> Date: Wed Apr 20 20:45:25 2016 -0500 Namespace MPIR_Comm_map_dir_t elements. Signed-off-by: Wesley Bland <wesley.bland(a)intel.com> diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index 8956998..95ccf96 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -1116,10 +1116,10 @@ typedef enum { /* direction of mapping: local to local, local to remote, remote to * local, remote to remote */ typedef enum { - MPIR_COMM_MAP_DIR_L2L, - MPIR_COMM_MAP_DIR_L2R, - MPIR_COMM_MAP_DIR_R2L, - MPIR_COMM_MAP_DIR_R2R + MPIR_COMM_MAP_DIR__L2L, + MPIR_COMM_MAP_DIR__L2R, + MPIR_COMM_MAP_DIR__R2L, + MPIR_COMM_MAP_DIR__R2R } MPIR_Comm_map_dir_t; typedef struct MPIR_Comm_map { diff --git a/src/mpi/comm/comm_create.c b/src/mpi/comm/comm_create.c index 282e0c6..f52467c 100644 --- a/src/mpi/comm/comm_create.c +++ b/src/mpi/comm/comm_create.c @@ -168,10 +168,10 @@ int MPIR_Comm_create_map(int local_n, int mpi_errno = MPI_SUCCESS; MPIR_Comm_map_irregular(newcomm, mapping_comm, local_mapping, - local_n, MPIR_COMM_MAP_DIR_L2L, NULL); + local_n, MPIR_COMM_MAP_DIR__L2L, NULL); if (mapping_comm->comm_kind == MPIR_COMM_KIND__INTERCOMM) { MPIR_Comm_map_irregular(newcomm, mapping_comm, remote_mapping, - remote_n, MPIR_COMM_MAP_DIR_R2R, NULL); + remote_n, MPIR_COMM_MAP_DIR__R2R, NULL); } fn_exit: diff --git a/src/mpi/comm/comm_split.c b/src/mpi/comm/comm_split.c index 6ca5688..18d1424 100644 --- a/src/mpi/comm/comm_split.c +++ b/src/mpi/comm/comm_split.c @@ -316,7 +316,7 @@ int MPIR_Comm_split_impl(MPIR_Comm *comm_ptr, int color, int key, MPIR_Comm **ne MPIU_Sort_inttable( remotekeytable, new_remote_size ); MPIR_Comm_map_irregular(*newcomm_ptr, comm_ptr, NULL, - new_size, MPIR_COMM_MAP_DIR_L2L, + new_size, MPIR_COMM_MAP_DIR__L2L, &mapper); for (i = 0; i < new_size; i++) { @@ -342,7 +342,7 @@ int MPIR_Comm_split_impl(MPIR_Comm *comm_ptr, int color, int key, MPIR_Comm **ne MPIR_Comm_map_irregular(*newcomm_ptr, comm_ptr, NULL, new_remote_size, - MPIR_COMM_MAP_DIR_R2R, &mapper); + MPIR_COMM_MAP_DIR__R2R, &mapper); for (i = 0; i < new_remote_size; i++) mapper->src_mapping[i] = remotekeytable[i].color; @@ -359,7 +359,7 @@ int MPIR_Comm_split_impl(MPIR_Comm *comm_ptr, int color, int key, MPIR_Comm **ne (*newcomm_ptr)->remote_size = new_size; MPIR_Comm_map_irregular(*newcomm_ptr, comm_ptr, NULL, - new_size, MPIR_COMM_MAP_DIR_L2L, + new_size, MPIR_COMM_MAP_DIR__L2L, &mapper); for (i = 0; i < new_size; i++) { diff --git a/src/mpi/comm/commutil.c b/src/mpi/comm/commutil.c index 1d1992c..ce6b714 100644 --- a/src/mpi/comm/commutil.c +++ b/src/mpi/comm/commutil.c @@ -190,7 +190,7 @@ int MPIR_Setup_intercomm_localcomm(MPIR_Comm * intercomm_ptr) localcomm_ptr->local_size = intercomm_ptr->local_size; localcomm_ptr->rank = intercomm_ptr->rank; - MPIR_Comm_map_dup(localcomm_ptr, intercomm_ptr, MPIR_COMM_MAP_DIR_L2L); + MPIR_Comm_map_dup(localcomm_ptr, intercomm_ptr, MPIR_COMM_MAP_DIR__L2L); /* TODO More advanced version: if the group is available, dup it by * increasing the reference count instead of recreating it later */ @@ -604,7 +604,7 @@ int MPIR_Comm_commit(MPIR_Comm * comm) comm->node_comm->remote_size = num_local; MPIR_Comm_map_irregular(comm->node_comm, comm, local_procs, - num_local, MPIR_COMM_MAP_DIR_L2L, NULL); + num_local, MPIR_COMM_MAP_DIR__L2L, NULL); mpi_errno = set_collops(comm->node_comm); if (mpi_errno) @@ -637,7 +637,7 @@ int MPIR_Comm_commit(MPIR_Comm * comm) comm->node_roots_comm->remote_size = num_external; MPIR_Comm_map_irregular(comm->node_roots_comm, comm, - external_procs, num_external, MPIR_COMM_MAP_DIR_L2L, NULL); + external_procs, num_external, MPIR_COMM_MAP_DIR__L2L, NULL); mpi_errno = set_collops(comm->node_roots_comm); if (mpi_errno) @@ -770,17 +770,17 @@ int MPIR_Comm_copy(MPIR_Comm * comm_ptr, int size, MPIR_Comm ** outcomm_ptr) if (size == comm_ptr->local_size) { /* Duplicate the network address mapping */ if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) - MPIR_Comm_map_dup(newcomm_ptr, comm_ptr, MPIR_COMM_MAP_DIR_L2L); + MPIR_Comm_map_dup(newcomm_ptr, comm_ptr, MPIR_COMM_MAP_DIR__L2L); else - MPIR_Comm_map_dup(newcomm_ptr, comm_ptr, MPIR_COMM_MAP_DIR_R2R); + MPIR_Comm_map_dup(newcomm_ptr, comm_ptr, MPIR_COMM_MAP_DIR__R2R); } else { int i; if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) - MPIR_Comm_map_irregular(newcomm_ptr, comm_ptr, NULL, size, MPIR_COMM_MAP_DIR_L2L, &map); + MPIR_Comm_map_irregular(newcomm_ptr, comm_ptr, NULL, size, MPIR_COMM_MAP_DIR__L2L, &map); else - MPIR_Comm_map_irregular(newcomm_ptr, comm_ptr, NULL, size, MPIR_COMM_MAP_DIR_R2R, &map); + MPIR_Comm_map_irregular(newcomm_ptr, comm_ptr, NULL, size, MPIR_COMM_MAP_DIR__R2R, &map); for (i = 0; i < size; i++) { /* For rank i in the new communicator, find the corresponding * rank in the input communicator */ @@ -790,7 +790,7 @@ int MPIR_Comm_copy(MPIR_Comm * comm_ptr, int size, MPIR_Comm ** outcomm_ptr) /* If it is an intercomm, duplicate the local network address references */ if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM) { - MPIR_Comm_map_dup(newcomm_ptr, comm_ptr, MPIR_COMM_MAP_DIR_L2L); + MPIR_Comm_map_dup(newcomm_ptr, comm_ptr, MPIR_COMM_MAP_DIR__L2L); } /* Set the sizes and ranks */ @@ -871,13 +871,13 @@ int MPIR_Comm_copy_data(MPIR_Comm * comm_ptr, MPIR_Comm ** outcomm_ptr) newcomm_ptr->local_comm = 0; if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) - MPIR_Comm_map_dup(newcomm_ptr, comm_ptr, MPIR_COMM_MAP_DIR_L2L); + MPIR_Comm_map_dup(newcomm_ptr, comm_ptr, MPIR_COMM_MAP_DIR__L2L); else - MPIR_Comm_map_dup(newcomm_ptr, comm_ptr, MPIR_COMM_MAP_DIR_R2R); + MPIR_Comm_map_dup(newcomm_ptr, comm_ptr, MPIR_COMM_MAP_DIR__R2R); /* If it is an intercomm, duplicate the network address mapping */ if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM) { - MPIR_Comm_map_dup(newcomm_ptr, comm_ptr, MPIR_COMM_MAP_DIR_L2L); + MPIR_Comm_map_dup(newcomm_ptr, comm_ptr, MPIR_COMM_MAP_DIR__L2L); } /* Set the sizes and ranks */ diff --git a/src/mpi/comm/intercomm_create.c b/src/mpi/comm/intercomm_create.c index 2573c07..807b06a 100644 --- a/src/mpi/comm/intercomm_create.c +++ b/src/mpi/comm/intercomm_create.c @@ -337,7 +337,7 @@ int MPIR_Intercomm_create_impl(MPIR_Comm *local_comm_ptr, int local_leader, mpi_errno = MPID_Create_intercomm_from_lpids( *new_intercomm_ptr, remote_size, remote_lpids ); if (mpi_errno) goto fn_fail; - MPIR_Comm_map_dup(*new_intercomm_ptr, local_comm_ptr, MPIR_COMM_MAP_DIR_L2L); + MPIR_Comm_map_dup(*new_intercomm_ptr, local_comm_ptr, MPIR_COMM_MAP_DIR__L2L); /* Inherit the error handler (if any) */ MPID_THREAD_CS_ENTER(POBJ, MPIR_THREAD_POBJ_COMM_MUTEX(local_comm_ptr)); diff --git a/src/mpi/comm/intercomm_merge.c b/src/mpi/comm/intercomm_merge.c index 3805fd0..b5a13ff 100644 --- a/src/mpi/comm/intercomm_merge.c +++ b/src/mpi/comm/intercomm_merge.c @@ -44,21 +44,21 @@ static int create_and_map(MPIR_Comm *comm_ptr, int local_high, MPIR_Comm *new_in from the existing comm */ if (local_high) { /* remote group first */ - MPIR_Comm_map_dup(new_intracomm_ptr, comm_ptr, MPIR_COMM_MAP_DIR_R2L); + MPIR_Comm_map_dup(new_intracomm_ptr, comm_ptr, MPIR_COMM_MAP_DIR__R2L); - MPIR_Comm_map_dup(new_intracomm_ptr, comm_ptr, MPIR_COMM_MAP_DIR_L2L); + MPIR_Comm_map_dup(new_intracomm_ptr, comm_ptr, MPIR_COMM_MAP_DIR__L2L); for (i = 0; i < comm_ptr->local_size; i++) if (i == comm_ptr->rank) new_intracomm_ptr->rank = comm_ptr->remote_size + i; } else { /* local group first */ - MPIR_Comm_map_dup(new_intracomm_ptr, comm_ptr, MPIR_COMM_MAP_DIR_L2L); + MPIR_Comm_map_dup(new_intracomm_ptr, comm_ptr, MPIR_COMM_MAP_DIR__L2L); for (i = 0; i < comm_ptr->local_size; i++) if (i == comm_ptr->rank) new_intracomm_ptr->rank = i; - MPIR_Comm_map_dup(new_intracomm_ptr, comm_ptr, MPIR_COMM_MAP_DIR_R2L); + MPIR_Comm_map_dup(new_intracomm_ptr, comm_ptr, MPIR_COMM_MAP_DIR__R2L); } fn_fail: diff --git a/src/mpid/ch3/src/ch3u_comm.c b/src/mpid/ch3/src/ch3u_comm.c index ce1a546..234f4ec 100644 --- a/src/mpid/ch3/src/ch3u_comm.c +++ b/src/mpid/ch3/src/ch3u_comm.c @@ -172,7 +172,7 @@ static inline int map_size(MPIR_Comm_map_t map) { if (map.type == MPIR_COMM_MAP_TYPE__IRREGULAR) return map.src_mapping_size; - else if (map.dir == MPIR_COMM_MAP_DIR_L2L || map.dir == MPIR_COMM_MAP_DIR_L2R) + else if (map.dir == MPIR_COMM_MAP_DIR__L2L || map.dir == MPIR_COMM_MAP_DIR__L2R) return map.src_comm->local_size; else return map.src_comm->remote_size; @@ -202,19 +202,19 @@ int MPIDI_CH3I_Comm_create_hook(MPIR_Comm *comm) /* do some sanity checks */ MPL_LL_FOREACH(comm->mapper_head, mapper) { if (mapper->src_comm->comm_kind == MPIR_COMM_KIND__INTRACOMM) - MPIU_Assert(mapper->dir == MPIR_COMM_MAP_DIR_L2L || - mapper->dir == MPIR_COMM_MAP_DIR_L2R); + MPIU_Assert(mapper->dir == MPIR_COMM_MAP_DIR__L2L || + mapper->dir == MPIR_COMM_MAP_DIR__L2R); if (comm->comm_kind == MPIR_COMM_KIND__INTRACOMM) - MPIU_Assert(mapper->dir == MPIR_COMM_MAP_DIR_L2L || - mapper->dir == MPIR_COMM_MAP_DIR_R2L); + MPIU_Assert(mapper->dir == MPIR_COMM_MAP_DIR__L2L || + mapper->dir == MPIR_COMM_MAP_DIR__R2L); } /* First, handle all the mappers that contribute to the local part * of the comm */ vcrt_size = 0; MPL_LL_FOREACH(comm->mapper_head, mapper) { - if (mapper->dir == MPIR_COMM_MAP_DIR_L2R || - mapper->dir == MPIR_COMM_MAP_DIR_R2R) + if (mapper->dir == MPIR_COMM_MAP_DIR__L2R || + mapper->dir == MPIR_COMM_MAP_DIR__R2R) continue; vcrt_size += map_size(*mapper); @@ -223,11 +223,11 @@ int MPIDI_CH3I_Comm_create_hook(MPIR_Comm *comm) MPL_LL_FOREACH(comm->mapper_head, mapper) { src_comm = mapper->src_comm; - if (mapper->dir == MPIR_COMM_MAP_DIR_L2R || - mapper->dir == MPIR_COMM_MAP_DIR_R2R) + if (mapper->dir == MPIR_COMM_MAP_DIR__L2R || + mapper->dir == MPIR_COMM_MAP_DIR__R2R) continue; - if (mapper->dir == MPIR_COMM_MAP_DIR_L2L) { + if (mapper->dir == MPIR_COMM_MAP_DIR__L2L) { if (src_comm->comm_kind == MPIR_COMM_KIND__INTRACOMM && comm->comm_kind == MPIR_COMM_KIND__INTRACOMM) { dup_vcrt(src_comm->dev.vcrt, &comm->dev.vcrt, mapper, mapper->src_comm->local_size, vcrt_size, vcrt_offset); @@ -243,7 +243,7 @@ int MPIDI_CH3I_Comm_create_hook(MPIR_Comm *comm) dup_vcrt(src_comm->dev.local_vcrt, &comm->dev.local_vcrt, mapper, mapper->src_comm->local_size, vcrt_size, vcrt_offset); } - else { /* mapper->dir == MPIR_COMM_MAP_DIR_R2L */ + else { /* mapper->dir == MPIR_COMM_MAP_DIR__R2L */ MPIU_Assert(src_comm->comm_kind == MPIR_COMM_KIND__INTERCOMM); if (comm->comm_kind == MPIR_COMM_KIND__INTRACOMM) { dup_vcrt(src_comm->dev.vcrt, &comm->dev.vcrt, mapper, mapper->src_comm->remote_size, @@ -260,8 +260,8 @@ int MPIDI_CH3I_Comm_create_hook(MPIR_Comm *comm) * of the comm (only valid for intercomms) */ vcrt_size = 0; MPL_LL_FOREACH(comm->mapper_head, mapper) { - if (mapper->dir == MPIR_COMM_MAP_DIR_L2L || - mapper->dir == MPIR_COMM_MAP_DIR_R2L) + if (mapper->dir == MPIR_COMM_MAP_DIR__L2L || + mapper->dir == MPIR_COMM_MAP_DIR__R2L) continue; vcrt_size += map_size(*mapper); @@ -270,13 +270,13 @@ int MPIDI_CH3I_Comm_create_hook(MPIR_Comm *comm) MPL_LL_FOREACH(comm->mapper_head, mapper) { src_comm = mapper->src_comm; - if (mapper->dir == MPIR_COMM_MAP_DIR_L2L || - mapper->dir == MPIR_COMM_MAP_DIR_R2L) + if (mapper->dir == MPIR_COMM_MAP_DIR__L2L || + mapper->dir == MPIR_COMM_MAP_DIR__R2L) continue; MPIU_Assert(comm->comm_kind == MPIR_COMM_KIND__INTERCOMM); - if (mapper->dir == MPIR_COMM_MAP_DIR_L2R) { + if (mapper->dir == MPIR_COMM_MAP_DIR__L2R) { if (src_comm->comm_kind == MPIR_COMM_KIND__INTRACOMM) dup_vcrt(src_comm->dev.vcrt, &comm->dev.vcrt, mapper, mapper->src_comm->local_size, vcrt_size, vcrt_offset); @@ -284,7 +284,7 @@ int MPIDI_CH3I_Comm_create_hook(MPIR_Comm *comm) dup_vcrt(src_comm->dev.local_vcrt, &comm->dev.vcrt, mapper, mapper->src_comm->local_size, vcrt_size, vcrt_offset); } - else { /* mapper->dir == MPIR_COMM_MAP_DIR_R2R */ + else { /* mapper->dir == MPIR_COMM_MAP_DIR__R2R */ MPIU_Assert(src_comm->comm_kind == MPIR_COMM_KIND__INTERCOMM); dup_vcrt(src_comm->dev.vcrt, &comm->dev.vcrt, mapper, mapper->src_comm->remote_size, vcrt_size, vcrt_offset); http://git.mpich.org/mpich.git/commitdiff/601e7efa64e7fd38ef09c77c7d5cfdead… commit 601e7efa64e7fd38ef09c77c7d5cfdeadb7fefa1 Author: Pavan Balaji <balaji(a)anl.gov> Date: Wed Apr 20 20:44:54 2016 -0500 Namespace MPIR_Comm_map_type_t elements. Signed-off-by: Wesley Bland <wesley.bland(a)intel.com> diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index 95ae9b4..8956998 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -1109,8 +1109,8 @@ typedef enum MPIR_Comm_hierarchy_kind_t { /* Communicators */ typedef enum { - MPIR_COMM_MAP_DUP, - MPIR_COMM_MAP_IRREGULAR + MPIR_COMM_MAP_TYPE__DUP, + MPIR_COMM_MAP_TYPE__IRREGULAR } MPIR_Comm_map_type_t; /* direction of mapping: local to local, local to remote, remote to diff --git a/src/mpi/comm/commutil.c b/src/mpi/comm/commutil.c index 9a27d06..1d1992c 100644 --- a/src/mpi/comm/commutil.c +++ b/src/mpi/comm/commutil.c @@ -415,13 +415,13 @@ int MPIR_Comm_map_irregular(MPIR_Comm * newcomm, MPIR_Comm * src_comm, int mpi_errno = MPI_SUCCESS; MPIR_Comm_map_t *mapper; MPIU_CHKPMEM_DECL(3); - MPID_MPI_STATE_DECL(MPID_STATE_MPIR_COMM_MAP_IRREGULAR); + MPID_MPI_STATE_DECL(MPID_STATE_MPIR_COMM_MAP_TYPE__IRREGULAR); - MPID_MPI_FUNC_ENTER(MPID_STATE_MPIR_COMM_MAP_IRREGULAR); + MPID_MPI_FUNC_ENTER(MPID_STATE_MPIR_COMM_MAP_TYPE__IRREGULAR); MPIU_CHKPMEM_MALLOC(mapper, MPIR_Comm_map_t *, sizeof(MPIR_Comm_map_t), mpi_errno, "mapper"); - mapper->type = MPIR_COMM_MAP_IRREGULAR; + mapper->type = MPIR_COMM_MAP_TYPE__IRREGULAR; mapper->src_comm = src_comm; mapper->dir = dir; mapper->src_mapping_size = src_mapping_size; @@ -445,7 +445,7 @@ int MPIR_Comm_map_irregular(MPIR_Comm * newcomm, MPIR_Comm * src_comm, fn_exit: MPIU_CHKPMEM_COMMIT(); - MPID_MPI_FUNC_EXIT(MPID_STATE_MPIR_COMM_MAP_IRREGULAR); + MPID_MPI_FUNC_EXIT(MPID_STATE_MPIR_COMM_MAP_TYPE__IRREGULAR); return mpi_errno; fn_fail: MPIU_CHKPMEM_REAP(); @@ -461,13 +461,13 @@ int MPIR_Comm_map_dup(MPIR_Comm * newcomm, MPIR_Comm * src_comm, MPIR_Comm_map_d int mpi_errno = MPI_SUCCESS; MPIR_Comm_map_t *mapper; MPIU_CHKPMEM_DECL(1); - MPID_MPI_STATE_DECL(MPID_STATE_MPIR_COMM_MAP_DUP); + MPID_MPI_STATE_DECL(MPID_STATE_MPIR_COMM_MAP_TYPE__DUP); - MPID_MPI_FUNC_ENTER(MPID_STATE_MPIR_COMM_MAP_DUP); + MPID_MPI_FUNC_ENTER(MPID_STATE_MPIR_COMM_MAP_TYPE__DUP); MPIU_CHKPMEM_MALLOC(mapper, MPIR_Comm_map_t *, sizeof(MPIR_Comm_map_t), mpi_errno, "mapper"); - mapper->type = MPIR_COMM_MAP_DUP; + mapper->type = MPIR_COMM_MAP_TYPE__DUP; mapper->src_comm = src_comm; mapper->dir = dir; @@ -477,7 +477,7 @@ int MPIR_Comm_map_dup(MPIR_Comm * newcomm, MPIR_Comm * src_comm, MPIR_Comm_map_d fn_exit: MPIU_CHKPMEM_COMMIT(); - MPID_MPI_FUNC_EXIT(MPID_STATE_MPIR_COMM_MAP_DUP); + MPID_MPI_FUNC_EXIT(MPID_STATE_MPIR_COMM_MAP_TYPE__DUP); return mpi_errno; fn_fail: MPIU_CHKPMEM_REAP(); @@ -499,7 +499,7 @@ int MPIR_Comm_map_free(MPIR_Comm * comm) for (mapper = comm->mapper_head; mapper;) { tmp = mapper->next; - if (mapper->type == MPIR_COMM_MAP_IRREGULAR && mapper->free_mapping) + if (mapper->type == MPIR_COMM_MAP_TYPE__IRREGULAR && mapper->free_mapping) MPL_free(mapper->src_mapping); MPL_free(mapper); mapper = tmp; diff --git a/src/mpid/ch3/src/ch3u_comm.c b/src/mpid/ch3/src/ch3u_comm.c index fa49813..ce1a546 100644 --- a/src/mpid/ch3/src/ch3u_comm.c +++ b/src/mpid/ch3/src/ch3u_comm.c @@ -127,12 +127,12 @@ static void dup_vcrt(struct MPIDI_VCRT *src_vcrt, struct MPIDI_VCRT **dest_vcrt, /* try to find the simple case where the new comm is a simple * duplicate of the previous comm. in that case, we simply add a * reference to the previous VCRT instead of recreating it. */ - if (mapper->type == MPIR_COMM_MAP_DUP && src_comm_size == vcrt_size) { + if (mapper->type == MPIR_COMM_MAP_TYPE__DUP && src_comm_size == vcrt_size) { *dest_vcrt = src_vcrt; MPIDI_VCRT_Add_ref(src_vcrt); return; } - else if (mapper->type == MPIR_COMM_MAP_IRREGULAR && + else if (mapper->type == MPIR_COMM_MAP_TYPE__IRREGULAR && mapper->src_mapping_size == vcrt_size) { /* if the mapping array is exactly the same as the original * comm's VC list, there is no need to create a new VCRT. @@ -156,7 +156,7 @@ static void dup_vcrt(struct MPIDI_VCRT *src_vcrt, struct MPIDI_VCRT **dest_vcrt, if (!vcrt_offset) MPIDI_VCRT_Create(vcrt_size, dest_vcrt); - if (mapper->type == MPIR_COMM_MAP_DUP) { + if (mapper->type == MPIR_COMM_MAP_TYPE__DUP) { for (i = 0; i < src_comm_size; i++) MPIDI_VCR_Dup(src_vcrt->vcr_table[i], &((*dest_vcrt)->vcr_table[i + vcrt_offset])); @@ -170,7 +170,7 @@ static void dup_vcrt(struct MPIDI_VCRT *src_vcrt, struct MPIDI_VCRT **dest_vcrt, static inline int map_size(MPIR_Comm_map_t map) { - if (map.type == MPIR_COMM_MAP_IRREGULAR) + if (map.type == MPIR_COMM_MAP_TYPE__IRREGULAR) return map.src_mapping_size; else if (map.dir == MPIR_COMM_MAP_DIR_L2L || map.dir == MPIR_COMM_MAP_DIR_L2R) return map.src_comm->local_size; http://git.mpich.org/mpich.git/commitdiff/845aafae660ddfa82a135ce5ac0a9b137… commit 845aafae660ddfa82a135ce5ac0a9b1377c103e9 Author: Pavan Balaji <balaji(a)anl.gov> Date: Wed Apr 20 20:44:09 2016 -0500 Namespace MPIR_Comm_hierarchy_kind_t elements. Signed-off-by: Wesley Bland <wesley.bland(a)intel.com> diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index 4fc3b78..95ae9b4 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -1100,11 +1100,11 @@ typedef enum MPIR_Comm_kind_t { /* ideally we could add these to MPIR_Comm_kind_t, but there's too much existing * code that assumes that the only valid values are INTRACOMM or INTERCOMM */ typedef enum MPIR_Comm_hierarchy_kind_t { - MPIR_HIERARCHY_FLAT = 0, /* no hierarchy */ - MPIR_HIERARCHY_PARENT = 1, /* has subcommunicators */ - MPIR_HIERARCHY_NODE_ROOTS = 2, /* is the subcomm for node roots */ - MPIR_HIERARCHY_NODE = 3, /* is the subcomm for a node */ - MPIR_HIERARCHY_SIZE /* cardinality of this enum */ + MPIR_COMM_HIERARCHY_KIND__FLAT = 0, /* no hierarchy */ + MPIR_COMM_HIERARCHY_KIND__PARENT = 1, /* has subcommunicators */ + MPIR_COMM_HIERARCHY_KIND__NODE_ROOTS = 2, /* is the subcomm for node roots */ + MPIR_COMM_HIERARCHY_KIND__NODE = 3, /* is the subcomm for a node */ + MPIR_COMM_HIERARCHY_KIND__SIZE /* cardinality of this enum */ } MPIR_Comm_hierarchy_kind_t; /* Communicators */ diff --git a/src/mpi/comm/commutil.c b/src/mpi/comm/commutil.c index fedb4ae..9a27d06 100644 --- a/src/mpi/comm/commutil.c +++ b/src/mpi/comm/commutil.c @@ -90,7 +90,7 @@ int MPIR_Comm_init(MPIR_Comm * comm_p) comm_p->name[0] = '\0'; comm_p->info = NULL; - comm_p->hierarchy_kind = MPIR_HIERARCHY_FLAT; + comm_p->hierarchy_kind = MPIR_COMM_HIERARCHY_KIND__FLAT; comm_p->node_comm = NULL; comm_p->node_roots_comm = NULL; comm_p->intranode_table = NULL; @@ -213,7 +213,7 @@ int MPIR_Setup_intercomm_localcomm(MPIR_Comm * intercomm_ptr) /* holds default collop "vtables" for _intracomms_, where * default[hierarchy_kind] is the pointer to the collop struct for that * hierarchy kind */ -static struct MPIR_Collops *default_collops[MPIR_HIERARCHY_SIZE] = { NULL }; +static struct MPIR_Collops *default_collops[MPIR_COMM_HIERARCHY_KIND__SIZE] = { NULL }; /* default for intercomms */ static struct MPIR_Collops *ic_default_collops = NULL; @@ -225,7 +225,7 @@ static struct MPIR_Collops *ic_default_collops = NULL; static int cleanup_default_collops(void *unused) { int i; - for (i = 0; i < MPIR_HIERARCHY_SIZE; ++i) { + for (i = 0; i < MPIR_COMM_HIERARCHY_KIND__SIZE; ++i) { if (default_collops[i]) { MPIU_Assert(default_collops[i]->ref_count >= 1); if (--default_collops[i]->ref_count == 0) @@ -250,10 +250,10 @@ static int init_default_collops(void) int mpi_errno = MPI_SUCCESS; int i; struct MPIR_Collops *ops = NULL; - MPIU_CHKPMEM_DECL(MPIR_HIERARCHY_SIZE + 1); + MPIU_CHKPMEM_DECL(MPIR_COMM_HIERARCHY_KIND__SIZE + 1); /* first initialize the intracomms */ - for (i = 0; i < MPIR_HIERARCHY_SIZE; ++i) { + for (i = 0; i < MPIR_COMM_HIERARCHY_KIND__SIZE; ++i) { MPIU_CHKPMEM_CALLOC(ops, struct MPIR_Collops *, sizeof(struct MPIR_Collops), mpi_errno, "default intracomm collops"); ops->ref_count = 1; /* force existence until finalize time */ @@ -289,17 +289,17 @@ static int init_default_collops(void) /* override defaults, such as for SMP */ switch (i) { - case MPIR_HIERARCHY_FLAT: + case MPIR_COMM_HIERARCHY_KIND__FLAT: break; - case MPIR_HIERARCHY_PARENT: + case MPIR_COMM_HIERARCHY_KIND__PARENT: ops->Ibcast_sched = &MPIR_Ibcast_SMP; ops->Iscan_sched = &MPIR_Iscan_SMP; ops->Iallreduce_sched = &MPIR_Iallreduce_SMP; ops->Ireduce_sched = &MPIR_Ireduce_SMP; break; - case MPIR_HIERARCHY_NODE: + case MPIR_COMM_HIERARCHY_KIND__NODE: break; - case MPIR_HIERARCHY_NODE_ROOTS: + case MPIR_COMM_HIERARCHY_KIND__NODE_ROOTS: break; /* --BEGIN ERROR HANDLING-- */ @@ -596,7 +596,7 @@ int MPIR_Comm_commit(MPIR_Comm * comm) comm->node_comm->recvcontext_id = comm->node_comm->context_id; comm->node_comm->rank = local_rank; comm->node_comm->comm_kind = MPIR_COMM_KIND__INTRACOMM; - comm->node_comm->hierarchy_kind = MPIR_HIERARCHY_NODE; + comm->node_comm->hierarchy_kind = MPIR_COMM_HIERARCHY_KIND__NODE; comm->node_comm->local_comm = NULL; MPL_DBG_MSG_D(MPIR_DBG_COMM, VERBOSE, "Create node_comm=%p\n", comm->node_comm); @@ -630,7 +630,7 @@ int MPIR_Comm_commit(MPIR_Comm * comm) comm->node_roots_comm->recvcontext_id = comm->node_roots_comm->context_id; comm->node_roots_comm->rank = external_rank; comm->node_roots_comm->comm_kind = MPIR_COMM_KIND__INTRACOMM; - comm->node_roots_comm->hierarchy_kind = MPIR_HIERARCHY_NODE_ROOTS; + comm->node_roots_comm->hierarchy_kind = MPIR_COMM_HIERARCHY_KIND__NODE_ROOTS; comm->node_roots_comm->local_comm = NULL; comm->node_roots_comm->local_size = num_external; @@ -652,7 +652,7 @@ int MPIR_Comm_commit(MPIR_Comm * comm) MPIR_Comm_map_free(comm->node_roots_comm); } - comm->hierarchy_kind = MPIR_HIERARCHY_PARENT; + comm->hierarchy_kind = MPIR_COMM_HIERARCHY_KIND__PARENT; } fn_exit: @@ -672,7 +672,7 @@ int MPIR_Comm_commit(MPIR_Comm * comm) collective communication, for example. */ int MPIR_Comm_is_node_aware(MPIR_Comm * comm) { - return (comm->hierarchy_kind == MPIR_HIERARCHY_PARENT); + return (comm->hierarchy_kind == MPIR_COMM_HIERARCHY_KIND__PARENT); } /* Returns true if the communicator is node-aware and processes in all the nodes diff --git a/src/mpid/ch3/channels/nemesis/src/ch3i_comm.c b/src/mpid/ch3/channels/nemesis/src/ch3i_comm.c index 1bfef18..4b65b33 100644 --- a/src/mpid/ch3/channels/nemesis/src/ch3i_comm.c +++ b/src/mpid/ch3/channels/nemesis/src/ch3i_comm.c @@ -33,7 +33,7 @@ int MPIDI_CH3I_comm_create(MPIR_Comm *comm, void *param) #endif /* set up intranode barrier iff this is an intranode communicator */ - if (comm->hierarchy_kind == MPIR_HIERARCHY_NODE) { + if (comm->hierarchy_kind == MPIR_COMM_HIERARCHY_KIND__NODE) { MPIR_Collops *cf, **cf_p; comm->dev.ch.barrier_vars = NULL; @@ -96,7 +96,7 @@ int MPIDI_CH3I_comm_destroy(MPIR_Comm *comm, void *param) goto fn_exit; #endif - if (comm->hierarchy_kind == MPIR_HIERARCHY_NODE) { + if (comm->hierarchy_kind == MPIR_COMM_HIERARCHY_KIND__NODE) { MPIR_Collops *cf = comm->coll_fns; /* replace previous coll_fns table */ @@ -168,7 +168,7 @@ static int barrier(MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) int prev; int sense; - MPIU_Assert(comm_ptr->hierarchy_kind == MPIR_HIERARCHY_NODE); + MPIU_Assert(comm_ptr->hierarchy_kind == MPIR_COMM_HIERARCHY_KIND__NODE); /* Trivial barriers return immediately */ if (comm_ptr->local_size == 1) http://git.mpich.org/mpich.git/commitdiff/de6110fb16445529264f4bb456a235df6… commit de6110fb16445529264f4bb456a235df67c52464 Author: Pavan Balaji <balaji(a)anl.gov> Date: Wed Apr 20 20:42:57 2016 -0500 Namespace MPIR_Comm_kind_t elements. Signed-off-by: Wesley Bland <wesley.bland(a)intel.com> diff --git a/src/include/mpierrs.h b/src/include/mpierrs.h index 88751a2..2dee4a8 100644 --- a/src/include/mpierrs.h +++ b/src/include/mpierrs.h @@ -206,7 +206,7 @@ cvars: } #define MPIR_ERRTEST_COMM_INTRA(comm_ptr, err ) \ - if ((comm_ptr)->comm_kind != MPIR_INTRACOMM) { \ + if ((comm_ptr)->comm_kind != MPIR_COMM_KIND__INTRACOMM) { \ err = MPIR_Err_create_code(MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, \ MPI_ERR_COMM,"**commnotintra",0); \ goto fn_fail; \ diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index 55de079..4fc3b78 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -1093,8 +1093,8 @@ void MPIR_Group_setup_lpid_list( MPIR_Group * ); MPIR_Comm_kind_t - Name the two types of communicators E*/ typedef enum MPIR_Comm_kind_t { - MPIR_INTRACOMM = 0, - MPIR_INTERCOMM = 1 + MPIR_COMM_KIND__INTRACOMM = 0, + MPIR_COMM_KIND__INTERCOMM = 1 } MPIR_Comm_kind_t; /* ideally we could add these to MPIR_Comm_kind_t, but there's too much existing @@ -1220,7 +1220,7 @@ typedef struct MPIR_Comm { MPIR_Group *local_group, /* Groups in communicator. */ *remote_group; /* The local and remote groups are the same for intra communicators */ - MPIR_Comm_kind_t comm_kind; /* MPIR_INTRACOMM or MPIR_INTERCOMM */ + MPIR_Comm_kind_t comm_kind; /* MPIR_COMM_KIND__INTRACOMM or MPIR_COMM_KIND__INTERCOMM */ char name[MPI_MAX_OBJECT_NAME]; /* Required for MPI-2 */ MPIR_Errhandler *errhandler; /* Pointer to the error handler structure */ struct MPIR_Comm *local_comm; /* Defined only for intercomms, holds diff --git a/src/mpi/coll/allgather.c b/src/mpi/coll/allgather.c index ecff424..dac7dda 100644 --- a/src/mpi/coll/allgather.c +++ b/src/mpi/coll/allgather.c @@ -791,7 +791,7 @@ int MPIR_Allgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, { int mpi_errno = MPI_SUCCESS; - if (comm_ptr->comm_kind == MPIR_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) { /* intracommunicator */ mpi_errno = MPIR_Allgather_intra(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, @@ -934,7 +934,7 @@ int MPI_Allgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; - if (comm_ptr->comm_kind == MPIR_INTERCOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM) { MPIR_ERRTEST_SENDBUF_INPLACE(sendbuf, sendcount, mpi_errno); } else { /* catch common aliasing cases */ diff --git a/src/mpi/coll/allgatherv.c b/src/mpi/coll/allgatherv.c index 02db271..c3767c3 100644 --- a/src/mpi/coll/allgatherv.c +++ b/src/mpi/coll/allgatherv.c @@ -896,7 +896,7 @@ int MPIR_Allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, { int mpi_errno = MPI_SUCCESS; - if (comm_ptr->comm_kind == MPIR_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) { /* intracommunicator */ mpi_errno = MPIR_Allgatherv_intra(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, @@ -1046,7 +1046,7 @@ int MPI_Allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; - if (comm_ptr->comm_kind == MPIR_INTERCOMM) + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM) MPIR_ERRTEST_SENDBUF_INPLACE(sendbuf, sendcount, mpi_errno); if (sendbuf != MPI_IN_PLACE) { MPIR_ERRTEST_COUNT(sendcount, mpi_errno); @@ -1061,7 +1061,7 @@ int MPI_Allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPIR_ERRTEST_USERBUFFER(sendbuf,sendcount,sendtype,mpi_errno); /* catch common aliasing cases */ - if (comm_ptr->comm_kind == MPIR_INTRACOMM && + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM && sendtype == recvtype && recvcounts[comm_ptr->rank] != 0 && sendcount != 0) { @@ -1071,7 +1071,7 @@ int MPI_Allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, } } - if (comm_ptr->comm_kind == MPIR_INTRACOMM) + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) comm_size = comm_ptr->local_size; else comm_size = comm_ptr->remote_size; diff --git a/src/mpi/coll/allred_group.c b/src/mpi/coll/allred_group.c index 1c37ac9..cb4a29a 100644 --- a/src/mpi/coll/allred_group.c +++ b/src/mpi/coll/allred_group.c @@ -370,7 +370,7 @@ int MPIR_Allreduce_group(void *sendbuf, void *recvbuf, int count, { int mpi_errno = MPI_SUCCESS; - MPIR_ERR_CHKANDJUMP(comm_ptr->comm_kind != MPIR_INTRACOMM, mpi_errno, MPI_ERR_OTHER, "**commnotintra"); + MPIR_ERR_CHKANDJUMP(comm_ptr->comm_kind != MPIR_COMM_KIND__INTRACOMM, mpi_errno, MPI_ERR_OTHER, "**commnotintra"); mpi_errno = MPIR_Allreduce_group_intra(sendbuf, recvbuf, count, datatype, op, comm_ptr, group_ptr, tag, errflag); diff --git a/src/mpi/coll/allreduce.c b/src/mpi/coll/allreduce.c index caddf6b..423a14c 100644 --- a/src/mpi/coll/allreduce.c +++ b/src/mpi/coll/allreduce.c @@ -718,7 +718,7 @@ int MPIR_Allreduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype d { int mpi_errno = MPI_SUCCESS; - if (comm_ptr->comm_kind == MPIR_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) { /* intracommunicator */ mpi_errno = MPIR_Allreduce_intra(sendbuf, recvbuf, count, datatype, op, comm_ptr, errflag); if (mpi_errno) MPIR_ERR_POP(mpi_errno); @@ -758,7 +758,7 @@ int MPIR_Allreduce_impl(const void *sendbuf, void *recvbuf, int count, MPI_Datat } else { - if (comm_ptr->comm_kind == MPIR_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) { /* intracommunicator */ mpi_errno = MPIR_Allreduce_intra(sendbuf, recvbuf, count, datatype, op, comm_ptr, errflag); if (mpi_errno) MPIR_ERR_POP(mpi_errno); @@ -860,7 +860,7 @@ int MPI_Allreduce(const void *sendbuf, void *recvbuf, int count, if (mpi_errno != MPI_SUCCESS) goto fn_fail; } - if (comm_ptr->comm_kind == MPIR_INTERCOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM) { MPIR_ERRTEST_SENDBUF_INPLACE(sendbuf, count, mpi_errno); } else { if (count != 0 && sendbuf != MPI_IN_PLACE) diff --git a/src/mpi/coll/alltoall.c b/src/mpi/coll/alltoall.c index 60edb28..d3a8381 100644 --- a/src/mpi/coll/alltoall.c +++ b/src/mpi/coll/alltoall.c @@ -559,7 +559,7 @@ int MPIR_Alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, { int mpi_errno = MPI_SUCCESS; - if (comm_ptr->comm_kind == MPIR_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) { /* intracommunicator */ mpi_errno = MPIR_Alltoall_intra(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, @@ -688,7 +688,7 @@ int MPI_Alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, if (mpi_errno != MPI_SUCCESS) goto fn_fail; } - if (comm_ptr->comm_kind == MPIR_INTRACOMM && + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM && sendbuf != MPI_IN_PLACE && sendcount == recvcount && sendtype == recvtype && @@ -706,7 +706,7 @@ int MPI_Alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, if (mpi_errno != MPI_SUCCESS) goto fn_fail; } - if (comm_ptr->comm_kind == MPIR_INTERCOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM) { MPIR_ERRTEST_SENDBUF_INPLACE(sendbuf, sendcount, mpi_errno); } MPIR_ERRTEST_RECVBUF_INPLACE(recvbuf, recvcount, mpi_errno); diff --git a/src/mpi/coll/alltoallv.c b/src/mpi/coll/alltoallv.c index 19d5942..8fd3692 100644 --- a/src/mpi/coll/alltoallv.c +++ b/src/mpi/coll/alltoallv.c @@ -334,7 +334,7 @@ int MPIR_Alltoallv(const void *sendbuf, const int *sendcounts, const int *sdispl { int mpi_errno = MPI_SUCCESS; - if (comm_ptr->comm_kind == MPIR_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) { /* intracommunicator */ mpi_errno = MPIR_Alltoallv_intra(sendbuf, sendcounts, sdispls, sendtype, recvbuf, recvcounts, @@ -465,12 +465,12 @@ int MPI_Alltoallv(const void *sendbuf, const int *sendcounts, { MPIR_Datatype *sendtype_ptr=NULL, *recvtype_ptr=NULL; int i, comm_size; - int check_send = (comm_ptr->comm_kind == MPIR_INTRACOMM && sendbuf != MPI_IN_PLACE); + int check_send = (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM && sendbuf != MPI_IN_PLACE); MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; - if (comm_ptr->comm_kind == MPIR_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) { comm_size = comm_ptr->local_size; if (sendbuf != MPI_IN_PLACE && sendtype == recvtype && sendcounts == recvcounts) @@ -478,7 +478,7 @@ int MPI_Alltoallv(const void *sendbuf, const int *sendcounts, } else comm_size = comm_ptr->remote_size; - if (comm_ptr->comm_kind == MPIR_INTERCOMM && sendbuf == MPI_IN_PLACE) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM && sendbuf == MPI_IN_PLACE) { MPIR_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**sendbuf_inplace"); } diff --git a/src/mpi/coll/alltoallw.c b/src/mpi/coll/alltoallw.c index 68216ff..08818b7 100644 --- a/src/mpi/coll/alltoallw.c +++ b/src/mpi/coll/alltoallw.c @@ -329,7 +329,7 @@ int MPIR_Alltoallw(const void *sendbuf, const int sendcounts[], const int sdispl { int mpi_errno = MPI_SUCCESS; - if (comm_ptr->comm_kind == MPIR_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) { /* intracommunicator */ mpi_errno = MPIR_Alltoallw_intra(sendbuf, sendcounts, sdispls, sendtypes, recvbuf, recvcounts, @@ -465,13 +465,13 @@ int MPI_Alltoallw(const void *sendbuf, const int sendcounts[], MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; - check_send = (comm_ptr->comm_kind == MPIR_INTRACOMM && sendbuf != MPI_IN_PLACE); + check_send = (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM && sendbuf != MPI_IN_PLACE); - if (comm_ptr->comm_kind == MPIR_INTERCOMM && sendbuf == MPI_IN_PLACE) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM && sendbuf == MPI_IN_PLACE) { MPIR_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**sendbuf_inplace"); } - if (comm_ptr->comm_kind == MPIR_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) { comm_size = comm_ptr->local_size; if (sendbuf != MPI_IN_PLACE && sendcounts == recvcounts && sendtypes == recvtypes) diff --git a/src/mpi/coll/barrier.c b/src/mpi/coll/barrier.c index 8785e3f..88499c8 100644 --- a/src/mpi/coll/barrier.c +++ b/src/mpi/coll/barrier.c @@ -285,7 +285,7 @@ int MPIR_Barrier(MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; - if (comm_ptr->comm_kind == MPIR_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) { /* intracommunicator */ mpi_errno = MPIR_Barrier_intra( comm_ptr, errflag ); if (mpi_errno) MPIR_ERR_POP(mpi_errno); diff --git a/src/mpi/coll/bcast.c b/src/mpi/coll/bcast.c index 43bcf59..547f8ea 100644 --- a/src/mpi/coll/bcast.c +++ b/src/mpi/coll/bcast.c @@ -1470,7 +1470,7 @@ inline int MPIR_Bcast(void *buffer, int count, MPI_Datatype datatype, int root, { int mpi_errno = MPI_SUCCESS; - if (comm_ptr->comm_kind == MPIR_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) { /* intracommunicator */ mpi_errno = MPIR_Bcast_intra( buffer, count, datatype, root, comm_ptr, errflag ); if (mpi_errno) MPIR_ERR_POP(mpi_errno); @@ -1558,7 +1558,7 @@ int MPI_Bcast( void *buffer, int count, MPI_Datatype datatype, int root, if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPIR_ERRTEST_COUNT(count, mpi_errno); MPIR_ERRTEST_DATATYPE(datatype, "datatype", mpi_errno); - if (comm_ptr->comm_kind == MPIR_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) { MPIR_ERRTEST_INTRA_ROOT(comm_ptr, root, mpi_errno); } else { diff --git a/src/mpi/coll/gather.c b/src/mpi/coll/gather.c index 870099c..8c35426 100644 --- a/src/mpi/coll/gather.c +++ b/src/mpi/coll/gather.c @@ -678,7 +678,7 @@ int MPIR_Gather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, { int mpi_errno = MPI_SUCCESS; - if (comm_ptr->comm_kind == MPIR_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) { /* intracommunicator */ mpi_errno = MPIR_Gather_intra(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, @@ -807,7 +807,7 @@ int MPI_Gather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; - if (comm_ptr->comm_kind == MPIR_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) { MPIR_ERRTEST_INTRA_ROOT(comm_ptr, root, mpi_errno); if (sendbuf != MPI_IN_PLACE) { @@ -848,7 +848,7 @@ int MPI_Gather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPIR_ERRTEST_SENDBUF_INPLACE(sendbuf, sendcount, mpi_errno); } - if (comm_ptr->comm_kind == MPIR_INTERCOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM) { MPIR_ERRTEST_INTER_ROOT(comm_ptr, root, mpi_errno); if (root == MPI_ROOT) { diff --git a/src/mpi/coll/gatherv.c b/src/mpi/coll/gatherv.c index 1f481c1..a09f360 100644 --- a/src/mpi/coll/gatherv.c +++ b/src/mpi/coll/gatherv.c @@ -101,9 +101,9 @@ int MPIR_Gatherv ( MPIDU_ERR_CHECK_MULTIPLE_THREADS_ENTER( comm_ptr ); /* If rank == root, then I recv lots, otherwise I send */ - if (((comm_ptr->comm_kind == MPIR_INTRACOMM) && (root == rank)) || - ((comm_ptr->comm_kind == MPIR_INTERCOMM) && (root == MPI_ROOT))) { - if (comm_ptr->comm_kind == MPIR_INTRACOMM) + if (((comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) && (root == rank)) || + ((comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM) && (root == MPI_ROOT))) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) comm_size = comm_ptr->local_size; else comm_size = comm_ptr->remote_size; @@ -119,7 +119,7 @@ int MPIR_Gatherv ( reqs = 0; for (i = 0; i < comm_size; i++) { if (recvcounts[i]) { - if ((comm_ptr->comm_kind == MPIR_INTRACOMM) && (i == rank)) { + if ((comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) && (i == rank)) { if (sendbuf != MPI_IN_PLACE) { mpi_errno = MPIR_Localcopy(sendbuf, sendcount, sendtype, ((char *)recvbuf+displs[rank]*extent), @@ -320,7 +320,7 @@ int MPI_Gatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; - if (comm_ptr->comm_kind == MPIR_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) { MPIR_ERRTEST_INTRA_ROOT(comm_ptr, root, mpi_errno); if (sendbuf != MPI_IN_PLACE) { @@ -370,7 +370,7 @@ int MPI_Gatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPIR_ERRTEST_SENDBUF_INPLACE(sendbuf, sendcount, mpi_errno); } - if (comm_ptr->comm_kind == MPIR_INTERCOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM) { MPIR_ERRTEST_INTER_ROOT(comm_ptr, root, mpi_errno); if (root == MPI_ROOT) { diff --git a/src/mpi/coll/helper_fns.c b/src/mpi/coll/helper_fns.c index 53193a8..c5b2729 100644 --- a/src/mpi/coll/helper_fns.c +++ b/src/mpi/coll/helper_fns.c @@ -30,7 +30,7 @@ int MPIC_Probe(int source, int tag, MPI_Comm comm, MPI_Status *status) MPIR_Comm_get_ptr( comm, comm_ptr ); - context_id = (comm_ptr->comm_kind == MPIR_INTRACOMM) ? + context_id = (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) ? MPIR_CONTEXT_INTRA_COLL : MPIR_CONTEXT_INTER_COLL; mpi_errno = MPID_Probe(source, tag, comm_ptr, context_id, status); @@ -292,7 +292,7 @@ int MPIC_Send(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, MPIR_TAG_SET_ERROR_BIT(tag); } - context_id = (comm_ptr->comm_kind == MPIR_INTRACOMM) ? + context_id = (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) ? MPIR_CONTEXT_INTRA_COLL : MPIR_CONTEXT_INTER_COLL; mpi_errno = MPID_Send(buf, count, datatype, dest, tag, comm_ptr, @@ -342,7 +342,7 @@ int MPIC_Recv(void *buf, MPI_Aint count, MPI_Datatype datatype, int source, int MPIR_ERR_CHKANDJUMP1((count < 0), mpi_errno, MPI_ERR_COUNT, "**countneg", "**countneg %d", count); - context_id = (comm_ptr->comm_kind == MPIR_INTRACOMM) ? + context_id = (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) ? MPIR_CONTEXT_INTRA_COLL : MPIR_CONTEXT_INTER_COLL; if (status == MPI_STATUS_IGNORE) @@ -399,7 +399,7 @@ int MPIC_Ssend(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, MPIR_ERR_CHKANDJUMP1((count < 0), mpi_errno, MPI_ERR_COUNT, "**countneg", "**countneg %d", count); - context_id = (comm_ptr->comm_kind == MPIR_INTRACOMM) ? + context_id = (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) ? MPIR_CONTEXT_INTRA_COLL : MPIR_CONTEXT_INTER_COLL; switch(*errflag) { @@ -462,7 +462,7 @@ int MPIC_Sendrecv(const void *sendbuf, MPI_Aint sendcount, MPI_Datatype sendtype MPIR_ERR_CHKANDJUMP1((recvcount < 0), mpi_errno, MPI_ERR_COUNT, "**countneg", "**countneg %d", recvcount); - context_id = (comm_ptr->comm_kind == MPIR_INTRACOMM) ? + context_id = (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) ? MPIR_CONTEXT_INTRA_COLL : MPIR_CONTEXT_INTER_COLL; if (status == MPI_STATUS_IGNORE) status = &mystatus; @@ -557,7 +557,7 @@ int MPIC_Sendrecv_replace(void *buf, int count, MPI_Datatype datatype, MPIR_TAG_SET_ERROR_BIT(sendtag); } - context_id_offset = (comm_ptr->comm_kind == MPIR_INTRACOMM) ? + context_id_offset = (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) ? MPIR_CONTEXT_INTRA_COLL : MPIR_CONTEXT_INTER_COLL; if (count > 0 && dest != MPI_PROC_NULL) { @@ -641,7 +641,7 @@ int MPIC_Isend(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, MPIR_TAG_SET_ERROR_BIT(tag); } - context_id = (comm_ptr->comm_kind == MPIR_INTRACOMM) ? + context_id = (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) ? MPIR_CONTEXT_INTRA_COLL : MPIR_CONTEXT_INTER_COLL; mpi_errno = MPID_Isend(buf, count, datatype, dest, tag, comm_ptr, @@ -682,7 +682,7 @@ int MPIC_Issend(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest MPIR_TAG_SET_ERROR_BIT(tag); } - context_id = (comm_ptr->comm_kind == MPIR_INTRACOMM) ? + context_id = (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) ? MPIR_CONTEXT_INTRA_COLL : MPIR_CONTEXT_INTER_COLL; mpi_errno = MPID_Issend(buf, count, datatype, dest, tag, comm_ptr, @@ -712,7 +712,7 @@ int MPIC_Irecv(void *buf, MPI_Aint count, MPI_Datatype datatype, int source, MPIR_ERR_CHKANDJUMP1((count < 0), mpi_errno, MPI_ERR_COUNT, "**countneg", "**countneg %d", count); - context_id = (comm_ptr->comm_kind == MPIR_INTRACOMM) ? + context_id = (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) ? MPIR_CONTEXT_INTRA_COLL : MPIR_CONTEXT_INTER_COLL; mpi_errno = MPID_Irecv(buf, count, datatype, source, tag, comm_ptr, diff --git a/src/mpi/coll/iallgather.c b/src/mpi/coll/iallgather.c index aa7f5dc..b352a6f 100644 --- a/src/mpi/coll/iallgather.c +++ b/src/mpi/coll/iallgather.c @@ -708,7 +708,7 @@ int MPI_Iallgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPIR_ERRTEST_ARGNULL(request,"request", mpi_errno); /* catch common aliasing cases */ - if (comm_ptr->comm_kind == MPIR_INTRACOMM && recvbuf != MPI_IN_PLACE && sendtype == recvtype && sendcount == recvcount && sendcount != 0) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM && recvbuf != MPI_IN_PLACE && sendtype == recvtype && sendcount == recvcount && sendcount != 0) { int recvtype_size; MPID_Datatype_get_size_macro(recvtype, recvtype_size); MPIR_ERRTEST_ALIAS_COLL(sendbuf, (char*)recvbuf + comm_ptr->rank*recvcount*recvtype_size, mpi_errno); diff --git a/src/mpi/coll/iallgatherv.c b/src/mpi/coll/iallgatherv.c index e9f23e1..1631d33 100644 --- a/src/mpi/coll/iallgatherv.c +++ b/src/mpi/coll/iallgatherv.c @@ -802,7 +802,7 @@ int MPI_Iallgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, v } /* catch common aliasing cases */ - if (comm_ptr->comm_kind == MPIR_INTRACOMM && + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM && sendtype == recvtype && recvcounts[comm_ptr->rank] != 0 && sendcount != 0) { diff --git a/src/mpi/coll/iallreduce.c b/src/mpi/coll/iallreduce.c index 2839fcc..3539d04 100644 --- a/src/mpi/coll/iallreduce.c +++ b/src/mpi/coll/iallreduce.c @@ -439,7 +439,7 @@ int MPIR_Iallreduce_intra(const void *sendbuf, void *recvbuf, int count, MPI_Dat int mpi_errno = MPI_SUCCESS; int comm_size, is_homogeneous, pof2, type_size; - MPIU_Assert(comm_ptr->comm_kind == MPIR_INTRACOMM); + MPIU_Assert(comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM); is_homogeneous = TRUE; #ifdef MPID_HAS_HETERO @@ -509,7 +509,7 @@ int MPIR_Iallreduce_inter(const void *sendbuf, void *recvbuf, int count, MPI_Dat int rank, root; MPIR_Comm *lcomm_ptr = NULL; - MPIU_Assert(comm_ptr->comm_kind == MPIR_INTERCOMM); + MPIU_Assert(comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM); rank = comm_ptr->rank; @@ -758,7 +758,7 @@ int MPI_Iallreduce(const void *sendbuf, void *recvbuf, int count, } if (mpi_errno != MPI_SUCCESS) goto fn_fail; - if (comm_ptr->comm_kind == MPIR_INTERCOMM) + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM) MPIR_ERRTEST_SENDBUF_INPLACE(sendbuf, count, mpi_errno); if (sendbuf != MPI_IN_PLACE) @@ -766,7 +766,7 @@ int MPI_Iallreduce(const void *sendbuf, void *recvbuf, int count, MPIR_ERRTEST_ARGNULL(request,"request", mpi_errno); - if (comm_ptr->comm_kind == MPIR_INTRACOMM && count != 0 && sendbuf != MPI_IN_PLACE) + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM && count != 0 && sendbuf != MPI_IN_PLACE) MPIR_ERRTEST_ALIAS_COLL(sendbuf, recvbuf, mpi_errno); /* TODO more checks may be appropriate (counts, in_place, buffer aliasing, etc) */ diff --git a/src/mpi/coll/ialltoall.c b/src/mpi/coll/ialltoall.c index 77c0595..21b9868 100644 --- a/src/mpi/coll/ialltoall.c +++ b/src/mpi/coll/ialltoall.c @@ -637,7 +637,7 @@ int MPI_Ialltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPIR_ERRTEST_ARGNULL(request,"request", mpi_errno); - if (comm_ptr->comm_kind == MPIR_INTRACOMM && + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM && sendbuf != MPI_IN_PLACE && sendcount == recvcount && sendtype == recvtype && diff --git a/src/mpi/coll/ialltoallv.c b/src/mpi/coll/ialltoallv.c index e6b4c14..5ee8033 100644 --- a/src/mpi/coll/ialltoallv.c +++ b/src/mpi/coll/ialltoallv.c @@ -47,7 +47,7 @@ int MPIR_Ialltoallv_intra(const void *sendbuf, const int sendcounts[], const int int dst, rank; MPIR_SCHED_CHKPMEM_DECL(1); - MPIU_Assert(comm_ptr->comm_kind == MPIR_INTRACOMM); + MPIU_Assert(comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM); comm_size = comm_ptr->local_size; rank = comm_ptr->rank; @@ -182,7 +182,7 @@ int MPIR_Ialltoallv_inter(const void *sendbuf, const int sendcounts[], const int int src, dst, rank, sendcount, recvcount; char *sendaddr, *recvaddr; - MPIU_Assert(comm_ptr->comm_kind == MPIR_INTERCOMM); + MPIU_Assert(comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM); local_size = comm_ptr->local_size; remote_size = comm_ptr->remote_size; @@ -373,7 +373,7 @@ int MPI_Ialltoallv(const void *sendbuf, const int sendcounts[], const int sdispl MPIR_ERRTEST_ARGNULL(request,"request", mpi_errno); - if (comm_ptr->comm_kind == MPIR_INTRACOMM && + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM && sendbuf != MPI_IN_PLACE && sendcounts == recvcounts && sendtype == recvtype) diff --git a/src/mpi/coll/ialltoallw.c b/src/mpi/coll/ialltoallw.c index 8174038..20a0321 100644 --- a/src/mpi/coll/ialltoallw.c +++ b/src/mpi/coll/ialltoallw.c @@ -354,7 +354,7 @@ int MPI_Ialltoallw(const void *sendbuf, const int sendcounts[], const int sdispl MPIR_ERRTEST_ARGNULL(sdispls,"sdispls", mpi_errno); MPIR_ERRTEST_ARGNULL(sendtypes,"sendtypes", mpi_errno); - if (comm_ptr->comm_kind == MPIR_INTRACOMM && + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM && sendcounts == recvcounts && sendtypes == recvtypes) MPIR_ERRTEST_ALIAS_COLL(sendbuf,recvbuf,mpi_errno); @@ -362,7 +362,7 @@ int MPI_Ialltoallw(const void *sendbuf, const int sendcounts[], const int sdispl MPIR_ERRTEST_ARGNULL(recvcounts,"recvcounts", mpi_errno); MPIR_ERRTEST_ARGNULL(rdispls,"rdispls", mpi_errno); MPIR_ERRTEST_ARGNULL(recvtypes,"recvtypes", mpi_errno); - if (comm_ptr->comm_kind == MPIR_INTERCOMM && sendbuf == MPI_IN_PLACE) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM && sendbuf == MPI_IN_PLACE) { MPIR_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**sendbuf_inplace"); } MPIR_ERRTEST_ARGNULL(request,"request", mpi_errno); diff --git a/src/mpi/coll/ibarrier.c b/src/mpi/coll/ibarrier.c index fcd5184..9ee44e9 100644 --- a/src/mpi/coll/ibarrier.c +++ b/src/mpi/coll/ibarrier.c @@ -58,7 +58,7 @@ int MPIR_Ibarrier_intra(MPIR_Comm *comm_ptr, MPID_Sched_t s) int mpi_errno = MPI_SUCCESS; int size, rank, src, dst, mask; - MPIU_Assert(comm_ptr->comm_kind == MPIR_INTRACOMM); + MPIU_Assert(comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM); size = comm_ptr->local_size; rank = comm_ptr->rank; @@ -103,7 +103,7 @@ int MPIR_Ibarrier_inter(MPIR_Comm *comm_ptr, MPID_Sched_t s) MPIR_SCHED_CHKPMEM_DECL(1); char *buf = NULL; - MPIU_Assert(comm_ptr->comm_kind == MPIR_INTERCOMM); + MPIU_Assert(comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM); rank = comm_ptr->rank; @@ -178,7 +178,7 @@ int MPIR_Ibarrier_impl(MPIR_Comm *comm_ptr, MPI_Request *request) *request = MPI_REQUEST_NULL; - if (comm_ptr->local_size != 1 || comm_ptr->comm_kind == MPIR_INTERCOMM) { + if (comm_ptr->local_size != 1 || comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM) { mpi_errno = MPID_Sched_next_tag(comm_ptr, &tag); if (mpi_errno) MPIR_ERR_POP(mpi_errno); mpi_errno = MPID_Sched_create(&s); diff --git a/src/mpi/coll/ibcast.c b/src/mpi/coll/ibcast.c index 8144a74..6373a05 100644 --- a/src/mpi/coll/ibcast.c +++ b/src/mpi/coll/ibcast.c @@ -867,7 +867,7 @@ int MPIR_Ibcast_intra(void *buffer, int count, MPI_Datatype datatype, int root, int comm_size, is_homogeneous ATTRIBUTE((unused)); MPI_Aint type_size, nbytes; - MPIU_Assert(comm_ptr->comm_kind == MPIR_INTRACOMM); + MPIU_Assert(comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM); is_homogeneous = 1; #ifdef MPID_HAS_HETERO @@ -916,7 +916,7 @@ int MPIR_Ibcast_inter(void *buffer, int count, MPI_Datatype datatype, int root, { int mpi_errno = MPI_SUCCESS; - MPIU_Assert(comm_ptr->comm_kind == MPIR_INTERCOMM); + MPIU_Assert(comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM); /* Intercommunicator broadcast. * Root sends to rank 0 in remote group. Remote group does local diff --git a/src/mpi/coll/igather.c b/src/mpi/coll/igather.c index a5dd321..1110c1a 100644 --- a/src/mpi/coll/igather.c +++ b/src/mpi/coll/igather.c @@ -83,7 +83,7 @@ int MPIR_Igather_binomial(const void *sendbuf, int sendcount, MPI_Datatype sendt is_homogeneous = !comm_ptr->is_hetero; #endif - MPIU_Assert(comm_ptr->comm_kind == MPIR_INTRACOMM); + MPIU_Assert(comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM); /* Use binomial tree algorithm. */ @@ -625,7 +625,7 @@ int MPI_Igather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; - if (comm_ptr->comm_kind == MPIR_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) { MPIR_ERRTEST_INTRA_ROOT(comm_ptr, root, mpi_errno); if (sendbuf != MPI_IN_PLACE) { @@ -666,7 +666,7 @@ int MPI_Igather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPIR_ERRTEST_SENDBUF_INPLACE(sendbuf, sendcount, mpi_errno); } - if (comm_ptr->comm_kind == MPIR_INTERCOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM) { MPIR_ERRTEST_INTER_ROOT(comm_ptr, root, mpi_errno); if (root == MPI_ROOT) { diff --git a/src/mpi/coll/igatherv.c b/src/mpi/coll/igatherv.c index 88baf00..c31ad92 100644 --- a/src/mpi/coll/igatherv.c +++ b/src/mpi/coll/igatherv.c @@ -46,10 +46,10 @@ int MPIR_Igatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, voi rank = comm_ptr->rank; /* If rank == root, then I recv lots, otherwise I send */ - if (((comm_ptr->comm_kind == MPIR_INTRACOMM) && (root == rank)) || - ((comm_ptr->comm_kind == MPIR_INTERCOMM) && (root == MPI_ROOT))) + if (((comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) && (root == rank)) || + ((comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM) && (root == MPI_ROOT))) { - if (comm_ptr->comm_kind == MPIR_INTRACOMM) + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) comm_size = comm_ptr->local_size; else comm_size = comm_ptr->remote_size; @@ -60,7 +60,7 @@ int MPIR_Igatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, voi for (i = 0; i < comm_size; i++) { if (recvcounts[i]) { - if ((comm_ptr->comm_kind == MPIR_INTRACOMM) && (i == rank)) { + if ((comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) && (i == rank)) { if (sendbuf != MPI_IN_PLACE) { mpi_errno = MPID_Sched_copy(sendbuf, sendcount, sendtype, ((char *)recvbuf+displs[rank]*extent), @@ -209,7 +209,7 @@ int MPI_Igatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; - if (comm_ptr->comm_kind == MPIR_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) { MPIR_ERRTEST_INTRA_ROOT(comm_ptr, root, mpi_errno); if (sendbuf != MPI_IN_PLACE) { @@ -259,7 +259,7 @@ int MPI_Igatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void MPIR_ERRTEST_SENDBUF_INPLACE(sendbuf, sendcount, mpi_errno); } - if (comm_ptr->comm_kind == MPIR_INTERCOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM) { MPIR_ERRTEST_INTER_ROOT(comm_ptr, root, mpi_errno); if (root == MPI_ROOT) { diff --git a/src/mpi/coll/ired_scat.c b/src/mpi/coll/ired_scat.c index b6fd8e0..d7b3c98 100644 --- a/src/mpi/coll/ired_scat.c +++ b/src/mpi/coll/ired_scat.c @@ -1128,7 +1128,7 @@ int MPI_Ireduce_scatter(const void *sendbuf, void *recvbuf, const int recvcounts while (i < comm_ptr->remote_size && recvcounts[i] == 0) ++i; - if (comm_ptr->comm_kind == MPIR_INTRACOMM && sendbuf != MPI_IN_PLACE && i < comm_ptr->remote_size) + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM && sendbuf != MPI_IN_PLACE && i < comm_ptr->remote_size) MPIR_ERRTEST_ALIAS_COLL(sendbuf, recvbuf, mpi_errno) /* TODO more checks may be appropriate (counts, in_place, etc) */ } diff --git a/src/mpi/coll/ired_scat_block.c b/src/mpi/coll/ired_scat_block.c index 322ce29..f0eeb52 100644 --- a/src/mpi/coll/ired_scat_block.c +++ b/src/mpi/coll/ired_scat_block.c @@ -1025,7 +1025,7 @@ int MPI_Ireduce_scatter_block(const void *sendbuf, void *recvbuf, MPIR_ERRTEST_ARGNULL(request,"request", mpi_errno); - if (comm_ptr->comm_kind == MPIR_INTRACOMM && sendbuf != MPI_IN_PLACE && recvcount != 0) + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM && sendbuf != MPI_IN_PLACE && recvcount != 0) MPIR_ERRTEST_ALIAS_COLL(sendbuf, recvbuf, mpi_errno) /* TODO more checks may be appropriate (counts, in_place, etc) */ } diff --git a/src/mpi/coll/ireduce.c b/src/mpi/coll/ireduce.c index f483c26..2308189 100644 --- a/src/mpi/coll/ireduce.c +++ b/src/mpi/coll/ireduce.c @@ -42,7 +42,7 @@ int MPIR_Ireduce_binomial(const void *sendbuf, void *recvbuf, int count, MPI_Dat void *tmp_buf; MPIR_SCHED_CHKPMEM_DECL(2); - MPIU_Assert(comm_ptr->comm_kind == MPIR_INTRACOMM); + MPIU_Assert(comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM); if (count == 0) return MPI_SUCCESS; @@ -544,7 +544,7 @@ int MPIR_Ireduce_intra(const void *sendbuf, void *recvbuf, int count, MPI_Dataty int mpi_errno = MPI_SUCCESS; int pof2, type_size, comm_size; - MPIU_Assert(comm_ptr->comm_kind == MPIR_INTRACOMM); + MPIU_Assert(comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM); comm_size = comm_ptr->local_size; @@ -592,7 +592,7 @@ int MPIR_Ireduce_SMP(const void *sendbuf, void *recvbuf, int count, MPI_Datatype if (!MPIR_CVAR_ENABLE_SMP_COLLECTIVES || !MPIR_CVAR_ENABLE_SMP_REDUCE) MPID_Abort(comm_ptr, MPI_ERR_OTHER, 1, "SMP collectives are disabled!"); MPIU_Assert(MPIR_Comm_is_node_aware(comm_ptr)); - MPIU_Assert(comm_ptr->comm_kind == MPIR_INTRACOMM); + MPIU_Assert(comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM); nc = comm_ptr->node_comm; nrc = comm_ptr->node_roots_comm; @@ -699,7 +699,7 @@ int MPIR_Ireduce_inter(const void *sendbuf, void *recvbuf, int count, MPI_Dataty void *tmp_buf = NULL; MPIR_SCHED_CHKPMEM_DECL(1); - MPIU_Assert(comm_ptr->comm_kind == MPIR_INTERCOMM); + MPIU_Assert(comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM); /* Intercommunicator reduce. Remote group does a local intracommunicator @@ -883,7 +883,7 @@ int MPI_Ireduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype data MPIR_ERRTEST_ARGNULL(request,"request", mpi_errno); - if (comm_ptr->comm_kind == MPIR_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) { if (sendbuf != MPI_IN_PLACE) MPIR_ERRTEST_USERBUFFER(sendbuf,count,datatype,mpi_errno); diff --git a/src/mpi/coll/iscatter.c b/src/mpi/coll/iscatter.c index a1451b5..027ec38 100644 --- a/src/mpi/coll/iscatter.c +++ b/src/mpi/coll/iscatter.c @@ -639,7 +639,7 @@ int MPI_Iscatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, { MPIR_Datatype *sendtype_ptr, *recvtype_ptr; MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); - if (comm_ptr->comm_kind == MPIR_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) { MPIR_ERRTEST_INTRA_ROOT(comm_ptr, root, mpi_errno); if (comm_ptr->rank == root) { @@ -679,7 +679,7 @@ int MPI_Iscatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, } } - if (comm_ptr->comm_kind == MPIR_INTERCOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM) { MPIR_ERRTEST_INTER_ROOT(comm_ptr, root, mpi_errno); if (root == MPI_ROOT) { diff --git a/src/mpi/coll/iscatterv.c b/src/mpi/coll/iscatterv.c index 00c26b5..ad5bb03 100644 --- a/src/mpi/coll/iscatterv.c +++ b/src/mpi/coll/iscatterv.c @@ -62,10 +62,10 @@ int MPIR_Iscatterv(const void *sendbuf, const int sendcounts[], const int displs rank = comm_ptr->rank; /* If I'm the root, then scatter */ - if (((comm_ptr->comm_kind == MPIR_INTRACOMM) && (root == rank)) || - ((comm_ptr->comm_kind == MPIR_INTERCOMM) && (root == MPI_ROOT))) + if (((comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) && (root == rank)) || + ((comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM) && (root == MPI_ROOT))) { - if (comm_ptr->comm_kind == MPIR_INTRACOMM) + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) comm_size = comm_ptr->local_size; else comm_size = comm_ptr->remote_size; @@ -81,7 +81,7 @@ int MPIR_Iscatterv(const void *sendbuf, const int sendcounts[], const int displs for (i = 0; i < comm_size; i++) { if (sendcounts[i]) { - if ((comm_ptr->comm_kind == MPIR_INTRACOMM) && (i == rank)) { + if ((comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) && (i == rank)) { if (recvbuf != MPI_IN_PLACE) { mpi_errno = MPID_Sched_copy(((char *)sendbuf+displs[rank]*extent), sendcounts[rank], sendtype, @@ -218,7 +218,7 @@ int MPI_Iscatterv(const void *sendbuf, const int sendcounts[], const int displs[ MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; - if (comm_ptr->comm_kind == MPIR_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) { MPIR_ERRTEST_INTRA_ROOT(comm_ptr, root, mpi_errno); rank = comm_ptr->rank; comm_size = comm_ptr->local_size; @@ -272,7 +272,7 @@ int MPI_Iscatterv(const void *sendbuf, const int sendcounts[], const int displs[ } } - if (comm_ptr->comm_kind == MPIR_INTERCOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM) { MPIR_ERRTEST_INTER_ROOT(comm_ptr, root, mpi_errno); if (root == MPI_ROOT) { comm_size = comm_ptr->remote_size; diff --git a/src/mpi/coll/red_scat.c b/src/mpi/coll/red_scat.c index b052f30..63aa171 100644 --- a/src/mpi/coll/red_scat.c +++ b/src/mpi/coll/red_scat.c @@ -1048,7 +1048,7 @@ int MPIR_Reduce_scatter(const void *sendbuf, void *recvbuf, const int recvcounts { int mpi_errno = MPI_SUCCESS; - if (comm_ptr->comm_kind == MPIR_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) { /* intracommunicator */ mpi_errno = MPIR_Reduce_scatter_intra(sendbuf, recvbuf, recvcounts, datatype, op, comm_ptr, errflag); @@ -1193,7 +1193,7 @@ int MPI_Reduce_scatter(const void *sendbuf, void *recvbuf, const int recvcounts[ } MPIR_ERRTEST_RECVBUF_INPLACE(recvbuf, recvcounts[comm_ptr->rank], mpi_errno); - if (comm_ptr->comm_kind == MPIR_INTERCOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM) { MPIR_ERRTEST_SENDBUF_INPLACE(sendbuf, sum, mpi_errno); } else if (sendbuf != MPI_IN_PLACE && sum != 0) MPIR_ERRTEST_ALIAS_COLL(sendbuf, recvbuf, mpi_errno) diff --git a/src/mpi/coll/red_scat_block.c b/src/mpi/coll/red_scat_block.c index f0bef42..4afefd5 100644 --- a/src/mpi/coll/red_scat_block.c +++ b/src/mpi/coll/red_scat_block.c @@ -1017,7 +1017,7 @@ int MPIR_Reduce_scatter_block(const void *sendbuf, void *recvbuf, { int mpi_errno = MPI_SUCCESS; - if (comm_ptr->comm_kind == MPIR_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) { /* intracommunicator */ mpi_errno = MPIR_Reduce_scatter_block_intra(sendbuf, recvbuf, recvcount, datatype, op, comm_ptr, errflag); if (mpi_errno) MPIR_ERR_POP(mpi_errno); @@ -1054,7 +1054,7 @@ int MPIR_Reduce_scatter_block_impl(const void *sendbuf, void *recvbuf, if (mpi_errno) MPIR_ERR_POP(mpi_errno); /* --END USEREXTENSION-- */ } else { - if (comm_ptr->comm_kind == MPIR_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) { /* intracommunicator */ mpi_errno = MPIR_Reduce_scatter_block_intra(sendbuf, recvbuf, recvcount, datatype, op, comm_ptr, errflag); if (mpi_errno) MPIR_ERR_POP(mpi_errno); @@ -1158,7 +1158,7 @@ int MPI_Reduce_scatter_block(const void *sendbuf, void *recvbuf, } MPIR_ERRTEST_RECVBUF_INPLACE(recvbuf, recvcount, mpi_errno); - if (comm_ptr->comm_kind == MPIR_INTERCOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM) { MPIR_ERRTEST_SENDBUF_INPLACE(sendbuf, recvcount, mpi_errno); } else if (sendbuf != MPI_IN_PLACE && recvcount != 0) MPIR_ERRTEST_ALIAS_COLL(sendbuf, recvbuf, mpi_errno) diff --git a/src/mpi/coll/reduce.c b/src/mpi/coll/reduce.c index 8ce9d0e..81b8202 100644 --- a/src/mpi/coll/reduce.c +++ b/src/mpi/coll/reduce.c @@ -1039,7 +1039,7 @@ int MPIR_Reduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype data { int mpi_errno = MPI_SUCCESS; - if (comm_ptr->comm_kind == MPIR_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) { /* intracommunicator */ mpi_errno = MPIR_Reduce_intra(sendbuf, recvbuf, count, datatype, op, root, comm_ptr, errflag); @@ -1077,7 +1077,7 @@ int MPIR_Reduce_impl(const void *sendbuf, void *recvbuf, int count, MPI_Datatype if (mpi_errno) MPIR_ERR_POP(mpi_errno); /* --END USEREXTENSION-- */ } else { - if (comm_ptr->comm_kind == MPIR_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) { /* intracommunicator */ mpi_errno = MPIR_Reduce_intra(sendbuf, recvbuf, count, datatype, op, root, comm_ptr, errflag); @@ -1175,7 +1175,7 @@ int MPI_Reduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datat MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; - if (comm_ptr->comm_kind == MPIR_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) { MPIR_ERRTEST_INTRA_ROOT(comm_ptr, root, mpi_errno); MPIR_ERRTEST_COUNT(count, mpi_errno); @@ -1203,7 +1203,7 @@ int MPI_Reduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datat MPIR_ERRTEST_SENDBUF_INPLACE(sendbuf, count, mpi_errno); } - if (comm_ptr->comm_kind == MPIR_INTERCOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM) { MPIR_ERRTEST_INTER_ROOT(comm_ptr, root, mpi_errno); if (root == MPI_ROOT) { diff --git a/src/mpi/coll/scatter.c b/src/mpi/coll/scatter.c index 42dc7ee..2faf560 100644 --- a/src/mpi/coll/scatter.c +++ b/src/mpi/coll/scatter.c @@ -577,7 +577,7 @@ int MPIR_Scatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, { int mpi_errno = MPI_SUCCESS; - if (comm_ptr->comm_kind == MPIR_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) { /* intracommunicator */ mpi_errno = MPIR_Scatter_intra(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, @@ -706,7 +706,7 @@ int MPI_Scatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; - if (comm_ptr->comm_kind == MPIR_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) { MPIR_ERRTEST_INTRA_ROOT(comm_ptr, root, mpi_errno); rank = comm_ptr->rank; @@ -747,7 +747,7 @@ int MPI_Scatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, } } - if (comm_ptr->comm_kind == MPIR_INTERCOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM) { MPIR_ERRTEST_INTER_ROOT(comm_ptr, root, mpi_errno); if (root == MPI_ROOT) { diff --git a/src/mpi/coll/scatterv.c b/src/mpi/coll/scatterv.c index 94a66dd..c915917 100644 --- a/src/mpi/coll/scatterv.c +++ b/src/mpi/coll/scatterv.c @@ -71,9 +71,9 @@ int MPIR_Scatterv(const void *sendbuf, const int *sendcounts, const int *displs, MPIDU_ERR_CHECK_MULTIPLE_THREADS_ENTER( comm_ptr ); /* If I'm the root, then scatter */ - if (((comm_ptr->comm_kind == MPIR_INTRACOMM) && (root == rank)) || - ((comm_ptr->comm_kind == MPIR_INTERCOMM) && (root == MPI_ROOT))) { - if (comm_ptr->comm_kind == MPIR_INTRACOMM) + if (((comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) && (root == rank)) || + ((comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM) && (root == MPI_ROOT))) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) comm_size = comm_ptr->local_size; else comm_size = comm_ptr->remote_size; @@ -93,7 +93,7 @@ int MPIR_Scatterv(const void *sendbuf, const int *sendcounts, const int *displs, reqs = 0; for (i = 0; i < comm_size; i++) { if (sendcounts[i]) { - if ((comm_ptr->comm_kind == MPIR_INTRACOMM) && (i == rank)) { + if ((comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) && (i == rank)) { if (recvbuf != MPI_IN_PLACE) { mpi_errno = MPIR_Localcopy(((char *)sendbuf+displs[rank]*extent), sendcounts[rank], sendtype, @@ -267,7 +267,7 @@ int MPI_Scatterv(const void *sendbuf, const int *sendcounts, const int *displs, MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; - if (comm_ptr->comm_kind == MPIR_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) { MPIR_ERRTEST_INTRA_ROOT(comm_ptr, root, mpi_errno); rank = comm_ptr->rank; comm_size = comm_ptr->local_size; @@ -320,7 +320,7 @@ int MPI_Scatterv(const void *sendbuf, const int *sendcounts, const int *displs, } } - if (comm_ptr->comm_kind == MPIR_INTERCOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM) { MPIR_ERRTEST_INTER_ROOT(comm_ptr, root, mpi_errno); if (root == MPI_ROOT) { comm_size = comm_ptr->remote_size; diff --git a/src/mpi/comm/comm_compare.c b/src/mpi/comm/comm_compare.c index e9f4322..c97368a 100644 --- a/src/mpi/comm/comm_compare.c +++ b/src/mpi/comm/comm_compare.c @@ -118,7 +118,7 @@ int MPI_Comm_compare(MPI_Comm comm1, MPI_Comm comm2, int *result) else if (comm1 == comm2) { *result = MPI_IDENT; } - else if (comm_ptr1->comm_kind == MPIR_INTRACOMM) { + else if (comm_ptr1->comm_kind == MPIR_COMM_KIND__INTRACOMM) { MPIR_Group *group_ptr1, *group_ptr2; mpi_errno = MPIR_Comm_group_impl(comm_ptr1, &group_ptr1); diff --git a/src/mpi/comm/comm_create.c b/src/mpi/comm/comm_create.c index f58f7bd..282e0c6 100644 --- a/src/mpi/comm/comm_create.c +++ b/src/mpi/comm/comm_create.c @@ -79,7 +79,7 @@ int MPIR_Comm_create_calculate_mapping(MPIR_Group *group_ptr, MPIR_Group_setup_lpid_list( group_ptr ); /* Optimize for groups contained within MPI_COMM_WORLD. */ - if (comm_ptr->comm_kind == MPIR_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) { int wsize; subsetOfWorld = 1; wsize = MPIR_Process.comm_world->local_size; @@ -169,7 +169,7 @@ int MPIR_Comm_create_map(int local_n, MPIR_Comm_map_irregular(newcomm, mapping_comm, local_mapping, local_n, MPIR_COMM_MAP_DIR_L2L, NULL); - if (mapping_comm->comm_kind == MPIR_INTERCOMM) { + if (mapping_comm->comm_kind == MPIR_COMM_KIND__INTERCOMM) { MPIR_Comm_map_irregular(newcomm, mapping_comm, remote_mapping, remote_n, MPIR_COMM_MAP_DIR_R2R, NULL); } @@ -198,7 +198,7 @@ int MPIR_Comm_create_intra(MPIR_Comm *comm_ptr, MPIR_Group *group_ptr, MPID_MPI_FUNC_ENTER(MPID_STATE_MPIR_COMM_CREATE_INTRA); - MPIU_Assert(comm_ptr->comm_kind == MPIR_INTRACOMM); + MPIU_Assert(comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM); n = group_ptr->size; *newcomm_ptr = NULL; @@ -299,7 +299,7 @@ PMPI_LOCAL int MPIR_Comm_create_inter(MPIR_Comm *comm_ptr, MPIR_Group *group_ptr MPID_MPI_FUNC_ENTER(MPID_STATE_MPIR_COMM_CREATE_INTER); - MPIU_Assert(comm_ptr->comm_kind == MPIR_INTERCOMM); + MPIU_Assert(comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM); /* Create a new communicator from the specified group members */ @@ -536,12 +536,12 @@ int MPI_Comm_create(MPI_Comm comm, MPI_Group group, MPI_Comm *newcomm) /* ... body of routine ... */ - if (comm_ptr->comm_kind == MPIR_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) { mpi_errno = MPIR_Comm_create_intra(comm_ptr, group_ptr, &newcomm_ptr); if (mpi_errno) MPIR_ERR_POP(mpi_errno); } else { - MPIU_Assert(comm_ptr->comm_kind == MPIR_INTERCOMM); + MPIU_Assert(comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM); mpi_errno = MPIR_Comm_create_inter(comm_ptr, group_ptr, &newcomm_ptr); if (mpi_errno) MPIR_ERR_POP(mpi_errno); } diff --git a/src/mpi/comm/comm_create_group.c b/src/mpi/comm/comm_create_group.c index e5e1573..ae41026 100644 --- a/src/mpi/comm/comm_create_group.c +++ b/src/mpi/comm/comm_create_group.c @@ -44,7 +44,7 @@ int MPIR_Comm_create_group(MPIR_Comm * comm_ptr, MPIR_Group * group_ptr, int tag MPID_MPI_STATE_DECL(MPID_STATE_MPIR_COMM_CREATE_GROUP); MPID_MPI_FUNC_ENTER(MPID_STATE_MPIR_COMM_CREATE_GROUP); - MPIU_Assert(comm_ptr->comm_kind == MPIR_INTRACOMM); + MPIU_Assert(comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM); n = group_ptr->size; *newcomm_ptr = NULL; diff --git a/src/mpi/comm/comm_idup.c b/src/mpi/comm/comm_idup.c index 1d766e2..240c226 100644 --- a/src/mpi/comm/comm_idup.c +++ b/src/mpi/comm/comm_idup.c @@ -55,7 +55,7 @@ int MPIR_Comm_idup_impl(MPIR_Comm *comm_ptr, MPIR_Comm **newcommp, MPIR_Request /* We now have a mostly-valid new communicator, so begin the process of * allocating a context ID to use for actual communication */ - if (comm_ptr->comm_kind == MPIR_INTERCOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM) { mpi_errno = MPIR_Get_intercomm_contextid_nonblock(comm_ptr, *newcommp, reqp); if (mpi_errno) MPIR_ERR_POP(mpi_errno); } diff --git a/src/mpi/comm/comm_remote_group.c b/src/mpi/comm/comm_remote_group.c index fc7f82d..bfb28ad 100644 --- a/src/mpi/comm/comm_remote_group.c +++ b/src/mpi/comm/comm_remote_group.c @@ -130,7 +130,7 @@ int MPI_Comm_remote_group(MPI_Comm comm, MPI_Group *group) /* Validate comm_ptr */ MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); /* If comm_ptr is not valid, it will be reset to null */ - if (comm_ptr && comm_ptr->comm_kind != MPIR_INTERCOMM) { + if (comm_ptr && comm_ptr->comm_kind != MPIR_COMM_KIND__INTERCOMM) { mpi_errno = MPIR_Err_create_code( MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_COMM, "**commnotinter", 0 ); diff --git a/src/mpi/comm/comm_remote_size.c b/src/mpi/comm/comm_remote_size.c index f713767..86bb4d8 100644 --- a/src/mpi/comm/comm_remote_size.c +++ b/src/mpi/comm/comm_remote_size.c @@ -84,7 +84,7 @@ int MPI_Comm_remote_size(MPI_Comm comm, int *size) /* Validate comm_ptr */ MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); /* If comm_ptr is not valid, it will be reset to null */ - if (comm_ptr && comm_ptr->comm_kind != MPIR_INTERCOMM) { + if (comm_ptr && comm_ptr->comm_kind != MPIR_COMM_KIND__INTERCOMM) { mpi_errno = MPIR_Err_create_code( MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_COMM, "**commnotinter", 0 ); diff --git a/src/mpi/comm/comm_split.c b/src/mpi/comm/comm_split.c index 5c3dbd7..6ca5688 100644 --- a/src/mpi/comm/comm_split.c +++ b/src/mpi/comm/comm_split.c @@ -153,7 +153,7 @@ int MPIR_Comm_split_impl(MPIR_Comm *comm_ptr, int color, int key, MPIR_Comm **ne /* Get the communicator to use in collectives on the local group of processes */ - if (comm_ptr->comm_kind == MPIR_INTERCOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM) { if (!comm_ptr->local_comm) { MPIR_Setup_intercomm_localcomm( comm_ptr ); } @@ -191,7 +191,7 @@ int MPIR_Comm_split_impl(MPIR_Comm *comm_ptr, int color, int key, MPIR_Comm **ne /* If we're an intercomm, we need to do the same thing for the remote table, as we need to know the size of the remote group of the same color before deciding to create the communicator */ - if (comm_ptr->comm_kind == MPIR_INTERCOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM) { splittype mypair; /* For the remote group, the situation is more complicated. We need to find the size of our "partner" group in the @@ -253,7 +253,7 @@ int MPIR_Comm_split_impl(MPIR_Comm *comm_ptr, int color, int key, MPIR_Comm **ne MPIU_Assert(new_context_id != 0); /* In the intercomm case, we need to exchange the context ids */ - if (comm_ptr->comm_kind == MPIR_INTERCOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM) { if (comm_ptr->rank == 0) { mpi_errno = MPIC_Sendrecv( &new_context_id, 1, MPIU_CONTEXT_ID_T_DATATYPE, 0, 0, &remote_context_id, 1, MPIU_CONTEXT_ID_T_DATATYPE, @@ -301,7 +301,7 @@ int MPIR_Comm_split_impl(MPIR_Comm *comm_ptr, int color, int key, MPIR_Comm **ne process in the input communicator */ MPIU_Sort_inttable( keytable, new_size ); - if (comm_ptr->comm_kind == MPIR_INTERCOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM) { MPIU_CHKLMEM_MALLOC(remotekeytable,sorttype*, new_remote_size*sizeof(sorttype), mpi_errno,"remote keytable"); diff --git a/src/mpi/comm/comm_test_inter.c b/src/mpi/comm/comm_test_inter.c index b64e1bd..6b7383b 100644 --- a/src/mpi/comm/comm_test_inter.c +++ b/src/mpi/comm/comm_test_inter.c @@ -92,7 +92,7 @@ int MPI_Comm_test_inter(MPI_Comm comm, int *flag) /* ... body of routine ... */ - *flag = (comm_ptr->comm_kind == MPIR_INTERCOMM); + *flag = (comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM); /* ... end of body of routine ... */ diff --git a/src/mpi/comm/commutil.c b/src/mpi/comm/commutil.c index 0584284..fedb4ae 100644 --- a/src/mpi/comm/commutil.c +++ b/src/mpi/comm/commutil.c @@ -183,7 +183,7 @@ int MPIR_Setup_intercomm_localcomm(MPIR_Comm * intercomm_ptr) localcomm_ptr->recvcontext_id)); /* Save the kind of the communicator */ - localcomm_ptr->comm_kind = MPIR_INTRACOMM; + localcomm_ptr->comm_kind = MPIR_COMM_KIND__INTRACOMM; /* Set the sizes and ranks */ localcomm_ptr->remote_size = intercomm_ptr->local_size; @@ -388,7 +388,7 @@ static int set_collops(MPIR_Comm * comm) initialized = TRUE; } - if (comm->comm_kind == MPIR_INTRACOMM) { + if (comm->comm_kind == MPIR_COMM_KIND__INTRACOMM) { /* FIXME MT what protects access to this structure and ic_default_collops? */ comm->coll_fns = default_collops[comm->hierarchy_kind]; } @@ -549,7 +549,7 @@ int MPIR_Comm_commit(MPIR_Comm * comm) MPIR_Comm_map_free(comm); - if (comm->comm_kind == MPIR_INTRACOMM) { + if (comm->comm_kind == MPIR_COMM_KIND__INTRACOMM) { mpi_errno = MPIU_Find_local_and_external(comm, &num_local, &local_rank, &local_procs, @@ -595,7 +595,7 @@ int MPIR_Comm_commit(MPIR_Comm * comm) comm->node_comm->context_id = comm->context_id + MPIR_CONTEXT_INTRANODE_OFFSET; comm->node_comm->recvcontext_id = comm->node_comm->context_id; comm->node_comm->rank = local_rank; - comm->node_comm->comm_kind = MPIR_INTRACOMM; + comm->node_comm->comm_kind = MPIR_COMM_KIND__INTRACOMM; comm->node_comm->hierarchy_kind = MPIR_HIERARCHY_NODE; comm->node_comm->local_comm = NULL; MPL_DBG_MSG_D(MPIR_DBG_COMM, VERBOSE, "Create node_comm=%p\n", comm->node_comm); @@ -629,7 +629,7 @@ int MPIR_Comm_commit(MPIR_Comm * comm) comm->node_roots_comm->context_id = comm->context_id + MPIR_CONTEXT_INTERNODE_OFFSET; comm->node_roots_comm->recvcontext_id = comm->node_roots_comm->context_id; comm->node_roots_comm->rank = external_rank; - comm->node_roots_comm->comm_kind = MPIR_INTRACOMM; + comm->node_roots_comm->comm_kind = MPIR_COMM_KIND__INTRACOMM; comm->node_roots_comm->hierarchy_kind = MPIR_HIERARCHY_NODE_ROOTS; comm->node_roots_comm->local_comm = NULL; @@ -727,7 +727,7 @@ int MPIR_Comm_copy(MPIR_Comm * comm_ptr, int size, MPIR_Comm ** outcomm_ptr) /* If there is a context id cache in oldcomm, use it here. Otherwise, * use the appropriate algorithm to get a new context id. Be careful * of intercomms here */ - if (comm_ptr->comm_kind == MPIR_INTERCOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM) { mpi_errno = MPIR_Get_intercomm_contextid(comm_ptr, &new_context_id, &new_recvcontext_id); if (mpi_errno) MPIR_ERR_POP(mpi_errno); @@ -769,7 +769,7 @@ int MPIR_Comm_copy(MPIR_Comm * comm_ptr, int size, MPIR_Comm ** outcomm_ptr) * test that matches the test on rank above. */ if (size == comm_ptr->local_size) { /* Duplicate the network address mapping */ - if (comm_ptr->comm_kind == MPIR_INTRACOMM) + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) MPIR_Comm_map_dup(newcomm_ptr, comm_ptr, MPIR_COMM_MAP_DIR_L2L); else MPIR_Comm_map_dup(newcomm_ptr, comm_ptr, MPIR_COMM_MAP_DIR_R2R); @@ -777,7 +777,7 @@ int MPIR_Comm_copy(MPIR_Comm * comm_ptr, int size, MPIR_Comm ** outcomm_ptr) else { int i; - if (comm_ptr->comm_kind == MPIR_INTRACOMM) + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) MPIR_Comm_map_irregular(newcomm_ptr, comm_ptr, NULL, size, MPIR_COMM_MAP_DIR_L2L, &map); else MPIR_Comm_map_irregular(newcomm_ptr, comm_ptr, NULL, size, MPIR_COMM_MAP_DIR_R2R, &map); @@ -789,13 +789,13 @@ int MPIR_Comm_copy(MPIR_Comm * comm_ptr, int size, MPIR_Comm ** outcomm_ptr) } /* If it is an intercomm, duplicate the local network address references */ - if (comm_ptr->comm_kind == MPIR_INTERCOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM) { MPIR_Comm_map_dup(newcomm_ptr, comm_ptr, MPIR_COMM_MAP_DIR_L2L); } /* Set the sizes and ranks */ newcomm_ptr->rank = comm_ptr->rank; - if (comm_ptr->comm_kind == MPIR_INTERCOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM) { newcomm_ptr->local_size = comm_ptr->local_size; newcomm_ptr->remote_size = comm_ptr->remote_size; newcomm_ptr->is_low_group = comm_ptr->is_low_group; @@ -870,13 +870,13 @@ int MPIR_Comm_copy_data(MPIR_Comm * comm_ptr, MPIR_Comm ** outcomm_ptr) newcomm_ptr->comm_kind = comm_ptr->comm_kind; newcomm_ptr->local_comm = 0; - if (comm_ptr->comm_kind == MPIR_INTRACOMM) + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) MPIR_Comm_map_dup(newcomm_ptr, comm_ptr, MPIR_COMM_MAP_DIR_L2L); else MPIR_Comm_map_dup(newcomm_ptr, comm_ptr, MPIR_COMM_MAP_DIR_R2R); /* If it is an intercomm, duplicate the network address mapping */ - if (comm_ptr->comm_kind == MPIR_INTERCOMM) { + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM) { MPIR_Comm_map_dup(newcomm_ptr, comm_ptr, MPIR_COMM_MAP_DIR_L2L); } @@ -970,7 +970,7 @@ int MPIR_Comm_delete_internal(MPIR_Comm * comm_ptr) comm_ptr->coll_fns = NULL; } - if (comm_ptr->comm_kind == MPIR_INTERCOMM && comm_ptr->local_comm) + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM && comm_ptr->local_comm) MPIR_Comm_release(comm_ptr->local_comm); /* Free the local and remote groups, if they exist */ diff --git a/src/mpi/comm/contextid.c b/src/mpi/comm/contextid.c index 7946c04..611be2a 100644 --- a/src/mpi/comm/contextid.c +++ b/src/mpi/comm/contextid.c @@ -481,7 +481,7 @@ int MPIR_Get_contextid_sparse_group(MPIR_Comm * comm_ptr, MPIR_Group * group_ptr st.local_mask[ALL_OWN_MASK_FLAG] = 0; /* Now, try to get a context id */ - MPIU_Assert(comm_ptr->comm_kind == MPIR_INTRACOMM); + MPIU_Assert(comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM); /* In the global and brief-global cases, note that this routine will * release that global lock when it needs to wait. That will allow * other processes to enter the global or brief global critical section. @@ -685,7 +685,7 @@ static int sched_cb_gcn_bcast(MPIR_Comm * comm, int tag, void *state) int mpi_errno = MPI_SUCCESS; struct gcn_state *st = state; - if (st->gcn_cid_kind == MPIR_INTERCOMM) { + if (st->gcn_cid_kind == MPIR_COMM_KIND__INTERCOMM) { if (st->comm_ptr_inter->rank == 0) { mpi_errno = MPID_Sched_recv(st->ctx1, 1, MPIU_CONTEXT_ID_T_DATATYPE, 0, st->comm_ptr_inter, @@ -966,7 +966,7 @@ static int sched_get_cid_nonblock(MPIR_Comm * comm_ptr, MPIR_Comm * newcomm, MPIU_CHKPMEM_MALLOC(st, struct gcn_state *, sizeof(struct gcn_state), mpi_errno, "gcn_state"); st->ctx0 = ctx0; st->ctx1 = ctx1; - if (gcn_cid_kind == MPIR_INTRACOMM) { + if (gcn_cid_kind == MPIR_COMM_KIND__INTRACOMM) { st->comm_ptr = comm_ptr; st->comm_ptr_inter = NULL; } @@ -1028,7 +1028,7 @@ int MPIR_Get_contextid_nonblock(MPIR_Comm * comm_ptr, MPIR_Comm * newcommp, MPIR /* add some entries to it */ mpi_errno = sched_get_cid_nonblock(comm_ptr, newcommp, &newcommp->context_id, &newcommp->recvcontext_id, - s, MPIR_INTRACOMM); + s, MPIR_COMM_KIND__INTRACOMM); if (mpi_errno) MPIR_ERR_POP(mpi_errno); @@ -1080,7 +1080,7 @@ int MPIR_Get_intercomm_contextid_nonblock(MPIR_Comm * comm_ptr, MPIR_Comm * newc /* first get a context ID over the local comm */ mpi_errno = sched_get_cid_nonblock(comm_ptr, newcommp, &newcommp->recvcontext_id, &newcommp->context_id, - s, MPIR_INTERCOMM); + s, MPIR_COMM_KIND__INTERCOMM); if (mpi_errno) MPIR_ERR_POP(mpi_errno); diff --git a/src/mpi/comm/intercomm_create.c b/src/mpi/comm/intercomm_create.c index 88f6571..2573c07 100644 --- a/src/mpi/comm/intercomm_create.c +++ b/src/mpi/comm/intercomm_create.c @@ -8,7 +8,7 @@ #include "mpiimpl.h" #include "mpicomm.h" -#define MPIR_INTERCOMM_CREATE_TAG 0 +#define MPIR_COMM_KIND__INTERCOMM_CREATE_TAG 0 /* -- Begin Profiling Symbol Block for routine MPI_Intercomm_create */ #if defined(HAVE_PRAGMA_WEAK) @@ -133,13 +133,13 @@ int MPIR_Intercomm_create_impl(MPIR_Comm *local_comm_ptr, int local_leader, int cts_tag; MPIR_Errflag_t errflag = MPIR_ERR_NONE; MPIU_CHKLMEM_DECL(4); - MPID_MPI_STATE_DECL(MPID_STATE_MPIR_INTERCOMM_CREATE_IMPL); + MPID_MPI_STATE_DECL(MPID_STATE_MPIR_COMM_KIND__INTERCOMM_CREATE_IMPL); - MPID_MPI_FUNC_ENTER(MPID_STATE_MPIR_INTERCOMM_CREATE_IMPL); + MPID_MPI_FUNC_ENTER(MPID_STATE_MPIR_COMM_KIND__INTERCOMM_CREATE_IMPL); /* Shift tag into the tagged coll space (tag provided by the user is ignored as of MPI 3.0) */ - cts_tag = MPIR_INTERCOMM_CREATE_TAG | MPIR_Process.tagged_coll_mask; + cts_tag = MPIR_COMM_KIND__INTERCOMM_CREATE_TAG | MPIR_Process.tagged_coll_mask; /* * Error checking for this routine requires care. Because this @@ -330,7 +330,7 @@ int MPIR_Intercomm_create_impl(MPIR_Comm *local_comm_ptr, int local_leader, (*new_intercomm_ptr)->remote_size = remote_size; (*new_intercomm_ptr)->local_size = local_comm_ptr->local_size; (*new_intercomm_ptr)->rank = local_comm_ptr->rank; - (*new_intercomm_ptr)->comm_kind = MPIR_INTERCOMM; + (*new_intercomm_ptr)->comm_kind = MPIR_COMM_KIND__INTERCOMM; (*new_intercomm_ptr)->local_comm = 0; (*new_intercomm_ptr)->is_low_group = is_low_group; @@ -353,7 +353,7 @@ int MPIR_Intercomm_create_impl(MPIR_Comm *local_comm_ptr, int local_leader, fn_exit: MPIU_CHKLMEM_FREEALL(); - MPID_MPI_FUNC_EXIT(MPID_STATE_MPIR_INTERCOMM_CREATE_IMPL); + MPID_MPI_FUNC_EXIT(MPID_STATE_MPIR_COMM_KIND__INTERCOMM_CREATE_IMPL); return mpi_errno; fn_fail: goto fn_exit; @@ -503,7 +503,7 @@ int MPI_Intercomm_create(MPI_Comm local_comm, int local_leader, process that is the local leader (local_comm_ptr->rank == local_leader because we can then use peer_comm_ptr->rank to get the rank in peer_comm of the local leader. */ - if (peer_comm_ptr->comm_kind == MPIR_INTRACOMM && + if (peer_comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM && local_comm_ptr->rank == local_leader && peer_comm_ptr->rank == remote_leader) { MPIR_ERR_SET(mpi_errno,MPI_ERR_RANK,"**ranksdistinct"); diff --git a/src/mpi/comm/intercomm_merge.c b/src/mpi/comm/intercomm_merge.c index b84d8f0..3805fd0 100644 --- a/src/mpi/comm/intercomm_merge.c +++ b/src/mpi/comm/intercomm_merge.c @@ -75,9 +75,9 @@ int MPIR_Intercomm_merge_impl(MPIR_Comm *comm_ptr, int high, MPIR_Comm **new_int int local_high, remote_high, new_size; MPIU_Context_id_t new_context_id; MPIR_Errflag_t errflag = MPIR_ERR_NONE; - MPID_MPI_STATE_DECL(MPID_STATE_MPIR_INTERCOMM_MERGE_IMPL); + MPID_MPI_STATE_DECL(MPID_STATE_MPIR_COMM_KIND__INTERCOMM_MERGE_IMPL); - MPID_MPI_FUNC_ENTER(MPID_STATE_MPIR_INTERCOMM_MERGE_IMPL); + MPID_MPI_FUNC_ENTER(MPID_STATE_MPIR_COMM_KIND__INTERCOMM_MERGE_IMPL); /* Make sure that we have a local intercommunicator */ if (!comm_ptr->local_comm) { /* Manufacture the local communicator */ @@ -153,7 +153,7 @@ int MPIR_Intercomm_merge_impl(MPIR_Comm *comm_ptr, int high, MPIR_Comm **new_int (*new_intracomm_ptr)->recvcontext_id = (*new_intracomm_ptr)->context_id; (*new_intracomm_ptr)->remote_size = (*new_intracomm_ptr)->local_size = new_size; (*new_intracomm_ptr)->rank = -1; - (*new_intracomm_ptr)->comm_kind = MPIR_INTRACOMM; + (*new_intracomm_ptr)->comm_kind = MPIR_COMM_KIND__INTRACOMM; /* Now we know which group comes first. Build the new mapping from the existing comm */ @@ -187,7 +187,7 @@ int MPIR_Intercomm_merge_impl(MPIR_Comm *comm_ptr, int high, MPIR_Comm **new_int (*new_intracomm_ptr)->remote_size = (*new_intracomm_ptr)->local_size = new_size; (*new_intracomm_ptr)->rank = -1; - (*new_intracomm_ptr)->comm_kind = MPIR_INTRACOMM; + (*new_intracomm_ptr)->comm_kind = MPIR_COMM_KIND__INTRACOMM; (*new_intracomm_ptr)->context_id = new_context_id; (*new_intracomm_ptr)->recvcontext_id = new_context_id; @@ -198,7 +198,7 @@ int MPIR_Intercomm_merge_impl(MPIR_Comm *comm_ptr, int high, MPIR_Comm **new_int if (mpi_errno) MPIR_ERR_POP(mpi_errno); fn_exit: - MPID_MPI_FUNC_EXIT(MPID_STATE_MPIR_INTERCOMM_MERGE_IMPL); + MPID_MPI_FUNC_EXIT(MPID_STATE_MPIR_COMM_KIND__INTERCOMM_MERGE_IMPL); return mpi_errno; fn_fail: goto fn_exit; @@ -284,7 +284,7 @@ int MPI_Intercomm_merge(MPI_Comm intercomm, int high, MPI_Comm *newintracomm) /* Validate comm_ptr */ MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); /* If comm_ptr is not valid, it will be reset to null */ - if (comm_ptr && comm_ptr->comm_kind != MPIR_INTERCOMM) { + if (comm_ptr && comm_ptr->comm_kind != MPIR_COMM_KIND__INTERCOMM) { mpi_errno = MPIR_Err_create_code( MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_COMM, "**commnotinter", 0 ); diff --git a/src/mpi/group/grouputil.c b/src/mpi/group/grouputil.c index 749f0f5..735c889 100644 --- a/src/mpi/group/grouputil.c +++ b/src/mpi/group/grouputil.c @@ -378,7 +378,7 @@ int MPIR_Group_check_subset( MPIR_Group *group_ptr, MPIR_Comm *comm_ptr ) int mpi_errno = MPI_SUCCESS; int g1_idx, g2_idx, l1_pid, l2_pid, i; MPIR_Group_pmap_t *vmap=0; - int vsize = comm_ptr->comm_kind == MPIR_INTERCOMM ? comm_ptr->local_size : + int vsize = comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM ? comm_ptr->local_size : comm_ptr->remote_size; MPIU_CHKLMEM_DECL(1); diff --git a/src/mpi/init/initthread.c b/src/mpi/init/initthread.c index f2e522a..fb619db 100644 --- a/src/mpi/init/initthread.c +++ b/src/mpi/init/initthread.c @@ -424,7 +424,7 @@ int MPIR_Init_thread(int * argc, char ***argv, int required, int * provided) MPIR_Process.comm_world->handle = MPI_COMM_WORLD; MPIR_Process.comm_world->context_id = 0 << MPIR_CONTEXT_PREFIX_SHIFT; MPIR_Process.comm_world->recvcontext_id = 0 << MPIR_CONTEXT_PREFIX_SHIFT; - MPIR_Process.comm_world->comm_kind = MPIR_INTRACOMM; + MPIR_Process.comm_world->comm_kind = MPIR_COMM_KIND__INTRACOMM; /* This initialization of the comm name could be done only when comm_get_name is called */ MPL_strncpy(MPIR_Process.comm_world->name, "MPI_COMM_WORLD", @@ -435,7 +435,7 @@ int MPIR_Init_thread(int * argc, char ***argv, int required, int * provided) MPIR_Process.comm_self->handle = MPI_COMM_SELF; MPIR_Process.comm_self->context_id = 1 << MPIR_CONTEXT_PREFIX_SHIFT; MPIR_Process.comm_self->recvcontext_id = 1 << MPIR_CONTEXT_PREFIX_SHIFT; - MPIR_Process.comm_self->comm_kind = MPIR_INTRACOMM; + MPIR_Process.comm_self->comm_kind = MPIR_COMM_KIND__INTRACOMM; MPL_strncpy(MPIR_Process.comm_self->name, "MPI_COMM_SELF", MPI_MAX_OBJECT_NAME); @@ -445,7 +445,7 @@ int MPIR_Init_thread(int * argc, char ***argv, int required, int * provided) MPIR_Process.icomm_world->handle = MPIR_ICOMM_WORLD; MPIR_Process.icomm_world->context_id = 2 << MPIR_CONTEXT_PREFIX_SHIFT; MPIR_Process.icomm_world->recvcontext_id= 2 << MPIR_CONTEXT_PREFIX_SHIFT; - MPIR_Process.icomm_world->comm_kind = MPIR_INTRACOMM; + MPIR_Process.icomm_world->comm_kind = MPIR_COMM_KIND__INTRACOMM; MPL_strncpy(MPIR_Process.icomm_world->name, "MPI_ICOMM_WORLD", MPI_MAX_OBJECT_NAME); diff --git a/src/mpid/ch3/src/ch3u_comm.c b/src/mpid/ch3/src/ch3u_comm.c index d37a709..fa49813 100644 --- a/src/mpid/ch3/src/ch3u_comm.c +++ b/src/mpid/ch3/src/ch3u_comm.c @@ -201,10 +201,10 @@ int MPIDI_CH3I_Comm_create_hook(MPIR_Comm *comm) /* do some sanity checks */ MPL_LL_FOREACH(comm->mapper_head, mapper) { - if (mapper->src_comm->comm_kind == MPIR_INTRACOMM) + if (mapper->src_comm->comm_kind == MPIR_COMM_KIND__INTRACOMM) MPIU_Assert(mapper->dir == MPIR_COMM_MAP_DIR_L2L || mapper->dir == MPIR_COMM_MAP_DIR_L2R); - if (comm->comm_kind == MPIR_INTRACOMM) + if (comm->comm_kind == MPIR_COMM_KIND__INTRACOMM) MPIU_Assert(mapper->dir == MPIR_COMM_MAP_DIR_L2L || mapper->dir == MPIR_COMM_MAP_DIR_R2L); } @@ -228,14 +228,14 @@ int MPIDI_CH3I_Comm_create_hook(MPIR_Comm *comm) continue; if (mapper->dir == MPIR_COMM_MAP_DIR_L2L) { - if (src_comm->comm_kind == MPIR_INTRACOMM && comm->comm_kind == MPIR_INTRACOMM) { + if (src_comm->comm_kind == MPIR_COMM_KIND__INTRACOMM && comm->comm_kind == MPIR_COMM_KIND__INTRACOMM) { dup_vcrt(src_comm->dev.vcrt, &comm->dev.vcrt, mapper, mapper->src_comm->local_size, vcrt_size, vcrt_offset); } - else if (src_comm->comm_kind == MPIR_INTRACOMM && comm->comm_kind == MPIR_INTERCOMM) + else if (src_comm->comm_kind == MPIR_COMM_KIND__INTRACOMM && comm->comm_kind == MPIR_COMM_KIND__INTERCOMM) dup_vcrt(src_comm->dev.vcrt, &comm->dev.local_vcrt, mapper, mapper->src_comm->local_size, vcrt_size, vcrt_offset); - else if (src_comm->comm_kind == MPIR_INTERCOMM && comm->comm_kind == MPIR_INTRACOMM) { + else if (src_comm->comm_kind == MPIR_COMM_KIND__INTERCOMM && comm->comm_kind == MPIR_COMM_KIND__INTRACOMM) { dup_vcrt(src_comm->dev.local_vcrt, &comm->dev.vcrt, mapper, mapper->src_comm->local_size, vcrt_size, vcrt_offset); } @@ -244,8 +244,8 @@ int MPIDI_CH3I_Comm_create_hook(MPIR_Comm *comm) mapper->src_comm->local_size, vcrt_size, vcrt_offset); } else { /* mapper->dir == MPIR_COMM_MAP_DIR_R2L */ - MPIU_Assert(src_comm->comm_kind == MPIR_INTERCOMM); - if (comm->comm_kind == MPIR_INTRACOMM) { + MPIU_Assert(src_comm->comm_kind == MPIR_COMM_KIND__INTERCOMM); + if (comm->comm_kind == MPIR_COMM_KIND__INTRACOMM) { dup_vcrt(src_comm->dev.vcrt, &comm->dev.vcrt, mapper, mapper->src_comm->remote_size, vcrt_size, vcrt_offset); } @@ -274,10 +274,10 @@ int MPIDI_CH3I_Comm_create_hook(MPIR_Comm *comm) mapper->dir == MPIR_COMM_MAP_DIR_R2L) continue; - MPIU_Assert(comm->comm_kind == MPIR_INTERCOMM); + MPIU_Assert(comm->comm_kind == MPIR_COMM_KIND__INTERCOMM); if (mapper->dir == MPIR_COMM_MAP_DIR_L2R) { - if (src_comm->comm_kind == MPIR_INTRACOMM) + if (src_comm->comm_kind == MPIR_COMM_KIND__INTRACOMM) dup_vcrt(src_comm->dev.vcrt, &comm->dev.vcrt, mapper, mapper->src_comm->local_size, vcrt_size, vcrt_offset); else @@ -285,14 +285,14 @@ int MPIDI_CH3I_Comm_create_hook(MPIR_Comm *comm) mapper->src_comm->local_size, vcrt_size, vcrt_offset); } else { /* mapper->dir == MPIR_COMM_MAP_DIR_R2R */ - MPIU_Assert(src_comm->comm_kind == MPIR_INTERCOMM); + MPIU_Assert(src_comm->comm_kind == MPIR_COMM_KIND__INTERCOMM); dup_vcrt(src_comm->dev.vcrt, &comm->dev.vcrt, mapper, mapper->src_comm->remote_size, vcrt_size, vcrt_offset); } vcrt_offset += map_size(*mapper); } - if (comm->comm_kind == MPIR_INTERCOMM) { + if (comm->comm_kind == MPIR_COMM_KIND__INTERCOMM) { /* setup the vcrt for the local_comm in the intercomm */ if (comm->local_comm) { comm->local_comm->dev.vcrt = comm->dev.local_vcrt; @@ -332,7 +332,7 @@ int MPIDI_CH3I_Comm_destroy_hook(MPIR_Comm *comm) mpi_errno = MPIDI_VCRT_Release(comm->dev.vcrt, comm->dev.is_disconnected); if (mpi_errno) MPIR_ERR_POP(mpi_errno); - if (comm->comm_kind == MPIR_INTERCOMM) { + if (comm->comm_kind == MPIR_COMM_KIND__INTERCOMM) { mpi_errno = MPIDI_VCRT_Release(comm->dev.local_vcrt, comm->dev.is_disconnected); if (mpi_errno) MPIR_ERR_POP(mpi_errno); } diff --git a/src/mpid/ch3/src/ch3u_port.c b/src/mpid/ch3/src/ch3u_port.c index 3b76447..7887f69 100644 --- a/src/mpid/ch3/src/ch3u_port.c +++ b/src/mpid/ch3/src/ch3u_port.c @@ -273,7 +273,7 @@ static int MPIDI_CH3I_Initialize_tmp_comm(MPIR_Comm **comm_pptr, /* Fill in new intercomm */ tmp_comm->local_size = 1; tmp_comm->rank = 0; - tmp_comm->comm_kind = MPIR_INTERCOMM; + tmp_comm->comm_kind = MPIR_COMM_KIND__INTERCOMM; tmp_comm->local_comm = NULL; tmp_comm->is_low_group = is_low_group; @@ -1164,7 +1164,7 @@ static int SetupNewIntercomm( MPIR_Comm *comm_ptr, int remote_comm_size, intercomm->rank = comm_ptr->rank; intercomm->local_group = NULL; intercomm->remote_group = NULL; - intercomm->comm_kind = MPIR_INTERCOMM; + intercomm->comm_kind = MPIR_COMM_KIND__INTERCOMM; intercomm->local_comm = NULL; intercomm->coll_fns = NULL; diff --git a/src/mpid/ch3/src/ch3u_recvq.c b/src/mpid/ch3/src/ch3u_recvq.c index 96daa93..fc28c7d 100644 --- a/src/mpid/ch3/src/ch3u_recvq.c +++ b/src/mpid/ch3/src/ch3u_recvq.c @@ -961,7 +961,7 @@ int MPIDI_CH3U_Clean_recvq(MPIR_Comm *comm_ptr) if (MPIR_Comm_is_node_aware(comm_ptr)) { int offset; - offset = (comm_ptr->comm_kind == MPIR_INTRACOMM) ? MPIR_CONTEXT_INTRA_PT2PT : MPIR_CONTEXT_INTER_PT2PT; + offset = (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) ? MPIR_CONTEXT_INTRA_PT2PT : MPIR_CONTEXT_INTER_PT2PT; match.parts.context_id = comm_ptr->recvcontext_id + MPIR_CONTEXT_INTRANODE_OFFSET + offset; if (MATCH_WITH_LEFT_RIGHT_MASK(rreq->dev.match, match, mask)) { @@ -975,7 +975,7 @@ int MPIDI_CH3U_Clean_recvq(MPIR_Comm *comm_ptr) } } - offset = (comm_ptr->comm_kind == MPIR_INTRACOMM) ? MPIR_CONTEXT_INTRA_COLL : MPIR_CONTEXT_INTER_COLL; + offset = (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) ? MPIR_CONTEXT_INTRA_COLL : MPIR_CONTEXT_INTER_COLL; match.parts.context_id = comm_ptr->recvcontext_id + MPIR_CONTEXT_INTRANODE_OFFSET + offset; if (MATCH_WITH_LEFT_RIGHT_MASK(rreq->dev.match, match, mask)) { @@ -989,7 +989,7 @@ int MPIDI_CH3U_Clean_recvq(MPIR_Comm *comm_ptr) } } - offset = (comm_ptr->comm_kind == MPIR_INTRACOMM) ? MPIR_CONTEXT_INTRA_PT2PT : MPIR_CONTEXT_INTER_PT2PT; + offset = (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) ? MPIR_CONTEXT_INTRA_PT2PT : MPIR_CONTEXT_INTER_PT2PT; match.parts.context_id = comm_ptr->recvcontext_id + MPIR_CONTEXT_INTERNODE_OFFSET + offset; if (MATCH_WITH_LEFT_RIGHT_MASK(rreq->dev.match, match, mask)) { @@ -1003,7 +1003,7 @@ int MPIDI_CH3U_Clean_recvq(MPIR_Comm *comm_ptr) } } - offset = (comm_ptr->comm_kind == MPIR_INTRACOMM) ? MPIR_CONTEXT_INTRA_COLL : MPIR_CONTEXT_INTER_COLL; + offset = (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) ? MPIR_CONTEXT_INTRA_COLL : MPIR_CONTEXT_INTER_COLL; match.parts.context_id = comm_ptr->recvcontext_id + MPIR_CONTEXT_INTERNODE_OFFSET + offset; if (MATCH_WITH_LEFT_RIGHT_MASK(rreq->dev.match, match, mask)) { @@ -1053,7 +1053,7 @@ int MPIDI_CH3U_Clean_recvq(MPIR_Comm *comm_ptr) if (MPIR_Comm_is_node_aware(comm_ptr)) { int offset; - offset = (comm_ptr->comm_kind == MPIR_INTRACOMM) ? MPIR_CONTEXT_INTRA_PT2PT : MPIR_CONTEXT_INTER_PT2PT; + offset = (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) ? MPIR_CONTEXT_INTRA_PT2PT : MPIR_CONTEXT_INTER_PT2PT; match.parts.context_id = comm_ptr->recvcontext_id + MPIR_CONTEXT_INTRANODE_OFFSET + offset; if (MATCH_WITH_LEFT_RIGHT_MASK(rreq->dev.match, match, mask)) { @@ -1067,7 +1067,7 @@ int MPIDI_CH3U_Clean_recvq(MPIR_Comm *comm_ptr) } } - offset = (comm_ptr->comm_kind == MPIR_INTRACOMM) ? MPIR_CONTEXT_INTRA_COLL : MPIR_CONTEXT_INTER_COLL; + offset = (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) ? MPIR_CONTEXT_INTRA_COLL : MPIR_CONTEXT_INTER_COLL; match.parts.context_id = comm_ptr->recvcontext_id + MPIR_CONTEXT_INTRANODE_OFFSET + offset; if (MATCH_WITH_LEFT_RIGHT_MASK(rreq->dev.match, match, mask)) { @@ -1081,7 +1081,7 @@ int MPIDI_CH3U_Clean_recvq(MPIR_Comm *comm_ptr) } } - offset = (comm_ptr->comm_kind == MPIR_INTRACOMM) ? MPIR_CONTEXT_INTRA_PT2PT : MPIR_CONTEXT_INTER_PT2PT; + offset = (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) ? MPIR_CONTEXT_INTRA_PT2PT : MPIR_CONTEXT_INTER_PT2PT; match.parts.context_id = comm_ptr->recvcontext_id + MPIR_CONTEXT_INTERNODE_OFFSET + offset; if (MATCH_WITH_LEFT_RIGHT_MASK(rreq->dev.match, match, mask)) { @@ -1095,7 +1095,7 @@ int MPIDI_CH3U_Clean_recvq(MPIR_Comm *comm_ptr) } } - offset = (comm_ptr->comm_kind == MPIR_INTRACOMM) ? MPIR_CONTEXT_INTRA_COLL : MPIR_CONTEXT_INTER_COLL; + offset = (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) ? MPIR_CONTEXT_INTRA_COLL : MPIR_CONTEXT_INTER_COLL; match.parts.context_id = comm_ptr->recvcontext_id + MPIR_CONTEXT_INTERNODE_OFFSET + offset; if (MATCH_WITH_LEFT_RIGHT_MASK(rreq->dev.match, match, mask)) { diff --git a/src/mpid/ch3/src/mpid_irsend.c b/src/mpid/ch3/src/mpid_irsend.c index 5b651e0..1105509 100644 --- a/src/mpid/ch3/src/mpid_irsend.c +++ b/src/mpid/ch3/src/mpid_irsend.c @@ -45,7 +45,7 @@ int MPID_Irsend(const void * buf, int count, MPI_Datatype datatype, int rank, in MPIR_ERR_SETANDJUMP(mpi_errno,MPIX_ERR_REVOKED,"**revoked"); } - if (rank == comm->rank && comm->comm_kind != MPIR_INTERCOMM) + if (rank == comm->rank && comm->comm_kind != MPIR_COMM_KIND__INTERCOMM) { mpi_errno = MPIDI_Isend_self(buf, count, datatype, rank, tag, comm, context_offset, MPIDI_REQUEST_TYPE_RSEND, &sreq); goto fn_exit; diff --git a/src/mpid/ch3/src/mpid_isend.c b/src/mpid/ch3/src/mpid_isend.c index f1ebd05..ad91ad1 100644 --- a/src/mpid/ch3/src/mpid_isend.c +++ b/src/mpid/ch3/src/mpid_isend.c @@ -58,7 +58,7 @@ int MPID_Isend(const void * buf, MPI_Aint count, MPI_Datatype datatype, int rank MPIR_ERR_SETANDJUMP(mpi_errno,MPIX_ERR_REVOKED,"**revoked"); } - if (rank == comm->rank && comm->comm_kind != MPIR_INTERCOMM) + if (rank == comm->rank && comm->comm_kind != MPIR_COMM_KIND__INTERCOMM) { mpi_errno = MPIDI_Isend_self(buf, count, datatype, rank, tag, comm, context_offset, MPIDI_REQUEST_TYPE_SEND, &sreq); diff --git a/src/mpid/ch3/src/mpid_issend.c b/src/mpid/ch3/src/mpid_issend.c index 450ed2a..5397b24 100644 --- a/src/mpid/ch3/src/mpid_issend.c +++ b/src/mpid/ch3/src/mpid_issend.c @@ -44,7 +44,7 @@ int MPID_Issend(const void * buf, int count, MPI_Datatype datatype, int rank, in MPIR_ERR_SETANDJUMP(mpi_errno,MPIX_ERR_REVOKED,"**revoked"); } - if (rank == comm->rank && comm->comm_kind != MPIR_INTERCOMM) + if (rank == comm->rank && comm->comm_kind != MPIR_COMM_KIND__INTERCOMM) { mpi_errno = MPIDI_Isend_self(buf, count, datatype, rank, tag, comm, context_offset, MPIDI_REQUEST_TYPE_SSEND, &sreq); goto fn_exit; diff --git a/src/mpid/ch3/src/mpid_rsend.c b/src/mpid/ch3/src/mpid_rsend.c index 019d792..794fef9 100644 --- a/src/mpid/ch3/src/mpid_rsend.c +++ b/src/mpid/ch3/src/mpid_rsend.c @@ -47,7 +47,7 @@ int MPID_Rsend(const void * buf, int count, MPI_Datatype datatype, int rank, int MPIR_ERR_SETANDJUMP(mpi_errno,MPIX_ERR_REVOKED,"**revoked"); } - if (rank == comm->rank && comm->comm_kind != MPIR_INTERCOMM) + if (rank == comm->rank && comm->comm_kind != MPIR_COMM_KIND__INTERCOMM) { mpi_errno = MPIDI_Isend_self(buf, count, datatype, rank, tag, comm, context_offset, MPIDI_REQUEST_TYPE_RSEND, &sreq); goto fn_exit; diff --git a/src/mpid/ch3/src/mpid_send.c b/src/mpid/ch3/src/mpid_send.c index 9b7ed2c..c438d72 100644 --- a/src/mpid/ch3/src/mpid_send.c +++ b/src/mpid/ch3/src/mpid_send.c @@ -45,7 +45,7 @@ int MPID_Send(const void * buf, MPI_Aint count, MPI_Datatype datatype, int rank, MPIR_ERR_SETANDJUMP(mpi_errno,MPIX_ERR_REVOKED,"**revoked"); } - if (rank == comm->rank && comm->comm_kind != MPIR_INTERCOMM) + if (rank == comm->rank && comm->comm_kind != MPIR_COMM_KIND__INTERCOMM) { mpi_errno = MPIDI_Isend_self(buf, count, datatype, rank, tag, comm, context_offset, MPIDI_REQUEST_TYPE_SEND, diff --git a/src/mpid/ch3/src/mpid_ssend.c b/src/mpid/ch3/src/mpid_ssend.c index 7b582d4..94f9f1b 100644 --- a/src/mpid/ch3/src/mpid_ssend.c +++ b/src/mpid/ch3/src/mpid_ssend.c @@ -44,7 +44,7 @@ int MPID_Ssend(const void * buf, MPI_Aint count, MPI_Datatype datatype, int rank MPIR_ERR_SETANDJUMP(mpi_errno,MPIX_ERR_REVOKED,"**revoked"); } - if (rank == comm->rank && comm->comm_kind != MPIR_INTERCOMM) + if (rank == comm->rank && comm->comm_kind != MPIR_COMM_KIND__INTERCOMM) { mpi_errno = MPIDI_Isend_self(buf, count, datatype, rank, tag, comm, context_offset, MPIDI_REQUEST_TYPE_SSEND, diff --git a/src/mpid/ch3/src/mpid_vc.c b/src/mpid/ch3/src/mpid_vc.c index 8d59de7..3541876 100644 --- a/src/mpid/ch3/src/mpid_vc.c +++ b/src/mpid/ch3/src/mpid_vc.c @@ -306,7 +306,7 @@ int MPID_Comm_get_lpid(MPIR_Comm *comm_ptr, int idx, int * lpid_ptr, MPIU_BOOL i MPIDI_FUNC_ENTER(MPID_STATE_MPID_VCR_GET_LPID); - if (comm_ptr->comm_kind == MPIR_INTRACOMM) + if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) *lpid_ptr = comm_ptr->dev.vcrt->vcr_table[idx]->lpid; else if (is_remote) *lpid_ptr = comm_ptr->dev.vcrt->vcr_table[idx]->lpid; diff --git a/src/mpid/common/hcoll/hcoll_init.c b/src/mpid/common/hcoll/hcoll_init.c index f426417..1935e40 100644 --- a/src/mpid/common/hcoll/hcoll_init.c +++ b/src/mpid/common/hcoll/hcoll_init.c @@ -161,7 +161,7 @@ int hcoll_comm_create(MPIR_Comm * comm_ptr, void *param) goto fn_exit; } num_ranks = comm_ptr->local_size; - if ((MPIR_INTRACOMM != comm_ptr->comm_kind) || (2 > num_ranks)) { + if ((MPIR_COMM_KIND__INTRACOMM != comm_ptr->comm_kind) || (2 > num_ranks)) { comm_ptr->hcoll_priv.is_hcoll_init = 0; goto fn_exit; } diff --git a/src/mpid/pamid/src/coll/red_scat/mpido_red_scat.c b/src/mpid/pamid/src/coll/red_scat/mpido_red_scat.c index dcfe437..d207f45 100644 --- a/src/mpid/pamid/src/coll/red_scat/mpido_red_scat.c +++ b/src/mpid/pamid/src/coll/red_scat/mpido_red_scat.c @@ -159,7 +159,7 @@ int MPIDO_Reduce_scatter_block(const void *sendbuf, rcbuf = recvbuf; int cuda_res; - if(comm_ptr->comm_kind == MPIR_INTRACOMM) + if(comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) cuda_res = MPIR_Reduce_scatter_block_intra(scbuf, rcbuf, recvcount, datatype, op, comm_ptr, mpierrno); else cuda_res = MPIR_Reduce_scatter_block_inter(scbuf, rcbuf, recvcount, datatype, op, comm_ptr, mpierrno); @@ -175,7 +175,7 @@ int MPIDO_Reduce_scatter_block(const void *sendbuf, } else #endif - if(comm_ptr->comm_kind == MPIR_INTRACOMM) + if(comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) return MPIR_Reduce_scatter_block_intra(sendbuf, recvbuf, recvcount, datatype, op, comm_ptr, mpierrno); else return MPIR_Reduce_scatter_block_inter(sendbuf, recvbuf, recvcount, datatype, op, comm_ptr, mpierrno); diff --git a/src/mpid/pamid/src/comm/mpid_comm.c b/src/mpid/pamid/src/comm/mpid_comm.c index 30fbefa..ab21b69 100644 --- a/src/mpid/pamid/src/comm/mpid_comm.c +++ b/src/mpid/pamid/src/comm/mpid_comm.c @@ -227,7 +227,7 @@ void MPIDI_Coll_comm_create(MPIR_Comm *comm) if (!MPIDI_Process.optimized.collectives) return; - if(comm->comm_kind != MPIR_INTRACOMM) return; + if(comm->comm_kind != MPIR_COMM_KIND__INTRACOMM) return; /* Create a geometry */ comm->coll_fns = MPL_calloc0(1, MPIR_Collops); @@ -372,7 +372,7 @@ void MPIDI_Coll_comm_destroy(MPIR_Comm *comm) if (!MPIDI_Process.optimized.collectives) return; - if(comm->comm_kind != MPIR_INTRACOMM) + if(comm->comm_kind != MPIR_COMM_KIND__INTRACOMM) return; /* It's possible (MPIR_Setup_intercomm_localcomm) to have an intracomm diff --git a/src/mpid/pamid/src/dyntask/mpid_comm_disconnect.c b/src/mpid/pamid/src/dyntask/mpid_comm_disconnect.c index 33ab772..1135fd6 100644 --- a/src/mpid/pamid/src/dyntask/mpid_comm_disconnect.c +++ b/src/mpid/pamid/src/dyntask/mpid_comm_disconnect.c @@ -216,7 +216,7 @@ int MPID_Comm_disconnect(MPIR_Comm *comm_ptr) char jobId[jobIdSize]; int MY_TASKID = PAMIX_Client_query(MPIDI_Client, PAMI_CLIENT_TASK_ID ).value.intval; - /*if( (comm_ptr->comm_kind == MPIR_INTERCOMM) && (comm_ptr->mpid.world_ids != NULL)) { */ + /*if( (comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM) && (comm_ptr->mpid.world_ids != NULL)) { */ if(comm_ptr->mpid.world_ids != NULL) { rc = MPID_Iprobe(comm_ptr->rank, MPI_ANY_TAG, comm_ptr, MPIR_CONTEXT_INTER_PT2PT, &probe_flag, &status); if(rc || probe_flag) { @@ -250,7 +250,7 @@ int MPID_Comm_disconnect(MPIR_Comm *comm_ptr) * the GROUPREMLIST, so these tasks will have to be use in addition * to the tasks in GROUPLIST to construct lcomm **/ - if(comm_ptr->comm_kind == MPIR_INTERCOMM) { + if(comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM) { for(i=0;i<comm_ptr->remote_size;i++) { for(j=0;j<gsize;j++) { if(comm_ptr->vcr[i]->taskid == glist[j]->taskid) { @@ -271,7 +271,7 @@ int MPID_Comm_disconnect(MPIR_Comm *comm_ptr) ranks[k++] = j; } } - if((comm_ptr->comm_kind == MPIR_INTERCOMM) && localtasks_in_remglist) { + if((comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM) && localtasks_in_remglist) { for(i=0;i<comm_ptr->remote_size;i++) { for(j=0;j<gsize;j++) { if(comm_ptr->vcr[i]->taskid == glist[j]->taskid) @@ -326,7 +326,7 @@ int MPID_Comm_disconnect(MPIR_Comm *comm_ptr) /* FIXME - we probably need a unique context_id. */ /* Fill in new intercomm */ - lcomm->comm_kind = MPIR_INTRACOMM; + lcomm->comm_kind = MPIR_COMM_KIND__INTRACOMM; lcomm->remote_size = lcomm->local_size = local_tasks; /* Set up VC reference table */ @@ -477,7 +477,7 @@ void MPIDI_get_allremote_leaders(int *tid_arr, MPIR_Comm *comm_ptr) if(tmp_node==NULL) {TRACE_ERR("_conn_info_list is NULL\n");} while(tmp_node != NULL) { if(tmp_node->rem_world_id == comm_ptr->mpid.world_ids[i]) { - if(comm_ptr->comm_kind == MPIR_INTRACOMM) { + if(comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM) { glist = comm_ptr->local_vcr; gsize = comm_ptr->local_size; } @@ -505,7 +505,7 @@ void MPIDI_get_allremote_leaders(int *tid_arr, MPIR_Comm *comm_ptr) * of world-x in my GROUPLIST and then see which of the two leaders is the * smallest one. The smallest one is the one in which I am interested. **/ - if(comm_ptr->comm_kind == MPIR_INTERCOMM) { + if(comm_ptr->comm_kind == MPIR_COMM_KIND__INTERCOMM) { found=0; glist = comm_ptr->local_vcr; gsize = comm_ptr->local_size; diff --git a/src/mpid/pamid/src/dyntask/mpidi_port.c b/src/mpid/pamid/src/dyntask/mpidi_port.c index f0b5fe7..10c6c86 100644 --- a/src/mpid/pamid/src/dyntask/mpidi_port.c +++ b/src/mpid/pamid/src/dyntask/mpidi_port.c @@ -409,7 +409,7 @@ static int MPIDI_Initialize_tmp_comm(struct MPIR_Comm **comm_pptr, /* Fill in new intercomm */ tmp_comm->local_size = 1; tmp_comm->rank = 0; - tmp_comm->comm_kind = MPIR_INTERCOMM; + tmp_comm->comm_kind = MPIR_COMM_KIND__INTERCOMM; tmp_comm->local_comm = NULL; tmp_comm->is_low_group = is_low_group; @@ -1409,7 +1409,7 @@ static int MPIDI_SetupNewIntercomm( struct MPIR_Comm *comm_ptr, int remote_comm_ intercomm->rank = comm_ptr->rank; intercomm->local_group = NULL; intercomm->remote_group = NULL; - intercomm->comm_kind = MPIR_INTERCOMM; + intercomm->comm_kind = MPIR_COMM_KIND__INTERCOMM; intercomm->local_comm = NULL; intercomm->coll_fns = NULL; intercomm->mpid.world_ids = NULL; /*FIXME*/ diff --git a/src/util/procmap/local_proc.c b/src/util/procmap/local_proc.c index fee6a8a..2ebb358 100644 --- a/src/util/procmap/local_proc.c +++ b/src/util/procmap/local_proc.c @@ -235,7 +235,7 @@ int MPIU_Get_internode_rank(MPIR_Comm *comm_ptr, int r) MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); MPIU_Assert(mpi_errno == MPI_SUCCESS); MPIU_Assert(r < comm_ptr->remote_size); - MPIU_Assert(comm_ptr->comm_kind == MPIR_INTRACOMM); + MPIU_Assert(comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM); MPIU_Assert(comm_ptr->internode_table != NULL); return comm_ptr->internode_table[r]; @@ -256,7 +256,7 @@ int MPIU_Get_intranode_rank(MPIR_Comm *comm_ptr, int r) MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); MPIU_Assert(mpi_errno == MPI_SUCCESS); MPIU_Assert(r < comm_ptr->remote_size); - MPIU_Assert(comm_ptr->comm_kind == MPIR_INTRACOMM); + MPIU_Assert(comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM); MPIU_Assert(comm_ptr->intranode_table != NULL); /* FIXME this could/should be a list of ranks on the local node, which http://git.mpich.org/mpich.git/commitdiff/cfd8c8855619a325919155b19c32744db… commit cfd8c8855619a325919155b19c32744dba5fe718 Author: Pavan Balaji <balaji(a)anl.gov> Date: Wed Apr 20 20:41:55 2016 -0500 Namespace MPIR_Lang_t elements. Signed-off-by: Wesley Bland <wesley.bland(a)intel.com> diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index f101ee5..55de079 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -331,13 +331,13 @@ extern MPID_Thread_tls_t MPIR_Per_thread_key; Attribute-DS E*/ typedef enum MPIR_Lang_t { - MPIR_LANG_C + MPIR_LANG__C #ifdef HAVE_FORTRAN_BINDING - , MPIR_LANG_FORTRAN - , MPIR_LANG_FORTRAN90 + , MPIR_LANG__FORTRAN + , MPIR_LANG__FORTRAN90 #endif #ifdef HAVE_CXX_BINDING - , MPIR_LANG_CXX + , MPIR_LANG__CXX #endif } MPIR_Lang_t; diff --git a/src/mpi/coll/op_create.c b/src/mpi/coll/op_create.c index dddb47a..f05c87f 100644 --- a/src/mpi/coll/op_create.c +++ b/src/mpi/coll/op_create.c @@ -43,7 +43,7 @@ void MPIR_Op_set_cxx( MPI_Op op, void (*opcall)(void) ) MPIR_Op *op_ptr; MPIR_Op_get_ptr( op, op_ptr ); - op_ptr->language = MPIR_LANG_CXX; + op_ptr->language = MPIR_LANG__CXX; MPIR_Process.cxx_call_op_fn = (void (*)(const void *, void *, int, MPI_Datatype, MPI_User_function *))opcall; } @@ -58,7 +58,7 @@ void MPIR_Op_set_fc( MPI_Op op ) MPIR_Op *op_ptr; MPIR_Op_get_ptr( op, op_ptr ); - op_ptr->language = MPIR_LANG_FORTRAN; + op_ptr->language = MPIR_LANG__FORTRAN; } #endif @@ -123,7 +123,7 @@ int MPI_Op_create(MPI_User_function *user_fn, int commute, MPI_Op *op) } /* --END ERROR HANDLING-- */ - op_ptr->language = MPIR_LANG_C; + op_ptr->language = MPIR_LANG__C; op_ptr->kind = commute ? MPIR_OP_USER : MPIR_OP_USER_NONCOMMUTE; op_ptr->function.c_function = (void (*)(const void *, void *, const int *, const MPI_Datatype *))user_fn; diff --git a/src/mpi/coll/reduce_local.c b/src/mpi/coll/reduce_local.c index d76c155..ffa7cf5 100644 --- a/src/mpi/coll/reduce_local.c +++ b/src/mpi/coll/reduce_local.c @@ -65,14 +65,14 @@ int MPIR_Reduce_local_impl(const void *inbuf, void *inoutbuf, int count, MPI_Dat MPIR_Op_get_ptr(op, op_ptr); #ifdef HAVE_CXX_BINDING - if (op_ptr->language == MPIR_LANG_CXX) { + if (op_ptr->language == MPIR_LANG__CXX) { uop = (MPI_User_function *) op_ptr->function.c_function; is_cxx_uop = 1; } else #endif { - if (op_ptr->language == MPIR_LANG_C) { + if (op_ptr->language == MPIR_LANG__C) { uop = (MPI_User_function *) op_ptr->function.c_function; } else { diff --git a/src/mpi/errhan/comm_call_errhandler.c b/src/mpi/errhan/comm_call_errhandler.c index 04fa93d..cb3245e 100644 --- a/src/mpi/errhan/comm_call_errhandler.c +++ b/src/mpi/errhan/comm_call_errhandler.c @@ -125,20 +125,20 @@ int MPI_Comm_call_errhandler(MPI_Comm comm, int errorcode) /* Process any user-defined error handling function */ switch (comm_ptr->errhandler->language) { - case MPIR_LANG_C: + case MPIR_LANG__C: (*comm_ptr->errhandler->errfn.C_Comm_Handler_function)( &comm_ptr->handle, &errorcode ); break; #ifdef HAVE_CXX_BINDING - case MPIR_LANG_CXX: + case MPIR_LANG__CXX: MPIR_Process.cxx_call_errfn( 0, &comm_ptr->handle, &errorcode, (void (*)(void))comm_ptr->errhandler->errfn.C_Comm_Handler_function ); break; #endif #ifdef HAVE_FORTRAN_BINDING - case MPIR_LANG_FORTRAN90: - case MPIR_LANG_FORTRAN: + case MPIR_LANG__FORTRAN90: + case MPIR_LANG__FORTRAN: { /* If int and MPI_Fint aren't the same size, we need to convert. As this is not performance critical, we diff --git a/src/mpi/errhan/comm_create_errhandler.c b/src/mpi/errhan/comm_create_errhandler.c index dbc1137..4dbb52e 100644 --- a/src/mpi/errhan/comm_create_errhandler.c +++ b/src/mpi/errhan/comm_create_errhandler.c @@ -39,7 +39,7 @@ int MPIR_Comm_create_errhandler_impl(MPI_Comm_errhandler_function *comm_errhandl errhan_ptr = (MPIR_Errhandler *)MPIU_Handle_obj_alloc( &MPIR_Errhandler_mem ); MPIR_ERR_CHKANDJUMP(!errhan_ptr, mpi_errno, MPI_ERR_OTHER, "**nomem"); - errhan_ptr->language = MPIR_LANG_C; + errhan_ptr->language = MPIR_LANG__C; errhan_ptr->kind = MPIR_COMM; MPIU_Object_set_ref(errhan_ptr,1); errhan_ptr->errfn.C_Comm_Handler_function = comm_errhandler_fn; diff --git a/src/mpi/errhan/errutil.c b/src/mpi/errhan/errutil.c index 93c94ee..a876bb8 100644 --- a/src/mpi/errhan/errutil.c +++ b/src/mpi/errhan/errutil.c @@ -181,7 +181,7 @@ void MPIR_Errhandler_set_cxx( MPI_Errhandler errhand, void (*errcall)(void) ) MPIR_Errhandler *errhand_ptr; MPIR_Errhandler_get_ptr( errhand, errhand_ptr ); - errhand_ptr->language = MPIR_LANG_CXX; + errhand_ptr->language = MPIR_LANG__CXX; MPIR_Process.cxx_call_errfn = (void (*)( int, int *, int *, void (*)(void) ))errcall; } @@ -193,7 +193,7 @@ void MPIR_Errhandler_set_fc( MPI_Errhandler errhand ) MPIR_Errhandler *errhand_ptr; MPIR_Errhandler_get_ptr( errhand, errhand_ptr ); - errhand_ptr->language = MPIR_LANG_FORTRAN; + errhand_ptr->language = MPIR_LANG__FORTRAN; } #endif @@ -306,12 +306,12 @@ int MPIR_Err_return_comm( MPIR_Comm *comm_ptr, const char fcname[], because MPICH-1 expected that */ switch (comm_ptr->errhandler->language) { - case MPIR_LANG_C: + case MPIR_LANG__C: (*comm_ptr->errhandler->errfn.C_Comm_Handler_function)( &comm_ptr->handle, &errcode, 0 ); break; #ifdef HAVE_CXX_BINDING - case MPIR_LANG_CXX: + case MPIR_LANG__CXX: (*MPIR_Process.cxx_call_errfn)( 0, &comm_ptr->handle, &errcode, (void (*)(void))*comm_ptr->errhandler->errfn.C_Comm_Handler_function ); /* The C++ code throws an exception if the error handler @@ -321,8 +321,8 @@ int MPIR_Err_return_comm( MPIR_Comm *comm_ptr, const char fcname[], break; #endif /* CXX_BINDING */ #ifdef HAVE_FORTRAN_BINDING - case MPIR_LANG_FORTRAN90: - case MPIR_LANG_FORTRAN: + case MPIR_LANG__FORTRAN90: + case MPIR_LANG__FORTRAN: { /* If int and MPI_Fint aren't the same size, we need to convert. As this is not performance critical, we @@ -384,12 +384,12 @@ int MPIR_Err_return_win( MPIR_Win *win_ptr, const char fcname[], int errcode ) because MPICH-1 expected that */ switch (win_ptr->errhandler->language) { - case MPIR_LANG_C: + case MPIR_LANG__C: (*win_ptr->errhandler->errfn.C_Win_Handler_function)( &win_ptr->handle, &errcode, 0 ); break; #ifdef HAVE_CXX_BINDING - case MPIR_LANG_CXX: + case MPIR_LANG__CXX: (*MPIR_Process.cxx_call_errfn)( 2, &win_ptr->handle, &errcode, (void (*)(void))*win_ptr->errhandler->errfn.C_Win_Handler_function ); /* The C++ code throws an exception if the error handler @@ -399,8 +399,8 @@ int MPIR_Err_return_win( MPIR_Win *win_ptr, const char fcname[], int errcode ) break; #endif /* CXX_BINDING */ #ifdef HAVE_FORTRAN_BINDING - case MPIR_LANG_FORTRAN90: - case MPIR_LANG_FORTRAN: + case MPIR_LANG__FORTRAN90: + case MPIR_LANG__FORTRAN: { /* If int and MPI_Fint aren't the same size, we need to convert. As this is not performance critical, we diff --git a/src/mpi/errhan/file_call_errhandler.c b/src/mpi/errhan/file_call_errhandler.c index d5ea20b..d0473b4 100644 --- a/src/mpi/errhan/file_call_errhandler.c +++ b/src/mpi/errhan/file_call_errhandler.c @@ -100,11 +100,11 @@ int MPI_File_call_errhandler(MPI_File fh, int errorcode) } switch (e->language) { - case MPIR_LANG_C: + case MPIR_LANG__C: (*e->errfn.C_File_Handler_function)( &fh, &errorcode ); break; #ifdef HAVE_CXX_BINDING - case MPIR_LANG_CXX: + case MPIR_LANG__CXX: /* See HAVE_LANGUAGE_FORTRAN below for an explanation */ { void *fh1 = (void *)&fh; (*MPIR_Process.cxx_call_errfn)( 1, fh1, &errorcode, @@ -113,8 +113,8 @@ int MPI_File_call_errhandler(MPI_File fh, int errorcode) break; #endif #ifdef HAVE_FORTRAN_BINDING - case MPIR_LANG_FORTRAN90: - case MPIR_LANG_FORTRAN: + case MPIR_LANG__FORTRAN90: + case MPIR_LANG__FORTRAN: /* The assignemt to a local variable prevents the compiler from generating a warning about a type-punned pointer. Since the value is really const (but MPI didn't define error handlers diff --git a/src/mpi/errhan/file_create_errhandler.c b/src/mpi/errhan/file_create_errhandler.c index c8419cb..18fac11 100644 --- a/src/mpi/errhan/file_create_errhandler.c +++ b/src/mpi/errhan/file_create_errhandler.c @@ -76,7 +76,7 @@ int MPI_File_create_errhandler(MPI_File_errhandler_function *file_errhandler_fn, errhan_ptr = (MPIR_Errhandler *)MPIU_Handle_obj_alloc( &MPIR_Errhandler_mem ); MPIR_ERR_CHKANDJUMP(!errhan_ptr,mpi_errno,MPI_ERR_OTHER,"**nomem"); - errhan_ptr->language = MPIR_LANG_C; + errhan_ptr->language = MPIR_LANG__C; errhan_ptr->kind = MPIR_FILE; MPIU_Object_set_ref(errhan_ptr,1); errhan_ptr->errfn.C_File_Handler_function = file_errhandler_fn; diff --git a/src/mpi/errhan/file_set_errhandler.c b/src/mpi/errhan/file_set_errhandler.c index 6cd6411..203c7c7 100644 --- a/src/mpi/errhan/file_set_errhandler.c +++ b/src/mpi/errhan/file_set_errhandler.c @@ -207,7 +207,7 @@ void MPIR_Get_file_error_routine( MPI_Errhandler e, interface. This is MPIR_File_call_cxx_errhandler. See file_call_errhandler.c */ #ifdef HAVE_CXX_BINDING - if (e_ptr->language == MPIR_LANG_CXX) *kind = 3; + if (e_ptr->language == MPIR_LANG__CXX) *kind = 3; #endif } } diff --git a/src/mpi/errhan/win_call_errhandler.c b/src/mpi/errhan/win_call_errhandler.c index a3f6bcc..bd76666 100644 --- a/src/mpi/errhan/win_call_errhandler.c +++ b/src/mpi/errhan/win_call_errhandler.c @@ -118,20 +118,20 @@ int MPI_Win_call_errhandler(MPI_Win win, int errorcode) } #endif switch (win_ptr->errhandler->language) { - case MPIR_LANG_C: + case MPIR_LANG__C: (*win_ptr->errhandler->errfn.C_Win_Handler_function)( &win_ptr->handle, &errorcode ); break; #ifdef HAVE_CXX_BINDING - case MPIR_LANG_CXX: + case MPIR_LANG__CXX: MPIR_Process.cxx_call_errfn( 2, &win_ptr->handle, &errorcode, (void (*)(void))win_ptr->errhandler->errfn.C_Win_Handler_function ); break; #endif #ifdef HAVE_FORTRAN_BINDING - case MPIR_LANG_FORTRAN90: - case MPIR_LANG_FORTRAN: + case MPIR_LANG__FORTRAN90: + case MPIR_LANG__FORTRAN: { /* If int and MPI_Fint aren't the same size, we need to convert. As this is not performance critical, we diff --git a/src/mpi/errhan/win_create_errhandler.c b/src/mpi/errhan/win_create_errhandler.c index 638f632..3cbbea8 100644 --- a/src/mpi/errhan/win_create_errhandler.c +++ b/src/mpi/errhan/win_create_errhandler.c @@ -79,7 +79,7 @@ int MPI_Win_create_errhandler(MPI_Win_errhandler_function *win_errhandler_fn, errhan_ptr = (MPIR_Errhandler *)MPIU_Handle_obj_alloc( &MPIR_Errhandler_mem ); MPIR_ERR_CHKANDJUMP1(!errhan_ptr,mpi_errno,MPI_ERR_OTHER,"**nomem", "**nomem %s", "MPI_Errhandler"); - errhan_ptr->language = MPIR_LANG_C; + errhan_ptr->language = MPIR_LANG__C; errhan_ptr->kind = MPIR_WIN; MPIU_Object_set_ref(errhan_ptr,1); errhan_ptr->errfn.C_Win_Handler_function = win_errhandler_fn; diff --git a/src/mpi/pt2pt/greq_start.c b/src/mpi/pt2pt/greq_start.c index f88025e..ed9a159 100644 --- a/src/mpi/pt2pt/greq_start.c +++ b/src/mpi/pt2pt/greq_start.c @@ -98,7 +98,7 @@ int MPIR_Grequest_start_impl(MPI_Grequest_query_function *query_fn, (*request_ptr)->u.ureq.greq_fns->poll_fn = NULL; (*request_ptr)->u.ureq.greq_fns->wait_fn = NULL; (*request_ptr)->u.ureq.greq_fns->grequest_extra_state = extra_state; - (*request_ptr)->u.ureq.greq_fns->greq_lang = MPIR_LANG_C; + (*request_ptr)->u.ureq.greq_fns->greq_lang = MPIR_LANG__C; /* Add an additional reference to the greq. One of them will be * released when we complete the request, and the second one, when diff --git a/src/mpi/pt2pt/mpir_request.c b/src/mpi/pt2pt/mpir_request.c index 1e98c43..511f14a 100644 --- a/src/mpi/pt2pt/mpir_request.c +++ b/src/mpi/pt2pt/mpir_request.c @@ -313,9 +313,9 @@ int MPIR_Request_get_error(MPIR_Request * request_ptr) switch (request_ptr->u.ureq.greq_fns->greq_lang) { - case MPIR_LANG_C: + case MPIR_LANG__C: #ifdef HAVE_CXX_BINDING - case MPIR_LANG_CXX: + case MPIR_LANG__CXX: #endif rc = (request_ptr->u.ureq.greq_fns->query_fn)( request_ptr->u.ureq.greq_fns->grequest_extra_state, @@ -324,8 +324,8 @@ int MPIR_Request_get_error(MPIR_Request * request_ptr) MPI_ERR_OTHER,;, "**user", "**userquery %d", rc); break; #ifdef HAVE_FORTRAN_BINDING - case MPIR_LANG_FORTRAN: - case MPIR_LANG_FORTRAN90: + case MPIR_LANG__FORTRAN: + case MPIR_LANG__FORTRAN90: { MPI_Fint ierr; MPI_Fint is[sizeof(MPI_Status)/sizeof(int)]; @@ -378,7 +378,7 @@ void MPIR_Grequest_set_lang_f77( MPI_Request greq ) MPIR_Request_get_ptr( greq, greq_ptr ); - greq_ptr->u.ureq.greq_fns->greq_lang = MPIR_LANG_FORTRAN; + greq_ptr->u.ureq.greq_fns->greq_lang = MPIR_LANG__FORTRAN; } #endif @@ -394,9 +394,9 @@ int MPIR_Grequest_cancel(MPIR_Request * request_ptr, int complete) switch (request_ptr->u.ureq.greq_fns->greq_lang) { - case MPIR_LANG_C: + case MPIR_LANG__C: #ifdef HAVE_CXX_BINDING - case MPIR_LANG_CXX: + case MPIR_LANG__CXX: #endif rc = (request_ptr->u.ureq.greq_fns->cancel_fn)( request_ptr->u.ureq.greq_fns->grequest_extra_state, complete); @@ -404,8 +404,8 @@ int MPIR_Grequest_cancel(MPIR_Request * request_ptr, int complete) MPI_ERR_OTHER,;, "**user", "**usercancel %d", rc); break; #ifdef HAVE_FORTRAN_BINDING - case MPIR_LANG_FORTRAN: - case MPIR_LANG_FORTRAN90: + case MPIR_LANG__FORTRAN: + case MPIR_LANG__FORTRAN90: { MPI_Fint ierr; MPI_Fint icomplete = complete; @@ -445,9 +445,9 @@ int MPIR_Grequest_query(MPIR_Request * request_ptr) switch (request_ptr->u.ureq.greq_fns->greq_lang) { - case MPIR_LANG_C: + case MPIR_LANG__C: #ifdef HAVE_CXX_BINDING - case MPIR_LANG_CXX: + case MPIR_LANG__CXX: #endif rc = (request_ptr->u.ureq.greq_fns->query_fn)(request_ptr->u.ureq.greq_fns->grequest_extra_state, &request_ptr->status); @@ -455,8 +455,8 @@ int MPIR_Grequest_query(MPIR_Request * request_ptr) {;}, "**user", "**userquery %d", rc); break; #ifdef HAVE_FORTRAN_BINDING - case MPIR_LANG_FORTRAN: - case MPIR_LANG_FORTRAN90: + case MPIR_LANG__FORTRAN: + case MPIR_LANG__FORTRAN90: { MPI_Fint ierr; MPI_Fint is[sizeof(MPI_Status)/sizeof(int)]; @@ -496,17 +496,17 @@ int MPIR_Grequest_free(MPIR_Request * request_ptr) switch (request_ptr->u.ureq.greq_fns->greq_lang) { - case MPIR_LANG_C: + case MPIR_LANG__C: #ifdef HAVE_CXX_BINDING - case MPIR_LANG_CXX: + case MPIR_LANG__CXX: #endif rc = (request_ptr->u.ureq.greq_fns->free_fn)(request_ptr->u.ureq.greq_fns->grequest_extra_state); MPIR_ERR_CHKANDSTMT1((rc != MPI_SUCCESS), mpi_errno, MPI_ERR_OTHER, {;}, "**user", "**userfree %d", rc); break; #ifdef HAVE_FORTRAN_BINDING - case MPIR_LANG_FORTRAN: - case MPIR_LANG_FORTRAN90: + case MPIR_LANG__FORTRAN: + case MPIR_LANG__FORTRAN90: { MPI_Fint ierr; http://git.mpich.org/mpich.git/commitdiff/c14976d66dbd57f92776471a51110d0ea… commit c14976d66dbd57f92776471a51110d0ea942700b Author: Pavan Balaji <balaji(a)anl.gov> Date: Wed Apr 20 20:40:39 2016 -0500 White-space cleanup. Improve the layout of enums to make them more readable. Signed-off-by: Wesley Bland <wesley.bland(a)intel.com> diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index c312b38..f101ee5 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -330,13 +330,14 @@ extern MPID_Thread_tls_t MPIR_Per_thread_key; Module: Attribute-DS E*/ -typedef enum MPIR_Lang_t { MPIR_LANG_C +typedef enum MPIR_Lang_t { + MPIR_LANG_C #ifdef HAVE_FORTRAN_BINDING - , MPIR_LANG_FORTRAN - , MPIR_LANG_FORTRAN90 + , MPIR_LANG_FORTRAN + , MPIR_LANG_FORTRAN90 #endif #ifdef HAVE_CXX_BINDING - , MPIR_LANG_CXX + , MPIR_LANG_CXX #endif } MPIR_Lang_t; @@ -1093,7 +1094,8 @@ void MPIR_Group_setup_lpid_list( MPIR_Group * ); E*/ typedef enum MPIR_Comm_kind_t { MPIR_INTRACOMM = 0, - MPIR_INTERCOMM = 1 } MPIR_Comm_kind_t; + MPIR_INTERCOMM = 1 +} MPIR_Comm_kind_t; /* ideally we could add these to MPIR_Comm_kind_t, but there's too much existing * code that assumes that the only valid values are INTRACOMM or INTERCOMM */ @@ -2021,14 +2023,25 @@ int MPID_Mem_was_alloced( void *ptr ); /* brad : this isn't used or implemented Module: Collective-DS E*/ -typedef enum MPIR_Op_kind { MPIR_OP_NULL=0, MPIR_OP_MAX=1, MPIR_OP_MIN=2, - MPIR_OP_SUM=3, MPIR_OP_PROD=4, - MPIR_OP_LAND=5, MPIR_OP_BAND=6, MPIR_OP_LOR=7, MPIR_OP_BOR=8, - MPIR_OP_LXOR=9, MPIR_OP_BXOR=10, MPIR_OP_MAXLOC=11, - MPIR_OP_MINLOC=12, MPIR_OP_REPLACE=13, - MPIR_OP_NO_OP=14, - MPIR_OP_USER_NONCOMMUTE=32, MPIR_OP_USER=33 } - MPIR_Op_kind; +typedef enum MPIR_Op_kind { + MPIR_OP_NULL=0, + MPIR_OP_MAX=1, + MPIR_OP_MIN=2, + MPIR_OP_SUM=3, + MPIR_OP_PROD=4, + MPIR_OP_LAND=5, + MPIR_OP_BAND=6, + MPIR_OP_LOR=7, + MPIR_OP_BOR=8, + MPIR_OP_LXOR=9, + MPIR_OP_BXOR=10, + MPIR_OP_MAXLOC=11, + MPIR_OP_MINLOC=12, + MPIR_OP_REPLACE=13, + MPIR_OP_NO_OP=14, + MPIR_OP_USER_NONCOMMUTE=32, + MPIR_OP_USER=33 +} MPIR_Op_kind; /*S MPIR_User_function - Definition of a user function for MPI_Op types. http://git.mpich.org/mpich.git/commitdiff/46008f6384b41c5308546406b0da7cf2b… commit 46008f6384b41c5308546406b0da7cf2bb6860f9 Author: Pavan Balaji <balaji(a)anl.gov> Date: Wed Apr 20 17:38:28 2016 -0500 Rename request kinds to make naming clear. Signed-off-by: Wesley Bland <wesley.bland(a)intel.com> diff --git a/src/include/mpierrs.h b/src/include/mpierrs.h index d6af3c1..88751a2 100644 --- a/src/include/mpierrs.h +++ b/src/include/mpierrs.h @@ -191,15 +191,15 @@ cvars: } #define MPIR_ERRTEST_PERSISTENT(reqp,err) \ - if ((reqp)->kind != MPIR_PREQUEST_SEND && reqp->kind != MPIR_PREQUEST_RECV) { \ + if ((reqp)->kind != MPIR_REQUEST_KIND__PREQUEST_SEND && reqp->kind != MPIR_REQUEST_KIND__PREQUEST_RECV) { \ err = MPIR_Err_create_code(MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, \ MPI_ERR_REQUEST, "**requestnotpersist", 0 ); \ goto fn_fail; \ } #define MPIR_ERRTEST_PERSISTENT_ACTIVE(reqp,err) \ - if (((reqp)->kind == MPIR_PREQUEST_SEND || \ - reqp->kind == MPIR_PREQUEST_RECV) && reqp->u.persist.real_request != NULL) { \ + if (((reqp)->kind == MPIR_REQUEST_KIND__PREQUEST_SEND || \ + reqp->kind == MPIR_REQUEST_KIND__PREQUEST_RECV) && reqp->u.persist.real_request != NULL) { \ err = MPIR_Err_create_code(MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, \ MPI_ERR_REQUEST, "**requestpersistactive", 0 ); \ goto fn_fail; \ diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index da3dd94..c312b38 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -1434,12 +1434,12 @@ void MPIR_Free_contextid( MPIU_Context_id_t ); /* Requests */ /* This currently defines a single structure type for all requests. Eventually, we may want a union type, as used in MPICH-1 */ -/* NOTE-R1: MPIR_REQUEST_MPROBE signifies that this is a request created by +/* NOTE-R1: MPIR_REQUEST_KIND__MPROBE signifies that this is a request created by * MPI_Mprobe or MPI_Improbe. Since we use MPI_Request objects as our * MPI_Message objects, we use this separate kind in order to provide stronger * error checking. Once a message (backed by a request) is promoted to a real * request by calling MPI_Mrecv/MPI_Imrecv, we actually modify the kind to be - * MPIR_REQUEST_RECV in order to keep completion logic as simple as possible. */ + * MPIR_REQUEST_KIND__RECV in order to keep completion logic as simple as possible. */ /*E MPIR_Request_kind - Kinds of MPI Requests @@ -1448,18 +1448,18 @@ void MPIR_Free_contextid( MPIU_Context_id_t ); E*/ typedef enum MPIR_Request_kind_t { - MPIR_REQUEST_UNDEFINED, - MPIR_REQUEST_SEND, - MPIR_REQUEST_RECV, - MPIR_PREQUEST_SEND, - MPIR_PREQUEST_RECV, - MPIR_UREQUEST, - MPIR_COLL_REQUEST, - MPIR_REQUEST_MPROBE, /* see NOTE-R1 */ - MPIR_WIN_REQUEST, - MPIR_LAST_REQUEST_KIND -#ifdef MPID_DEV_REQUEST_KIND_DECL - , MPID_DEV_REQUEST_KIND_DECL + MPIR_REQUEST_KIND__UNDEFINED, + MPIR_REQUEST_KIND__SEND, + MPIR_REQUEST_KIND__RECV, + MPIR_REQUEST_KIND__PREQUEST_SEND, + MPIR_REQUEST_KIND__PREQUEST_RECV, + MPIR_REQUEST_KIND__GREQUEST, + MPIR_REQUEST_KIND__COLL, + MPIR_REQUEST_KIND__MPROBE, /* see NOTE-R1 */ + MPIR_REQUEST_KIND__RMA, + MPIR_REQUEST_KIND__LAST +#ifdef MPID_REQUEST_KIND_DECL + , MPID_REQUEST_KIND_DECL #endif } MPIR_Request_kind_t; @@ -1604,10 +1604,10 @@ typedef struct MPIR_Request { union { struct { struct MPIR_Grequest_fns *greq_fns; - } ureq; /* kind : MPIR_UREQUEST */ + } ureq; /* kind : MPIR_REQUEST_KIND__GREQUEST */ struct { MPIR_Errflag_t errflag; - } nbc; /* kind : MPIR_COLL_REQUEST */ + } nbc; /* kind : MPIR_REQUEST_KIND__COLL */ #if defined HAVE_DEBUGGER_SUPPORT struct { struct MPIR_Sendq *dbg_next; @@ -1728,7 +1728,7 @@ static inline MPIR_Request *MPIR_Request_create(MPIR_Request_kind_t kind) req->request_completed_cb = NULL; switch(kind) { - case MPIR_COLL_REQUEST: + case MPIR_REQUEST_KIND__COLL: req->u.nbc.errflag = MPIR_ERR_NONE; break; default: @@ -1788,7 +1788,7 @@ static inline void MPIR_Request_free(MPIR_Request *req) MPIR_Comm_release(req->comm); } - if (req->kind == MPIR_UREQUEST && req->u.ureq.greq_fns != NULL) { + if (req->kind == MPIR_REQUEST_KIND__GREQUEST && req->u.ureq.greq_fns != NULL) { MPL_free(req->u.ureq.greq_fns); } diff --git a/src/mpi/coll/helper_fns.c b/src/mpi/coll/helper_fns.c index 148178c..53193a8 100644 --- a/src/mpi/coll/helper_fns.c +++ b/src/mpi/coll/helper_fns.c @@ -212,7 +212,7 @@ int MPIC_Wait(MPIR_Request * request_ptr, MPIR_Errflag_t *errflag) MPL_DBG_MSG_S(MPIR_DBG_PT2PT, TYPICAL, "IN: errflag = %s", *errflag?"TRUE":"FALSE"); - if (request_ptr->kind == MPIR_REQUEST_SEND) + if (request_ptr->kind == MPIR_REQUEST_KIND__SEND) request_ptr->status.MPI_TAG = 0; if (!MPIR_Request_is_complete(request_ptr)) @@ -228,7 +228,7 @@ int MPIC_Wait(MPIR_Request * request_ptr, MPIR_Errflag_t *errflag) MPID_Progress_end(&progress_state); } - if (request_ptr->kind == MPIR_REQUEST_RECV) + if (request_ptr->kind == MPIR_REQUEST_KIND__RECV) MPIR_Process_status(&request_ptr->status, errflag); MPIR_TAG_CLEAR_ERROR_BITS(request_ptr->status.MPI_TAG); diff --git a/src/mpi/pt2pt/cancel.c b/src/mpi/pt2pt/cancel.c index 2c1df30..8ceb998 100644 --- a/src/mpi/pt2pt/cancel.c +++ b/src/mpi/pt2pt/cancel.c @@ -36,24 +36,24 @@ int MPIR_Cancel_impl(MPIR_Request *request_ptr) switch (request_ptr->kind) { - case MPIR_REQUEST_SEND: + case MPIR_REQUEST_KIND__SEND: { mpi_errno = MPID_Cancel_send(request_ptr); if (mpi_errno) MPIR_ERR_POP(mpi_errno); break; } - case MPIR_REQUEST_RECV: + case MPIR_REQUEST_KIND__RECV: { mpi_errno = MPID_Cancel_recv(request_ptr); if (mpi_errno) MPIR_ERR_POP(mpi_errno); break; } - case MPIR_PREQUEST_SEND: + case MPIR_REQUEST_KIND__PREQUEST_SEND: { if (request_ptr->u.persist.real_request != NULL) { - if (request_ptr->u.persist.real_request->kind != MPIR_UREQUEST) { + if (request_ptr->u.persist.real_request->kind != MPIR_REQUEST_KIND__GREQUEST) { /* jratt(a)us.ibm.com: I don't know about the bsend * comment below, but the CC stuff on the next * line is *really* needed for persistent Bsend @@ -86,7 +86,7 @@ int MPIR_Cancel_impl(MPIR_Request *request_ptr) break; } - case MPIR_PREQUEST_RECV: + case MPIR_REQUEST_KIND__PREQUEST_RECV: { if (request_ptr->u.persist.real_request != NULL) { mpi_errno = MPID_Cancel_recv(request_ptr->u.persist.real_request); @@ -97,7 +97,7 @@ int MPIR_Cancel_impl(MPIR_Request *request_ptr) break; } - case MPIR_UREQUEST: + case MPIR_REQUEST_KIND__GREQUEST: { mpi_errno = MPIR_Grequest_cancel(request_ptr, MPIR_cc_is_complete(&request_ptr->cc)); if (mpi_errno) MPIR_ERR_POP(mpi_errno); diff --git a/src/mpi/pt2pt/greq_complete.c b/src/mpi/pt2pt/greq_complete.c index 419b2c0..19749c7 100644 --- a/src/mpi/pt2pt/greq_complete.c +++ b/src/mpi/pt2pt/greq_complete.c @@ -95,7 +95,7 @@ int MPI_Grequest_complete( MPI_Request request ) MPID_BEGIN_ERROR_CHECKS; { MPIR_Request_valid_ptr(request_ptr,mpi_errno); - if (request_ptr && request_ptr->kind != MPIR_UREQUEST) { + if (request_ptr && request_ptr->kind != MPIR_REQUEST_KIND__GREQUEST) { mpi_errno = MPIR_Err_create_code( MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_ARG, "**notgenreq", 0 ); } diff --git a/src/mpi/pt2pt/greq_start.c b/src/mpi/pt2pt/greq_start.c index 7a0db3e..f88025e 100644 --- a/src/mpi/pt2pt/greq_start.c +++ b/src/mpi/pt2pt/greq_start.c @@ -84,7 +84,7 @@ int MPIR_Grequest_start_impl(MPI_Grequest_query_function *query_fn, /* MT FIXME this routine is not thread-safe in the non-global case */ - *request_ptr = MPIR_Request_create(MPIR_UREQUEST); + *request_ptr = MPIR_Request_create(MPIR_REQUEST_KIND__GREQUEST); MPIR_ERR_CHKANDJUMP1(request_ptr == NULL, mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", "generalized request"); MPIU_Object_set_ref( *request_ptr, 1 ); diff --git a/src/mpi/pt2pt/imrecv.c b/src/mpi/pt2pt/imrecv.c index 4b7a2e4..e5955e5 100644 --- a/src/mpi/pt2pt/imrecv.c +++ b/src/mpi/pt2pt/imrecv.c @@ -97,7 +97,7 @@ int MPI_Imrecv(void *buf, int count, MPI_Datatype datatype, MPI_Message *message if (*message != MPI_MESSAGE_NO_PROC) { MPIR_Request_valid_ptr(msgp, mpi_errno); if (mpi_errno) MPIR_ERR_POP(mpi_errno); - MPIR_ERR_CHKANDJUMP((msgp->kind != MPIR_REQUEST_MPROBE), + MPIR_ERR_CHKANDJUMP((msgp->kind != MPIR_REQUEST_KIND__MPROBE), mpi_errno, MPI_ERR_ARG, "**reqnotmsg"); } diff --git a/src/mpi/pt2pt/mpir_request.c b/src/mpi/pt2pt/mpir_request.c index ee05809..1e98c43 100644 --- a/src/mpi/pt2pt/mpir_request.c +++ b/src/mpi/pt2pt/mpir_request.c @@ -73,7 +73,7 @@ int MPIR_Request_complete(MPI_Request * request, MPIR_Request * request_ptr, *active = TRUE; switch(request_ptr->kind) { - case MPIR_REQUEST_SEND: + case MPIR_REQUEST_KIND__SEND: { if (status != MPI_STATUS_IGNORE) { @@ -85,7 +85,7 @@ int MPIR_Request_complete(MPI_Request * request, MPIR_Request * request_ptr, if (NULL != request) *request = MPI_REQUEST_NULL; break; } - case MPIR_REQUEST_RECV: + case MPIR_REQUEST_KIND__RECV: { MPIR_Request_extract_status(request_ptr, status); mpi_errno = request_ptr->status.MPI_ERROR; @@ -94,7 +94,7 @@ int MPIR_Request_complete(MPI_Request * request, MPIR_Request * request_ptr, break; } - case MPIR_PREQUEST_SEND: + case MPIR_REQUEST_KIND__PREQUEST_SEND: { if (request_ptr->u.persist.real_request != NULL) { @@ -105,7 +105,7 @@ int MPIR_Request_complete(MPI_Request * request, MPIR_Request * request_ptr, request_ptr->cc_ptr = &request_ptr->cc; request_ptr->u.persist.real_request = NULL; - if (prequest_ptr->kind != MPIR_UREQUEST) + if (prequest_ptr->kind != MPIR_REQUEST_KIND__GREQUEST) { if (status != MPI_STATUS_IGNORE) { @@ -162,7 +162,7 @@ int MPIR_Request_complete(MPI_Request * request, MPIR_Request * request_ptr, break; } - case MPIR_PREQUEST_RECV: + case MPIR_REQUEST_KIND__PREQUEST_RECV: { if (request_ptr->u.persist.real_request != NULL) { @@ -198,7 +198,7 @@ int MPIR_Request_complete(MPI_Request * request, MPIR_Request * request_ptr, break; } - case MPIR_UREQUEST: + case MPIR_REQUEST_KIND__GREQUEST: { int rc; @@ -220,8 +220,8 @@ int MPIR_Request_complete(MPI_Request * request, MPIR_Request * request_ptr, break; } - case MPIR_COLL_REQUEST: - case MPIR_WIN_REQUEST: + case MPIR_REQUEST_KIND__COLL: + case MPIR_REQUEST_KIND__RMA: { mpi_errno = request_ptr->status.MPI_ERROR; MPIR_Request_extract_status(request_ptr, status); @@ -260,19 +260,19 @@ int MPIR_Request_get_error(MPIR_Request * request_ptr) switch(request_ptr->kind) { - case MPIR_REQUEST_SEND: - case MPIR_REQUEST_RECV: - case MPIR_COLL_REQUEST: + case MPIR_REQUEST_KIND__SEND: + case MPIR_REQUEST_KIND__RECV: + case MPIR_REQUEST_KIND__COLL: { mpi_errno = request_ptr->status.MPI_ERROR; break; } - case MPIR_PREQUEST_SEND: + case MPIR_REQUEST_KIND__PREQUEST_SEND: { if (request_ptr->u.persist.real_request != NULL) { - if (request_ptr->u.persist.real_request->kind == MPIR_UREQUEST) + if (request_ptr->u.persist.real_request->kind == MPIR_REQUEST_KIND__GREQUEST) { /* This is needed for persistent Bsend requests */ mpi_errno = MPIR_Grequest_query( @@ -291,7 +291,7 @@ int MPIR_Request_get_error(MPIR_Request * request_ptr) break; } - case MPIR_PREQUEST_RECV: + case MPIR_REQUEST_KIND__PREQUEST_RECV: { if (request_ptr->u.persist.real_request != NULL) { @@ -305,7 +305,7 @@ int MPIR_Request_get_error(MPIR_Request * request_ptr) break; } - case MPIR_UREQUEST: + case MPIR_REQUEST_KIND__GREQUEST: { int rc; @@ -559,7 +559,7 @@ int MPIR_Grequest_progress_poke(int count, for (i=0, j=0, n_classes=1, n_native=0, n_greq=0; i< count; i++) { if (request_ptrs[i] == NULL || MPIR_Request_is_complete(request_ptrs[i])) continue; - if (request_ptrs[i]->kind == MPIR_UREQUEST) + if (request_ptrs[i]->kind == MPIR_REQUEST_KIND__GREQUEST) { n_greq += 1; wait_fn = request_ptrs[i]->u.ureq.greq_fns->wait_fn; @@ -582,7 +582,7 @@ int MPIR_Grequest_progress_poke(int count, for (i = 0; i< count; i++ ) { if (request_ptrs[i] != NULL && - request_ptrs[i]->kind == MPIR_UREQUEST && + request_ptrs[i]->kind == MPIR_REQUEST_KIND__GREQUEST && !MPIR_Request_is_complete(request_ptrs[i]) && request_ptrs[i]->u.ureq.greq_fns->poll_fn != NULL) { @@ -635,7 +635,7 @@ int MPIR_Grequest_waitall(int count, MPIR_Request * const * request_ptrs) for (i = 0; i < count; ++i) { /* skip over requests we're not interested in */ - if (request_ptrs[i] == NULL || *request_ptrs[i]->cc_ptr == 0 || request_ptrs[i]->kind != MPIR_UREQUEST) + if (request_ptrs[i] == NULL || *request_ptrs[i]->cc_ptr == 0 || request_ptrs[i]->kind != MPIR_REQUEST_KIND__GREQUEST) continue; if (n_greq == 0 || request_ptrs[i]->u.ureq.greq_fns->greq_class == curr_class) @@ -674,7 +674,7 @@ int MPIR_Grequest_waitall(int count, MPIR_Request * const * request_ptrs) /* skip over requests we're not interested in */ if (request_ptrs[i] == NULL || MPIR_Request_is_complete(request_ptrs[i]) || - request_ptrs[i]->kind != MPIR_UREQUEST || + request_ptrs[i]->kind != MPIR_REQUEST_KIND__GREQUEST || request_ptrs[i]->u.ureq.greq_fns->wait_fn == NULL) { continue; @@ -690,7 +690,7 @@ int MPIR_Grequest_waitall(int count, MPIR_Request * const * request_ptrs) { if (request_ptrs[i] == NULL || MPIR_Request_is_complete(request_ptrs[i]) || - request_ptrs[i]->kind != MPIR_UREQUEST) + request_ptrs[i]->kind != MPIR_REQUEST_KIND__GREQUEST) { continue; } diff --git a/src/mpi/pt2pt/mrecv.c b/src/mpi/pt2pt/mrecv.c index d946005..64ca570 100644 --- a/src/mpi/pt2pt/mrecv.c +++ b/src/mpi/pt2pt/mrecv.c @@ -96,7 +96,7 @@ int MPI_Mrecv(void *buf, int count, MPI_Datatype datatype, MPI_Message *message, if (*message != MPI_MESSAGE_NO_PROC) { MPIR_Request_valid_ptr(msgp, mpi_errno); if (mpi_errno) MPIR_ERR_POP(mpi_errno); - MPIR_ERR_CHKANDJUMP((msgp->kind != MPIR_REQUEST_MPROBE), + MPIR_ERR_CHKANDJUMP((msgp->kind != MPIR_REQUEST_KIND__MPROBE), mpi_errno, MPI_ERR_ARG, "**reqnotmsg"); } diff --git a/src/mpi/pt2pt/request_free.c b/src/mpi/pt2pt/request_free.c index 42d22b6..00a119a 100644 --- a/src/mpi/pt2pt/request_free.c +++ b/src/mpi/pt2pt/request_free.c @@ -109,23 +109,23 @@ int MPI_Request_free(MPI_Request *request) switch (request_ptr->kind) { - case MPIR_REQUEST_SEND: + case MPIR_REQUEST_KIND__SEND: { MPIR_SENDQ_FORGET(request_ptr); break; } - case MPIR_REQUEST_RECV: + case MPIR_REQUEST_KIND__RECV: { break; } - case MPIR_PREQUEST_SEND: + case MPIR_REQUEST_KIND__PREQUEST_SEND: { /* If this is an active persistent request, we must also release the partner request. */ if (request_ptr->u.persist.real_request != NULL) { - if (request_ptr->u.persist.real_request->kind == MPIR_UREQUEST) + if (request_ptr->u.persist.real_request->kind == MPIR_REQUEST_KIND__GREQUEST) { /* This is needed for persistent Bsend requests */ mpi_errno = MPIR_Grequest_free( @@ -137,7 +137,7 @@ int MPI_Request_free(MPI_Request *request) } - case MPIR_PREQUEST_RECV: + case MPIR_REQUEST_KIND__PREQUEST_RECV: { /* If this is an active persistent request, we must also release the partner request. */ @@ -148,7 +148,7 @@ int MPI_Request_free(MPI_Request *request) break; } - case MPIR_UREQUEST: + case MPIR_REQUEST_KIND__GREQUEST: { mpi_errno = MPIR_Grequest_free(request_ptr); break; diff --git a/src/mpi/pt2pt/request_get_status.c b/src/mpi/pt2pt/request_get_status.c index 7269de6..224cf64 100644 --- a/src/mpi/pt2pt/request_get_status.c +++ b/src/mpi/pt2pt/request_get_status.c @@ -117,7 +117,7 @@ int MPI_Request_get_status(MPI_Request request, int *flag, MPI_Status *status) { switch(request_ptr->kind) { - case MPIR_REQUEST_SEND: + case MPIR_REQUEST_KIND__SEND: { if (status != MPI_STATUS_IGNORE) { @@ -127,20 +127,20 @@ int MPI_Request_get_status(MPI_Request request, int *flag, MPI_Status *status) break; } - case MPIR_REQUEST_RECV: + case MPIR_REQUEST_KIND__RECV: { MPIR_Request_extract_status(request_ptr, status); mpi_errno = request_ptr->status.MPI_ERROR; break; } - case MPIR_PREQUEST_SEND: + case MPIR_REQUEST_KIND__PREQUEST_SEND: { MPIR_Request * prequest_ptr = request_ptr->u.persist.real_request; if (prequest_ptr != NULL) { - if (prequest_ptr->kind != MPIR_UREQUEST) + if (prequest_ptr->kind != MPIR_REQUEST_KIND__GREQUEST) { if (status != MPI_STATUS_IGNORE) { @@ -189,7 +189,7 @@ int MPI_Request_get_status(MPI_Request request, int *flag, MPI_Status *status) break; } - case MPIR_PREQUEST_RECV: + case MPIR_REQUEST_KIND__PREQUEST_RECV: { MPIR_Request * prequest_ptr = request_ptr->u.persist.real_request; @@ -209,7 +209,7 @@ int MPI_Request_get_status(MPI_Request request, int *flag, MPI_Status *status) break; } - case MPIR_UREQUEST: + case MPIR_REQUEST_KIND__GREQUEST: { int rc; diff --git a/src/mpi/pt2pt/test.c b/src/mpi/pt2pt/test.c index 9876864..25ca804 100644 --- a/src/mpi/pt2pt/test.c +++ b/src/mpi/pt2pt/test.c @@ -52,7 +52,7 @@ int MPIR_Test_impl(MPI_Request *request, int *flag, MPI_Status *status) mpi_errno = MPID_Progress_test(); if (mpi_errno != MPI_SUCCESS) goto fn_fail; - if (request_ptr->kind == MPIR_UREQUEST && + if (request_ptr->kind == MPIR_REQUEST_KIND__GREQUEST && request_ptr->u.ureq.greq_fns != NULL && request_ptr->u.ureq.greq_fns->poll_fn != NULL) { diff --git a/src/mpi/pt2pt/testall.c b/src/mpi/pt2pt/testall.c index 398a891..a8c144c 100644 --- a/src/mpi/pt2pt/testall.c +++ b/src/mpi/pt2pt/testall.c @@ -87,7 +87,7 @@ int MPIR_Testall_impl(int count, MPI_Request array_of_requests[], int *flag, for (i = 0; i < count; i++) { if (request_ptrs[i] != NULL && - request_ptrs[i]->kind == MPIR_UREQUEST && + request_ptrs[i]->kind == MPIR_REQUEST_KIND__GREQUEST && request_ptrs[i]->u.ureq.greq_fns->poll_fn != NULL) { mpi_errno = (request_ptrs[i]->u.ureq.greq_fns->poll_fn)(request_ptrs[i]->u.ureq.greq_fns->grequest_extra_state, diff --git a/src/mpi/pt2pt/testany.c b/src/mpi/pt2pt/testany.c index 0ca07d5..013aad4 100644 --- a/src/mpi/pt2pt/testany.c +++ b/src/mpi/pt2pt/testany.c @@ -162,7 +162,7 @@ int MPI_Testany(int count, MPI_Request array_of_requests[], int *indx, for (i = 0; i < count; i++) { if (request_ptrs[i] != NULL && - request_ptrs[i]->kind == MPIR_UREQUEST && + request_ptrs[i]->kind == MPIR_REQUEST_KIND__GREQUEST && request_ptrs[i]->u.ureq.greq_fns->poll_fn != NULL) { mpi_errno = (request_ptrs[i]->u.ureq.greq_fns->poll_fn)(request_ptrs[i]->u.ureq.greq_fns->grequest_extra_state, diff --git a/src/mpi/pt2pt/testsome.c b/src/mpi/pt2pt/testsome.c index 57c4e67..3a4112a 100644 --- a/src/mpi/pt2pt/testsome.c +++ b/src/mpi/pt2pt/testsome.c @@ -162,7 +162,7 @@ int MPI_Testsome(int incount, MPI_Request array_of_requests[], int *outcount, for (i = 0; i < incount; i++) { if (request_ptrs[i] != NULL && - request_ptrs[i]->kind == MPIR_UREQUEST && + request_ptrs[i]->kind == MPIR_REQUEST_KIND__GREQUEST && request_ptrs[i]->u.ureq.greq_fns->poll_fn != NULL) { mpi_errno = (request_ptrs[i]->u.ureq.greq_fns->poll_fn)(request_ptrs[i]->u.ureq.greq_fns->grequest_extra_state, diff --git a/src/mpi/pt2pt/wait.c b/src/mpi/pt2pt/wait.c index 3844848..ea92615 100644 --- a/src/mpi/pt2pt/wait.c +++ b/src/mpi/pt2pt/wait.c @@ -61,7 +61,7 @@ int MPIR_Wait_impl(MPI_Request *request, MPI_Status *status) while (!MPIR_Request_is_complete(request_ptr)) { mpi_errno = MPIR_Grequest_progress_poke(1, &request_ptr, status); - if (request_ptr->kind == MPIR_UREQUEST && + if (request_ptr->kind == MPIR_REQUEST_KIND__GREQUEST && request_ptr->u.ureq.greq_fns->wait_fn != NULL) { if (mpi_errno) { diff --git a/src/mpi/pt2pt/waitall.c b/src/mpi/pt2pt/waitall.c index 5d9546e..6983246 100644 --- a/src/mpi/pt2pt/waitall.c +++ b/src/mpi/pt2pt/waitall.c @@ -32,7 +32,7 @@ int MPI_Waitall(int count, MPI_Request array_of_requests[], MPI_Status array_of_ /* The "fastpath" version of MPIR_Request_complete. It only handles - * MPIR_REQUEST_SEND and MPIR_REQUEST_RECV kinds, and it does not attempt to + * MPIR_REQUEST_KIND__SEND and MPIR_REQUEST_KIND__RECV kinds, and it does not attempt to * deal with status structures under the assumption that bleeding fast code will * pass either MPI_STATUS_IGNORE or MPI_STATUSES_IGNORE as appropriate. This * routine (or some a variation of it) is an unfortunately necessary stunt to @@ -46,9 +46,9 @@ static inline int request_complete_fastpath(MPI_Request *request, MPIR_Request * { int mpi_errno = MPI_SUCCESS; - MPIU_Assert(request_ptr->kind == MPIR_REQUEST_SEND || request_ptr->kind == MPIR_REQUEST_RECV); + MPIU_Assert(request_ptr->kind == MPIR_REQUEST_KIND__SEND || request_ptr->kind == MPIR_REQUEST_KIND__RECV); - if (request_ptr->kind == MPIR_REQUEST_SEND) { + if (request_ptr->kind == MPIR_REQUEST_KIND__SEND) { /* FIXME: are Ibsend requests added to the send queue? */ MPIR_SENDQ_FORGET(request_ptr); } @@ -106,19 +106,19 @@ int MPIR_Waitall_impl(int count, MPI_Request array_of_requests[], { MPIR_Request_valid_ptr( request_ptrs[i], mpi_errno ); if (mpi_errno) MPIR_ERR_POP(mpi_errno); - MPIR_ERR_CHKANDJUMP1((request_ptrs[i]->kind == MPIR_REQUEST_MPROBE), + MPIR_ERR_CHKANDJUMP1((request_ptrs[i]->kind == MPIR_REQUEST_KIND__MPROBE), mpi_errno, MPI_ERR_ARG, "**msgnotreq", "**msgnotreq %d", i); } MPID_END_ERROR_CHECKS; } # endif - if (request_ptrs[i]->kind != MPIR_REQUEST_RECV && - request_ptrs[i]->kind != MPIR_REQUEST_SEND) + if (request_ptrs[i]->kind != MPIR_REQUEST_KIND__RECV && + request_ptrs[i]->kind != MPIR_REQUEST_KIND__SEND) { optimize = FALSE; } - if (request_ptrs[i]->kind == MPIR_UREQUEST) + if (request_ptrs[i]->kind == MPIR_REQUEST_KIND__GREQUEST) ++n_greqs; /* If one of the requests is an anysource on a communicator that's @@ -212,7 +212,7 @@ int MPIR_Waitall_impl(int count, MPI_Request array_of_requests[], while (!MPIR_Request_is_complete(request_ptrs[i])) { /* generalized requests should already be finished */ - MPIU_Assert(request_ptrs[i]->kind != MPIR_UREQUEST); + MPIU_Assert(request_ptrs[i]->kind != MPIR_REQUEST_KIND__GREQUEST); mpi_errno = MPID_Progress_wait(&progress_state); if (mpi_errno != MPI_SUCCESS) { diff --git a/src/mpi/pt2pt/waitany.c b/src/mpi/pt2pt/waitany.c index 1bdb87b..f74fa0a 100644 --- a/src/mpi/pt2pt/waitany.c +++ b/src/mpi/pt2pt/waitany.c @@ -157,7 +157,7 @@ int MPI_Waitany(int count, MPI_Request array_of_requests[], int *indx, /* we found at least one non-null request */ found_nonnull_req = TRUE; - if (request_ptrs[i]->kind == MPIR_UREQUEST && request_ptrs[i]->u.ureq.greq_fns->poll_fn != NULL) + if (request_ptrs[i]->kind == MPIR_REQUEST_KIND__GREQUEST && request_ptrs[i]->u.ureq.greq_fns->poll_fn != NULL) { /* this is a generalized request; make progress on it */ mpi_errno = (request_ptrs[i]->u.ureq.greq_fns->poll_fn)(request_ptrs[i]->u.ureq.greq_fns->grequest_extra_state, status); diff --git a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_poll.c b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_poll.c index ef38a63..0cc55e9 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_poll.c +++ b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_poll.c @@ -85,8 +85,8 @@ static void MPID_nem_llc_send_handler(void *cba, uint64_t * p_reqid) kind = sreq->kind; switch (kind) { unsigned int reqtype; - case MPIR_REQUEST_SEND: - case MPIR_PREQUEST_SEND:{ + case MPIR_REQUEST_KIND__SEND: + case MPIR_REQUEST_KIND__PREQUEST_SEND:{ reqtype = MPIDI_Request_get_type(sreq); /* Free temporal buffer for non-contiguous data. diff --git a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_probe.c b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_probe.c index ccb4cd2..e2276c4 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_probe.c +++ b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_probe.c @@ -157,9 +157,9 @@ int MPID_nem_llc_improbe(MPIDI_VC_t * vc, int source, int tag, MPIR_Comm * comm, *flag = 1; - req = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + req = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); MPIU_Object_set_ref(req, 2); - req->kind = MPIR_REQUEST_MPROBE; + req->kind = MPIR_REQUEST_KIND__MPROBE; req->comm = comm; MPIR_Comm_add_ref(comm); req->ch.vc = vc; diff --git a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_send.c b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_send.c index 8f1048e..02e179e 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_send.c +++ b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_send.c @@ -43,10 +43,10 @@ int MPID_nem_llc_isend(struct MPIDI_VC *vc, const void *buf, int count, MPI_Data LLC_comm_rank(LLC_COMM_MPICH, &LLC_my_rank); dprintf("llc_isend,LLC_my_rank=%d\n", LLC_my_rank); - struct MPIR_Request *sreq = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + struct MPIR_Request *sreq = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); MPIU_Assert(sreq != NULL); MPIU_Object_set_ref(sreq, 2); - sreq->kind = MPIR_REQUEST_SEND; + sreq->kind = MPIR_REQUEST_KIND__SEND; /* Used in llc_poll --> MPID_nem_llc_send_handler */ sreq->ch.vc = vc; @@ -186,10 +186,10 @@ int MPID_nem_llc_iStartContigMsg(MPIDI_VC_t * vc, void *hdr, intptr_t hdr_sz, vo MPL_DBG_MSG_D(MPIDI_CH3_DBG_CHANNEL, VERBOSE, "hdr type = %d", ((MPIDI_CH3_Pkt_t *) hdr)->type); /* create a request */ - sreq = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + sreq = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); MPIU_Assert(sreq != NULL); MPIU_Object_set_ref(sreq, 2); - sreq->kind = MPIR_REQUEST_SEND; + sreq->kind = MPIR_REQUEST_KIND__SEND; sreq->ch.vc = vc; sreq->dev.OnDataAvail = 0; @@ -264,8 +264,8 @@ int MPID_nem_llc_iSendContig(MPIDI_VC_t * vc, MPIR_Request * sreq, void *hdr, in MPIDI_FUNC_ENTER(MPID_STATE_MPID_NEM_LLC_ISENDCONTIGMSG); - if (sreq->kind == MPIR_REQUEST_UNDEFINED) { - sreq->kind = MPIR_REQUEST_SEND; + if (sreq->kind == MPIR_REQUEST_KIND__UNDEFINED) { + sreq->kind = MPIR_REQUEST_KIND__SEND; } dprintf("llc_iSendConitig,sreq=%p,hdr=%p,hdr_sz=%ld,data=%p,data_sz=%ld\n", sreq, hdr, hdr_sz, data, data_sz); @@ -814,7 +814,7 @@ int llc_poll(int in_blocking_poll, llc_send_f sfnc, llc_recv_f rfnc) lcmd = (LLC_cmd_t *) events[0].side.initiator.req_id; MPIR_Request *req = ((struct llc_cmd_area *) lcmd->usr_area)->cbarg; - if (req->kind != MPIR_REQUEST_MPROBE) { + if (req->kind != MPIR_REQUEST_KIND__MPROBE) { /* Unpack non-contiguous dt */ int is_contig; MPIDU_Datatype_is_contig(req->dev.datatype, &is_contig); @@ -976,10 +976,10 @@ int MPID_nem_llc_issend(struct MPIDI_VC *vc, const void *buf, int count, MPI_Dat LLC_comm_rank(LLC_COMM_MPICH, &LLC_my_rank); dprintf("llc_isend,LLC_my_rank=%d\n", LLC_my_rank); - struct MPIR_Request *sreq = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + struct MPIR_Request *sreq = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); MPIU_Assert(sreq != NULL); MPIU_Object_set_ref(sreq, 2); - sreq->kind = MPIR_REQUEST_SEND; + sreq->kind = MPIR_REQUEST_KIND__SEND; /* Used in llc_poll --> MPID_nem_llc_send_handler */ sreq->ch.vc = vc; diff --git a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_probe.c b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_probe.c index 3e77796..88d1b7a 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_probe.c +++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_probe.c @@ -135,9 +135,9 @@ int MPID_nem_mxm_improbe(MPIDI_VC_t * vc, int source, int tag, MPIR_Comm * comm, *flag = 1; - req = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + req = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); MPIU_Object_set_ref(req, 2); - req->kind = MPIR_REQUEST_MPROBE; + req->kind = MPIR_REQUEST_KIND__MPROBE; req->comm = comm; MPIR_Comm_add_ref(comm); req->ch.vc = vc; diff --git a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c index 112ab12..d6313b6 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c +++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c @@ -113,11 +113,11 @@ int MPID_nem_mxm_iStartContigMsg(MPIDI_VC_t * vc, void *hdr, intptr_t hdr_sz, vo MPIDI_DBG_Print_packet((MPIDI_CH3_Pkt_t *) hdr); /* create a request */ - sreq = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + sreq = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); MPIU_Assert(sreq != NULL); MPIU_Object_set_ref(sreq, 2); MPIU_Memcpy(&(sreq->dev.pending_pkt), (char *) hdr, sizeof(MPIDI_CH3_Pkt_t)); - sreq->kind = MPIR_REQUEST_SEND; + sreq->kind = MPIR_REQUEST_KIND__SEND; sreq->dev.OnDataAvail = NULL; sreq->dev.tmpbuf = NULL; diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_cm.c b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_cm.c index b935292..2816090 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_cm.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_cm.c @@ -551,7 +551,7 @@ int MPID_nem_ofi_connect_to_root(const char *business_card, MPIDI_VC_t * new_vc) my_bc_len = OFI_KVSAPPSTRLEN - my_bc_len; MPID_nem_ofi_create_req(&sreq, 1); - sreq->kind = MPIR_REQUEST_SEND; + sreq->kind = MPIR_REQUEST_KIND__SEND; sreq->dev.OnDataAvail = NULL; sreq->dev.next = NULL; REQ_OFI(sreq)->event_callback = MPID_nem_ofi_connect_to_root_callback; diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h index b3e7adc..1492ac7 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h @@ -249,7 +249,7 @@ static inline int MPID_nem_ofi_create_req(MPIR_Request ** request, int refcnt) { int mpi_errno = MPI_SUCCESS; MPIR_Request *req; - req = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + req = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); MPIU_Assert(req); MPIDI_Request_clear_dbg(req); MPIU_Object_set_ref(req, refcnt); @@ -271,7 +271,7 @@ static inline int MPID_nem_ofi_create_req_lw(MPIR_Request ** request, int refcnt MPIU_Assert(HANDLE_GET_MPI_KIND(req->handle) == MPIR_REQUEST); MPIU_Object_set_ref(req, refcnt); - req->kind = MPIR_REQUEST_SEND; + req->kind = MPIR_REQUEST_KIND__SEND; MPIR_cc_set(&req->cc, 0); // request is already completed req->cc_ptr = &req->cc; req->status.MPI_ERROR = MPI_SUCCESS; diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_msg.c b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_msg.c index e6f88fe..29258c8 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_msg.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_msg.c @@ -322,7 +322,7 @@ int MPID_nem_ofi_iStartContigMsg(MPIDI_VC_t * vc, MPIU_Assert(hdr_sz <= (intptr_t) sizeof(MPIDI_CH3_Pkt_t)); MPID_nem_ofi_create_req(&sreq, 2); - sreq->kind = MPIR_REQUEST_SEND; + sreq->kind = MPIR_REQUEST_KIND__SEND; sreq->dev.OnDataAvail = NULL; sreq->dev.next = NULL; pkt_len = sizeof(MPIDI_CH3_Pkt_t) + data_sz; diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_probe_template.c b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_probe_template.c index aac2e5b..4ee0746 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_probe_template.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_probe_template.c @@ -52,7 +52,7 @@ int ADD_SUFFIX(MPID_nem_ofi_iprobe_impl)(struct MPIDI_VC *vc, BEGIN_FUNC(FCNAME); if (rreq_ptr) { MPIDI_CH3I_NM_OFI_RC(MPID_nem_ofi_create_req(&rreq, 1)); - rreq->kind = MPIR_REQUEST_RECV; + rreq->kind = MPIR_REQUEST_KIND__RECV; *rreq_ptr = rreq; rreq->comm = comm; @@ -165,7 +165,7 @@ int ADD_SUFFIX(MPID_nem_ofi_improbe)(struct MPIDI_VC *vc, tag, comm, context_offset, flag, status, message); if (*flag) { status->MPI_ERROR = old_error; - (*message)->kind = MPIR_REQUEST_MPROBE; + (*message)->kind = MPIR_REQUEST_KIND__MPROBE; } END_FUNC(FCNAME); return s; diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_progress.c b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_progress.c index d53e734..f3ec603 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_progress.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_progress.c @@ -94,10 +94,10 @@ int MPID_nem_ofi_poll(int in_blocking_poll) /* Other kinds of requests, this is fatal. */ /* ----------------------------------------------------- */ req = context_to_req(error.op_context); - if (req->kind == MPIR_REQUEST_SEND) { + if (req->kind == MPIR_REQUEST_KIND__SEND) { mpi_errno = REQ_OFI(req)->event_callback(NULL, req); } - else if (req->kind == MPIR_REQUEST_RECV) { + else if (req->kind == MPIR_REQUEST_KIND__RECV) { mpi_errno = REQ_OFI(req)->event_callback(&wc, req); req->status.MPI_ERROR = MPI_ERR_TRUNCATE; req->status.MPI_TAG = error.tag; diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_tagged_template.c b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_tagged_template.c index 12bf495..5cfae09 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_tagged_template.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_tagged_template.c @@ -124,7 +124,7 @@ static inline int ADD_SUFFIX(send_normal)(struct MPIDI_VC *vc, /* Create the MPI request */ /* ---------------------------------------------------- */ MPID_nem_ofi_create_req(&sreq, 2); - sreq->kind = MPIR_REQUEST_SEND; + sreq->kind = MPIR_REQUEST_KIND__SEND; sreq->dev.OnDataAvail = NULL; REQ_OFI(sreq)->event_callback = MPID_nem_ofi_send_callback; REQ_OFI(sreq)->vc = vc; diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h index 8cf7788..68aab68 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h @@ -68,9 +68,9 @@ static inline MPID_nem_ptl_req_area * REQ_PTL(MPIR_Request *req) { } while (0) #define MPID_nem_ptl_request_create_sreq(sreq_, errno_, comm_) do { \ - (sreq_) = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); \ + (sreq_) = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); \ MPIU_Object_set_ref((sreq_), 2); \ - (sreq_)->kind = MPIR_REQUEST_SEND; \ + (sreq_)->kind = MPIR_REQUEST_KIND__SEND; \ MPIR_Comm_add_ref(comm_); \ (sreq_)->comm = comm_; \ (sreq_)->status.MPI_ERROR = MPI_SUCCESS; \ diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c index 7862417..2a0cf8e 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c @@ -365,10 +365,10 @@ int MPID_nem_ptl_iStartContigMsg(MPIDI_VC_t *vc, void *hdr, intptr_t hdr_sz, voi MPIU_Assert(hdr_sz <= sizeof(MPIDI_CH3_Pkt_t)); /* create a request */ - *sreq_ptr = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + *sreq_ptr = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); MPIU_Assert(*sreq_ptr != NULL); MPIU_Object_set_ref(*sreq_ptr, 2); - (*sreq_ptr)->kind = MPIR_REQUEST_SEND; + (*sreq_ptr)->kind = MPIR_REQUEST_KIND__SEND; (*sreq_ptr)->dev.OnDataAvail = NULL; (*sreq_ptr)->dev.user_buf = NULL; @@ -484,7 +484,7 @@ int MPID_nem_ptl_nm_ctl_event_handler(const ptl_event_t *e) MPIR_ERR_POP(mpi_errno); } else { - MPIR_Request *req = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + MPIR_Request *req = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); /* This request is actually complete; just needs to wait to enforce ordering */ TMPBUF(req) = MPL_malloc(packet_sz); MPIU_Assert(TMPBUF(req)); @@ -501,7 +501,7 @@ int MPID_nem_ptl_nm_ctl_event_handler(const ptl_event_t *e) char *buf_ptr; ptl_size_t target_offset; - MPIR_Request *req = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + MPIR_Request *req = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); MPIU_Assert(req != NULL); MPIDI_CH3U_Request_decrement_cc(req, &incomplete); /* We'll increment it below */ REQ_PTL(req)->event_handler = MPID_nem_ptl_nm_ctl_event_handler; diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_probe.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_probe.c index 977d37c..006c5ba 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_probe.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_probe.c @@ -127,7 +127,7 @@ int MPID_nem_ptl_iprobe(MPIDI_VC_t *vc, int source, int tag, MPIR_Comm *comm, in id_any.phys.pid = PTL_PID_ANY; /* create a request */ - req = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + req = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); MPIR_ERR_CHKANDJUMP1(!req, mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", "MPIR_Request_create"); MPIU_Object_set_ref(req, 2); /* 1 ref for progress engine and 1 ref for us */ REQ_PTL(req)->event_handler = handle_probe; @@ -202,12 +202,12 @@ int MPID_nem_ptl_improbe(MPIDI_VC_t *vc, int source, int tag, MPIR_Comm *comm, i id_any.phys.pid = PTL_PID_ANY; /* create a request */ - req = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + req = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); MPID_nem_ptl_init_req(req); MPIR_ERR_CHKANDJUMP1(!req, mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", "MPIR_Request_create"); MPIU_Object_set_ref(req, 2); /* 1 ref for progress engine and 1 ref for us */ REQ_PTL(req)->event_handler = handle_mprobe; - req->kind = MPIR_REQUEST_MPROBE; + req->kind = MPIR_REQUEST_KIND__MPROBE; /* create a dummy ME to use for searching the list */ me.start = NULL; @@ -323,11 +323,11 @@ int MPID_nem_ptl_pkt_cancel_send_req_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pk /* create a dummy request and search for the message */ /* create a request */ - search_req = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + search_req = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); MPID_nem_ptl_init_req(search_req); MPIR_ERR_CHKANDJUMP1(!search_req, mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", "MPIR_Request_create"); MPIU_Object_set_ref(search_req, 2); /* 1 ref for progress engine and 1 ref for us */ - search_req->kind = MPIR_REQUEST_MPROBE; + search_req->kind = MPIR_REQUEST_KIND__MPROBE; /* create a dummy ME to use for searching the list */ me.start = NULL; diff --git a/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_send.c b/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_send.c index 81667b0..b0f1c20 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_send.c +++ b/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_send.c @@ -306,10 +306,10 @@ int MPID_nem_tcp_iStartContigMsg(MPIDI_VC_t *vc, void *hdr, intptr_t hdr_sz, voi MPL_DBG_MSG (MPIDI_CH3_DBG_CHANNEL, VERBOSE, "enqueuing"); /* create a request */ - sreq = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + sreq = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); MPIU_Assert (sreq != NULL); MPIU_Object_set_ref (sreq, 2); - sreq->kind = MPIR_REQUEST_SEND; + sreq->kind = MPIR_REQUEST_KIND__SEND; sreq->dev.OnDataAvail = 0; sreq->ch.vc = vc; @@ -445,10 +445,10 @@ int MPID_nem_tcp_iStartContigMsg_paused(MPIDI_VC_t *vc, void *hdr, intptr_t hdr_ MPL_DBG_MSG (MPIDI_CH3_DBG_CHANNEL, VERBOSE, "enqueuing"); /* create a request */ - sreq = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + sreq = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); MPIU_Assert (sreq != NULL); MPIU_Object_set_ref (sreq, 2); - sreq->kind = MPIR_REQUEST_SEND; + sreq->kind = MPIR_REQUEST_KIND__SEND; sreq->dev.OnDataAvail = 0; sreq->ch.vc = vc; diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_istartmsg.c b/src/mpid/ch3/channels/nemesis/src/ch3_istartmsg.c index b380182..810f8a5 100644 --- a/src/mpid/ch3/channels/nemesis/src/ch3_istartmsg.c +++ b/src/mpid/ch3/channels/nemesis/src/ch3_istartmsg.c @@ -89,10 +89,10 @@ int MPIDI_CH3_iStartMsg (MPIDI_VC_t *vc, void *hdr, intptr_t hdr_sz, MPIR_Reques MPL_DBG_MSG(MPIDI_CH3_DBG_OTHER, TERSE, "enqueuing"); /* create a request */ - sreq = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + sreq = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); MPIU_Assert (sreq != NULL); MPIU_Object_set_ref (sreq, 2); - sreq->kind = MPIR_REQUEST_SEND; + sreq->kind = MPIR_REQUEST_KIND__SEND; sreq->dev.pending_pkt = *(MPIDI_CH3_Pkt_t *) hdr; sreq->dev.iov[0].MPL_IOV_BUF = (char *) &sreq->dev.pending_pkt; diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_istartmsgv.c b/src/mpid/ch3/channels/nemesis/src/ch3_istartmsgv.c index 0b249ce..ea5942b 100644 --- a/src/mpid/ch3/channels/nemesis/src/ch3_istartmsgv.c +++ b/src/mpid/ch3/channels/nemesis/src/ch3_istartmsgv.c @@ -117,10 +117,10 @@ int MPIDI_CH3_iStartMsgv (MPIDI_VC_t *vc, MPL_IOV *iov, int n_iov, MPIR_Request { /* Create a new request and save remaining portions of the * iov in it. */ - sreq = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + sreq = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); MPIU_Assert(sreq != NULL); MPIU_Object_set_ref(sreq, 2); - sreq->kind = MPIR_REQUEST_SEND; + sreq->kind = MPIR_REQUEST_KIND__SEND; for (j = 0; j < remaining_n_iov; ++j) { sreq->dev.iov[j] = remaining_iov[j]; @@ -148,10 +148,10 @@ int MPIDI_CH3_iStartMsgv (MPIDI_VC_t *vc, MPL_IOV *iov, int n_iov, MPIR_Request MPL_DBG_MSG(MPIDI_CH3_DBG_OTHER, TERSE, "request enqueued"); /* create a request */ - sreq = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + sreq = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); MPIU_Assert(sreq != NULL); MPIU_Object_set_ref(sreq, 2); - sreq->kind = MPIR_REQUEST_SEND; + sreq->kind = MPIR_REQUEST_KIND__SEND; sreq->dev.pending_pkt = *(MPIDI_CH3_Pkt_t *) iov[0].MPL_IOV_BUF; sreq->dev.iov[0].MPL_IOV_BUF = (char *) &sreq->dev.pending_pkt; diff --git a/src/mpid/ch3/channels/nemesis/src/mpid_nem_mpich.c b/src/mpid/ch3/channels/nemesis/src/mpid_nem_mpich.c index da2e358..68acd83 100644 --- a/src/mpid/ch3/channels/nemesis/src/mpid_nem_mpich.c +++ b/src/mpid/ch3/channels/nemesis/src/mpid_nem_mpich.c @@ -96,10 +96,10 @@ int MPID_nem_send_iov(MPIDI_VC_t *vc, MPIR_Request **sreq_ptr, MPL_IOV *iov, int if (*sreq_ptr == NULL) { /* create a request */ - sreq = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + sreq = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); MPIU_Assert(sreq != NULL); MPIU_Object_set_ref(sreq, 2); - sreq->kind = MPIR_REQUEST_SEND; + sreq->kind = MPIR_REQUEST_KIND__SEND; sreq->dev.OnDataAvail = 0; } diff --git a/src/mpid/ch3/channels/sock/src/ch3_istartmsg.c b/src/mpid/ch3/channels/sock/src/ch3_istartmsg.c index df28f2e..c28f4a6 100644 --- a/src/mpid/ch3/channels/sock/src/ch3_istartmsg.c +++ b/src/mpid/ch3/channels/sock/src/ch3_istartmsg.c @@ -18,13 +18,13 @@ static MPIR_Request * create_request(void * hdr, intptr_t hdr_sz, MPIDI_FUNC_ENTER(MPID_STATE_CREATE_REQUEST); - sreq = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + sreq = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); /* --BEGIN ERROR HANDLING-- */ if (sreq == NULL) return NULL; /* --END ERROR HANDLING-- */ MPIU_Object_set_ref(sreq, 2); - sreq->kind = MPIR_REQUEST_SEND; + sreq->kind = MPIR_REQUEST_KIND__SEND; MPIU_Assert(hdr_sz == sizeof(MPIDI_CH3_Pkt_t)); sreq->dev.pending_pkt = *(MPIDI_CH3_Pkt_t *) hdr; sreq->dev.iov[0].MPL_IOV_BUF = @@ -126,11 +126,11 @@ int MPIDI_CH3_iStartMsg(MPIDI_VC_t * vc, void * hdr, intptr_t hdr_sz, { MPL_DBG_MSG_D(MPIDI_CH3_DBG_CHANNEL,TYPICAL, "ERROR - MPIDU_Sock_write failed, rc=%d", rc); - sreq = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + sreq = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); if (!sreq) { MPIR_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomem"); } - sreq->kind = MPIR_REQUEST_SEND; + sreq->kind = MPIR_REQUEST_KIND__SEND; MPIR_cc_set(&(sreq->cc), 0); sreq->status.MPI_ERROR = MPIR_Err_create_code( rc, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, @@ -194,11 +194,11 @@ int MPIDI_CH3_iStartMsg(MPIDI_VC_t * vc, void * hdr, intptr_t hdr_sz, { /* Connection failed, so allocate a request and return an error. */ MPL_DBG_VCUSE(vc,"ERROR - connection failed"); - sreq = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + sreq = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); if (!sreq) { MPIR_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomem"); } - sreq->kind = MPIR_REQUEST_SEND; + sreq->kind = MPIR_REQUEST_KIND__SEND; MPIR_cc_set(&sreq->cc, 0); sreq->status.MPI_ERROR = MPIR_Err_create_code( MPI_SUCCESS, diff --git a/src/mpid/ch3/channels/sock/src/ch3_istartmsgv.c b/src/mpid/ch3/channels/sock/src/ch3_istartmsgv.c index b5c5d9b..1edc491 100644 --- a/src/mpid/ch3/channels/sock/src/ch3_istartmsgv.c +++ b/src/mpid/ch3/channels/sock/src/ch3_istartmsgv.c @@ -19,13 +19,13 @@ static MPIR_Request * create_request(MPL_IOV * iov, int iov_count, MPIDI_FUNC_ENTER(MPID_STATE_CREATE_REQUEST); - sreq = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + sreq = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); /* --BEGIN ERROR HANDLING-- */ if (sreq == NULL) return NULL; /* --END ERROR HANDLING-- */ MPIU_Object_set_ref(sreq, 2); - sreq->kind = MPIR_REQUEST_SEND; + sreq->kind = MPIR_REQUEST_KIND__SEND; for (i = 0; i < iov_count; i++) { @@ -158,11 +158,11 @@ int MPIDI_CH3_iStartMsgv(MPIDI_VC_t * vc, MPL_IOV * iov, int n_iov, { MPL_DBG_MSG_D(MPIDI_CH3_DBG_CHANNEL,TYPICAL, "ERROR - MPIDU_Sock_writev failed, rc=%d", rc); - sreq = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + sreq = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); if (sreq == NULL) { MPIR_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomem"); } - sreq->kind = MPIR_REQUEST_SEND; + sreq->kind = MPIR_REQUEST_KIND__SEND; MPIR_cc_set(&(sreq->cc), 0); sreq->status.MPI_ERROR = MPIR_Err_create_code( rc, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, @@ -226,11 +226,11 @@ int MPIDI_CH3_iStartMsgv(MPIDI_VC_t * vc, MPL_IOV * iov, int n_iov, { /* Connection failed, so allocate a request and return an error. */ MPL_DBG_VCUSE(vc,"ERROR - connection failed"); - sreq = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + sreq = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); if (sreq == NULL) { MPIR_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomem"); } - sreq->kind = MPIR_REQUEST_SEND; + sreq->kind = MPIR_REQUEST_KIND__SEND; MPIR_cc_set(&(sreq->cc), 0); sreq->status.MPI_ERROR = MPIR_Err_create_code( MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, diff --git a/src/mpid/ch3/include/mpid_rma_issue.h b/src/mpid/ch3/include/mpid_rma_issue.h index 132a273..e4c855c 100644 --- a/src/mpid/ch3/include/mpid_rma_issue.h +++ b/src/mpid/ch3/include/mpid_rma_issue.h @@ -314,11 +314,11 @@ static int issue_from_origin_buffer(MPIDI_RMA_Op_t * rma_op, MPIDI_VC_t * vc, * always need a request to be passed in. */ /* create a new request */ - req = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + req = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); MPIR_ERR_CHKANDJUMP(req == NULL, mpi_errno, MPI_ERR_OTHER, "**nomemreq"); MPIU_Object_set_ref(req, 2); - req->kind = MPIR_REQUEST_SEND; + req->kind = MPIR_REQUEST_KIND__SEND; /* set extended packet header, it is freed when the request is freed. */ if (ext_hdr_sz > 0) { @@ -676,7 +676,7 @@ static int issue_get_acc_op(MPIDI_RMA_Op_t * rma_op, MPIR_Win * win_ptr, /* Create a request for the GACC response. Store the response buf, count, and * datatype in it, and pass the request's handle in the GACC packet. When the * response comes from the target, it will contain the request handle. */ - resp_req = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + resp_req = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); MPIR_ERR_CHKANDJUMP(resp_req == NULL, mpi_errno, MPI_ERR_OTHER, "**nomemreq"); MPIU_Object_set_ref(resp_req, 2); @@ -771,7 +771,7 @@ static int issue_get_acc_op(MPIDI_RMA_Op_t * rma_op, MPIR_Win * win_ptr, /* Create a request for the GACC response. Store the response buf, count, and * datatype in it, and pass the request's handle in the GACC packet. When the * response comes from the target, it will contain the request handle. */ - resp_req = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + resp_req = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); MPIR_ERR_CHKANDJUMP(resp_req == NULL, mpi_errno, MPI_ERR_OTHER, "**nomemreq"); MPIU_Object_set_ref(resp_req, 2); @@ -899,7 +899,7 @@ static int issue_get_op(MPIDI_RMA_Op_t * rma_op, MPIR_Win * win_ptr, * and pass a handle to it in the get packet. When the get * response comes from the target, it will contain the request * handle. */ - curr_req = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + curr_req = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); if (curr_req == NULL) { MPIR_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**nomemreq"); } @@ -1022,7 +1022,7 @@ static int issue_cas_op(MPIDI_RMA_Op_t * rma_op, /* Create a request for the RMW response. Store the origin buf, count, and * datatype in it, and pass the request's handle RMW packet. When the * response comes from the target, it will contain the request handle. */ - curr_req = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + curr_req = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); MPIR_ERR_CHKANDJUMP(curr_req == NULL, mpi_errno, MPI_ERR_OTHER, "**nomemreq"); /* Set refs on the request to 2: one for the response message, and one for @@ -1085,7 +1085,7 @@ static int issue_fop_op(MPIDI_RMA_Op_t * rma_op, /* Create a request for the GACC response. Store the response buf, count, and * datatype in it, and pass the request's handle in the GACC packet. When the * response comes from the target, it will contain the request handle. */ - resp_req = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + resp_req = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); MPIR_ERR_CHKANDJUMP(resp_req == NULL, mpi_errno, MPI_ERR_OTHER, "**nomemreq"); MPIU_Object_set_ref(resp_req, 2); diff --git a/src/mpid/ch3/include/mpidimpl.h b/src/mpid/ch3/include/mpidimpl.h index 73d9558..11f1c3e 100644 --- a/src/mpid/ch3/include/mpidimpl.h +++ b/src/mpid/ch3/include/mpidimpl.h @@ -287,9 +287,9 @@ extern MPIDI_Process_t MPIDI_Process; */ #define MPIDI_Request_create_sreq(sreq_, mpi_errno_, FAIL_) \ { \ - (sreq_) = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); \ + (sreq_) = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); \ MPIU_Object_set_ref((sreq_), 2); \ - (sreq_)->kind = MPIR_REQUEST_SEND; \ + (sreq_)->kind = MPIR_REQUEST_KIND__SEND; \ (sreq_)->comm = comm; \ (sreq_)->dev.partner_request = NULL; \ MPIR_Comm_add_ref(comm); \ @@ -306,9 +306,9 @@ extern MPIDI_Process_t MPIDI_Process; /* This is the receive request version of MPIDI_Request_create_sreq */ #define MPIDI_Request_create_rreq(rreq_, mpi_errno_, FAIL_) \ { \ - (rreq_) = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); \ + (rreq_) = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); \ MPIU_Object_set_ref((rreq_), 2); \ - (rreq_)->kind = MPIR_REQUEST_RECV; \ + (rreq_)->kind = MPIR_REQUEST_KIND__RECV; \ (rreq_)->dev.partner_request = NULL; \ } @@ -316,12 +316,12 @@ extern MPIDI_Process_t MPIDI_Process; * returning when a user passed MPI_PROC_NULL */ #define MPIDI_Request_create_null_rreq(rreq_, mpi_errno_, FAIL_) \ do { \ - (rreq_) = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); \ + (rreq_) = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); \ if ((rreq_) != NULL) { \ MPIU_Object_set_ref((rreq_), 1); \ /* MT FIXME should these be handled by MPIR_Request_create? */ \ MPIR_cc_set(&(rreq_)->cc, 0); \ - (rreq_)->kind = MPIR_REQUEST_RECV; \ + (rreq_)->kind = MPIR_REQUEST_KIND__RECV; \ MPIR_Status_set_procnull(&(rreq_)->status); \ } \ else { \ diff --git a/src/mpid/ch3/include/mpidpre.h b/src/mpid/ch3/include/mpidpre.h index edfd22c..284f80e 100644 --- a/src/mpid/ch3/include/mpidpre.h +++ b/src/mpid/ch3/include/mpidpre.h @@ -483,7 +483,7 @@ MPIR_REQUEST_DECL #endif #ifdef MPIDI_CH3_REQUEST_KIND_DECL -#define MPID_DEV_REQUEST_KIND_DECL MPIDI_CH3_REQUEST_KIND_DECL +#define MPID_REQUEST_KIND_DECL MPIDI_CH3_REQUEST_KIND_DECL #endif #endif diff --git a/src/mpid/ch3/include/mpidrma.h b/src/mpid/ch3/include/mpidrma.h index 213216b..9a35ee0 100644 --- a/src/mpid/ch3/include/mpidrma.h +++ b/src/mpid/ch3/include/mpidrma.h @@ -455,7 +455,7 @@ static inline int enqueue_lock_origin(MPIR_Win * win_ptr, MPIDI_VC_t * vc, } /* create request to receive upcoming requests */ - req = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + req = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); MPIU_Object_set_ref(req, 1); /* fill in area in req that will be used in Receive_data_found() */ diff --git a/src/mpid/ch3/src/ch3u_handle_recv_req.c b/src/mpid/ch3/src/ch3u_handle_recv_req.c index 211b155..c79082b 100644 --- a/src/mpid/ch3/src/ch3u_handle_recv_req.c +++ b/src/mpid/ch3/src/ch3u_handle_recv_req.c @@ -318,7 +318,7 @@ int MPIDI_CH3_ReqHandler_GaccumRecvComplete(MPIDI_VC_t * vc, MPIR_Request * rreq MPIDU_Datatype_is_contig(rreq->dev.datatype, &is_contig); MPIDU_Datatype_get_true_lb(rreq->dev.datatype, &dt_true_lb); - resp_req = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + resp_req = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); MPIR_ERR_CHKANDJUMP(resp_req == NULL, mpi_errno, MPI_ERR_OTHER, "**nomemreq"); MPIU_Object_set_ref(resp_req, 1); MPIDI_Request_set_type(resp_req, MPIDI_REQUEST_TYPE_GET_ACCUM_RESP); @@ -455,7 +455,7 @@ int MPIDI_CH3_ReqHandler_FOPRecvComplete(MPIDI_VC_t * vc, MPIR_Request * rreq, i MPIDU_Datatype_is_contig(rreq->dev.datatype, &is_contig); /* Create response request */ - resp_req = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + resp_req = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); MPIR_ERR_CHKANDJUMP(resp_req == NULL, mpi_errno, MPI_ERR_OTHER, "**nomemreq"); MPIDI_Request_set_type(resp_req, MPIDI_REQUEST_TYPE_FOP_RESP); MPIU_Object_set_ref(resp_req, 1); @@ -879,10 +879,10 @@ int MPIDI_CH3_ReqHandler_GetDerivedDTRecvComplete(MPIDI_VC_t * vc, create_derived_datatype(rreq, dtype_info, &new_dtp); /* create request for sending data */ - sreq = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + sreq = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); MPIR_ERR_CHKANDJUMP(sreq == NULL, mpi_errno, MPI_ERR_OTHER, "**nomemreq"); - sreq->kind = MPIR_REQUEST_SEND; + sreq->kind = MPIR_REQUEST_KIND__SEND; MPIDI_Request_set_type(sreq, MPIDI_REQUEST_TYPE_GET_RESP); sreq->dev.OnDataAvail = MPIDI_CH3_ReqHandler_GetSendComplete; sreq->dev.OnFinal = MPIDI_CH3_ReqHandler_GetSendComplete; @@ -1198,14 +1198,14 @@ static inline int perform_get_in_lock_queue(MPIR_Win * win_ptr, /* Make sure that all data is received for this op. */ MPIU_Assert(target_lock_entry->all_data_recved == 1); - sreq = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + sreq = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); if (sreq == NULL) { MPIR_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**nomemreq"); } MPIU_Object_set_ref(sreq, 1); MPIDI_Request_set_type(sreq, MPIDI_REQUEST_TYPE_GET_RESP); - sreq->kind = MPIR_REQUEST_SEND; + sreq->kind = MPIR_REQUEST_KIND__SEND; sreq->dev.OnDataAvail = MPIDI_CH3_ReqHandler_GetSendComplete; sreq->dev.OnFinal = MPIDI_CH3_ReqHandler_GetSendComplete; @@ -1374,14 +1374,14 @@ static inline int perform_get_acc_in_lock_queue(MPIR_Win * win_ptr, /* Make sure that all data is received for this op. */ MPIU_Assert(target_lock_entry->all_data_recved == 1); - sreq = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + sreq = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); if (sreq == NULL) { MPIR_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**nomemreq"); } MPIU_Object_set_ref(sreq, 1); MPIDI_Request_set_type(sreq, MPIDI_REQUEST_TYPE_GET_ACCUM_RESP); - sreq->kind = MPIR_REQUEST_SEND; + sreq->kind = MPIR_REQUEST_KIND__SEND; sreq->dev.OnDataAvail = MPIDI_CH3_ReqHandler_GaccumSendComplete; sreq->dev.OnFinal = MPIDI_CH3_ReqHandler_GaccumSendComplete; @@ -1588,7 +1588,7 @@ static inline int perform_fop_in_lock_queue(MPIR_Win * win_ptr, fop_resp_pkt->flags |= MPIDI_CH3_PKT_FLAG_RMA_ACK; if (fop_pkt->type == MPIDI_CH3_PKT_FOP) { - resp_req = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + resp_req = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); if (resp_req == NULL) { MPIR_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**nomemreq"); } diff --git a/src/mpid/ch3/src/ch3u_rma_pkthandler.c b/src/mpid/ch3/src/ch3u_rma_pkthandler.c index 3c41578..3923ffa 100644 --- a/src/mpid/ch3/src/ch3u_rma_pkthandler.c +++ b/src/mpid/ch3/src/ch3u_rma_pkthandler.c @@ -315,7 +315,7 @@ int MPIDI_CH3_PktHandler_Put(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, data_len = *buflen - sizeof(MPIDI_CH3_Pkt_t); data_buf = (char *) pkt + sizeof(MPIDI_CH3_Pkt_t); - req = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + req = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); MPIU_Object_set_ref(req, 1); req->dev.user_buf = put_pkt->addr; @@ -464,7 +464,7 @@ int MPIDI_CH3_PktHandler_Get(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, goto fn_exit; } - req = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + req = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); req->dev.target_win_handle = get_pkt->target_win_handle; req->dev.flags = get_pkt->flags; @@ -491,7 +491,7 @@ int MPIDI_CH3_PktHandler_Get(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, MPIDI_Request_set_type(req, MPIDI_REQUEST_TYPE_GET_RESP); req->dev.OnDataAvail = MPIDI_CH3_ReqHandler_GetSendComplete; req->dev.OnFinal = MPIDI_CH3_ReqHandler_GetSendComplete; - req->kind = MPIR_REQUEST_SEND; + req->kind = MPIR_REQUEST_KIND__SEND; if (get_pkt->flags & MPIDI_CH3_PKT_FLAG_RMA_IMMED_RESP) { MPIDI_Pkt_init(get_resp_pkt, MPIDI_CH3_PKT_GET_RESP_IMMED); @@ -705,7 +705,7 @@ int MPIDI_CH3_PktHandler_Accumulate(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, else { MPIU_Assert(pkt->type == MPIDI_CH3_PKT_ACCUMULATE); - req = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + req = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); MPIU_Object_set_ref(req, 1); *rreqp = req; @@ -905,14 +905,14 @@ int MPIDI_CH3_PktHandler_GetAccumulate(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, /* Immed packet type is used when target datatype is predefined datatype. */ MPIU_Assert(MPIR_DATATYPE_IS_PREDEFINED(get_accum_pkt->datatype)); - resp_req = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + resp_req = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); resp_req->dev.target_win_handle = get_accum_pkt->target_win_handle; resp_req->dev.flags = get_accum_pkt->flags; MPIDI_Request_set_type(resp_req, MPIDI_REQUEST_TYPE_GET_ACCUM_RESP); resp_req->dev.OnDataAvail = MPIDI_CH3_ReqHandler_GaccumSendComplete; resp_req->dev.OnFinal = MPIDI_CH3_ReqHandler_GaccumSendComplete; - resp_req->kind = MPIR_REQUEST_SEND; + resp_req->kind = MPIR_REQUEST_KIND__SEND; /* here we increment the Active Target counter to guarantee the GET-like * operation are completed when counter reaches zero. */ @@ -978,7 +978,7 @@ int MPIDI_CH3_PktHandler_GetAccumulate(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, MPIU_Assert(pkt->type == MPIDI_CH3_PKT_GET_ACCUM); - req = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + req = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); MPIU_Object_set_ref(req, 1); *rreqp = req; @@ -1436,7 +1436,7 @@ int MPIDI_CH3_PktHandler_FOP(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, if (fop_pkt->op == MPI_NO_OP) is_empty_origin = TRUE; - req = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + req = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); MPIU_Object_set_ref(req, 1); MPIDI_Request_set_type(req, MPIDI_REQUEST_TYPE_FOP_RECV); *rreqp = req; diff --git a/src/mpid/ch3/src/ch3u_rma_reqops.c b/src/mpid/ch3/src/ch3u_rma_reqops.c index b6c55ff..920d66a 100644 --- a/src/mpid/ch3/src/ch3u_rma_reqops.c +++ b/src/mpid/ch3/src/ch3u_rma_reqops.c @@ -37,9 +37,9 @@ int MPID_Rput(const void *origin_addr, int origin_count, MPIDI_Datatype_get_info(origin_count, origin_datatype, dt_contig, data_sz, dtp, dt_true_lb); /* Create user request, initially cc=1, ref=1 */ - ureq = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + ureq = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); MPIR_ERR_CHKANDJUMP(ureq == NULL, mpi_errno, MPI_ERR_OTHER, "**nomemreq"); - ureq->kind = MPIR_WIN_REQUEST; + ureq->kind = MPIR_REQUEST_KIND__RMA; /* This request is referenced by user and ch3 by default. */ MPIU_Object_set_ref(ureq, 2); @@ -100,9 +100,9 @@ int MPID_Rget(void *origin_addr, int origin_count, MPIDI_Datatype_get_info(origin_count, origin_datatype, dt_contig, data_sz, dtp, dt_true_lb); /* Create user request, initially cc=1, ref=1 */ - ureq = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + ureq = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); MPIR_ERR_CHKANDJUMP(ureq == NULL, mpi_errno, MPI_ERR_OTHER, "**nomemreq"); - ureq->kind = MPIR_WIN_REQUEST; + ureq->kind = MPIR_REQUEST_KIND__RMA; /* This request is referenced by user and ch3 by default. */ MPIU_Object_set_ref(ureq, 2); @@ -161,9 +161,9 @@ int MPID_Raccumulate(const void *origin_addr, int origin_count, mpi_errno, MPI_ERR_RMA_SYNC, "**rmasync"); /* Create user request, initially cc=1, ref=1 */ - ureq = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + ureq = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); MPIR_ERR_CHKANDJUMP(ureq == NULL, mpi_errno, MPI_ERR_OTHER, "**nomemreq"); - ureq->kind = MPIR_WIN_REQUEST; + ureq->kind = MPIR_REQUEST_KIND__RMA; /* This request is referenced by user and ch3 by default. */ MPIU_Object_set_ref(ureq, 2); @@ -225,9 +225,9 @@ int MPID_Rget_accumulate(const void *origin_addr, int origin_count, mpi_errno, MPI_ERR_RMA_SYNC, "**rmasync"); /* Create user request, initially cc=1, ref=1 */ - ureq = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + ureq = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); MPIR_ERR_CHKANDJUMP(ureq == NULL, mpi_errno, MPI_ERR_OTHER, "**nomemreq"); - ureq->kind = MPIR_WIN_REQUEST; + ureq->kind = MPIR_REQUEST_KIND__RMA; /* This request is referenced by user and ch3 by default. */ MPIU_Object_set_ref(ureq, 2); diff --git a/src/mpid/ch3/src/mpid_cancel_recv.c b/src/mpid/ch3/src/mpid_cancel_recv.c index 3c8a025..69da3a1 100644 --- a/src/mpid/ch3/src/mpid_cancel_recv.c +++ b/src/mpid/ch3/src/mpid_cancel_recv.c @@ -19,7 +19,7 @@ int MPID_Cancel_recv(MPIR_Request * rreq) MPIDI_FUNC_ENTER(MPID_STATE_MPID_CANCEL_RECV); - MPIU_Assert(rreq->kind == MPIR_REQUEST_RECV); + MPIU_Assert(rreq->kind == MPIR_REQUEST_KIND__RECV); /* If the netmod has its own cancel_recv function, we need to call it here. ANYSOURCE cancels (netmod and otherwise) are handled by diff --git a/src/mpid/ch3/src/mpid_cancel_send.c b/src/mpid/ch3/src/mpid_cancel_send.c index 3df04ce..2e6d7ff 100644 --- a/src/mpid/ch3/src/mpid_cancel_send.c +++ b/src/mpid/ch3/src/mpid_cancel_send.c @@ -24,7 +24,7 @@ int MPID_Cancel_send(MPIR_Request * sreq) MPIDI_FUNC_ENTER(MPID_STATE_MPID_CANCEL_SEND); - MPIU_Assert(sreq->kind == MPIR_REQUEST_SEND); + MPIU_Assert(sreq->kind == MPIR_REQUEST_KIND__SEND); MPIDI_Request_cancel_pending(sreq, &flag); if (flag) diff --git a/src/mpid/ch3/src/mpid_comm_failure_ack.c b/src/mpid/ch3/src/mpid_comm_failure_ack.c index d05c7f0..037611e 100644 --- a/src/mpid/ch3/src/mpid_comm_failure_ack.c +++ b/src/mpid/ch3/src/mpid_comm_failure_ack.c @@ -89,7 +89,7 @@ int MPID_Comm_AS_enabled(MPIR_Comm *comm_ptr) { int MPID_Request_is_anysource(MPIR_Request *request_ptr) { int ret = 0; - if (request_ptr->kind == MPIR_REQUEST_RECV) + if (request_ptr->kind == MPIR_REQUEST_KIND__RECV) ret = request_ptr->dev.match.parts.rank == MPI_ANY_SOURCE; return ret; diff --git a/src/mpid/ch3/src/mpid_improbe.c b/src/mpid/ch3/src/mpid_improbe.c index ed7fbbe..28d29a1 100644 --- a/src/mpid/ch3/src/mpid_improbe.c +++ b/src/mpid/ch3/src/mpid_improbe.c @@ -99,7 +99,7 @@ int MPID_Improbe(int source, int tag, MPIR_Comm *comm, int context_offset, } if (*flag && *message) { - (*message)->kind = MPIR_REQUEST_MPROBE; + (*message)->kind = MPIR_REQUEST_KIND__MPROBE; MPIR_Request_extract_status((*message), status); } diff --git a/src/mpid/ch3/src/mpid_imrecv.c b/src/mpid/ch3/src/mpid_imrecv.c index 4dde4eb..23be8f2 100644 --- a/src/mpid/ch3/src/mpid_imrecv.c +++ b/src/mpid/ch3/src/mpid_imrecv.c @@ -28,10 +28,10 @@ int MPID_Imrecv(void *buf, int count, MPI_Datatype datatype, } MPIU_Assert(message != NULL); - MPIU_Assert(message->kind == MPIR_REQUEST_MPROBE); + MPIU_Assert(message->kind == MPIR_REQUEST_KIND__MPROBE); /* promote the request object to be a "real" recv request */ - message->kind = MPIR_REQUEST_RECV; + message->kind = MPIR_REQUEST_KIND__RECV; *rreqp = rreq = message; diff --git a/src/mpid/ch3/src/mpid_mprobe.c b/src/mpid/ch3/src/mpid_mprobe.c index 163495a..f68b9b7 100644 --- a/src/mpid/ch3/src/mpid_mprobe.c +++ b/src/mpid/ch3/src/mpid_mprobe.c @@ -106,7 +106,7 @@ int MPID_Mprobe(int source, int tag, MPIR_Comm *comm, int context_offset, if (mpi_errno) MPIR_ERR_POP(mpi_errno); if (*message) { - (*message)->kind = MPIR_REQUEST_MPROBE; + (*message)->kind = MPIR_REQUEST_KIND__MPROBE; MPIR_Request_extract_status((*message), status); } diff --git a/src/mpid/ch3/src/mpid_startall.c b/src/mpid/ch3/src/mpid_startall.c index e4aea41..e45d66c 100644 --- a/src/mpid/ch3/src/mpid_startall.c +++ b/src/mpid/ch3/src/mpid_startall.c @@ -22,7 +22,7 @@ /* This macro initializes all of the fields in a persistent request */ #define MPIDI_Request_create_psreq(sreq_, mpi_errno_, FAIL_) \ { \ - (sreq_) = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); \ + (sreq_) = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); \ if ((sreq_) == NULL) \ { \ MPL_DBG_MSG(MPIDI_CH3_DBG_OTHER,VERBOSE,"send request allocation failed");\ @@ -32,7 +32,7 @@ \ MPIU_Object_set_ref((sreq_), 1); \ MPIR_cc_set(&(sreq_)->cc, 0); \ - (sreq_)->kind = MPIR_PREQUEST_SEND; \ + (sreq_)->kind = MPIR_REQUEST_KIND__PREQUEST_SEND; \ (sreq_)->comm = comm; \ MPIR_Comm_add_ref(comm); \ (sreq_)->dev.match.parts.rank = rank; \ @@ -299,7 +299,7 @@ int MPID_Recv_init(void * buf, int count, MPI_Datatype datatype, int rank, int t MPIDI_FUNC_ENTER(MPID_STATE_MPID_RECV_INIT); - rreq = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); + rreq = MPIR_Request_create(MPIR_REQUEST_KIND__UNDEFINED); if (rreq == NULL) { /* --BEGIN ERROR HANDLING-- */ @@ -309,7 +309,7 @@ int MPID_Recv_init(void * buf, int count, MPI_Datatype datatype, int rank, int t } MPIU_Object_set_ref(rreq, 1); - rreq->kind = MPIR_PREQUEST_RECV; + rreq->kind = MPIR_REQUEST_KIND__PREQUEST_RECV; rreq->comm = comm; MPIR_cc_set(&rreq->cc, 0); MPIR_Comm_add_ref(comm); diff --git a/src/mpid/common/hcoll/hcoll_rte.c b/src/mpid/common/hcoll/hcoll_rte.c index acd3076..235e076 100644 --- a/src/mpid/common/hcoll/hcoll_rte.c +++ b/src/mpid/common/hcoll/hcoll_rte.c @@ -386,7 +386,7 @@ static int group_id(rte_grp_handle_t group) static void *get_coll_handle(void) { MPIR_Request *req; - req = MPIR_Request_create(MPIR_COLL_REQUEST); + req = MPIR_Request_create(MPIR_REQUEST_KIND__COLL); return (void *) req; } diff --git a/src/mpid/common/sched/mpidu_sched.c b/src/mpid/common/sched/mpidu_sched.c index 0a7f396..41872d8 100644 --- a/src/mpid/common/sched/mpidu_sched.c +++ b/src/mpid/common/sched/mpidu_sched.c @@ -407,7 +407,7 @@ int MPIDU_Sched_start(MPID_Sched_t * sp, MPIR_Comm * comm, int tag, MPIR_Request MPIU_Assert(s->entries != NULL); /* now create and populate the request */ - r = MPIR_Request_create(MPIR_COLL_REQUEST); + r = MPIR_Request_create(MPIR_REQUEST_KIND__COLL); if (!r) MPIR_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**nomem"); /* FIXME is this right when comm/datatype GC is used? */ diff --git a/src/mpid/pamid/src/coll/allgather/mpido_iallgather.c b/src/mpid/pamid/src/coll/allgather/mpido_iallgather.c index 34b8bbd..1f3f3ab 100644 --- a/src/mpid/pamid/src/coll/allgather/mpido_iallgather.c +++ b/src/mpid/pamid/src/coll/allgather/mpido_iallgather.c @@ -62,7 +62,7 @@ MPIDO_Iallgather(const void *sendbuf, * perform an additional iallgather. */ MPIR_Request * mpid_request = MPID_Request_create_inline(); - mpid_request->kind = MPIR_COLL_REQUEST; + mpid_request->kind = MPIR_REQUEST_KIND__COLL; *request = mpid_request; MPIDI_Request_complete_norelease_inline(mpid_request); diff --git a/src/mpid/pamid/src/coll/allgatherv/mpido_iallgatherv.c b/src/mpid/pamid/src/coll/allgatherv/mpido_iallgatherv.c index 1b9efb0..b7570cd 100644 --- a/src/mpid/pamid/src/coll/allgatherv/mpido_iallgatherv.c +++ b/src/mpid/pamid/src/coll/allgatherv/mpido_iallgatherv.c @@ -66,7 +66,7 @@ MPIDO_Iallgatherv(const void *sendbuf, * perform an additional iallgather. */ MPIR_Request * mpid_request = MPID_Request_create_inline(); - mpid_request->kind = MPIR_COLL_REQUEST; + mpid_request->kind = MPIR_REQUEST_KIND__COLL; *request = mpid_request; MPIDI_Request_complete_norelease_inline(mpid_request); diff --git a/src/mpid/pamid/src/coll/allreduce/mpido_iallreduce.c b/src/mpid/pamid/src/coll/allreduce/mpido_iallreduce.c index 3f0c219..d504b80 100644 --- a/src/mpid/pamid/src/coll/allreduce/mpido_iallreduce.c +++ b/src/mpid/pamid/src/coll/allreduce/mpido_iallreduce.c @@ -62,7 +62,7 @@ int MPIDO_Iallreduce(const void *sendbuf, * perform an additional iallreduce. */ MPIR_Request * mpid_request = MPID_Request_create_inline(); - mpid_request->kind = MPIR_COLL_REQUEST; + mpid_request->kind = MPIR_REQUEST_KIND__COLL; *request = mpid_request; MPIDI_Request_complete_norelease_inline(mpid_request); diff --git a/src/mpid/pamid/src/coll/alltoall/mpido_ialltoall.c b/src/mpid/pamid/src/coll/alltoall/mpido_ialltoall.c index 90f014b..7ecfb2c 100644 --- a/src/mpid/pamid/src/coll/alltoall/mpido_ialltoall.c +++ b/src/mpid/pamid/src/coll/alltoall/mpido_ialltoall.c @@ -64,7 +64,7 @@ int MPIDO_Ialltoall(const void *sendbuf, * perform an additional ialltoall. */ MPIR_Request * mpid_request = MPID_Request_create_inline(); - mpid_request->kind = MPIR_COLL_REQUEST; + mpid_request->kind = MPIR_REQUEST_KIND__COLL; *request = mpid_request; MPIDI_Request_complete_norelease_inline(mpid_request); diff --git a/src/mpid/pamid/src/coll/alltoallv/mpido_ialltoallv.c b/src/mpid/pamid/src/coll/alltoallv/mpido_ialltoallv.c index 5c88f07..a296664 100644 --- a/src/mpid/pamid/src/coll/alltoallv/mpido_ialltoallv.c +++ b/src/mpid/pamid/src/coll/alltoallv/mpido_ialltoallv.c @@ -66,7 +66,7 @@ int MPIDO_Ialltoallv(const void *sendbuf, * perform an additional ialltoallv. */ MPIR_Request * mpid_request = MPID_Request_create_inline(); - mpid_request->kind = MPIR_COLL_REQUEST; + mpid_request->kind = MPIR_REQUEST_KIND__COLL; *request = mpid_request; MPIDI_Request_complete_norelease_inline(mpid_request); diff --git a/src/mpid/pamid/src/coll/alltoallw/mpido_ialltoallw.c b/src/mpid/pamid/src/coll/alltoallw/mpido_ialltoallw.c index 0f82a4f..2569bfa 100644 --- a/src/mpid/pamid/src/coll/alltoallw/mpido_ialltoallw.c +++ b/src/mpid/pamid/src/coll/alltoallw/mpido_ialltoallw.c @@ -66,7 +66,7 @@ int MPIDO_Ialltoallw(const void *sendbuf, * perform an additional ialltoallw. */ MPIR_Request * mpid_request = MPID_Request_create_inline(); - mpid_request->kind = MPIR_COLL_REQUEST; + mpid_request->kind = MPIR_REQUEST_KIND__COLL; *request = mpid_request; MPIDI_Request_complete_norelease_inline(mpid_request); diff --git a/src/mpid/pamid/src/coll/barrier/mpido_ibarrier.c b/src/mpid/pamid/src/coll/barrier/mpido_ibarrier.c index fc48a0b..eb093fa 100644 --- a/src/mpid/pamid/src/coll/barrier/mpido_ibarrier.c +++ b/src/mpid/pamid/src/coll/barrier/mpido_ibarrier.c @@ -54,7 +54,7 @@ int MPIDO_Ibarrier(MPIR_Comm *comm_ptr, MPIR_Request **request) int rc = MPIR_Barrier(comm_ptr, &mpierrno); MPIR_Request * mpid_request = MPID_Request_create_inline(); - mpid_request->kind = MPIR_COLL_REQUEST; + mpid_request->kind = MPIR_REQUEST_KIND__COLL; *request = mpid_request; MPIDI_Request_complete_norelease_inline(mpid_request); diff --git a/src/mpid/pamid/src/coll/bcast/mpido_ibcast.c b/src/mpid/pamid/src/coll/bcast/mpido_ibcast.c index 630e379..85134dd 100644 --- a/src/mpid/pamid/src/coll/bcast/mpido_ibcast.c +++ b/src/mpid/pamid/src/coll/bcast/mpido_ibcast.c @@ -56,7 +56,7 @@ int MPIDO_Ibcast(void *buffer, * object so the MPIR_Ibcast_impl() function does not perform the bcast. */ MPIR_Request * mpid_request = MPID_Request_create_inline(); - mpid_request->kind = MPIR_COLL_REQUEST; + mpid_request->kind = MPIR_REQUEST_KIND__COLL; *request = mpid_request; MPIDI_Request_complete_norelease_inline(mpid_request); diff --git a/src/mpid/pamid/src/coll/exscan/mpido_iexscan.c b/src/mpid/pamid/src/coll/exscan/mpido_iexscan.c index 4d2b90f..2da2b08 100644 --- a/src/mpid/pamid/src/coll/exscan/mpido_iexscan.c +++ b/src/mpid/pamid/src/coll/exscan/mpido_iexscan.c @@ -54,7 +54,7 @@ int MPIDO_Iexscan(const void *sendbuf, void *recvbuf, * perform an additional iexscan. */ MPIR_Request * mpid_request = MPID_Request_create_inline(); - mpid_request->kind = MPIR_COLL_REQUEST; + mpid_request->kind = MPIR_REQUEST_KIND__COLL; *request = mpid_request; MPIDI_Request_complete_norelease_inline(mpid_request); diff --git a/src/mpid/pamid/src/coll/gather/mpido_igather.c b/src/mpid/pamid/src/coll/gather/mpido_igather.c index 1ce2b4f..f55eea4 100644 --- a/src/mpid/pamid/src/coll/gather/mpido_igather.c +++ b/src/mpid/pamid/src/coll/gather/mpido_igather.c @@ -61,7 +61,7 @@ int MPIDO_Igather(const void *sendbuf, * perform an additional igather. */ MPIR_Request * mpid_request = MPID_Request_create_inline(); - mpid_request->kind = MPIR_COLL_REQUEST; + mpid_request->kind = MPIR_REQUEST_KIND__COLL; *request = mpid_request; MPIDI_Request_complete_norelease_inline(mpid_request); diff --git a/src/mpid/pamid/src/coll/gatherv/mpido_igatherv.c b/src/mpid/pamid/src/coll/gatherv/mpido_igatherv.c index b6be41b..3a315d6 100644 --- a/src/mpid/pamid/src/coll/gatherv/mpido_igatherv.c +++ b/src/mpid/pamid/src/coll/gatherv/mpido_igatherv.c @@ -66,7 +66,7 @@ int MPIDO_Igatherv(const void *sendbuf, * perform an additional igatherv. */ MPIR_Request * mpid_request = MPID_Request_create_inline(); - mpid_request->kind = MPIR_COLL_REQUEST; + mpid_request->kind = MPIR_REQUEST_KIND__COLL; *request = mpid_request; MPIDI_Request_complete_norelease_inline(mpid_request); diff --git a/src/mpid/pamid/src/coll/ired_scat/mpido_ired_scat.c b/src/mpid/pamid/src/coll/ired_scat/mpido_ired_scat.c index 3e841bc..80d54d8 100644 --- a/src/mpid/pamid/src/coll/ired_scat/mpido_ired_scat.c +++ b/src/mpid/pamid/src/coll/ired_scat/mpido_ired_scat.c @@ -61,7 +61,7 @@ int MPIDO_Ireduce_scatter(const void *sendbuf, * does not perform an additional ireduce_scatter. */ MPIR_Request * mpid_request = MPID_Request_create_inline(); - mpid_request->kind = MPIR_COLL_REQUEST; + mpid_request->kind = MPIR_REQUEST_KIND__COLL; *request = mpid_request; MPIDI_Request_complete_norelease_inline(mpid_request); diff --git a/src/mpid/pamid/src/coll/ired_scat_block/mpido_ired_scat_block.c b/src/mpid/pamid/src/coll/ired_scat_block/mpido_ired_scat_block.c index 8027664..1a9f738 100644 --- a/src/mpid/pamid/src/coll/ired_scat_block/mpido_ired_scat_block.c +++ b/src/mpid/pamid/src/coll/ired_scat_block/mpido_ired_scat_block.c @@ -61,7 +61,7 @@ int MPIDO_Ireduce_scatter_block(const void *sendbuf, * does not perform an additional ireduce_scatter_block. */ MPIR_Request * mpid_request = MPID_Request_create_inline(); - mpid_request->kind = MPIR_COLL_REQUEST; + mpid_request->kind = MPIR_REQUEST_KIND__COLL; *request = mpid_request; MPIDI_Request_complete_norelease_inline(mpid_request); diff --git a/src/mpid/pamid/src/coll/reduce/mpido_ireduce.c b/src/mpid/pamid/src/coll/reduce/mpido_ireduce.c index a610b77..e7f7c57 100644 --- a/src/mpid/pamid/src/coll/reduce/mpido_ireduce.c +++ b/src/mpid/pamid/src/coll/reduce/mpido_ireduce.c @@ -61,7 +61,7 @@ int MPIDO_Ireduce(const void *sendbuf, * does not perform an additional ireduce. */ MPIR_Request * mpid_request = MPID_Request_create_inline(); - mpid_request->kind = MPIR_COLL_REQUEST; + mpid_request->kind = MPIR_REQUEST_KIND__COLL; *request = mpid_request; MPIDI_Request_complete_norelease_inline(mpid_request); diff --git a/src/mpid/pamid/src/coll/scan/mpido_scan.c b/src/mpid/pamid/src/coll/scan/mpido_scan.c index efb17eb..ee4c8d2 100644 --- a/src/mpid/pamid/src/coll/scan/mpido_scan.c +++ b/src/mpid/pamid/src/coll/scan/mpido_scan.c @@ -74,7 +74,7 @@ int MPIDO_Iscan(const void *sendbuf, void *recvbuf, * does not perform an additional iscan. */ MPIR_Request * mpid_request = MPID_Request_create_inline(); - mpid_request->kind = MPIR_COLL_REQUEST; + mpid_request->kind = MPIR_REQUEST_KIND__COLL; *request = mpid_request; MPIDI_Request_complete_norelease_inline(mpid_request); diff --git a/src/mpid/pamid/src/coll/scatter/mpido_iscatter.c b/src/mpid/pamid/src/coll/scatter/mpido_iscatter.c index 98f12f9..9d11d91 100644 --- a/src/mpid/pamid/src/coll/scatter/mpido_iscatter.c +++ b/src/mpid/pamid/src/coll/scatter/mpido_iscatter.c @@ -63,7 +63,7 @@ int MPIDO_Iscatter(const void *sendbuf, * does not perform an additional iscatter. */ MPIR_Request * mpid_request = MPID_Request_create_inline(); - mpid_request->kind = MPIR_COLL_REQUEST; + mpid_request->kind = MPIR_REQUEST_KIND__COLL; *request = mpid_request; MPIDI_Request_complete_norelease_inline(mpid_request); diff --git a/src/mpid/pamid/src/coll/scatterv/mpido_iscatterv.c b/src/mpid/pamid/src/coll/scatterv/mpido_iscatterv.c index 203b68b..11d9173 100644 --- a/src/mpid/pamid/src/coll/scatterv/mpido_iscatterv.c +++ b/src/mpid/pamid/src/coll/scatterv/mpido_iscatterv.c @@ -62,7 +62,7 @@ int MPIDO_Iscatterv(const void *sendbuf, * does not perform an additional iscatterv. */ MPIR_Request * mpid_request = MPID_Request_create_inline(); - mpid_request->kind = MPIR_COLL_REQUEST; + mpid_request->kind = MPIR_REQUEST_KIND__COLL; *request = mpid_request; MPIDI_Request_complete_norelease_inline(mpid_request); diff --git a/src/mpid/pamid/src/mpid_improbe.c b/src/mpid/pamid/src/mpid_improbe.c index eba7b17..97e8d7a 100644 --- a/src/mpid/pamid/src/mpid_improbe.c +++ b/src/mpid/pamid/src/mpid_improbe.c @@ -38,7 +38,7 @@ int MPID_Improbe(int source, int tag, MPIR_Comm *comm, int context_offset, MPID_Progress_poke(); } else { - rreq->kind = MPIR_REQUEST_MPROBE; + rreq->kind = MPIR_REQUEST_KIND__MPROBE; MPIR_Request_extract_status(rreq, status); } diff --git a/src/mpid/pamid/src/mpid_imrecv.c b/src/mpid/pamid/src/mpid_imrecv.c index a7f9242..426707e 100644 --- a/src/mpid/pamid/src/mpid_imrecv.c +++ b/src/mpid/pamid/src/mpid_imrecv.c @@ -20,7 +20,7 @@ int MPID_Imrecv(void *buf, int count, MPI_Datatype datatype, { rreq = MPIDI_Request_create2(); MPIR_Status_set_procnull(&rreq->status); - rreq->kind = MPIR_REQUEST_RECV; + rreq->kind = MPIR_REQUEST_KIND__RECV; MPIDI_Request_complete(rreq); *rreqp = rreq; return MPI_SUCCESS; @@ -28,10 +28,10 @@ int MPID_Imrecv(void *buf, int count, MPI_Datatype datatype, } MPIU_Assert(message != NULL); - MPIU_Assert(message->kind == MPIR_REQUEST_MPROBE); + MPIU_Assert(message->kind == MPIR_REQUEST_KIND__MPROBE); /* promote the request object to be a "real" recv request */ - message->kind = MPIR_REQUEST_RECV; + message->kind = MPIR_REQUEST_KIND__RECV; *rreqp = rreq = message; diff --git a/src/mpid/pamid/src/mpid_mprobe.c b/src/mpid/pamid/src/mpid_mprobe.c index 740c6f9..29a27b5 100644 --- a/src/mpid/pamid/src/mpid_mprobe.c +++ b/src/mpid/pamid/src/mpid_mprobe.c @@ -32,7 +32,7 @@ int MPID_Mprobe(int source, int tag, MPIR_Comm *comm, int context_offset, #endif if (rreq) { - rreq->kind = MPIR_REQUEST_MPROBE; + rreq->kind = MPIR_REQUEST_KIND__MPROBE; MPIR_Request_extract_status(rreq, status); } *message = rreq; diff --git a/src/mpid/pamid/src/mpid_recvq.c b/src/mpid/pamid/src/mpid_recvq.c index e478cbb..f0e00cb 100644 --- a/src/mpid/pamid/src/mpid_recvq.c +++ b/src/mpid/pamid/src/mpid_recvq.c @@ -742,7 +742,7 @@ MPIDI_Recvq_AEU(MPIR_Request *newreq, int source, pami_task_t pami_source, int t queue */ MPIR_Request *rreq; rreq = newreq; - rreq->kind = MPIR_REQUEST_RECV; + rreq->kind = MPIR_REQUEST_KIND__RECV; TRACE_MEMSET_R(pami_source,msg_seqno,recv_status); TRACE_SET_REQ_VAL(rreq->mpid.envelope.msginfo.MPIseqno,-1); TRACE_SET_REQ_VAL(rreq->mpid.envelope.length,-1); diff --git a/src/mpid/pamid/src/mpid_recvq.h b/src/mpid/pamid/src/mpid_recvq.h index 5d1864d..12b8733 100644 --- a/src/mpid/pamid/src/mpid_recvq.h +++ b/src/mpid/pamid/src/mpid_recvq.h @@ -209,7 +209,7 @@ MPIDI_Recvq_FDU_or_AEP(MPIR_Request *newreq, int source, pami_task_t pami_source TRACE_SET_REQ_VAL(rreq->mpid.envelope.msginfo.MPIseqno,-1); TRACE_SET_REQ_VAL(rreq->mpid.envelope.length,-1); TRACE_SET_REQ_VAL(rreq->mpid.envelope.data,(void *) 0); - rreq->kind = MPIR_REQUEST_RECV; + rreq->kind = MPIR_REQUEST_KIND__RECV; MPIDI_Request_setMatch(rreq, tag, source, context_id); #ifdef QUEUE_BINARY_SEARCH_SUPPORT if(MPIDI_Process.queue_binary_search_support_on) diff --git a/src/mpid/pamid/src/onesided/mpid_win_reqops.c b/src/mpid/pamid/src/onesided/mpid_win_reqops.c index 0807f53..36518d1 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_reqops.c +++ b/src/mpid/pamid/src/onesided/mpid_win_reqops.c @@ -60,7 +60,7 @@ MPID_Rput(const void *origin_addr, MPIR_Request *rreq = MPIDI_Request_create1(); *request = rreq; - rreq->kind = MPIR_WIN_REQUEST; + rreq->kind = MPIR_REQUEST_KIND__RMA; win->mpid.rreq = rreq; win->mpid.request_based = 1; @@ -111,7 +111,7 @@ MPID_Rget(void *origin_addr, } MPIR_Request *rreq = MPIDI_Request_create1(); - rreq->kind = MPIR_WIN_REQUEST; + rreq->kind = MPIR_REQUEST_KIND__RMA; *request = rreq; win->mpid.rreq = rreq; win->mpid.request_based = 1; @@ -170,7 +170,7 @@ MPID_Raccumulate(const void *origin_addr, } MPIR_Request *rreq = MPIDI_Request_create1(); - rreq->kind = MPIR_WIN_REQUEST; + rreq->kind = MPIR_REQUEST_KIND__RMA; *request = rreq; win->mpid.rreq = rreq; win->mpid.request_based = 1; @@ -235,7 +235,7 @@ MPID_Rget_accumulate(const void *origin_addr, } MPIR_Request *rreq = MPIDI_Request_create1(); - rreq->kind = MPIR_WIN_REQUEST; + rreq->kind = MPIR_REQUEST_KIND__RMA; *request = rreq; win->mpid.rreq = rreq; win->mpid.request_based = 1; diff --git a/src/mpid/pamid/src/pt2pt/mpid_cancel.c b/src/mpid/pamid/src/pt2pt/mpid_cancel.c index 987d73e..d40443e 100644 --- a/src/mpid/pamid/src/pt2pt/mpid_cancel.c +++ b/src/mpid/pamid/src/pt2pt/mpid_cancel.c @@ -25,7 +25,7 @@ int MPID_Cancel_recv(MPIR_Request * rreq) { - MPID_assert(rreq->kind == MPIR_REQUEST_RECV); + MPID_assert(rreq->kind == MPIR_REQUEST_KIND__RECV); if (MPIDI_Recvq_FDPR(rreq)) { MPIR_STATUS_SET_CANCEL_BIT(rreq->status, TRUE); diff --git a/src/mpid/pamid/src/pt2pt/mpid_isend.h b/src/mpid/pamid/src/pt2pt/mpid_isend.h index 368c402..c2aa646 100644 --- a/src/mpid/pamid/src/pt2pt/mpid_isend.h +++ b/src/mpid/pamid/src/pt2pt/mpid_isend.h @@ -113,7 +113,7 @@ MPID_Isend_inline(const void * buf, unsigned ncontexts = MPIDI_Process.avail_contexts; /* communicator & destination info */ sreq->comm = comm; - sreq->kind = MPIR_REQUEST_SEND; + sreq->kind = MPIR_REQUEST_KIND__SEND; MPIR_Comm_add_ref(comm); pami_context_t context = MPIDI_Context[MPIDI_Context_hash(rank, context_id, 0, ncontexts)]; diff --git a/src/mpid/pamid/src/pt2pt/mpidi_recvmsg.c b/src/mpid/pamid/src/pt2pt/mpidi_recvmsg.c index 2765072..16092e6 100644 --- a/src/mpid/pamid/src/pt2pt/mpidi_recvmsg.c +++ b/src/mpid/pamid/src/pt2pt/mpidi_recvmsg.c @@ -152,7 +152,7 @@ MPIDI_RecvMsg_procnull(MPIR_Comm * comm, MPIR_Request * rreq; rreq = MPIDI_Request_create2(); MPIR_Status_set_procnull(&rreq->status); - rreq->kind = MPIR_REQUEST_RECV; + rreq->kind = MPIR_REQUEST_KIND__RECV; rreq->comm = comm; MPIR_Comm_add_ref(comm); MPIDI_Request_complete(rreq); diff --git a/src/mpid/pamid/src/pt2pt/mpidi_send.h b/src/mpid/pamid/src/pt2pt/mpidi_send.h index 911c872..b061771 100644 --- a/src/mpid/pamid/src/pt2pt/mpidi_send.h +++ b/src/mpid/pamid/src/pt2pt/mpidi_send.h @@ -106,7 +106,7 @@ MPIDI_Send(const void * buf, MPIDI_Request_setPeerRank_comm(sreq, rank); /* message type info */ - sreq->kind = MPIR_REQUEST_SEND; + sreq->kind = MPIR_REQUEST_KIND__SEND; /* ----------------------------------------- */ /* start the message */ /* ----------------------------------------- */ diff --git a/src/mpid/pamid/src/pt2pt/persistent/mpid_recv_init.c b/src/mpid/pamid/src/pt2pt/persistent/mpid_recv_init.c index 50e0249..63ebbeb 100644 --- a/src/mpid/pamid/src/pt2pt/persistent/mpid_recv_init.c +++ b/src/mpid/pamid/src/pt2pt/persistent/mpid_recv_init.c @@ -35,7 +35,7 @@ int MPID_Recv_init(void * buf, { MPIR_Request * rreq = *request = MPIDI_Request_create2(); - rreq->kind = MPIR_PREQUEST_RECV; + rreq->kind = MPIR_REQUEST_KIND__PREQUEST_RECV; rreq->comm = comm; MPIR_Comm_add_ref(comm); MPIDI_Request_setMatch(rreq, tag, rank, comm->recvcontext_id+context_offset); diff --git a/src/mpid/pamid/src/pt2pt/persistent/mpid_send_init.c b/src/mpid/pamid/src/pt2pt/persistent/mpid_send_init.c index 08427cf..35080e5 100644 --- a/src/mpid/pamid/src/pt2pt/persistent/mpid_send_init.c +++ b/src/mpid/pamid/src/pt2pt/persistent/mpid_send_init.c @@ -41,7 +41,7 @@ MPID_PSendRequest(const void * buf, { MPIR_Request* sreq = *request = MPIDI_Request_create2(); - sreq->kind = MPIR_PREQUEST_SEND; + sreq->kind = MPIR_REQUEST_KIND__PREQUEST_SEND; sreq->comm = comm; MPIR_Comm_add_ref(comm); MPIDI_Request_setMatch(sreq, tag, rank, comm->context_id+context_offset); http://git.mpich.org/mpich.git/commitdiff/ceb3cb52fc212972111f61a8088057126… commit ceb3cb52fc212972111f61a8088057126de188da Author: Pavan Balaji <balaji(a)anl.gov> Date: Tue Apr 19 10:12:48 2016 -0500 Enable dbg_next only in debug mode. When no debugger is attached, this field is unnecessary. Signed-off-by: Wesley Bland <wesley.bland(a)intel.com> diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index 9b26724..da3dd94 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -1608,9 +1608,11 @@ typedef struct MPIR_Request { struct { MPIR_Errflag_t errflag; } nbc; /* kind : MPIR_COLL_REQUEST */ +#if defined HAVE_DEBUGGER_SUPPORT struct { struct MPIR_Sendq *dbg_next; } send; /* kind : MPID_REQUEST_SEND */ +#endif /* HAVE_DEBUGGER_SUPPORT */ struct { /* Persistent requests have their own "real" requests */ struct MPIR_Request *real_request; diff --git a/src/mpi/debugger/dbginit.c b/src/mpi/debugger/dbginit.c index aae5730..1838087 100644 --- a/src/mpi/debugger/dbginit.c +++ b/src/mpi/debugger/dbginit.c @@ -351,6 +351,7 @@ static MPIR_Sendq *pool = 0; void MPIR_Sendq_remember( MPIR_Request *req, int rank, int tag, int context_id ) { +#if defined HAVE_DEBUGGER_SUPPORT MPIR_Sendq *p; MPID_THREAD_CS_ENTER(POBJ, req->pobj_mutex); @@ -377,10 +378,12 @@ void MPIR_Sendq_remember( MPIR_Request *req, req->u.send.dbg_next = p; fn_exit: MPID_THREAD_CS_EXIT(POBJ, req->pobj_mutex); +#endif /* HAVE_DEBUGGER_SUPPORT */ } void MPIR_Sendq_forget( MPIR_Request *req ) { +#if defined HAVE_DEBUGGER_SUPPORT MPIR_Sendq *p, *prev; MPID_THREAD_CS_ENTER(POBJ, req->pobj_mutex); @@ -398,6 +401,7 @@ void MPIR_Sendq_forget( MPIR_Request *req ) p->next = pool; pool = p; MPID_THREAD_CS_EXIT(POBJ, req->pobj_mutex); +#endif /* HAVE_DEBUGGER_SUPPORT */ } static int SendqFreePool( void *d ) http://git.mpich.org/mpich.git/commitdiff/dd20be4e8d3b41fdbd666f0139f1b1f98… commit dd20be4e8d3b41fdbd666f0139f1b1f98261eaf1 Author: Pavan Balaji <balaji(a)anl.gov> Date: Tue Mar 1 16:08:37 2016 +0900 Restructure MPIR_Request to have kind-specific fields. Depending on the kind of request, some fields are irrelevant. Simply including all fields into the request structure bloats up the size of the request. This patch moves the fields into kind-specific structures out of which a union is created. This seems to reduce the size of the request by around 16 bytes. For persistent requests, we separate out the "partner request" into "real request" and "partner request". The latter is only used within the device and need not be exposed to the upper layers. Signed-off-by: Wesley Bland <wesley.bland(a)intel.com> diff --git a/src/include/mpierrs.h b/src/include/mpierrs.h index 0d0cb18..d6af3c1 100644 --- a/src/include/mpierrs.h +++ b/src/include/mpierrs.h @@ -199,7 +199,7 @@ cvars: #define MPIR_ERRTEST_PERSISTENT_ACTIVE(reqp,err) \ if (((reqp)->kind == MPIR_PREQUEST_SEND || \ - reqp->kind == MPIR_PREQUEST_RECV) && reqp->partner_request != NULL) { \ + reqp->kind == MPIR_PREQUEST_RECV) && reqp->u.persist.real_request != NULL) { \ err = MPIR_Err_create_code(MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, \ MPI_ERR_REQUEST, "**requestpersistactive", 0 ); \ goto fn_fail; \ diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index 651b79f..9b26724 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -1600,18 +1600,22 @@ typedef struct MPIR_Request { MPIR_Comm *comm; /* Status is needed for wait/test/recv */ MPI_Status status; - /* Persistent requests have their own "real" requests. Receive requests - have partnering send requests when src=dest. etc. */ - struct MPIR_Request *partner_request; - /* User-defined request support via a "vtable". Saves space in the already - * bloated request for regular pt2pt and NBC requests. */ - struct MPIR_Grequest_fns *greq_fns; - - struct MPIR_Sendq *dbg_next; - - /* Errflag for NBC requests. Not used by other requests. */ - MPIR_Errflag_t errflag; + union { + struct { + struct MPIR_Grequest_fns *greq_fns; + } ureq; /* kind : MPIR_UREQUEST */ + struct { + MPIR_Errflag_t errflag; + } nbc; /* kind : MPIR_COLL_REQUEST */ + struct { + struct MPIR_Sendq *dbg_next; + } send; /* kind : MPID_REQUEST_SEND */ + struct { + /* Persistent requests have their own "real" requests */ + struct MPIR_Request *real_request; + } persist; /* kind : MPID_PREQUEST_SEND or MPID_PREQUEST_RECV */ + } u; /* Notes about request_completed_cb: * @@ -1719,10 +1723,16 @@ static inline MPIR_Request *MPIR_Request_create(MPIR_Request_kind_t kind) MPIR_STATUS_SET_CANCEL_BIT(req->status, FALSE); req->comm = NULL; - req->greq_fns = NULL; - req->errflag = MPIR_ERR_NONE; req->request_completed_cb = NULL; + switch(kind) { + case MPIR_COLL_REQUEST: + req->u.nbc.errflag = MPIR_ERR_NONE; + break; + default: + break; + } + MPID_Request_init(req); } else @@ -1776,8 +1786,8 @@ static inline void MPIR_Request_free(MPIR_Request *req) MPIR_Comm_release(req->comm); } - if (req->greq_fns != NULL) { - MPL_free(req->greq_fns); + if (req->kind == MPIR_UREQUEST && req->u.ureq.greq_fns != NULL) { + MPL_free(req->u.ureq.greq_fns); } MPID_Request_finalize(req); diff --git a/src/mpi/debugger/dbginit.c b/src/mpi/debugger/dbginit.c index 74cdca1..aae5730 100644 --- a/src/mpi/debugger/dbginit.c +++ b/src/mpi/debugger/dbginit.c @@ -362,7 +362,7 @@ void MPIR_Sendq_remember( MPIR_Request *req, p = (MPIR_Sendq *)MPL_malloc( sizeof(MPIR_Sendq) ); if (!p) { /* Just ignore it */ - req->dbg_next = NULL; + req->u.send.dbg_next = NULL; goto fn_exit; } } @@ -374,7 +374,7 @@ void MPIR_Sendq_remember( MPIR_Request *req, p->prev = NULL; MPIR_Sendq_head = p; if (p->next) p->next->prev = p; - req->dbg_next = p; + req->u.send.dbg_next = p; fn_exit: MPID_THREAD_CS_EXIT(POBJ, req->pobj_mutex); } @@ -384,7 +384,7 @@ void MPIR_Sendq_forget( MPIR_Request *req ) MPIR_Sendq *p, *prev; MPID_THREAD_CS_ENTER(POBJ, req->pobj_mutex); - p = req->dbg_next; + p = req->u.send.dbg_next; if (!p) { /* Just ignore it */ MPID_THREAD_CS_EXIT(POBJ, req->pobj_mutex); diff --git a/src/mpi/pt2pt/cancel.c b/src/mpi/pt2pt/cancel.c index 929c1a7..2c1df30 100644 --- a/src/mpi/pt2pt/cancel.c +++ b/src/mpi/pt2pt/cancel.c @@ -52,8 +52,8 @@ int MPIR_Cancel_impl(MPIR_Request *request_ptr) case MPIR_PREQUEST_SEND: { - if (request_ptr->partner_request != NULL) { - if (request_ptr->partner_request->kind != MPIR_UREQUEST) { + if (request_ptr->u.persist.real_request != NULL) { + if (request_ptr->u.persist.real_request->kind != MPIR_UREQUEST) { /* jratt(a)us.ibm.com: I don't know about the bsend * comment below, but the CC stuff on the next * line is *really* needed for persistent Bsend @@ -68,16 +68,16 @@ int MPIR_Cancel_impl(MPIR_Request *request_ptr) * causing an MPI_Wait on the parent to block * until the child is canceled or completed. */ - request_ptr->cc_ptr = request_ptr->partner_request->cc_ptr; - mpi_errno = MPID_Cancel_send(request_ptr->partner_request); + request_ptr->cc_ptr = request_ptr->u.persist.real_request->cc_ptr; + mpi_errno = MPID_Cancel_send(request_ptr->u.persist.real_request); if (mpi_errno) MPIR_ERR_POP(mpi_errno); } else { /* This is needed for persistent Bsend requests */ /* FIXME why do we directly access the partner request's * cc field? shouldn't our cc_ptr be set to the address * of the partner req's cc field? */ - mpi_errno = MPIR_Grequest_cancel(request_ptr->partner_request, - MPIR_cc_is_complete(&request_ptr->partner_request->cc)); + mpi_errno = MPIR_Grequest_cancel(request_ptr->u.persist.real_request, + MPIR_cc_is_complete(&request_ptr->u.persist.real_request->cc)); if (mpi_errno) MPIR_ERR_POP(mpi_errno); } } else { @@ -88,8 +88,8 @@ int MPIR_Cancel_impl(MPIR_Request *request_ptr) case MPIR_PREQUEST_RECV: { - if (request_ptr->partner_request != NULL) { - mpi_errno = MPID_Cancel_recv(request_ptr->partner_request); + if (request_ptr->u.persist.real_request != NULL) { + mpi_errno = MPID_Cancel_recv(request_ptr->u.persist.real_request); if (mpi_errno) MPIR_ERR_POP(mpi_errno); } else { MPIR_ERR_SETANDJUMP(mpi_errno,MPI_ERR_REQUEST,"**requestpersistactive"); diff --git a/src/mpi/pt2pt/greq_start.c b/src/mpi/pt2pt/greq_start.c index 0c39b6e..7a0db3e 100644 --- a/src/mpi/pt2pt/greq_start.c +++ b/src/mpi/pt2pt/greq_start.c @@ -91,15 +91,14 @@ int MPIR_Grequest_start_impl(MPI_Grequest_query_function *query_fn, (*request_ptr)->cc_ptr = &(*request_ptr)->cc; MPIR_cc_set((*request_ptr)->cc_ptr, 1); (*request_ptr)->comm = NULL; - (*request_ptr)->greq_fns = NULL; - MPIU_CHKPMEM_MALLOC((*request_ptr)->greq_fns, struct MPIR_Grequest_fns *, sizeof(struct MPIR_Grequest_fns), mpi_errno, "greq_fns"); - (*request_ptr)->greq_fns->cancel_fn = cancel_fn; - (*request_ptr)->greq_fns->free_fn = free_fn; - (*request_ptr)->greq_fns->query_fn = query_fn; - (*request_ptr)->greq_fns->poll_fn = NULL; - (*request_ptr)->greq_fns->wait_fn = NULL; - (*request_ptr)->greq_fns->grequest_extra_state = extra_state; - (*request_ptr)->greq_fns->greq_lang = MPIR_LANG_C; + MPIU_CHKPMEM_MALLOC((*request_ptr)->u.ureq.greq_fns, struct MPIR_Grequest_fns *, sizeof(struct MPIR_Grequest_fns), mpi_errno, "greq_fns"); + (*request_ptr)->u.ureq.greq_fns->cancel_fn = cancel_fn; + (*request_ptr)->u.ureq.greq_fns->free_fn = free_fn; + (*request_ptr)->u.ureq.greq_fns->query_fn = query_fn; + (*request_ptr)->u.ureq.greq_fns->poll_fn = NULL; + (*request_ptr)->u.ureq.greq_fns->wait_fn = NULL; + (*request_ptr)->u.ureq.greq_fns->grequest_extra_state = extra_state; + (*request_ptr)->u.ureq.greq_fns->greq_lang = MPIR_LANG_C; /* Add an additional reference to the greq. One of them will be * released when we complete the request, and the second one, when @@ -362,9 +361,9 @@ int MPIX_Grequest_class_allocate(MPIX_Grequest_class greq_class, if (mpi_errno == MPI_SUCCESS) { *request = lrequest_ptr->handle; - lrequest_ptr->greq_fns->poll_fn = class_ptr->poll_fn; - lrequest_ptr->greq_fns->wait_fn = class_ptr->wait_fn; - lrequest_ptr->greq_fns->greq_class = greq_class; + lrequest_ptr->u.ureq.greq_fns->poll_fn = class_ptr->poll_fn; + lrequest_ptr->u.ureq.greq_fns->wait_fn = class_ptr->wait_fn; + lrequest_ptr->u.ureq.greq_fns->greq_class = greq_class; } return mpi_errno; } @@ -436,8 +435,8 @@ int MPIX_Grequest_start_impl( MPI_Grequest_query_function *query_fn, mpi_errno = MPIR_Grequest_start_impl(query_fn, free_fn, cancel_fn, extra_state, request); if (mpi_errno == MPI_SUCCESS) { - (*request)->greq_fns->poll_fn = poll_fn; - (*request)->greq_fns->wait_fn = wait_fn; + (*request)->u.ureq.greq_fns->poll_fn = poll_fn; + (*request)->u.ureq.greq_fns->wait_fn = wait_fn; } return mpi_errno; diff --git a/src/mpi/pt2pt/mpir_request.c b/src/mpi/pt2pt/mpir_request.c index ab4ad49..ee05809 100644 --- a/src/mpi/pt2pt/mpir_request.c +++ b/src/mpi/pt2pt/mpir_request.c @@ -96,14 +96,14 @@ int MPIR_Request_complete(MPI_Request * request, MPIR_Request * request_ptr, case MPIR_PREQUEST_SEND: { - if (request_ptr->partner_request != NULL) + if (request_ptr->u.persist.real_request != NULL) { - MPIR_Request * prequest_ptr = request_ptr->partner_request; + MPIR_Request * prequest_ptr = request_ptr->u.persist.real_request; /* reset persistent request to inactive state */ MPIR_cc_set(&request_ptr->cc, 0); request_ptr->cc_ptr = &request_ptr->cc; - request_ptr->partner_request = NULL; + request_ptr->u.persist.real_request = NULL; if (prequest_ptr->kind != MPIR_UREQUEST) { @@ -164,14 +164,14 @@ int MPIR_Request_complete(MPI_Request * request, MPIR_Request * request_ptr, case MPIR_PREQUEST_RECV: { - if (request_ptr->partner_request != NULL) + if (request_ptr->u.persist.real_request != NULL) { - MPIR_Request * prequest_ptr = request_ptr->partner_request; + MPIR_Request * prequest_ptr = request_ptr->u.persist.real_request; /* reset persistent request to inactive state */ MPIR_cc_set(&request_ptr->cc, 0); request_ptr->cc_ptr = &request_ptr->cc; - request_ptr->partner_request = NULL; + request_ptr->u.persist.real_request = NULL; MPIR_Request_extract_status(prequest_ptr, status); mpi_errno = prequest_ptr->status.MPI_ERROR; @@ -270,17 +270,17 @@ int MPIR_Request_get_error(MPIR_Request * request_ptr) case MPIR_PREQUEST_SEND: { - if (request_ptr->partner_request != NULL) + if (request_ptr->u.persist.real_request != NULL) { - if (request_ptr->partner_request->kind == MPIR_UREQUEST) + if (request_ptr->u.persist.real_request->kind == MPIR_UREQUEST) { /* This is needed for persistent Bsend requests */ mpi_errno = MPIR_Grequest_query( - request_ptr->partner_request); + request_ptr->u.persist.real_request); } if (mpi_errno == MPI_SUCCESS) { - mpi_errno = request_ptr->partner_request->status.MPI_ERROR; + mpi_errno = request_ptr->u.persist.real_request->status.MPI_ERROR; } } else @@ -293,9 +293,9 @@ int MPIR_Request_get_error(MPIR_Request * request_ptr) case MPIR_PREQUEST_RECV: { - if (request_ptr->partner_request != NULL) + if (request_ptr->u.persist.real_request != NULL) { - mpi_errno = request_ptr->partner_request->status.MPI_ERROR; + mpi_errno = request_ptr->u.persist.real_request->status.MPI_ERROR; } else { @@ -311,14 +311,14 @@ int MPIR_Request_get_error(MPIR_Request * request_ptr) /* Note that we've acquired the thread private storage above */ - switch (request_ptr->greq_fns->greq_lang) + switch (request_ptr->u.ureq.greq_fns->greq_lang) { case MPIR_LANG_C: #ifdef HAVE_CXX_BINDING case MPIR_LANG_CXX: #endif - rc = (request_ptr->greq_fns->query_fn)( - request_ptr->greq_fns->grequest_extra_state, + rc = (request_ptr->u.ureq.greq_fns->query_fn)( + request_ptr->u.ureq.greq_fns->grequest_extra_state, &request_ptr->status); MPIR_ERR_CHKANDSTMT1((rc != MPI_SUCCESS), mpi_errno, MPI_ERR_OTHER,;, "**user", "**userquery %d", rc); @@ -329,8 +329,8 @@ int MPIR_Request_get_error(MPIR_Request * request_ptr) { MPI_Fint ierr; MPI_Fint is[sizeof(MPI_Status)/sizeof(int)]; - ((MPIR_Grequest_f77_query_function*)(request_ptr->greq_fns->query_fn))( - request_ptr->greq_fns->grequest_extra_state, is, + ((MPIR_Grequest_f77_query_function*)(request_ptr->u.ureq.greq_fns->query_fn))( + request_ptr->u.ureq.greq_fns->grequest_extra_state, is, &ierr ); rc = (int) ierr; if (rc == MPI_SUCCESS) @@ -347,7 +347,7 @@ int MPIR_Request_get_error(MPIR_Request * request_ptr) /* This should not happen */ MPIR_ERR_SETANDSTMT1(mpi_errno, MPI_ERR_INTERN,;, "**badcase", - "**badcase %d", request_ptr->greq_fns->greq_lang); + "**badcase %d", request_ptr->u.ureq.greq_fns->greq_lang); break; /* --END ERROR HANDLING-- */ } @@ -378,7 +378,7 @@ void MPIR_Grequest_set_lang_f77( MPI_Request greq ) MPIR_Request_get_ptr( greq, greq_ptr ); - greq_ptr->greq_fns->greq_lang = MPIR_LANG_FORTRAN; + greq_ptr->u.ureq.greq_fns->greq_lang = MPIR_LANG_FORTRAN; } #endif @@ -392,14 +392,14 @@ int MPIR_Grequest_cancel(MPIR_Request * request_ptr, int complete) int rc; int mpi_errno = MPI_SUCCESS; - switch (request_ptr->greq_fns->greq_lang) + switch (request_ptr->u.ureq.greq_fns->greq_lang) { case MPIR_LANG_C: #ifdef HAVE_CXX_BINDING case MPIR_LANG_CXX: #endif - rc = (request_ptr->greq_fns->cancel_fn)( - request_ptr->greq_fns->grequest_extra_state, complete); + rc = (request_ptr->u.ureq.greq_fns->cancel_fn)( + request_ptr->u.ureq.greq_fns->grequest_extra_state, complete); MPIR_ERR_CHKANDSTMT1((rc != MPI_SUCCESS), mpi_errno, MPI_ERR_OTHER,;, "**user", "**usercancel %d", rc); break; @@ -410,8 +410,8 @@ int MPIR_Grequest_cancel(MPIR_Request * request_ptr, int complete) MPI_Fint ierr; MPI_Fint icomplete = complete; - ((MPIR_Grequest_f77_cancel_function *)(request_ptr->greq_fns->cancel_fn))( - request_ptr->greq_fns->grequest_extra_state, &icomplete, &ierr); + ((MPIR_Grequest_f77_cancel_function *)(request_ptr->u.ureq.greq_fns->cancel_fn))( + request_ptr->u.ureq.greq_fns->grequest_extra_state, &icomplete, &ierr); rc = (int) ierr; MPIR_ERR_CHKANDSTMT1((rc != MPI_SUCCESS), mpi_errno, MPI_ERR_OTHER, {;}, "**user", "**usercancel %d", rc); @@ -424,7 +424,7 @@ int MPIR_Grequest_cancel(MPIR_Request * request_ptr, int complete) /* --BEGIN ERROR HANDLING-- */ /* This should not happen */ MPIR_ERR_SETANDSTMT1(mpi_errno, MPI_ERR_INTERN,;, "**badcase", - "**badcase %d", request_ptr->greq_fns->greq_lang); + "**badcase %d", request_ptr->u.ureq.greq_fns->greq_lang); break; /* --END ERROR HANDLING-- */ } @@ -443,13 +443,13 @@ int MPIR_Grequest_query(MPIR_Request * request_ptr) int rc; int mpi_errno = MPI_SUCCESS; - switch (request_ptr->greq_fns->greq_lang) + switch (request_ptr->u.ureq.greq_fns->greq_lang) { case MPIR_LANG_C: #ifdef HAVE_CXX_BINDING case MPIR_LANG_CXX: #endif - rc = (request_ptr->greq_fns->query_fn)(request_ptr->greq_fns->grequest_extra_state, + rc = (request_ptr->u.ureq.greq_fns->query_fn)(request_ptr->u.ureq.greq_fns->grequest_extra_state, &request_ptr->status); MPIR_ERR_CHKANDSTMT1((rc != MPI_SUCCESS), mpi_errno, MPI_ERR_OTHER, {;}, "**user", "**userquery %d", rc); @@ -460,8 +460,8 @@ int MPIR_Grequest_query(MPIR_Request * request_ptr) { MPI_Fint ierr; MPI_Fint is[sizeof(MPI_Status)/sizeof(int)]; - ((MPIR_Grequest_f77_query_function *)(request_ptr->greq_fns->query_fn))( - request_ptr->greq_fns->grequest_extra_state, is, &ierr ); + ((MPIR_Grequest_f77_query_function *)(request_ptr->u.ureq.greq_fns->query_fn))( + request_ptr->u.ureq.greq_fns->grequest_extra_state, is, &ierr ); rc = (int)ierr; if (rc == MPI_SUCCESS) PMPI_Status_f2c( is, &request_ptr->status ); @@ -475,7 +475,7 @@ int MPIR_Grequest_query(MPIR_Request * request_ptr) /* --BEGIN ERROR HANDLING-- */ /* This should not happen */ MPIR_ERR_SETANDSTMT1(mpi_errno, MPI_ERR_INTERN,;, "**badcase", - "**badcase %d", request_ptr->greq_fns->greq_lang); + "**badcase %d", request_ptr->u.ureq.greq_fns->greq_lang); break; /* --END ERROR HANDLING-- */ } @@ -494,13 +494,13 @@ int MPIR_Grequest_free(MPIR_Request * request_ptr) int rc; int mpi_errno = MPI_SUCCESS; - switch (request_ptr->greq_fns->greq_lang) + switch (request_ptr->u.ureq.greq_fns->greq_lang) { case MPIR_LANG_C: #ifdef HAVE_CXX_BINDING case MPIR_LANG_CXX: #endif - rc = (request_ptr->greq_fns->free_fn)(request_ptr->greq_fns->grequest_extra_state); + rc = (request_ptr->u.ureq.greq_fns->free_fn)(request_ptr->u.ureq.greq_fns->grequest_extra_state); MPIR_ERR_CHKANDSTMT1((rc != MPI_SUCCESS), mpi_errno, MPI_ERR_OTHER, {;}, "**user", "**userfree %d", rc); break; @@ -510,8 +510,8 @@ int MPIR_Grequest_free(MPIR_Request * request_ptr) { MPI_Fint ierr; - ((MPIR_Grequest_f77_free_function *)(request_ptr->greq_fns->free_fn))( - request_ptr->greq_fns->grequest_extra_state, &ierr); + ((MPIR_Grequest_f77_free_function *)(request_ptr->u.ureq.greq_fns->free_fn))( + request_ptr->u.ureq.greq_fns->grequest_extra_state, &ierr); rc = (int) ierr; MPIR_ERR_CHKANDSTMT1((rc != MPI_SUCCESS), mpi_errno, MPI_ERR_OTHER, {;}, "**user", "**userfree %d", rc); @@ -524,7 +524,7 @@ int MPIR_Grequest_free(MPIR_Request * request_ptr) /* --BEGIN ERROR HANDLING-- */ /* This should not happen */ MPIR_ERR_SETANDSTMT1(mpi_errno, MPI_ERR_INTERN, {;}, "**badcase", - "**badcase %d", request_ptr->greq_fns->greq_lang); + "**badcase %d", request_ptr->u.ureq.greq_fns->greq_lang); break; /* --END ERROR HANDLING-- */ } @@ -562,13 +562,13 @@ int MPIR_Grequest_progress_poke(int count, if (request_ptrs[i]->kind == MPIR_UREQUEST) { n_greq += 1; - wait_fn = request_ptrs[i]->greq_fns->wait_fn; - state_ptrs[j] = request_ptrs[i]->greq_fns->grequest_extra_state; + wait_fn = request_ptrs[i]->u.ureq.greq_fns->wait_fn; + state_ptrs[j] = request_ptrs[i]->u.ureq.greq_fns->grequest_extra_state; j++; if (i+1 < count) { if (request_ptrs[i+1] == NULL || - (request_ptrs[i]->greq_fns->greq_class != - request_ptrs[i+1]->greq_fns->greq_class) ) + (request_ptrs[i]->u.ureq.greq_fns->greq_class != + request_ptrs[i+1]->u.ureq.greq_fns->greq_class) ) n_classes += 1; } } else { @@ -582,11 +582,11 @@ int MPIR_Grequest_progress_poke(int count, for (i = 0; i< count; i++ ) { if (request_ptrs[i] != NULL && - request_ptrs[i]->kind == MPIR_UREQUEST && + request_ptrs[i]->kind == MPIR_UREQUEST && !MPIR_Request_is_complete(request_ptrs[i]) && - request_ptrs[i]->greq_fns->poll_fn != NULL) + request_ptrs[i]->u.ureq.greq_fns->poll_fn != NULL) { - mpi_errno = (request_ptrs[i]->greq_fns->poll_fn)(request_ptrs[i]->greq_fns->grequest_extra_state, &(array_of_statuses[i])); + mpi_errno = (request_ptrs[i]->u.ureq.greq_fns->poll_fn)(request_ptrs[i]->u.ureq.greq_fns->grequest_extra_state, &(array_of_statuses[i])); if (mpi_errno) MPIR_ERR_POP(mpi_errno); } } @@ -638,13 +638,13 @@ int MPIR_Grequest_waitall(int count, MPIR_Request * const * request_ptrs) if (request_ptrs[i] == NULL || *request_ptrs[i]->cc_ptr == 0 || request_ptrs[i]->kind != MPIR_UREQUEST) continue; - if (n_greq == 0 || request_ptrs[i]->greq_fns->greq_class == curr_class) + if (n_greq == 0 || request_ptrs[i]->u.ureq.greq_fns->greq_class == curr_class) { /* if this is the first grequest of a group, or if it's the same class as the last one, add its state to the list */ - curr_class = request_ptrs[i]->greq_fns->greq_class; - wait_fn = request_ptrs[i]->greq_fns->wait_fn; - state_ptrs[n_greq] = request_ptrs[i]->greq_fns->grequest_extra_state; + curr_class = request_ptrs[i]->u.ureq.greq_fns->greq_class; + wait_fn = request_ptrs[i]->u.ureq.greq_fns->wait_fn; + state_ptrs[n_greq] = request_ptrs[i]->u.ureq.greq_fns->grequest_extra_state; ++n_greq; } else @@ -654,9 +654,9 @@ int MPIR_Grequest_waitall(int count, MPIR_Request * const * request_ptrs) mpi_error = (wait_fn)(n_greq, state_ptrs, 0, NULL); if (mpi_error) MPIR_ERR_POP(mpi_error); - curr_class = request_ptrs[i]->greq_fns->greq_class; - wait_fn = request_ptrs[i]->greq_fns->wait_fn; - state_ptrs[0] = request_ptrs[i]->greq_fns->grequest_extra_state; + curr_class = request_ptrs[i]->u.ureq.greq_fns->greq_class; + wait_fn = request_ptrs[i]->u.ureq.greq_fns->wait_fn; + state_ptrs[0] = request_ptrs[i]->u.ureq.greq_fns->grequest_extra_state; n_greq = 1; } } @@ -675,12 +675,12 @@ int MPIR_Grequest_waitall(int count, MPIR_Request * const * request_ptrs) if (request_ptrs[i] == NULL || MPIR_Request_is_complete(request_ptrs[i]) || request_ptrs[i]->kind != MPIR_UREQUEST || - request_ptrs[i]->greq_fns->wait_fn == NULL) + request_ptrs[i]->u.ureq.greq_fns->wait_fn == NULL) { continue; } - mpi_error = (request_ptrs[i]->greq_fns->wait_fn)(1, &request_ptrs[i]->greq_fns->grequest_extra_state, 0, NULL); + mpi_error = (request_ptrs[i]->u.ureq.greq_fns->wait_fn)(1, &request_ptrs[i]->u.ureq.greq_fns->grequest_extra_state, 0, NULL); if (mpi_error) MPIR_ERR_POP(mpi_error); MPIU_Assert(MPIR_Request_is_complete(request_ptrs[i])); } diff --git a/src/mpi/pt2pt/request_free.c b/src/mpi/pt2pt/request_free.c index db8249f..42d22b6 100644 --- a/src/mpi/pt2pt/request_free.c +++ b/src/mpi/pt2pt/request_free.c @@ -123,15 +123,15 @@ int MPI_Request_free(MPI_Request *request) { /* If this is an active persistent request, we must also release the partner request. */ - if (request_ptr->partner_request != NULL) + if (request_ptr->u.persist.real_request != NULL) { - if (request_ptr->partner_request->kind == MPIR_UREQUEST) + if (request_ptr->u.persist.real_request->kind == MPIR_UREQUEST) { /* This is needed for persistent Bsend requests */ mpi_errno = MPIR_Grequest_free( - request_ptr->partner_request); + request_ptr->u.persist.real_request); } - MPIR_Request_free(request_ptr->partner_request); + MPIR_Request_free(request_ptr->u.persist.real_request); } break; } @@ -141,9 +141,9 @@ int MPI_Request_free(MPI_Request *request) { /* If this is an active persistent request, we must also release the partner request. */ - if (request_ptr->partner_request != NULL) + if (request_ptr->u.persist.real_request != NULL) { - MPIR_Request_free(request_ptr->partner_request); + MPIR_Request_free(request_ptr->u.persist.real_request); } break; } diff --git a/src/mpi/pt2pt/request_get_status.c b/src/mpi/pt2pt/request_get_status.c index 7af680a..7269de6 100644 --- a/src/mpi/pt2pt/request_get_status.c +++ b/src/mpi/pt2pt/request_get_status.c @@ -136,7 +136,7 @@ int MPI_Request_get_status(MPI_Request request, int *flag, MPI_Status *status) case MPIR_PREQUEST_SEND: { - MPIR_Request * prequest_ptr = request_ptr->partner_request; + MPIR_Request * prequest_ptr = request_ptr->u.persist.real_request; if (prequest_ptr != NULL) { @@ -191,7 +191,7 @@ int MPI_Request_get_status(MPI_Request request, int *flag, MPI_Status *status) case MPIR_PREQUEST_RECV: { - MPIR_Request * prequest_ptr = request_ptr->partner_request; + MPIR_Request * prequest_ptr = request_ptr->u.persist.real_request; if (prequest_ptr != NULL) { diff --git a/src/mpi/pt2pt/test.c b/src/mpi/pt2pt/test.c index cbca7e9..9876864 100644 --- a/src/mpi/pt2pt/test.c +++ b/src/mpi/pt2pt/test.c @@ -53,10 +53,10 @@ int MPIR_Test_impl(MPI_Request *request, int *flag, MPI_Status *status) if (mpi_errno != MPI_SUCCESS) goto fn_fail; if (request_ptr->kind == MPIR_UREQUEST && - request_ptr->greq_fns != NULL && - request_ptr->greq_fns->poll_fn != NULL) + request_ptr->u.ureq.greq_fns != NULL && + request_ptr->u.ureq.greq_fns->poll_fn != NULL) { - mpi_errno = (request_ptr->greq_fns->poll_fn)(request_ptr->greq_fns->grequest_extra_state, status); + mpi_errno = (request_ptr->u.ureq.greq_fns->poll_fn)(request_ptr->u.ureq.greq_fns->grequest_extra_state, status); if (mpi_errno) MPIR_ERR_POP(mpi_errno); } diff --git a/src/mpi/pt2pt/testall.c b/src/mpi/pt2pt/testall.c index 65ab270..398a891 100644 --- a/src/mpi/pt2pt/testall.c +++ b/src/mpi/pt2pt/testall.c @@ -88,9 +88,9 @@ int MPIR_Testall_impl(int count, MPI_Request array_of_requests[], int *flag, { if (request_ptrs[i] != NULL && request_ptrs[i]->kind == MPIR_UREQUEST && - request_ptrs[i]->greq_fns->poll_fn != NULL) + request_ptrs[i]->u.ureq.greq_fns->poll_fn != NULL) { - mpi_errno = (request_ptrs[i]->greq_fns->poll_fn)(request_ptrs[i]->greq_fns->grequest_extra_state, + mpi_errno = (request_ptrs[i]->u.ureq.greq_fns->poll_fn)(request_ptrs[i]->u.ureq.greq_fns->grequest_extra_state, &(array_of_statuses[i])); if (mpi_errno != MPI_SUCCESS) goto fn_fail; } diff --git a/src/mpi/pt2pt/testany.c b/src/mpi/pt2pt/testany.c index 9f5a7e8..0ca07d5 100644 --- a/src/mpi/pt2pt/testany.c +++ b/src/mpi/pt2pt/testany.c @@ -163,9 +163,9 @@ int MPI_Testany(int count, MPI_Request array_of_requests[], int *indx, { if (request_ptrs[i] != NULL && request_ptrs[i]->kind == MPIR_UREQUEST && - request_ptrs[i]->greq_fns->poll_fn != NULL) + request_ptrs[i]->u.ureq.greq_fns->poll_fn != NULL) { - mpi_errno = (request_ptrs[i]->greq_fns->poll_fn)(request_ptrs[i]->greq_fns->grequest_extra_state, + mpi_errno = (request_ptrs[i]->u.ureq.greq_fns->poll_fn)(request_ptrs[i]->u.ureq.greq_fns->grequest_extra_state, status); if (mpi_errno != MPI_SUCCESS) goto fn_fail; } diff --git a/src/mpi/pt2pt/testsome.c b/src/mpi/pt2pt/testsome.c index 4412abf..57c4e67 100644 --- a/src/mpi/pt2pt/testsome.c +++ b/src/mpi/pt2pt/testsome.c @@ -163,9 +163,9 @@ int MPI_Testsome(int incount, MPI_Request array_of_requests[], int *outcount, { if (request_ptrs[i] != NULL && request_ptrs[i]->kind == MPIR_UREQUEST && - request_ptrs[i]->greq_fns->poll_fn != NULL) + request_ptrs[i]->u.ureq.greq_fns->poll_fn != NULL) { - mpi_errno = (request_ptrs[i]->greq_fns->poll_fn)(request_ptrs[i]->greq_fns->grequest_extra_state, + mpi_errno = (request_ptrs[i]->u.ureq.greq_fns->poll_fn)(request_ptrs[i]->u.ureq.greq_fns->grequest_extra_state, array_of_statuses); if (mpi_errno != MPI_SUCCESS) goto fn_fail; } diff --git a/src/mpi/pt2pt/wait.c b/src/mpi/pt2pt/wait.c index 5b289c9..3844848 100644 --- a/src/mpi/pt2pt/wait.c +++ b/src/mpi/pt2pt/wait.c @@ -62,7 +62,7 @@ int MPIR_Wait_impl(MPI_Request *request, MPI_Status *status) { mpi_errno = MPIR_Grequest_progress_poke(1, &request_ptr, status); if (request_ptr->kind == MPIR_UREQUEST && - request_ptr->greq_fns->wait_fn != NULL) + request_ptr->u.ureq.greq_fns->wait_fn != NULL) { if (mpi_errno) { /* --BEGIN ERROR HANDLING-- */ diff --git a/src/mpi/pt2pt/waitany.c b/src/mpi/pt2pt/waitany.c index eb3b677..1bdb87b 100644 --- a/src/mpi/pt2pt/waitany.c +++ b/src/mpi/pt2pt/waitany.c @@ -157,10 +157,10 @@ int MPI_Waitany(int count, MPI_Request array_of_requests[], int *indx, /* we found at least one non-null request */ found_nonnull_req = TRUE; - if (request_ptrs[i]->kind == MPIR_UREQUEST && request_ptrs[i]->greq_fns->poll_fn != NULL) + if (request_ptrs[i]->kind == MPIR_UREQUEST && request_ptrs[i]->u.ureq.greq_fns->poll_fn != NULL) { /* this is a generalized request; make progress on it */ - mpi_errno = (request_ptrs[i]->greq_fns->poll_fn)(request_ptrs[i]->greq_fns->grequest_extra_state, status); + mpi_errno = (request_ptrs[i]->u.ureq.greq_fns->poll_fn)(request_ptrs[i]->u.ureq.greq_fns->grequest_extra_state, status); if (mpi_errno != MPI_SUCCESS) goto fn_progress_end_fail; } if (MPIR_Request_is_complete(request_ptrs[i])) diff --git a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c index e00042e..112ab12 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c +++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c @@ -270,7 +270,7 @@ int MPID_nem_mxm_send(MPIDI_VC_t * vc, const void *buf, MPI_Aint count, MPI_Data MPIDU_Datatype_get_ptr(datatype, sreq->dev.datatype_ptr); MPIDU_Datatype_add_ref(sreq->dev.datatype_ptr); } - sreq->partner_request = NULL; + sreq->dev.partner_request = NULL; sreq->dev.OnDataAvail = NULL; sreq->dev.tmpbuf = NULL; sreq->ch.vc = vc; @@ -373,7 +373,7 @@ int MPID_nem_mxm_ssend(MPIDI_VC_t * vc, const void *buf, MPI_Aint count, MPI_Dat MPIDU_Datatype_get_ptr(datatype, sreq->dev.datatype_ptr); MPIDU_Datatype_add_ref(sreq->dev.datatype_ptr); } - sreq->partner_request = NULL; + sreq->dev.partner_request = NULL; sreq->dev.OnDataAvail = NULL; sreq->dev.tmpbuf = NULL; sreq->ch.vc = vc; @@ -476,7 +476,7 @@ int MPID_nem_mxm_isend(MPIDI_VC_t * vc, const void *buf, MPI_Aint count, MPI_Dat MPIDU_Datatype_get_ptr(datatype, sreq->dev.datatype_ptr); MPIDU_Datatype_add_ref(sreq->dev.datatype_ptr); } - sreq->partner_request = NULL; + sreq->dev.partner_request = NULL; sreq->dev.OnDataAvail = NULL; sreq->dev.tmpbuf = NULL; sreq->ch.vc = vc; @@ -579,7 +579,7 @@ int MPID_nem_mxm_issend(MPIDI_VC_t * vc, const void *buf, MPI_Aint count, MPI_Da MPIDU_Datatype_get_ptr(datatype, sreq->dev.datatype_ptr); MPIDU_Datatype_add_ref(sreq->dev.datatype_ptr); } - sreq->partner_request = NULL; + sreq->dev.partner_request = NULL; sreq->dev.OnDataAvail = NULL; sreq->dev.tmpbuf = NULL; sreq->ch.vc = vc; diff --git a/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt.c b/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt.c index da5c49c..d49da80 100644 --- a/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt.c +++ b/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt.c @@ -107,7 +107,7 @@ int MPID_nem_lmt_RndvSend(MPIR_Request **sreq_p, const void * buf, MPI_Aint coun MPL_DBG_MSG_D(MPIDI_CH3_DBG_OTHER,VERBOSE, "sending lmt RTS, data_sz=%" PRIdPTR, data_sz); - sreq->partner_request = NULL; + sreq->dev.partner_request = NULL; sreq->ch.lmt_tmp_cookie.MPL_IOV_LEN = 0; MPIDI_Pkt_init(rts_pkt, MPIDI_NEM_PKT_LMT_RTS); diff --git a/src/mpid/ch3/include/mpidimpl.h b/src/mpid/ch3/include/mpidimpl.h index ffe7c67..73d9558 100644 --- a/src/mpid/ch3/include/mpidimpl.h +++ b/src/mpid/ch3/include/mpidimpl.h @@ -267,7 +267,7 @@ extern MPIDI_Process_t MPIDI_Process; #endif #ifdef HAVE_DEBUGGER_SUPPORT -#define MPIDI_Request_clear_dbg(sreq_) ((sreq_)->dbg_next = NULL) +#define MPIDI_Request_clear_dbg(sreq_) ((sreq_)->u.send.dbg_next = NULL) #else #define MPIDI_Request_clear_dbg(sreq_) #endif @@ -291,7 +291,7 @@ extern MPIDI_Process_t MPIDI_Process; MPIU_Object_set_ref((sreq_), 2); \ (sreq_)->kind = MPIR_REQUEST_SEND; \ (sreq_)->comm = comm; \ - (sreq_)->partner_request = NULL; \ + (sreq_)->dev.partner_request = NULL; \ MPIR_Comm_add_ref(comm); \ (sreq_)->dev.match.parts.rank = rank; \ (sreq_)->dev.match.parts.tag = tag; \ @@ -309,7 +309,7 @@ extern MPIDI_Process_t MPIDI_Process; (rreq_) = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); \ MPIU_Object_set_ref((rreq_), 2); \ (rreq_)->kind = MPIR_REQUEST_RECV; \ - (rreq_)->partner_request = NULL; \ + (rreq_)->dev.partner_request = NULL; \ } /* creates a new, trivially complete recv request that is suitable for @@ -425,8 +425,8 @@ extern MPIDI_Process_t MPIDI_Process; partner RTS sreq and nullify partner request */ #define MPIDI_Request_fetch_and_clear_rts_sreq(sreq_, rts_sreq_) \ { \ - *(rts_sreq_) = (sreq_)->partner_request; \ - (sreq_)->partner_request = NULL; \ + *(rts_sreq_) = (sreq_)->dev.partner_request; \ + (sreq_)->dev.partner_request = NULL; \ } /* FIXME: We've moved to allow finer-grain critical sections... */ diff --git a/src/mpid/ch3/include/mpidpre.h b/src/mpid/ch3/include/mpidpre.h index dcfd83a..edfd22c 100644 --- a/src/mpid/ch3/include/mpidpre.h +++ b/src/mpid/ch3/include/mpidpre.h @@ -464,6 +464,11 @@ typedef struct MPIDI_Request { Question: do we want to make this a link instead of reserving a fixed spot in the request? */ MPIDI_CH3_Pkt_t pending_pkt; + + /* partner send request when a receive request is created by the + * sender (only used for self send) */ + struct MPIR_Request * partner_request; + struct MPIR_Request * next; } MPIDI_Request; #define MPIR_REQUEST_DECL MPIDI_Request dev; diff --git a/src/mpid/ch3/src/ch3u_buffer.c b/src/mpid/ch3/src/ch3u_buffer.c index d73c1b1..414fa81 100644 --- a/src/mpid/ch3/src/ch3u_buffer.c +++ b/src/mpid/ch3/src/ch3u_buffer.c @@ -229,7 +229,7 @@ void MPIDI_CH3U_Buffer_copy( int MPIDI_CH3_RecvFromSelf( MPIR_Request *rreq, void *buf, MPI_Aint count, MPI_Datatype datatype ) { - MPIR_Request * const sreq = rreq->partner_request; + MPIR_Request * const sreq = rreq->dev.partner_request; int mpi_errno = MPI_SUCCESS; if (sreq != NULL) diff --git a/src/mpid/ch3/src/ch3u_rndv.c b/src/mpid/ch3/src/ch3u_rndv.c index a684b04..3408084 100644 --- a/src/mpid/ch3/src/ch3u_rndv.c +++ b/src/mpid/ch3/src/ch3u_rndv.c @@ -34,7 +34,7 @@ int MPIDI_CH3_RndvSend( MPIR_Request **sreq_p, const void * buf, MPI_Aint count, sreq->dev.OnDataAvail = 0; - sreq->partner_request = NULL; + sreq->dev.partner_request = NULL; MPIDI_Pkt_init(rts_pkt, MPIDI_CH3_PKT_RNDV_REQ_TO_SEND); rts_pkt->match.parts.rank = comm->rank; diff --git a/src/mpid/ch3/src/mpid_cancel_send.c b/src/mpid/ch3/src/mpid_cancel_send.c index 3583b0c..3df04ce 100644 --- a/src/mpid/ch3/src/mpid_cancel_send.c +++ b/src/mpid/ch3/src/mpid_cancel_send.c @@ -61,7 +61,7 @@ int MPID_Cancel_send(MPIR_Request * sreq) MPID_THREAD_CS_EXIT(POBJ, MPIR_THREAD_POBJ_MSGQ_MUTEX); if (rreq) { - MPIU_Assert(rreq->partner_request == sreq); + MPIU_Assert(rreq->dev.partner_request == sreq); MPL_DBG_MSG_FMT(MPIDI_CH3_DBG_OTHER,VERBOSE,(MPL_DBG_FDEST, "send-to-self cancellation successful, sreq=0x%08x, rreq=0x%08x", diff --git a/src/mpid/ch3/src/mpid_startall.c b/src/mpid/ch3/src/mpid_startall.c index ea1acbd..e4aea41 100644 --- a/src/mpid/ch3/src/mpid_startall.c +++ b/src/mpid/ch3/src/mpid_startall.c @@ -41,7 +41,7 @@ (sreq_)->dev.user_buf = (void *) buf; \ (sreq_)->dev.user_count = count; \ (sreq_)->dev.datatype = datatype; \ - (sreq_)->partner_request = NULL; \ + (sreq_)->u.persist.real_request = NULL; \ } @@ -74,7 +74,7 @@ int MPID_Startall(int count, MPIR_Request * requests[]) { rc = MPID_Irecv(preq->dev.user_buf, preq->dev.user_count, preq->dev.datatype, preq->dev.match.parts.rank, preq->dev.match.parts.tag, preq->comm, preq->dev.match.parts.context_id - preq->comm->recvcontext_id, - &preq->partner_request); + &preq->u.persist.real_request); break; } @@ -82,7 +82,7 @@ int MPID_Startall(int count, MPIR_Request * requests[]) { rc = MPID_Isend(preq->dev.user_buf, preq->dev.user_count, preq->dev.datatype, preq->dev.match.parts.rank, preq->dev.match.parts.tag, preq->comm, preq->dev.match.parts.context_id - preq->comm->context_id, - &preq->partner_request); + &preq->u.persist.real_request); break; } @@ -90,7 +90,7 @@ int MPID_Startall(int count, MPIR_Request * requests[]) { rc = MPID_Irsend(preq->dev.user_buf, preq->dev.user_count, preq->dev.datatype, preq->dev.match.parts.rank, preq->dev.match.parts.tag, preq->comm, preq->dev.match.parts.context_id - preq->comm->context_id, - &preq->partner_request); + &preq->u.persist.real_request); break; } @@ -98,7 +98,7 @@ int MPID_Startall(int count, MPIR_Request * requests[]) { rc = MPID_Issend(preq->dev.user_buf, preq->dev.user_count, preq->dev.datatype, preq->dev.match.parts.rank, preq->dev.match.parts.tag, preq->comm, preq->dev.match.parts.context_id - preq->comm->context_id, - &preq->partner_request); + &preq->u.persist.real_request); break; } @@ -112,7 +112,7 @@ int MPID_Startall(int count, MPIR_Request * requests[]) &sreq_handle); if (rc == MPI_SUCCESS) { - MPIR_Request_get_ptr(sreq_handle, preq->partner_request); + MPIR_Request_get_ptr(sreq_handle, preq->u.persist.real_request); } break; } @@ -129,7 +129,7 @@ int MPID_Startall(int count, MPIR_Request * requests[]) if (rc == MPI_SUCCESS) { preq->status.MPI_ERROR = MPI_SUCCESS; - preq->cc_ptr = &preq->partner_request->cc; + preq->cc_ptr = &preq->u.persist.real_request->cc; } /* --BEGIN ERROR HANDLING-- */ else @@ -139,7 +139,7 @@ int MPID_Startall(int count, MPIR_Request * requests[]) the error code in the persistent request. The wait and test routines will look at the error code in the persistent request if a partner request is not present. */ - preq->partner_request = NULL; + preq->u.persist.real_request = NULL; preq->status.MPI_ERROR = rc; preq->cc_ptr = &preq->cc; MPIR_cc_set(&preq->cc, 0); @@ -319,7 +319,7 @@ int MPID_Recv_init(void * buf, int count, MPI_Datatype datatype, int rank, int t rreq->dev.user_buf = (void *) buf; rreq->dev.user_count = count; rreq->dev.datatype = datatype; - rreq->partner_request = NULL; + rreq->u.persist.real_request = NULL; MPIDI_Request_set_type(rreq, MPIDI_REQUEST_TYPE_RECV); if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { diff --git a/src/mpid/ch3/src/mpidi_isend_self.c b/src/mpid/ch3/src/mpidi_isend_self.c index b5808a3..5da4cd2 100644 --- a/src/mpid/ch3/src/mpidi_isend_self.c +++ b/src/mpid/ch3/src/mpidi_isend_self.c @@ -118,7 +118,7 @@ int MPIDI_Isend_self(const void * buf, MPI_Aint count, MPI_Datatype datatype, in MPIDU_Datatype_get_ptr(datatype, sreq->dev.datatype_ptr); MPIDU_Datatype_add_ref(sreq->dev.datatype_ptr); } - rreq->partner_request = sreq; + rreq->dev.partner_request = sreq; rreq->dev.sender_req_id = sreq->handle; MPIDU_Datatype_get_size_macro(datatype, dt_sz); MPIR_STATUS_SET_COUNT(rreq->status, count * dt_sz); @@ -132,7 +132,7 @@ int MPIDI_Isend_self(const void * buf, MPI_Aint count, MPI_Datatype datatype, in "**rsendnomatch", "**rsendnomatch %d %d", rank, tag); rreq->status.MPI_ERROR = sreq->status.MPI_ERROR; - rreq->partner_request = NULL; + rreq->dev.partner_request = NULL; rreq->dev.sender_req_id = MPI_REQUEST_NULL; MPIR_STATUS_SET_COUNT(rreq->status, 0); diff --git a/src/mpid/common/sched/mpidu_sched.c b/src/mpid/common/sched/mpidu_sched.c index 9c70876..0a7f396 100644 --- a/src/mpid/common/sched/mpidu_sched.c +++ b/src/mpid/common/sched/mpidu_sched.c @@ -142,30 +142,30 @@ static int MPIDU_Sched_start_entry(struct MPIDU_Sched *s, size_t idx, struct MPI * &send.count, but this requires patching up the pointers * during realloc of entries, so this is easier */ ret_errno = MPIC_Isend(e->u.send.buf, *e->u.send.count_p, e->u.send.datatype, - e->u.send.dest, s->tag, comm, &e->u.send.sreq, &r->errflag); + e->u.send.dest, s->tag, comm, &e->u.send.sreq, &r->u.nbc.errflag); } else { if (e->u.send.is_sync) { ret_errno = MPIC_Issend(e->u.send.buf, e->u.send.count, e->u.send.datatype, - e->u.send.dest, s->tag, comm, &e->u.send.sreq, &r->errflag); + e->u.send.dest, s->tag, comm, &e->u.send.sreq, &r->u.nbc.errflag); } else { ret_errno = MPIC_Isend(e->u.send.buf, e->u.send.count, e->u.send.datatype, - e->u.send.dest, s->tag, comm, &e->u.send.sreq, &r->errflag); + e->u.send.dest, s->tag, comm, &e->u.send.sreq, &r->u.nbc.errflag); } } /* Check if the error is actually fatal to the NBC or we can continue. */ if (unlikely(ret_errno)) { - if (MPIR_ERR_NONE == r->errflag) { + if (MPIR_ERR_NONE == r->u.nbc.errflag) { if (MPIX_ERR_PROC_FAILED == MPIR_ERR_GET_CLASS(ret_errno)) { - r->errflag = MPIR_ERR_PROC_FAILED; + r->u.nbc.errflag = MPIR_ERR_PROC_FAILED; } else { - r->errflag = MPIR_ERR_OTHER; + r->u.nbc.errflag = MPIR_ERR_OTHER; } } e->status = MPIDU_SCHED_ENTRY_STATUS_FAILED; - MPL_DBG_MSG_D(MPIR_DBG_COMM, VERBOSE, "Sched SEND failed. Errflag: %d\n", (int) r->errflag); + MPL_DBG_MSG_D(MPIR_DBG_COMM, VERBOSE, "Sched SEND failed. Errflag: %d\n", (int) r->u.nbc.errflag); } else { e->status = MPIDU_SCHED_ENTRY_STATUS_STARTED; @@ -178,18 +178,18 @@ static int MPIDU_Sched_start_entry(struct MPIDU_Sched *s, size_t idx, struct MPI e->u.recv.src, s->tag, comm, &e->u.recv.rreq); /* Check if the error is actually fatal to the NBC or we can continue. */ if (unlikely(ret_errno)) { - if (MPIR_ERR_NONE == r->errflag) { + if (MPIR_ERR_NONE == r->u.nbc.errflag) { if (MPIX_ERR_PROC_FAILED == MPIR_ERR_GET_CLASS(ret_errno)) { - r->errflag = MPIR_ERR_PROC_FAILED; + r->u.nbc.errflag = MPIR_ERR_PROC_FAILED; } else { - r->errflag = MPIR_ERR_OTHER; + r->u.nbc.errflag = MPIR_ERR_OTHER; } } /* We should set the status to failed here - since the request is not freed. this * will be handled later in MPIDU_Sched_progress_state, so set to started here */ e->status = MPIDU_SCHED_ENTRY_STATUS_STARTED; - MPL_DBG_MSG_D(MPIR_DBG_COMM, VERBOSE, "Sched RECV failed. Errflag: %d\n", (int) r->errflag); + MPL_DBG_MSG_D(MPIR_DBG_COMM, VERBOSE, "Sched RECV failed. Errflag: %d\n", (int) r->u.nbc.errflag); } else { e->status = MPIDU_SCHED_ENTRY_STATUS_STARTED; @@ -231,12 +231,12 @@ static int MPIDU_Sched_start_entry(struct MPIDU_Sched *s, size_t idx, struct MPI /* Sched entries list can be reallocated inside callback */ e = &s->entries[idx]; if (unlikely(ret_errno)) { - if (MPIR_ERR_NONE == r->errflag) { + if (MPIR_ERR_NONE == r->u.nbc.errflag) { if (MPIX_ERR_PROC_FAILED == MPIR_ERR_GET_CLASS(ret_errno)) { - r->errflag = MPIR_ERR_PROC_FAILED; + r->u.nbc.errflag = MPIR_ERR_PROC_FAILED; } else { - r->errflag = MPIR_ERR_OTHER; + r->u.nbc.errflag = MPIR_ERR_OTHER; } } e->status = MPIDU_SCHED_ENTRY_STATUS_FAILED; @@ -250,12 +250,12 @@ static int MPIDU_Sched_start_entry(struct MPIDU_Sched *s, size_t idx, struct MPI /* Sched entries list can be reallocated inside callback */ e = &s->entries[idx]; if (unlikely(ret_errno)) { - if (MPIR_ERR_NONE == r->errflag) { + if (MPIR_ERR_NONE == r->u.nbc.errflag) { if (MPIX_ERR_PROC_FAILED == MPIR_ERR_GET_CLASS(ret_errno)) { - r->errflag = MPIR_ERR_PROC_FAILED; + r->u.nbc.errflag = MPIR_ERR_PROC_FAILED; } else { - r->errflag = MPIR_ERR_OTHER; + r->u.nbc.errflag = MPIR_ERR_OTHER; } } e->status = MPIDU_SCHED_ENTRY_STATUS_FAILED; @@ -890,7 +890,7 @@ static int MPIDU_Sched_progress_state(struct MPIDU_Sched_state *state, int *made MPL_DBG_MSG_FMT(MPIR_DBG_COMM, VERBOSE, (MPL_DBG_FDEST, "completed SEND entry %d, sreq=%p\n", (int) i, e->u.send.sreq)); - if (s->req->errflag != MPIR_ERR_NONE) + if (s->req->u.nbc.errflag != MPIR_ERR_NONE) e->status = MPIDU_SCHED_ENTRY_STATUS_FAILED; else e->status = MPIDU_SCHED_ENTRY_STATUS_COMPLETE; @@ -905,14 +905,14 @@ static int MPIDU_Sched_progress_state(struct MPIDU_Sched_state *state, int *made MPL_DBG_MSG_FMT(MPIR_DBG_COMM, VERBOSE, (MPL_DBG_FDEST, "completed RECV entry %d, rreq=%p\n", (int) i, e->u.recv.rreq)); - MPIR_Process_status(&e->u.recv.rreq->status, &s->req->errflag); + MPIR_Process_status(&e->u.recv.rreq->status, &s->req->u.nbc.errflag); if (e->u.recv.status != MPI_STATUS_IGNORE) { int recvd; e->u.recv.status->MPI_ERROR = e->u.recv.rreq->status.MPI_ERROR; MPIR_Get_count_impl(&e->u.recv.rreq->status, MPI_BYTE, &recvd); MPIR_STATUS_SET_COUNT(*(e->u.recv.status), recvd); } - if (s->req->errflag != MPIR_ERR_NONE) + if (s->req->u.nbc.errflag != MPIR_ERR_NONE) e->status = MPIDU_SCHED_ENTRY_STATUS_FAILED; else e->status = MPIDU_SCHED_ENTRY_STATUS_COMPLETE; @@ -952,7 +952,7 @@ static int MPIDU_Sched_progress_state(struct MPIDU_Sched_state *state, int *made MPL_DL_DELETE(state->head, s); /* TODO refactor into a sched_complete routine? */ - switch (s->req->errflag) { + switch (s->req->u.nbc.errflag) { case MPIR_ERR_PROC_FAILED: MPIR_ERR_SET(s->req->status.MPI_ERROR, MPIX_ERR_PROC_FAILED, "**comm"); break; diff --git a/src/mpid/pamid/src/mpid_request.h b/src/mpid/pamid/src/mpid_request.h index 5f74269..c260864 100644 --- a/src/mpid/pamid/src/mpid_request.h +++ b/src/mpid/pamid/src/mpid_request.h @@ -136,7 +136,7 @@ void MPIDI_Request_allocate_pool(); #endif #ifdef HAVE_DEBUGGER_SUPPORT -#define MPIDI_Request_clear_dbg(req_) ((req_)->dbg_next = NULL) +#define MPIDI_Request_clear_dbg(req_) ((req_)->u.send.dbg_next = NULL) #else #define MPIDI_Request_clear_dbg(req_) #endif http://git.mpich.org/mpich.git/commitdiff/3b418a958be32f22412961c41995b29b5… commit 3b418a958be32f22412961c41995b29b5c0eb14c Author: Pavan Balaji <balaji(a)anl.gov> Date: Tue Apr 19 09:49:18 2016 -0500 Do not initialize unnecessary fields. Some fields were being defensively initialized inside the request allocation function, thus increasing the instruction count in request allocation. Signed-off-by: Wesley Bland <wesley.bland(a)intel.com> diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index 10682c5..651b79f 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -1715,12 +1715,7 @@ static inline MPIR_Request *MPIR_Request_create(MPIR_Request_kind_t kind) MPIR_cc_set(&req->cc, 1); req->cc_ptr = &req->cc; - /* FIXME: status fields meaningful only for receive, and even - * then should not need to be set. */ - req->status.MPI_SOURCE = MPI_UNDEFINED; - req->status.MPI_TAG = MPI_UNDEFINED; req->status.MPI_ERROR = MPI_SUCCESS; - MPIR_STATUS_SET_COUNT(req->status, 0); MPIR_STATUS_SET_CANCEL_BIT(req->status, FALSE); req->comm = NULL; http://git.mpich.org/mpich.git/commitdiff/4459b29de71916d1df6663e943b0df767… commit 4459b29de71916d1df6663e943b0df767f34dd84 Author: Pavan Balaji <balaji(a)anl.gov> Date: Mon Apr 18 15:51:11 2016 -0500 Modify MPID_Request_create to take request type argument. Passing the request type allows the request allocation to optimize for specific request types, since it does not need to initialize all fields. The current ch3 code simply allocates all requests as UNDEFINED. This is at the same position we were before we added the request type argument. Signed-off-by: Wesley Bland <wesley.bland(a)intel.com> diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index fc2047c..10682c5 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -1685,7 +1685,7 @@ void MPID_Request_finalize(MPIR_Request *); @*/ int MPID_Request_complete(MPIR_Request *); -static inline MPIR_Request *MPIR_Request_create(void) +static inline MPIR_Request *MPIR_Request_create(MPIR_Request_kind_t kind) { MPIR_Request *req; @@ -1711,7 +1711,7 @@ static inline MPIR_Request *MPIR_Request_create(void) * kind to UNDEFINED? And should the RMA values be set only * for RMA requests? */ MPIU_Object_set_ref(req, 1); - req->kind = MPIR_REQUEST_UNDEFINED; + req->kind = kind; MPIR_cc_set(&req->cc, 1); req->cc_ptr = &req->cc; diff --git a/src/mpi/pt2pt/greq_start.c b/src/mpi/pt2pt/greq_start.c index bd91733..0c39b6e 100644 --- a/src/mpi/pt2pt/greq_start.c +++ b/src/mpi/pt2pt/greq_start.c @@ -84,10 +84,9 @@ int MPIR_Grequest_start_impl(MPI_Grequest_query_function *query_fn, /* MT FIXME this routine is not thread-safe in the non-global case */ - *request_ptr = MPIR_Request_create(); + *request_ptr = MPIR_Request_create(MPIR_UREQUEST); MPIR_ERR_CHKANDJUMP1(request_ptr == NULL, mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", "generalized request"); - (*request_ptr)->kind = MPIR_UREQUEST; MPIU_Object_set_ref( *request_ptr, 1 ); (*request_ptr)->cc_ptr = &(*request_ptr)->cc; MPIR_cc_set((*request_ptr)->cc_ptr, 1); diff --git a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_probe.c b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_probe.c index 70b47d3..ccb4cd2 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_probe.c +++ b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_probe.c @@ -157,7 +157,7 @@ int MPID_nem_llc_improbe(MPIDI_VC_t * vc, int source, int tag, MPIR_Comm * comm, *flag = 1; - req = MPIR_Request_create(); + req = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); MPIU_Object_set_ref(req, 2); req->kind = MPIR_REQUEST_MPROBE; req->comm = comm; diff --git a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_send.c b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_send.c index 389b3f0..8f1048e 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_send.c +++ b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_send.c @@ -43,7 +43,7 @@ int MPID_nem_llc_isend(struct MPIDI_VC *vc, const void *buf, int count, MPI_Data LLC_comm_rank(LLC_COMM_MPICH, &LLC_my_rank); dprintf("llc_isend,LLC_my_rank=%d\n", LLC_my_rank); - struct MPIR_Request *sreq = MPIR_Request_create(); + struct MPIR_Request *sreq = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); MPIU_Assert(sreq != NULL); MPIU_Object_set_ref(sreq, 2); sreq->kind = MPIR_REQUEST_SEND; @@ -186,7 +186,7 @@ int MPID_nem_llc_iStartContigMsg(MPIDI_VC_t * vc, void *hdr, intptr_t hdr_sz, vo MPL_DBG_MSG_D(MPIDI_CH3_DBG_CHANNEL, VERBOSE, "hdr type = %d", ((MPIDI_CH3_Pkt_t *) hdr)->type); /* create a request */ - sreq = MPIR_Request_create(); + sreq = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); MPIU_Assert(sreq != NULL); MPIU_Object_set_ref(sreq, 2); sreq->kind = MPIR_REQUEST_SEND; @@ -976,7 +976,7 @@ int MPID_nem_llc_issend(struct MPIDI_VC *vc, const void *buf, int count, MPI_Dat LLC_comm_rank(LLC_COMM_MPICH, &LLC_my_rank); dprintf("llc_isend,LLC_my_rank=%d\n", LLC_my_rank); - struct MPIR_Request *sreq = MPIR_Request_create(); + struct MPIR_Request *sreq = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); MPIU_Assert(sreq != NULL); MPIU_Object_set_ref(sreq, 2); sreq->kind = MPIR_REQUEST_SEND; diff --git a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_probe.c b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_probe.c index 437ac38..3e77796 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_probe.c +++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_probe.c @@ -135,7 +135,7 @@ int MPID_nem_mxm_improbe(MPIDI_VC_t * vc, int source, int tag, MPIR_Comm * comm, *flag = 1; - req = MPIR_Request_create(); + req = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); MPIU_Object_set_ref(req, 2); req->kind = MPIR_REQUEST_MPROBE; req->comm = comm; diff --git a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c index 8546b53..e00042e 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c +++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c @@ -113,7 +113,7 @@ int MPID_nem_mxm_iStartContigMsg(MPIDI_VC_t * vc, void *hdr, intptr_t hdr_sz, vo MPIDI_DBG_Print_packet((MPIDI_CH3_Pkt_t *) hdr); /* create a request */ - sreq = MPIR_Request_create(); + sreq = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); MPIU_Assert(sreq != NULL); MPIU_Object_set_ref(sreq, 2); MPIU_Memcpy(&(sreq->dev.pending_pkt), (char *) hdr, sizeof(MPIDI_CH3_Pkt_t)); diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h index 5b052e9..b3e7adc 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h @@ -249,7 +249,7 @@ static inline int MPID_nem_ofi_create_req(MPIR_Request ** request, int refcnt) { int mpi_errno = MPI_SUCCESS; MPIR_Request *req; - req = MPIR_Request_create(); + req = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); MPIU_Assert(req); MPIDI_Request_clear_dbg(req); MPIU_Object_set_ref(req, refcnt); diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h index 043d6ea..8cf7788 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h @@ -68,7 +68,7 @@ static inline MPID_nem_ptl_req_area * REQ_PTL(MPIR_Request *req) { } while (0) #define MPID_nem_ptl_request_create_sreq(sreq_, errno_, comm_) do { \ - (sreq_) = MPIR_Request_create(); \ + (sreq_) = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); \ MPIU_Object_set_ref((sreq_), 2); \ (sreq_)->kind = MPIR_REQUEST_SEND; \ MPIR_Comm_add_ref(comm_); \ diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c index 44b651a..7862417 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c @@ -365,7 +365,7 @@ int MPID_nem_ptl_iStartContigMsg(MPIDI_VC_t *vc, void *hdr, intptr_t hdr_sz, voi MPIU_Assert(hdr_sz <= sizeof(MPIDI_CH3_Pkt_t)); /* create a request */ - *sreq_ptr = MPIR_Request_create(); + *sreq_ptr = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); MPIU_Assert(*sreq_ptr != NULL); MPIU_Object_set_ref(*sreq_ptr, 2); (*sreq_ptr)->kind = MPIR_REQUEST_SEND; @@ -484,7 +484,7 @@ int MPID_nem_ptl_nm_ctl_event_handler(const ptl_event_t *e) MPIR_ERR_POP(mpi_errno); } else { - MPIR_Request *req = MPIR_Request_create(); + MPIR_Request *req = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); /* This request is actually complete; just needs to wait to enforce ordering */ TMPBUF(req) = MPL_malloc(packet_sz); MPIU_Assert(TMPBUF(req)); @@ -501,7 +501,7 @@ int MPID_nem_ptl_nm_ctl_event_handler(const ptl_event_t *e) char *buf_ptr; ptl_size_t target_offset; - MPIR_Request *req = MPIR_Request_create(); + MPIR_Request *req = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); MPIU_Assert(req != NULL); MPIDI_CH3U_Request_decrement_cc(req, &incomplete); /* We'll increment it below */ REQ_PTL(req)->event_handler = MPID_nem_ptl_nm_ctl_event_handler; diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_probe.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_probe.c index da36d85..977d37c 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_probe.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_probe.c @@ -127,7 +127,7 @@ int MPID_nem_ptl_iprobe(MPIDI_VC_t *vc, int source, int tag, MPIR_Comm *comm, in id_any.phys.pid = PTL_PID_ANY; /* create a request */ - req = MPIR_Request_create(); + req = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); MPIR_ERR_CHKANDJUMP1(!req, mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", "MPIR_Request_create"); MPIU_Object_set_ref(req, 2); /* 1 ref for progress engine and 1 ref for us */ REQ_PTL(req)->event_handler = handle_probe; @@ -202,7 +202,7 @@ int MPID_nem_ptl_improbe(MPIDI_VC_t *vc, int source, int tag, MPIR_Comm *comm, i id_any.phys.pid = PTL_PID_ANY; /* create a request */ - req = MPIR_Request_create(); + req = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); MPID_nem_ptl_init_req(req); MPIR_ERR_CHKANDJUMP1(!req, mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", "MPIR_Request_create"); MPIU_Object_set_ref(req, 2); /* 1 ref for progress engine and 1 ref for us */ @@ -323,7 +323,7 @@ int MPID_nem_ptl_pkt_cancel_send_req_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pk /* create a dummy request and search for the message */ /* create a request */ - search_req = MPIR_Request_create(); + search_req = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); MPID_nem_ptl_init_req(search_req); MPIR_ERR_CHKANDJUMP1(!search_req, mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", "MPIR_Request_create"); MPIU_Object_set_ref(search_req, 2); /* 1 ref for progress engine and 1 ref for us */ diff --git a/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_send.c b/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_send.c index 3ed5558..81667b0 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_send.c +++ b/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_send.c @@ -306,7 +306,7 @@ int MPID_nem_tcp_iStartContigMsg(MPIDI_VC_t *vc, void *hdr, intptr_t hdr_sz, voi MPL_DBG_MSG (MPIDI_CH3_DBG_CHANNEL, VERBOSE, "enqueuing"); /* create a request */ - sreq = MPIR_Request_create(); + sreq = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); MPIU_Assert (sreq != NULL); MPIU_Object_set_ref (sreq, 2); sreq->kind = MPIR_REQUEST_SEND; @@ -445,7 +445,7 @@ int MPID_nem_tcp_iStartContigMsg_paused(MPIDI_VC_t *vc, void *hdr, intptr_t hdr_ MPL_DBG_MSG (MPIDI_CH3_DBG_CHANNEL, VERBOSE, "enqueuing"); /* create a request */ - sreq = MPIR_Request_create(); + sreq = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); MPIU_Assert (sreq != NULL); MPIU_Object_set_ref (sreq, 2); sreq->kind = MPIR_REQUEST_SEND; diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_istartmsg.c b/src/mpid/ch3/channels/nemesis/src/ch3_istartmsg.c index 56dfb65..b380182 100644 --- a/src/mpid/ch3/channels/nemesis/src/ch3_istartmsg.c +++ b/src/mpid/ch3/channels/nemesis/src/ch3_istartmsg.c @@ -89,7 +89,7 @@ int MPIDI_CH3_iStartMsg (MPIDI_VC_t *vc, void *hdr, intptr_t hdr_sz, MPIR_Reques MPL_DBG_MSG(MPIDI_CH3_DBG_OTHER, TERSE, "enqueuing"); /* create a request */ - sreq = MPIR_Request_create(); + sreq = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); MPIU_Assert (sreq != NULL); MPIU_Object_set_ref (sreq, 2); sreq->kind = MPIR_REQUEST_SEND; diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_istartmsgv.c b/src/mpid/ch3/channels/nemesis/src/ch3_istartmsgv.c index 46128f0..0b249ce 100644 --- a/src/mpid/ch3/channels/nemesis/src/ch3_istartmsgv.c +++ b/src/mpid/ch3/channels/nemesis/src/ch3_istartmsgv.c @@ -117,7 +117,7 @@ int MPIDI_CH3_iStartMsgv (MPIDI_VC_t *vc, MPL_IOV *iov, int n_iov, MPIR_Request { /* Create a new request and save remaining portions of the * iov in it. */ - sreq = MPIR_Request_create(); + sreq = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); MPIU_Assert(sreq != NULL); MPIU_Object_set_ref(sreq, 2); sreq->kind = MPIR_REQUEST_SEND; @@ -148,7 +148,7 @@ int MPIDI_CH3_iStartMsgv (MPIDI_VC_t *vc, MPL_IOV *iov, int n_iov, MPIR_Request MPL_DBG_MSG(MPIDI_CH3_DBG_OTHER, TERSE, "request enqueued"); /* create a request */ - sreq = MPIR_Request_create(); + sreq = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); MPIU_Assert(sreq != NULL); MPIU_Object_set_ref(sreq, 2); sreq->kind = MPIR_REQUEST_SEND; diff --git a/src/mpid/ch3/channels/nemesis/src/mpid_nem_mpich.c b/src/mpid/ch3/channels/nemesis/src/mpid_nem_mpich.c index 32dd078..da2e358 100644 --- a/src/mpid/ch3/channels/nemesis/src/mpid_nem_mpich.c +++ b/src/mpid/ch3/channels/nemesis/src/mpid_nem_mpich.c @@ -96,7 +96,7 @@ int MPID_nem_send_iov(MPIDI_VC_t *vc, MPIR_Request **sreq_ptr, MPL_IOV *iov, int if (*sreq_ptr == NULL) { /* create a request */ - sreq = MPIR_Request_create(); + sreq = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); MPIU_Assert(sreq != NULL); MPIU_Object_set_ref(sreq, 2); sreq->kind = MPIR_REQUEST_SEND; diff --git a/src/mpid/ch3/channels/sock/src/ch3_istartmsg.c b/src/mpid/ch3/channels/sock/src/ch3_istartmsg.c index 5027519..df28f2e 100644 --- a/src/mpid/ch3/channels/sock/src/ch3_istartmsg.c +++ b/src/mpid/ch3/channels/sock/src/ch3_istartmsg.c @@ -18,7 +18,7 @@ static MPIR_Request * create_request(void * hdr, intptr_t hdr_sz, MPIDI_FUNC_ENTER(MPID_STATE_CREATE_REQUEST); - sreq = MPIR_Request_create(); + sreq = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); /* --BEGIN ERROR HANDLING-- */ if (sreq == NULL) return NULL; @@ -126,7 +126,7 @@ int MPIDI_CH3_iStartMsg(MPIDI_VC_t * vc, void * hdr, intptr_t hdr_sz, { MPL_DBG_MSG_D(MPIDI_CH3_DBG_CHANNEL,TYPICAL, "ERROR - MPIDU_Sock_write failed, rc=%d", rc); - sreq = MPIR_Request_create(); + sreq = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); if (!sreq) { MPIR_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomem"); } @@ -194,7 +194,7 @@ int MPIDI_CH3_iStartMsg(MPIDI_VC_t * vc, void * hdr, intptr_t hdr_sz, { /* Connection failed, so allocate a request and return an error. */ MPL_DBG_VCUSE(vc,"ERROR - connection failed"); - sreq = MPIR_Request_create(); + sreq = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); if (!sreq) { MPIR_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomem"); } diff --git a/src/mpid/ch3/channels/sock/src/ch3_istartmsgv.c b/src/mpid/ch3/channels/sock/src/ch3_istartmsgv.c index da1b8ad..b5c5d9b 100644 --- a/src/mpid/ch3/channels/sock/src/ch3_istartmsgv.c +++ b/src/mpid/ch3/channels/sock/src/ch3_istartmsgv.c @@ -19,7 +19,7 @@ static MPIR_Request * create_request(MPL_IOV * iov, int iov_count, MPIDI_FUNC_ENTER(MPID_STATE_CREATE_REQUEST); - sreq = MPIR_Request_create(); + sreq = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); /* --BEGIN ERROR HANDLING-- */ if (sreq == NULL) return NULL; @@ -57,7 +57,7 @@ static MPIR_Request * create_request(MPL_IOV * iov, int iov_count, * the request. */ -/* XXX - What do we do if MPIR_Request_create() returns NULL??? +/* XXX - What do we do if MPIR_Request_create returns NULL??? If MPIDI_CH3_iStartMsgv() returns NULL, the calling code assumes the request completely successfully, but the reality is that we couldn't allocate the memory for a request. This @@ -158,7 +158,7 @@ int MPIDI_CH3_iStartMsgv(MPIDI_VC_t * vc, MPL_IOV * iov, int n_iov, { MPL_DBG_MSG_D(MPIDI_CH3_DBG_CHANNEL,TYPICAL, "ERROR - MPIDU_Sock_writev failed, rc=%d", rc); - sreq = MPIR_Request_create(); + sreq = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); if (sreq == NULL) { MPIR_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomem"); } @@ -226,7 +226,7 @@ int MPIDI_CH3_iStartMsgv(MPIDI_VC_t * vc, MPL_IOV * iov, int n_iov, { /* Connection failed, so allocate a request and return an error. */ MPL_DBG_VCUSE(vc,"ERROR - connection failed"); - sreq = MPIR_Request_create(); + sreq = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); if (sreq == NULL) { MPIR_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomem"); } diff --git a/src/mpid/ch3/include/mpid_rma_issue.h b/src/mpid/ch3/include/mpid_rma_issue.h index ebf7043..132a273 100644 --- a/src/mpid/ch3/include/mpid_rma_issue.h +++ b/src/mpid/ch3/include/mpid_rma_issue.h @@ -314,7 +314,7 @@ static int issue_from_origin_buffer(MPIDI_RMA_Op_t * rma_op, MPIDI_VC_t * vc, * always need a request to be passed in. */ /* create a new request */ - req = MPIR_Request_create(); + req = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); MPIR_ERR_CHKANDJUMP(req == NULL, mpi_errno, MPI_ERR_OTHER, "**nomemreq"); MPIU_Object_set_ref(req, 2); @@ -676,7 +676,7 @@ static int issue_get_acc_op(MPIDI_RMA_Op_t * rma_op, MPIR_Win * win_ptr, /* Create a request for the GACC response. Store the response buf, count, and * datatype in it, and pass the request's handle in the GACC packet. When the * response comes from the target, it will contain the request handle. */ - resp_req = MPIR_Request_create(); + resp_req = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); MPIR_ERR_CHKANDJUMP(resp_req == NULL, mpi_errno, MPI_ERR_OTHER, "**nomemreq"); MPIU_Object_set_ref(resp_req, 2); @@ -771,7 +771,7 @@ static int issue_get_acc_op(MPIDI_RMA_Op_t * rma_op, MPIR_Win * win_ptr, /* Create a request for the GACC response. Store the response buf, count, and * datatype in it, and pass the request's handle in the GACC packet. When the * response comes from the target, it will contain the request handle. */ - resp_req = MPIR_Request_create(); + resp_req = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); MPIR_ERR_CHKANDJUMP(resp_req == NULL, mpi_errno, MPI_ERR_OTHER, "**nomemreq"); MPIU_Object_set_ref(resp_req, 2); @@ -899,7 +899,7 @@ static int issue_get_op(MPIDI_RMA_Op_t * rma_op, MPIR_Win * win_ptr, * and pass a handle to it in the get packet. When the get * response comes from the target, it will contain the request * handle. */ - curr_req = MPIR_Request_create(); + curr_req = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); if (curr_req == NULL) { MPIR_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**nomemreq"); } @@ -1022,7 +1022,7 @@ static int issue_cas_op(MPIDI_RMA_Op_t * rma_op, /* Create a request for the RMW response. Store the origin buf, count, and * datatype in it, and pass the request's handle RMW packet. When the * response comes from the target, it will contain the request handle. */ - curr_req = MPIR_Request_create(); + curr_req = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); MPIR_ERR_CHKANDJUMP(curr_req == NULL, mpi_errno, MPI_ERR_OTHER, "**nomemreq"); /* Set refs on the request to 2: one for the response message, and one for @@ -1085,7 +1085,7 @@ static int issue_fop_op(MPIDI_RMA_Op_t * rma_op, /* Create a request for the GACC response. Store the response buf, count, and * datatype in it, and pass the request's handle in the GACC packet. When the * response comes from the target, it will contain the request handle. */ - resp_req = MPIR_Request_create(); + resp_req = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); MPIR_ERR_CHKANDJUMP(resp_req == NULL, mpi_errno, MPI_ERR_OTHER, "**nomemreq"); MPIU_Object_set_ref(resp_req, 2); diff --git a/src/mpid/ch3/include/mpidimpl.h b/src/mpid/ch3/include/mpidimpl.h index 21dcdaa..ffe7c67 100644 --- a/src/mpid/ch3/include/mpidimpl.h +++ b/src/mpid/ch3/include/mpidimpl.h @@ -287,7 +287,7 @@ extern MPIDI_Process_t MPIDI_Process; */ #define MPIDI_Request_create_sreq(sreq_, mpi_errno_, FAIL_) \ { \ - (sreq_) = MPIR_Request_create(); \ + (sreq_) = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); \ MPIU_Object_set_ref((sreq_), 2); \ (sreq_)->kind = MPIR_REQUEST_SEND; \ (sreq_)->comm = comm; \ @@ -306,7 +306,7 @@ extern MPIDI_Process_t MPIDI_Process; /* This is the receive request version of MPIDI_Request_create_sreq */ #define MPIDI_Request_create_rreq(rreq_, mpi_errno_, FAIL_) \ { \ - (rreq_) = MPIR_Request_create(); \ + (rreq_) = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); \ MPIU_Object_set_ref((rreq_), 2); \ (rreq_)->kind = MPIR_REQUEST_RECV; \ (rreq_)->partner_request = NULL; \ @@ -316,7 +316,7 @@ extern MPIDI_Process_t MPIDI_Process; * returning when a user passed MPI_PROC_NULL */ #define MPIDI_Request_create_null_rreq(rreq_, mpi_errno_, FAIL_) \ do { \ - (rreq_) = MPIR_Request_create(); \ + (rreq_) = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); \ if ((rreq_) != NULL) { \ MPIU_Object_set_ref((rreq_), 1); \ /* MT FIXME should these be handled by MPIR_Request_create? */ \ diff --git a/src/mpid/ch3/include/mpidrma.h b/src/mpid/ch3/include/mpidrma.h index c8c75d7..213216b 100644 --- a/src/mpid/ch3/include/mpidrma.h +++ b/src/mpid/ch3/include/mpidrma.h @@ -455,7 +455,7 @@ static inline int enqueue_lock_origin(MPIR_Win * win_ptr, MPIDI_VC_t * vc, } /* create request to receive upcoming requests */ - req = MPIR_Request_create(); + req = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); MPIU_Object_set_ref(req, 1); /* fill in area in req that will be used in Receive_data_found() */ diff --git a/src/mpid/ch3/src/ch3u_handle_recv_req.c b/src/mpid/ch3/src/ch3u_handle_recv_req.c index 8125271..211b155 100644 --- a/src/mpid/ch3/src/ch3u_handle_recv_req.c +++ b/src/mpid/ch3/src/ch3u_handle_recv_req.c @@ -318,7 +318,7 @@ int MPIDI_CH3_ReqHandler_GaccumRecvComplete(MPIDI_VC_t * vc, MPIR_Request * rreq MPIDU_Datatype_is_contig(rreq->dev.datatype, &is_contig); MPIDU_Datatype_get_true_lb(rreq->dev.datatype, &dt_true_lb); - resp_req = MPIR_Request_create(); + resp_req = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); MPIR_ERR_CHKANDJUMP(resp_req == NULL, mpi_errno, MPI_ERR_OTHER, "**nomemreq"); MPIU_Object_set_ref(resp_req, 1); MPIDI_Request_set_type(resp_req, MPIDI_REQUEST_TYPE_GET_ACCUM_RESP); @@ -455,7 +455,7 @@ int MPIDI_CH3_ReqHandler_FOPRecvComplete(MPIDI_VC_t * vc, MPIR_Request * rreq, i MPIDU_Datatype_is_contig(rreq->dev.datatype, &is_contig); /* Create response request */ - resp_req = MPIR_Request_create(); + resp_req = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); MPIR_ERR_CHKANDJUMP(resp_req == NULL, mpi_errno, MPI_ERR_OTHER, "**nomemreq"); MPIDI_Request_set_type(resp_req, MPIDI_REQUEST_TYPE_FOP_RESP); MPIU_Object_set_ref(resp_req, 1); @@ -879,7 +879,7 @@ int MPIDI_CH3_ReqHandler_GetDerivedDTRecvComplete(MPIDI_VC_t * vc, create_derived_datatype(rreq, dtype_info, &new_dtp); /* create request for sending data */ - sreq = MPIR_Request_create(); + sreq = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); MPIR_ERR_CHKANDJUMP(sreq == NULL, mpi_errno, MPI_ERR_OTHER, "**nomemreq"); sreq->kind = MPIR_REQUEST_SEND; @@ -1198,7 +1198,7 @@ static inline int perform_get_in_lock_queue(MPIR_Win * win_ptr, /* Make sure that all data is received for this op. */ MPIU_Assert(target_lock_entry->all_data_recved == 1); - sreq = MPIR_Request_create(); + sreq = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); if (sreq == NULL) { MPIR_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**nomemreq"); } @@ -1374,7 +1374,7 @@ static inline int perform_get_acc_in_lock_queue(MPIR_Win * win_ptr, /* Make sure that all data is received for this op. */ MPIU_Assert(target_lock_entry->all_data_recved == 1); - sreq = MPIR_Request_create(); + sreq = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); if (sreq == NULL) { MPIR_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**nomemreq"); } @@ -1588,7 +1588,7 @@ static inline int perform_fop_in_lock_queue(MPIR_Win * win_ptr, fop_resp_pkt->flags |= MPIDI_CH3_PKT_FLAG_RMA_ACK; if (fop_pkt->type == MPIDI_CH3_PKT_FOP) { - resp_req = MPIR_Request_create(); + resp_req = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); if (resp_req == NULL) { MPIR_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**nomemreq"); } diff --git a/src/mpid/ch3/src/ch3u_rma_pkthandler.c b/src/mpid/ch3/src/ch3u_rma_pkthandler.c index 310a6d8..3c41578 100644 --- a/src/mpid/ch3/src/ch3u_rma_pkthandler.c +++ b/src/mpid/ch3/src/ch3u_rma_pkthandler.c @@ -315,7 +315,7 @@ int MPIDI_CH3_PktHandler_Put(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, data_len = *buflen - sizeof(MPIDI_CH3_Pkt_t); data_buf = (char *) pkt + sizeof(MPIDI_CH3_Pkt_t); - req = MPIR_Request_create(); + req = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); MPIU_Object_set_ref(req, 1); req->dev.user_buf = put_pkt->addr; @@ -464,7 +464,7 @@ int MPIDI_CH3_PktHandler_Get(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, goto fn_exit; } - req = MPIR_Request_create(); + req = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); req->dev.target_win_handle = get_pkt->target_win_handle; req->dev.flags = get_pkt->flags; @@ -705,7 +705,7 @@ int MPIDI_CH3_PktHandler_Accumulate(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, else { MPIU_Assert(pkt->type == MPIDI_CH3_PKT_ACCUMULATE); - req = MPIR_Request_create(); + req = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); MPIU_Object_set_ref(req, 1); *rreqp = req; @@ -905,7 +905,7 @@ int MPIDI_CH3_PktHandler_GetAccumulate(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, /* Immed packet type is used when target datatype is predefined datatype. */ MPIU_Assert(MPIR_DATATYPE_IS_PREDEFINED(get_accum_pkt->datatype)); - resp_req = MPIR_Request_create(); + resp_req = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); resp_req->dev.target_win_handle = get_accum_pkt->target_win_handle; resp_req->dev.flags = get_accum_pkt->flags; @@ -978,7 +978,7 @@ int MPIDI_CH3_PktHandler_GetAccumulate(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, MPIU_Assert(pkt->type == MPIDI_CH3_PKT_GET_ACCUM); - req = MPIR_Request_create(); + req = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); MPIU_Object_set_ref(req, 1); *rreqp = req; @@ -1436,7 +1436,7 @@ int MPIDI_CH3_PktHandler_FOP(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, if (fop_pkt->op == MPI_NO_OP) is_empty_origin = TRUE; - req = MPIR_Request_create(); + req = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); MPIU_Object_set_ref(req, 1); MPIDI_Request_set_type(req, MPIDI_REQUEST_TYPE_FOP_RECV); *rreqp = req; diff --git a/src/mpid/ch3/src/ch3u_rma_reqops.c b/src/mpid/ch3/src/ch3u_rma_reqops.c index 70401ca..b6c55ff 100644 --- a/src/mpid/ch3/src/ch3u_rma_reqops.c +++ b/src/mpid/ch3/src/ch3u_rma_reqops.c @@ -37,7 +37,7 @@ int MPID_Rput(const void *origin_addr, int origin_count, MPIDI_Datatype_get_info(origin_count, origin_datatype, dt_contig, data_sz, dtp, dt_true_lb); /* Create user request, initially cc=1, ref=1 */ - ureq = MPIR_Request_create(); + ureq = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); MPIR_ERR_CHKANDJUMP(ureq == NULL, mpi_errno, MPI_ERR_OTHER, "**nomemreq"); ureq->kind = MPIR_WIN_REQUEST; @@ -100,7 +100,7 @@ int MPID_Rget(void *origin_addr, int origin_count, MPIDI_Datatype_get_info(origin_count, origin_datatype, dt_contig, data_sz, dtp, dt_true_lb); /* Create user request, initially cc=1, ref=1 */ - ureq = MPIR_Request_create(); + ureq = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); MPIR_ERR_CHKANDJUMP(ureq == NULL, mpi_errno, MPI_ERR_OTHER, "**nomemreq"); ureq->kind = MPIR_WIN_REQUEST; @@ -161,7 +161,7 @@ int MPID_Raccumulate(const void *origin_addr, int origin_count, mpi_errno, MPI_ERR_RMA_SYNC, "**rmasync"); /* Create user request, initially cc=1, ref=1 */ - ureq = MPIR_Request_create(); + ureq = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); MPIR_ERR_CHKANDJUMP(ureq == NULL, mpi_errno, MPI_ERR_OTHER, "**nomemreq"); ureq->kind = MPIR_WIN_REQUEST; @@ -225,7 +225,7 @@ int MPID_Rget_accumulate(const void *origin_addr, int origin_count, mpi_errno, MPI_ERR_RMA_SYNC, "**rmasync"); /* Create user request, initially cc=1, ref=1 */ - ureq = MPIR_Request_create(); + ureq = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); MPIR_ERR_CHKANDJUMP(ureq == NULL, mpi_errno, MPI_ERR_OTHER, "**nomemreq"); ureq->kind = MPIR_WIN_REQUEST; diff --git a/src/mpid/ch3/src/mpid_startall.c b/src/mpid/ch3/src/mpid_startall.c index fc103a8..ea1acbd 100644 --- a/src/mpid/ch3/src/mpid_startall.c +++ b/src/mpid/ch3/src/mpid_startall.c @@ -22,7 +22,7 @@ /* This macro initializes all of the fields in a persistent request */ #define MPIDI_Request_create_psreq(sreq_, mpi_errno_, FAIL_) \ { \ - (sreq_) = MPIR_Request_create(); \ + (sreq_) = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); \ if ((sreq_) == NULL) \ { \ MPL_DBG_MSG(MPIDI_CH3_DBG_OTHER,VERBOSE,"send request allocation failed");\ @@ -299,7 +299,7 @@ int MPID_Recv_init(void * buf, int count, MPI_Datatype datatype, int rank, int t MPIDI_FUNC_ENTER(MPID_STATE_MPID_RECV_INIT); - rreq = MPIR_Request_create(); + rreq = MPIR_Request_create(MPIR_REQUEST_UNDEFINED); if (rreq == NULL) { /* --BEGIN ERROR HANDLING-- */ diff --git a/src/mpid/common/hcoll/hcoll_rte.c b/src/mpid/common/hcoll/hcoll_rte.c index 68d479a..acd3076 100644 --- a/src/mpid/common/hcoll/hcoll_rte.c +++ b/src/mpid/common/hcoll/hcoll_rte.c @@ -386,8 +386,7 @@ static int group_id(rte_grp_handle_t group) static void *get_coll_handle(void) { MPIR_Request *req; - req = MPIR_Request_create(); - req->kind = MPIR_COLL_REQUEST; + req = MPIR_Request_create(MPIR_COLL_REQUEST); return (void *) req; } diff --git a/src/mpid/common/sched/mpidu_sched.c b/src/mpid/common/sched/mpidu_sched.c index 3c95f20..9c70876 100644 --- a/src/mpid/common/sched/mpidu_sched.c +++ b/src/mpid/common/sched/mpidu_sched.c @@ -407,10 +407,9 @@ int MPIDU_Sched_start(MPID_Sched_t * sp, MPIR_Comm * comm, int tag, MPIR_Request MPIU_Assert(s->entries != NULL); /* now create and populate the request */ - r = MPIR_Request_create(); + r = MPIR_Request_create(MPIR_COLL_REQUEST); if (!r) MPIR_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**nomem"); - r->kind = MPIR_COLL_REQUEST; /* FIXME is this right when comm/datatype GC is used? */ MPIR_Comm_add_ref(comm); r->comm = comm; http://git.mpich.org/mpich.git/commitdiff/cff297b0a46908c9d4f40975eafb5337f… commit cff297b0a46908c9d4f40975eafb5337f19155e5 Author: Pavan Balaji <balaji(a)anl.gov> Date: Tue Apr 19 14:42:11 2016 -0500 Move cc_ptr close to cc in the MPIR_Request structure. In most cases, cc_ptr points to the address of cc in the same request structure. It makes sense to keep these fields close to each other to maximize cache hits. Signed-off-by: Wesley Bland <wesley.bland(a)intel.com> diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index 6e018fe..fc2047c 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -1585,17 +1585,19 @@ extern MPL_dbg_class MPIR_DBG_ASSERT; S*/ typedef struct MPIR_Request { MPIU_OBJECT_HEADER; /* adds handle and ref_count fields */ + MPIR_Request_kind_t kind; - /* pointer to the completion counter */ - /* This is necessary for the case when an operation is described by a - list of requests */ + + /* pointer to the completion counter. This is necessary for the + * case when an operation is described by a list of requests */ MPIR_cc_t *cc_ptr; + /* the actual completion counter. Ensure cc and status are in the + * same cache line, assuming the cache line size is a multiple of + * 32 bytes and 32-bit integers */ + MPIR_cc_t cc; + /* A comm is needed to find the proper error handler */ MPIR_Comm *comm; - /* completion counter. Ensure cc and status are in the same cache - line, assuming the cache line size is a multiple of 32 bytes - and 32-bit integers */ - MPIR_cc_t cc; /* Status is needed for wait/test/recv */ MPI_Status status; /* Persistent requests have their own "real" requests. Receive requests http://git.mpich.org/mpich.git/commitdiff/cb35f608b18c3045245db44eebee66a7a… commit cb35f608b18c3045245db44eebee66a7a472ebeb Author: Pavan Balaji <balaji(a)anl.gov> Date: Wed Apr 20 16:36:15 2016 -0500 Request creation/destruction reformatting. Request creation/destruction are really MPIR-level functionality, where the device can include hooks to manage its part of the fields. This patch moves this functionality to the MPIR layer. The patch also moves around some definitions in mpiimpl.h to allow the code dependencies to be met. Signed-off-by: Wesley Bland <wesley.bland(a)intel.com> diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index c2df158..6e018fe 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -1482,6 +1482,90 @@ struct MPIR_Grequest_fns { the generalize req */ }; +#if defined (MPL_USE_DBG_LOGGING) +extern MPL_dbg_class MPIR_DBG_INIT; +extern MPL_dbg_class MPIR_DBG_PT2PT; +extern MPL_dbg_class MPIR_DBG_THREAD; +extern MPL_dbg_class MPIR_DBG_DATATYPE; +extern MPL_dbg_class MPIR_DBG_COMM; +extern MPL_dbg_class MPIR_DBG_BSEND; +extern MPL_dbg_class MPIR_DBG_ERRHAND; +extern MPL_dbg_class MPIR_DBG_OTHER; +extern MPL_dbg_class MPIR_DBG_REQUEST; +extern MPL_dbg_class MPIR_DBG_ASSERT; +#endif /* MPL_USE_DBG_LOGGING */ + +/* MPI_Status manipulation macros */ +#define MPIR_BITS_IN_INT (8 * SIZEOF_INT) + +/* We use bits from the "count_lo" and "count_hi_and_cancelled" fields + * to represent the 'count' and 'cancelled' objects. The LSB of the + * "count_hi_and_cancelled" field represents the 'cancelled' object. + * The 'count' object is split between the "count_lo" and + * "count_hi_and_cancelled" fields, with the lower order bits going + * into the "count_lo" field, and the higher order bits goin into the + * "count_hi_and_cancelled" field. This gives us 2N-1 bits for the + * 'count' object, where N is the size of int. However, the value + * returned to the user is bounded by the definition on MPI_Count. */ +/* NOTE: The below code assumes that the count value is never + * negative. For negative values, right-shifting can have weird + * implementation specific consequences. */ +#define MPIR_STATUS_SET_COUNT(status_, count_) \ + { \ + (status_).count_lo = ((int) count_); \ + (status_).count_hi_and_cancelled &= 1; \ + (status_).count_hi_and_cancelled |= (int) ((MPIR_Ucount) count_ >> MPIR_BITS_IN_INT << 1); \ + } + +#define MPIR_STATUS_GET_COUNT(status_) \ + ((MPI_Count) ((((MPIR_Ucount) (((unsigned int) (status_).count_hi_and_cancelled) >> 1)) << MPIR_BITS_IN_INT) + (unsigned int) (status_).count_lo)) + +#define MPIR_STATUS_SET_CANCEL_BIT(status_, cancelled_) \ + { \ + (status_).count_hi_and_cancelled &= ~1; \ + (status_).count_hi_and_cancelled |= cancelled_; \ + } + +#define MPIR_STATUS_GET_CANCEL_BIT(status_) ((status_).count_hi_and_cancelled & 1) + +/* Do not set MPI_ERROR (only set if ERR_IN_STATUS is returned */ +#define MPIR_Status_set_empty(status_) \ + { \ + if ((status_) != MPI_STATUS_IGNORE) \ + { \ + (status_)->MPI_SOURCE = MPI_ANY_SOURCE; \ + (status_)->MPI_TAG = MPI_ANY_TAG; \ + MPIR_STATUS_SET_COUNT(*(status_), 0); \ + MPIR_STATUS_SET_CANCEL_BIT(*(status_), FALSE); \ + } \ + } +/* See MPI 1.1, section 3.11, Null Processes */ +/* Do not set MPI_ERROR (only set if ERR_IN_STATUS is returned */ +#define MPIR_Status_set_procnull(status_) \ + { \ + if ((status_) != MPI_STATUS_IGNORE) \ + { \ + (status_)->MPI_SOURCE = MPI_PROC_NULL; \ + (status_)->MPI_TAG = MPI_ANY_TAG; \ + MPIR_STATUS_SET_COUNT(*(status_), 0); \ + MPIR_STATUS_SET_CANCEL_BIT(*(status_), FALSE); \ + } \ + } + +#define MPIR_Request_extract_status(request_ptr_, status_) \ +{ \ + if ((status_) != MPI_STATUS_IGNORE) \ + { \ + int error__; \ + \ + /* According to the MPI 1.1 standard page 22 lines 9-12, the MPI_ERROR field may not be modified except by the \ + functions in section 3.7.5 which return MPI_ERR_IN_STATUSES (MPI_Wait{all,some} and MPI_Test{all,some}). */ \ + error__ = (status_)->MPI_ERROR; \ + *(status_) = (request_ptr_)->status; \ + (status_)->MPI_ERROR = error__; \ + } \ +} + #define MPIR_Request_is_complete(req_) (MPIR_cc_is_complete((req_)->cc_ptr)) /*S @@ -1563,12 +1647,148 @@ extern MPIU_Object_alloc_t MPIR_Request_mem; /* Preallocated request objects */ extern MPIR_Request MPIR_Request_direct[]; +/*@ + MPID_Request_init - Initialize device parts of request + + Return value: + None + @*/ +void MPID_Request_init(MPIR_Request *); + +/*@ + MPID_Request_finalize - Deallocate device parts of request + + Input Parameter: +. request - request to release + + Module: + Request +@*/ +void MPID_Request_finalize(MPIR_Request *); + +/*@ + MPID_Request_complete - Complete a request + + Input Parameter: +. request - request to complete + + Notes: + This routine is called to decrement the completion count of a + request object. If the completion count of the request object has + reached zero, the reference count for the object will be + decremented. + + Module: + Request +@*/ +int MPID_Request_complete(MPIR_Request *); + +static inline MPIR_Request *MPIR_Request_create(void) +{ + MPIR_Request *req; + + req = MPIU_Handle_obj_alloc(&MPIR_Request_mem); + if (req != NULL) { + MPL_DBG_MSG_P(MPIR_DBG_REQUEST,VERBOSE, + "allocated request, handle=0x%08x", req->handle); +#ifdef MPICH_DBG_OUTPUT + /*MPIU_Assert(HANDLE_GET_MPI_KIND(req->handle) == MPIR_REQUEST);*/ + if (HANDLE_GET_MPI_KIND(req->handle) != MPIR_REQUEST) + { + int mpi_errno; + mpi_errno = MPIR_Err_create_code(MPI_SUCCESS, MPIR_ERR_FATAL, + FCNAME, __LINE__, MPI_ERR_OTHER, + "**invalid_handle", "**invalid_handle %d", req->handle); + MPID_Abort(MPIR_Process.comm_world, mpi_errno, -1, NULL); + } +#endif + /* FIXME: This makes request creation expensive. We need to + * trim this to the basics, with additional setup for + * special-purpose requests (think base class and + * inheritance). For example, do we really* want to set the + * kind to UNDEFINED? And should the RMA values be set only + * for RMA requests? */ + MPIU_Object_set_ref(req, 1); + req->kind = MPIR_REQUEST_UNDEFINED; + MPIR_cc_set(&req->cc, 1); + req->cc_ptr = &req->cc; + + /* FIXME: status fields meaningful only for receive, and even + * then should not need to be set. */ + req->status.MPI_SOURCE = MPI_UNDEFINED; + req->status.MPI_TAG = MPI_UNDEFINED; + req->status.MPI_ERROR = MPI_SUCCESS; + MPIR_STATUS_SET_COUNT(req->status, 0); + MPIR_STATUS_SET_CANCEL_BIT(req->status, FALSE); + + req->comm = NULL; + req->greq_fns = NULL; + req->errflag = MPIR_ERR_NONE; + req->request_completed_cb = NULL; + + MPID_Request_init(req); + } + else + { + /* FIXME: This fails to fail if debugging is turned off */ + MPL_DBG_MSG(MPIR_DBG_REQUEST,TYPICAL,"unable to allocate a request"); + } + + return req; +} + #define MPIR_Request_add_ref( _req ) \ do { MPIU_Object_add_ref( _req ); } while (0) #define MPIR_Request_release_ref( _req, _inuse ) \ do { MPIU_Object_release_ref( _req, _inuse ); } while (0) +static inline void MPIR_Request_free(MPIR_Request *req) +{ + int inuse; + + MPIR_Request_release_ref(req, &inuse); + if (inuse == 0) { + MPL_DBG_MSG_P(MPIR_DBG_REQUEST,VERBOSE, + "freeing request, handle=0x%08x", req->handle); + +#ifdef MPICH_DBG_OUTPUT + if (HANDLE_GET_MPI_KIND(req->handle) != MPIR_REQUEST) + { + int mpi_errno = MPIR_Err_create_code(MPI_SUCCESS, MPIR_ERR_FATAL, + FCNAME, __LINE__, MPI_ERR_OTHER, + "**invalid_handle", "**invalid_handle %d", req->handle); + MPID_Abort(MPIR_Process.comm_world, mpi_errno, -1, NULL); + } + + if (req->ref_count != 0) + { + int mpi_errno = MPIR_Err_create_code(MPI_SUCCESS, MPIR_ERR_FATAL, + FCNAME, __LINE__, MPI_ERR_OTHER, + "**invalid_refcount", "**invalid_refcount %d", req->ref_count); + MPID_Abort(MPIR_Process.comm_world, mpi_errno, -1, NULL); + } +#endif + + /* FIXME: We need a better way to handle these so that we do + * not always need to initialize these fields and check them + * when we destroy a request */ + /* FIXME: We need a way to call these routines ONLY when the + * related ref count has become zero. */ + if (req->comm != NULL) { + MPIR_Comm_release(req->comm); + } + + if (req->greq_fns != NULL) { + MPL_free(req->greq_fns); + } + + MPID_Request_finalize(req); + + MPIU_Handle_obj_free(&MPIR_Request_mem, req); + } +} + /* These macros allow us to implement a sendq when debugger support is selected. As there is extra overhead for this, we only do this when specifically requested @@ -2111,19 +2331,6 @@ typedef struct MPICH_PerProcess_t { } MPICH_PerProcess_t; extern MPICH_PerProcess_t MPIR_Process; -#if defined (MPL_USE_DBG_LOGGING) -extern MPL_dbg_class MPIR_DBG_INIT; -extern MPL_dbg_class MPIR_DBG_PT2PT; -extern MPL_dbg_class MPIR_DBG_THREAD; -extern MPL_dbg_class MPIR_DBG_DATATYPE; -extern MPL_dbg_class MPIR_DBG_COMM; -extern MPL_dbg_class MPIR_DBG_BSEND; -extern MPL_dbg_class MPIR_DBG_ERRHAND; -extern MPL_dbg_class MPIR_DBG_OTHER; - -extern MPL_dbg_class MPIR_DBG_ASSERT; -#endif /* MPL_USE_DBG_LOGGING */ - /* ------------------------------------------------------------------------- */ /* In MPICH, each function has an "enter" and "exit" macro. These can be * used to add various features to each function at compile time, or they @@ -2215,76 +2422,6 @@ void MPIR_Err_print_stack(FILE *, int); /* ------------------------------------------------------------------------- */ -/* MPI_Status manipulation macros */ -#define MPIR_BITS_IN_INT (8 * SIZEOF_INT) - -/* We use bits from the "count_lo" and "count_hi_and_cancelled" fields - * to represent the 'count' and 'cancelled' objects. The LSB of the - * "count_hi_and_cancelled" field represents the 'cancelled' object. - * The 'count' object is split between the "count_lo" and - * "count_hi_and_cancelled" fields, with the lower order bits going - * into the "count_lo" field, and the higher order bits goin into the - * "count_hi_and_cancelled" field. This gives us 2N-1 bits for the - * 'count' object, where N is the size of int. However, the value - * returned to the user is bounded by the definition on MPI_Count. */ -/* NOTE: The below code assumes that the count value is never - * negative. For negative values, right-shifting can have weird - * implementation specific consequences. */ -#define MPIR_STATUS_SET_COUNT(status_, count_) \ - { \ - (status_).count_lo = ((int) count_); \ - (status_).count_hi_and_cancelled &= 1; \ - (status_).count_hi_and_cancelled |= (int) ((MPIR_Ucount) count_ >> MPIR_BITS_IN_INT << 1); \ - } - -#define MPIR_STATUS_GET_COUNT(status_) \ - ((MPI_Count) ((((MPIR_Ucount) (((unsigned int) (status_).count_hi_and_cancelled) >> 1)) << MPIR_BITS_IN_INT) + (unsigned int) (status_).count_lo)) - -#define MPIR_STATUS_SET_CANCEL_BIT(status_, cancelled_) \ - { \ - (status_).count_hi_and_cancelled &= ~1; \ - (status_).count_hi_and_cancelled |= cancelled_; \ - } - -#define MPIR_STATUS_GET_CANCEL_BIT(status_) ((status_).count_hi_and_cancelled & 1) - -/* Do not set MPI_ERROR (only set if ERR_IN_STATUS is returned */ -#define MPIR_Status_set_empty(status_) \ - { \ - if ((status_) != MPI_STATUS_IGNORE) \ - { \ - (status_)->MPI_SOURCE = MPI_ANY_SOURCE; \ - (status_)->MPI_TAG = MPI_ANY_TAG; \ - MPIR_STATUS_SET_COUNT(*(status_), 0); \ - MPIR_STATUS_SET_CANCEL_BIT(*(status_), FALSE); \ - } \ - } -/* See MPI 1.1, section 3.11, Null Processes */ -/* Do not set MPI_ERROR (only set if ERR_IN_STATUS is returned */ -#define MPIR_Status_set_procnull(status_) \ - { \ - if ((status_) != MPI_STATUS_IGNORE) \ - { \ - (status_)->MPI_SOURCE = MPI_PROC_NULL; \ - (status_)->MPI_TAG = MPI_ANY_TAG; \ - MPIR_STATUS_SET_COUNT(*(status_), 0); \ - MPIR_STATUS_SET_CANCEL_BIT(*(status_), FALSE); \ - } \ - } - -#define MPIR_Request_extract_status(request_ptr_, status_) \ -{ \ - if ((status_) != MPI_STATUS_IGNORE) \ - { \ - int error__; \ - \ - /* According to the MPI 1.1 standard page 22 lines 9-12, the MPI_ERROR field may not be modified except by the \ - functions in section 3.7.5 which return MPI_ERR_IN_STATUSES (MPI_Wait{all,some} and MPI_Test{all,some}). */ \ - error__ = (status_)->MPI_ERROR; \ - *(status_) = (request_ptr_)->status; \ - (status_)->MPI_ERROR = error__; \ - } \ -} /* ------------------------------------------------------------------------- */ /* FIXME: The bindings should be divided into three groups: @@ -3473,56 +3610,6 @@ int MPID_Progress_test(void); @*/ int MPID_Progress_poke(void); -/*@ - MPID_Request_create - Create and return a bare request - - Return value: - A pointer to a new request object. - - Notes: - This routine is intended for use by 'MPI_Grequest_start' only. Note that - once a request is created with this routine, any progress engine must assume - that an outside function can complete a request with - 'MPID_Request_complete'. - - The request object returned by this routine should be initialized such that - ref_count is one and handle contains a valid handle referring to the object. - @*/ -MPIR_Request * MPID_Request_create(void); - -/*@ - MPID_Request_release - Release a request - - Input Parameter: -. request - request to release - - Notes: - This routine is called to release a reference to request object. If - the reference count of the request object has reached zero, the object will - be deallocated. - - Module: - Request -@*/ -void MPID_Request_release(MPIR_Request *); - -/*@ - MPID_Request_complete - Complete a request - - Input Parameter: -. request - request to complete - - Notes: - This routine is called to decrement the completion count of a - request object. If the completion count of the request object has - reached zero, the reference count for the object will be - decremented. - - Module: - Request -@*/ -int MPID_Request_complete(MPIR_Request *); - typedef struct MPIR_Grequest_class { MPIU_OBJECT_HEADER; /* adds handle and ref_count fields */ MPI_Grequest_query_function *query_fn; diff --git a/src/mpi/coll/helper_fns.c b/src/mpi/coll/helper_fns.c index 1df8e15..148178c 100644 --- a/src/mpi/coll/helper_fns.c +++ b/src/mpi/coll/helper_fns.c @@ -301,7 +301,7 @@ int MPIC_Send(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, if (request_ptr) { mpi_errno = MPIC_Wait(request_ptr, errflag); if (mpi_errno) MPIR_ERR_POP(mpi_errno); - MPID_Request_release(request_ptr); + MPIR_Request_free(request_ptr); } fn_exit: @@ -310,7 +310,7 @@ int MPIC_Send(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, return mpi_errno; fn_fail: /* --BEGIN ERROR HANDLING-- */ - if (request_ptr) MPID_Request_release(request_ptr); + if (request_ptr) MPIR_Request_free(request_ptr); if (mpi_errno && !*errflag) { if (MPIX_ERR_PROC_FAILED == MPIR_ERR_GET_CLASS(mpi_errno)) { *errflag = MPIR_ERR_PROC_FAILED; @@ -358,7 +358,7 @@ int MPIC_Recv(void *buf, MPI_Aint count, MPI_Datatype datatype, int source, int *status = request_ptr->status; mpi_errno = status->MPI_ERROR; - MPID_Request_release(request_ptr); + MPIR_Request_free(request_ptr); } else { MPIR_Process_status(status, errflag); @@ -375,7 +375,7 @@ int MPIC_Recv(void *buf, MPI_Aint count, MPI_Datatype datatype, int source, int return mpi_errno; fn_fail: /* --BEGIN ERROR HANDLING-- */ - if (request_ptr) MPID_Request_release(request_ptr); + if (request_ptr) MPIR_Request_free(request_ptr); goto fn_exit; /* --END ERROR HANDLING-- */ } @@ -417,7 +417,7 @@ int MPIC_Ssend(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, if (request_ptr) { mpi_errno = MPIC_Wait(request_ptr, errflag); if (mpi_errno) MPIR_ERR_POP(mpi_errno); - MPID_Request_release(request_ptr); + MPIR_Request_free(request_ptr); } fn_exit: @@ -426,7 +426,7 @@ int MPIC_Ssend(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, return mpi_errno; fn_fail: /* --BEGIN ERROR HANDLING-- */ - if (request_ptr) MPID_Request_release(request_ptr); + if (request_ptr) MPIR_Request_free(request_ptr); if (mpi_errno && !*errflag) { if (MPIX_ERR_PROC_FAILED == MPIR_ERR_GET_CLASS(mpi_errno)) { *errflag = MPIR_ERR_PROC_FAILED; @@ -497,8 +497,8 @@ int MPIC_Sendrecv(const void *sendbuf, MPI_Aint sendcount, MPI_Datatype sendtype } } - MPID_Request_release(send_req_ptr); - MPID_Request_release(recv_req_ptr); + MPIR_Request_free(send_req_ptr); + MPIR_Request_free(recv_req_ptr); fn_exit: MPL_DBG_MSG_D(MPIR_DBG_PT2PT, TYPICAL, "OUT: errflag = %d", *errflag); @@ -507,9 +507,9 @@ int MPIC_Sendrecv(const void *sendbuf, MPI_Aint sendcount, MPI_Datatype sendtype return mpi_errno; fn_fail: if (send_req_ptr) - MPID_Request_release(send_req_ptr); + MPIR_Request_free(send_req_ptr); if (recv_req_ptr) - MPID_Request_release(recv_req_ptr); + MPIR_Request_free(recv_req_ptr); goto fn_exit; } @@ -578,7 +578,7 @@ int MPIC_Sendrecv_replace(void *buf, int count, MPI_Datatype datatype, /* --BEGIN ERROR HANDLING-- */ /* FIXME: should we cancel the pending (possibly completed) receive * request or wait for it to complete? */ - MPID_Request_release(rreq); + MPIR_Request_free(rreq); MPIR_ERR_POP(mpi_errno); /* --END ERROR HANDLING-- */ } @@ -598,8 +598,8 @@ int MPIC_Sendrecv_replace(void *buf, int count, MPI_Datatype datatype, } } - MPID_Request_release(sreq); - MPID_Request_release(rreq); + MPIR_Request_free(sreq); + MPIR_Request_free(rreq); fn_exit: MPIU_CHKLMEM_FREEALL(); @@ -608,9 +608,9 @@ int MPIC_Sendrecv_replace(void *buf, int count, MPI_Datatype datatype, return mpi_errno; fn_fail: if (sreq) - MPID_Request_release(sreq); + MPIR_Request_free(sreq); if (rreq) - MPID_Request_release(rreq); + MPIR_Request_free(rreq); goto fn_exit; } diff --git a/src/mpi/init/initthread.c b/src/mpi/init/initthread.c index 867c104..f2e522a 100644 --- a/src/mpi/init/initthread.c +++ b/src/mpi/init/initthread.c @@ -304,6 +304,7 @@ MPL_dbg_class MPIR_DBG_COMM; MPL_dbg_class MPIR_DBG_BSEND; MPL_dbg_class MPIR_DBG_ERRHAND; MPL_dbg_class MPIR_DBG_OTHER; +MPL_dbg_class MPIR_DBG_REQUEST; /* these classes might need to move out later */ MPL_dbg_class MPIR_DBG_ASSERT; @@ -560,6 +561,7 @@ int MPIR_Init_thread(int * argc, char ***argv, int required, int * provided) MPIR_DBG_BSEND = MPL_dbg_class_alloc("BSEND", "bsend"); MPIR_DBG_ERRHAND = MPL_dbg_class_alloc("ERRHAND", "errhand"); MPIR_DBG_OTHER = MPL_dbg_class_alloc("OTHER", "other"); + MPIR_DBG_REQUEST = MPL_dbg_class_alloc("REQUEST", "request"); MPIR_DBG_ASSERT = MPL_dbg_class_alloc("ASSERT", "assert"); MPIR_DBG_STRING = MPL_dbg_class_alloc("STRING", "string"); diff --git a/src/mpi/pt2pt/greq_complete.c b/src/mpi/pt2pt/greq_complete.c index 7ab42ee..419b2c0 100644 --- a/src/mpi/pt2pt/greq_complete.c +++ b/src/mpi/pt2pt/greq_complete.c @@ -40,7 +40,7 @@ void MPIR_Grequest_complete_impl(MPIR_Request *request_ptr) MPID_Request_complete( request_ptr ); /* The request release comes with the wait/test, not this complete - routine, so we don't call the MPID_Request_release routine */ + routine, so we don't call the MPIR_Request_free routine */ } #endif diff --git a/src/mpi/pt2pt/greq_start.c b/src/mpi/pt2pt/greq_start.c index 39faae4..bd91733 100644 --- a/src/mpi/pt2pt/greq_start.c +++ b/src/mpi/pt2pt/greq_start.c @@ -84,7 +84,7 @@ int MPIR_Grequest_start_impl(MPI_Grequest_query_function *query_fn, /* MT FIXME this routine is not thread-safe in the non-global case */ - *request_ptr = MPID_Request_create(); + *request_ptr = MPIR_Request_create(); MPIR_ERR_CHKANDJUMP1(request_ptr == NULL, mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", "generalized request"); (*request_ptr)->kind = MPIR_UREQUEST; diff --git a/src/mpi/pt2pt/mpir_request.c b/src/mpi/pt2pt/mpir_request.c index 97f066a..ab4ad49 100644 --- a/src/mpi/pt2pt/mpir_request.c +++ b/src/mpi/pt2pt/mpir_request.c @@ -81,7 +81,7 @@ int MPIR_Request_complete(MPI_Request * request, MPIR_Request * request_ptr, } mpi_errno = request_ptr->status.MPI_ERROR; MPIR_SENDQ_FORGET(request_ptr); - MPID_Request_release(request_ptr); + MPIR_Request_free(request_ptr); if (NULL != request) *request = MPI_REQUEST_NULL; break; } @@ -89,7 +89,7 @@ int MPIR_Request_complete(MPI_Request * request, MPIR_Request * request_ptr, { MPIR_Request_extract_status(request_ptr, status); mpi_errno = request_ptr->status.MPI_ERROR; - MPID_Request_release(request_ptr); + MPIR_Request_free(request_ptr); if (NULL != request) *request = MPI_REQUEST_NULL; break; } @@ -138,7 +138,7 @@ int MPIR_Request_complete(MPI_Request * request, MPIR_Request * request_ptr, } } - MPID_Request_release(prequest_ptr); + MPIR_Request_free(prequest_ptr); } else { @@ -176,7 +176,7 @@ int MPIR_Request_complete(MPI_Request * request, MPIR_Request * request_ptr, MPIR_Request_extract_status(prequest_ptr, status); mpi_errno = prequest_ptr->status.MPI_ERROR; - MPID_Request_release(prequest_ptr); + MPIR_Request_free(prequest_ptr); } else { @@ -214,7 +214,7 @@ int MPIR_Request_complete(MPI_Request * request, MPIR_Request * request_ptr, mpi_errno = rc; } - MPID_Request_release(request_ptr); + MPIR_Request_free(request_ptr); if (NULL != request) *request = MPI_REQUEST_NULL; break; @@ -225,7 +225,7 @@ int MPIR_Request_complete(MPI_Request * request, MPIR_Request * request_ptr, { mpi_errno = request_ptr->status.MPI_ERROR; MPIR_Request_extract_status(request_ptr, status); - MPID_Request_release(request_ptr); + MPIR_Request_free(request_ptr); if (NULL != request) *request = MPI_REQUEST_NULL; break; } diff --git a/src/mpi/pt2pt/recv.c b/src/mpi/pt2pt/recv.c index 132db58..3c4bbde 100644 --- a/src/mpi/pt2pt/recv.c +++ b/src/mpi/pt2pt/recv.c @@ -181,7 +181,7 @@ int MPI_Recv(void *buf, int count, MPI_Datatype datatype, int source, int tag, mpi_errno = request_ptr->status.MPI_ERROR; MPIR_Request_extract_status(request_ptr, status); - MPID_Request_release(request_ptr); + MPIR_Request_free(request_ptr); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/pt2pt/request_free.c b/src/mpi/pt2pt/request_free.c index 8f91575..db8249f 100644 --- a/src/mpi/pt2pt/request_free.c +++ b/src/mpi/pt2pt/request_free.c @@ -131,7 +131,7 @@ int MPI_Request_free(MPI_Request *request) mpi_errno = MPIR_Grequest_free( request_ptr->partner_request); } - MPID_Request_release(request_ptr->partner_request); + MPIR_Request_free(request_ptr->partner_request); } break; } @@ -143,7 +143,7 @@ int MPI_Request_free(MPI_Request *request) release the partner request. */ if (request_ptr->partner_request != NULL) { - MPID_Request_release(request_ptr->partner_request); + MPIR_Request_free(request_ptr->partner_request); } break; } @@ -165,7 +165,7 @@ int MPI_Request_free(MPI_Request *request) /* --END ERROR HANDLING-- */ } - MPID_Request_release(request_ptr); + MPIR_Request_free(request_ptr); *request = MPI_REQUEST_NULL; if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/pt2pt/rsend.c b/src/mpi/pt2pt/rsend.c index 8c697c1..d958ae9 100644 --- a/src/mpi/pt2pt/rsend.c +++ b/src/mpi/pt2pt/rsend.c @@ -150,7 +150,7 @@ int MPI_Rsend(const void *buf, int count, MPI_Datatype datatype, int dest, int t } mpi_errno = request_ptr->status.MPI_ERROR; - MPID_Request_release(request_ptr); + MPIR_Request_free(request_ptr); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/pt2pt/send.c b/src/mpi/pt2pt/send.c index 537a9f5..edb2a81 100644 --- a/src/mpi/pt2pt/send.c +++ b/src/mpi/pt2pt/send.c @@ -155,7 +155,7 @@ int MPI_Send(const void *buf, int count, MPI_Datatype datatype, int dest, int ta } mpi_errno = request_ptr->status.MPI_ERROR; - MPID_Request_release(request_ptr); + MPIR_Request_free(request_ptr); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/pt2pt/sendrecv.c b/src/mpi/pt2pt/sendrecv.c index 4f34c55..bfa03df 100644 --- a/src/mpi/pt2pt/sendrecv.c +++ b/src/mpi/pt2pt/sendrecv.c @@ -169,7 +169,7 @@ int MPI_Sendrecv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, { /* --BEGIN ERROR HANDLING-- */ /* FIXME: should we cancel the pending (possibly completed) receive request or wait for it to complete? */ - MPID_Request_release(rreq); + MPIR_Request_free(rreq); goto fn_fail; /* --END ERROR HANDLING-- */ } @@ -212,13 +212,13 @@ int MPI_Sendrecv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, mpi_errno = rreq->status.MPI_ERROR; MPIR_Request_extract_status(rreq, status); - MPID_Request_release(rreq); + MPIR_Request_free(rreq); if (mpi_errno == MPI_SUCCESS) { mpi_errno = sreq->status.MPI_ERROR; } - MPID_Request_release(sreq); + MPIR_Request_free(sreq); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/pt2pt/sendrecv_rep.c b/src/mpi/pt2pt/sendrecv_rep.c index 0092f62..e9d2f11 100644 --- a/src/mpi/pt2pt/sendrecv_rep.c +++ b/src/mpi/pt2pt/sendrecv_rep.c @@ -168,7 +168,7 @@ int MPI_Sendrecv_replace(void *buf, int count, MPI_Datatype datatype, { /* --BEGIN ERROR HANDLING-- */ /* FIXME: should we cancel the pending (possibly completed) receive request or wait for it to complete? */ - MPID_Request_release(rreq); + MPIR_Request_free(rreq); goto fn_fail; /* --END ERROR HANDLING-- */ } @@ -208,8 +208,8 @@ int MPI_Sendrecv_replace(void *buf, int count, MPI_Datatype datatype, } } - MPID_Request_release(sreq); - MPID_Request_release(rreq); + MPIR_Request_free(sreq); + MPIR_Request_free(rreq); } # endif diff --git a/src/mpi/pt2pt/ssend.c b/src/mpi/pt2pt/ssend.c index 80ed009..38880a2 100644 --- a/src/mpi/pt2pt/ssend.c +++ b/src/mpi/pt2pt/ssend.c @@ -133,7 +133,7 @@ int MPI_Ssend(const void *buf, int count, MPI_Datatype datatype, int dest, int t if (mpi_errno) MPIR_ERR_POP(mpi_errno); mpi_errno = request_ptr->status.MPI_ERROR; - MPID_Request_release(request_ptr); + MPIR_Request_free(request_ptr); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/pt2pt/waitall.c b/src/mpi/pt2pt/waitall.c index 273753c..5d9546e 100644 --- a/src/mpi/pt2pt/waitall.c +++ b/src/mpi/pt2pt/waitall.c @@ -56,7 +56,7 @@ static inline int request_complete_fastpath(MPI_Request *request, MPIR_Request * /* the completion path for SEND and RECV is the same at this time, modulo * the SENDQ hook above */ mpi_errno = request_ptr->status.MPI_ERROR; - MPID_Request_release(request_ptr); + MPIR_Request_free(request_ptr); *request = MPI_REQUEST_NULL; /* avoid normal fn_exit/fn_fail jump pattern to reduce jumps and compiler confusion */ diff --git a/src/mpid/ch3/channels/nemesis/include/mpid_nem_impl.h b/src/mpid/ch3/channels/nemesis/include/mpid_nem_impl.h index 24d0f7d..12601ab 100644 --- a/src/mpid/ch3/channels/nemesis/include/mpid_nem_impl.h +++ b/src/mpid/ch3/channels/nemesis/include/mpid_nem_impl.h @@ -159,8 +159,8 @@ typedef union MPIDI_CH3_nem_pkt if (NULL != _rts_req) { \ /* error case: drop both the ch3 and nemesis \ * references, so the request can be cleanly freed */ \ - MPID_Request_release(_rts_req); \ - MPID_Request_release(_rts_req); \ + MPIR_Request_free(_rts_req); \ + MPIR_Request_free(_rts_req); \ } \ MPIR_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**rtspkt"); \ } \ @@ -172,11 +172,11 @@ typedef union MPIDI_CH3_nem_pkt mpi_errno = _rts_req->status.MPI_ERROR; \ /* error case: drop both the ch3 and nemesis \ * references, so the request can be cleanly freed */ \ - MPID_Request_release(_rts_req); \ - MPID_Request_release(_rts_req); \ + MPIR_Request_free(_rts_req); \ + MPIR_Request_free(_rts_req); \ MPIR_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**rtspkt"); \ } \ - MPID_Request_release(_rts_req); \ + MPIR_Request_free(_rts_req); \ } \ } while (0) @@ -202,7 +202,7 @@ typedef union MPIDI_CH3_nem_pkt if (_cts_req != NULL) \ { \ MPIR_ERR_CHKANDJUMP(_cts_req->status.MPI_ERROR, mpi_errno, MPI_ERR_OTHER, "**ctspkt"); \ - MPID_Request_release(_cts_req); \ + MPIR_Request_free(_cts_req); \ } \ } while (0) @@ -253,7 +253,7 @@ static inline int MPID_nem_lmt_send_COOKIE(MPIDI_VC_t *vc, MPIR_Request *req, if (cookie_req != NULL) { MPIR_ERR_CHKANDJUMP(cookie_req->status.MPI_ERROR, mpi_errno, MPI_ERR_OTHER, "**cookiepkt"); - MPID_Request_release(cookie_req); + MPIR_Request_free(cookie_req); } fn_fail: @@ -273,7 +273,7 @@ fn_fail: if (_done_req != NULL) \ { \ MPIR_ERR_CHKANDJUMP(_done_req->status.MPI_ERROR, mpi_errno, MPI_ERR_OTHER, "**donepkt"); \ - MPID_Request_release(_done_req); \ + MPIR_Request_free(_done_req); \ } \ } while (0) diff --git a/src/mpid/ch3/channels/nemesis/include/mpidi_ch3_impl.h b/src/mpid/ch3/channels/nemesis/include/mpidi_ch3_impl.h index 54fd0ab..92b27af 100644 --- a/src/mpid/ch3/channels/nemesis/include/mpidi_ch3_impl.h +++ b/src/mpid/ch3/channels/nemesis/include/mpidi_ch3_impl.h @@ -40,7 +40,7 @@ extern struct MPIR_Request *MPIDI_CH3I_shm_active_send; MPL_DBG_MSG_FMT(MPIDI_CH3_DBG_CHANNEL, VERBOSE, (MPL_DBG_FDEST, \ "MPIDI_CH3I_Sendq_dequeuereq=%p (handle=%#x), queue=%p", \ *(ep), *(ep) ? (*(ep))->handle : -1, qp)); \ - MPID_Request_release(*(ep)); \ + MPIR_Request_free(*(ep)); \ } while (0) #define MPIDI_CH3I_Sendq_enqueue_multiple_no_refcount(qp, ep0, ep1) \ /* used to move reqs from one queue to another, so we don't update */ \ diff --git a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_poll.c b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_poll.c index d6015f9..ef38a63 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_poll.c +++ b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_poll.c @@ -96,7 +96,7 @@ static void MPID_nem_llc_send_handler(void *cba, uint64_t * p_reqid) * control message send follows * MPIDI_CH3_iStartMsg/v-->MPID_nem_llc_iStartContigMsg-->MPID_nem_llc_iSendContig * and MPID_nem_llc_iSendContig set req->dev.state to zero - * because MPID_Request_create (in src/mpid/ch3/src/ch3u_request.c) + * because MPIR_Request_create * sets it to zero. In addition, eager-short message has req->comm of zero. */ #ifndef notdef_leak_0001_hack /* See also MPIDI_CH3_Request_create and _destory() */ diff --git a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_probe.c b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_probe.c index 0e84902..70b47d3 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_probe.c +++ b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_probe.c @@ -157,7 +157,7 @@ int MPID_nem_llc_improbe(MPIDI_VC_t * vc, int source, int tag, MPIR_Comm * comm, *flag = 1; - req = MPID_Request_create(); + req = MPIR_Request_create(); MPIU_Object_set_ref(req, 2); req->kind = MPIR_REQUEST_MPROBE; req->comm = comm; diff --git a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_send.c b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_send.c index 37ebaa5..389b3f0 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_send.c +++ b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_send.c @@ -43,7 +43,7 @@ int MPID_nem_llc_isend(struct MPIDI_VC *vc, const void *buf, int count, MPI_Data LLC_comm_rank(LLC_COMM_MPICH, &LLC_my_rank); dprintf("llc_isend,LLC_my_rank=%d\n", LLC_my_rank); - struct MPIR_Request *sreq = MPID_Request_create(); + struct MPIR_Request *sreq = MPIR_Request_create(); MPIU_Assert(sreq != NULL); MPIU_Object_set_ref(sreq, 2); sreq->kind = MPIR_REQUEST_SEND; @@ -186,7 +186,7 @@ int MPID_nem_llc_iStartContigMsg(MPIDI_VC_t * vc, void *hdr, intptr_t hdr_sz, vo MPL_DBG_MSG_D(MPIDI_CH3_DBG_CHANNEL, VERBOSE, "hdr type = %d", ((MPIDI_CH3_Pkt_t *) hdr)->type); /* create a request */ - sreq = MPID_Request_create(); + sreq = MPIR_Request_create(); MPIU_Assert(sreq != NULL); MPIU_Object_set_ref(sreq, 2); sreq->kind = MPIR_REQUEST_SEND; @@ -976,7 +976,7 @@ int MPID_nem_llc_issend(struct MPIDI_VC *vc, const void *buf, int count, MPI_Dat LLC_comm_rank(LLC_COMM_MPICH, &LLC_my_rank); dprintf("llc_isend,LLC_my_rank=%d\n", LLC_my_rank); - struct MPIR_Request *sreq = MPID_Request_create(); + struct MPIR_Request *sreq = MPIR_Request_create(); MPIU_Assert(sreq != NULL); MPIU_Object_set_ref(sreq, 2); sreq->kind = MPIR_REQUEST_SEND; diff --git a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_impl.h b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_impl.h index 661904b..f577c68 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_impl.h +++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_impl.h @@ -200,7 +200,7 @@ typedef GENERIC_Q_DECL(struct MPIR_Request) MPID_nem_mxm_reqq_t; MPL_DBG_MSG_FMT(MPIDI_CH3_DBG_CHANNEL, VERBOSE, (MPL_DBG_FDEST, \ "MPID_nem_mxm_queue_dequeuereq=%p (handle=%#x), queue=%p", \ *(ep), *(ep) ? (*(ep))->handle : -1, qp)); \ - MPID_Request_release(*(ep)); \ + MPIR_Request_free(*(ep)); \ } while (0) typedef struct MPID_nem_mxm_module_t { diff --git a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_probe.c b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_probe.c index 020ca84..437ac38 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_probe.c +++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_probe.c @@ -135,7 +135,7 @@ int MPID_nem_mxm_improbe(MPIDI_VC_t * vc, int source, int tag, MPIR_Comm * comm, *flag = 1; - req = MPID_Request_create(); + req = MPIR_Request_create(); MPIU_Object_set_ref(req, 2); req->kind = MPIR_REQUEST_MPROBE; req->comm = comm; diff --git a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c index 49c489c..8546b53 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c +++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c @@ -113,7 +113,7 @@ int MPID_nem_mxm_iStartContigMsg(MPIDI_VC_t * vc, void *hdr, intptr_t hdr_sz, vo MPIDI_DBG_Print_packet((MPIDI_CH3_Pkt_t *) hdr); /* create a request */ - sreq = MPID_Request_create(); + sreq = MPIR_Request_create(); MPIU_Assert(sreq != NULL); MPIU_Object_set_ref(sreq, 2); MPIU_Memcpy(&(sreq->dev.pending_pkt), (char *) hdr, sizeof(MPIDI_CH3_Pkt_t)); diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h index 6c389f6..5b052e9 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h @@ -249,7 +249,7 @@ static inline int MPID_nem_ofi_create_req(MPIR_Request ** request, int refcnt) { int mpi_errno = MPI_SUCCESS; MPIR_Request *req; - req = MPID_Request_create(); + req = MPIR_Request_create(); MPIU_Assert(req); MPIDI_Request_clear_dbg(req); MPIU_Object_set_ref(req, refcnt); diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_probe_template.c b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_probe_template.c index 5f46527..aac2e5b 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_probe_template.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_probe_template.c @@ -99,7 +99,7 @@ int ADD_SUFFIX(MPID_nem_ofi_iprobe_impl)(struct MPIDI_VC *vc, ret = fi_trecvmsg(gl_data.endpoint,&msg,msgflags); if(ret == -ENOMSG) { if (rreq_ptr) { - MPID_Request_release(rreq); + MPIR_Request_free(rreq); *rreq_ptr = NULL; *flag = 0; } @@ -115,7 +115,7 @@ int ADD_SUFFIX(MPID_nem_ofi_iprobe_impl)(struct MPIDI_VC *vc, if (PEEK_NOT_FOUND == REQ_OFI(rreq)->match_state) { if (rreq_ptr) { - MPID_Request_release(rreq); + MPIR_Request_free(rreq); *rreq_ptr = NULL; *flag = 0; } diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h index 8f0d725..043d6ea 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h @@ -68,7 +68,7 @@ static inline MPID_nem_ptl_req_area * REQ_PTL(MPIR_Request *req) { } while (0) #define MPID_nem_ptl_request_create_sreq(sreq_, errno_, comm_) do { \ - (sreq_) = MPID_Request_create(); \ + (sreq_) = MPIR_Request_create(); \ MPIU_Object_set_ref((sreq_), 2); \ (sreq_)->kind = MPIR_REQUEST_SEND; \ MPIR_Comm_add_ref(comm_); \ diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c index 2b59c89..44b651a 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c @@ -54,7 +54,7 @@ static inline int handle_request(MPIR_Request *req) incr_expected_recv_ptr(REQ_PTL(req)->bytes_put); /* Free resources */ MPL_free(TMPBUF(req)); - MPID_Request_release(req); + MPIR_Request_free(req); return mpi_errno; } @@ -365,7 +365,7 @@ int MPID_nem_ptl_iStartContigMsg(MPIDI_VC_t *vc, void *hdr, intptr_t hdr_sz, voi MPIU_Assert(hdr_sz <= sizeof(MPIDI_CH3_Pkt_t)); /* create a request */ - *sreq_ptr = MPID_Request_create(); + *sreq_ptr = MPIR_Request_create(); MPIU_Assert(*sreq_ptr != NULL); MPIU_Object_set_ref(*sreq_ptr, 2); (*sreq_ptr)->kind = MPIR_REQUEST_SEND; @@ -484,7 +484,7 @@ int MPID_nem_ptl_nm_ctl_event_handler(const ptl_event_t *e) MPIR_ERR_POP(mpi_errno); } else { - MPIR_Request *req = MPID_Request_create(); + MPIR_Request *req = MPIR_Request_create(); /* This request is actually complete; just needs to wait to enforce ordering */ TMPBUF(req) = MPL_malloc(packet_sz); MPIU_Assert(TMPBUF(req)); @@ -501,7 +501,7 @@ int MPID_nem_ptl_nm_ctl_event_handler(const ptl_event_t *e) char *buf_ptr; ptl_size_t target_offset; - MPIR_Request *req = MPID_Request_create(); + MPIR_Request *req = MPIR_Request_create(); MPIU_Assert(req != NULL); MPIDI_CH3U_Request_decrement_cc(req, &incomplete); /* We'll increment it below */ REQ_PTL(req)->event_handler = MPID_nem_ptl_nm_ctl_event_handler; diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_probe.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_probe.c index 8c3d342..da36d85 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_probe.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_probe.c @@ -127,8 +127,8 @@ int MPID_nem_ptl_iprobe(MPIDI_VC_t *vc, int source, int tag, MPIR_Comm *comm, in id_any.phys.pid = PTL_PID_ANY; /* create a request */ - req = MPID_Request_create(); - MPIR_ERR_CHKANDJUMP1(!req, mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", "MPID_Request_create"); + req = MPIR_Request_create(); + MPIR_ERR_CHKANDJUMP1(!req, mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", "MPIR_Request_create"); MPIU_Object_set_ref(req, 2); /* 1 ref for progress engine and 1 ref for us */ REQ_PTL(req)->event_handler = handle_probe; @@ -171,7 +171,7 @@ int MPID_nem_ptl_iprobe(MPIDI_VC_t *vc, int source, int tag, MPIR_Comm *comm, in if (status != MPI_STATUS_IGNORE) *status = req->status; - MPID_Request_release(req); + MPIR_Request_free(req); fn_exit: MPIDI_FUNC_EXIT(MPID_STATE_MPID_NEM_PTL_IPROBE); @@ -202,9 +202,9 @@ int MPID_nem_ptl_improbe(MPIDI_VC_t *vc, int source, int tag, MPIR_Comm *comm, i id_any.phys.pid = PTL_PID_ANY; /* create a request */ - req = MPID_Request_create(); + req = MPIR_Request_create(); MPID_nem_ptl_init_req(req); - MPIR_ERR_CHKANDJUMP1(!req, mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", "MPID_Request_create"); + MPIR_ERR_CHKANDJUMP1(!req, mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", "MPIR_Request_create"); MPIU_Object_set_ref(req, 2); /* 1 ref for progress engine and 1 ref for us */ REQ_PTL(req)->event_handler = handle_mprobe; req->kind = MPIR_REQUEST_MPROBE; @@ -251,7 +251,7 @@ int MPID_nem_ptl_improbe(MPIDI_VC_t *vc, int source, int tag, MPIR_Comm *comm, i *message = req; } else { - MPID_Request_release(req); + MPIR_Request_free(req); } fn_exit: @@ -323,9 +323,9 @@ int MPID_nem_ptl_pkt_cancel_send_req_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pk /* create a dummy request and search for the message */ /* create a request */ - search_req = MPID_Request_create(); + search_req = MPIR_Request_create(); MPID_nem_ptl_init_req(search_req); - MPIR_ERR_CHKANDJUMP1(!search_req, mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", "MPID_Request_create"); + MPIR_ERR_CHKANDJUMP1(!search_req, mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", "MPIR_Request_create"); MPIU_Object_set_ref(search_req, 2); /* 1 ref for progress engine and 1 ref for us */ search_req->kind = MPIR_REQUEST_MPROBE; @@ -368,9 +368,9 @@ int MPID_nem_ptl_pkt_cancel_send_req_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pk if (REQ_PTL(search_req)->found) MPL_free(search_req->dev.tmpbuf); - MPID_Request_release(search_req); + MPIR_Request_free(search_req); if (resp_req != NULL) - MPID_Request_release(resp_req); + MPIR_Request_free(resp_req); fn_exit: return mpi_errno; diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c index c7da822..35a9358 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c @@ -324,7 +324,7 @@ static int send_msg(ptl_hdr_data_t ssend_flag, struct MPIDI_VC *vc, const void * return mpi_errno; fn_fail: if (sreq) { - MPID_Request_release(sreq); + MPIR_Request_free(sreq); sreq = NULL; } MPIU_CHKPMEM_REAP(); @@ -405,7 +405,7 @@ int MPID_nem_ptl_cancel_send(struct MPIDI_VC *vc, struct MPIR_Request *sreq) 0, &csr_sreq); if (csr_sreq != NULL) - MPID_Request_release(csr_sreq); + MPIR_Request_free(csr_sreq); fn_exit: MPIDI_FUNC_EXIT(MPID_STATE_MPID_NEM_PTL_CANCEL_SEND); diff --git a/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_ckpt.c b/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_ckpt.c index 1bded15..7f91c72 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_ckpt.c +++ b/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_ckpt.c @@ -88,7 +88,7 @@ int MPID_nem_tcp_ckpt_continue_vc(MPIDI_VC_t *vc) if (mpi_errno) MPIR_ERR_POP(mpi_errno); if (unpause_req) { if (unpause_req->status.MPI_ERROR) MPIR_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**fail"); - MPID_Request_release(unpause_req); + MPIR_Request_free(unpause_req); if (mpi_errno) goto fn_fail; } @@ -125,10 +125,10 @@ int MPID_nem_tcp_ckpt_restart_vc(MPIDI_VC_t *vc) if (sreq != NULL) { if (sreq->status.MPI_ERROR != MPI_SUCCESS) { mpi_errno = sreq->status.MPI_ERROR; - MPID_Request_release(sreq); + MPIR_Request_free(sreq); MPIR_ERR_INTERNALANDJUMP(mpi_errno, "Failed to send checkpoint unpause pkt."); } - MPID_Request_release(sreq); + MPIR_Request_free(sreq); } fn_exit: diff --git a/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_send.c b/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_send.c index 417fbd1..3ed5558 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_send.c +++ b/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_send.c @@ -306,7 +306,7 @@ int MPID_nem_tcp_iStartContigMsg(MPIDI_VC_t *vc, void *hdr, intptr_t hdr_sz, voi MPL_DBG_MSG (MPIDI_CH3_DBG_CHANNEL, VERBOSE, "enqueuing"); /* create a request */ - sreq = MPID_Request_create(); + sreq = MPIR_Request_create(); MPIU_Assert (sreq != NULL); MPIU_Object_set_ref (sreq, 2); sreq->kind = MPIR_REQUEST_SEND; @@ -445,7 +445,7 @@ int MPID_nem_tcp_iStartContigMsg_paused(MPIDI_VC_t *vc, void *hdr, intptr_t hdr_ MPL_DBG_MSG (MPIDI_CH3_DBG_CHANNEL, VERBOSE, "enqueuing"); /* create a request */ - sreq = MPID_Request_create(); + sreq = MPIR_Request_create(); MPIU_Assert (sreq != NULL); MPIU_Object_set_ref (sreq, 2); sreq->kind = MPIR_REQUEST_SEND; @@ -854,7 +854,7 @@ fn_exit: MPIDI_FUNC_EXIT(MPID_STATE_MPID_NEM_TCP_SENDNONCONTIG); return mpi_errno; fn_fail: - MPID_Request_release(sreq); + MPIR_Request_free(sreq); goto fn_exit; } diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_istartmsg.c b/src/mpid/ch3/channels/nemesis/src/ch3_istartmsg.c index cb226e3..56dfb65 100644 --- a/src/mpid/ch3/channels/nemesis/src/ch3_istartmsg.c +++ b/src/mpid/ch3/channels/nemesis/src/ch3_istartmsg.c @@ -89,7 +89,7 @@ int MPIDI_CH3_iStartMsg (MPIDI_VC_t *vc, void *hdr, intptr_t hdr_sz, MPIR_Reques MPL_DBG_MSG(MPIDI_CH3_DBG_OTHER, TERSE, "enqueuing"); /* create a request */ - sreq = MPID_Request_create(); + sreq = MPIR_Request_create(); MPIU_Assert (sreq != NULL); MPIU_Object_set_ref (sreq, 2); sreq->kind = MPIR_REQUEST_SEND; diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_istartmsgv.c b/src/mpid/ch3/channels/nemesis/src/ch3_istartmsgv.c index 2732eea..46128f0 100644 --- a/src/mpid/ch3/channels/nemesis/src/ch3_istartmsgv.c +++ b/src/mpid/ch3/channels/nemesis/src/ch3_istartmsgv.c @@ -117,7 +117,7 @@ int MPIDI_CH3_iStartMsgv (MPIDI_VC_t *vc, MPL_IOV *iov, int n_iov, MPIR_Request { /* Create a new request and save remaining portions of the * iov in it. */ - sreq = MPID_Request_create(); + sreq = MPIR_Request_create(); MPIU_Assert(sreq != NULL); MPIU_Object_set_ref(sreq, 2); sreq->kind = MPIR_REQUEST_SEND; @@ -148,7 +148,7 @@ int MPIDI_CH3_iStartMsgv (MPIDI_VC_t *vc, MPL_IOV *iov, int n_iov, MPIR_Request MPL_DBG_MSG(MPIDI_CH3_DBG_OTHER, TERSE, "request enqueued"); /* create a request */ - sreq = MPID_Request_create(); + sreq = MPIR_Request_create(); MPIU_Assert(sreq != NULL); MPIU_Object_set_ref(sreq, 2); sreq->kind = MPIR_REQUEST_SEND; diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_progress.c b/src/mpid/ch3/channels/nemesis/src/ch3_progress.c index d3b7a8f..f38211b 100644 --- a/src/mpid/ch3/channels/nemesis/src/ch3_progress.c +++ b/src/mpid/ch3/channels/nemesis/src/ch3_progress.c @@ -119,7 +119,7 @@ static int check_terminating_vcs(void) while (!TERMQ_EMPTY() && MPIR_Request_is_complete(TERMQ_HEAD()->req)) { vc_term_element_t *ep; TERMQ_DEQUEUE(&ep); - MPID_Request_release(ep->req); + MPIR_Request_free(ep->req); mpi_errno = shm_connection_terminated(ep->vc); if (mpi_errno) MPIR_ERR_POP(mpi_errno); MPL_free(ep); @@ -1166,7 +1166,7 @@ int MPIDI_CH3I_Complete_sendq_with_error(MPIDI_VC_t * vc) req->status.MPI_ERROR = MPI_SUCCESS; MPIR_ERR_SET1(req->status.MPI_ERROR, MPIX_ERR_PROC_FAILED, "**comm_fail", "**comm_fail %d", vc->pg_rank); - MPID_Request_release(req); /* ref count was incremented when added to queue */ + MPIR_Request_free(req); /* ref count was incremented when added to queue */ mpi_errno = MPID_Request_complete(req); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); diff --git a/src/mpid/ch3/channels/nemesis/src/mpid_nem_ckpt.c b/src/mpid/ch3/channels/nemesis/src/mpid_nem_ckpt.c index 3b9ac78..6ab78a0 100644 --- a/src/mpid/ch3/channels/nemesis/src/mpid_nem_ckpt.c +++ b/src/mpid/ch3/channels/nemesis/src/mpid_nem_ckpt.c @@ -445,7 +445,7 @@ int MPIDI_nem_ckpt_start(void) if (req != NULL) { MPIR_ERR_CHKANDJUMP(req->status.MPI_ERROR, mpi_errno, MPI_ERR_OTHER, "**ckptpkt"); - MPID_Request_release(req); + MPIR_Request_free(req); } if (!vc_ch->is_local) { diff --git a/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt.c b/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt.c index f0b016a..da5c49c 100644 --- a/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt.c +++ b/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt.c @@ -339,7 +339,7 @@ static int pkt_CTS_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, intptr_t *bufle the RTS request object. */ MPIDI_Request_fetch_and_clear_rts_sreq(sreq, &rts_sreq); if (rts_sreq != NULL) - MPID_Request_release(rts_sreq); + MPIR_Request_free(rts_sreq); if (cts_pkt->cookie_len != 0) { diff --git a/src/mpid/ch3/channels/nemesis/src/mpid_nem_mpich.c b/src/mpid/ch3/channels/nemesis/src/mpid_nem_mpich.c index dafd598..32dd078 100644 --- a/src/mpid/ch3/channels/nemesis/src/mpid_nem_mpich.c +++ b/src/mpid/ch3/channels/nemesis/src/mpid_nem_mpich.c @@ -96,7 +96,7 @@ int MPID_nem_send_iov(MPIDI_VC_t *vc, MPIR_Request **sreq_ptr, MPL_IOV *iov, int if (*sreq_ptr == NULL) { /* create a request */ - sreq = MPID_Request_create(); + sreq = MPIR_Request_create(); MPIU_Assert(sreq != NULL); MPIU_Object_set_ref(sreq, 2); sreq->kind = MPIR_REQUEST_SEND; diff --git a/src/mpid/ch3/channels/sock/include/mpidi_ch3_impl.h b/src/mpid/ch3/channels/sock/include/mpidi_ch3_impl.h index 884b799..f7f6cd4 100644 --- a/src/mpid/ch3/channels/sock/include/mpidi_ch3_impl.h +++ b/src/mpid/ch3/channels/sock/include/mpidi_ch3_impl.h @@ -57,7 +57,7 @@ { \ vcch->sendq_tail = NULL; \ } \ - MPID_Request_release(req_); \ + MPIR_Request_free(req_); \ } diff --git a/src/mpid/ch3/channels/sock/src/ch3_istartmsg.c b/src/mpid/ch3/channels/sock/src/ch3_istartmsg.c index 882d4cf..5027519 100644 --- a/src/mpid/ch3/channels/sock/src/ch3_istartmsg.c +++ b/src/mpid/ch3/channels/sock/src/ch3_istartmsg.c @@ -18,7 +18,7 @@ static MPIR_Request * create_request(void * hdr, intptr_t hdr_sz, MPIDI_FUNC_ENTER(MPID_STATE_CREATE_REQUEST); - sreq = MPID_Request_create(); + sreq = MPIR_Request_create(); /* --BEGIN ERROR HANDLING-- */ if (sreq == NULL) return NULL; @@ -126,7 +126,7 @@ int MPIDI_CH3_iStartMsg(MPIDI_VC_t * vc, void * hdr, intptr_t hdr_sz, { MPL_DBG_MSG_D(MPIDI_CH3_DBG_CHANNEL,TYPICAL, "ERROR - MPIDU_Sock_write failed, rc=%d", rc); - sreq = MPID_Request_create(); + sreq = MPIR_Request_create(); if (!sreq) { MPIR_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomem"); } @@ -194,7 +194,7 @@ int MPIDI_CH3_iStartMsg(MPIDI_VC_t * vc, void * hdr, intptr_t hdr_sz, { /* Connection failed, so allocate a request and return an error. */ MPL_DBG_VCUSE(vc,"ERROR - connection failed"); - sreq = MPID_Request_create(); + sreq = MPIR_Request_create(); if (!sreq) { MPIR_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomem"); } diff --git a/src/mpid/ch3/channels/sock/src/ch3_istartmsgv.c b/src/mpid/ch3/channels/sock/src/ch3_istartmsgv.c index 07214bb..da1b8ad 100644 --- a/src/mpid/ch3/channels/sock/src/ch3_istartmsgv.c +++ b/src/mpid/ch3/channels/sock/src/ch3_istartmsgv.c @@ -19,7 +19,7 @@ static MPIR_Request * create_request(MPL_IOV * iov, int iov_count, MPIDI_FUNC_ENTER(MPID_STATE_CREATE_REQUEST); - sreq = MPID_Request_create(); + sreq = MPIR_Request_create(); /* --BEGIN ERROR HANDLING-- */ if (sreq == NULL) return NULL; @@ -57,7 +57,7 @@ static MPIR_Request * create_request(MPL_IOV * iov, int iov_count, * the request. */ -/* XXX - What do we do if MPID_Request_create() returns NULL??? +/* XXX - What do we do if MPIR_Request_create() returns NULL??? If MPIDI_CH3_iStartMsgv() returns NULL, the calling code assumes the request completely successfully, but the reality is that we couldn't allocate the memory for a request. This @@ -158,7 +158,7 @@ int MPIDI_CH3_iStartMsgv(MPIDI_VC_t * vc, MPL_IOV * iov, int n_iov, { MPL_DBG_MSG_D(MPIDI_CH3_DBG_CHANNEL,TYPICAL, "ERROR - MPIDU_Sock_writev failed, rc=%d", rc); - sreq = MPID_Request_create(); + sreq = MPIR_Request_create(); if (sreq == NULL) { MPIR_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomem"); } @@ -226,7 +226,7 @@ int MPIDI_CH3_iStartMsgv(MPIDI_VC_t * vc, MPL_IOV * iov, int n_iov, { /* Connection failed, so allocate a request and return an error. */ MPL_DBG_VCUSE(vc,"ERROR - connection failed"); - sreq = MPID_Request_create(); + sreq = MPIR_Request_create(); if (sreq == NULL) { MPIR_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomem"); } diff --git a/src/mpid/ch3/include/mpid_coll.h b/src/mpid/ch3/include/mpid_coll.h index f9a0498..9adb88b 100644 --- a/src/mpid/ch3/include/mpid_coll.h +++ b/src/mpid/ch3/include/mpid_coll.h @@ -10,7 +10,7 @@ #define FUNCNAME MPID_Barrier #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPID_Barrier(MPID_Comm * comm, MPIR_Errflag_t * errflag) +static inline int MPID_Barrier(MPIR_Comm * comm, MPIR_Errflag_t * errflag) { int mpi_errno = MPI_SUCCESS; @@ -24,7 +24,7 @@ static inline int MPID_Barrier(MPID_Comm * comm, MPIR_Errflag_t * errflag) #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) static inline int MPID_Bcast(void *buffer, int count, MPI_Datatype datatype, int root, - MPID_Comm * comm, MPIR_Errflag_t * errflag) + MPIR_Comm * comm, MPIR_Errflag_t * errflag) { int mpi_errno = MPI_SUCCESS; @@ -38,7 +38,7 @@ static inline int MPID_Bcast(void *buffer, int count, MPI_Datatype datatype, int #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) static inline int MPID_Allreduce(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPID_Comm * comm, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, MPIR_Errflag_t * errflag) { int mpi_errno = MPI_SUCCESS; @@ -54,7 +54,7 @@ static inline int MPID_Allreduce(const void *sendbuf, void *recvbuf, int count, #define FCNAME MPL_QUOTE(FUNCNAME) static inline int MPID_Allgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPID_Comm * comm, MPIR_Errflag_t * errflag) + MPIR_Comm * comm, MPIR_Errflag_t * errflag) { int mpi_errno = MPI_SUCCESS; @@ -70,7 +70,7 @@ static inline int MPID_Allgather(const void *sendbuf, int sendcount, MPI_Datatyp #define FCNAME MPL_QUOTE(FUNCNAME) static inline int MPID_Allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, - MPI_Datatype recvtype, MPID_Comm * comm, MPIR_Errflag_t * errflag) + MPI_Datatype recvtype, MPIR_Comm * comm, MPIR_Errflag_t * errflag) { int mpi_errno = MPI_SUCCESS; @@ -86,7 +86,7 @@ static inline int MPID_Allgatherv(const void *sendbuf, int sendcount, MPI_Dataty #define FCNAME MPL_QUOTE(FUNCNAME) static inline int MPID_Scatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPID_Comm * comm, MPIR_Errflag_t * errflag) + int root, MPIR_Comm * comm, MPIR_Errflag_t * errflag) { int mpi_errno = MPI_SUCCESS; @@ -102,7 +102,7 @@ static inline int MPID_Scatter(const void *sendbuf, int sendcount, MPI_Datatype #define FCNAME MPL_QUOTE(FUNCNAME) static inline int MPID_Scatterv(const void *sendbuf, const int *sendcounts, const int *displs, MPI_Datatype sendtype, void *recvbuf, int recvcount, - MPI_Datatype recvtype, int root, MPID_Comm * comm, + MPI_Datatype recvtype, int root, MPIR_Comm * comm, MPIR_Errflag_t * errflag) { int mpi_errno = MPI_SUCCESS; @@ -119,7 +119,7 @@ static inline int MPID_Scatterv(const void *sendbuf, const int *sendcounts, cons #define FCNAME MPL_QUOTE(FUNCNAME) static inline int MPID_Gather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPID_Comm * comm, MPIR_Errflag_t * errflag) + int root, MPIR_Comm * comm, MPIR_Errflag_t * errflag) { int mpi_errno = MPI_SUCCESS; @@ -135,7 +135,7 @@ static inline int MPID_Gather(const void *sendbuf, int sendcount, MPI_Datatype s #define FCNAME MPL_QUOTE(FUNCNAME) static inline int MPID_Gatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, - MPI_Datatype recvtype, int root, MPID_Comm * comm, + MPI_Datatype recvtype, int root, MPIR_Comm * comm, MPIR_Errflag_t * errflag) { int mpi_errno = MPI_SUCCESS; @@ -152,7 +152,7 @@ static inline int MPID_Gatherv(const void *sendbuf, int sendcount, MPI_Datatype #define FCNAME MPL_QUOTE(FUNCNAME) static inline int MPID_Alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPID_Comm * comm, MPIR_Errflag_t * errflag) + MPIR_Comm * comm, MPIR_Errflag_t * errflag) { int mpi_errno = MPI_SUCCESS; @@ -168,7 +168,7 @@ static inline int MPID_Alltoall(const void *sendbuf, int sendcount, MPI_Datatype #define FCNAME MPL_QUOTE(FUNCNAME) static inline int MPID_Alltoallv(const void *sendbuf, const int *sendcounts, const int *sdispls, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, - const int *rdispls, MPI_Datatype recvtype, MPID_Comm * comm, + const int *rdispls, MPI_Datatype recvtype, MPIR_Comm * comm, MPIR_Errflag_t * errflag) { int mpi_errno = MPI_SUCCESS; @@ -186,7 +186,7 @@ static inline int MPID_Alltoallv(const void *sendbuf, const int *sendcounts, con static inline int MPID_Alltoallw(const void *sendbuf, const int sendcounts[], const int sdispls[], const MPI_Datatype sendtypes[], void *recvbuf, const int recvcounts[], const int rdispls[], - const MPI_Datatype recvtypes[], MPID_Comm * comm_ptr, + const MPI_Datatype recvtypes[], MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno = MPI_SUCCESS; @@ -204,7 +204,7 @@ static inline int MPID_Alltoallw(const void *sendbuf, const int sendcounts[], co #define FCNAME MPL_QUOTE(FUNCNAME) static inline int MPID_Reduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, - MPID_Comm * comm, MPIR_Errflag_t * errflag) + MPIR_Comm * comm, MPIR_Errflag_t * errflag) { int mpi_errno = MPI_SUCCESS; @@ -218,7 +218,7 @@ static inline int MPID_Reduce(const void *sendbuf, void *recvbuf, int count, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) static inline int MPID_Reduce_scatter(const void *sendbuf, void *recvbuf, const int recvcounts[], - MPI_Datatype datatype, MPI_Op op, MPID_Comm * comm_ptr, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno = MPI_SUCCESS; @@ -235,7 +235,7 @@ static inline int MPID_Reduce_scatter(const void *sendbuf, void *recvbuf, const #define FCNAME MPL_QUOTE(FUNCNAME) static inline int MPID_Reduce_scatter_block(const void *sendbuf, void *recvbuf, int recvcount, MPI_Datatype datatype, - MPI_Op op, MPID_Comm * comm_ptr, + MPI_Op op, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno = MPI_SUCCESS; @@ -251,7 +251,7 @@ static inline int MPID_Reduce_scatter_block(const void *sendbuf, void *recvbuf, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) static inline int MPID_Scan(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPID_Comm * comm, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, MPIR_Errflag_t * errflag) { int mpi_errno = MPI_SUCCESS; @@ -266,7 +266,7 @@ static inline int MPID_Scan(const void *sendbuf, void *recvbuf, int count, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) static inline int MPID_Exscan(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPID_Comm * comm, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, MPIR_Errflag_t * errflag) { int mpi_errno = MPI_SUCCESS; @@ -282,7 +282,7 @@ static inline int MPID_Exscan(const void *sendbuf, void *recvbuf, int count, #define FCNAME MPL_QUOTE(FUNCNAME) static inline int MPID_Neighbor_allgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPID_Comm * comm) + MPIR_Comm * comm) { int mpi_errno = MPI_SUCCESS; @@ -299,7 +299,7 @@ static inline int MPID_Neighbor_allgather(const void *sendbuf, int sendcount, MP static inline int MPID_Neighbor_allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int displs[], - MPI_Datatype recvtype, MPID_Comm * comm) + MPI_Datatype recvtype, MPIR_Comm * comm) { int mpi_errno = MPI_SUCCESS; @@ -317,7 +317,7 @@ static inline int MPID_Neighbor_alltoallv(const void *sendbuf, const int sendcou const int sdispls[], MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int rdispls[], MPI_Datatype recvtype, - MPID_Comm * comm) + MPIR_Comm * comm) { int mpi_errno = MPI_SUCCESS; @@ -335,7 +335,7 @@ static inline int MPID_Neighbor_alltoallw(const void *sendbuf, const int sendcou const MPI_Aint sdispls[], const MPI_Datatype sendtypes[], void *recvbuf, const int recvcounts[], const MPI_Aint rdispls[], const MPI_Datatype recvtypes[], - MPID_Comm * comm) + MPIR_Comm * comm) { int mpi_errno = MPI_SUCCESS; @@ -352,7 +352,7 @@ static inline int MPID_Neighbor_alltoallw(const void *sendbuf, const int sendcou #define FCNAME MPL_QUOTE(FUNCNAME) static inline int MPID_Neighbor_alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPID_Comm * comm) + MPIR_Comm * comm) { int mpi_errno = MPI_SUCCESS; @@ -368,7 +368,7 @@ static inline int MPID_Neighbor_alltoall(const void *sendbuf, int sendcount, MPI #define FCNAME MPL_QUOTE(FUNCNAME) static inline int MPID_Ineighbor_allgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, - MPI_Datatype recvtype, MPID_Comm * comm, + MPI_Datatype recvtype, MPIR_Comm * comm, MPI_Request * request) { int mpi_errno = MPI_SUCCESS; @@ -386,7 +386,7 @@ static inline int MPID_Ineighbor_allgather(const void *sendbuf, int sendcount, static inline int MPID_Ineighbor_allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int displs[], - MPI_Datatype recvtype, MPID_Comm * comm, + MPI_Datatype recvtype, MPIR_Comm * comm, MPI_Request * request) { int mpi_errno = MPI_SUCCESS; @@ -404,7 +404,7 @@ static inline int MPID_Ineighbor_allgatherv(const void *sendbuf, int sendcount, #define FCNAME MPL_QUOTE(FUNCNAME) static inline int MPID_Ineighbor_alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPID_Comm * comm, MPI_Request * request) + MPIR_Comm * comm, MPI_Request * request) { int mpi_errno = MPI_SUCCESS; @@ -422,7 +422,7 @@ static inline int MPID_Ineighbor_alltoallv(const void *sendbuf, const int sendco const int sdispls[], MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int rdispls[], MPI_Datatype recvtype, - MPID_Comm * comm, MPI_Request * request) + MPIR_Comm * comm, MPI_Request * request) { int mpi_errno = MPI_SUCCESS; @@ -441,7 +441,7 @@ static inline int MPID_Ineighbor_alltoallw(const void *sendbuf, const int sendco const MPI_Aint sdispls[], const MPI_Datatype sendtypes[], void *recvbuf, const int recvcounts[], const MPI_Aint rdispls[], const MPI_Datatype recvtypes[], - MPID_Comm * comm, MPI_Request * request) + MPIR_Comm * comm, MPI_Request * request) { int mpi_errno = MPI_SUCCESS; @@ -456,7 +456,7 @@ static inline int MPID_Ineighbor_alltoallw(const void *sendbuf, const int sendco #define FUNCNAME MPID_Ibarrier #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPID_Ibarrier(MPID_Comm * comm, MPI_Request * request) +static inline int MPID_Ibarrier(MPIR_Comm * comm, MPI_Request * request) { int mpi_errno = MPI_SUCCESS; @@ -470,7 +470,7 @@ static inline int MPID_Ibarrier(MPID_Comm * comm, MPI_Request * request) #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) static inline int MPID_Ibcast(void *buffer, int count, MPI_Datatype datatype, int root, - MPID_Comm * comm, MPI_Request * request) + MPIR_Comm * comm, MPI_Request * request) { int mpi_errno = MPI_SUCCESS; @@ -485,7 +485,7 @@ static inline int MPID_Ibcast(void *buffer, int count, MPI_Datatype datatype, in #define FCNAME MPL_QUOTE(FUNCNAME) static inline int MPID_Iallgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPID_Comm * comm, MPI_Request * request) + MPIR_Comm * comm, MPI_Request * request) { int mpi_errno = MPI_SUCCESS; @@ -501,7 +501,7 @@ static inline int MPID_Iallgather(const void *sendbuf, int sendcount, MPI_Dataty #define FCNAME MPL_QUOTE(FUNCNAME) static inline int MPID_Iallgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, - MPI_Datatype recvtype, MPID_Comm * comm, MPI_Request * request) + MPI_Datatype recvtype, MPIR_Comm * comm, MPI_Request * request) { int mpi_errno = MPI_SUCCESS; @@ -516,7 +516,7 @@ static inline int MPID_Iallgatherv(const void *sendbuf, int sendcount, MPI_Datat #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) static inline int MPID_Iallreduce(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPID_Comm * comm, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, MPI_Request * request) { int mpi_errno = MPI_SUCCESS; @@ -532,7 +532,7 @@ static inline int MPID_Iallreduce(const void *sendbuf, void *recvbuf, int count, #define FCNAME MPL_QUOTE(FUNCNAME) static inline int MPID_Ialltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPID_Comm * comm, MPI_Request * request) + MPIR_Comm * comm, MPI_Request * request) { int mpi_errno = MPI_SUCCESS; @@ -550,7 +550,7 @@ static inline int MPID_Ialltoallv(const void *sendbuf, const int sendcounts[], const int sdispls[], MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int rdispls[], MPI_Datatype recvtype, - MPID_Comm * comm, MPI_Request * request) + MPIR_Comm * comm, MPI_Request * request) { int mpi_errno = MPI_SUCCESS; @@ -568,7 +568,7 @@ static inline int MPID_Ialltoallw(const void *sendbuf, const int sendcounts[], const int sdispls[], const MPI_Datatype sendtypes[], void *recvbuf, const int recvcounts[], const int rdispls[], const MPI_Datatype recvtypes[], - MPID_Comm * comm, MPI_Request * request) + MPIR_Comm * comm, MPI_Request * request) { int mpi_errno = MPI_SUCCESS; @@ -583,7 +583,7 @@ static inline int MPID_Ialltoallw(const void *sendbuf, const int sendcounts[], #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) static inline int MPID_Iexscan(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPID_Comm * comm, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, MPI_Request * request) { int mpi_errno = MPI_SUCCESS; @@ -599,7 +599,7 @@ static inline int MPID_Iexscan(const void *sendbuf, void *recvbuf, int count, #define FCNAME MPL_QUOTE(FUNCNAME) static inline int MPID_Igather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPID_Comm * comm, MPI_Request * request) + int root, MPIR_Comm * comm, MPI_Request * request) { int mpi_errno = MPI_SUCCESS; @@ -615,7 +615,7 @@ static inline int MPID_Igather(const void *sendbuf, int sendcount, MPI_Datatype #define FCNAME MPL_QUOTE(FUNCNAME) static inline int MPID_Igatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, - MPI_Datatype recvtype, int root, MPID_Comm * comm, + MPI_Datatype recvtype, int root, MPIR_Comm * comm, MPI_Request * request) { int mpi_errno = MPI_SUCCESS; @@ -631,7 +631,7 @@ static inline int MPID_Igatherv(const void *sendbuf, int sendcount, MPI_Datatype #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) static inline int MPID_Ireduce_scatter_block(const void *sendbuf, void *recvbuf, int recvcount, - MPI_Datatype datatype, MPI_Op op, MPID_Comm * comm, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, MPI_Request * request) { int mpi_errno = MPI_SUCCESS; @@ -647,7 +647,7 @@ static inline int MPID_Ireduce_scatter_block(const void *sendbuf, void *recvbuf, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) static inline int MPID_Ireduce_scatter(const void *sendbuf, void *recvbuf, const int recvcounts[], - MPI_Datatype datatype, MPI_Op op, MPID_Comm * comm, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, MPI_Request * request) { int mpi_errno = MPI_SUCCESS; @@ -663,7 +663,7 @@ static inline int MPID_Ireduce_scatter(const void *sendbuf, void *recvbuf, const #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) static inline int MPID_Ireduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, int root, MPID_Comm * comm, MPI_Request * request) + MPI_Op op, int root, MPIR_Comm * comm, MPI_Request * request) { int mpi_errno = MPI_SUCCESS; @@ -677,7 +677,7 @@ static inline int MPID_Ireduce(const void *sendbuf, void *recvbuf, int count, MP #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) static inline int MPID_Iscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, MPID_Comm * comm, MPI_Request * request) + MPI_Op op, MPIR_Comm * comm, MPI_Request * request) { int mpi_errno = MPI_SUCCESS; @@ -692,7 +692,7 @@ static inline int MPID_Iscan(const void *sendbuf, void *recvbuf, int count, MPI_ #define FCNAME MPL_QUOTE(FUNCNAME) static inline int MPID_Iscatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPID_Comm * comm, MPI_Request * request) + int root, MPIR_Comm * comm, MPI_Request * request) { int mpi_errno = MPI_SUCCESS; @@ -709,7 +709,7 @@ static inline int MPID_Iscatter(const void *sendbuf, int sendcount, MPI_Datatype static inline int MPID_Iscatterv(const void *sendbuf, const int *sendcounts, const int *displs, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPID_Comm * comm, MPI_Request * request) + int root, MPIR_Comm * comm, MPI_Request * request) { int mpi_errno = MPI_SUCCESS; diff --git a/src/mpid/ch3/include/mpid_rma_issue.h b/src/mpid/ch3/include/mpid_rma_issue.h index 8210bdb..ebf7043 100644 --- a/src/mpid/ch3/include/mpid_rma_issue.h +++ b/src/mpid/ch3/include/mpid_rma_issue.h @@ -314,7 +314,7 @@ static int issue_from_origin_buffer(MPIDI_RMA_Op_t * rma_op, MPIDI_VC_t * vc, * always need a request to be passed in. */ /* create a new request */ - req = MPID_Request_create(); + req = MPIR_Request_create(); MPIR_ERR_CHKANDJUMP(req == NULL, mpi_errno, MPI_ERR_OTHER, "**nomemreq"); MPIU_Object_set_ref(req, 2); @@ -381,7 +381,7 @@ static int issue_from_origin_buffer(MPIDI_RMA_Op_t * rma_op, MPIDI_VC_t * vc, MPIDU_Datatype_release(req->dev.datatype_ptr); if (req->dev.ext_hdr_ptr) MPL_free(req->dev.ext_hdr_ptr); - MPID_Request_release(req); + MPIR_Request_free(req); } (*req_ptr) = NULL; @@ -676,7 +676,7 @@ static int issue_get_acc_op(MPIDI_RMA_Op_t * rma_op, MPIR_Win * win_ptr, /* Create a request for the GACC response. Store the response buf, count, and * datatype in it, and pass the request's handle in the GACC packet. When the * response comes from the target, it will contain the request handle. */ - resp_req = MPID_Request_create(); + resp_req = MPIR_Request_create(); MPIR_ERR_CHKANDJUMP(resp_req == NULL, mpi_errno, MPI_ERR_OTHER, "**nomemreq"); MPIU_Object_set_ref(resp_req, 2); @@ -697,7 +697,7 @@ static int issue_get_acc_op(MPIDI_RMA_Op_t * rma_op, MPIR_Win * win_ptr, MPIR_ERR_CHKANDJUMP(mpi_errno, mpi_errno, MPI_ERR_OTHER, "**ch3|rmamsg"); if (curr_req != NULL) { - MPID_Request_release(curr_req); + MPIR_Request_free(curr_req); } rma_op->single_req = resp_req; @@ -771,7 +771,7 @@ static int issue_get_acc_op(MPIDI_RMA_Op_t * rma_op, MPIR_Win * win_ptr, /* Create a request for the GACC response. Store the response buf, count, and * datatype in it, and pass the request's handle in the GACC packet. When the * response comes from the target, it will contain the request handle. */ - resp_req = MPID_Request_create(); + resp_req = MPIR_Request_create(); MPIR_ERR_CHKANDJUMP(resp_req == NULL, mpi_errno, MPI_ERR_OTHER, "**nomemreq"); MPIU_Object_set_ref(resp_req, 2); @@ -814,7 +814,7 @@ static int issue_get_acc_op(MPIDI_RMA_Op_t * rma_op, MPIR_Win * win_ptr, MPIR_ERR_POP(mpi_errno); if (curr_req != NULL) { - MPID_Request_release(curr_req); + MPIR_Request_free(curr_req); } if (rma_op->reqs_size == 1) @@ -847,8 +847,8 @@ static int issue_get_acc_op(MPIDI_RMA_Op_t * rma_op, MPIR_Win * win_ptr, /* error case: drop both our reference to the request and the * progress engine's reference to it, since the progress * engine didn't get a chance to see it yet. */ - MPID_Request_release(rma_op->single_req); - MPID_Request_release(rma_op->single_req); + MPIR_Request_free(rma_op->single_req); + MPIR_Request_free(rma_op->single_req); rma_op->single_req = NULL; } else if (rma_op->reqs_size > 1) { @@ -858,8 +858,8 @@ static int issue_get_acc_op(MPIDI_RMA_Op_t * rma_op, MPIR_Win * win_ptr, * and the progress engine's reference to it, since * the progress engine didn't get a chance to see it * yet. */ - MPID_Request_release(rma_op->multi_reqs[i]); - MPID_Request_release(rma_op->multi_reqs[i]); + MPIR_Request_free(rma_op->multi_reqs[i]); + MPIR_Request_free(rma_op->multi_reqs[i]); } } MPL_free(rma_op->multi_reqs); @@ -899,7 +899,7 @@ static int issue_get_op(MPIDI_RMA_Op_t * rma_op, MPIR_Win * win_ptr, * and pass a handle to it in the get packet. When the get * response comes from the target, it will contain the request * handle. */ - curr_req = MPID_Request_create(); + curr_req = MPIR_Request_create(); if (curr_req == NULL) { MPIR_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**nomemreq"); } @@ -982,7 +982,7 @@ static int issue_get_op(MPIDI_RMA_Op_t * rma_op, MPIR_Win * win_ptr, /* release the request returned by iStartMsg or iStartMsgv */ if (req != NULL) { - MPID_Request_release(req); + MPIR_Request_free(req); } rma_op->single_req = curr_req; @@ -1022,7 +1022,7 @@ static int issue_cas_op(MPIDI_RMA_Op_t * rma_op, /* Create a request for the RMW response. Store the origin buf, count, and * datatype in it, and pass the request's handle RMW packet. When the * response comes from the target, it will contain the request handle. */ - curr_req = MPID_Request_create(); + curr_req = MPIR_Request_create(); MPIR_ERR_CHKANDJUMP(curr_req == NULL, mpi_errno, MPI_ERR_OTHER, "**nomemreq"); /* Set refs on the request to 2: one for the response message, and one for @@ -1045,7 +1045,7 @@ static int issue_cas_op(MPIDI_RMA_Op_t * rma_op, MPIR_ERR_CHKANDJUMP(mpi_errno, mpi_errno, MPI_ERR_OTHER, "**ch3|rmamsg"); if (rmw_req != NULL) { - MPID_Request_release(rmw_req); + MPIR_Request_free(rmw_req); } rma_op->single_req = curr_req; @@ -1085,7 +1085,7 @@ static int issue_fop_op(MPIDI_RMA_Op_t * rma_op, /* Create a request for the GACC response. Store the response buf, count, and * datatype in it, and pass the request's handle in the GACC packet. When the * response comes from the target, it will contain the request handle. */ - resp_req = MPID_Request_create(); + resp_req = MPIR_Request_create(); MPIR_ERR_CHKANDJUMP(resp_req == NULL, mpi_errno, MPI_ERR_OTHER, "**nomemreq"); MPIU_Object_set_ref(resp_req, 2); @@ -1118,7 +1118,7 @@ static int issue_fop_op(MPIDI_RMA_Op_t * rma_op, } if (curr_req != NULL) { - MPID_Request_release(curr_req); + MPIR_Request_free(curr_req); } rma_op->single_req = resp_req; diff --git a/src/mpid/ch3/include/mpidimpl.h b/src/mpid/ch3/include/mpidimpl.h index 8df8a17..21dcdaa 100644 --- a/src/mpid/ch3/include/mpidimpl.h +++ b/src/mpid/ch3/include/mpidimpl.h @@ -287,7 +287,7 @@ extern MPIDI_Process_t MPIDI_Process; */ #define MPIDI_Request_create_sreq(sreq_, mpi_errno_, FAIL_) \ { \ - (sreq_) = MPID_Request_create(); \ + (sreq_) = MPIR_Request_create(); \ MPIU_Object_set_ref((sreq_), 2); \ (sreq_)->kind = MPIR_REQUEST_SEND; \ (sreq_)->comm = comm; \ @@ -306,7 +306,7 @@ extern MPIDI_Process_t MPIDI_Process; /* This is the receive request version of MPIDI_Request_create_sreq */ #define MPIDI_Request_create_rreq(rreq_, mpi_errno_, FAIL_) \ { \ - (rreq_) = MPID_Request_create(); \ + (rreq_) = MPIR_Request_create(); \ MPIU_Object_set_ref((rreq_), 2); \ (rreq_)->kind = MPIR_REQUEST_RECV; \ (rreq_)->partner_request = NULL; \ @@ -316,10 +316,10 @@ extern MPIDI_Process_t MPIDI_Process; * returning when a user passed MPI_PROC_NULL */ #define MPIDI_Request_create_null_rreq(rreq_, mpi_errno_, FAIL_) \ do { \ - (rreq_) = MPID_Request_create(); \ + (rreq_) = MPIR_Request_create(); \ if ((rreq_) != NULL) { \ MPIU_Object_set_ref((rreq_), 1); \ - /* MT FIXME should these be handled by MPID_Request_create? */ \ + /* MT FIXME should these be handled by MPIR_Request_create? */ \ MPIR_cc_set(&(rreq_)->cc, 0); \ (rreq_)->kind = MPIR_REQUEST_RECV; \ MPIR_Status_set_procnull(&(rreq_)->status); \ diff --git a/src/mpid/ch3/include/mpidpre.h b/src/mpid/ch3/include/mpidpre.h index 16045fe..dcfd83a 100644 --- a/src/mpid/ch3/include/mpidpre.h +++ b/src/mpid/ch3/include/mpidpre.h @@ -131,7 +131,7 @@ typedef union { * MPIDI_CH3_CA_COMPLETE - The last operation for this request has completed. * The completion counter should be decremented. If * it has reached zero, then the request should be released by calling - * MPID_Request_release(). + * MPIR_Request_free(). * * MPIDI_CH3_CA_UNPACK_UEBUF_AND_COMPLETE - This is a special case of the * MPIDI_CH3_CA_COMPLETE. The data for an unexpected diff --git a/src/mpid/ch3/include/mpidrma.h b/src/mpid/ch3/include/mpidrma.h index 325682d..c8c75d7 100644 --- a/src/mpid/ch3/include/mpidrma.h +++ b/src/mpid/ch3/include/mpidrma.h @@ -48,7 +48,7 @@ static inline int send_lock_msg(int dest, int lock_type, MPIR_Win * win_ptr) /* release the request returned by iStartMsg */ if (req != NULL) { - MPID_Request_release(req); + MPIR_Request_free(req); } fn_exit: @@ -91,7 +91,7 @@ static inline int send_unlock_msg(int dest, MPIR_Win * win_ptr, MPIDI_CH3_Pkt_fl /* Release the request returned by iStartMsg */ if (req != NULL) { - MPID_Request_release(req); + MPIR_Request_free(req); } fn_exit: @@ -142,7 +142,7 @@ static inline int MPIDI_CH3I_Send_lock_ack_pkt(MPIDI_VC_t * vc, MPIR_Win * win_p } if (req != NULL) { - MPID_Request_release(req); + MPIR_Request_free(req); } fn_fail: @@ -189,7 +189,7 @@ static inline int MPIDI_CH3I_Send_lock_op_ack_pkt(MPIDI_VC_t * vc, MPIR_Win * wi } if (req != NULL) { - MPID_Request_release(req); + MPIR_Request_free(req); } fn_fail: @@ -226,7 +226,7 @@ static inline int MPIDI_CH3I_Send_ack_pkt(MPIDI_VC_t * vc, MPIR_Win * win_ptr, } if (req != NULL) { - MPID_Request_release(req); + MPIR_Request_free(req); } fn_fail: @@ -264,7 +264,7 @@ static inline int send_decr_at_cnt_msg(int dst, MPIR_Win * win_ptr, MPIDI_CH3_Pk } if (request != NULL) { - MPID_Request_release(request); + MPIR_Request_free(request); } fn_exit: @@ -304,7 +304,7 @@ static inline int send_flush_msg(int dest, MPIR_Win * win_ptr) /* Release the request returned by iStartMsg */ if (req != NULL) { - MPID_Request_release(req); + MPIR_Request_free(req); } fn_exit: @@ -455,7 +455,7 @@ static inline int enqueue_lock_origin(MPIR_Win * win_ptr, MPIDI_VC_t * vc, } /* create request to receive upcoming requests */ - req = MPID_Request_create(); + req = MPIR_Request_create(); MPIU_Object_set_ref(req, 1); /* fill in area in req that will be used in Receive_data_found() */ @@ -662,7 +662,7 @@ static inline int check_and_set_req_completion(MPIR_Win * win_ptr, MPIDI_RMA_Tar continue; if (MPIR_Request_is_complete((*req))) { - MPID_Request_release((*req)); + MPIR_Request_free((*req)); (*req) = NULL; } else { @@ -677,7 +677,7 @@ static inline int check_and_set_req_completion(MPIR_Win * win_ptr, MPIDI_RMA_Tar (*req)->dev.request_handle = rma_op->ureq->handle; } - MPID_Request_release((*req)); + MPIR_Request_free((*req)); } } @@ -769,13 +769,13 @@ static inline int handle_lock_ack_with_op(MPIR_Win * win_ptr, * operation. */ if (op->reqs_size == 1) { MPIU_Assert(op->single_req != NULL); - MPID_Request_release(op->single_req); + MPIR_Request_free(op->single_req); op->single_req = NULL; op->reqs_size = 0; } else if (op->reqs_size > 1) { MPIU_Assert(op->multi_reqs != NULL && op->multi_reqs[0] != NULL); - MPID_Request_release(op->multi_reqs[0]); + MPIR_Request_free(op->multi_reqs[0]); /* free req array in this op */ MPL_free(op->multi_reqs); op->multi_reqs = NULL; diff --git a/src/mpid/ch3/src/ch3u_eager.c b/src/mpid/ch3/src/ch3u_eager.c index 5baeb21..e5b332e 100644 --- a/src/mpid/ch3/src/ch3u_eager.c +++ b/src/mpid/ch3/src/ch3u_eager.c @@ -54,7 +54,7 @@ int MPIDI_CH3_SendNoncontig_iov( MPIDI_VC_t *vc, MPIR_Request *sreq, /* --BEGIN ERROR HANDLING-- */ if (mpi_errno != MPI_SUCCESS) { - MPID_Request_release(sreq); + MPIR_Request_free(sreq); MPIR_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**ch3|eagermsg"); } /* --END ERROR HANDLING-- */ @@ -65,7 +65,7 @@ int MPIDI_CH3_SendNoncontig_iov( MPIDI_VC_t *vc, MPIR_Request *sreq, else { /* --BEGIN ERROR HANDLING-- */ - MPID_Request_release(sreq); + MPIR_Request_free(sreq); MPIR_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**ch3|loadsendiov"); /* --END ERROR HANDLING-- */ } @@ -568,7 +568,7 @@ int MPIDI_CH3_EagerContigIsend( MPIR_Request **sreq_p, /* --BEGIN ERROR HANDLING-- */ if (mpi_errno != MPI_SUCCESS) { - MPID_Request_release(sreq); + MPIR_Request_free(sreq); *sreq_p = NULL; MPIR_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**ch3|eagermsg"); } diff --git a/src/mpid/ch3/src/ch3u_eagersync.c b/src/mpid/ch3/src/ch3u_eagersync.c index a0dbd95..61aa0ae 100644 --- a/src/mpid/ch3/src/ch3u_eagersync.c +++ b/src/mpid/ch3/src/ch3u_eagersync.c @@ -81,7 +81,7 @@ int MPIDI_CH3_EagerSyncNoncontigSend( MPIR_Request **sreq_p, { /* Make sure to destroy the request before setting the pointer to * NULL, otherwise we lose the handle on the request */ - MPID_Request_release(sreq); + MPIR_Request_free(sreq); *sreq_p = NULL; MPIR_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**ch3|eagermsg"); } @@ -152,7 +152,7 @@ int MPIDI_CH3_EagerSyncZero(MPIR_Request **sreq_p, int rank, int tag, /* --BEGIN ERROR HANDLING-- */ if (mpi_errno != MPI_SUCCESS) { - MPID_Request_release(sreq); + MPIR_Request_free(sreq); *sreq_p = NULL; MPIR_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**ch3|eagermsg"); } @@ -185,7 +185,7 @@ int MPIDI_CH3_EagerSyncAck( MPIDI_VC_t *vc, MPIR_Request *rreq ) } if (esa_req != NULL) { - MPID_Request_release(esa_req); + MPIR_Request_free(esa_req); } fn_fail: return mpi_errno; @@ -299,7 +299,7 @@ int MPIDI_CH3_PktHandler_EagerSyncSend( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, "**ch3|syncack"); } if (esa_req != NULL) { - MPID_Request_release(esa_req); + MPIR_Request_free(esa_req); } } else diff --git a/src/mpid/ch3/src/ch3u_handle_connection.c b/src/mpid/ch3/src/ch3u_handle_connection.c index 7850b96..46e2948 100644 --- a/src/mpid/ch3/src/ch3u_handle_connection.c +++ b/src/mpid/ch3/src/ch3u_handle_connection.c @@ -258,7 +258,7 @@ int MPIDI_CH3U_VC_SendClose( MPIDI_VC_t *vc, int rank ) if (sreq != NULL) { /* There is still another reference being held by the channel. It will not be released until the pkt is actually sent. */ - MPID_Request_release(sreq); + MPIR_Request_free(sreq); } fn_exit: @@ -300,7 +300,7 @@ int MPIDI_CH3_PktHandler_Close( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, { /* There is still another reference being held by the channel. It will not be released until the pkt is actually sent. */ - MPID_Request_release(resp_sreq); + MPIR_Request_free(resp_sreq); } } diff --git a/src/mpid/ch3/src/ch3u_handle_recv_req.c b/src/mpid/ch3/src/ch3u_handle_recv_req.c index 7183cf1..8125271 100644 --- a/src/mpid/ch3/src/ch3u_handle_recv_req.c +++ b/src/mpid/ch3/src/ch3u_handle_recv_req.c @@ -318,7 +318,7 @@ int MPIDI_CH3_ReqHandler_GaccumRecvComplete(MPIDI_VC_t * vc, MPIR_Request * rreq MPIDU_Datatype_is_contig(rreq->dev.datatype, &is_contig); MPIDU_Datatype_get_true_lb(rreq->dev.datatype, &dt_true_lb); - resp_req = MPID_Request_create(); + resp_req = MPIR_Request_create(); MPIR_ERR_CHKANDJUMP(resp_req == NULL, mpi_errno, MPI_ERR_OTHER, "**nomemreq"); MPIU_Object_set_ref(resp_req, 1); MPIDI_Request_set_type(resp_req, MPIDI_REQUEST_TYPE_GET_ACCUM_RESP); @@ -455,7 +455,7 @@ int MPIDI_CH3_ReqHandler_FOPRecvComplete(MPIDI_VC_t * vc, MPIR_Request * rreq, i MPIDU_Datatype_is_contig(rreq->dev.datatype, &is_contig); /* Create response request */ - resp_req = MPID_Request_create(); + resp_req = MPIR_Request_create(); MPIR_ERR_CHKANDJUMP(resp_req == NULL, mpi_errno, MPI_ERR_OTHER, "**nomemreq"); MPIDI_Request_set_type(resp_req, MPIDI_REQUEST_TYPE_FOP_RESP); MPIU_Object_set_ref(resp_req, 1); @@ -879,7 +879,7 @@ int MPIDI_CH3_ReqHandler_GetDerivedDTRecvComplete(MPIDI_VC_t * vc, create_derived_datatype(rreq, dtype_info, &new_dtp); /* create request for sending data */ - sreq = MPID_Request_create(); + sreq = MPIR_Request_create(); MPIR_ERR_CHKANDJUMP(sreq == NULL, mpi_errno, MPI_ERR_OTHER, "**nomemreq"); sreq->kind = MPIR_REQUEST_SEND; @@ -919,7 +919,7 @@ int MPIDI_CH3_ReqHandler_GetDerivedDTRecvComplete(MPIDI_VC_t * vc, /* MPID_THREAD_CS_EXIT(POBJ, vc->pobj_mutex); */ /* --BEGIN ERROR HANDLING-- */ if (mpi_errno != MPI_SUCCESS) { - MPID_Request_release(sreq); + MPIR_Request_free(sreq); sreq = NULL; MPIR_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**ch3|rmamsg"); } @@ -1198,7 +1198,7 @@ static inline int perform_get_in_lock_queue(MPIR_Win * win_ptr, /* Make sure that all data is received for this op. */ MPIU_Assert(target_lock_entry->all_data_recved == 1); - sreq = MPID_Request_create(); + sreq = MPIR_Request_create(); if (sreq == NULL) { MPIR_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**nomemreq"); } @@ -1251,7 +1251,7 @@ static inline int perform_get_in_lock_queue(MPIR_Win * win_ptr, mpi_errno = MPIDI_CH3_iSendv(target_lock_entry->vc, sreq, iov, iovcnt); if (mpi_errno != MPI_SUCCESS) { - MPID_Request_release(sreq); + MPIR_Request_free(sreq); MPIR_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**ch3|rmamsg"); } } @@ -1264,7 +1264,7 @@ static inline int perform_get_in_lock_queue(MPIR_Win * win_ptr, mpi_errno = MPIDI_CH3_iSendv(target_lock_entry->vc, sreq, iov, iovcnt); if (mpi_errno != MPI_SUCCESS) { - MPID_Request_release(sreq); + MPIR_Request_free(sreq); MPIR_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**ch3|rmamsg"); } } @@ -1374,7 +1374,7 @@ static inline int perform_get_acc_in_lock_queue(MPIR_Win * win_ptr, /* Make sure that all data is received for this op. */ MPIU_Assert(target_lock_entry->all_data_recved == 1); - sreq = MPID_Request_create(); + sreq = MPIR_Request_create(); if (sreq == NULL) { MPIR_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**nomemreq"); } @@ -1448,7 +1448,7 @@ static inline int perform_get_acc_in_lock_queue(MPIR_Win * win_ptr, mpi_errno = MPIDI_CH3_iSendv(target_lock_entry->vc, sreq, iov, iovcnt); if (mpi_errno != MPI_SUCCESS) { - MPID_Request_release(sreq); + MPIR_Request_free(sreq); MPIR_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**ch3|rmamsg"); } @@ -1533,7 +1533,7 @@ static inline int perform_get_acc_in_lock_queue(MPIR_Win * win_ptr, mpi_errno = MPIDI_CH3_iSendv(target_lock_entry->vc, sreq, iov, iovcnt); if (mpi_errno != MPI_SUCCESS) { - MPID_Request_release(sreq); + MPIR_Request_free(sreq); MPIR_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**ch3|rmamsg"); } @@ -1588,7 +1588,7 @@ static inline int perform_fop_in_lock_queue(MPIR_Win * win_ptr, fop_resp_pkt->flags |= MPIDI_CH3_PKT_FLAG_RMA_ACK; if (fop_pkt->type == MPIDI_CH3_PKT_FOP) { - resp_req = MPID_Request_create(); + resp_req = MPIR_Request_create(); if (resp_req == NULL) { MPIR_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**nomemreq"); } @@ -1679,11 +1679,11 @@ static inline int perform_fop_in_lock_queue(MPIR_Win * win_ptr, * operation are completed when counter reaches zero. */ win_ptr->at_completion_counter++; - MPID_Request_release(resp_req); + MPIR_Request_free(resp_req); goto fn_exit; } else { - MPID_Request_release(resp_req); + MPIR_Request_free(resp_req); } } } @@ -1696,7 +1696,7 @@ static inline int perform_fop_in_lock_queue(MPIR_Win * win_ptr, mpi_errno = MPIDI_CH3_iSendv(target_lock_entry->vc, resp_req, iov, iovcnt); if (mpi_errno != MPI_SUCCESS) { - MPID_Request_release(resp_req); + MPIR_Request_free(resp_req); MPIR_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**ch3|rmamsg"); } goto fn_exit; @@ -1779,11 +1779,11 @@ static inline int perform_cas_in_lock_queue(MPIR_Win * win_ptr, * operation are completed when counter reaches zero. */ win_ptr->at_completion_counter++; - MPID_Request_release(send_req); + MPIR_Request_free(send_req); goto fn_exit; } else - MPID_Request_release(send_req); + MPIR_Request_free(send_req); } /* do final action */ diff --git a/src/mpid/ch3/src/ch3u_request.c b/src/mpid/ch3/src/ch3u_request.c index 934b493..2d3090c 100644 --- a/src/mpid/ch3/src/ch3u_request.c +++ b/src/mpid/ch3/src/ch3u_request.c @@ -24,88 +24,42 @@ /* See the comments above about request creation. Some routines will use macros in mpidimpl.h *instead* of this routine */ #undef FUNCNAME -#define FUNCNAME MPID_Request_create +#define FUNCNAME MPID_Request_init #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -MPIR_Request * MPID_Request_create(void) +void MPID_Request_init(MPIR_Request *req) { - MPIR_Request * req; - MPIDI_STATE_DECL(MPID_STATE_MPIR_REQUEST_CREATE); + MPIDI_STATE_DECL(MPID_STATE_MPID_REQUEST_INIT); - MPIDI_FUNC_ENTER(MPID_STATE_MPIR_REQUEST_CREATE); + MPIDI_FUNC_ENTER(MPID_STATE_MPID_REQUEST_INIT); - req = MPIU_Handle_obj_alloc(&MPIR_Request_mem); - if (req != NULL) - { - MPL_DBG_MSG_P(MPIDI_CH3_DBG_CHANNEL,VERBOSE, - "allocated request, handle=0x%08x", req->handle); -#ifdef MPICH_DBG_OUTPUT - /*MPIU_Assert(HANDLE_GET_MPI_KIND(req->handle) == MPIR_REQUEST);*/ - if (HANDLE_GET_MPI_KIND(req->handle) != MPIR_REQUEST) - { - int mpi_errno; - mpi_errno = MPIR_Err_create_code(MPI_SUCCESS, MPIR_ERR_FATAL, - FCNAME, __LINE__, MPI_ERR_OTHER, - "**invalid_handle", "**invalid_handle %d", req->handle); - MPID_Abort(MPIR_Process.comm_world, mpi_errno, -1, NULL); - } -#endif - /* FIXME: This makes request creation expensive. We need to trim - this to the basics, with additional setup for special-purpose - requests (think base class and inheritance). For example, do we - *really* want to set the kind to UNDEFINED? And should the RMA - values be set only for RMA requests? */ - MPIU_Object_set_ref(req, 1); - req->kind = MPIR_REQUEST_UNDEFINED; - MPIR_cc_set(&req->cc, 1); - req->cc_ptr = &req->cc; - /* FIXME: status fields meaningful only for receive, and even then - should not need to be set. */ - req->status.MPI_SOURCE = MPI_UNDEFINED; - req->status.MPI_TAG = MPI_UNDEFINED; - req->status.MPI_ERROR = MPI_SUCCESS; - MPIR_STATUS_SET_COUNT(req->status, 0); - MPIR_STATUS_SET_CANCEL_BIT(req->status, FALSE); - req->comm = NULL; - req->greq_fns = NULL; - req->errflag = MPIR_ERR_NONE; - req->request_completed_cb = NULL; - req->dev.datatype_ptr = NULL; - req->dev.segment_ptr = NULL; - /* Masks and flags for channel device state in an MPIR_Request */ - req->dev.state = 0; - req->dev.cancel_pending = FALSE; - /* FIXME: RMA ops shouldn't need to be set except when creating a - request for RMA operations */ - req->dev.target_win_handle = MPI_WIN_NULL; - req->dev.source_win_handle = MPI_WIN_NULL; - req->dev.target_lock_queue_entry = NULL; - req->dev.dataloop = NULL; - req->dev.iov_offset = 0; - req->dev.flags = MPIDI_CH3_PKT_FLAG_NONE; - req->dev.resp_request_handle = MPI_REQUEST_NULL; - req->dev.user_buf = NULL; - req->dev.OnDataAvail = NULL; - req->dev.OnFinal = NULL; - req->dev.user_buf = NULL; - req->dev.drop_data = FALSE; - req->dev.tmpbuf = NULL; - req->dev.ext_hdr_ptr = NULL; - req->dev.ext_hdr_sz = 0; - req->dev.rma_target_ptr = NULL; - req->dev.request_handle = MPI_REQUEST_NULL; + req->dev.datatype_ptr = NULL; + req->dev.segment_ptr = NULL; + /* Masks and flags for channel device state in an MPID_Request */ + req->dev.state = 0; + req->dev.cancel_pending = FALSE; + /* FIXME: RMA ops shouldn't need to be set except when creating a + * request for RMA operations */ + req->dev.target_win_handle = MPI_WIN_NULL; + req->dev.source_win_handle = MPI_WIN_NULL; + req->dev.target_lock_queue_entry = NULL; + req->dev.dataloop = NULL; + req->dev.iov_offset = 0; + req->dev.flags = MPIDI_CH3_PKT_FLAG_NONE; + req->dev.resp_request_handle = MPI_REQUEST_NULL; + req->dev.user_buf = NULL; + req->dev.OnDataAvail = NULL; + req->dev.OnFinal = NULL; + req->dev.user_buf = NULL; + req->dev.drop_data = FALSE; + req->dev.tmpbuf = NULL; + req->dev.ext_hdr_ptr = NULL; + req->dev.ext_hdr_sz = 0; + req->dev.rma_target_ptr = NULL; + req->dev.request_handle = MPI_REQUEST_NULL; #ifdef MPIDI_CH3_REQUEST_INIT - MPIDI_CH3_REQUEST_INIT(req); + MPIDI_CH3_REQUEST_INIT(req); #endif - } - else - { - /* FIXME: This fails to fail if debugging is turned off */ - MPL_DBG_MSG(MPIDI_CH3_DBG_CHANNEL,TYPICAL,"unable to allocate a request"); - } - - MPIDI_FUNC_EXIT(MPID_STATE_MPIR_REQUEST_CREATE); - return req; } @@ -623,7 +577,7 @@ int MPID_Request_complete(MPIR_Request *req) } } - MPID_Request_release(req); + MPIR_Request_free(req); MPIDI_CH3_Progress_signal_completion(); } @@ -634,64 +588,21 @@ int MPID_Request_complete(MPIR_Request *req) goto fn_exit; } -void MPID_Request_release(MPIR_Request *req) +void MPID_Request_finalize(MPIR_Request *req) { - int inuse; - - MPIR_Request_release_ref(req, &inuse); - if (inuse == 0) { - MPL_DBG_MSG_P(MPIDI_CH3_DBG_CHANNEL,VERBOSE, - "freeing request, handle=0x%08x", req->handle); - -#ifdef MPICH_DBG_OUTPUT - /*MPIU_Assert(HANDLE_GET_MPI_KIND(req->handle) == MPIR_REQUEST);*/ - if (HANDLE_GET_MPI_KIND(req->handle) != MPIR_REQUEST) - { - int mpi_errno = MPIR_Err_create_code(MPI_SUCCESS, MPIR_ERR_FATAL, - FCNAME, __LINE__, MPI_ERR_OTHER, - "**invalid_handle", "**invalid_handle %d", req->handle); - MPID_Abort(MPIR_Process.comm_world, mpi_errno, -1, NULL); - } - /* XXX DJG FIXME should we be checking this? */ - /*MPIU_Assert(req->ref_count == 0);*/ - if (req->ref_count != 0) - { - int mpi_errno = MPIR_Err_create_code(MPI_SUCCESS, MPIR_ERR_FATAL, - FCNAME, __LINE__, MPI_ERR_OTHER, - "**invalid_refcount", "**invalid_refcount %d", req->ref_count); - MPID_Abort(MPIR_Process.comm_world, mpi_errno, -1, NULL); - } -#endif - - /* FIXME: We need a better way to handle these so that we do - not always need to initialize these fields and check them - when we destroy a request */ - /* FIXME: We need a way to call these routines ONLY when the - related ref count has become zero. */ - if (req->comm != NULL) { - MPIR_Comm_release(req->comm); - } - - if (req->greq_fns != NULL) { - MPL_free(req->greq_fns); - } - - if (req->dev.datatype_ptr != NULL) { - MPIDU_Datatype_release(req->dev.datatype_ptr); - } - - if (req->dev.segment_ptr != NULL) { - MPIDU_Segment_free(req->dev.segment_ptr); - } + if (req->dev.datatype_ptr != NULL) { + MPIDU_Datatype_release(req->dev.datatype_ptr); + } - if (MPIDI_Request_get_srbuf_flag(req)) { - MPIDI_CH3U_SRBuf_free(req); - } + if (req->dev.segment_ptr != NULL) { + MPIDU_Segment_free(req->dev.segment_ptr); + } - if (req->dev.ext_hdr_ptr != NULL) { - MPL_free(req->dev.ext_hdr_ptr); - } + if (MPIDI_Request_get_srbuf_flag(req)) { + MPIDI_CH3U_SRBuf_free(req); + } - MPIU_Handle_obj_free(&MPIR_Request_mem, req); + if (req->dev.ext_hdr_ptr != NULL) { + MPL_free(req->dev.ext_hdr_ptr); } } diff --git a/src/mpid/ch3/src/ch3u_rma_pkthandler.c b/src/mpid/ch3/src/ch3u_rma_pkthandler.c index 26341aa..310a6d8 100644 --- a/src/mpid/ch3/src/ch3u_rma_pkthandler.c +++ b/src/mpid/ch3/src/ch3u_rma_pkthandler.c @@ -315,7 +315,7 @@ int MPIDI_CH3_PktHandler_Put(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, data_len = *buflen - sizeof(MPIDI_CH3_Pkt_t); data_buf = (char *) pkt + sizeof(MPIDI_CH3_Pkt_t); - req = MPID_Request_create(); + req = MPIR_Request_create(); MPIU_Object_set_ref(req, 1); req->dev.user_buf = put_pkt->addr; @@ -464,7 +464,7 @@ int MPIDI_CH3_PktHandler_Get(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, goto fn_exit; } - req = MPID_Request_create(); + req = MPIR_Request_create(); req->dev.target_win_handle = get_pkt->target_win_handle; req->dev.flags = get_pkt->flags; @@ -530,7 +530,7 @@ int MPIDI_CH3_PktHandler_Get(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, MPID_THREAD_CS_EXIT(POBJ, vc->pobj_mutex); /* --BEGIN ERROR HANDLING-- */ if (mpi_errno != MPI_SUCCESS) { - MPID_Request_release(req); + MPIR_Request_free(req); MPIR_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**ch3|rmamsg"); } /* --END ERROR HANDLING-- */ @@ -547,7 +547,7 @@ int MPIDI_CH3_PktHandler_Get(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, MPID_THREAD_CS_EXIT(POBJ, vc->pobj_mutex); /* --BEGIN ERROR HANDLING-- */ if (mpi_errno != MPI_SUCCESS) { - MPID_Request_release(req); + MPIR_Request_free(req); MPIR_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**ch3|rmamsg"); } /* --END ERROR HANDLING-- */ @@ -705,7 +705,7 @@ int MPIDI_CH3_PktHandler_Accumulate(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, else { MPIU_Assert(pkt->type == MPIDI_CH3_PKT_ACCUMULATE); - req = MPID_Request_create(); + req = MPIR_Request_create(); MPIU_Object_set_ref(req, 1); *rreqp = req; @@ -905,7 +905,7 @@ int MPIDI_CH3_PktHandler_GetAccumulate(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, /* Immed packet type is used when target datatype is predefined datatype. */ MPIU_Assert(MPIR_DATATYPE_IS_PREDEFINED(get_accum_pkt->datatype)); - resp_req = MPID_Request_create(); + resp_req = MPIR_Request_create(); resp_req->dev.target_win_handle = get_accum_pkt->target_win_handle; resp_req->dev.flags = get_accum_pkt->flags; @@ -968,7 +968,7 @@ int MPIDI_CH3_PktHandler_GetAccumulate(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, MPID_THREAD_CS_EXIT(POBJ, vc->pobj_mutex); /* --BEGIN ERROR HANDLING-- */ if (mpi_errno != MPI_SUCCESS) { - MPID_Request_release(resp_req); + MPIR_Request_free(resp_req); MPIR_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**ch3|rmamsg"); } /* --END ERROR HANDLING-- */ @@ -978,7 +978,7 @@ int MPIDI_CH3_PktHandler_GetAccumulate(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, MPIU_Assert(pkt->type == MPIDI_CH3_PKT_GET_ACCUM); - req = MPID_Request_create(); + req = MPIR_Request_create(); MPIU_Object_set_ref(req, 1); *rreqp = req; @@ -1230,11 +1230,11 @@ int MPIDI_CH3_PktHandler_CAS(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, * operation are completed when counter reaches zero. */ win_ptr->at_completion_counter++; - MPID_Request_release(req); + MPIR_Request_free(req); goto fn_exit; } else - MPID_Request_release(req); + MPIR_Request_free(req); } mpi_errno = finish_op_on_target(win_ptr, vc, TRUE /* has response data */ , @@ -1409,11 +1409,11 @@ int MPIDI_CH3_PktHandler_FOP(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, * operation are completed when counter reaches zero. */ win_ptr->at_completion_counter++; - MPID_Request_release(resp_req); + MPIR_Request_free(resp_req); goto fn_exit; } else { - MPID_Request_release(resp_req); + MPIR_Request_free(resp_req); } } @@ -1436,7 +1436,7 @@ int MPIDI_CH3_PktHandler_FOP(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, if (fop_pkt->op == MPI_NO_OP) is_empty_origin = TRUE; - req = MPID_Request_create(); + req = MPIR_Request_create(); MPIU_Object_set_ref(req, 1); MPIDI_Request_set_type(req, MPIDI_REQUEST_TYPE_FOP_RECV); *rreqp = req; diff --git a/src/mpid/ch3/src/ch3u_rma_reqops.c b/src/mpid/ch3/src/ch3u_rma_reqops.c index 4393c52..70401ca 100644 --- a/src/mpid/ch3/src/ch3u_rma_reqops.c +++ b/src/mpid/ch3/src/ch3u_rma_reqops.c @@ -37,7 +37,7 @@ int MPID_Rput(const void *origin_addr, int origin_count, MPIDI_Datatype_get_info(origin_count, origin_datatype, dt_contig, data_sz, dtp, dt_true_lb); /* Create user request, initially cc=1, ref=1 */ - ureq = MPID_Request_create(); + ureq = MPIR_Request_create(); MPIR_ERR_CHKANDJUMP(ureq == NULL, mpi_errno, MPI_ERR_OTHER, "**nomemreq"); ureq->kind = MPIR_WIN_REQUEST; @@ -100,7 +100,7 @@ int MPID_Rget(void *origin_addr, int origin_count, MPIDI_Datatype_get_info(origin_count, origin_datatype, dt_contig, data_sz, dtp, dt_true_lb); /* Create user request, initially cc=1, ref=1 */ - ureq = MPID_Request_create(); + ureq = MPIR_Request_create(); MPIR_ERR_CHKANDJUMP(ureq == NULL, mpi_errno, MPI_ERR_OTHER, "**nomemreq"); ureq->kind = MPIR_WIN_REQUEST; @@ -161,7 +161,7 @@ int MPID_Raccumulate(const void *origin_addr, int origin_count, mpi_errno, MPI_ERR_RMA_SYNC, "**rmasync"); /* Create user request, initially cc=1, ref=1 */ - ureq = MPID_Request_create(); + ureq = MPIR_Request_create(); MPIR_ERR_CHKANDJUMP(ureq == NULL, mpi_errno, MPI_ERR_OTHER, "**nomemreq"); ureq->kind = MPIR_WIN_REQUEST; @@ -225,7 +225,7 @@ int MPID_Rget_accumulate(const void *origin_addr, int origin_count, mpi_errno, MPI_ERR_RMA_SYNC, "**rmasync"); /* Create user request, initially cc=1, ref=1 */ - ureq = MPID_Request_create(); + ureq = MPIR_Request_create(); MPIR_ERR_CHKANDJUMP(ureq == NULL, mpi_errno, MPI_ERR_OTHER, "**nomemreq"); ureq->kind = MPIR_WIN_REQUEST; diff --git a/src/mpid/ch3/src/ch3u_rma_sync.c b/src/mpid/ch3/src/ch3u_rma_sync.c index 93d16c5..10a5248 100644 --- a/src/mpid/ch3/src/ch3u_rma_sync.c +++ b/src/mpid/ch3/src/ch3u_rma_sync.c @@ -548,7 +548,7 @@ int MPID_Win_fence(int assert, MPIR_Win * win_ptr) win_ptr->states.access_state = MPIDI_RMA_FENCE_GRANTED; } - MPID_Request_release(req_ptr); + MPIR_Request_free(req_ptr); } goto finish_fence; @@ -672,7 +672,7 @@ int MPID_Win_fence(int assert, MPIR_Win * win_ptr) win_ptr->states.access_state = MPIDI_RMA_FENCE_GRANTED; } - MPID_Request_release(req_ptr); + MPIR_Request_free(req_ptr); } if (win_ptr->shm_allocated == TRUE) { @@ -909,7 +909,7 @@ int MPID_Win_start(MPIR_Group * group_ptr, int assert, MPIR_Win * win_ptr) win_ptr->sync_request_cnt++; } - MPID_Request_release(req_ptr); + MPIR_Request_free(req_ptr); } } } diff --git a/src/mpid/ch3/src/ch3u_rndv.c b/src/mpid/ch3/src/ch3u_rndv.c index a044460..a684b04 100644 --- a/src/mpid/ch3/src/ch3u_rndv.c +++ b/src/mpid/ch3/src/ch3u_rndv.c @@ -56,7 +56,7 @@ int MPIDI_CH3_RndvSend( MPIR_Request **sreq_p, const void * buf, MPI_Aint count, /* --BEGIN ERROR HANDLING-- */ if (mpi_errno != MPI_SUCCESS) { - MPID_Request_release(sreq); + MPIR_Request_free(sreq); *sreq_p = NULL; MPIR_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**ch3|rtspkt"); } @@ -65,13 +65,13 @@ int MPIDI_CH3_RndvSend( MPIR_Request **sreq_p, const void * buf, MPI_Aint count, { if (rts_sreq->status.MPI_ERROR != MPI_SUCCESS) { - MPID_Request_release(sreq); + MPIR_Request_free(sreq); *sreq_p = NULL; mpi_errno = rts_sreq->status.MPI_ERROR; - MPID_Request_release(rts_sreq); + MPIR_Request_free(rts_sreq); MPIR_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**ch3|rtspkt"); } - MPID_Request_release(rts_sreq); + MPIR_Request_free(rts_sreq); } /* FIXME: fill temporary IOV or pack temporary buffer after send to hide @@ -165,7 +165,7 @@ int MPIDI_CH3_PktHandler_RndvReqToSend( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, "**ch3|ctspkt"); } if (cts_req != NULL) { - MPID_Request_release(cts_req); + MPIR_Request_free(cts_req); } } else @@ -227,7 +227,7 @@ int MPIDI_CH3_PktHandler_RndvClrToSend( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, MPIDI_Request_fetch_and_clear_rts_sreq(sreq, &rts_sreq); if (rts_sreq != NULL) { - MPID_Request_release(rts_sreq); + MPIR_Request_free(rts_sreq); } *buflen = sizeof(MPIDI_CH3_Pkt_t); @@ -369,7 +369,7 @@ int MPIDI_CH3_RecvRndv( MPIDI_VC_t * vc, MPIR_Request *rreq ) /* FIXME: Ideally we could specify that a req not be returned. This would avoid our having to decrement the reference count on a req we don't want/need. */ - MPID_Request_release(cts_req); + MPIR_Request_free(cts_req); } fn_fail: diff --git a/src/mpid/ch3/src/mpid_cancel_send.c b/src/mpid/ch3/src/mpid_cancel_send.c index a0e2eae..3583b0c 100644 --- a/src/mpid/ch3/src/mpid_cancel_send.c +++ b/src/mpid/ch3/src/mpid_cancel_send.c @@ -72,8 +72,8 @@ int MPID_Cancel_send(MPIR_Request * sreq) * reference. We explicitly drop a second reference, * because the receive request will never be visible to * the user. */ - MPID_Request_release(rreq); - MPID_Request_release(rreq); + MPIR_Request_free(rreq); + MPIR_Request_free(rreq); MPIR_STATUS_SET_CANCEL_BIT(sreq->status, TRUE); mpi_errno = MPID_Request_complete(sreq); @@ -126,7 +126,7 @@ int MPID_Cancel_send(MPIR_Request * sreq) /* since we attempted to cancel a RTS request, then we are responsible for releasing that request */ - MPID_Request_release(rts_sreq); + MPIR_Request_free(rts_sreq); /* --BEGIN ERROR HANDLING-- */ if (mpi_errno != MPI_SUCCESS) @@ -204,7 +204,7 @@ int MPID_Cancel_send(MPIR_Request * sreq) } if (csr_sreq != NULL) { - MPID_Request_release(csr_sreq); + MPIR_Request_free(csr_sreq); } } @@ -256,9 +256,9 @@ int MPIDI_CH3_PktHandler_CancelSendReq( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, } if (MPIDI_Request_get_msg_type(rreq) == MPIDI_REQUEST_RNDV_MSG) { - MPID_Request_release(rreq); + MPIR_Request_free(rreq); } - MPID_Request_release(rreq); + MPIR_Request_free(rreq); ack = TRUE; } else @@ -280,7 +280,7 @@ int MPIDI_CH3_PktHandler_CancelSendReq( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, } if (resp_sreq != NULL) { - MPID_Request_release(resp_sreq); + MPIR_Request_free(resp_sreq); } *rreqp = NULL; diff --git a/src/mpid/ch3/src/mpid_comm_revoke.c b/src/mpid/ch3/src/mpid_comm_revoke.c index 5c1cc3e..56e6abd 100644 --- a/src/mpid/ch3/src/mpid_comm_revoke.c +++ b/src/mpid/ch3/src/mpid_comm_revoke.c @@ -70,7 +70,7 @@ int MPID_Comm_revoke(MPIR_Comm *comm_ptr, int is_remote) /* We don't need to keep a reference to this request. The * progress engine will keep a reference until it completes * later */ - MPID_Request_release(request); + MPIR_Request_free(request); } /* Check to see if we are done revoking */ diff --git a/src/mpid/ch3/src/mpid_imrecv.c b/src/mpid/ch3/src/mpid_imrecv.c index 99292b5..4dde4eb 100644 --- a/src/mpid/ch3/src/mpid_imrecv.c +++ b/src/mpid/ch3/src/mpid_imrecv.c @@ -128,7 +128,7 @@ int MPID_Imrecv(void *buf, int count, MPI_Datatype datatype, #ifdef HAVE_ERROR_CHECKING int msg_type = MPIDI_Request_get_msg_type(rreq); #endif - MPID_Request_release(rreq); + MPIR_Request_free(rreq); rreq = NULL; MPIR_ERR_SETANDJUMP1(mpi_errno,MPI_ERR_INTERN, "**ch3|badmsgtype", "**ch3|badmsgtype %d", msg_type); diff --git a/src/mpid/ch3/src/mpid_irecv.c b/src/mpid/ch3/src/mpid_irecv.c index bc56710..55b7bc3 100644 --- a/src/mpid/ch3/src/mpid_irecv.c +++ b/src/mpid/ch3/src/mpid_irecv.c @@ -135,7 +135,7 @@ int MPID_Irecv(void * buf, MPI_Aint count, MPI_Datatype datatype, int rank, int #ifdef HAVE_ERROR_CHECKING int msg_type = MPIDI_Request_get_msg_type(rreq); #endif - MPID_Request_release(rreq); + MPIR_Request_free(rreq); rreq = NULL; MPIR_ERR_SETANDJUMP1(mpi_errno,MPI_ERR_INTERN, "**ch3|badmsgtype", "**ch3|badmsgtype %d", msg_type); diff --git a/src/mpid/ch3/src/mpid_irsend.c b/src/mpid/ch3/src/mpid_irsend.c index def0046..5b651e0 100644 --- a/src/mpid/ch3/src/mpid_irsend.c +++ b/src/mpid/ch3/src/mpid_irsend.c @@ -100,7 +100,7 @@ int MPID_Irsend(const void * buf, int count, MPI_Datatype datatype, int rank, in /* --BEGIN ERROR HANDLING-- */ if (mpi_errno != MPI_SUCCESS) { - MPID_Request_release(sreq); + MPIR_Request_free(sreq); sreq = NULL; MPIR_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**ch3|eagermsg"); goto fn_exit; diff --git a/src/mpid/ch3/src/mpid_isend.c b/src/mpid/ch3/src/mpid_isend.c index 3b98f39..f1ebd05 100644 --- a/src/mpid/ch3/src/mpid_isend.c +++ b/src/mpid/ch3/src/mpid_isend.c @@ -117,7 +117,7 @@ int MPID_Isend(const void * buf, MPI_Aint count, MPI_Datatype datatype, int rank /* --BEGIN ERROR HANDLING-- */ if (mpi_errno != MPI_SUCCESS) { - MPID_Request_release(sreq); + MPIR_Request_free(sreq); sreq = NULL; MPIR_ERR_SET(mpi_errno, MPI_ERR_OTHER, "**ch3|eagermsg"); goto fn_exit; diff --git a/src/mpid/ch3/src/mpid_recv.c b/src/mpid/ch3/src/mpid_recv.c index c738b9b..88f3311 100644 --- a/src/mpid/ch3/src/mpid_recv.c +++ b/src/mpid/ch3/src/mpid_recv.c @@ -103,7 +103,7 @@ int MPID_Recv(void * buf, MPI_Aint count, MPI_Datatype datatype, int rank, int t *status = rreq->status; } - MPID_Request_release(rreq); + MPIR_Request_free(rreq); rreq = NULL; goto fn_exit; @@ -151,7 +151,7 @@ int MPID_Recv(void * buf, MPI_Aint count, MPI_Datatype datatype, int rank, int t #ifdef HAVE_ERROR_CHECKING int msg_type = MPIDI_Request_get_msg_type(rreq); #endif - MPID_Request_release(rreq); + MPIR_Request_free(rreq); rreq = NULL; MPIR_ERR_SETANDJUMP1(mpi_errno,MPI_ERR_INTERN, "**ch3|badmsgtype", "**ch3|badmsgtype %d", msg_type); diff --git a/src/mpid/ch3/src/mpid_startall.c b/src/mpid/ch3/src/mpid_startall.c index 0adec4b..fc103a8 100644 --- a/src/mpid/ch3/src/mpid_startall.c +++ b/src/mpid/ch3/src/mpid_startall.c @@ -22,7 +22,7 @@ /* This macro initializes all of the fields in a persistent request */ #define MPIDI_Request_create_psreq(sreq_, mpi_errno_, FAIL_) \ { \ - (sreq_) = MPID_Request_create(); \ + (sreq_) = MPIR_Request_create(); \ if ((sreq_) == NULL) \ { \ MPL_DBG_MSG(MPIDI_CH3_DBG_OTHER,VERBOSE,"send request allocation failed");\ @@ -299,7 +299,7 @@ int MPID_Recv_init(void * buf, int count, MPI_Datatype datatype, int rank, int t MPIDI_FUNC_ENTER(MPID_STATE_MPID_RECV_INIT); - rreq = MPID_Request_create(); + rreq = MPIR_Request_create(); if (rreq == NULL) { /* --BEGIN ERROR HANDLING-- */ diff --git a/src/mpid/ch3/src/mpidi_isend_self.c b/src/mpid/ch3/src/mpidi_isend_self.c index f9dc247..b5808a3 100644 --- a/src/mpid/ch3/src/mpidi_isend_self.c +++ b/src/mpid/ch3/src/mpidi_isend_self.c @@ -49,8 +49,8 @@ int MPIDI_Isend_self(const void * buf, MPI_Aint count, MPI_Datatype datatype, in * progress engine reference and the second to release the * user reference since the user will never have a chance to * release their reference. */ - MPID_Request_release(sreq); - MPID_Request_release(sreq); + MPIR_Request_free(sreq); + MPIR_Request_free(sreq); sreq = NULL; MPIR_ERR_SET1(mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomemuereq %d", MPIDI_CH3U_Recvq_count_unexp()); @@ -66,8 +66,8 @@ int MPIDI_Isend_self(const void * buf, MPI_Aint count, MPI_Datatype datatype, in * progress engine reference and the second to release the * user reference since the user will never have a chance to * release their reference. */ - MPID_Request_release(sreq); - MPID_Request_release(sreq); + MPIR_Request_free(sreq); + MPIR_Request_free(sreq); sreq = NULL; goto fn_exit; } diff --git a/src/mpid/common/hcoll/hcoll_rte.c b/src/mpid/common/hcoll/hcoll_rte.c index bf86405..68d479a 100644 --- a/src/mpid/common/hcoll/hcoll_rte.c +++ b/src/mpid/common/hcoll/hcoll_rte.c @@ -263,7 +263,7 @@ static int test(rte_request_handle_t * request, int *completed) *completed = (int) MPIR_Request_is_complete(req); if (*completed) { - MPID_Request_release(req); + MPIR_Request_free(req); request->status = HCOLRTE_REQUEST_DONE; } @@ -386,7 +386,7 @@ static int group_id(rte_grp_handle_t group) static void *get_coll_handle(void) { MPIR_Request *req; - req = MPID_Request_create(); + req = MPIR_Request_create(); req->kind = MPIR_COLL_REQUEST; return (void *) req; } @@ -413,7 +413,7 @@ static void coll_handle_free(void *handle) MPIR_Request *req; if (NULL != handle) { req = (MPIR_Request *) handle; - MPID_Request_release(req); + MPIR_Request_free(req); } } diff --git a/src/mpid/common/sched/mpidu_sched.c b/src/mpid/common/sched/mpidu_sched.c index 42a4ab4..3c95f20 100644 --- a/src/mpid/common/sched/mpidu_sched.c +++ b/src/mpid/common/sched/mpidu_sched.c @@ -407,7 +407,7 @@ int MPIDU_Sched_start(MPID_Sched_t * sp, MPIR_Comm * comm, int tag, MPIR_Request MPIU_Assert(s->entries != NULL); /* now create and populate the request */ - r = MPID_Request_create(); + r = MPIR_Request_create(); if (!r) MPIR_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**nomem"); r->kind = MPIR_COLL_REQUEST; @@ -450,8 +450,8 @@ int MPIDU_Sched_start(MPID_Sched_t * sp, MPIR_Comm * comm, int tag, MPIR_Request if (*req) *req = NULL; if (r) { - MPID_Request_release(r); /* the schedule's ref */ - MPID_Request_release(r); /* the user's ref */ + MPIR_Request_free(r); /* the schedule's ref */ + MPIR_Request_free(r); /* the user's ref */ } goto fn_exit; @@ -895,7 +895,7 @@ static int MPIDU_Sched_progress_state(struct MPIDU_Sched_state *state, int *made e->status = MPIDU_SCHED_ENTRY_STATUS_FAILED; else e->status = MPIDU_SCHED_ENTRY_STATUS_COMPLETE; - MPID_Request_release(e->u.send.sreq); + MPIR_Request_free(e->u.send.sreq); e->u.send.sreq = NULL; MPIR_Comm_release(e->u.send.comm); dtype_release_if_not_builtin(e->u.send.datatype); @@ -917,7 +917,7 @@ static int MPIDU_Sched_progress_state(struct MPIDU_Sched_state *state, int *made e->status = MPIDU_SCHED_ENTRY_STATUS_FAILED; else e->status = MPIDU_SCHED_ENTRY_STATUS_COMPLETE; - MPID_Request_release(e->u.recv.rreq); + MPIR_Request_free(e->u.recv.rreq); e->u.recv.rreq = NULL; MPIR_Comm_release(e->u.recv.comm); dtype_release_if_not_builtin(e->u.recv.datatype); diff --git a/src/mpid/pamid/src/mpid_request.h b/src/mpid/pamid/src/mpid_request.h index 04bafa4..5f74269 100644 --- a/src/mpid/pamid/src/mpid_request.h +++ b/src/mpid/pamid/src/mpid_request.h @@ -30,8 +30,8 @@ * \{ */ -#define MPID_Request_create MPID_Request_create_inline -#define MPID_Request_release MPID_Request_release_inline +#define MPIR_Request_create MPID_Request_create_inline +#define MPIR_Request_free MPID_Request_free_inline #define MPIDI_Request_complete MPIDI_Request_complete_inline #define MPIDI_Request_complete_norelease MPIDI_Request_complete_norelease_inline #define MPID_Request_discard MPID_Request_discard_inline @@ -238,7 +238,7 @@ static inline MPIR_Request * MPIDI_Request_create2() { MPIR_Request * req; - req = MPID_Request_create(); + req = MPIR_Request_create(); MPIU_Object_set_ref(req, 2); return req; @@ -248,7 +248,7 @@ static inline MPIR_Request * MPIDI_Request_create1() { MPIR_Request * req; - req = MPID_Request_create(); + req = MPIR_Request_create(); MPIU_Object_set_ref(req, 1); return req; @@ -268,7 +268,7 @@ MPIDI_Request_create1() static inline void -MPID_Request_release_inline(MPIR_Request *req) +MPID_Request_free_inline(MPIR_Request *req) { int count; MPID_assert(HANDLE_GET_MPI_KIND(req->handle) == MPIR_REQUEST); @@ -326,7 +326,7 @@ MPIDI_Request_complete_inline(MPIR_Request *req) MPIR_cc_decr(req->cc_ptr, &count); MPID_assert(count >= 0); - MPID_Request_release(req); + MPIR_Request_free(req); if (count == 0) /* decrement completion count; if 0, signal progress engine */ { MPIDI_Progress_signal(); diff --git a/src/mpid/pamid/src/onesided/mpid_1s.c b/src/mpid/pamid/src/onesided/mpid_1s.c index c7e11f8..e9a49b0 100644 --- a/src/mpid/pamid/src/onesided/mpid_1s.c +++ b/src/mpid/pamid/src/onesided/mpid_1s.c @@ -77,7 +77,7 @@ MPIDI_Win_DoneCB(pami_context_t context, * portion of the request structure after decrementing the completion * counter. * - * See MPID_Request_release_inline() + * See MPID_Request_free_inline() */ MPIR_cc_set(req_handle->cc_ptr, 0); } diff --git a/src/mpid/pamid/src/onesided/mpid_win_get.c b/src/mpid/pamid/src/onesided/mpid_win_get.c index 8252d3f..f9cd4b3 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_get.c +++ b/src/mpid/pamid/src/onesided/mpid_win_get.c @@ -316,7 +316,7 @@ MPID_Get(void *origin_addr, * portion of the request structure after decrementing the completion * counter. * - * See MPID_Request_release_inline() + * See MPID_Request_free_inline() */ if(req->req_handle) MPIR_cc_set(req->req_handle->cc_ptr, 0); diff --git a/src/mpid/pamid/src/onesided/mpid_win_get_accumulate.c b/src/mpid/pamid/src/onesided/mpid_win_get_accumulate.c index bd5cbf3..54b90da 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_get_accumulate.c +++ b/src/mpid/pamid/src/onesided/mpid_win_get_accumulate.c @@ -199,7 +199,7 @@ MPIDI_Win_GetAccDoneCB(pami_context_t context, * portion of the request structure after decrementing the completion * counter. * - * See MPID_Request_release_inline() + * See MPID_Request_free_inline() */ if(req_handle) MPIR_cc_set(req_handle->cc_ptr, 0); diff --git a/src/mpid/pamid/src/onesided/mpid_win_put.c b/src/mpid/pamid/src/onesided/mpid_win_put.c index 5ce9f20..9e70f56 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_put.c +++ b/src/mpid/pamid/src/onesided/mpid_win_put.c @@ -319,7 +319,7 @@ MPID_Put(const void *origin_addr, * portion of the request structure after decrementing the completion * counter. * - * See MPID_Request_release_inline() + * See MPID_Request_free_inline() */ if(req->req_handle) MPIR_cc_set(req->req_handle->cc_ptr, 0); diff --git a/src/mpid/pamid/src/pt2pt/mpidi_callback_eager.c b/src/mpid/pamid/src/pt2pt/mpidi_callback_eager.c index 147d58c..51b876e 100644 --- a/src/mpid/pamid/src/pt2pt/mpidi_callback_eager.c +++ b/src/mpid/pamid/src/pt2pt/mpidi_callback_eager.c @@ -162,7 +162,7 @@ MPIDI_RecvCB(pami_context_t context, #endif } MPIU_THREAD_CS_EXIT(MSGQUEUE,0); - if (completed) MPID_Request_release(newreq); + if (completed) MPIR_Request_free(newreq); goto fn_exit_eager; } else diff --git a/src/mpid/pamid/src/pt2pt/mpidi_callback_short.c b/src/mpid/pamid/src/pt2pt/mpidi_callback_short.c index 65feda1..8ecbef2 100644 --- a/src/mpid/pamid/src/pt2pt/mpidi_callback_short.c +++ b/src/mpid/pamid/src/pt2pt/mpidi_callback_short.c @@ -124,7 +124,7 @@ MPIDI_RecvShortCB(pami_context_t context, #endif } MPIU_THREAD_CS_EXIT(MSGQUEUE,0); - MPID_Request_release(newreq); + MPIR_Request_free(newreq); goto fn_exit_short; } else diff --git a/src/mpid/pamid/src/pt2pt/mpidi_callback_util.c b/src/mpid/pamid/src/pt2pt/mpidi_callback_util.c index 8e43697..ca34ec5 100644 --- a/src/mpid/pamid/src/pt2pt/mpidi_callback_util.c +++ b/src/mpid/pamid/src/pt2pt/mpidi_callback_util.c @@ -131,7 +131,7 @@ MPIDI_Callback_process_trunc(pami_context_t context, rreq->mpid.uebuflen = MPIR_STATUS_GET_COUNT(rreq->status); rreq->mpid.uebuf = (void*)sndbuf; MPIDI_RecvDoneCB(context, rreq, PAMI_SUCCESS); - MPID_Request_release(rreq); + MPIR_Request_free(rreq); } } @@ -191,5 +191,5 @@ MPIDI_Callback_process_userdefined_dt(pami_context_t context, rreq->mpid.uebuflen = sndlen; rreq->mpid.uebuf = (void*)sndbuf; MPIDI_RecvDoneCB(context, rreq, PAMI_SUCCESS); - MPID_Request_release(rreq); + MPIR_Request_free(rreq); } diff --git a/src/mpid/pamid/src/pt2pt/mpidi_control.c b/src/mpid/pamid/src/pt2pt/mpidi_control.c index c4d48f6..d2e2b87 100644 --- a/src/mpid/pamid/src/pt2pt/mpidi_control.c +++ b/src/mpid/pamid/src/pt2pt/mpidi_control.c @@ -104,7 +104,7 @@ MPIDI_RecvRzvDoneCB(pami_context_t context, #endif MPIDI_RecvDoneCB(context, rreq, PAMI_SUCCESS); - MPID_Request_release(rreq); + MPIR_Request_free(rreq); } /** @@ -135,7 +135,7 @@ MPIDI_RecvRzvDoneCB_zerobyte(pami_context_t context, TRACE_SET_R_BIT(MPIDI_Request_getPeerRank_pami(rreq),(rreq->mpid.idx),fl.f.sync_com_in_HH); TRACE_SET_R_BIT(MPIDI_Request_getPeerRank_pami(rreq),(rreq->mpid.idx),fl.f.matchedInHH); TRACE_SET_R_VAL(MPIDI_Request_getPeerRank_pami(rreq),(rreq->mpid.idx),bufadd,rreq->mpid.userbuf); - MPID_Request_release(rreq); + MPIR_Request_free(rreq); } /** @@ -273,7 +273,7 @@ MPIDI_CancelReq_proc(pami_context_t context, info->MPIctxt); if(sreq) { - MPID_Request_release(sreq); + MPIR_Request_free(sreq); type = MPIDI_CONTROL_CANCEL_ACKNOWLEDGE; } else diff --git a/src/mpid/pamid/src/pt2pt/mpidi_done.c b/src/mpid/pamid/src/pt2pt/mpidi_done.c index 0e767d4..8034b43 100644 --- a/src/mpid/pamid/src/pt2pt/mpidi_done.c +++ b/src/mpid/pamid/src/pt2pt/mpidi_done.c @@ -128,7 +128,7 @@ MPIDI_RecvDoneCB_mutexed(pami_context_t context, MPIDI_RecvDoneCB(context, clientdata, result); MPIU_THREAD_CS_EXIT(MSGQUEUE, 0); - MPID_Request_release(rreq); + MPIR_Request_free(rreq); } @@ -226,7 +226,7 @@ void MPIDI_Recvq_process_out_of_order_msgs(pami_task_t src, pami_context_t conte rreq->mpid.envelope.msginfo.MPIseqno = ooreq->mpid.envelope.msginfo.MPIseqno; MPIDI_Request_complete(rreq); } - MPID_Request_release(ooreq); + MPIR_Request_free(ooreq); } else { if (MPIDI_Request_getMatchSeq(ooreq) == (in_cntr->nMsgs+ 1)) http://git.mpich.org/mpich.git/commitdiff/19e8742ad7662dfe1f715b172461b0bfd… commit 19e8742ad7662dfe1f715b172461b0bfd4db5947 Author: Wesley Bland <wesley.bland(a)intel.com> Date: Tue Apr 19 10:45:37 2016 -0500 Rename object types to MPIR Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/maint/decode_handle b/maint/decode_handle index 71652fa..6ac7cb3 100755 --- a/maint/decode_handle +++ b/maint/decode_handle @@ -59,24 +59,24 @@ while (scalar @ARGV) { ## code from src/include/mpihandlemem.h from which this script was derived ## ----8<---- -## +## ## typedef enum MPIR_Object_kind { -## MPID_COMM = 0x1, -## MPID_GROUP = 0x2, +## MPIR_COMM = 0x1, +## MPIR_GROUP = 0x2, ## MPIR_DATATYPE = 0x3, -## MPID_FILE = 0x4, /* This is not used */ -## MPID_ERRHANDLER = 0x5, -## MPID_OP = 0x6, +## MPIR_FILE = 0x4, /* This is not used */ +## MPIR_ERRHANDLER = 0x5, +## MPIR_OP = 0x6, ## MPIR_INFO = 0x7, -## MPID_WIN = 0x8, +## MPIR_WIN = 0x8, ## MPID_KEYVAL = 0x9, -## MPID_ATTR = 0xa, +## MPIR_ATTR = 0xa, ## MPIR_REQUEST = 0xb, -## MPID_PROCGROUP = 0xc, /* These are internal device objects */ -## MPID_VCONN = 0xd, -## MPID_GREQ_CLASS = 0xf +## MPIR_PROCGROUP = 0xc, /* These are internal device objects */ +## MPIR_VCONN = 0xd, +## MPIR_GREQ_CLASS = 0xf ## } MPIR_Object_kind; -## +## ## #define HANDLE_MPI_KIND_SHIFT 26 ## #define HANDLE_GET_MPI_KIND(a) ( ((a)&0x3c000000) >> HANDLE_MPI_KIND_SHIFT ) ## #define HANDLE_SET_MPI_KIND(a,kind) ((a) | ((kind) << HANDLE_MPI_KIND_SHIFT)) diff --git a/src/include/mpierrs.h b/src/include/mpierrs.h index 506d063..0d0cb18 100644 --- a/src/include/mpierrs.h +++ b/src/include/mpierrs.h @@ -360,7 +360,7 @@ cvars: MPIR_ERR_SETANDSTMT(err,MPI_ERR_OP,goto fn_fail,"**opnotallowed"); \ } \ else { \ - MPIR_ERRTEST_VALID_HANDLE(op,MPID_OP,err,MPI_ERR_OP,"**op"); \ + MPIR_ERRTEST_VALID_HANDLE(op,MPIR_OP,err,MPI_ERR_OP,"**op"); \ } \ } while (0) @@ -373,7 +373,7 @@ cvars: MPIR_ERR_SETANDSTMT(err,MPI_ERR_OP,goto fn_fail,"**opnotallowed"); \ } \ else { \ - MPIR_ERRTEST_VALID_HANDLE(op,MPID_OP,err,MPI_ERR_OP,"**op"); \ + MPIR_ERRTEST_VALID_HANDLE(op,MPIR_OP,err,MPI_ERR_OP,"**op"); \ } \ if (HANDLE_GET_KIND(op) != HANDLE_KIND_BUILTIN) { \ MPIR_ERR_SETANDSTMT(err,MPI_ERR_OP,goto fn_fail,"**opnotpredefined"); \ @@ -386,7 +386,7 @@ cvars: MPIR_ERR_SETANDSTMT(err,MPI_ERR_OP,goto fn_fail,"**opnull"); \ } \ else { \ - MPIR_ERRTEST_VALID_HANDLE(op,MPID_OP,err,MPI_ERR_OP,"**op"); \ + MPIR_ERRTEST_VALID_HANDLE(op,MPIR_OP,err,MPI_ERR_OP,"**op"); \ } \ if (HANDLE_GET_KIND(op) != HANDLE_KIND_BUILTIN) { \ MPIR_ERR_SETANDSTMT(err,MPI_ERR_OP,goto fn_fail,"**opnotpredefined"); \ @@ -398,7 +398,7 @@ cvars: MPIR_ERR_SETANDSTMT(err,MPI_ERR_GROUP,goto fn_fail,"**groupnull"); \ } \ else { \ - MPIR_ERRTEST_VALID_HANDLE(group,MPID_GROUP,err,MPI_ERR_GROUP,"**group"); \ + MPIR_ERRTEST_VALID_HANDLE(group,MPIR_GROUP,err,MPI_ERR_GROUP,"**group"); \ } #define MPIR_ERRTEST_COMM(comm_, err_) \ @@ -409,7 +409,7 @@ cvars: } \ else \ { \ - MPIR_ERRTEST_VALID_HANDLE((comm_), MPID_COMM, (err_), MPI_ERR_COMM, "**comm"); \ + MPIR_ERRTEST_VALID_HANDLE((comm_), MPIR_COMM, (err_), MPI_ERR_COMM, "**comm"); \ } \ } @@ -467,7 +467,7 @@ cvars: MPIR_ERR_SETANDSTMT(err_,MPI_ERR_ARG,goto fn_fail,"**errhandlernull"); \ } \ else { \ - MPIR_ERRTEST_VALID_HANDLE(errhandler_,MPID_ERRHANDLER, \ + MPIR_ERRTEST_VALID_HANDLE(errhandler_,MPIR_ERRHANDLER, \ err_,MPI_ERR_ARG,"**errhandler"); \ } @@ -497,7 +497,7 @@ cvars: { \ MPIR_ERR_SETANDSTMT(err_, MPI_ERR_KEYVAL,goto fn_fail, "**keyvalinvalid"); \ } \ - else if (HANDLE_GET_MPI_KIND(keyval_) != MPID_KEYVAL) \ + else if (HANDLE_GET_MPI_KIND(keyval_) != MPIR_KEYVAL) \ { \ MPIR_ERR_SETANDSTMT(err_, MPI_ERR_KEYVAL,goto fn_fail, "**keyval"); \ } \ @@ -510,7 +510,7 @@ cvars: #define MPIR_ERRTEST_KEYVAL_PERM(keyval_, err_) \ { \ - if (HANDLE_GET_MPI_KIND(keyval_) == MPID_KEYVAL && \ + if (HANDLE_GET_MPI_KIND(keyval_) == MPIR_KEYVAL && \ HANDLE_GET_KIND(keyval_) == HANDLE_KIND_BUILTIN) \ { \ MPIR_ERR_SETANDSTMT(err_, MPI_ERR_KEYVAL,goto fn_fail, "**permattr"); \ diff --git a/src/include/mpihandlemem.h b/src/include/mpihandlemem.h index cb1ee58..91f993f 100644 --- a/src/include/mpihandlemem.h +++ b/src/include/mpihandlemem.h @@ -45,33 +45,33 @@ MPI handle represents. It is an enum because only this applies only the the MPI and internal MPICH objects. - The 'MPID_PROCGROUP' kind is used to manage process groups (different + The 'MPIR_PROCGROUP' kind is used to manage process groups (different from MPI Groups) that are used to keep track of collections of - processes (each 'MPID_PROCGROUP' corresponds to a group of processes - that define an 'MPI_COMM_WORLD'. This becomes important only - when MPI-2 dynamic process features are supported. 'MPID_VCONN' is + processes (each 'MPIR_PROCGROUP' corresponds to a group of processes + that define an 'MPI_COMM_WORLD'. This becomes important only + when MPI-2 dynamic process features are supported. 'MPIR_VCONN' is a virtual connection; while this is not part of the overall ADI3 design, an object that manages connections to other processes is - a common need, and 'MPID_VCONN' may be used for that. + a common need, and 'MPIR_VCONN' may be used for that. Module: Attribute-DS E*/ typedef enum MPIR_Object_kind { - MPID_COMM = 0x1, - MPID_GROUP = 0x2, + MPIR_COMM = 0x1, + MPIR_GROUP = 0x2, MPIR_DATATYPE = 0x3, - MPID_FILE = 0x4, /* only used obliquely inside MPIR_Errhandler objs */ - MPID_ERRHANDLER = 0x5, - MPID_OP = 0x6, + MPIR_FILE = 0x4, /* only used obliquely inside MPIR_Errhandler objs */ + MPIR_ERRHANDLER = 0x5, + MPIR_OP = 0x6, MPIR_INFO = 0x7, - MPID_WIN = 0x8, - MPID_KEYVAL = 0x9, - MPID_ATTR = 0xa, + MPIR_WIN = 0x8, + MPIR_KEYVAL = 0x9, + MPIR_ATTR = 0xa, MPIR_REQUEST = 0xb, - MPID_PROCGROUP = 0xc, /* These are internal device objects */ - MPID_VCONN = 0xd, - MPID_GREQ_CLASS = 0xf + MPIR_PROCGROUP = 0xc, /* These are internal device objects */ + MPIR_VCONN = 0xd, + MPIR_GREQ_CLASS = 0xf } MPIR_Object_kind; #define HANDLE_MPI_KIND_SHIFT 26 diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index eae4e84..c2df158 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -458,6 +458,7 @@ void MPIR_DatatypeAttrFinalize( void ); } \ } #define MPIR_Win_valid_ptr(ptr,err) MPIR_Valid_ptr_class(Win,ptr,MPI_ERR_WIN,err) +#define MPIR_Group_valid_ptr(ptr,err) MPIR_Valid_ptr_class(Win,ptr,MPI_ERR_GROUP,err) #define MPIR_Op_valid_ptr(ptr,err) MPIR_Valid_ptr_class(Op,ptr,MPI_ERR_OP,err) #define MPIR_Errhandler_valid_ptr(ptr,err) MPIR_Valid_ptr_class(Errhandler,ptr,MPI_ERR_ARG,err) #define MPIR_Request_valid_ptr(ptr,err) MPIR_Valid_ptr_class(Request,ptr,MPI_ERR_REQUEST,err) diff --git a/src/mpi/attr/attr_put.c b/src/mpi/attr/attr_put.c index e9541d7..b8d8870 100644 --- a/src/mpi/attr/attr_put.c +++ b/src/mpi/attr/attr_put.c @@ -88,7 +88,7 @@ int MPI_Attr_put(MPI_Comm comm, int keyval, void *attribute_val) MPID_BEGIN_ERROR_CHECKS; { MPIR_ERRTEST_COMM(comm, mpi_errno); - MPIR_ERRTEST_KEYVAL(keyval, MPID_COMM, "communicator", mpi_errno); + MPIR_ERRTEST_KEYVAL(keyval, MPIR_COMM, "communicator", mpi_errno); MPIR_ERRTEST_KEYVAL_PERM(keyval, mpi_errno); } MPID_END_ERROR_CHECKS; diff --git a/src/mpi/attr/attrutil.c b/src/mpi/attr/attrutil.c index 4daa2de..e84274a 100644 --- a/src/mpi/attr/attrutil.c +++ b/src/mpi/attr/attrutil.c @@ -28,21 +28,21 @@ /* Preallocated keyval objects */ MPIR_Keyval MPIR_Keyval_direct[MPID_KEYVAL_PREALLOC] = { {0} }; -MPIU_Object_alloc_t MPIR_Keyval_mem = { 0, 0, 0, 0, MPID_KEYVAL, +MPIU_Object_alloc_t MPIR_Keyval_mem = { 0, 0, 0, 0, MPIR_KEYVAL, sizeof(MPIR_Keyval), MPIR_Keyval_direct, MPID_KEYVAL_PREALLOC, }; -#ifndef MPID_ATTR_PREALLOC -#define MPID_ATTR_PREALLOC 32 +#ifndef MPIR_ATTR_PREALLOC +#define MPIR_ATTR_PREALLOC 32 #endif /* Preallocated keyval objects */ -MPIR_Attribute MPID_Attr_direct[MPID_ATTR_PREALLOC] = { {0} }; -MPIU_Object_alloc_t MPID_Attr_mem = { 0, 0, 0, 0, MPID_ATTR, +MPIR_Attribute MPID_Attr_direct[MPIR_ATTR_PREALLOC] = { {0} }; +MPIU_Object_alloc_t MPID_Attr_mem = { 0, 0, 0, 0, MPIR_ATTR, sizeof(MPIR_Attribute), MPID_Attr_direct, - MPID_ATTR_PREALLOC, }; + MPIR_ATTR_PREALLOC, }; /* Provides a way to trap all attribute allocations when debugging leaks. */ MPIR_Attribute *MPID_Attr_alloc(void) diff --git a/src/mpi/attr/comm_create_keyval.c b/src/mpi/attr/comm_create_keyval.c index cb0cea9..251052b 100644 --- a/src/mpi/attr/comm_create_keyval.c +++ b/src/mpi/attr/comm_create_keyval.c @@ -60,10 +60,10 @@ int MPIR_Comm_create_keyval_impl(MPI_Comm_copy_attr_function *comm_copy_attr_fn, /* The handle encodes the keyval kind. Modify it to have the correct field */ keyval_ptr->handle = (keyval_ptr->handle & ~(0x03c00000)) | - (MPID_COMM << 22); + (MPIR_COMM << 22); MPIU_Object_set_ref(keyval_ptr,1); keyval_ptr->was_freed = 0; - keyval_ptr->kind = MPID_COMM; + keyval_ptr->kind = MPIR_COMM; keyval_ptr->extra_state = extra_state; keyval_ptr->copyfn.user_function = comm_copy_attr_fn; keyval_ptr->copyfn.proxy = MPIR_Attr_copy_c_proxy; diff --git a/src/mpi/attr/comm_delete_attr.c b/src/mpi/attr/comm_delete_attr.c index 096178b..f35c18d 100644 --- a/src/mpi/attr/comm_delete_attr.c +++ b/src/mpi/attr/comm_delete_attr.c @@ -123,7 +123,7 @@ int MPI_Comm_delete_attr(MPI_Comm comm, int comm_keyval) MPID_BEGIN_ERROR_CHECKS; { MPIR_ERRTEST_COMM(comm, mpi_errno); - MPIR_ERRTEST_KEYVAL(comm_keyval, MPID_COMM, "communicator", mpi_errno); + MPIR_ERRTEST_KEYVAL(comm_keyval, MPIR_COMM, "communicator", mpi_errno); MPIR_ERRTEST_KEYVAL_PERM(comm_keyval, mpi_errno); } MPID_END_ERROR_CHECKS; diff --git a/src/mpi/attr/comm_free_keyval.c b/src/mpi/attr/comm_free_keyval.c index 9b0eaa7..6fa4922 100644 --- a/src/mpi/attr/comm_free_keyval.c +++ b/src/mpi/attr/comm_free_keyval.c @@ -87,7 +87,7 @@ int MPI_Comm_free_keyval(int *comm_keyval) MPID_BEGIN_ERROR_CHECKS; { MPIR_ERRTEST_ARGNULL(comm_keyval, "comm_keyval", mpi_errno); - MPIR_ERRTEST_KEYVAL(*comm_keyval, MPID_COMM, "communicator", mpi_errno); + MPIR_ERRTEST_KEYVAL(*comm_keyval, MPIR_COMM, "communicator", mpi_errno); MPIR_ERRTEST_KEYVAL_PERM(*comm_keyval, mpi_errno); } MPID_END_ERROR_CHECKS; diff --git a/src/mpi/attr/comm_get_attr.c b/src/mpi/attr/comm_get_attr.c index 8809278..8fd2d5d 100644 --- a/src/mpi/attr/comm_get_attr.c +++ b/src/mpi/attr/comm_get_attr.c @@ -56,7 +56,7 @@ int MPIR_CommGetAttr( MPI_Comm comm, int comm_keyval, void *attribute_val, MPID_BEGIN_ERROR_CHECKS; { MPIR_ERRTEST_COMM(comm, mpi_errno); - MPIR_ERRTEST_KEYVAL(comm_keyval, MPID_COMM, "communicator", mpi_errno); + MPIR_ERRTEST_KEYVAL(comm_keyval, MPIR_COMM, "communicator", mpi_errno); # ifdef NEEDS_POINTER_ALIGNMENT_ADJUST /* A common user error is to pass the address of a 4-byte int when the address of a pointer (or an address-sized int) diff --git a/src/mpi/attr/comm_set_attr.c b/src/mpi/attr/comm_set_attr.c index edd3e6e..ae7ff50 100644 --- a/src/mpi/attr/comm_set_attr.c +++ b/src/mpi/attr/comm_set_attr.c @@ -124,7 +124,7 @@ int MPIR_CommSetAttr( MPI_Comm comm, int comm_keyval, void *attribute_val, MPID_BEGIN_ERROR_CHECKS; { MPIR_ERRTEST_COMM(comm, mpi_errno); - MPIR_ERRTEST_KEYVAL(comm_keyval, MPID_COMM, "communicator", mpi_errno); + MPIR_ERRTEST_KEYVAL(comm_keyval, MPIR_COMM, "communicator", mpi_errno); MPIR_ERRTEST_KEYVAL_PERM(comm_keyval, mpi_errno); } MPID_END_ERROR_CHECKS; @@ -231,7 +231,7 @@ int MPI_Comm_set_attr(MPI_Comm comm, int comm_keyval, void *attribute_val) MPID_BEGIN_ERROR_CHECKS; { MPIR_ERRTEST_COMM(comm, mpi_errno); - MPIR_ERRTEST_KEYVAL(comm_keyval, MPID_COMM, "communicator", mpi_errno); + MPIR_ERRTEST_KEYVAL(comm_keyval, MPIR_COMM, "communicator", mpi_errno); MPIR_ERRTEST_KEYVAL_PERM(comm_keyval, mpi_errno); } MPID_END_ERROR_CHECKS; diff --git a/src/mpi/attr/win_create_keyval.c b/src/mpi/attr/win_create_keyval.c index cbb5c09..d945cb2 100644 --- a/src/mpi/attr/win_create_keyval.c +++ b/src/mpi/attr/win_create_keyval.c @@ -109,10 +109,10 @@ int MPI_Win_create_keyval(MPI_Win_copy_attr_function *win_copy_attr_fn, /* The handle encodes the keyval kind. Modify it to have the correct field */ keyval_ptr->handle = (keyval_ptr->handle & ~(0x03c00000)) | - (MPID_WIN << 22); + (MPIR_WIN << 22); MPIU_Object_set_ref(keyval_ptr,1); keyval_ptr->was_freed = 0; - keyval_ptr->kind = MPID_WIN; + keyval_ptr->kind = MPIR_WIN; keyval_ptr->extra_state = extra_state; keyval_ptr->copyfn.user_function = win_copy_attr_fn; keyval_ptr->copyfn.proxy = MPIR_Attr_copy_c_proxy; diff --git a/src/mpi/coll/op_create.c b/src/mpi/coll/op_create.c index d9cc324..dddb47a 100644 --- a/src/mpi/coll/op_create.c +++ b/src/mpi/coll/op_create.c @@ -32,7 +32,7 @@ int MPI_Op_create(MPI_User_function *user_fn, int commute, MPI_Op *op) __attribu /* Preallocated op objects */ MPIR_Op MPIR_Op_builtin[MPIR_OP_N_BUILTIN] = { {0} }; MPIR_Op MPIR_Op_direct[MPIR_OP_PREALLOC] = { {0} }; -MPIU_Object_alloc_t MPIR_Op_mem = { 0, 0, 0, 0, MPID_OP, +MPIU_Object_alloc_t MPIR_Op_mem = { 0, 0, 0, 0, MPIR_OP, sizeof(MPIR_Op), MPIR_Op_direct, MPIR_OP_PREALLOC, }; diff --git a/src/mpi/comm/commutil.c b/src/mpi/comm/commutil.c index 0aa40a4..0584284 100644 --- a/src/mpi/comm/commutil.c +++ b/src/mpi/comm/commutil.c @@ -27,7 +27,7 @@ MPIU_Object_alloc_t MPIR_Comm_mem = { 0, 0, 0, - MPID_COMM, + MPIR_COMM, sizeof(MPIR_Comm), MPIR_Comm_direct, MPID_COMM_PREALLOC diff --git a/src/mpi/debugger/dbgstub.c b/src/mpi/debugger/dbgstub.c index bf624ee..de4d801 100644 --- a/src/mpi/debugger/dbgstub.c +++ b/src/mpi/debugger/dbgstub.c @@ -42,7 +42,7 @@ extern MPIR_Comm_list MPIR_All_communicators; These routines (more precisely, the field_offset routine) need to known the layout of the internal data structures */ enum { TYPE_UNKNOWN = 0, - TYPE_MPID_COMM = 1, + TYPE_MPIR_COMM = 1, TYPE_MPIR_COMM_LIST = 2, TYPE_MPIDI_REQUEST = 3, TYPE_MPIDI_MESSAGE_MATCH = 4, @@ -55,10 +55,10 @@ enum { TYPE_UNKNOWN = 0, recent type, so a static current type will not work. Instead, we have an example of each type, and return that value. */ -static int knownTypesArray[] = { TYPE_UNKNOWN, TYPE_MPID_COMM, - TYPE_MPIR_COMM_LIST, TYPE_MPIDI_REQUEST, +static int knownTypesArray[] = { TYPE_UNKNOWN, TYPE_MPIR_COMM, + TYPE_MPIR_COMM_LIST, TYPE_MPIDI_REQUEST, TYPE_MPIDI_MESSAGE_MATCH, TYPE_MPIR_REQUEST, - TYPE_MPIR_SENDQ, + TYPE_MPIR_SENDQ, TYPE_MPIDI_MESSAGE_MATCH_PARTS }; mqs_type * dbgrI_find_type(mqs_image *image, char *name, @@ -67,7 +67,7 @@ mqs_type * dbgrI_find_type(mqs_image *image, char *name, int curType = TYPE_UNKNOWN; if (strcmp(name,"MPID_Comm") == 0) { - curType = TYPE_MPID_COMM; + curType = TYPE_MPIR_COMM; } else if (strcmp( name, "MPIR_Comm_list" ) == 0) { curType = TYPE_MPIR_COMM_LIST; diff --git a/src/mpi/errhan/comm_create_errhandler.c b/src/mpi/errhan/comm_create_errhandler.c index 012f5d1..dbc1137 100644 --- a/src/mpi/errhan/comm_create_errhandler.c +++ b/src/mpi/errhan/comm_create_errhandler.c @@ -40,7 +40,7 @@ int MPIR_Comm_create_errhandler_impl(MPI_Comm_errhandler_function *comm_errhandl MPIR_ERR_CHKANDJUMP(!errhan_ptr, mpi_errno, MPI_ERR_OTHER, "**nomem"); errhan_ptr->language = MPIR_LANG_C; - errhan_ptr->kind = MPID_COMM; + errhan_ptr->kind = MPIR_COMM; MPIU_Object_set_ref(errhan_ptr,1); errhan_ptr->errfn.C_Comm_Handler_function = comm_errhandler_fn; diff --git a/src/mpi/errhan/errutil.c b/src/mpi/errhan/errutil.c index f2deb45..93c94ee 100644 --- a/src/mpi/errhan/errutil.c +++ b/src/mpi/errhan/errutil.c @@ -138,18 +138,18 @@ static int checkForUserErrcode( int ); * in MPICH */ -#ifndef MPID_ERRHANDLER_PREALLOC -#define MPID_ERRHANDLER_PREALLOC 8 +#ifndef MPIR_ERRHANDLER_PREALLOC +#define MPIR_ERRHANDLER_PREALLOC 8 #endif /* Preallocated errorhandler objects */ MPIR_Errhandler MPIR_Errhandler_builtin[3] = { {0} }; -MPIR_Errhandler MPIR_Errhandler_direct[MPID_ERRHANDLER_PREALLOC] = +MPIR_Errhandler MPIR_Errhandler_direct[MPIR_ERRHANDLER_PREALLOC] = { {0} }; -MPIU_Object_alloc_t MPIR_Errhandler_mem = { 0, 0, 0, 0, MPID_ERRHANDLER, +MPIU_Object_alloc_t MPIR_Errhandler_mem = { 0, 0, 0, 0, MPIR_ERRHANDLER, sizeof(MPIR_Errhandler), MPIR_Errhandler_direct, - MPID_ERRHANDLER_PREALLOC, }; + MPIR_ERRHANDLER_PREALLOC, }; void MPIR_Errhandler_free(MPIR_Errhandler *errhan_ptr) { diff --git a/src/mpi/errhan/file_create_errhandler.c b/src/mpi/errhan/file_create_errhandler.c index 2a85f62..c8419cb 100644 --- a/src/mpi/errhan/file_create_errhandler.c +++ b/src/mpi/errhan/file_create_errhandler.c @@ -77,7 +77,7 @@ int MPI_File_create_errhandler(MPI_File_errhandler_function *file_errhandler_fn, errhan_ptr = (MPIR_Errhandler *)MPIU_Handle_obj_alloc( &MPIR_Errhandler_mem ); MPIR_ERR_CHKANDJUMP(!errhan_ptr,mpi_errno,MPI_ERR_OTHER,"**nomem"); errhan_ptr->language = MPIR_LANG_C; - errhan_ptr->kind = MPID_FILE; + errhan_ptr->kind = MPIR_FILE; MPIU_Object_set_ref(errhan_ptr,1); errhan_ptr->errfn.C_File_Handler_function = file_errhandler_fn; diff --git a/src/mpi/errhan/file_set_errhandler.c b/src/mpi/errhan/file_set_errhandler.c index 8755ee0..6cd6411 100644 --- a/src/mpi/errhan/file_set_errhandler.c +++ b/src/mpi/errhan/file_set_errhandler.c @@ -91,7 +91,7 @@ int MPI_File_set_errhandler(MPI_File file, MPI_Errhandler errhandler) MPIR_Errhandler_valid_ptr( errhan_ptr,mpi_errno ); /* Also check for a valid errhandler kind */ if (!mpi_errno) { - if (errhan_ptr->kind != MPID_FILE) { + if (errhan_ptr->kind != MPIR_FILE) { mpi_errno = MPIR_Err_create_code( MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_ARG, "**errhandnotfile", NULL ); } diff --git a/src/mpi/errhan/win_create_errhandler.c b/src/mpi/errhan/win_create_errhandler.c index 65845c6..638f632 100644 --- a/src/mpi/errhan/win_create_errhandler.c +++ b/src/mpi/errhan/win_create_errhandler.c @@ -80,7 +80,7 @@ int MPI_Win_create_errhandler(MPI_Win_errhandler_function *win_errhandler_fn, MPIR_ERR_CHKANDJUMP1(!errhan_ptr,mpi_errno,MPI_ERR_OTHER,"**nomem", "**nomem %s", "MPI_Errhandler"); errhan_ptr->language = MPIR_LANG_C; - errhan_ptr->kind = MPID_WIN; + errhan_ptr->kind = MPIR_WIN; MPIU_Object_set_ref(errhan_ptr,1); errhan_ptr->errfn.C_Win_Handler_function = win_errhandler_fn; diff --git a/src/mpi/errhan/win_set_errhandler.c b/src/mpi/errhan/win_set_errhandler.c index 6caa1c5..5c5a4c4 100644 --- a/src/mpi/errhan/win_set_errhandler.c +++ b/src/mpi/errhan/win_set_errhandler.c @@ -89,7 +89,7 @@ int MPI_Win_set_errhandler(MPI_Win win, MPI_Errhandler errhandler) MPIR_Errhandler_valid_ptr( errhan_ptr,mpi_errno ); /* Also check for a valid errhandler kind */ if (!mpi_errno) { - if (errhan_ptr->kind != MPID_WIN) { + if (errhan_ptr->kind != MPIR_WIN) { mpi_errno = MPIR_Err_create_code( MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_ARG, "**errhandnotwin", NULL ); diff --git a/src/mpi/group/grouputil.c b/src/mpi/group/grouputil.c index 23f01c2..749f0f5 100644 --- a/src/mpi/group/grouputil.c +++ b/src/mpi/group/grouputil.c @@ -14,7 +14,7 @@ /* Preallocated group objects */ MPIR_Group MPIR_Group_builtin[MPIR_GROUP_N_BUILTIN] = { {0} }; MPIR_Group MPIR_Group_direct[MPID_GROUP_PREALLOC] = { {0} }; -MPIU_Object_alloc_t MPIR_Group_mem = { 0, 0, 0, 0, MPID_GROUP, +MPIU_Object_alloc_t MPIR_Group_mem = { 0, 0, 0, 0, MPIR_GROUP, sizeof(MPIR_Group), MPIR_Group_direct, MPID_GROUP_PREALLOC}; diff --git a/src/mpi/pt2pt/greq_start.c b/src/mpi/pt2pt/greq_start.c index d8876cb..39faae4 100644 --- a/src/mpi/pt2pt/greq_start.c +++ b/src/mpi/pt2pt/greq_start.c @@ -30,16 +30,16 @@ PMPI_LOCAL int MPIR_Grequest_free_classes_on_finalize(void *extra_data); #define MPI_Grequest_start PMPI_Grequest_start /* preallocated grequest classes */ -#ifndef MPID_GREQ_CLASS_PREALLOC -#define MPID_GREQ_CLASS_PREALLOC 2 +#ifndef MPIR_GREQ_CLASS_PREALLOC +#define MPIR_GREQ_CLASS_PREALLOC 2 #endif -MPIR_Grequest_class MPIR_Grequest_class_direct[MPID_GREQ_CLASS_PREALLOC] = +MPIR_Grequest_class MPIR_Grequest_class_direct[MPIR_GREQ_CLASS_PREALLOC] = { {0} }; -MPIU_Object_alloc_t MPIR_Grequest_class_mem = {0, 0, 0, 0, MPID_GREQ_CLASS, +MPIU_Object_alloc_t MPIR_Grequest_class_mem = {0, 0, 0, 0, MPIR_GREQ_CLASS, sizeof(MPIR_Grequest_class), MPIR_Grequest_class_direct, - MPID_GREQ_CLASS_PREALLOC, }; + MPIR_GREQ_CLASS_PREALLOC, }; /* We jump through some minor hoops to manage the list of classes ourselves and * only register a single finalizer to avoid hitting limitations in the current diff --git a/src/mpi/rma/winutil.c b/src/mpi/rma/winutil.c index 508442f..9b8ae90 100644 --- a/src/mpi/rma/winutil.c +++ b/src/mpi/rma/winutil.c @@ -14,6 +14,6 @@ /* Preallocated window objects */ MPIR_Win MPIR_Win_direct[MPIR_WIN_PREALLOC] = { {0} }; -MPIU_Object_alloc_t MPIR_Win_mem = { 0, 0, 0, 0, MPID_WIN, +MPIU_Object_alloc_t MPIR_Win_mem = { 0, 0, 0, 0, MPIR_WIN, sizeof(MPIR_Win), MPIR_Win_direct, - MPID_WIN_PREALLOC}; + MPIR_WIN_PREALLOC}; diff --git a/src/mpid/ch3/src/mpid_port.c b/src/mpid/ch3/src/mpid_port.c index 135f342..e206634 100644 --- a/src/mpid/ch3/src/mpid_port.c +++ b/src/mpid/ch3/src/mpid_port.c @@ -44,9 +44,9 @@ static MPIDI_PortFns portFns = { 0, 0, 0, 0 }; int MPIR_Open_port(MPIR_Info *info_ptr, char *port_name) { int mpi_errno=MPI_SUCCESS; - MPIDI_STATE_DECL(MPID_STATE_MPID_OPEN_PORT); + MPIDI_STATE_DECL(MPID_STATE_MPIR_OPEN_PORT); - MPIDI_FUNC_ENTER(MPID_STATE_MPID_OPEN_PORT); + MPIDI_FUNC_ENTER(MPID_STATE_MPIR_OPEN_PORT); /* Check to see if we need to setup channel-specific functions for handling the port operations */ @@ -71,7 +71,7 @@ int MPIR_Open_port(MPIR_Info *info_ptr, char *port_name) } fn_fail: - MPIDI_FUNC_EXIT(MPID_STATE_MPID_OPEN_PORT); + MPIDI_FUNC_EXIT(MPID_STATE_MPIR_OPEN_PORT); return mpi_errno; } diff --git a/src/mpid/ch3/src/mpid_vc.c b/src/mpid/ch3/src/mpid_vc.c index d11305e..8d59de7 100644 --- a/src/mpid/ch3/src/mpid_vc.c +++ b/src/mpid/ch3/src/mpid_vc.c @@ -620,7 +620,7 @@ static int lpid_counter = 0; int MPIDI_VC_Init( MPIDI_VC_t *vc, MPIDI_PG_t *pg, int rank ) { vc->state = MPIDI_VC_STATE_INACTIVE; - vc->handle = HANDLE_SET_MPI_KIND(0, MPID_VCONN); + vc->handle = HANDLE_SET_MPI_KIND(0, MPIR_VCONN); MPIU_Object_set_ref(vc, 0); vc->pg = pg; vc->pg_rank = rank; diff --git a/src/mpid/pamid/include/mpidi_constants.h b/src/mpid/pamid/include/mpidi_constants.h index 3fcb3b2..25c7c5a 100644 --- a/src/mpid/pamid/include/mpidi_constants.h +++ b/src/mpid/pamid/include/mpidi_constants.h @@ -122,7 +122,7 @@ enum enum /* PAMID_COLLECTIVES_MEMORY_OPTIMIZED levels */ { - MPID_OPT_LVL_IRREG = 1, /**< Do not optimize irregular communicators */ - MPID_OPT_LVL_NONCONTIG = 2, /**< Disable some non-contig collectives */ + MPIR_OPT_LVL_IRREG = 1, /**< Do not optimize irregular communicators */ + MPIR_OPT_LVL_NONCONTIG = 2, /**< Disable some non-contig collectives */ }; #endif diff --git a/src/mpid/pamid/include/mpidi_datatypes.h b/src/mpid/pamid/include/mpidi_datatypes.h index fbff89a..b716fc9 100644 --- a/src/mpid/pamid/include/mpidi_datatypes.h +++ b/src/mpid/pamid/include/mpidi_datatypes.h @@ -125,7 +125,7 @@ typedef struct unsigned subcomms; /**< Enable hardware optimized subcomm's */ unsigned select_colls; /**< Enable collective selection */ unsigned auto_select_colls; /**< Enable automatic collective selection */ - unsigned memory; /**< Enable memory optimized subcomm's - See MPID_OPT_LVL_xxxx */ + unsigned memory; /**< Enable memory optimized subcomm's - See MPIR_OPT_LVL_xxxx */ unsigned num_requests; /**< Number of requests between flow control barriers */ } optimized; diff --git a/src/mpid/pamid/src/comm/mpid_comm.c b/src/mpid/pamid/src/comm/mpid_comm.c index de5a7e8..30fbefa 100644 --- a/src/mpid/pamid/src/comm/mpid_comm.c +++ b/src/mpid/pamid/src/comm/mpid_comm.c @@ -266,7 +266,7 @@ void MPIDI_Coll_comm_create(MPIR_Comm *comm) size_t numconfigs = 0; #ifdef HAVE_PAMI_GEOMETRY_NONCONTIG config[0].name = PAMI_GEOMETRY_NONCONTIG; - if(MPIDI_Process.optimized.memory & MPID_OPT_LVL_NONCONTIG) + if(MPIDI_Process.optimized.memory & MPIR_OPT_LVL_NONCONTIG) config[0].value.intval = 0; // Disable non-contig, pamid doesn't use pami for non-contig data collectives else config[0].value.intval = 1; // Enable non-contig even though pamid doesn't use pami for non-contig data collectives, @@ -288,7 +288,7 @@ void MPIDI_Coll_comm_create(MPIR_Comm *comm) } #endif - if((MPIDI_Process.optimized.memory & MPID_OPT_LVL_IRREG) && (comm->local_size & (comm->local_size-1))) + if((MPIDI_Process.optimized.memory & MPIR_OPT_LVL_IRREG) && (comm->local_size & (comm->local_size-1))) { /* Don't create irregular geometries. Fallback to MPICH only collectives */ geom_init = 0; diff --git a/src/mpid/pamid/src/mpid_init.c b/src/mpid/pamid/src/mpid_init.c index 30685bd..bfc2cf5 100644 --- a/src/mpid/pamid/src/mpid_init.c +++ b/src/mpid/pamid/src/mpid_init.c @@ -392,7 +392,7 @@ MPIDI_PAMI_client_init(int* rank, int* size, int* mpidi_dynamic_tasking, char ** #ifdef HAVE_PAMI_CLIENT_NONCONTIG config[0].name = PAMI_CLIENT_NONCONTIG; - if(MPIDI_Process.optimized.memory & MPID_OPT_LVL_NONCONTIG) + if(MPIDI_Process.optimized.memory & MPIR_OPT_LVL_NONCONTIG) config[0].value.intval = 0; // Disable non-contig, pamid doesn't use pami for non-contig data collectives so save memory else config[0].value.intval = 1; // Enable non-contig even though pamid doesn't use pami for non-contig data collectives, diff --git a/src/mpid/pamid/src/mpidi_env.c b/src/mpid/pamid/src/mpidi_env.c index 3198723..e00282a 100644 --- a/src/mpid/pamid/src/mpidi_env.c +++ b/src/mpid/pamid/src/mpidi_env.c @@ -113,8 +113,8 @@ * Possible values: * - 0 - Collectives are not memory optimized. * - n - Collectives are memory optimized. Levels are bitwise values : - * MPID_OPT_LVL_IRREG = 1, Do not optimize irregular communicators - * MPID_OPT_LVL_NONCONTIG = 2, Disable some non-contig collectives + * MPIR_OPT_LVL_IRREG = 1, Do not optimize irregular communicators + * MPIR_OPT_LVL_NONCONTIG = 2, Disable some non-contig collectives * * PAMID_OPTIMIZED_SUBCOMMS - Use PAMI 'optimized' collectives. Defaullt is 1. * - 0 - Some optimized protocols may be disabled. diff --git a/src/util/mem/handlemem.c b/src/util/mem/handlemem.c index 8abcb3c..e12a91d 100644 --- a/src/util/mem/handlemem.c +++ b/src/util/mem/handlemem.c @@ -491,7 +491,7 @@ void *MPIU_Handle_get_ptr_indirect( int handle, MPIU_Object_alloc_t *objmem ) /* returns the name of the handle kind for debugging/logging purposes */ const char *MPIU_Handle_get_kind_str(int kind) { -#define mpiu_name_case_(name_) case MPID_##name_: return (#name_) +#define mpiu_name_case_(name_) case MPIR_##name_: return (#name_) switch (kind) { mpiu_name_case_(COMM); mpiu_name_case_(GROUP); http://git.mpich.org/mpich.git/commitdiff/b01017cb2a613d1a58742ebae169db571… commit b01017cb2a613d1a58742ebae169db5713195ef4 Author: Wesley Bland <wesley.bland(a)intel.com> Date: Tue Apr 19 10:00:57 2016 -0500 Rename MPID_Datatype to MPIR_Datatype Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/maint/decode_handle b/maint/decode_handle index 934b61f..71652fa 100755 --- a/maint/decode_handle +++ b/maint/decode_handle @@ -61,9 +61,9 @@ while (scalar @ARGV) { ## ----8<---- ## ## typedef enum MPIR_Object_kind { -## MPID_COMM = 0x1, +## MPID_COMM = 0x1, ## MPID_GROUP = 0x2, -## MPID_DATATYPE = 0x3, +## MPIR_DATATYPE = 0x3, ## MPID_FILE = 0x4, /* This is not used */ ## MPID_ERRHANDLER = 0x5, ## MPID_OP = 0x6, diff --git a/src/binding/fortran/use_mpi/create_f90_util.c b/src/binding/fortran/use_mpi/create_f90_util.c index 0749891..13fdd4e 100644 --- a/src/binding/fortran/use_mpi/create_f90_util.c +++ b/src/binding/fortran/use_mpi/create_f90_util.c @@ -80,7 +80,7 @@ int MPIR_Create_unnamed_predefined( MPI_Datatype old, int combiner, /* Initialize the contents data */ { - MPID_Datatype *new_dtp = NULL; + MPIR_Datatype *new_dtp = NULL; int vals[2]; int nvals=0; @@ -191,7 +191,7 @@ static int MPIR_Create_unnamed_predefined( MPI_Datatype old, int combiner, /* Initialize the contents data */ if (mpi_errno == MPI_SUCCESS) { - MPID_Datatype *new_dtp; + MPIR_Datatype *new_dtp; int vals[2]; int nvals=0; diff --git a/src/glue/romio/glue_romio.c b/src/glue/romio/glue_romio.c index 4f421c7..7eaa9c3 100644 --- a/src/glue/romio/glue_romio.c +++ b/src/glue/romio/glue_romio.c @@ -83,10 +83,10 @@ int MPIR_Ext_datatype_iscommitted(MPI_Datatype datatype) if (mpi_errno) MPIR_ERR_POP(mpi_errno); if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno) MPIR_ERR_POP(mpi_errno); MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); diff --git a/src/include/mpierrs.h b/src/include/mpierrs.h index 2ac5e11..506d063 100644 --- a/src/include/mpierrs.h +++ b/src/include/mpierrs.h @@ -224,7 +224,7 @@ cvars: */ #define MPIR_ERRTEST_DATATYPE(datatype, name_, err_) \ { \ - if (HANDLE_GET_MPI_KIND(datatype) != MPID_DATATYPE || \ + if (HANDLE_GET_MPI_KIND(datatype) != MPIR_DATATYPE || \ (HANDLE_GET_KIND(datatype) == HANDLE_KIND_INVALID && \ datatype != MPI_DATATYPE_NULL)) \ { \ @@ -316,7 +316,7 @@ cvars: if (HANDLE_GET_KIND(dtype) == HANDLE_KIND_BUILTIN) { ferr=1; } \ else { \ MPI_Aint errsize; \ - MPID_Datatype *errdtypeptr; \ + MPIR_Datatype *errdtypeptr; \ MPID_Datatype_get_ptr(dtype,errdtypeptr); \ MPID_Datatype_get_size_macro(dtype,errsize); \ if (errdtypeptr && errdtypeptr->true_lb == 0 && \ diff --git a/src/include/mpihandlemem.h b/src/include/mpihandlemem.h index 9a245af..cb1ee58 100644 --- a/src/include/mpihandlemem.h +++ b/src/include/mpihandlemem.h @@ -58,9 +58,9 @@ Attribute-DS E*/ typedef enum MPIR_Object_kind { - MPID_COMM = 0x1, + MPID_COMM = 0x1, MPID_GROUP = 0x2, - MPID_DATATYPE = 0x3, + MPIR_DATATYPE = 0x3, MPID_FILE = 0x4, /* only used obliquely inside MPIR_Errhandler objs */ MPID_ERRHANDLER = 0x5, MPID_OP = 0x6, diff --git a/src/mpi/attr/type_create_keyval.c b/src/mpi/attr/type_create_keyval.c index 5de6c29..0d53c54 100644 --- a/src/mpi/attr/type_create_keyval.c +++ b/src/mpi/attr/type_create_keyval.c @@ -109,10 +109,10 @@ int MPI_Type_create_keyval(MPI_Type_copy_attr_function *type_copy_attr_fn, /* The handle encodes the keyval kind. Modify it to have the correct field */ keyval_ptr->handle = (keyval_ptr->handle & ~(0x03c00000)) | - (MPID_DATATYPE << 22); + (MPIR_DATATYPE << 22); MPIU_Object_set_ref(keyval_ptr,1); keyval_ptr->was_freed = 0; - keyval_ptr->kind = MPID_DATATYPE; + keyval_ptr->kind = MPIR_DATATYPE; keyval_ptr->extra_state = extra_state; keyval_ptr->copyfn.user_function = type_copy_attr_fn; keyval_ptr->copyfn.proxy = MPIR_Attr_copy_c_proxy; diff --git a/src/mpi/attr/type_delete_attr.c b/src/mpi/attr/type_delete_attr.c index 88d05c7..6a174b8 100644 --- a/src/mpi/attr/type_delete_attr.c +++ b/src/mpi/attr/type_delete_attr.c @@ -52,7 +52,7 @@ int MPI_Type_delete_attr(MPI_Datatype datatype, int type_keyval) { static const char FCNAME[] = "MPI_Type_delete_attr"; int mpi_errno = MPI_SUCCESS; - MPID_Datatype *type_ptr = NULL; + MPIR_Datatype *type_ptr = NULL; MPIR_Attribute *p, **old_p; MPIR_Keyval *keyval_ptr = 0; MPID_MPI_STATE_DECL(MPID_STATE_MPI_TYPE_DELETE_ATTR); @@ -70,7 +70,7 @@ int MPI_Type_delete_attr(MPI_Datatype datatype, int type_keyval) MPID_BEGIN_ERROR_CHECKS; { MPIR_ERRTEST_DATATYPE(datatype, "datatype", mpi_errno); - MPIR_ERRTEST_KEYVAL(type_keyval, MPID_DATATYPE, "datatype", mpi_errno); + MPIR_ERRTEST_KEYVAL(type_keyval, MPIR_DATATYPE, "datatype", mpi_errno); MPIR_ERRTEST_KEYVAL_PERM(type_keyval, mpi_errno); } MPID_END_ERROR_CHECKS; @@ -87,7 +87,7 @@ int MPI_Type_delete_attr(MPI_Datatype datatype, int type_keyval) MPID_BEGIN_ERROR_CHECKS; { /* Validate type_ptr */ - MPID_Datatype_valid_ptr( type_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( type_ptr, mpi_errno ); /* If type_ptr is not valid, it will be reset to null */ /* Validate keyval_ptr */ if (mpi_errno) goto fn_fail; diff --git a/src/mpi/attr/type_free_keyval.c b/src/mpi/attr/type_free_keyval.c index 8768fb8..1fdbc86 100644 --- a/src/mpi/attr/type_free_keyval.c +++ b/src/mpi/attr/type_free_keyval.c @@ -67,7 +67,7 @@ int MPI_Type_free_keyval(int *type_keyval) MPID_BEGIN_ERROR_CHECKS; { MPIR_ERRTEST_ARGNULL(type_keyval, "type_keyval", mpi_errno); - MPIR_ERRTEST_KEYVAL(*type_keyval, MPID_DATATYPE, "datatype", mpi_errno); + MPIR_ERRTEST_KEYVAL(*type_keyval, MPIR_DATATYPE, "datatype", mpi_errno); MPIR_ERRTEST_KEYVAL_PERM(*type_keyval, mpi_errno); } MPID_END_ERROR_CHECKS; diff --git a/src/mpi/attr/type_get_attr.c b/src/mpi/attr/type_get_attr.c index c439c9d..2da9d25 100644 --- a/src/mpi/attr/type_get_attr.c +++ b/src/mpi/attr/type_get_attr.c @@ -36,7 +36,7 @@ int MPIR_TypeGetAttr( MPI_Datatype datatype, int type_keyval, void *attribute_va static const char FCNAME[] = "MPI_Type_get_attr"; #endif int mpi_errno = MPI_SUCCESS; - MPID_Datatype *type_ptr = NULL; + MPIR_Datatype *type_ptr = NULL; MPIR_Attribute *p; MPID_MPI_STATE_DECL(MPID_STATE_MPIR_TYPE_GET_ATTR); @@ -51,7 +51,7 @@ int MPIR_TypeGetAttr( MPI_Datatype datatype, int type_keyval, void *attribute_va MPID_BEGIN_ERROR_CHECKS; { MPIR_ERRTEST_DATATYPE(datatype, "datatype", mpi_errno); - MPIR_ERRTEST_KEYVAL(type_keyval, MPID_DATATYPE, "datatype", mpi_errno); + MPIR_ERRTEST_KEYVAL(type_keyval, MPIR_DATATYPE, "datatype", mpi_errno); # ifdef NEEDS_POINTER_ALIGNMENT_ADJUST /* A common user error is to pass the address of a 4-byte int when the address of a pointer (or an address-sized int) @@ -76,7 +76,7 @@ int MPIR_TypeGetAttr( MPI_Datatype datatype, int type_keyval, void *attribute_va MPID_BEGIN_ERROR_CHECKS; { /* Validate datatype pointer */ - MPID_Datatype_valid_ptr( type_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( type_ptr, mpi_errno ); /* If type_ptr is not valid, it will be reset to null */ if (mpi_errno) goto fn_fail; } diff --git a/src/mpi/attr/type_set_attr.c b/src/mpi/attr/type_set_attr.c index 2c0e38d..571fc46 100644 --- a/src/mpi/attr/type_set_attr.c +++ b/src/mpi/attr/type_set_attr.c @@ -33,7 +33,7 @@ int MPIR_TypeSetAttr(MPI_Datatype datatype, int type_keyval, void *attribute_val { static const char FCNAME[] = "MPIR_TypeSetAttr"; int mpi_errno = MPI_SUCCESS; - MPID_Datatype *type_ptr = NULL; + MPIR_Datatype *type_ptr = NULL; MPIR_Keyval *keyval_ptr = NULL; MPIR_Attribute *p, **old_p; MPID_MPI_STATE_DECL(MPID_STATE_MPIR_TYPE_SET_ATTR); @@ -51,7 +51,7 @@ int MPIR_TypeSetAttr(MPI_Datatype datatype, int type_keyval, void *attribute_val MPID_BEGIN_ERROR_CHECKS; { MPIR_ERRTEST_DATATYPE(datatype, "datatype", mpi_errno); - MPIR_ERRTEST_KEYVAL(type_keyval, MPID_DATATYPE, "datatype", mpi_errno); + MPIR_ERRTEST_KEYVAL(type_keyval, MPIR_DATATYPE, "datatype", mpi_errno); MPIR_ERRTEST_KEYVAL_PERM(type_keyval, mpi_errno); } MPID_END_ERROR_CHECKS; @@ -68,7 +68,7 @@ int MPIR_TypeSetAttr(MPI_Datatype datatype, int type_keyval, void *attribute_val MPID_BEGIN_ERROR_CHECKS; { /* Validate type_ptr */ - MPID_Datatype_valid_ptr( type_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( type_ptr, mpi_errno ); /* If type_ptr is not valid, it will be reset to null */ /* Validate keyval_ptr */ MPIR_Keyval_valid_ptr( keyval_ptr, mpi_errno ); diff --git a/src/mpi/coll/allgather.c b/src/mpi/coll/allgather.c index f4ff7d4..ecff424 100644 --- a/src/mpi/coll/allgather.c +++ b/src/mpi/coll/allgather.c @@ -929,7 +929,7 @@ int MPI_Allgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, { MPID_BEGIN_ERROR_CHECKS; { - MPID_Datatype *recvtype_ptr=NULL, *sendtype_ptr=NULL; + MPIR_Datatype *recvtype_ptr=NULL, *sendtype_ptr=NULL; MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -953,7 +953,7 @@ int MPI_Allgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, if (HANDLE_GET_KIND(sendtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(sendtype, sendtype_ptr); - MPID_Datatype_valid_ptr( sendtype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( sendtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr( sendtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -967,7 +967,7 @@ int MPI_Allgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, if (HANDLE_GET_KIND(recvtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(recvtype, recvtype_ptr); - MPID_Datatype_valid_ptr( recvtype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( recvtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr( recvtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/coll/allgatherv.c b/src/mpi/coll/allgatherv.c index 53a0ac7..02db271 100644 --- a/src/mpi/coll/allgatherv.c +++ b/src/mpi/coll/allgatherv.c @@ -1040,7 +1040,7 @@ int MPI_Allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, { MPID_BEGIN_ERROR_CHECKS; { - MPID_Datatype *recvtype_ptr=NULL, *sendtype_ptr=NULL; + MPIR_Datatype *recvtype_ptr=NULL, *sendtype_ptr=NULL; int i, comm_size; MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); @@ -1053,7 +1053,7 @@ int MPI_Allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPIR_ERRTEST_DATATYPE(sendtype, "sendtype", mpi_errno); if (HANDLE_GET_KIND(sendtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(sendtype, sendtype_ptr); - MPID_Datatype_valid_ptr( sendtype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( sendtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr( sendtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -1083,7 +1083,7 @@ int MPI_Allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, if (HANDLE_GET_KIND(recvtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(recvtype, recvtype_ptr); - MPID_Datatype_valid_ptr( recvtype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( recvtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr( recvtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/coll/allreduce.c b/src/mpi/coll/allreduce.c index 413b816..caddf6b 100644 --- a/src/mpi/coll/allreduce.c +++ b/src/mpi/coll/allreduce.c @@ -843,7 +843,7 @@ int MPI_Allreduce(const void *sendbuf, void *recvbuf, int count, { MPID_BEGIN_ERROR_CHECKS; { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPIR_Op *op_ptr = NULL; MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); @@ -854,7 +854,7 @@ int MPI_Allreduce(const void *sendbuf, void *recvbuf, int count, if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(datatype, datatype_ptr); - MPID_Datatype_valid_ptr( datatype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( datatype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr( datatype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/coll/alltoall.c b/src/mpi/coll/alltoall.c index 330d5a8..60edb28 100644 --- a/src/mpi/coll/alltoall.c +++ b/src/mpi/coll/alltoall.c @@ -672,7 +672,7 @@ int MPI_Alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, { MPID_BEGIN_ERROR_CHECKS; { - MPID_Datatype *sendtype_ptr=NULL, *recvtype_ptr=NULL; + MPIR_Datatype *sendtype_ptr=NULL, *recvtype_ptr=NULL; MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -682,7 +682,7 @@ int MPI_Alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPIR_ERRTEST_DATATYPE(sendtype, "sendtype", mpi_errno); if (HANDLE_GET_KIND(sendtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(sendtype, sendtype_ptr); - MPID_Datatype_valid_ptr( sendtype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( sendtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr( sendtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -700,7 +700,7 @@ int MPI_Alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPIR_ERRTEST_DATATYPE(recvtype, "recvtype", mpi_errno); if (HANDLE_GET_KIND(recvtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(recvtype, recvtype_ptr); - MPID_Datatype_valid_ptr( recvtype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( recvtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr( recvtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/coll/alltoallv.c b/src/mpi/coll/alltoallv.c index f70182d..19d5942 100644 --- a/src/mpi/coll/alltoallv.c +++ b/src/mpi/coll/alltoallv.c @@ -463,7 +463,7 @@ int MPI_Alltoallv(const void *sendbuf, const int *sendcounts, { MPID_BEGIN_ERROR_CHECKS; { - MPID_Datatype *sendtype_ptr=NULL, *recvtype_ptr=NULL; + MPIR_Datatype *sendtype_ptr=NULL, *recvtype_ptr=NULL; int i, comm_size; int check_send = (comm_ptr->comm_kind == MPIR_INTRACOMM && sendbuf != MPI_IN_PLACE); @@ -492,14 +492,14 @@ int MPI_Alltoallv(const void *sendbuf, const int *sendcounts, } if (check_send && HANDLE_GET_KIND(sendtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(sendtype, sendtype_ptr); - MPID_Datatype_valid_ptr( sendtype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( sendtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr( sendtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; } if (HANDLE_GET_KIND(recvtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(recvtype, recvtype_ptr); - MPID_Datatype_valid_ptr( recvtype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( recvtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr( recvtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/coll/alltoallw.c b/src/mpi/coll/alltoallw.c index 81d64ea..68216ff 100644 --- a/src/mpi/coll/alltoallw.c +++ b/src/mpi/coll/alltoallw.c @@ -458,7 +458,7 @@ int MPI_Alltoallw(const void *sendbuf, const int sendcounts[], { MPID_BEGIN_ERROR_CHECKS; { - MPID_Datatype *sendtype_ptr=NULL, *recvtype_ptr=NULL; + MPIR_Datatype *sendtype_ptr=NULL, *recvtype_ptr=NULL; int i, comm_size; int check_send; @@ -487,7 +487,7 @@ int MPI_Alltoallw(const void *sendbuf, const int sendcounts[], } if ((sendcounts[i] > 0) && (HANDLE_GET_KIND(sendtypes[i]) != HANDLE_KIND_BUILTIN)) { MPID_Datatype_get_ptr(sendtypes[i], sendtype_ptr); - MPID_Datatype_valid_ptr( sendtype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( sendtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr( sendtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -500,7 +500,7 @@ int MPI_Alltoallw(const void *sendbuf, const int sendcounts[], } if ((recvcounts[i] > 0) && (HANDLE_GET_KIND(recvtypes[i]) != HANDLE_KIND_BUILTIN)) { MPID_Datatype_get_ptr(recvtypes[i], recvtype_ptr); - MPID_Datatype_valid_ptr( recvtype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( recvtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr( recvtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/coll/bcast.c b/src/mpi/coll/bcast.c index 29bb9a4..43bcf59 100644 --- a/src/mpi/coll/bcast.c +++ b/src/mpi/coll/bcast.c @@ -140,7 +140,7 @@ static int MPIR_Bcast_binomial( MPI_Aint type_size; MPI_Aint position; void *tmp_buf=NULL; - MPID_Datatype *dtp; + MPIR_Datatype *dtp; MPIU_CHKLMEM_DECL(1); comm_size = comm_ptr->local_size; @@ -494,7 +494,7 @@ static int MPIR_Bcast_scatter_doubling_allgather( int recv_offset, tree_root, nprocs_completed, offset; MPI_Aint position; MPIU_CHKLMEM_DECL(1); - MPID_Datatype *dtp; + MPIR_Datatype *dtp; MPI_Aint true_extent, true_lb; void *tmp_buf; @@ -801,7 +801,7 @@ static int MPIR_Bcast_scatter_ring_allgather( void *tmp_buf; int recvd_size; MPI_Status status; - MPID_Datatype *dtp; + MPIR_Datatype *dtp; MPI_Aint true_extent, true_lb; MPIU_CHKLMEM_DECL(1); @@ -1552,7 +1552,7 @@ int MPI_Bcast( void *buffer, int count, MPI_Datatype datatype, int root, { MPID_BEGIN_ERROR_CHECKS; { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -1567,7 +1567,7 @@ int MPI_Bcast( void *buffer, int count, MPI_Datatype datatype, int root, if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(datatype, datatype_ptr); - MPID_Datatype_valid_ptr( datatype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( datatype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr( datatype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/coll/exscan.c b/src/mpi/coll/exscan.c index 1c13fe5..89a12b7 100644 --- a/src/mpi/coll/exscan.c +++ b/src/mpi/coll/exscan.c @@ -346,7 +346,7 @@ int MPI_Exscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datat { MPID_BEGIN_ERROR_CHECKS; { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPIR_Op *op_ptr = NULL; int rank; @@ -360,7 +360,7 @@ int MPI_Exscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datat if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(datatype, datatype_ptr); - MPID_Datatype_valid_ptr( datatype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( datatype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr( datatype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/coll/gather.c b/src/mpi/coll/gather.c index b67ea4e..870099c 100644 --- a/src/mpi/coll/gather.c +++ b/src/mpi/coll/gather.c @@ -801,7 +801,7 @@ int MPI_Gather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, { MPID_BEGIN_ERROR_CHECKS; { - MPID_Datatype *sendtype_ptr=NULL, *recvtype_ptr=NULL; + MPIR_Datatype *sendtype_ptr=NULL, *recvtype_ptr=NULL; int rank; MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); @@ -815,7 +815,7 @@ int MPI_Gather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPIR_ERRTEST_DATATYPE(sendtype, "sendtype", mpi_errno); if (HANDLE_GET_KIND(sendtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(sendtype, sendtype_ptr); - MPID_Datatype_valid_ptr( sendtype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( sendtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr( sendtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -829,7 +829,7 @@ int MPI_Gather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPIR_ERRTEST_DATATYPE(recvtype, "recvtype", mpi_errno); if (HANDLE_GET_KIND(recvtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(recvtype, recvtype_ptr); - MPID_Datatype_valid_ptr( recvtype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( recvtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr( recvtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -856,7 +856,7 @@ int MPI_Gather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPIR_ERRTEST_DATATYPE(recvtype, "recvtype", mpi_errno); if (HANDLE_GET_KIND(recvtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(recvtype, recvtype_ptr); - MPID_Datatype_valid_ptr( recvtype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( recvtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr( recvtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -870,7 +870,7 @@ int MPI_Gather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPIR_ERRTEST_DATATYPE(sendtype, "sendtype", mpi_errno); if (HANDLE_GET_KIND(sendtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(sendtype, sendtype_ptr); - MPID_Datatype_valid_ptr( sendtype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( sendtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr( sendtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/coll/gatherv.c b/src/mpi/coll/gatherv.c index 3deffb8..1f481c1 100644 --- a/src/mpi/coll/gatherv.c +++ b/src/mpi/coll/gatherv.c @@ -314,7 +314,7 @@ int MPI_Gatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, { MPID_BEGIN_ERROR_CHECKS; { - MPID_Datatype *sendtype_ptr=NULL, *recvtype_ptr=NULL; + MPIR_Datatype *sendtype_ptr=NULL, *recvtype_ptr=NULL; int i, rank, comm_size; MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); @@ -328,7 +328,7 @@ int MPI_Gatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPIR_ERRTEST_DATATYPE(sendtype, "sendtype", mpi_errno); if (HANDLE_GET_KIND(sendtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(sendtype, sendtype_ptr); - MPID_Datatype_valid_ptr( sendtype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( sendtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr( sendtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -345,7 +345,7 @@ int MPI_Gatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, } if (HANDLE_GET_KIND(recvtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(recvtype, recvtype_ptr); - MPID_Datatype_valid_ptr( recvtype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( recvtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr( recvtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -381,7 +381,7 @@ int MPI_Gatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, } if (HANDLE_GET_KIND(recvtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(recvtype, recvtype_ptr); - MPID_Datatype_valid_ptr( recvtype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( recvtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr( recvtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -399,7 +399,7 @@ int MPI_Gatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPIR_ERRTEST_DATATYPE(sendtype, "sendtype", mpi_errno); if (HANDLE_GET_KIND(sendtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(sendtype, sendtype_ptr); - MPID_Datatype_valid_ptr( sendtype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( sendtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr( sendtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/coll/iallgather.c b/src/mpi/coll/iallgather.c index b13e82b..aa7f5dc 100644 --- a/src/mpi/coll/iallgather.c +++ b/src/mpi/coll/iallgather.c @@ -46,7 +46,7 @@ static int get_count(MPIR_Comm *comm, int tag, void *state) } static int dtp_release_ref(MPIR_Comm *comm, int tag, void *state) { - MPID_Datatype *recv_dtp = state; + MPIR_Datatype *recv_dtp = state; MPID_Datatype_release(recv_dtp); return MPI_SUCCESS; } @@ -67,7 +67,7 @@ int MPIR_Iallgather_rec_dbl(const void *sendbuf, int sendcount, MPI_Datatype sen int dst_tree_root, my_tree_root, tree_root; int offset, send_offset, recv_offset; MPI_Aint recvtype_extent; - MPID_Datatype *recv_dtp; + MPIR_Datatype *recv_dtp; MPIR_SCHED_CHKPMEM_DECL(1); comm_size = comm_ptr->local_size; @@ -688,18 +688,18 @@ int MPI_Iallgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, { MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (sendbuf != MPI_IN_PLACE && HANDLE_GET_KIND(sendtype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *sendtype_ptr = NULL; + MPIR_Datatype *sendtype_ptr = NULL; MPID_Datatype_get_ptr(sendtype, sendtype_ptr); - MPID_Datatype_valid_ptr(sendtype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(sendtype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(sendtype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; } if (HANDLE_GET_KIND(recvtype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *recvtype_ptr = NULL; + MPIR_Datatype *recvtype_ptr = NULL; MPID_Datatype_get_ptr(recvtype, recvtype_ptr); - MPID_Datatype_valid_ptr(recvtype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(recvtype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(recvtype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/coll/iallgatherv.c b/src/mpi/coll/iallgatherv.c index a7461b4..e9f23e1 100644 --- a/src/mpi/coll/iallgatherv.c +++ b/src/mpi/coll/iallgatherv.c @@ -793,9 +793,9 @@ int MPI_Iallgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, v if (sendbuf != MPI_IN_PLACE) { if (HANDLE_GET_KIND(sendtype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *sendtype_ptr = NULL; + MPIR_Datatype *sendtype_ptr = NULL; MPID_Datatype_get_ptr(sendtype, sendtype_ptr); - MPID_Datatype_valid_ptr(sendtype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(sendtype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(sendtype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -815,9 +815,9 @@ int MPI_Iallgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, v MPIR_ERRTEST_ARGNULL(recvcounts,"recvcounts", mpi_errno); MPIR_ERRTEST_ARGNULL(displs,"displs", mpi_errno); if (HANDLE_GET_KIND(recvtype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *recvtype_ptr = NULL; + MPIR_Datatype *recvtype_ptr = NULL; MPID_Datatype_get_ptr(recvtype, recvtype_ptr); - MPID_Datatype_valid_ptr(recvtype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(recvtype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(recvtype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/coll/iallreduce.c b/src/mpi/coll/iallreduce.c index 2ab9353..2839fcc 100644 --- a/src/mpi/coll/iallreduce.c +++ b/src/mpi/coll/iallreduce.c @@ -740,9 +740,9 @@ int MPI_Iallreduce(const void *sendbuf, void *recvbuf, int count, { MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/coll/ialltoall.c b/src/mpi/coll/ialltoall.c index 637ca0c..77c0595 100644 --- a/src/mpi/coll/ialltoall.c +++ b/src/mpi/coll/ialltoall.c @@ -618,18 +618,18 @@ int MPI_Ialltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, if (mpi_errno != MPI_SUCCESS) goto fn_fail; if (sendbuf != MPI_IN_PLACE && HANDLE_GET_KIND(sendtype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *sendtype_ptr = NULL; + MPIR_Datatype *sendtype_ptr = NULL; MPID_Datatype_get_ptr(sendtype, sendtype_ptr); - MPID_Datatype_valid_ptr(sendtype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(sendtype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(sendtype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; } if (HANDLE_GET_KIND(recvtype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *recvtype_ptr = NULL; + MPIR_Datatype *recvtype_ptr = NULL; MPID_Datatype_get_ptr(recvtype, recvtype_ptr); - MPID_Datatype_valid_ptr(recvtype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(recvtype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(recvtype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/coll/ialltoallv.c b/src/mpi/coll/ialltoallv.c index 8c61eed..e6b4c14 100644 --- a/src/mpi/coll/ialltoallv.c +++ b/src/mpi/coll/ialltoallv.c @@ -351,9 +351,9 @@ int MPI_Ialltoallv(const void *sendbuf, const int sendcounts[], const int sdispl MPIR_ERRTEST_ARGNULL(sendcounts,"sendcounts", mpi_errno); MPIR_ERRTEST_ARGNULL(sdispls,"sdispls", mpi_errno); if (HANDLE_GET_KIND(sendtype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *sendtype_ptr = NULL; + MPIR_Datatype *sendtype_ptr = NULL; MPID_Datatype_get_ptr(sendtype, sendtype_ptr); - MPID_Datatype_valid_ptr(sendtype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(sendtype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(sendtype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -363,9 +363,9 @@ int MPI_Ialltoallv(const void *sendbuf, const int sendcounts[], const int sdispl MPIR_ERRTEST_ARGNULL(recvcounts,"recvcounts", mpi_errno); MPIR_ERRTEST_ARGNULL(rdispls,"rdispls", mpi_errno); if (HANDLE_GET_KIND(recvtype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *recvtype_ptr = NULL; + MPIR_Datatype *recvtype_ptr = NULL; MPID_Datatype_get_ptr(recvtype, recvtype_ptr); - MPID_Datatype_valid_ptr(recvtype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(recvtype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(recvtype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/coll/ibcast.c b/src/mpi/coll/ibcast.c index 3789356..8144a74 100644 --- a/src/mpi/coll/ibcast.c +++ b/src/mpi/coll/ibcast.c @@ -395,7 +395,7 @@ int MPIR_Ibcast_scatter_rec_dbl_allgather(void *buffer, int count, MPI_Datatype int type_size, j, k, i, tmp_mask, is_contig, is_homogeneous ATTRIBUTE((unused)); int relative_dst, dst_tree_root, my_tree_root, send_offset; int recv_offset, tree_root, nprocs_completed, offset; - MPID_Datatype *dtp; + MPIR_Datatype *dtp; MPI_Aint true_extent, true_lb; void *tmp_buf; struct MPIR_Ibcast_status *status; @@ -650,7 +650,7 @@ int MPIR_Ibcast_scatter_ring_allgather(void *buffer, int count, MPI_Datatype dat int i, j, jnext, left, right; MPI_Aint true_extent, true_lb; void *tmp_buf = NULL; - MPID_Datatype *dtp = NULL; + MPIR_Datatype *dtp = NULL; struct MPIR_Ibcast_status *status; MPIR_SCHED_CHKPMEM_DECL(4); @@ -1056,9 +1056,9 @@ int MPI_Ibcast(void *buffer, int count, MPI_Datatype datatype, int root, MPI_Com if (mpi_errno != MPI_SUCCESS) goto fn_fail; if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/coll/iexscan.c b/src/mpi/coll/iexscan.c index 4da6888..c1a9e20 100644 --- a/src/mpi/coll/iexscan.c +++ b/src/mpi/coll/iexscan.c @@ -278,9 +278,9 @@ int MPI_Iexscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype data MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); MPIR_ERRTEST_COMM_INTRA(comm_ptr, mpi_errno); if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/coll/igather.c b/src/mpi/coll/igather.c index ea00d30..a5dd321 100644 --- a/src/mpi/coll/igather.c +++ b/src/mpi/coll/igather.c @@ -619,7 +619,7 @@ int MPI_Igather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, { MPID_BEGIN_ERROR_CHECKS { - MPID_Datatype *sendtype_ptr=NULL, *recvtype_ptr=NULL; + MPIR_Datatype *sendtype_ptr=NULL, *recvtype_ptr=NULL; int rank; MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); @@ -633,7 +633,7 @@ int MPI_Igather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPIR_ERRTEST_DATATYPE(sendtype, "sendtype", mpi_errno); if (HANDLE_GET_KIND(sendtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(sendtype, sendtype_ptr); - MPID_Datatype_valid_ptr( sendtype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( sendtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr( sendtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -647,7 +647,7 @@ int MPI_Igather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPIR_ERRTEST_DATATYPE(recvtype, "recvtype", mpi_errno); if (HANDLE_GET_KIND(recvtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(recvtype, recvtype_ptr); - MPID_Datatype_valid_ptr( recvtype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( recvtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr( recvtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -674,7 +674,7 @@ int MPI_Igather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPIR_ERRTEST_DATATYPE(recvtype, "recvtype", mpi_errno); if (HANDLE_GET_KIND(recvtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(recvtype, recvtype_ptr); - MPID_Datatype_valid_ptr( recvtype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( recvtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr( recvtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -688,7 +688,7 @@ int MPI_Igather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPIR_ERRTEST_DATATYPE(sendtype, "sendtype", mpi_errno); if (HANDLE_GET_KIND(sendtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(sendtype, sendtype_ptr); - MPID_Datatype_valid_ptr( sendtype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( sendtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr( sendtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/coll/igatherv.c b/src/mpi/coll/igatherv.c index 5a8e463..88baf00 100644 --- a/src/mpi/coll/igatherv.c +++ b/src/mpi/coll/igatherv.c @@ -203,7 +203,7 @@ int MPI_Igatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void { MPID_BEGIN_ERROR_CHECKS { - MPID_Datatype *sendtype_ptr=NULL, *recvtype_ptr=NULL; + MPIR_Datatype *sendtype_ptr=NULL, *recvtype_ptr=NULL; int i, rank, comm_size; MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); @@ -217,7 +217,7 @@ int MPI_Igatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void MPIR_ERRTEST_DATATYPE(sendtype, "sendtype", mpi_errno); if (HANDLE_GET_KIND(sendtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(sendtype, sendtype_ptr); - MPID_Datatype_valid_ptr( sendtype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( sendtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr( sendtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -234,7 +234,7 @@ int MPI_Igatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void } if (HANDLE_GET_KIND(recvtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(recvtype, recvtype_ptr); - MPID_Datatype_valid_ptr( recvtype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( recvtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr( recvtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -270,7 +270,7 @@ int MPI_Igatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void } if (HANDLE_GET_KIND(recvtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(recvtype, recvtype_ptr); - MPID_Datatype_valid_ptr( recvtype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( recvtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr( recvtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -288,7 +288,7 @@ int MPI_Igatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void MPIR_ERRTEST_DATATYPE(sendtype, "sendtype", mpi_errno); if (HANDLE_GET_KIND(sendtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(sendtype, sendtype_ptr); - MPID_Datatype_valid_ptr( sendtype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( sendtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr( sendtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/coll/ired_scat.c b/src/mpi/coll/ired_scat.c index 0fc9217..b6fd8e0 100644 --- a/src/mpi/coll/ired_scat.c +++ b/src/mpi/coll/ired_scat.c @@ -1106,9 +1106,9 @@ int MPI_Ireduce_scatter(const void *sendbuf, void *recvbuf, const int recvcounts MPIR_ERRTEST_ARGNULL(recvcounts,"recvcounts", mpi_errno); if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/coll/ired_scat_block.c b/src/mpi/coll/ired_scat_block.c index d5981f1..322ce29 100644 --- a/src/mpi/coll/ired_scat_block.c +++ b/src/mpi/coll/ired_scat_block.c @@ -1005,9 +1005,9 @@ int MPI_Ireduce_scatter_block(const void *sendbuf, void *recvbuf, { MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/coll/ireduce.c b/src/mpi/coll/ireduce.c index f9802c7..f483c26 100644 --- a/src/mpi/coll/ireduce.c +++ b/src/mpi/coll/ireduce.c @@ -863,9 +863,9 @@ int MPI_Ireduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype data MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/coll/iscan.c b/src/mpi/coll/iscan.c index e70dbd6..8727274 100644 --- a/src/mpi/coll/iscan.c +++ b/src/mpi/coll/iscan.c @@ -413,9 +413,9 @@ int MPI_Iscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype dataty MPIR_ERRTEST_COMM_INTRA(comm_ptr, mpi_errno); if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/coll/iscatter.c b/src/mpi/coll/iscatter.c index 464be10..a1451b5 100644 --- a/src/mpi/coll/iscatter.c +++ b/src/mpi/coll/iscatter.c @@ -637,7 +637,7 @@ int MPI_Iscatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, { MPID_BEGIN_ERROR_CHECKS { - MPID_Datatype *sendtype_ptr, *recvtype_ptr; + MPIR_Datatype *sendtype_ptr, *recvtype_ptr; MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (comm_ptr->comm_kind == MPIR_INTRACOMM) { MPIR_ERRTEST_INTRA_ROOT(comm_ptr, root, mpi_errno); @@ -647,7 +647,7 @@ int MPI_Iscatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPIR_ERRTEST_DATATYPE(sendtype, "sendtype", mpi_errno); if (HANDLE_GET_KIND(sendtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(sendtype, sendtype_ptr); - MPID_Datatype_valid_ptr(sendtype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(sendtype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(sendtype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -670,7 +670,7 @@ int MPI_Iscatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPIR_ERRTEST_DATATYPE(recvtype, "recvtype", mpi_errno); if (HANDLE_GET_KIND(recvtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(recvtype, recvtype_ptr); - MPID_Datatype_valid_ptr(recvtype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(recvtype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(recvtype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -687,7 +687,7 @@ int MPI_Iscatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPIR_ERRTEST_DATATYPE(sendtype, "sendtype", mpi_errno); if (HANDLE_GET_KIND(sendtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(sendtype, sendtype_ptr); - MPID_Datatype_valid_ptr(sendtype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(sendtype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(sendtype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -700,7 +700,7 @@ int MPI_Iscatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPIR_ERRTEST_DATATYPE(recvtype, "recvtype", mpi_errno); if (HANDLE_GET_KIND(recvtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(recvtype, recvtype_ptr); - MPID_Datatype_valid_ptr(recvtype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(recvtype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(recvtype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/coll/iscatterv.c b/src/mpi/coll/iscatterv.c index 550266e..00c26b5 100644 --- a/src/mpi/coll/iscatterv.c +++ b/src/mpi/coll/iscatterv.c @@ -212,7 +212,7 @@ int MPI_Iscatterv(const void *sendbuf, const int sendcounts[], const int displs[ { MPID_BEGIN_ERROR_CHECKS { - MPID_Datatype *sendtype_ptr=NULL, *recvtype_ptr=NULL; + MPIR_Datatype *sendtype_ptr=NULL, *recvtype_ptr=NULL; int i, comm_size, rank; MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); @@ -230,7 +230,7 @@ int MPI_Iscatterv(const void *sendbuf, const int sendcounts[], const int displs[ } if (HANDLE_GET_KIND(sendtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(sendtype, sendtype_ptr); - MPID_Datatype_valid_ptr( sendtype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( sendtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr( sendtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -263,7 +263,7 @@ int MPI_Iscatterv(const void *sendbuf, const int sendcounts[], const int displs[ MPIR_ERRTEST_DATATYPE(recvtype, "recvtype", mpi_errno); if (HANDLE_GET_KIND(recvtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(recvtype, recvtype_ptr); - MPID_Datatype_valid_ptr( recvtype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( recvtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr( recvtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -282,7 +282,7 @@ int MPI_Iscatterv(const void *sendbuf, const int sendcounts[], const int displs[ } if (HANDLE_GET_KIND(sendtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(sendtype, sendtype_ptr); - MPID_Datatype_valid_ptr( sendtype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( sendtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr( sendtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -300,7 +300,7 @@ int MPI_Iscatterv(const void *sendbuf, const int sendcounts[], const int displs[ MPIR_ERRTEST_DATATYPE(recvtype, "recvtype", mpi_errno); if (HANDLE_GET_KIND(recvtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(recvtype, recvtype_ptr); - MPID_Datatype_valid_ptr( recvtype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( recvtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr( recvtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/coll/red_scat.c b/src/mpi/coll/red_scat.c index 4b212dc..b052f30 100644 --- a/src/mpi/coll/red_scat.c +++ b/src/mpi/coll/red_scat.c @@ -1167,7 +1167,7 @@ int MPI_Reduce_scatter(const void *sendbuf, void *recvbuf, const int recvcounts[ { MPID_BEGIN_ERROR_CHECKS; { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPIR_Op *op_ptr = NULL; int i, size, sum; @@ -1186,7 +1186,7 @@ int MPI_Reduce_scatter(const void *sendbuf, void *recvbuf, const int recvcounts[ MPIR_ERRTEST_DATATYPE(datatype, "datatype", mpi_errno); if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(datatype, datatype_ptr); - MPID_Datatype_valid_ptr( datatype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( datatype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr( datatype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/coll/red_scat_block.c b/src/mpi/coll/red_scat_block.c index 0599e18..f0bef42 100644 --- a/src/mpi/coll/red_scat_block.c +++ b/src/mpi/coll/red_scat_block.c @@ -1140,7 +1140,7 @@ int MPI_Reduce_scatter_block(const void *sendbuf, void *recvbuf, { MPID_BEGIN_ERROR_CHECKS; { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPIR_Op *op_ptr = NULL; MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); @@ -1151,7 +1151,7 @@ int MPI_Reduce_scatter_block(const void *sendbuf, void *recvbuf, MPIR_ERRTEST_DATATYPE(datatype, "datatype", mpi_errno); if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(datatype, datatype_ptr); - MPID_Datatype_valid_ptr( datatype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( datatype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr( datatype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/coll/reduce.c b/src/mpi/coll/reduce.c index 3e69b70..8ce9d0e 100644 --- a/src/mpi/coll/reduce.c +++ b/src/mpi/coll/reduce.c @@ -1168,7 +1168,7 @@ int MPI_Reduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datat { MPID_BEGIN_ERROR_CHECKS; { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPIR_Op *op_ptr = NULL; int rank; @@ -1182,7 +1182,7 @@ int MPI_Reduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datat MPIR_ERRTEST_DATATYPE(datatype, "datatype", mpi_errno); if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(datatype, datatype_ptr); - MPID_Datatype_valid_ptr( datatype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( datatype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr( datatype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -1211,7 +1211,7 @@ int MPI_Reduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datat MPIR_ERRTEST_DATATYPE(datatype, "datatype", mpi_errno); if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(datatype, datatype_ptr); - MPID_Datatype_valid_ptr( datatype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( datatype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr( datatype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -1225,7 +1225,7 @@ int MPI_Reduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datat MPIR_ERRTEST_DATATYPE(datatype, "datatype", mpi_errno); if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(datatype, datatype_ptr); - MPID_Datatype_valid_ptr( datatype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( datatype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr( datatype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/coll/scan.c b/src/mpi/coll/scan.c index 4c3f964..e4ebda1 100644 --- a/src/mpi/coll/scan.c +++ b/src/mpi/coll/scan.c @@ -528,7 +528,7 @@ int MPI_Scan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatyp { MPID_BEGIN_ERROR_CHECKS; { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPIR_Op *op_ptr = NULL; MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); @@ -541,7 +541,7 @@ int MPI_Scan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatyp if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(datatype, datatype_ptr); - MPID_Datatype_valid_ptr( datatype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( datatype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr( datatype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/coll/scatter.c b/src/mpi/coll/scatter.c index 1aac657..42dc7ee 100644 --- a/src/mpi/coll/scatter.c +++ b/src/mpi/coll/scatter.c @@ -700,7 +700,7 @@ int MPI_Scatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, { MPID_BEGIN_ERROR_CHECKS; { - MPID_Datatype *sendtype_ptr=NULL, *recvtype_ptr=NULL; + MPIR_Datatype *sendtype_ptr=NULL, *recvtype_ptr=NULL; int rank; MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); @@ -715,7 +715,7 @@ int MPI_Scatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPIR_ERRTEST_DATATYPE(sendtype, "sendtype", mpi_errno); if (HANDLE_GET_KIND(sendtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(sendtype, sendtype_ptr); - MPID_Datatype_valid_ptr( sendtype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( sendtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr( sendtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -738,7 +738,7 @@ int MPI_Scatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPIR_ERRTEST_DATATYPE(recvtype, "recvtype", mpi_errno); if (HANDLE_GET_KIND(recvtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(recvtype, recvtype_ptr); - MPID_Datatype_valid_ptr( recvtype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( recvtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr( recvtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -755,7 +755,7 @@ int MPI_Scatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPIR_ERRTEST_DATATYPE(sendtype, "sendtype", mpi_errno); if (HANDLE_GET_KIND(sendtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(sendtype, sendtype_ptr); - MPID_Datatype_valid_ptr( sendtype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( sendtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr( sendtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -768,7 +768,7 @@ int MPI_Scatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPIR_ERRTEST_DATATYPE(recvtype, "recvtype", mpi_errno); if (HANDLE_GET_KIND(recvtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(recvtype, recvtype_ptr); - MPID_Datatype_valid_ptr( recvtype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( recvtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr( recvtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/coll/scatterv.c b/src/mpi/coll/scatterv.c index 56df240..94a66dd 100644 --- a/src/mpi/coll/scatterv.c +++ b/src/mpi/coll/scatterv.c @@ -261,7 +261,7 @@ int MPI_Scatterv(const void *sendbuf, const int *sendcounts, const int *displs, { MPID_BEGIN_ERROR_CHECKS; { - MPID_Datatype *sendtype_ptr=NULL, *recvtype_ptr=NULL; + MPIR_Datatype *sendtype_ptr=NULL, *recvtype_ptr=NULL; int i, comm_size, rank; MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); @@ -279,7 +279,7 @@ int MPI_Scatterv(const void *sendbuf, const int *sendcounts, const int *displs, } if (HANDLE_GET_KIND(sendtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(sendtype, sendtype_ptr); - MPID_Datatype_valid_ptr( sendtype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( sendtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr( sendtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -311,7 +311,7 @@ int MPI_Scatterv(const void *sendbuf, const int *sendcounts, const int *displs, MPIR_ERRTEST_DATATYPE(recvtype, "recvtype", mpi_errno); if (HANDLE_GET_KIND(recvtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(recvtype, recvtype_ptr); - MPID_Datatype_valid_ptr( recvtype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( recvtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr( recvtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -330,7 +330,7 @@ int MPI_Scatterv(const void *sendbuf, const int *sendcounts, const int *displs, } if (HANDLE_GET_KIND(sendtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(sendtype, sendtype_ptr); - MPID_Datatype_valid_ptr( sendtype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( sendtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr( sendtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -348,7 +348,7 @@ int MPI_Scatterv(const void *sendbuf, const int *sendcounts, const int *displs, MPIR_ERRTEST_DATATYPE(recvtype, "recvtype", mpi_errno); if (HANDLE_GET_KIND(recvtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(recvtype, recvtype_ptr); - MPID_Datatype_valid_ptr( recvtype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( recvtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr( recvtype_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/datatype/get_count.c b/src/mpi/datatype/get_count.c index a96f7a3..8170db3 100644 --- a/src/mpi/datatype/get_count.c +++ b/src/mpi/datatype/get_count.c @@ -101,7 +101,7 @@ int MPI_Get_count( const MPI_Status *status, MPI_Datatype datatype, int *count ) { MPID_BEGIN_ERROR_CHECKS; { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPIR_ERRTEST_ARGNULL(status, "status", mpi_errno); MPIR_ERRTEST_ARGNULL(count, "count", mpi_errno); @@ -110,7 +110,7 @@ int MPI_Get_count( const MPI_Status *status, MPI_Datatype datatype, int *count ) /* Validate datatype_ptr */ if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno) goto fn_fail; /* Q: Must the type be committed to be used with this function? */ } diff --git a/src/mpi/datatype/get_elements.c b/src/mpi/datatype/get_elements.c index 38c9bf7..64c7d07 100644 --- a/src/mpi/datatype/get_elements.c +++ b/src/mpi/datatype/get_elements.c @@ -82,7 +82,7 @@ int MPI_Get_elements(const MPI_Status *status, MPI_Datatype datatype, int *count { MPID_BEGIN_ERROR_CHECKS; { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPIR_ERRTEST_ARGNULL(status, "status", mpi_errno); MPIR_ERRTEST_ARGNULL(count, "count", mpi_errno); @@ -91,7 +91,7 @@ int MPI_Get_elements(const MPI_Status *status, MPI_Datatype datatype, int *count /* Validate datatype_ptr */ if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); diff --git a/src/mpi/datatype/get_elements_x.c b/src/mpi/datatype/get_elements_x.c index 7a1a2c6..682a299 100644 --- a/src/mpi/datatype/get_elements_x.c +++ b/src/mpi/datatype/get_elements_x.c @@ -159,7 +159,7 @@ PMPI_LOCAL MPI_Count MPIR_Type_get_elements(MPI_Count *bytes_p, MPI_Count count, MPI_Datatype datatype) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(datatype, datatype_ptr); /* invalid if builtin */ @@ -282,7 +282,7 @@ PMPI_LOCAL MPI_Count MPIR_Type_get_elements(MPI_Count *bytes_p, int MPIR_Get_elements_x_impl(const MPI_Status *status, MPI_Datatype datatype, MPI_Count *elements) { int mpi_errno = MPI_SUCCESS; - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPI_Count byte_count; if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { @@ -411,9 +411,9 @@ int MPI_Get_elements_x(const MPI_Status *status, MPI_Datatype datatype, MPI_Coun MPID_BEGIN_ERROR_CHECKS { if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); } diff --git a/src/mpi/datatype/pack.c b/src/mpi/datatype/pack.c index b28fd1f..545e593 100644 --- a/src/mpi/datatype/pack.c +++ b/src/mpi/datatype/pack.c @@ -54,7 +54,7 @@ int MPIR_Pack_impl(const void *inbuf, dt_true_lb = 0; data_sz = incount * MPID_Datatype_get_basic_size(datatype); } else { - MPID_Datatype *dt_ptr; + MPIR_Datatype *dt_ptr; MPID_Datatype_get_ptr(datatype, dt_ptr); contig = dt_ptr->is_contig; dt_true_lb = dt_ptr->true_lb; @@ -197,10 +197,10 @@ int MPI_Pack(const void *inbuf, MPIR_ERRTEST_DATATYPE(datatype, "datatype", mpi_errno); if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/datatype/pack_external.c b/src/mpi/datatype/pack_external.c index 2972fa3..0ac8e56 100644 --- a/src/mpi/datatype/pack_external.c +++ b/src/mpi/datatype/pack_external.c @@ -94,10 +94,10 @@ int MPI_Pack_external(const char datarep[], MPIR_ERRTEST_DATATYPE(datatype, "datatype", mpi_errno); if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; } diff --git a/src/mpi/datatype/pack_external_size.c b/src/mpi/datatype/pack_external_size.c index 7f5284d..6962306 100644 --- a/src/mpi/datatype/pack_external_size.c +++ b/src/mpi/datatype/pack_external_size.c @@ -83,13 +83,13 @@ int MPI_Pack_external_size(const char datarep[], { MPID_BEGIN_ERROR_CHECKS; { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; /* Convert MPI object handles to object pointers */ MPID_Datatype_get_ptr(datatype, datatype_ptr); /* Validate datatype_ptr */ - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); /* If datatype_ptr is not valid, it will be reset to null */ if (mpi_errno) goto fn_fail; } diff --git a/src/mpi/datatype/pack_size.c b/src/mpi/datatype/pack_size.c index c896085..9bdab7c 100644 --- a/src/mpi/datatype/pack_size.c +++ b/src/mpi/datatype/pack_size.c @@ -105,7 +105,7 @@ int MPI_Pack_size(int incount, MPID_BEGIN_ERROR_CHECKS; { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPIR_ERRTEST_COUNT(incount, mpi_errno); MPIR_ERRTEST_ARGNULL(size, "size", mpi_errno); @@ -118,7 +118,7 @@ int MPI_Pack_size(int incount, if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); if (mpi_errno) goto fn_fail; } diff --git a/src/mpi/datatype/status_set_elements.c b/src/mpi/datatype/status_set_elements.c index 0d0753c..534e3f7 100644 --- a/src/mpi/datatype/status_set_elements.c +++ b/src/mpi/datatype/status_set_elements.c @@ -64,7 +64,7 @@ int MPI_Status_set_elements(MPI_Status *status, MPI_Datatype datatype, { MPID_BEGIN_ERROR_CHECKS; { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPIR_ERRTEST_COUNT(count,mpi_errno); MPIR_ERRTEST_ARGNULL(status,"status",mpi_errno); @@ -72,7 +72,7 @@ int MPI_Status_set_elements(MPI_Status *status, MPI_Datatype datatype, /* Validate datatype_ptr */ MPID_Datatype_get_ptr( datatype, datatype_ptr ); - MPID_Datatype_valid_ptr( datatype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( datatype_ptr, mpi_errno ); /* If datatype_ptr is not valid, it will be reset to null */ if (mpi_errno) goto fn_fail; } diff --git a/src/mpi/datatype/status_set_elements_x.c b/src/mpi/datatype/status_set_elements_x.c index a0229a5..b429f73 100644 --- a/src/mpi/datatype/status_set_elements_x.c +++ b/src/mpi/datatype/status_set_elements_x.c @@ -103,9 +103,9 @@ int MPI_Status_set_elements_x(MPI_Status *status, MPI_Datatype datatype, MPI_Cou MPID_BEGIN_ERROR_CHECKS { if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); } diff --git a/src/mpi/datatype/type_commit.c b/src/mpi/datatype/type_commit.c index 0ad46ea..be63e27 100644 --- a/src/mpi/datatype/type_commit.c +++ b/src/mpi/datatype/type_commit.c @@ -98,13 +98,13 @@ int MPI_Type_commit(MPI_Datatype *datatype) { MPID_BEGIN_ERROR_CHECKS; { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; /* Convert MPI object handles to object pointers */ MPID_Datatype_get_ptr( *datatype, datatype_ptr ); /* Validate datatype_ptr */ - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno) goto fn_fail; } MPID_END_ERROR_CHECKS; diff --git a/src/mpi/datatype/type_contiguous.c b/src/mpi/datatype/type_contiguous.c index d99c80a..bd682af 100644 --- a/src/mpi/datatype/type_contiguous.c +++ b/src/mpi/datatype/type_contiguous.c @@ -34,7 +34,7 @@ int MPIR_Type_contiguous_impl(int count, MPI_Datatype *newtype) { int mpi_errno = MPI_SUCCESS; - MPID_Datatype *new_dtp; + MPIR_Datatype *new_dtp; MPI_Datatype new_handle; mpi_errno = MPID_Type_contiguous(count, @@ -153,14 +153,14 @@ int MPI_Type_contiguous(int count, { MPID_BEGIN_ERROR_CHECKS; { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPIR_ERRTEST_COUNT(count, mpi_errno); MPIR_ERRTEST_DATATYPE(oldtype, "datatype", mpi_errno); if (HANDLE_GET_KIND(oldtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(oldtype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; } } diff --git a/src/mpi/datatype/type_create_darray.c b/src/mpi/datatype/type_create_darray.c index 925ec5a..5760aff 100644 --- a/src/mpi/datatype/type_create_darray.c +++ b/src/mpi/datatype/type_create_darray.c @@ -386,7 +386,7 @@ int MPI_Type_create_darray(int size, # endif int *ints; - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPIU_CHKLMEM_DECL(3); MPID_MPI_STATE_DECL(MPID_STATE_MPI_TYPE_CREATE_DARRAY); @@ -513,7 +513,7 @@ int MPI_Type_create_darray(int size, } /* Validate datatype_ptr */ - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); /* If datatype_ptr is not valid, it will be reset to null */ /* --BEGIN ERROR HANDLING-- */ if (mpi_errno) goto fn_fail; diff --git a/src/mpi/datatype/type_create_hindexed.c b/src/mpi/datatype/type_create_hindexed.c index 5db81a8..228b9f6 100644 --- a/src/mpi/datatype/type_create_hindexed.c +++ b/src/mpi/datatype/type_create_hindexed.c @@ -64,7 +64,7 @@ int MPI_Type_create_hindexed(int count, static const char FCNAME[] = "MPI_Type_create_hindexed"; int mpi_errno = MPI_SUCCESS; MPI_Datatype new_handle; - MPID_Datatype *new_dtp; + MPIR_Datatype *new_dtp; int i, *ints; MPIU_CHKLMEM_DECL(1); MPID_MPI_STATE_DECL(MPID_STATE_MPI_TYPE_CREATE_HINDEXED); @@ -79,7 +79,7 @@ int MPI_Type_create_hindexed(int count, MPID_BEGIN_ERROR_CHECKS; { int j; - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPIR_ERRTEST_COUNT(count, mpi_errno); if (count > 0) { @@ -91,7 +91,7 @@ int MPI_Type_create_hindexed(int count, if (HANDLE_GET_KIND(oldtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(oldtype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; } for (j=0; j < count; j++) { diff --git a/src/mpi/datatype/type_create_hindexed_block.c b/src/mpi/datatype/type_create_hindexed_block.c index 9714d82..3cb7ce2 100644 --- a/src/mpi/datatype/type_create_hindexed_block.c +++ b/src/mpi/datatype/type_create_hindexed_block.c @@ -37,7 +37,7 @@ int MPIR_Type_create_hindexed_block_impl(int count, int blocklength, { int mpi_errno = MPI_SUCCESS; MPI_Datatype new_handle; - MPID_Datatype *new_dtp; + MPIR_Datatype *new_dtp; int ints[2]; mpi_errno = MPID_Type_blockindexed(count, blocklength, array_of_displacements, 1, @@ -114,7 +114,7 @@ int MPI_Type_create_hindexed_block(int count, { MPID_BEGIN_ERROR_CHECKS; { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPIR_ERRTEST_COUNT(count, mpi_errno); MPIR_ERRTEST_ARGNEG(blocklength, "blocklen", mpi_errno); @@ -125,7 +125,7 @@ int MPI_Type_create_hindexed_block(int count, if (HANDLE_GET_KIND(oldtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(oldtype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); } if (mpi_errno) diff --git a/src/mpi/datatype/type_create_hvector.c b/src/mpi/datatype/type_create_hvector.c index f7b95ed..81b6261 100644 --- a/src/mpi/datatype/type_create_hvector.c +++ b/src/mpi/datatype/type_create_hvector.c @@ -62,7 +62,7 @@ int MPI_Type_create_hvector(int count, static const char FCNAME[] = "MPI_Type_create_hvector"; int mpi_errno = MPI_SUCCESS; MPI_Datatype new_handle; - MPID_Datatype *new_dtp; + MPIR_Datatype *new_dtp; int ints[2]; MPID_MPI_STATE_DECL(MPID_STATE_MPI_TYPE_CREATE_HVECTOR); @@ -75,7 +75,7 @@ int MPI_Type_create_hvector(int count, { MPID_BEGIN_ERROR_CHECKS; { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPIR_ERRTEST_COUNT(count, mpi_errno); MPIR_ERRTEST_ARGNEG(blocklength, "blocklen", mpi_errno); @@ -83,7 +83,7 @@ int MPI_Type_create_hvector(int count, if (HANDLE_GET_KIND(oldtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(oldtype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; } MPIR_ERRTEST_ARGNULL(newtype, "newtype", mpi_errno); diff --git a/src/mpi/datatype/type_create_indexed_block.c b/src/mpi/datatype/type_create_indexed_block.c index 2fafcac..eae6ea1 100644 --- a/src/mpi/datatype/type_create_indexed_block.c +++ b/src/mpi/datatype/type_create_indexed_block.c @@ -39,7 +39,7 @@ int MPIR_Type_create_indexed_block_impl(int count, int mpi_errno = MPI_SUCCESS; MPIU_CHKLMEM_DECL(1); MPI_Datatype new_handle; - MPID_Datatype *new_dtp; + MPIR_Datatype *new_dtp; int i, *ints; mpi_errno = MPID_Type_blockindexed(count, @@ -148,7 +148,7 @@ int MPI_Type_create_indexed_block(int count, { MPID_BEGIN_ERROR_CHECKS; { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPIR_ERRTEST_COUNT(count, mpi_errno); MPIR_ERRTEST_ARGNEG(blocklength, "blocklen", mpi_errno); @@ -161,7 +161,7 @@ int MPI_Type_create_indexed_block(int count, if (HANDLE_GET_KIND(oldtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(oldtype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); } if (mpi_errno) goto fn_fail; diff --git a/src/mpi/datatype/type_create_resized.c b/src/mpi/datatype/type_create_resized.c index 894a87e..afe91c9 100644 --- a/src/mpi/datatype/type_create_resized.c +++ b/src/mpi/datatype/type_create_resized.c @@ -59,7 +59,7 @@ int MPI_Type_create_resized(MPI_Datatype oldtype, static const char FCNAME[] = "MPI_Type_create_resized"; int mpi_errno = MPI_SUCCESS; MPI_Datatype new_handle; - MPID_Datatype *new_dtp; + MPIR_Datatype *new_dtp; MPI_Aint aints[2]; MPID_MPI_STATE_DECL(MPID_STATE_MPI_TYPE_CREATE_RESIZED); @@ -73,13 +73,13 @@ int MPI_Type_create_resized(MPI_Datatype oldtype, { MPID_BEGIN_ERROR_CHECKS; { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPIR_ERRTEST_DATATYPE(oldtype, "datatype", mpi_errno); /* Validate datatype_ptr */ MPID_Datatype_get_ptr(oldtype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); /* If datatype_ptr is not valid, it will be reset to null */ if (mpi_errno) goto fn_fail; } diff --git a/src/mpi/datatype/type_create_struct.c b/src/mpi/datatype/type_create_struct.c index 5557ce1..fad34ab 100644 --- a/src/mpi/datatype/type_create_struct.c +++ b/src/mpi/datatype/type_create_struct.c @@ -40,7 +40,7 @@ int MPIR_Type_create_struct_impl(int count, int mpi_errno = MPI_SUCCESS; int i, *ints; MPI_Datatype new_handle; - MPID_Datatype *new_dtp; + MPIR_Datatype *new_dtp; MPIU_CHKLMEM_DECL(1); mpi_errno = MPID_Type_struct(count, @@ -127,7 +127,7 @@ int MPI_Type_create_struct(int count, MPID_BEGIN_ERROR_CHECKS; { int j; - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPIR_ERRTEST_COUNT(count,mpi_errno); @@ -143,7 +143,7 @@ int MPI_Type_create_struct(int count, if (array_of_types[j] != MPI_DATATYPE_NULL && HANDLE_GET_KIND(array_of_types[j]) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(array_of_types[j], datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; } } diff --git a/src/mpi/datatype/type_create_subarray.c b/src/mpi/datatype/type_create_subarray.c index 84419cf..2c249fd 100644 --- a/src/mpi/datatype/type_create_subarray.c +++ b/src/mpi/datatype/type_create_subarray.c @@ -81,7 +81,7 @@ int MPI_Type_create_subarray(int ndims, /* for saving contents */ int *ints; - MPID_Datatype *new_dtp; + MPIR_Datatype *new_dtp; MPIU_CHKLMEM_DECL(1); MPID_MPI_STATE_DECL(MPID_STATE_MPI_TYPE_CREATE_SUBARRAY); @@ -95,7 +95,7 @@ int MPI_Type_create_subarray(int ndims, { MPID_BEGIN_ERROR_CHECKS; { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; /* Check parameters */ MPIR_ERRTEST_ARGNONPOS(ndims, "ndims", mpi_errno, MPI_ERR_DIMS); @@ -172,7 +172,7 @@ int MPI_Type_create_subarray(int ndims, MPID_Datatype_get_ptr(oldtype, datatype_ptr); /* Validate datatype_ptr */ - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); /* If datatype_ptr is not valid, it will be reset to null */ if (mpi_errno != MPI_SUCCESS) goto fn_fail; } diff --git a/src/mpi/datatype/type_dup.c b/src/mpi/datatype/type_dup.c index 25f5394..83cf8bb 100644 --- a/src/mpi/datatype/type_dup.c +++ b/src/mpi/datatype/type_dup.c @@ -52,8 +52,8 @@ int MPI_Type_dup(MPI_Datatype oldtype, MPI_Datatype *newtype) static const char FCNAME[] = "MPI_Type_dup"; int mpi_errno = MPI_SUCCESS; MPI_Datatype new_handle; - MPID_Datatype *datatype_ptr = NULL; - MPID_Datatype *new_dtp; + MPIR_Datatype *datatype_ptr = NULL; + MPIR_Datatype *new_dtp; MPID_MPI_STATE_DECL(MPID_STATE_MPI_TYPE_DUP); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -81,7 +81,7 @@ int MPI_Type_dup(MPI_Datatype oldtype, MPI_Datatype *newtype) MPID_BEGIN_ERROR_CHECKS; { /* Validate datatype_ptr */ - MPID_Datatype_valid_ptr( datatype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( datatype_ptr, mpi_errno ); /* If comm_ptr is not valid, it will be reset to null */ MPIR_ERRTEST_ARGNULL(newtype, "newtype", mpi_errno); } diff --git a/src/mpi/datatype/type_extent.c b/src/mpi/datatype/type_extent.c index 7f8db44..92d79f0 100644 --- a/src/mpi/datatype/type_extent.c +++ b/src/mpi/datatype/type_extent.c @@ -76,13 +76,13 @@ int MPI_Type_extent(MPI_Datatype datatype, MPI_Aint *extent) { MPID_BEGIN_ERROR_CHECKS; { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; /* Convert MPI object handles to object pointers */ MPID_Datatype_get_ptr(datatype, datatype_ptr); /* Validate datatype_ptr */ - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno) goto fn_fail; } MPID_END_ERROR_CHECKS; diff --git a/src/mpi/datatype/type_free.c b/src/mpi/datatype/type_free.c index dc68238..c3544bf 100644 --- a/src/mpi/datatype/type_free.c +++ b/src/mpi/datatype/type_free.c @@ -31,7 +31,7 @@ int MPI_Type_free(MPI_Datatype *datatype) __attribute__((weak,alias("PMPI_Type_f #define FCNAME MPL_QUOTE(FUNCNAME) void MPIR_Type_free_impl(MPI_Datatype *datatype) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr( *datatype, datatype_ptr ); MPID_Datatype_release(datatype_ptr); @@ -97,7 +97,7 @@ int MPI_Type_free(MPI_Datatype *datatype) { MPID_BEGIN_ERROR_CHECKS; { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; /* Check for built-in type */ if (HANDLE_GET_KIND(*datatype) == HANDLE_KIND_BUILTIN) { @@ -129,7 +129,7 @@ int MPI_Type_free(MPI_Datatype *datatype) MPID_Datatype_get_ptr( *datatype, datatype_ptr ); /* Validate datatype_ptr */ - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno) goto fn_fail; } MPID_END_ERROR_CHECKS; diff --git a/src/mpi/datatype/type_get_contents.c b/src/mpi/datatype/type_get_contents.c index e3a37e7..776d199 100644 --- a/src/mpi/datatype/type_get_contents.c +++ b/src/mpi/datatype/type_get_contents.c @@ -86,7 +86,7 @@ int MPI_Type_get_contents(MPI_Datatype datatype, { MPID_BEGIN_ERROR_CHECKS; { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; /* Check for built-in type */ if (HANDLE_GET_KIND(datatype) == HANDLE_KIND_BUILTIN) { @@ -119,7 +119,7 @@ int MPI_Type_get_contents(MPI_Datatype datatype, MPID_Datatype_get_ptr(datatype, datatype_ptr); /* Validate datatype_ptr */ - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); /* If comm_ptr is not value, it will be reset to null */ if (mpi_errno) goto fn_fail; } diff --git a/src/mpi/datatype/type_get_envelope.c b/src/mpi/datatype/type_get_envelope.c index aa033ef..3594733 100644 --- a/src/mpi/datatype/type_get_envelope.c +++ b/src/mpi/datatype/type_get_envelope.c @@ -49,7 +49,7 @@ void MPIR_Type_get_envelope_impl(MPI_Datatype datatype, *num_datatypes = 0; } else { - MPID_Datatype *dtp; + MPIR_Datatype *dtp; MPID_Datatype_get_ptr(datatype, dtp); @@ -115,13 +115,13 @@ int MPI_Type_get_envelope(MPI_Datatype datatype, { MPID_BEGIN_ERROR_CHECKS; { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; /* Convert MPI object handles to object pointers */ MPID_Datatype_get_ptr( datatype, datatype_ptr ); /* Validate datatype_ptr */ - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); /* If comm_ptr is not value, it will be reset to null */ if (mpi_errno != MPI_SUCCESS) goto fn_fail; } diff --git a/src/mpi/datatype/type_get_extent.c b/src/mpi/datatype/type_get_extent.c index f2a7149..2ec1ba9 100644 --- a/src/mpi/datatype/type_get_extent.c +++ b/src/mpi/datatype/type_get_extent.c @@ -88,13 +88,13 @@ int MPI_Type_get_extent(MPI_Datatype datatype, MPI_Aint *lb, MPI_Aint *extent) { MPID_BEGIN_ERROR_CHECKS; { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; /* Convert MPI object handles to object pointers */ MPID_Datatype_get_ptr(datatype, datatype_ptr); /* Validate datatype_ptr */ - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno) goto fn_fail; } MPID_END_ERROR_CHECKS; diff --git a/src/mpi/datatype/type_get_extent_x.c b/src/mpi/datatype/type_get_extent_x.c index 0221f06..561c958 100644 --- a/src/mpi/datatype/type_get_extent_x.c +++ b/src/mpi/datatype/type_get_extent_x.c @@ -32,7 +32,7 @@ int MPI_Type_get_extent_x(MPI_Datatype datatype, MPI_Count *lb, MPI_Count *exten #define FCNAME MPL_QUOTE(FUNCNAME) void MPIR_Type_get_extent_x_impl(MPI_Datatype datatype, MPI_Count *lb, MPI_Count *extent) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(datatype, datatype_ptr); @@ -98,9 +98,9 @@ int MPI_Type_get_extent_x(MPI_Datatype datatype, MPI_Count *lb, MPI_Count *exten MPID_BEGIN_ERROR_CHECKS { if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); } /* TODO more checks may be appropriate (counts, in_place, buffer aliasing, etc) */ diff --git a/src/mpi/datatype/type_get_name.c b/src/mpi/datatype/type_get_name.c index 507ab14..e4a4d0d 100644 --- a/src/mpi/datatype/type_get_name.c +++ b/src/mpi/datatype/type_get_name.c @@ -143,7 +143,7 @@ int MPIR_Datatype_init_names(void) #endif int mpi_errno = MPI_SUCCESS; int i; - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; static volatile int needsInit = 1; MPID_THREAD_CS_ENTER(POBJ, MPIR_THREAD_GLOBAL_ALLFUNC_MUTEX); @@ -167,8 +167,8 @@ int MPIR_Datatype_init_names(void) MPID_Datatype_get_ptr(mpi_names[i].dtype, datatype_ptr); - if (datatype_ptr < MPID_Datatype_builtin || - datatype_ptr > MPID_Datatype_builtin + MPID_DATATYPE_N_BUILTIN) + if (datatype_ptr < MPIR_Datatype_builtin || + datatype_ptr > MPIR_Datatype_builtin + MPIR_DATATYPE_N_BUILTIN) { MPIR_ERR_SETFATALANDJUMP1(mpi_errno,MPI_ERR_INTERN, "**typeinitbadmem","**typeinitbadmem %d", i); @@ -238,7 +238,7 @@ int MPI_Type_get_name(MPI_Datatype datatype, char *type_name, int *resultlen) { static const char FCNAME[] = "MPI_Type_get_name"; int mpi_errno = MPI_SUCCESS; - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; static int setup = 0; MPID_MPI_STATE_DECL(MPID_STATE_MPI_TYPE_GET_NAME); @@ -270,7 +270,7 @@ int MPI_Type_get_name(MPI_Datatype datatype, char *type_name, int *resultlen) MPID_BEGIN_ERROR_CHECKS; { /* Validate datatype_ptr */ - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno) goto fn_fail; /* If datatype_ptr is not valid, it will be reset to null */ MPIR_ERRTEST_ARGNULL(type_name,"type_name", mpi_errno); diff --git a/src/mpi/datatype/type_get_true_extent.c b/src/mpi/datatype/type_get_true_extent.c index e5e064b..090f757 100644 --- a/src/mpi/datatype/type_get_true_extent.c +++ b/src/mpi/datatype/type_get_true_extent.c @@ -90,13 +90,13 @@ int MPI_Type_get_true_extent(MPI_Datatype datatype, MPI_Aint *true_lb, { MPID_BEGIN_ERROR_CHECKS; { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; /* Convert MPI object handles to object pointers */ MPID_Datatype_get_ptr(datatype, datatype_ptr); /* Validate datatype_ptr */ - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno) goto fn_fail; } MPID_END_ERROR_CHECKS; diff --git a/src/mpi/datatype/type_get_true_extent_x.c b/src/mpi/datatype/type_get_true_extent_x.c index b16ab01..119a72c 100644 --- a/src/mpi/datatype/type_get_true_extent_x.c +++ b/src/mpi/datatype/type_get_true_extent_x.c @@ -32,7 +32,7 @@ int MPI_Type_get_true_extent_x(MPI_Datatype datatype, MPI_Count *lb, MPI_Count * #define FCNAME MPL_QUOTE(FUNCNAME) void MPIR_Type_get_true_extent_x_impl(MPI_Datatype datatype, MPI_Count *true_lb, MPI_Count *true_extent) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(datatype, datatype_ptr); @@ -98,9 +98,9 @@ int MPI_Type_get_true_extent_x(MPI_Datatype datatype, MPI_Count *true_lb, MPI_Co MPID_BEGIN_ERROR_CHECKS { if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); } /* TODO more checks may be appropriate (counts, in_place, buffer aliasing, etc) */ diff --git a/src/mpi/datatype/type_hindexed.c b/src/mpi/datatype/type_hindexed.c index b48bed7..913c072 100644 --- a/src/mpi/datatype/type_hindexed.c +++ b/src/mpi/datatype/type_hindexed.c @@ -89,7 +89,7 @@ int MPI_Type_hindexed(int count, static const char FCNAME[] = "MPI_Type_hindexed"; int mpi_errno = MPI_SUCCESS; MPI_Datatype new_handle; - MPID_Datatype *new_dtp; + MPIR_Datatype *new_dtp; int i, *ints; MPIU_CHKLMEM_DECL(1); MPID_MPI_STATE_DECL(MPID_STATE_MPI_TYPE_HINDEXED); @@ -104,7 +104,7 @@ int MPI_Type_hindexed(int count, MPID_BEGIN_ERROR_CHECKS; { int j; - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPIR_ERRTEST_COUNT(count, mpi_errno); MPIR_ERRTEST_DATATYPE(oldtype, "datatype", mpi_errno); @@ -115,7 +115,7 @@ int MPI_Type_hindexed(int count, if (HANDLE_GET_KIND(oldtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr( oldtype, datatype_ptr ); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; } /* verify that all blocklengths are >= 0 */ diff --git a/src/mpi/datatype/type_hvector.c b/src/mpi/datatype/type_hvector.c index 4174cf0..b5b959d 100644 --- a/src/mpi/datatype/type_hvector.c +++ b/src/mpi/datatype/type_hvector.c @@ -34,7 +34,7 @@ int MPIR_Type_hvector_impl(int count, int blocklength, MPI_Aint stride, MPI_Data { int mpi_errno = MPI_SUCCESS; MPI_Datatype new_handle; - MPID_Datatype *new_dtp; + MPIR_Datatype *new_dtp; int ints[2]; mpi_errno = MPID_Type_vector(count, @@ -111,7 +111,7 @@ int MPI_Type_hvector(int count, { MPID_BEGIN_ERROR_CHECKS; { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPIR_ERRTEST_COUNT(count, mpi_errno); MPIR_ERRTEST_ARGNEG(blocklength,"blocklength",mpi_errno); @@ -119,7 +119,7 @@ int MPI_Type_hvector(int count, if (HANDLE_GET_KIND(oldtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(oldtype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno) goto fn_fail; } diff --git a/src/mpi/datatype/type_indexed.c b/src/mpi/datatype/type_indexed.c index f02de6d..425a8b8 100644 --- a/src/mpi/datatype/type_indexed.c +++ b/src/mpi/datatype/type_indexed.c @@ -37,7 +37,7 @@ int MPIR_Type_indexed_impl(int count, const int *array_of_blocklengths, { int mpi_errno = MPI_SUCCESS; MPI_Datatype new_handle; - MPID_Datatype *new_dtp; + MPIR_Datatype *new_dtp; int i, *ints; MPIU_CHKLMEM_DECL(1); @@ -154,7 +154,7 @@ int MPI_Type_indexed(int count, MPID_BEGIN_ERROR_CHECKS; { int j; - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPIR_ERRTEST_COUNT(count,mpi_errno); if (count > 0) { @@ -165,7 +165,7 @@ int MPI_Type_indexed(int count, if (HANDLE_GET_KIND(oldtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr( oldtype, datatype_ptr ); - MPID_Datatype_valid_ptr( datatype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( datatype_ptr, mpi_errno ); } /* verify that all blocklengths are >= 0 */ for (j=0; j < count; j++) { diff --git a/src/mpi/datatype/type_lb.c b/src/mpi/datatype/type_lb.c index 2f0778f..9ec1107 100644 --- a/src/mpi/datatype/type_lb.c +++ b/src/mpi/datatype/type_lb.c @@ -34,7 +34,7 @@ void MPIR_Type_lb_impl(MPI_Datatype datatype, MPI_Aint *displacement) if (HANDLE_GET_KIND(datatype) == HANDLE_KIND_BUILTIN) { *displacement = 0; } else { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(datatype, datatype_ptr); *displacement = datatype_ptr->lb; } @@ -93,13 +93,13 @@ int MPI_Type_lb(MPI_Datatype datatype, MPI_Aint *displacement) { MPID_BEGIN_ERROR_CHECKS; { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; /* Convert MPI object handles to object pointers */ MPID_Datatype_get_ptr(datatype, datatype_ptr); /* Validate datatype_ptr */ - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno) goto fn_fail; } MPID_END_ERROR_CHECKS; diff --git a/src/mpi/datatype/type_set_name.c b/src/mpi/datatype/type_set_name.c index 08ce1fb..b71c7a7 100644 --- a/src/mpi/datatype/type_set_name.c +++ b/src/mpi/datatype/type_set_name.c @@ -51,7 +51,7 @@ Input Parameters: int MPI_Type_set_name(MPI_Datatype datatype, const char *type_name) { int mpi_errno = MPI_SUCCESS; - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; static int setup = 0; MPID_MPI_STATE_DECL(MPID_STATE_MPI_TYPE_SET_NAME); @@ -81,7 +81,7 @@ int MPI_Type_set_name(MPI_Datatype datatype, const char *type_name) int slen; /* Validate datatype_ptr */ - MPID_Datatype_valid_ptr( datatype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( datatype_ptr, mpi_errno ); /* If datatype_ptr is not valid, it will be reset to null */ MPIR_ERRTEST_ARGNULL(type_name,"type_name", mpi_errno); diff --git a/src/mpi/datatype/type_size.c b/src/mpi/datatype/type_size.c index cc9a3f4..a1e3db0 100644 --- a/src/mpi/datatype/type_size.c +++ b/src/mpi/datatype/type_size.c @@ -84,13 +84,13 @@ int MPI_Type_size(MPI_Datatype datatype, int *size) { MPID_BEGIN_ERROR_CHECKS; { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; /* Convert MPI object handles to object pointers */ MPID_Datatype_get_ptr( datatype, datatype_ptr ); /* Validate datatype_ptr */ - MPID_Datatype_valid_ptr( datatype_ptr, mpi_errno ); + MPIR_Datatype_valid_ptr( datatype_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; } MPID_END_ERROR_CHECKS; diff --git a/src/mpi/datatype/type_size_x.c b/src/mpi/datatype/type_size_x.c index 1a5a555..81bf558 100644 --- a/src/mpi/datatype/type_size_x.c +++ b/src/mpi/datatype/type_size_x.c @@ -94,9 +94,9 @@ int MPI_Type_size_x(MPI_Datatype datatype, MPI_Count *size) MPID_BEGIN_ERROR_CHECKS { if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); } /* TODO more checks may be appropriate (counts, in_place, buffer aliasing, etc) */ diff --git a/src/mpi/datatype/type_struct.c b/src/mpi/datatype/type_struct.c index 0a9f9dc..cb2d62c 100644 --- a/src/mpi/datatype/type_struct.c +++ b/src/mpi/datatype/type_struct.c @@ -37,7 +37,7 @@ int MPIR_Type_struct_impl(int count, const int *array_of_blocklengths, int mpi_errno = MPI_SUCCESS; MPI_Datatype new_handle; int i, *ints; - MPID_Datatype *new_dtp; + MPIR_Datatype *new_dtp; MPIU_CHKLMEM_DECL(1); mpi_errno = MPID_Type_struct(count, @@ -168,7 +168,7 @@ int MPI_Type_struct(int count, MPID_BEGIN_ERROR_CHECKS; { int i; - MPID_Datatype *datatype_ptr; + MPIR_Datatype *datatype_ptr; MPIR_ERRTEST_COUNT(count,mpi_errno); if (count > 0) { @@ -184,7 +184,7 @@ int MPI_Type_struct(int count, if (array_of_types[i] != MPI_DATATYPE_NULL && HANDLE_GET_KIND(array_of_types[i]) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(array_of_types[i], datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); } } if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/datatype/type_ub.c b/src/mpi/datatype/type_ub.c index afc6a45..96e97ee 100644 --- a/src/mpi/datatype/type_ub.c +++ b/src/mpi/datatype/type_ub.c @@ -57,7 +57,7 @@ The replacement for this routine is 'MPI_Type_get_extent' int MPI_Type_ub(MPI_Datatype datatype, MPI_Aint *displacement) { int mpi_errno = MPI_SUCCESS; - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_TYPE_UB); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -84,7 +84,7 @@ int MPI_Type_ub(MPI_Datatype datatype, MPI_Aint *displacement) MPID_BEGIN_ERROR_CHECKS; { /* Validate datatype_ptr */ - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno) goto fn_fail; } MPID_END_ERROR_CHECKS; diff --git a/src/mpi/datatype/type_vector.c b/src/mpi/datatype/type_vector.c index ded9339..cedc8e7 100644 --- a/src/mpi/datatype/type_vector.c +++ b/src/mpi/datatype/type_vector.c @@ -34,7 +34,7 @@ int MPIR_Type_vector_impl(int count, int blocklength, int stride, MPI_Datatype o { int mpi_errno = MPI_SUCCESS; MPI_Datatype new_handle; - MPID_Datatype *new_dtp; + MPIR_Datatype *new_dtp; int ints[3]; mpi_errno = MPID_Type_vector(count, @@ -115,7 +115,7 @@ int MPI_Type_vector(int count, { MPID_BEGIN_ERROR_CHECKS; { - MPID_Datatype *old_ptr = NULL; + MPIR_Datatype *old_ptr = NULL; MPIR_ERRTEST_COUNT(count, mpi_errno); MPIR_ERRTEST_ARGNEG(blocklength, "blocklen", mpi_errno); @@ -123,7 +123,7 @@ int MPI_Type_vector(int count, if (oldtype != MPI_DATATYPE_NULL && HANDLE_GET_KIND(oldtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype_get_ptr(oldtype, old_ptr); - MPID_Datatype_valid_ptr(old_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(old_ptr, mpi_errno); if (mpi_errno) goto fn_fail; } } diff --git a/src/mpi/datatype/typeutil.c b/src/mpi/datatype/typeutil.c index b3c58b4..33949cd 100644 --- a/src/mpi/datatype/typeutil.c +++ b/src/mpi/datatype/typeutil.c @@ -11,21 +11,21 @@ /* This is the utility file for datatypes that contains the basic datatype items and storage management. It also contains a temporary routine that is used by ROMIO to test to see if datatypes are contiguous */ -#ifndef MPID_DATATYPE_PREALLOC -#define MPID_DATATYPE_PREALLOC 8 +#ifndef MPIR_DATATYPE_PREALLOC +#define MPIR_DATATYPE_PREALLOC 8 #endif /* Preallocated datatype objects */ -MPID_Datatype MPID_Datatype_builtin[MPID_DATATYPE_N_BUILTIN + 1] = { {0} }; -MPID_Datatype MPID_Datatype_direct[MPID_DATATYPE_PREALLOC] = { {0} }; -MPIU_Object_alloc_t MPID_Datatype_mem = { 0, 0, 0, 0, MPID_DATATYPE, - sizeof(MPID_Datatype), MPID_Datatype_direct, - MPID_DATATYPE_PREALLOC}; +MPIR_Datatype MPIR_Datatype_builtin[MPIR_DATATYPE_N_BUILTIN + 1] = { {0} }; +MPIR_Datatype MPIR_Datatype_direct[MPIR_DATATYPE_PREALLOC] = { {0} }; +MPIU_Object_alloc_t MPIR_Datatype_mem = { 0, 0, 0, 0, MPIR_DATATYPE, + sizeof(MPIR_Datatype), MPIR_Datatype_direct, + MPIR_DATATYPE_PREALLOC}; static int MPIR_Datatype_finalize(void *dummy ); static int MPIR_DatatypeAttrFinalizeCallback(void *dummy ); -/* Call this routine to associate a MPID_Datatype with each predefined +/* Call this routine to associate a MPIR_Datatype with each predefined datatype. We do this with lazy initialization because many MPI programs do not require anything except the predefined datatypes, and all of the necessary information about those is stored within the @@ -147,10 +147,10 @@ int MPIR_Datatype_init(void) { int i; int mpi_errno = MPI_SUCCESS; - MPID_Datatype *ptr; + MPIR_Datatype *ptr; - MPIU_Assert(MPID_Datatype_mem.initialized == 0); - MPIU_Assert(MPID_DATATYPE_PREALLOC >= 5); + MPIU_Assert(MPIR_Datatype_mem.initialized == 0); + MPIU_Assert(MPIR_DATATYPE_PREALLOC >= 5); for (i=0; mpi_pairtypes[i] != (MPI_Datatype) -1; ++i) { /* types based on 'long long' and 'long double', may be disabled at @@ -168,14 +168,14 @@ int MPIR_Datatype_init(void) /* we use the _unsafe version because we are still in MPI_Init, before * multiple threads are permitted and possibly before support for * critical sections is entirely setup */ - ptr = (MPID_Datatype *)MPIU_Handle_obj_alloc_unsafe( &MPID_Datatype_mem ); + ptr = (MPIR_Datatype *)MPIU_Handle_obj_alloc_unsafe( &MPIR_Datatype_mem ); MPIU_Assert(ptr); MPIU_Assert(ptr->handle == mpi_pairtypes[i]); /* this is a redundant alternative to the previous statement */ - MPIU_Assert((void *) ptr == (void *) (MPID_Datatype_direct + HANDLE_INDEX(mpi_pairtypes[i]))); + MPIU_Assert((void *) ptr == (void *) (MPIR_Datatype_direct + HANDLE_INDEX(mpi_pairtypes[i]))); - mpi_errno = MPID_Type_create_pairtype(mpi_pairtypes[i], (MPID_Datatype *) ptr); + mpi_errno = MPID_Type_create_pairtype(mpi_pairtypes[i], (MPIR_Datatype *) ptr); if (mpi_errno) MPIR_ERR_POP(mpi_errno); } @@ -193,7 +193,7 @@ fn_fail: static int MPIR_Datatype_finalize(void *dummy ATTRIBUTE((unused)) ) { int i; - MPID_Datatype *dptr; + MPIR_Datatype *dptr; for (i=0; mpi_pairtypes[i] != (MPI_Datatype) -1; i++) { if (mpi_pairtypes[i] != MPI_DATATYPE_NULL) { @@ -217,7 +217,7 @@ int MPIR_Datatype_builtin_fillin(void) { int mpi_errno = MPI_SUCCESS; int i; - MPID_Datatype *dptr; + MPIR_Datatype *dptr; MPI_Datatype d = MPI_DATATYPE_NULL; static int is_init = 0; @@ -229,7 +229,7 @@ int MPIR_Datatype_builtin_fillin(void) } if (!is_init) { - for (i=0; i<MPID_DATATYPE_N_BUILTIN; i++) { + for (i=0; i<MPIR_DATATYPE_N_BUILTIN; i++) { /* Compute the index from the value of the handle */ d = mpi_dtypes[i]; if (d == -1) { @@ -243,8 +243,8 @@ int MPIR_Datatype_builtin_fillin(void) MPID_Datatype_get_ptr(d,dptr); /* --BEGIN ERROR HANDLING-- */ - if (dptr < MPID_Datatype_builtin || - dptr > MPID_Datatype_builtin + MPID_DATATYPE_N_BUILTIN) + if (dptr < MPIR_Datatype_builtin || + dptr > MPIR_Datatype_builtin + MPIR_DATATYPE_N_BUILTIN) { mpi_errno = MPIR_Err_create_code(MPI_SUCCESS, MPIR_ERR_FATAL, FCNAME, @@ -255,7 +255,7 @@ int MPIR_Datatype_builtin_fillin(void) } /* --END ERROR HANDLING-- */ - /* dptr will point into MPID_Datatype_builtin */ + /* dptr will point into MPIR_Datatype_builtin */ dptr->handle = d; dptr->is_permanent = 1; dptr->is_contig = 1; @@ -284,7 +284,7 @@ int MPIR_Datatype_builtin_fillin(void) /* This will eventually be removed once ROMIO knows more about MPICH */ void MPIR_Datatype_iscontig(MPI_Datatype datatype, int *flag) { - MPID_Datatype *datatype_ptr; + MPIR_Datatype *datatype_ptr; if (HANDLE_GET_KIND(datatype) == HANDLE_KIND_BUILTIN) *flag = 1; else { @@ -297,11 +297,11 @@ void MPIR_Datatype_iscontig(MPI_Datatype datatype, int *flag) in Finalize */ static int MPIR_DatatypeAttrFinalizeCallback(void *dummy ATTRIBUTE((unused)) ) { - MPID_Datatype *dtype; + MPIR_Datatype *dtype; int i, mpi_errno=MPI_SUCCESS; - for (i=0; i<MPID_DATATYPE_N_BUILTIN; i++) { - dtype = &MPID_Datatype_builtin[i]; + for (i=0; i<MPIR_DATATYPE_N_BUILTIN; i++) { + dtype = &MPIR_Datatype_builtin[i]; if (dtype && MPIR_Process.attr_free && dtype->attributes) { mpi_errno = MPIR_Process.attr_free( dtype->handle, &dtype->attributes ); diff --git a/src/mpi/datatype/unpack.c b/src/mpi/datatype/unpack.c index eb58b5c..cf1acb3 100644 --- a/src/mpi/datatype/unpack.c +++ b/src/mpi/datatype/unpack.c @@ -49,7 +49,7 @@ int MPIR_Unpack_impl(const void *inbuf, MPI_Aint insize, MPI_Aint *position, dt_true_lb = 0; data_sz = outcount * MPID_Datatype_get_basic_size(datatype); } else { - MPID_Datatype *dt_ptr; + MPIR_Datatype *dt_ptr; MPID_Datatype_get_ptr(datatype, dt_ptr); contig = dt_ptr->is_contig; dt_true_lb = dt_ptr->true_lb; @@ -183,10 +183,10 @@ int MPI_Unpack(const void *inbuf, int insize, int *position, if (datatype != MPI_DATATYPE_NULL && HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); } if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/datatype/unpack_external.c b/src/mpi/datatype/unpack_external.c index d9e6d95..25ee12b 100644 --- a/src/mpi/datatype/unpack_external.c +++ b/src/mpi/datatype/unpack_external.c @@ -91,10 +91,10 @@ int MPI_Unpack_external(const char datarep[], MPIR_ERRTEST_DATATYPE(datatype, "datatype", mpi_errno); if (datatype != MPI_DATATYPE_NULL && HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); } diff --git a/src/mpi/errhan/errutil.c b/src/mpi/errhan/errutil.c index df7038d..f2deb45 100644 --- a/src/mpi/errhan/errutil.c +++ b/src/mpi/errhan/errutil.c @@ -1453,7 +1453,7 @@ static const char * GetDTypeString(MPI_Datatype d) int num_integers, num_addresses, num_datatypes, combiner = 0; char *str; - if (HANDLE_GET_MPI_KIND(d) != MPID_DATATYPE || \ + if (HANDLE_GET_MPI_KIND(d) != MPIR_DATATYPE || \ (HANDLE_GET_KIND(d) == HANDLE_KIND_INVALID && \ d != MPI_DATATYPE_NULL)) return "INVALID DATATYPE"; diff --git a/src/mpi/pt2pt/bsend.c b/src/mpi/pt2pt/bsend.c index f8b07c5..d0327fb 100644 --- a/src/mpi/pt2pt/bsend.c +++ b/src/mpi/pt2pt/bsend.c @@ -134,10 +134,10 @@ int MPI_Bsend(const void *buf, int count, MPI_Datatype datatype, int dest, int t /* Validate datatype object */ if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno) goto fn_fail; MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); if (mpi_errno) goto fn_fail; diff --git a/src/mpi/pt2pt/bsend_init.c b/src/mpi/pt2pt/bsend_init.c index a0869d2..781d88b 100644 --- a/src/mpi/pt2pt/bsend_init.c +++ b/src/mpi/pt2pt/bsend_init.c @@ -104,10 +104,10 @@ int MPI_Bsend_init(const void *buf, int count, MPI_Datatype datatype, /* Validate datatype object */ if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno) goto fn_fail; MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); if (mpi_errno) goto fn_fail; diff --git a/src/mpi/pt2pt/ibsend.c b/src/mpi/pt2pt/ibsend.c index 680aa33..77cbfde 100644 --- a/src/mpi/pt2pt/ibsend.c +++ b/src/mpi/pt2pt/ibsend.c @@ -207,10 +207,10 @@ int MPI_Ibsend(const void *buf, int count, MPI_Datatype datatype, int dest, int /* Validate datatype object */ if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno) goto fn_fail; MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); if (mpi_errno) goto fn_fail; diff --git a/src/mpi/pt2pt/imrecv.c b/src/mpi/pt2pt/imrecv.c index f82f62e..4b7a2e4 100644 --- a/src/mpi/pt2pt/imrecv.c +++ b/src/mpi/pt2pt/imrecv.c @@ -85,9 +85,9 @@ int MPI_Imrecv(void *buf, int count, MPI_Datatype datatype, MPI_Message *message MPID_BEGIN_ERROR_CHECKS { if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/pt2pt/irecv.c b/src/mpi/pt2pt/irecv.c index 8f89f4c..72d9a6f 100644 --- a/src/mpi/pt2pt/irecv.c +++ b/src/mpi/pt2pt/irecv.c @@ -105,10 +105,10 @@ int MPI_Irecv(void *buf, int count, MPI_Datatype datatype, int source, /* Validate datatype object */ if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno) goto fn_fail; MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); if (mpi_errno) goto fn_fail; diff --git a/src/mpi/pt2pt/irsend.c b/src/mpi/pt2pt/irsend.c index 14291ed..ce19356 100644 --- a/src/mpi/pt2pt/irsend.c +++ b/src/mpi/pt2pt/irsend.c @@ -106,10 +106,10 @@ int MPI_Irsend(const void *buf, int count, MPI_Datatype datatype, int dest, int /* Validate datatype object */ if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno) goto fn_fail; MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); if (mpi_errno) goto fn_fail; diff --git a/src/mpi/pt2pt/isend.c b/src/mpi/pt2pt/isend.c index 6622e11..e41adca 100644 --- a/src/mpi/pt2pt/isend.c +++ b/src/mpi/pt2pt/isend.c @@ -104,10 +104,10 @@ int MPI_Isend(const void *buf, int count, MPI_Datatype datatype, int dest, int t /* Validate datatype object */ if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno) goto fn_fail; MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); if (mpi_errno) goto fn_fail; diff --git a/src/mpi/pt2pt/issend.c b/src/mpi/pt2pt/issend.c index 4206cf4..f22b216 100644 --- a/src/mpi/pt2pt/issend.c +++ b/src/mpi/pt2pt/issend.c @@ -105,10 +105,10 @@ int MPI_Issend(const void *buf, int count, MPI_Datatype datatype, int dest, int /* Validate datatype object */ if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno) goto fn_fail; MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); if (mpi_errno) goto fn_fail; diff --git a/src/mpi/pt2pt/mrecv.c b/src/mpi/pt2pt/mrecv.c index a1d7b8c..d946005 100644 --- a/src/mpi/pt2pt/mrecv.c +++ b/src/mpi/pt2pt/mrecv.c @@ -84,9 +84,9 @@ int MPI_Mrecv(void *buf, int count, MPI_Datatype datatype, MPI_Message *message, MPID_BEGIN_ERROR_CHECKS { if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/pt2pt/recv.c b/src/mpi/pt2pt/recv.c index 04d50d7..132db58 100644 --- a/src/mpi/pt2pt/recv.c +++ b/src/mpi/pt2pt/recv.c @@ -113,10 +113,10 @@ int MPI_Recv(void *buf, int count, MPI_Datatype datatype, int source, int tag, /* Validate datatype object */ if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno) goto fn_fail; MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); if (mpi_errno) goto fn_fail; diff --git a/src/mpi/pt2pt/recv_init.c b/src/mpi/pt2pt/recv_init.c index 0981c29..14ac702 100644 --- a/src/mpi/pt2pt/recv_init.c +++ b/src/mpi/pt2pt/recv_init.c @@ -107,10 +107,10 @@ int MPI_Recv_init(void *buf, int count, MPI_Datatype datatype, int source, /* Validate datatype object */ if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno) goto fn_fail; MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); if (mpi_errno) goto fn_fail; diff --git a/src/mpi/pt2pt/rsend.c b/src/mpi/pt2pt/rsend.c index 4ac0800..8c697c1 100644 --- a/src/mpi/pt2pt/rsend.c +++ b/src/mpi/pt2pt/rsend.c @@ -101,10 +101,10 @@ int MPI_Rsend(const void *buf, int count, MPI_Datatype datatype, int dest, int t /* Validate datatype object */ if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno) goto fn_fail; MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); if (mpi_errno) goto fn_fail; diff --git a/src/mpi/pt2pt/rsend_init.c b/src/mpi/pt2pt/rsend_init.c index f05aba4..9ca7bcf 100644 --- a/src/mpi/pt2pt/rsend_init.c +++ b/src/mpi/pt2pt/rsend_init.c @@ -107,10 +107,10 @@ int MPI_Rsend_init(const void *buf, int count, MPI_Datatype datatype, int dest, /* Validate datatype object */ if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno) goto fn_fail; MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); if (mpi_errno) goto fn_fail; diff --git a/src/mpi/pt2pt/send.c b/src/mpi/pt2pt/send.c index cecc6dc..537a9f5 100644 --- a/src/mpi/pt2pt/send.c +++ b/src/mpi/pt2pt/send.c @@ -106,10 +106,10 @@ int MPI_Send(const void *buf, int count, MPI_Datatype datatype, int dest, int ta /* Validate datatype object */ if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno) goto fn_fail; MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); if (mpi_errno) goto fn_fail; diff --git a/src/mpi/pt2pt/send_init.c b/src/mpi/pt2pt/send_init.c index d186ca2..a718f14 100644 --- a/src/mpi/pt2pt/send_init.c +++ b/src/mpi/pt2pt/send_init.c @@ -107,10 +107,10 @@ int MPI_Send_init(const void *buf, int count, MPI_Datatype datatype, int dest, /* Validate datatype object */ if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno) goto fn_fail; MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); if (mpi_errno) goto fn_fail; diff --git a/src/mpi/pt2pt/sendrecv.c b/src/mpi/pt2pt/sendrecv.c index f5005d3..4f34c55 100644 --- a/src/mpi/pt2pt/sendrecv.c +++ b/src/mpi/pt2pt/sendrecv.c @@ -131,20 +131,20 @@ int MPI_Sendrecv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, /* Validate datatype objects */ if (HANDLE_GET_KIND(sendtype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(sendtype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno) goto fn_fail; MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); if (mpi_errno) goto fn_fail; } if (HANDLE_GET_KIND(recvtype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(recvtype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno) goto fn_fail; MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); if (mpi_errno) goto fn_fail; diff --git a/src/mpi/pt2pt/sendrecv_rep.c b/src/mpi/pt2pt/sendrecv_rep.c index aaa521b..0092f62 100644 --- a/src/mpi/pt2pt/sendrecv_rep.c +++ b/src/mpi/pt2pt/sendrecv_rep.c @@ -115,10 +115,10 @@ int MPI_Sendrecv_replace(void *buf, int count, MPI_Datatype datatype, /* Validate datatype object */ if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno) goto fn_fail; MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); if (mpi_errno) goto fn_fail; diff --git a/src/mpi/pt2pt/ssend.c b/src/mpi/pt2pt/ssend.c index 486614f..80ed009 100644 --- a/src/mpi/pt2pt/ssend.c +++ b/src/mpi/pt2pt/ssend.c @@ -100,10 +100,10 @@ int MPI_Ssend(const void *buf, int count, MPI_Datatype datatype, int dest, int t /* Validate datatype object */ if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno) goto fn_fail; MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); if (mpi_errno) goto fn_fail; diff --git a/src/mpi/pt2pt/ssend_init.c b/src/mpi/pt2pt/ssend_init.c index bc5a584..4478117 100644 --- a/src/mpi/pt2pt/ssend_init.c +++ b/src/mpi/pt2pt/ssend_init.c @@ -104,10 +104,10 @@ int MPI_Ssend_init(const void *buf, int count, MPI_Datatype datatype, int dest, /* Validate datatype object */ if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno) goto fn_fail; MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); if (mpi_errno) goto fn_fail; diff --git a/src/mpi/rma/accumulate.c b/src/mpi/rma/accumulate.c index 8e9235c..01b684c 100644 --- a/src/mpi/rma/accumulate.c +++ b/src/mpi/rma/accumulate.c @@ -115,10 +115,10 @@ int MPI_Accumulate(const void *origin_addr, int origin_count, MPI_Datatype if (HANDLE_GET_KIND(origin_datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(origin_datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -126,10 +126,10 @@ int MPI_Accumulate(const void *origin_addr, int origin_count, MPI_Datatype if (HANDLE_GET_KIND(target_datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(target_datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/rma/get.c b/src/mpi/rma/get.c index 4ba86b5..bf5788f 100644 --- a/src/mpi/rma/get.c +++ b/src/mpi/rma/get.c @@ -110,10 +110,10 @@ int MPI_Get(void *origin_addr, int origin_count, MPI_Datatype if (HANDLE_GET_KIND(origin_datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(origin_datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -121,10 +121,10 @@ int MPI_Get(void *origin_addr, int origin_count, MPI_Datatype if (HANDLE_GET_KIND(target_datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(target_datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/rma/get_accumulate.c b/src/mpi/rma/get_accumulate.c index 259323a..afb78b1 100644 --- a/src/mpi/rma/get_accumulate.c +++ b/src/mpi/rma/get_accumulate.c @@ -156,10 +156,10 @@ int MPI_Get_accumulate(const void *origin_addr, int origin_count, if (op != MPI_NO_OP && HANDLE_GET_KIND(origin_datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(origin_datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -167,10 +167,10 @@ int MPI_Get_accumulate(const void *origin_addr, int origin_count, if (HANDLE_GET_KIND(result_datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(result_datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -178,10 +178,10 @@ int MPI_Get_accumulate(const void *origin_addr, int origin_count, if (HANDLE_GET_KIND(target_datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(target_datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/rma/put.c b/src/mpi/rma/put.c index 306adb3..e7ecf7e 100644 --- a/src/mpi/rma/put.c +++ b/src/mpi/rma/put.c @@ -110,10 +110,10 @@ int MPI_Put(const void *origin_addr, int origin_count, MPI_Datatype if (HANDLE_GET_KIND(origin_datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(origin_datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -121,10 +121,10 @@ int MPI_Put(const void *origin_addr, int origin_count, MPI_Datatype if (HANDLE_GET_KIND(target_datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(target_datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/rma/raccumulate.c b/src/mpi/rma/raccumulate.c index 9033db4..fbeca51 100644 --- a/src/mpi/rma/raccumulate.c +++ b/src/mpi/rma/raccumulate.c @@ -129,10 +129,10 @@ int MPI_Raccumulate(const void *origin_addr, int origin_count, MPI_Datatype if (HANDLE_GET_KIND(origin_datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(origin_datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -140,10 +140,10 @@ int MPI_Raccumulate(const void *origin_addr, int origin_count, MPI_Datatype if (HANDLE_GET_KIND(target_datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(target_datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/rma/rget.c b/src/mpi/rma/rget.c index cada257..b1a8879 100644 --- a/src/mpi/rma/rget.c +++ b/src/mpi/rma/rget.c @@ -124,10 +124,10 @@ int MPI_Rget(void *origin_addr, int origin_count, MPI_Datatype if (HANDLE_GET_KIND(origin_datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(origin_datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -135,10 +135,10 @@ int MPI_Rget(void *origin_addr, int origin_count, MPI_Datatype if (HANDLE_GET_KIND(target_datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(target_datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/rma/rget_accumulate.c b/src/mpi/rma/rget_accumulate.c index 61294ca..23f5500 100644 --- a/src/mpi/rma/rget_accumulate.c +++ b/src/mpi/rma/rget_accumulate.c @@ -145,10 +145,10 @@ int MPI_Rget_accumulate(const void *origin_addr, int origin_count, if (op != MPI_NO_OP && HANDLE_GET_KIND(origin_datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(origin_datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -156,10 +156,10 @@ int MPI_Rget_accumulate(const void *origin_addr, int origin_count, if (HANDLE_GET_KIND(result_datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(origin_datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -167,10 +167,10 @@ int MPI_Rget_accumulate(const void *origin_addr, int origin_count, if (HANDLE_GET_KIND(target_datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(target_datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/rma/rput.c b/src/mpi/rma/rput.c index aeae461..f99d0dc 100644 --- a/src/mpi/rma/rput.c +++ b/src/mpi/rma/rput.c @@ -126,10 +126,10 @@ int MPI_Rput(const void *origin_addr, int origin_count, MPI_Datatype if (HANDLE_GET_KIND(origin_datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(origin_datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -137,10 +137,10 @@ int MPI_Rput(const void *origin_addr, int origin_count, MPI_Datatype if (HANDLE_GET_KIND(target_datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *datatype_ptr = NULL; + MPIR_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(target_datatype, datatype_ptr); - MPID_Datatype_valid_ptr(datatype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(datatype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/topo/inhb_allgather.c b/src/mpi/topo/inhb_allgather.c index 1914779..c14e4eb 100644 --- a/src/mpi/topo/inhb_allgather.c +++ b/src/mpi/topo/inhb_allgather.c @@ -173,18 +173,18 @@ int MPI_Ineighbor_allgather(const void *sendbuf, int sendcount, MPI_Datatype sen MPID_BEGIN_ERROR_CHECKS { if (HANDLE_GET_KIND(sendtype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *sendtype_ptr = NULL; + MPIR_Datatype *sendtype_ptr = NULL; MPID_Datatype_get_ptr(sendtype, sendtype_ptr); - MPID_Datatype_valid_ptr(sendtype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(sendtype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(sendtype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; } if (HANDLE_GET_KIND(recvtype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *recvtype_ptr = NULL; + MPIR_Datatype *recvtype_ptr = NULL; MPID_Datatype_get_ptr(recvtype, recvtype_ptr); - MPID_Datatype_valid_ptr(recvtype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(recvtype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(recvtype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/topo/inhb_allgatherv.c b/src/mpi/topo/inhb_allgatherv.c index 5a361e4..7429d7f 100644 --- a/src/mpi/topo/inhb_allgatherv.c +++ b/src/mpi/topo/inhb_allgatherv.c @@ -178,18 +178,18 @@ int MPI_Ineighbor_allgatherv(const void *sendbuf, int sendcount, MPI_Datatype se MPID_BEGIN_ERROR_CHECKS { if (HANDLE_GET_KIND(sendtype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *sendtype_ptr = NULL; + MPIR_Datatype *sendtype_ptr = NULL; MPID_Datatype_get_ptr(sendtype, sendtype_ptr); - MPID_Datatype_valid_ptr(sendtype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(sendtype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(sendtype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; } if (HANDLE_GET_KIND(recvtype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *recvtype_ptr = NULL; + MPIR_Datatype *recvtype_ptr = NULL; MPID_Datatype_get_ptr(recvtype, recvtype_ptr); - MPID_Datatype_valid_ptr(recvtype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(recvtype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(recvtype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/topo/inhb_alltoall.c b/src/mpi/topo/inhb_alltoall.c index 8b6b220..275b237 100644 --- a/src/mpi/topo/inhb_alltoall.c +++ b/src/mpi/topo/inhb_alltoall.c @@ -179,18 +179,18 @@ int MPI_Ineighbor_alltoall(const void *sendbuf, int sendcount, MPI_Datatype send MPID_BEGIN_ERROR_CHECKS { if (HANDLE_GET_KIND(sendtype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *sendtype_ptr = NULL; + MPIR_Datatype *sendtype_ptr = NULL; MPID_Datatype_get_ptr(sendtype, sendtype_ptr); - MPID_Datatype_valid_ptr(sendtype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(sendtype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(sendtype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; } if (HANDLE_GET_KIND(recvtype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *recvtype_ptr = NULL; + MPIR_Datatype *recvtype_ptr = NULL; MPID_Datatype_get_ptr(recvtype, recvtype_ptr); - MPID_Datatype_valid_ptr(recvtype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(recvtype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(recvtype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/topo/inhb_alltoallv.c b/src/mpi/topo/inhb_alltoallv.c index 13841a1..5880a6d 100644 --- a/src/mpi/topo/inhb_alltoallv.c +++ b/src/mpi/topo/inhb_alltoallv.c @@ -184,18 +184,18 @@ int MPI_Ineighbor_alltoallv(const void *sendbuf, const int sendcounts[], const i MPID_BEGIN_ERROR_CHECKS { if (HANDLE_GET_KIND(sendtype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *sendtype_ptr = NULL; + MPIR_Datatype *sendtype_ptr = NULL; MPID_Datatype_get_ptr(sendtype, sendtype_ptr); - MPID_Datatype_valid_ptr(sendtype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(sendtype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(sendtype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; } if (HANDLE_GET_KIND(recvtype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *recvtype_ptr = NULL; + MPIR_Datatype *recvtype_ptr = NULL; MPID_Datatype_get_ptr(recvtype, recvtype_ptr); - MPID_Datatype_valid_ptr(recvtype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(recvtype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPID_Datatype_committed_ptr(recvtype_ptr, mpi_errno); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/topo/nhb_allgather.c b/src/mpi/topo/nhb_allgather.c index 6b16711..f27dd37 100644 --- a/src/mpi/topo/nhb_allgather.c +++ b/src/mpi/topo/nhb_allgather.c @@ -133,16 +133,16 @@ int MPI_Neighbor_allgather(const void *sendbuf, int sendcount, MPI_Datatype send MPID_BEGIN_ERROR_CHECKS { if (HANDLE_GET_KIND(sendtype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *sendtype_ptr = NULL; + MPIR_Datatype *sendtype_ptr = NULL; MPID_Datatype_get_ptr(sendtype, sendtype_ptr); - MPID_Datatype_valid_ptr(sendtype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(sendtype_ptr, mpi_errno); MPID_Datatype_committed_ptr(sendtype_ptr, mpi_errno); } if (HANDLE_GET_KIND(recvtype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *recvtype_ptr = NULL; + MPIR_Datatype *recvtype_ptr = NULL; MPID_Datatype_get_ptr(recvtype, recvtype_ptr); - MPID_Datatype_valid_ptr(recvtype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(recvtype_ptr, mpi_errno); MPID_Datatype_committed_ptr(recvtype_ptr, mpi_errno); } diff --git a/src/mpi/topo/nhb_allgatherv.c b/src/mpi/topo/nhb_allgatherv.c index d3ae882..cbba644 100644 --- a/src/mpi/topo/nhb_allgatherv.c +++ b/src/mpi/topo/nhb_allgatherv.c @@ -134,16 +134,16 @@ int MPI_Neighbor_allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sen MPID_BEGIN_ERROR_CHECKS { if (HANDLE_GET_KIND(sendtype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *sendtype_ptr = NULL; + MPIR_Datatype *sendtype_ptr = NULL; MPID_Datatype_get_ptr(sendtype, sendtype_ptr); - MPID_Datatype_valid_ptr(sendtype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(sendtype_ptr, mpi_errno); MPID_Datatype_committed_ptr(sendtype_ptr, mpi_errno); } if (HANDLE_GET_KIND(recvtype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *recvtype_ptr = NULL; + MPIR_Datatype *recvtype_ptr = NULL; MPID_Datatype_get_ptr(recvtype, recvtype_ptr); - MPID_Datatype_valid_ptr(recvtype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(recvtype_ptr, mpi_errno); MPID_Datatype_committed_ptr(recvtype_ptr, mpi_errno); } diff --git a/src/mpi/topo/nhb_alltoall.c b/src/mpi/topo/nhb_alltoall.c index 47ecd3b..64d90c7 100644 --- a/src/mpi/topo/nhb_alltoall.c +++ b/src/mpi/topo/nhb_alltoall.c @@ -137,16 +137,16 @@ int MPI_Neighbor_alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendt MPID_BEGIN_ERROR_CHECKS { if (HANDLE_GET_KIND(sendtype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *sendtype_ptr = NULL; + MPIR_Datatype *sendtype_ptr = NULL; MPID_Datatype_get_ptr(sendtype, sendtype_ptr); - MPID_Datatype_valid_ptr(sendtype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(sendtype_ptr, mpi_errno); MPID_Datatype_committed_ptr(sendtype_ptr, mpi_errno); } if (HANDLE_GET_KIND(recvtype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *recvtype_ptr = NULL; + MPIR_Datatype *recvtype_ptr = NULL; MPID_Datatype_get_ptr(recvtype, recvtype_ptr); - MPID_Datatype_valid_ptr(recvtype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(recvtype_ptr, mpi_errno); MPID_Datatype_committed_ptr(recvtype_ptr, mpi_errno); } diff --git a/src/mpi/topo/nhb_alltoallv.c b/src/mpi/topo/nhb_alltoallv.c index b30cf8d..9c17650 100644 --- a/src/mpi/topo/nhb_alltoallv.c +++ b/src/mpi/topo/nhb_alltoallv.c @@ -132,16 +132,16 @@ int MPI_Neighbor_alltoallv(const void *sendbuf, const int sendcounts[], const in MPID_BEGIN_ERROR_CHECKS { if (HANDLE_GET_KIND(sendtype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *sendtype_ptr = NULL; + MPIR_Datatype *sendtype_ptr = NULL; MPID_Datatype_get_ptr(sendtype, sendtype_ptr); - MPID_Datatype_valid_ptr(sendtype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(sendtype_ptr, mpi_errno); MPID_Datatype_committed_ptr(sendtype_ptr, mpi_errno); } if (HANDLE_GET_KIND(recvtype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype *recvtype_ptr = NULL; + MPIR_Datatype *recvtype_ptr = NULL; MPID_Datatype_get_ptr(recvtype, recvtype_ptr); - MPID_Datatype_valid_ptr(recvtype_ptr, mpi_errno); + MPIR_Datatype_valid_ptr(recvtype_ptr, mpi_errno); MPID_Datatype_committed_ptr(recvtype_ptr, mpi_errno); } diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_tagged_template.c b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_tagged_template.c index ea2fe3e..12bf495 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_tagged_template.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_tagged_template.c @@ -112,7 +112,7 @@ static inline int ADD_SUFFIX(send_normal)(struct MPIDI_VC *vc, int context_offset, MPIR_Request **request, int dt_contig, intptr_t data_sz, - MPID_Datatype *dt_ptr, + MPIR_Datatype *dt_ptr, MPI_Aint dt_true_lb, uint64_t send_type) { @@ -276,7 +276,7 @@ ADD_SUFFIX(do_isend)(struct MPIDI_VC *vc, int dt_contig, mpi_errno = MPI_SUCCESS; MPI_Aint dt_true_lb; intptr_t data_sz; - MPID_Datatype *dt_ptr; + MPIR_Datatype *dt_ptr; BEGIN_FUNC(FCNAME); VC_READY_CHECK(vc); diff --git a/src/mpid/common/datatype/mpid_datatype_fallback.h b/src/mpid/common/datatype/mpid_datatype_fallback.h index 7731b49..0ac6da7 100644 --- a/src/mpid/common/datatype/mpid_datatype_fallback.h +++ b/src/mpid/common/datatype/mpid_datatype_fallback.h @@ -3,23 +3,23 @@ * (C) 2016 by Argonne National Laboratory. * See COPYRIGHT in top-level directory. */ -#ifndef MPID_DATATYPE_FALLBACK_H_INCLUDED -#define MPID_DATATYPE_FALLBACK_H_INCLUDED +#ifndef MPIR_DATATYPE_FALLBACK_H_INCLUDED +#define MPIR_DATATYPE_FALLBACK_H_INCLUDED #include "mpidu_datatype.h" /* Variables */ -#define MPID_Datatype_direct MPIDU_Datatype_direct -#define MPID_Datatype_builtin MPIDU_Datatype_builtin -#define MPID_Datatype_mem MPIDU_Datatype_mem +#define MPIR_Datatype_direct MPIDU_Datatype_direct +#define MPIR_Datatype_builtin MPIDU_Datatype_builtin +#define MPIR_Datatype_mem MPIDU_Datatype_mem /* Macros */ -#define MPID_DATATYPE_N_BUILTIN MPIDU_DATATYPE_N_BUILTIN +#define MPIR_DATATYPE_N_BUILTIN MPIDU_DATATYPE_N_BUILTIN #define MPID_DTYPE_BEGINNING MPIDU_DTYPE_BEGINNING #define MPID_DTYPE_END MPIDU_DTYPE_END -typedef MPIDU_Datatype MPID_Datatype; -typedef MPIDU_Datatype_contents MPID_Datatype_contents; +typedef MPIDU_Datatype MPIR_Datatype; +typedef MPIDU_Datatype_contents MPIR_Datatype_contents; #define MPID_Datatype_add_ref MPIDU_Datatype_add_ref #define MPID_Datatype_committed_ptr MPIDU_Datatype_committed_ptr @@ -31,7 +31,7 @@ typedef MPIDU_Datatype_contents MPID_Datatype_contents; #define MPID_Datatype_get_extent_macro MPIDU_Datatype_get_extent_macro #define MPID_Datatype_is_contig MPIDU_Datatype_is_contig #define MPID_Datatype_release MPIDU_Datatype_release -#define MPID_Datatype_valid_ptr MPIDU_Datatype_valid_ptr +#define MPIR_Datatype_valid_ptr MPIDU_Datatype_valid_ptr #define MPID_Datatype_get_loopdepth_macro MPIDU_Datatype_get_loopdepth_macro #define MPID_Datatype_get_loopptr_macro MPIDU_Datatype_get_loopptr_macro diff --git a/src/mpid/common/datatype/mpidu_datatype.h b/src/mpid/common/datatype/mpidu_datatype.h index 69f4e58..dcd6e5a 100644 --- a/src/mpid/common/datatype/mpidu_datatype.h +++ b/src/mpid/common/datatype/mpidu_datatype.h @@ -53,7 +53,7 @@ basic_type_ = MPI_DATATYPE_NULL; \ } while(0) -/* MPIDU_Datatype_release decrements the reference count on the MPID_Datatype +/* MPIDU_Datatype_release decrements the reference count on the MPIR_Datatype * and, if the refct is then zero, frees the MPIDU_Datatype and associated * structures. */ diff --git a/src/mpid/common/sched/mpidu_sched.c b/src/mpid/common/sched/mpidu_sched.c index 56e7ec3..42a4ab4 100644 --- a/src/mpid/common/sched/mpidu_sched.c +++ b/src/mpid/common/sched/mpidu_sched.c @@ -26,7 +26,7 @@ if ((datatype_) != MPI_DATATYPE_NULL && \ HANDLE_GET_KIND((datatype_)) != HANDLE_KIND_BUILTIN) \ { \ - MPID_Datatype *dtp_ = NULL; \ + MPIR_Datatype *dtp_ = NULL; \ MPID_Datatype_get_ptr((datatype_), dtp_); \ MPID_Datatype_add_ref(dtp_); \ } \ @@ -36,7 +36,7 @@ if ((datatype_) != MPI_DATATYPE_NULL && \ HANDLE_GET_KIND((datatype_)) != HANDLE_KIND_BUILTIN) \ { \ - MPID_Datatype *dtp_ = NULL; \ + MPIR_Datatype *dtp_ = NULL; \ MPID_Datatype_get_ptr((datatype_), dtp_); \ MPID_Datatype_release(dtp_); \ } \ diff --git a/src/mpid/pamid/src/onesided/mpid_win_get.c b/src/mpid/pamid/src/onesided/mpid_win_get.c index 0845b36..8252d3f 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_get.c +++ b/src/mpid/pamid/src/onesided/mpid_win_get.c @@ -409,7 +409,7 @@ MPID_Get(void *origin_addr, if ((MPIDI_Process.typed_onesided == 1) && (!req->target.dt.contig || !req->origin.dt.contig)) { /* We will use the PAMI_Rget_typed call so we need to make sure any MPI_Type_free before the context * executes the get does not free the MPIDU_Datatype, which would also free the associated PAMI datatype which - * is still needed for communication -- decrement the ref in the callback to allow the MPID_Datatype + * is still needed for communication -- decrement the ref in the callback to allow the MPIR_Datatype * to be freed once the PAMI communication has completed. */ MPIDU_Datatype_add_ref(req->origin.dt.pointer); diff --git a/src/mpid/pamid/src/onesided/mpid_win_put.c b/src/mpid/pamid/src/onesided/mpid_win_put.c index 1964fd9..5ce9f20 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_put.c +++ b/src/mpid/pamid/src/onesided/mpid_win_put.c @@ -409,7 +409,7 @@ MPID_Put(const void *origin_addr, if ((MPIDI_Process.typed_onesided == 1) && (!req->target.dt.contig || !req->origin.dt.contig)) { /* We will use the PAMI_Rput_typed call so we need to make sure any MPI_Type_free before the context * executes the put does not free the MPIDU_Datatype, which would also free the associated PAMI datatype which - * is still needed for communication -- decrement the ref in the callback to allow the MPID_Datatype + * is still needed for communication -- decrement the ref in the callback to allow the MPIR_Datatype * to be freed once the PAMI communication has completed. */ MPIDU_Datatype_add_ref(req->origin.dt.pointer); http://git.mpich.org/mpich.git/commitdiff/78f7074624c37834587b8fb9940a8d521… commit 78f7074624c37834587b8fb9940a8d52137e01c2 Author: Wesley Bland <wesley.bland(a)intel.com> Date: Tue Apr 19 09:09:46 2016 -0500 Rename MPID_Request to MPIR_Request Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/doc/notes/coll/collective.txt b/doc/notes/coll/collective.txt index fc21466..6a516c5 100644 --- a/doc/notes/coll/collective.txt +++ b/doc/notes/coll/collective.txt @@ -96,12 +96,12 @@ a transfer block defines 0 or 1 envelope/payloads for sources and 0 to N envelop account that there might be incoming active message or error conditions, so we should poll all methods (and all vcs) periodically. -- We believe that a MPID_Request might simply contain enough information for +- We believe that a MPIR_Request might simply contain enough information for signalling that one or more CARs have completed. This implies that a - MPID_Request might consist of a integer counter of outstanding CARs. When + MPIR_Request might consist of a integer counter of outstanding CARs. When the counter reached zero, the request is complete. David suggests making - CARs and MPID_Requests reside in the same physical structure so that in the - MPI_Send/Recv() case, two logical allocations (one for MPID_Request and CAR) + CARs and MPIR_Requests reside in the same physical structure so that in the + MPI_Send/Recv() case, two logical allocations (one for MPIR_Request and CAR) are combined into one. - operations within a block are prioritized by the order in which they are diff --git a/doc/notes/pt2pt/pt2pt.txt b/doc/notes/pt2pt/pt2pt.txt index b73dd75..459b922 100644 --- a/doc/notes/pt2pt/pt2pt.txt +++ b/doc/notes/pt2pt/pt2pt.txt @@ -204,12 +204,12 @@ a transfer block defines 0 or 1 envelope/payloads for sources and 0 to N envelop account that there might be incoming active message or error conditions, so we should poll all methods (and all vcs) periodically. -- We believe that a MPID_Request might simply contain enough information for +- We believe that a MPIR_Request might simply contain enough information for signalling that one or more CARs have completed. This implies that a - MPID_Request might consist of a integer counter of outstanding CARs. When + MPIR_Request might consist of a integer counter of outstanding CARs. When the counter reached zero, the request is complete. David suggests making - CARs and MPID_Requests reside in the same physical structure so that in the - MPI_Send/Recv() case, two logical allocations (one for MPID_Request and CAR) + CARs and MPIR_Requests reside in the same physical structure so that in the + MPI_Send/Recv() case, two logical allocations (one for MPIR_Request and CAR) are combined into one. - operations within a block are prioritized by the order in which they are @@ -259,4 +259,4 @@ MPID_Issend(buf, count, datatype, dest, tag, comm, request, error) Items which make life more difficult: -- \ No newline at end of file +- diff --git a/src/include/mpibsend.h b/src/include/mpibsend.h index 539ef20..8a3bf5d 100644 --- a/src/include/mpibsend.h +++ b/src/include/mpibsend.h @@ -46,7 +46,7 @@ typedef enum { BSEND_INIT = 2 } MPIR_Bsend_kind_t; -struct MPID_Request; +struct MPIR_Request; struct MPIR_Comm; /* BsendMsg is used to hold all of the message particulars in case a @@ -67,7 +67,7 @@ typedef struct MPIR_Bsend_data { including all headers */ struct MPIR_Bsend_data *next, *prev; MPIR_Bsend_kind_t kind; - struct MPID_Request *request; + struct MPIR_Request *request; MPIR_Bsend_msg_t msg; double alignpad; /* make sure that the struct shares double alignment */ diff --git a/src/include/mpichconfconst.h b/src/include/mpichconfconst.h index 43370ef..de3cbfb 100644 --- a/src/include/mpichconfconst.h +++ b/src/include/mpichconfconst.h @@ -36,7 +36,7 @@ /* _SINGLE is the "null" granularity, where all processes are single-threaded */ #define MPICH_THREAD_GRANULARITY_SINGLE 4 -/* controls the allocation mechanism for MPID_Request handles, which can greatly +/* controls the allocation mechanism for MPIR_Request handles, which can greatly * affect concurrency on the critical path */ #define MPIU_HANDLE_ALLOCATION_MUTEX 0 #define MPIU_HANDLE_ALLOCATION_THREAD_LOCAL 1 diff --git a/src/include/mpierrs.h b/src/include/mpierrs.h index 87aaf04..2ac5e11 100644 --- a/src/include/mpierrs.h +++ b/src/include/mpierrs.h @@ -191,15 +191,15 @@ cvars: } #define MPIR_ERRTEST_PERSISTENT(reqp,err) \ - if ((reqp)->kind != MPID_PREQUEST_SEND && reqp->kind != MPID_PREQUEST_RECV) { \ + if ((reqp)->kind != MPIR_PREQUEST_SEND && reqp->kind != MPIR_PREQUEST_RECV) { \ err = MPIR_Err_create_code(MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, \ MPI_ERR_REQUEST, "**requestnotpersist", 0 ); \ goto fn_fail; \ } #define MPIR_ERRTEST_PERSISTENT_ACTIVE(reqp,err) \ - if (((reqp)->kind == MPID_PREQUEST_SEND || \ - reqp->kind == MPID_PREQUEST_RECV) && reqp->partner_request != NULL) { \ + if (((reqp)->kind == MPIR_PREQUEST_SEND || \ + reqp->kind == MPIR_PREQUEST_RECV) && reqp->partner_request != NULL) { \ err = MPIR_Err_create_code(MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, \ MPI_ERR_REQUEST, "**requestpersistactive", 0 ); \ goto fn_fail; \ diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index 21e3095..eae4e84 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -404,7 +404,7 @@ void MPIR_DatatypeAttrFinalize( void ); #define MPIR_Op_get_ptr(a,ptr) MPIR_Getb_ptr(Op,a,0x000000ff,ptr) #define MPIR_Info_get_ptr(a,ptr) MPIR_Getb_ptr(Info,a,0x03ffffff,ptr) #define MPIR_Win_get_ptr(a,ptr) MPIR_Get_ptr(Win,a,ptr) -#define MPID_Request_get_ptr(a,ptr) MPIR_Get_ptr(Request,a,ptr) +#define MPIR_Request_get_ptr(a,ptr) MPIR_Get_ptr(Request,a,ptr) #define MPIR_Grequest_class_get_ptr(a,ptr) MPIR_Get_ptr(Grequest_class,a,ptr) /* Keyvals have a special format. This is roughly MPID_Get_ptrb, but the handle index is in a smaller bit field. In addition, @@ -460,7 +460,7 @@ void MPIR_DatatypeAttrFinalize( void ); #define MPIR_Win_valid_ptr(ptr,err) MPIR_Valid_ptr_class(Win,ptr,MPI_ERR_WIN,err) #define MPIR_Op_valid_ptr(ptr,err) MPIR_Valid_ptr_class(Op,ptr,MPI_ERR_OP,err) #define MPIR_Errhandler_valid_ptr(ptr,err) MPIR_Valid_ptr_class(Errhandler,ptr,MPI_ERR_ARG,err) -#define MPID_Request_valid_ptr(ptr,err) MPIR_Valid_ptr_class(Request,ptr,MPI_ERR_REQUEST,err) +#define MPIR_Request_valid_ptr(ptr,err) MPIR_Valid_ptr_class(Request,ptr,MPI_ERR_REQUEST,err) #define MPIR_Keyval_valid_ptr(ptr,err) MPIR_Valid_ptr_class(Keyval,ptr,MPI_ERR_KEYVAL,err) #define MPIR_DATATYPE_IS_PREDEFINED(type) \ @@ -1440,27 +1440,27 @@ void MPIR_Free_contextid( MPIU_Context_id_t ); * request by calling MPI_Mrecv/MPI_Imrecv, we actually modify the kind to be * MPIR_REQUEST_RECV in order to keep completion logic as simple as possible. */ /*E - MPID_Request_kind - Kinds of MPI Requests + MPIR_Request_kind - Kinds of MPI Requests Module: Request-DS E*/ -typedef enum MPID_Request_kind_t { +typedef enum MPIR_Request_kind_t { MPIR_REQUEST_UNDEFINED, MPIR_REQUEST_SEND, MPIR_REQUEST_RECV, - MPID_PREQUEST_SEND, - MPID_PREQUEST_RECV, - MPID_UREQUEST, - MPID_COLL_REQUEST, + MPIR_PREQUEST_SEND, + MPIR_PREQUEST_RECV, + MPIR_UREQUEST, + MPIR_COLL_REQUEST, MPIR_REQUEST_MPROBE, /* see NOTE-R1 */ - MPID_WIN_REQUEST, - MPID_LAST_REQUEST_KIND + MPIR_WIN_REQUEST, + MPIR_LAST_REQUEST_KIND #ifdef MPID_DEV_REQUEST_KIND_DECL , MPID_DEV_REQUEST_KIND_DECL #endif -} MPID_Request_kind_t; +} MPIR_Request_kind_t; /* Typedefs for Fortran generalized requests */ typedef void (MPIR_Grequest_f77_cancel_function)(void *, MPI_Fint*, MPI_Fint *); @@ -1481,10 +1481,10 @@ struct MPIR_Grequest_fns { the generalize req */ }; -#define MPID_Request_is_complete(req_) (MPIR_cc_is_complete((req_)->cc_ptr)) +#define MPIR_Request_is_complete(req_) (MPIR_cc_is_complete((req_)->cc_ptr)) /*S - MPID_Request - Description of the Request data structure + MPIR_Request - Description of the Request data structure Module: Request-DS @@ -1495,12 +1495,12 @@ struct MPIR_Grequest_fns { Requests come in many flavors, as stored in the 'kind' field. It is expected that each kind of request will have its own structure type - (e.g., 'MPID_Request_send_t') that extends the 'MPID_Request'. + (e.g., 'MPIR_Request_send_t') that extends the 'MPIR_Request'. S*/ -typedef struct MPID_Request { +typedef struct MPIR_Request { MPIU_OBJECT_HEADER; /* adds handle and ref_count fields */ - MPID_Request_kind_t kind; + MPIR_Request_kind_t kind; /* pointer to the completion counter */ /* This is necessary for the case when an operation is described by a list of requests */ @@ -1515,7 +1515,7 @@ typedef struct MPID_Request { MPI_Status status; /* Persistent requests have their own "real" requests. Receive requests have partnering send requests when src=dest. etc. */ - struct MPID_Request *partner_request; + struct MPIR_Request *partner_request; /* User-defined request support via a "vtable". Saves space in the already * bloated request for regular pt2pt and NBC requests. */ @@ -1548,17 +1548,19 @@ typedef struct MPID_Request { * never yield the lock to other threads. So the recursion * should be multithreading-safe. */ - int (*request_completed_cb)(struct MPID_Request *); + int (*request_completed_cb)(struct MPIR_Request *); /* Other, device-specific information */ #ifdef MPID_DEV_REQUEST_DECL MPID_DEV_REQUEST_DECL #endif -} MPID_Request ATTRIBUTE((__aligned__(32))); +} MPIR_Request ATTRIBUTE((__aligned__(32))); -extern MPIU_Object_alloc_t MPID_Request_mem; +#define MPIR_REQUEST_PREALLOC 8 + +extern MPIU_Object_alloc_t MPIR_Request_mem; /* Preallocated request objects */ -extern MPID_Request MPID_Request_direct[]; +extern MPIR_Request MPIR_Request_direct[]; #define MPIR_Request_add_ref( _req ) \ do { MPIU_Object_add_ref( _req ); } while (0) @@ -1573,8 +1575,8 @@ extern MPID_Request MPID_Request_direct[]; #ifdef HAVE_DEBUGGER_SUPPORT void MPIR_WaitForDebugger( void ); void MPIR_DebuggerSetAborting( const char * ); -void MPIR_Sendq_remember(MPID_Request *, int, int, int ); -void MPIR_Sendq_forget(MPID_Request *); +void MPIR_Sendq_remember(MPIR_Request *, int, int, int ); +void MPIR_Sendq_forget(MPIR_Request *); void MPIR_CommL_remember( MPIR_Comm * ); void MPIR_CommL_forget( MPIR_Comm * ); @@ -1590,8 +1592,8 @@ void MPIR_CommL_forget( MPIR_Comm * ); #endif /* must come after MPIR_Comm is declared/defined */ -int MPIR_Get_contextid_nonblock(MPIR_Comm *comm_ptr, MPIR_Comm *newcommp, MPID_Request **req); -int MPIR_Get_intercomm_contextid_nonblock(MPIR_Comm *comm_ptr, MPIR_Comm *newcommp, MPID_Request **req); +int MPIR_Get_contextid_nonblock(MPIR_Comm *comm_ptr, MPIR_Comm *newcommp, MPIR_Request **req); +int MPIR_Get_intercomm_contextid_nonblock(MPIR_Comm *comm_ptr, MPIR_Comm *newcommp, MPIR_Request **req); /* ------------------------------------------------------------------------- */ /* Prototypes and definitions for the node ID code. This is used to support @@ -1637,7 +1639,7 @@ int MPID_Get_max_node_id(MPIR_Comm *comm, MPID_Node_id_t *max_id_p); Should a 'MPID_Win' be defined after 'MPID_Segment' in case the device wants to store a queue of pending put/get operations, described with 'MPID_Segment' - (or 'MPID_Request')s? + (or 'MPIR_Request')s? S*/ typedef struct MPIR_Win { @@ -2330,25 +2332,25 @@ int MPIR_Group_release(MPIR_Group *group_ptr); int MPIR_dup_fn ( MPI_Comm, int, void *, void *, void *, int * ); /* marks a request as complete, extracting the status */ -int MPIR_Request_complete(MPI_Request *, MPID_Request *, MPI_Status *, int *); +int MPIR_Request_complete(MPI_Request *, MPIR_Request *, MPI_Status *, int *); -int MPIR_Request_get_error(MPID_Request *); +int MPIR_Request_get_error(MPIR_Request *); /* run the progress engine until the given request is complete */ -int MPIR_Progress_wait_request(MPID_Request *req); +int MPIR_Progress_wait_request(MPIR_Request *req); /* The following routines perform the callouts to the user routines registered as part of a generalized request. They handle any language binding issues that are necessary. They are used when completing, freeing, cancelling or extracting the status from a generalized request. */ -int MPIR_Grequest_cancel(MPID_Request * request_ptr, int complete); -int MPIR_Grequest_query(MPID_Request * request_ptr); -int MPIR_Grequest_free(MPID_Request * request_ptr); +int MPIR_Grequest_cancel(MPIR_Request * request_ptr, int complete); +int MPIR_Grequest_query(MPIR_Request * request_ptr); +int MPIR_Grequest_free(MPIR_Request * request_ptr); /* this routine was added to support our extension relaxing the progress rules * for generalized requests */ -int MPIR_Grequest_progress_poke(int count, MPID_Request **request_ptrs, +int MPIR_Grequest_progress_poke(int count, MPIR_Request **request_ptrs, MPI_Status array_of_statuses[] ); -int MPIR_Grequest_waitall(int count, MPID_Request * const * request_ptrs); +int MPIR_Grequest_waitall(int count, MPIR_Request * const * request_ptrs); /* ------------------------------------------------------------------------- */ /* Prototypes for language-specific routines, such as routines to set @@ -2391,7 +2393,7 @@ int MPIR_Grequest_waitall(int count, MPID_Request * const * request_ptrs); `depend` on using command-line arguments). This call also initializes all MPID data needed by the device. This - includes the 'MPID_Request's and any other data structures used by + includes the 'MPIR_Request's and any other data structures used by the device. The arguments 'has_args' and 'has_env' indicate whether the process was @@ -2736,7 +2738,7 @@ int MPID_Comm_revoke(MPIR_Comm *comm, int is_remote); @*/ int MPID_Send( const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, MPIR_Comm *comm, int context_offset, - MPID_Request **request ); + MPIR_Request **request ); /*@ MPID_Rsend - MPID entry point for MPI_Rsend @@ -2761,7 +2763,7 @@ int MPID_Send( const void *buf, MPI_Aint count, MPI_Datatype datatype, @*/ int MPID_Rsend( const void *buf, int count, MPI_Datatype datatype, int dest, int tag, MPIR_Comm *comm, int context_offset, - MPID_Request **request ); + MPIR_Request **request ); /*@ MPID_Ssend - MPID entry point for MPI_Ssend @@ -2786,7 +2788,7 @@ int MPID_Rsend( const void *buf, int count, MPI_Datatype datatype, @*/ int MPID_Ssend( const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, MPIR_Comm *comm, int context_offset, - MPID_Request **request ); + MPIR_Request **request ); /*@ MPID_tBsend - Attempt a send and return if it would block @@ -2841,7 +2843,7 @@ int MPID_tBsend( const void *buf, int count, MPI_Datatype datatype, @*/ int MPID_Isend( const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, MPIR_Comm *comm, int context_offset, - MPID_Request **request ); + MPIR_Request **request ); /*@ MPID_Irsend - MPID entry point for MPI_Irsend @@ -2860,7 +2862,7 @@ int MPID_Isend( const void *buf, MPI_Aint count, MPI_Datatype datatype, @*/ int MPID_Irsend( const void *buf, int count, MPI_Datatype datatype, int dest, int tag, MPIR_Comm *comm, int context_offset, - MPID_Request **request ); + MPIR_Request **request ); /*@ MPID_Issend - MPID entry point for MPI_Issend @@ -2879,7 +2881,7 @@ int MPID_Irsend( const void *buf, int count, MPI_Datatype datatype, @*/ int MPID_Issend( const void *buf, int count, MPI_Datatype datatype, int dest, int tag, MPIR_Comm *comm, int context_offset, - MPID_Request **request ); + MPIR_Request **request ); /*@ MPID_Recv - MPID entry point for MPI_Recv @@ -2901,7 +2903,7 @@ int MPID_Issend( const void *buf, int count, MPI_Datatype datatype, @*/ int MPID_Recv( void *buf, MPI_Aint count, MPI_Datatype datatype, int source, int tag, MPIR_Comm *comm, int context_offset, - MPI_Status *status, MPID_Request **request ); + MPI_Status *status, MPIR_Request **request ); /*@ @@ -2921,7 +2923,7 @@ int MPID_Recv( void *buf, MPI_Aint count, MPI_Datatype datatype, @*/ int MPID_Irecv( void *buf, MPI_Aint count, MPI_Datatype datatype, int source, int tag, MPIR_Comm *comm, int context_offset, - MPID_Request **request ); + MPIR_Request **request ); /*@ MPID_Send_init - MPID entry point for MPI_Send_init @@ -2940,10 +2942,10 @@ int MPID_Irecv( void *buf, MPI_Aint count, MPI_Datatype datatype, @*/ int MPID_Send_init( const void *buf, int count, MPI_Datatype datatype, int dest, int tag, MPIR_Comm *comm, int context_offset, - MPID_Request **request ); + MPIR_Request **request ); int MPID_Bsend_init(const void *, int, MPI_Datatype, int, int, MPIR_Comm *, - int, MPID_Request **); + int, MPIR_Request **); /*@ MPID_Rsend_init - MPID entry point for MPI_Rsend_init @@ -2961,7 +2963,7 @@ int MPID_Bsend_init(const void *, int, MPI_Datatype, int, int, MPIR_Comm *, @*/ int MPID_Rsend_init( const void *buf, int count, MPI_Datatype datatype, int dest, int tag, MPIR_Comm *comm, int context_offset, - MPID_Request **request ); + MPIR_Request **request ); /*@ MPID_Ssend_init - MPID entry point for MPI_Ssend_init @@ -2979,7 +2981,7 @@ int MPID_Rsend_init( const void *buf, int count, MPI_Datatype datatype, @*/ int MPID_Ssend_init( const void *buf, int count, MPI_Datatype datatype, int dest, int tag, MPIR_Comm *comm, int context_offset, - MPID_Request **request ); + MPIR_Request **request ); /*@ MPID_Recv_init - MPID entry point for MPI_Recv_init @@ -2998,7 +3000,7 @@ int MPID_Ssend_init( const void *buf, int count, MPI_Datatype datatype, @*/ int MPID_Recv_init( void *buf, int count, MPI_Datatype datatype, int source, int tag, MPIR_Comm *comm, int context_offset, - MPID_Request **request ); + MPIR_Request **request ); /*@ MPID_Startall - MPID entry point for MPI_Startall @@ -3013,7 +3015,7 @@ int MPID_Recv_init( void *buf, int count, MPI_Datatype datatype, whereas an implementation built on just 'MPID_Start' would force the ADI to initiate the communication in the order encountered. @*/ -int MPID_Startall(int count, MPID_Request *requests[]); +int MPID_Startall(int count, MPIR_Request *requests[]); /*@ MPID_Probe - Block until a matching request is found and return information @@ -3104,7 +3106,7 @@ int MPID_Iprobe(int, int, MPIR_Comm *, int, int *, MPI_Status *); - context_offset - context id offset of communicator to match Output Parameter: -+ message - 'MPID_Request' (logically a message) set as defined by 'MPI_Mprobe' ++ message - 'MPIR_Request' (logically a message) set as defined by 'MPI_Mprobe' - status - 'MPI_Status' set as defined by 'MPI_Mprobe' Return Value: @@ -3121,7 +3123,7 @@ int MPID_Iprobe(int, int, MPIR_Comm *, int, int *, MPI_Status *); @*/ int MPID_Mprobe(int source, int tag, MPIR_Comm *comm, int context_offset, - MPID_Request **message, MPI_Status *status); + MPIR_Request **message, MPI_Status *status); /*@ MPID_Improbe - Look for a matching request in the receive queue and return @@ -3135,7 +3137,7 @@ int MPID_Mprobe(int source, int tag, MPIR_Comm *comm, int context_offset, Output Parameter: + flag - 'flag' set as defined by 'MPI_Improbe' -. message - 'MPID_Request' (logically a message) set as defined by 'MPI_Improbe' +. message - 'MPIR_Request' (logically a message) set as defined by 'MPI_Improbe' - status - 'MPI_Status' set as defined by 'MPI_Improbe' Return Value: @@ -3152,7 +3154,7 @@ int MPID_Mprobe(int source, int tag, MPIR_Comm *comm, int context_offset, @*/ int MPID_Improbe(int source, int tag, MPIR_Comm *comm, int context_offset, - int *flag, MPID_Request **message, MPI_Status *status); + int *flag, MPIR_Request **message, MPI_Status *status); /*@ MPID_Imrecv - Begin receiving the message indicated by the given message @@ -3161,7 +3163,7 @@ int MPID_Improbe(int source, int tag, MPIR_Comm *comm, int context_offset, Input Parameters: + count - number of elements to receive . datatype - datatype of each recv buffer element -- message - 'MPID_Request' (logically a message) set as defined by 'MPI_Mprobe' +- message - 'MPIR_Request' (logically a message) set as defined by 'MPI_Mprobe' Output Parameter: + buf - receive buffer @@ -3178,7 +3180,7 @@ int MPID_Improbe(int source, int tag, MPIR_Comm *comm, int context_offset, @*/ int MPID_Imrecv(void *buf, int count, MPI_Datatype datatype, - MPID_Request *message, MPID_Request **rreqp); + MPIR_Request *message, MPIR_Request **rreqp); /*@ MPID_Mrecv - Receive the message indicated by the given message handle. @@ -3186,7 +3188,7 @@ int MPID_Imrecv(void *buf, int count, MPI_Datatype datatype, Input Parameters: + count - number of elements to receive . datatype - datatype of each recv buffer element -- message - 'MPID_Request' (logically a message) set as defined by 'MPI_Mprobe' +- message - 'MPIR_Request' (logically a message) set as defined by 'MPI_Mprobe' Output Parameter: + buf - receive buffer @@ -3203,7 +3205,7 @@ int MPID_Imrecv(void *buf, int count, MPI_Datatype datatype, @*/ int MPID_Mrecv(void *buf, int count, MPI_Datatype datatype, - MPID_Request *message, MPI_Status *status); + MPIR_Request *message, MPI_Status *status); /*@ MPID_Cancel_send - Cancel the indicated send request @@ -3225,7 +3227,7 @@ int MPID_Mrecv(void *buf, int count, MPI_Datatype datatype, Request @*/ -int MPID_Cancel_send(MPID_Request *); +int MPID_Cancel_send(MPIR_Request *); /*@ MPID_Cancel_recv - Cancel the indicated recv request @@ -3248,7 +3250,7 @@ int MPID_Cancel_send(MPID_Request *); Request @*/ -int MPID_Cancel_recv(MPID_Request *); +int MPID_Cancel_recv(MPIR_Request *); /*@ MPID_Comm_AS_enabled - Query whether anysource operations are enabled for a communicator @@ -3273,7 +3275,7 @@ int MPID_Comm_AS_enabled(MPIR_Comm *); 1 - The request is anysource @*/ -int MPID_Request_is_anysource(MPID_Request *); +int MPID_Request_is_anysource(MPIR_Request *); /*@ MPID_Aint_add - Returns the sum of base and disp @@ -3349,20 +3351,20 @@ int MPID_Compare_and_swap(const void *origin_addr, const void *compare_addr, int MPID_Rput(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPIR_Win *win, - MPID_Request **request); + MPIR_Request **request); int MPID_Rget(void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPIR_Win *win, - MPID_Request **request); + MPIR_Request **request); int MPID_Raccumulate(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Op op, MPIR_Win *win, - MPID_Request **request); + MPIR_Request **request); int MPID_Rget_accumulate(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, void *result_addr, int result_count, MPI_Datatype result_datatype, int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Op op, MPIR_Win *win, - MPID_Request **request); + MPIR_Request **request); int MPID_Win_lock_all(int assert, MPIR_Win *win); int MPID_Win_unlock_all(MPIR_Win *win); @@ -3382,7 +3384,7 @@ int MPID_Win_sync(MPIR_Win *win); Notes: This routine is informs the progress engine that a block of code follows that - will examine the completion counter of some 'MPID_Request' objects and then + will examine the completion counter of some 'MPIR_Request' objects and then call 'MPID_Progress_wait' zero or more times followed by a call to 'MPID_Progress_end'. @@ -3485,7 +3487,7 @@ int MPID_Progress_poke(void); The request object returned by this routine should be initialized such that ref_count is one and handle contains a valid handle referring to the object. @*/ -MPID_Request * MPID_Request_create(void); +MPIR_Request * MPID_Request_create(void); /*@ MPID_Request_release - Release a request @@ -3501,7 +3503,7 @@ MPID_Request * MPID_Request_create(void); Module: Request @*/ -void MPID_Request_release(MPID_Request *); +void MPID_Request_release(MPIR_Request *); /*@ MPID_Request_complete - Complete a request @@ -3518,7 +3520,7 @@ void MPID_Request_release(MPID_Request *); Module: Request @*/ -int MPID_Request_complete(MPID_Request *); +int MPID_Request_complete(MPIR_Request *); typedef struct MPIR_Grequest_class { MPIU_OBJECT_HEADER; /* adds handle and ref_count fields */ @@ -3766,7 +3768,7 @@ int MPID_Comm_get_lpid(MPIR_Comm *comm_ptr, int idx, int * lpid_ptr, MPIU_BOOL i MPIR_CONTEXT_INTRA(INTER)_COLL. */ int MPIR_Localcopy(const void *sendbuf, MPI_Aint sendcount, MPI_Datatype sendtype, void *recvbuf, MPI_Aint recvcount, MPI_Datatype recvtype); -int MPIC_Wait(MPID_Request * request_ptr, MPIR_Errflag_t *errflag); +int MPIC_Wait(MPIR_Request * request_ptr, MPIR_Errflag_t *errflag); int MPIC_Probe(int source, int tag, MPI_Comm comm, MPI_Status *status); /* FT versions of te MPIC_ functions */ @@ -3785,12 +3787,12 @@ int MPIC_Sendrecv_replace(void *buf, int count, MPI_Datatype datatype, int source, int recvtag, MPIR_Comm *comm_ptr, MPI_Status *status, MPIR_Errflag_t *errflag); int MPIC_Isend(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, - MPIR_Comm *comm_ptr, MPID_Request **request, MPIR_Errflag_t *errflag); + MPIR_Comm *comm_ptr, MPIR_Request **request, MPIR_Errflag_t *errflag); int MPIC_Issend(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, - MPIR_Comm *comm_ptr, MPID_Request **request, MPIR_Errflag_t *errflag); + MPIR_Comm *comm_ptr, MPIR_Request **request, MPIR_Errflag_t *errflag); int MPIC_Irecv(void *buf, MPI_Aint count, MPI_Datatype datatype, int source, - int tag, MPIR_Comm *comm_ptr, MPID_Request **request); -int MPIC_Waitall(int numreq, MPID_Request *requests[], MPI_Status statuses[], MPIR_Errflag_t *errflag); + int tag, MPIR_Comm *comm_ptr, MPIR_Request **request); +int MPIC_Waitall(int numreq, MPIR_Request *requests[], MPI_Status statuses[], MPIR_Errflag_t *errflag); void MPIR_MAXF ( void *, void *, int *, MPI_Datatype * ) ; @@ -4032,7 +4034,7 @@ int MPIR_Comm_is_node_consecutive( MPIR_Comm *); void MPIR_Free_err_dyncodes( void ); -int MPIR_Comm_idup_impl(MPIR_Comm *comm_ptr, MPIR_Comm **newcomm, MPID_Request **reqp); +int MPIR_Comm_idup_impl(MPIR_Comm *comm_ptr, MPIR_Comm **newcomm, MPIR_Request **reqp); int MPIR_Comm_shrink(MPIR_Comm *comm_ptr, MPIR_Comm **newcomm_ptr); int MPIR_Comm_agree(MPIR_Comm *comm_ptr, int *flag); @@ -4233,7 +4235,7 @@ int MPIU_Get_intranode_rank(MPIR_Comm *comm_ptr, int r); #define MPIR_Test_cancelled_impl(status, flag) *(flag) = MPIR_STATUS_GET_CANCEL_BIT(*(status)) /* MPIR_ functions. These are versions of MPI_ functions appropriate for calling within MPI */ -int MPIR_Cancel_impl(MPID_Request *request_ptr); +int MPIR_Cancel_impl(MPIR_Request *request_ptr); struct MPIR_Topology; void MPIR_Cart_rank_impl(struct MPIR_Topology *cart_ptr, const int *coords, int *rank); int MPIR_Cart_create_impl(MPIR_Comm *comm_ptr, int ndims, const int dims[], @@ -4290,17 +4292,17 @@ int MPIR_Group_translate_ranks_impl(MPIR_Group *group_ptr1, int n, const int *ra MPIR_Group *group_ptr2, int *ranks2); int MPIR_Group_union_impl(MPIR_Group *group_ptr1, MPIR_Group *group_ptr2, MPIR_Group **new_group_ptr); void MPIR_Get_count_impl(const MPI_Status *status, MPI_Datatype datatype, int *count); -void MPIR_Grequest_complete_impl(MPID_Request *request_ptr); +void MPIR_Grequest_complete_impl(MPIR_Request *request_ptr); int MPIR_Grequest_start_impl(MPI_Grequest_query_function *query_fn, MPI_Grequest_free_function *free_fn, MPI_Grequest_cancel_function *cancel_fn, - void *extra_state, MPID_Request **request_ptr); + void *extra_state, MPIR_Request **request_ptr); int MPIX_Grequest_start_impl(MPI_Grequest_query_function *, MPI_Grequest_free_function *, MPI_Grequest_cancel_function *, MPIX_Grequest_poll_function *, MPIX_Grequest_wait_function *, void *, - MPID_Request **); + MPIR_Request **); int MPIR_Graph_map_impl(const MPIR_Comm *comm_ptr, int nnodes, const int indx[], const int edges[], int *newrank); int MPIR_Type_commit_impl(MPI_Datatype *datatype); diff --git a/src/include/mpir_nbc.h b/src/include/mpir_nbc.h index c0bad0c..588172b 100644 --- a/src/include/mpir_nbc.h +++ b/src/include/mpir_nbc.h @@ -60,7 +60,7 @@ int MPID_Sched_clone(MPID_Sched_t orig, MPID_Sched_t *cloned); * comm should be the primary (user) communicator with which this collective is * associated, even if other hidden communicators are used for a subset of the * operations. It will be used for error handling and similar operations. */ -int MPID_Sched_start(MPID_Sched_t *sp, MPIR_Comm *comm, int tag, MPID_Request **req); +int MPID_Sched_start(MPID_Sched_t *sp, MPIR_Comm *comm, int tag, MPIR_Request **req); /* send and recv take a comm ptr to enable hierarchical collectives */ int MPID_Sched_send(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, MPIR_Comm *comm, MPID_Sched_t s); diff --git a/src/mpi/coll/alltoall.c b/src/mpi/coll/alltoall.c index bc371b9..330d5a8 100644 --- a/src/mpi/coll/alltoall.c +++ b/src/mpi/coll/alltoall.c @@ -147,7 +147,7 @@ int MPIR_Alltoall_intra( MPI_Aint pack_size, position; MPI_Datatype newtype = MPI_DATATYPE_NULL; void *tmp_buf; - MPID_Request **reqarray; + MPIR_Request **reqarray; MPI_Status *starray; MPIU_CHKLMEM_DECL(6); @@ -338,7 +338,7 @@ int MPIR_Alltoall_intra( bblock = MPIR_CVAR_ALLTOALL_THROTTLE; if (bblock == 0) bblock = comm_size; - MPIU_CHKLMEM_MALLOC(reqarray, MPID_Request **, 2*bblock*sizeof(MPID_Request*), mpi_errno, "reqarray"); + MPIU_CHKLMEM_MALLOC(reqarray, MPIR_Request **, 2*bblock*sizeof(MPIR_Request*), mpi_errno, "reqarray"); MPIU_CHKLMEM_MALLOC(starray, MPI_Status *, 2*bblock*sizeof(MPI_Status), mpi_errno, "starray"); diff --git a/src/mpi/coll/alltoallv.c b/src/mpi/coll/alltoallv.c index 2c0b9af..f70182d 100644 --- a/src/mpi/coll/alltoallv.c +++ b/src/mpi/coll/alltoallv.c @@ -71,7 +71,7 @@ int MPIR_Alltoallv_intra(const void *sendbuf, const int *sendcounts, const int * int mpi_errno_ret = MPI_SUCCESS; MPI_Status *starray; MPI_Status status; - MPID_Request **reqarray; + MPIR_Request **reqarray; int dst, rank, req_cnt; int ii, ss, bblock; int type_size; @@ -139,7 +139,7 @@ int MPIR_Alltoallv_intra(const void *sendbuf, const int *sendcounts, const int * MPID_Datatype_get_extent_macro(sendtype, send_extent); MPIU_CHKLMEM_MALLOC(starray, MPI_Status*, 2*bblock*sizeof(MPI_Status), mpi_errno, "starray"); - MPIU_CHKLMEM_MALLOC(reqarray, MPID_Request**, 2*bblock*sizeof(MPID_Request *), mpi_errno, "reqarray"); + MPIU_CHKLMEM_MALLOC(reqarray, MPIR_Request**, 2*bblock*sizeof(MPIR_Request *), mpi_errno, "reqarray"); /* post only bblock isends/irecvs at a time as suggested by Tony Ladd */ for (ii=0; ii<comm_size; ii+=bblock) { diff --git a/src/mpi/coll/alltoallw.c b/src/mpi/coll/alltoallw.c index d106baf..81d64ea 100644 --- a/src/mpi/coll/alltoallw.c +++ b/src/mpi/coll/alltoallw.c @@ -64,7 +64,7 @@ int MPIR_Alltoallw_intra(const void *sendbuf, const int sendcounts[], const int int mpi_errno_ret = MPI_SUCCESS; MPI_Status status; MPI_Status *starray; - MPID_Request **reqarray; + MPIR_Request **reqarray; int dst, rank; int outstanding_requests; int ii, ss, bblock; @@ -126,7 +126,7 @@ int MPIR_Alltoallw_intra(const void *sendbuf, const int sendcounts[], const int if (bblock == 0) bblock = comm_size; MPIU_CHKLMEM_MALLOC(starray, MPI_Status*, 2*bblock*sizeof(MPI_Status), mpi_errno, "starray"); - MPIU_CHKLMEM_MALLOC(reqarray, MPID_Request**, 2*bblock*sizeof(MPID_Request *), mpi_errno, "reqarray"); + MPIU_CHKLMEM_MALLOC(reqarray, MPIR_Request**, 2*bblock*sizeof(MPIR_Request *), mpi_errno, "reqarray"); /* post only bblock isends/irecvs at a time as suggested by Tony Ladd */ for (ii=0; ii<comm_size; ii+=bblock) { diff --git a/src/mpi/coll/gatherv.c b/src/mpi/coll/gatherv.c index 43a4e7c..3deffb8 100644 --- a/src/mpi/coll/gatherv.c +++ b/src/mpi/coll/gatherv.c @@ -91,7 +91,7 @@ int MPIR_Gatherv ( MPI_Aint extent; int i, reqs; int min_procs; - MPID_Request **reqarray; + MPIR_Request **reqarray; MPI_Status *starray; MPIU_CHKLMEM_DECL(2); @@ -113,7 +113,7 @@ int MPIR_Gatherv ( MPIU_Ensure_Aint_fits_in_pointer(MPIU_VOID_PTR_CAST_TO_MPI_AINT recvbuf + displs[rank] * extent); - MPIU_CHKLMEM_MALLOC(reqarray, MPID_Request **, comm_size * sizeof(MPID_Request *), mpi_errno, "reqarray"); + MPIU_CHKLMEM_MALLOC(reqarray, MPIR_Request **, comm_size * sizeof(MPIR_Request *), mpi_errno, "reqarray"); MPIU_CHKLMEM_MALLOC(starray, MPI_Status *, comm_size * sizeof(MPI_Status), mpi_errno, "starray"); reqs = 0; diff --git a/src/mpi/coll/helper_fns.c b/src/mpi/coll/helper_fns.c index c4c08b2..1df8e15 100644 --- a/src/mpi/coll/helper_fns.c +++ b/src/mpi/coll/helper_fns.c @@ -203,7 +203,7 @@ int MPIR_Localcopy(const void *sendbuf, MPI_Aint sendcount, MPI_Datatype sendtyp #define FUNCNAME MPIC_Wait #undef FCNAME #define FCNAME "MPIC_Wait" -int MPIC_Wait(MPID_Request * request_ptr, MPIR_Errflag_t *errflag) +int MPIC_Wait(MPIR_Request * request_ptr, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPIC_WAIT); @@ -215,12 +215,12 @@ int MPIC_Wait(MPID_Request * request_ptr, MPIR_Errflag_t *errflag) if (request_ptr->kind == MPIR_REQUEST_SEND) request_ptr->status.MPI_TAG = 0; - if (!MPID_Request_is_complete(request_ptr)) + if (!MPIR_Request_is_complete(request_ptr)) { MPID_Progress_state progress_state; MPID_Progress_start(&progress_state); - while (!MPID_Request_is_complete(request_ptr)) + while (!MPIR_Request_is_complete(request_ptr)) { mpi_errno = MPID_Progress_wait(&progress_state); if (mpi_errno) { MPIR_ERR_POP(mpi_errno); } @@ -273,7 +273,7 @@ int MPIC_Send(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, { int mpi_errno = MPI_SUCCESS; int context_id; - MPID_Request *request_ptr = NULL; + MPIR_Request *request_ptr = NULL; MPIDI_STATE_DECL(MPID_STATE_MPIC_SEND); MPIDI_FUNC_ENTER(MPID_STATE_MPIC_SEND); @@ -332,7 +332,7 @@ int MPIC_Recv(void *buf, MPI_Aint count, MPI_Datatype datatype, int source, int int mpi_errno = MPI_SUCCESS; int context_id; MPI_Status mystatus; - MPID_Request *request_ptr = NULL; + MPIR_Request *request_ptr = NULL; MPIDI_STATE_DECL(MPID_STATE_MPIC_RECV); MPIDI_FUNC_ENTER(MPID_STATE_MPIC_RECV); @@ -389,7 +389,7 @@ int MPIC_Ssend(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, { int mpi_errno = MPI_SUCCESS; int context_id; - MPID_Request *request_ptr = NULL; + MPIR_Request *request_ptr = NULL; MPIDI_STATE_DECL(MPID_STATE_MPIC_SSEND); MPIDI_FUNC_ENTER(MPID_STATE_MPIC_SSEND); @@ -450,7 +450,7 @@ int MPIC_Sendrecv(const void *sendbuf, MPI_Aint sendcount, MPI_Datatype sendtype int mpi_errno = MPI_SUCCESS; int context_id; MPI_Status mystatus; - MPID_Request *recv_req_ptr = NULL, *send_req_ptr = NULL; + MPIR_Request *recv_req_ptr = NULL, *send_req_ptr = NULL; MPIDI_STATE_DECL(MPID_STATE_MPIC_SENDRECV); MPIDI_FUNC_ENTER(MPID_STATE_MPIC_SENDRECV); @@ -528,8 +528,8 @@ int MPIC_Sendrecv_replace(void *buf, int count, MPI_Datatype datatype, int mpi_errno = MPI_SUCCESS; MPI_Status mystatus; MPIU_Context_id_t context_id_offset; - MPID_Request *sreq = NULL; - MPID_Request *rreq = NULL; + MPIR_Request *sreq = NULL; + MPIR_Request *rreq = NULL; void *tmpbuf = NULL; MPI_Aint tmpbuf_size = 0; MPI_Aint tmpbuf_count = 0; @@ -619,7 +619,7 @@ int MPIC_Sendrecv_replace(void *buf, int count, MPI_Datatype datatype, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIC_Isend(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, - MPIR_Comm *comm_ptr, MPID_Request **request_ptr, MPIR_Errflag_t *errflag) + MPIR_Comm *comm_ptr, MPIR_Request **request_ptr, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; int context_id; @@ -660,7 +660,7 @@ int MPIC_Isend(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIC_Issend(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, - MPIR_Comm *comm_ptr, MPID_Request **request_ptr, MPIR_Errflag_t *errflag) + MPIR_Comm *comm_ptr, MPIR_Request **request_ptr, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; int context_id; @@ -701,7 +701,7 @@ int MPIC_Issend(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIC_Irecv(void *buf, MPI_Aint count, MPI_Datatype datatype, int source, - int tag, MPIR_Comm *comm_ptr, MPID_Request **request_ptr) + int tag, MPIR_Comm *comm_ptr, MPIR_Request **request_ptr) { int mpi_errno = MPI_SUCCESS; int context_id; @@ -731,7 +731,7 @@ int MPIC_Irecv(void *buf, MPI_Aint count, MPI_Datatype datatype, int source, #define FUNCNAME MPIC_Waitall #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIC_Waitall(int numreq, MPID_Request *requests[], MPI_Status statuses[], MPIR_Errflag_t *errflag) +int MPIC_Waitall(int numreq, MPIR_Request *requests[], MPI_Status statuses[], MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; int i; @@ -762,7 +762,7 @@ int MPIC_Waitall(int numreq, MPID_Request *requests[], MPI_Status statuses[], MP status_array[i].MPI_TAG = 0; status_array[i].MPI_SOURCE = MPI_PROC_NULL; - /* Convert the MPID_Request objects to MPI_Request objects */ + /* Convert the MPIR_Request objects to MPI_Request objects */ request_ptrs[i] = requests[i]->handle; } diff --git a/src/mpi/coll/iallgather.c b/src/mpi/coll/iallgather.c index 0f50655..b13e82b 100644 --- a/src/mpi/coll/iallgather.c +++ b/src/mpi/coll/iallgather.c @@ -594,7 +594,7 @@ fn_fail: int MPIR_Iallgather_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; - MPID_Request *reqp = NULL; + MPIR_Request *reqp = NULL; int tag = -1; MPID_Sched_t s = MPID_SCHED_NULL; diff --git a/src/mpi/coll/iallgatherv.c b/src/mpi/coll/iallgatherv.c index c440134..a7461b4 100644 --- a/src/mpi/coll/iallgatherv.c +++ b/src/mpi/coll/iallgatherv.c @@ -695,7 +695,7 @@ int MPIR_Iallgatherv_impl(const void *sendbuf, int sendcount, MPI_Datatype sendt MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; - MPID_Request *reqp = NULL; + MPIR_Request *reqp = NULL; int tag = -1; MPID_Sched_t s = MPID_SCHED_NULL; diff --git a/src/mpi/coll/iallreduce.c b/src/mpi/coll/iallreduce.c index c5bebf2..2ab9353 100644 --- a/src/mpi/coll/iallreduce.c +++ b/src/mpi/coll/iallreduce.c @@ -649,7 +649,7 @@ fn_fail: int MPIR_Iallreduce_impl(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; - MPID_Request *reqp = NULL; + MPIR_Request *reqp = NULL; int tag = -1; MPID_Sched_t s = MPID_SCHED_NULL; diff --git a/src/mpi/coll/ialltoall.c b/src/mpi/coll/ialltoall.c index 7da0b26..637ca0c 100644 --- a/src/mpi/coll/ialltoall.c +++ b/src/mpi/coll/ialltoall.c @@ -522,7 +522,7 @@ fn_fail: int MPIR_Ialltoall_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; - MPID_Request *reqp = NULL; + MPIR_Request *reqp = NULL; int tag = -1; MPID_Sched_t s = MPID_SCHED_NULL; diff --git a/src/mpi/coll/ialltoallv.c b/src/mpi/coll/ialltoallv.c index ec4484a..8c61eed 100644 --- a/src/mpi/coll/ialltoallv.c +++ b/src/mpi/coll/ialltoallv.c @@ -251,7 +251,7 @@ int MPIR_Ialltoallv_impl(const void *sendbuf, const int sendcounts[], const int MPI_Request *request) { int mpi_errno = MPI_SUCCESS; - MPID_Request *reqp = NULL; + MPIR_Request *reqp = NULL; int tag = -1; MPID_Sched_t s = MPID_SCHED_NULL; diff --git a/src/mpi/coll/ialltoallw.c b/src/mpi/coll/ialltoallw.c index 2dc71af..8174038 100644 --- a/src/mpi/coll/ialltoallw.c +++ b/src/mpi/coll/ialltoallw.c @@ -256,7 +256,7 @@ int MPIR_Ialltoallw_impl(const void *sendbuf, const int sendcounts[], const int MPI_Request *request) { int mpi_errno = MPI_SUCCESS; - MPID_Request *reqp = NULL; + MPIR_Request *reqp = NULL; int tag = -1; MPID_Sched_t s = MPID_SCHED_NULL; diff --git a/src/mpi/coll/ibarrier.c b/src/mpi/coll/ibarrier.c index dd8bf78..fcd5184 100644 --- a/src/mpi/coll/ibarrier.c +++ b/src/mpi/coll/ibarrier.c @@ -172,7 +172,7 @@ fn_fail: int MPIR_Ibarrier_impl(MPIR_Comm *comm_ptr, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; - MPID_Request *reqp = NULL; + MPIR_Request *reqp = NULL; int tag = -1; MPID_Sched_t s = MPID_SCHED_NULL; diff --git a/src/mpi/coll/ibcast.c b/src/mpi/coll/ibcast.c index 482c915..3789356 100644 --- a/src/mpi/coll/ibcast.c +++ b/src/mpi/coll/ibcast.c @@ -966,7 +966,7 @@ fn_fail: int MPIR_Ibcast_impl(void *buffer, int count, MPI_Datatype datatype, int root, MPIR_Comm *comm_ptr, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; - MPID_Request *reqp = NULL; + MPIR_Request *reqp = NULL; int tag = -1; MPID_Sched_t s = MPID_SCHED_NULL; diff --git a/src/mpi/coll/iexscan.c b/src/mpi/coll/iexscan.c index ffa798c..4da6888 100644 --- a/src/mpi/coll/iexscan.c +++ b/src/mpi/coll/iexscan.c @@ -187,7 +187,7 @@ fn_fail: int MPIR_Iexscan_impl(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; - MPID_Request *reqp = NULL; + MPIR_Request *reqp = NULL; int tag = -1; MPID_Sched_t s = MPID_SCHED_NULL; diff --git a/src/mpi/coll/igather.c b/src/mpi/coll/igather.c index fa20b6c..ea00d30 100644 --- a/src/mpi/coll/igather.c +++ b/src/mpi/coll/igather.c @@ -525,7 +525,7 @@ fn_fail: int MPIR_Igather_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPIR_Comm *comm_ptr, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; - MPID_Request *reqp = NULL; + MPIR_Request *reqp = NULL; int tag = -1; MPID_Sched_t s = MPID_SCHED_NULL; diff --git a/src/mpi/coll/igatherv.c b/src/mpi/coll/igatherv.c index 36df4f6..5a8e463 100644 --- a/src/mpi/coll/igatherv.c +++ b/src/mpi/coll/igatherv.c @@ -114,7 +114,7 @@ int MPIR_Igatherv_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype int root, MPIR_Comm *comm_ptr, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; - MPID_Request *reqp = NULL; + MPIR_Request *reqp = NULL; int tag = -1; MPID_Sched_t s = MPID_SCHED_NULL; diff --git a/src/mpi/coll/ired_scat.c b/src/mpi/coll/ired_scat.c index 29c1ad8..0fc9217 100644 --- a/src/mpi/coll/ired_scat.c +++ b/src/mpi/coll/ired_scat.c @@ -1012,7 +1012,7 @@ int MPIR_Ireduce_scatter_impl(const void *sendbuf, void *recvbuf, const int recv MPI_Request *request) { int mpi_errno = MPI_SUCCESS; - MPID_Request *reqp = NULL; + MPIR_Request *reqp = NULL; int tag = -1; MPID_Sched_t s = MPID_SCHED_NULL; diff --git a/src/mpi/coll/ired_scat_block.c b/src/mpi/coll/ired_scat_block.c index 0a0d243..d5981f1 100644 --- a/src/mpi/coll/ired_scat_block.c +++ b/src/mpi/coll/ired_scat_block.c @@ -914,7 +914,7 @@ fn_fail: int MPIR_Ireduce_scatter_block_impl(const void *sendbuf, void *recvbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; - MPID_Request *reqp = NULL; + MPIR_Request *reqp = NULL; int tag = -1; MPID_Sched_t s = MPID_SCHED_NULL; diff --git a/src/mpi/coll/ireduce.c b/src/mpi/coll/ireduce.c index 43eaabc..f9802c7 100644 --- a/src/mpi/coll/ireduce.c +++ b/src/mpi/coll/ireduce.c @@ -770,7 +770,7 @@ fn_fail: int MPIR_Ireduce_impl(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPIR_Comm *comm_ptr, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; - MPID_Request *reqp = NULL; + MPIR_Request *reqp = NULL; int tag = -1; MPID_Sched_t s = MPID_SCHED_NULL; diff --git a/src/mpi/coll/iscan.c b/src/mpi/coll/iscan.c index 94fa5f8..e70dbd6 100644 --- a/src/mpi/coll/iscan.c +++ b/src/mpi/coll/iscan.c @@ -321,7 +321,7 @@ fn_fail: int MPIR_Iscan_impl(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; - MPID_Request *reqp = NULL; + MPIR_Request *reqp = NULL; int tag = -1; MPID_Sched_t s = MPID_SCHED_NULL; diff --git a/src/mpi/coll/iscatter.c b/src/mpi/coll/iscatter.c index 69dc81d..464be10 100644 --- a/src/mpi/coll/iscatter.c +++ b/src/mpi/coll/iscatter.c @@ -550,7 +550,7 @@ fn_fail: int MPIR_Iscatter_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPIR_Comm *comm_ptr, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; - MPID_Request *reqp = NULL; + MPIR_Request *reqp = NULL; int tag = -1; MPID_Sched_t s = MPID_SCHED_NULL; diff --git a/src/mpi/coll/iscatterv.c b/src/mpi/coll/iscatterv.c index 8a34f0b..550266e 100644 --- a/src/mpi/coll/iscatterv.c +++ b/src/mpi/coll/iscatterv.c @@ -121,7 +121,7 @@ int MPIR_Iscatterv_impl(const void *sendbuf, const int sendcounts[], const int d MPI_Datatype recvtype, int root, MPIR_Comm *comm_ptr, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; - MPID_Request *reqp = NULL; + MPIR_Request *reqp = NULL; int tag = -1; MPID_Sched_t s = MPID_SCHED_NULL; diff --git a/src/mpi/coll/scatterv.c b/src/mpi/coll/scatterv.c index f29eebb..56df240 100644 --- a/src/mpi/coll/scatterv.c +++ b/src/mpi/coll/scatterv.c @@ -61,7 +61,7 @@ int MPIR_Scatterv(const void *sendbuf, const int *sendcounts, const int *displs, int mpi_errno_ret = MPI_SUCCESS; MPI_Aint extent; int i, reqs; - MPID_Request **reqarray; + MPIR_Request **reqarray; MPI_Status *starray; MPIU_CHKLMEM_DECL(2); @@ -87,7 +87,7 @@ int MPIR_Scatterv(const void *sendbuf, const int *sendcounts, const int *displs, * this? */ MPIU_Ensure_Aint_fits_in_pointer(MPIU_VOID_PTR_CAST_TO_MPI_AINT sendbuf + extent); - MPIU_CHKLMEM_MALLOC(reqarray, MPID_Request **, comm_size * sizeof(MPID_Request *), mpi_errno, "reqarray"); + MPIU_CHKLMEM_MALLOC(reqarray, MPIR_Request **, comm_size * sizeof(MPIR_Request *), mpi_errno, "reqarray"); MPIU_CHKLMEM_MALLOC(starray, MPI_Status *, comm_size * sizeof(MPI_Status), mpi_errno, "starray"); reqs = 0; diff --git a/src/mpi/comm/comm_idup.c b/src/mpi/comm/comm_idup.c index c80d3e5..1d766e2 100644 --- a/src/mpi/comm/comm_idup.c +++ b/src/mpi/comm/comm_idup.c @@ -30,7 +30,7 @@ int MPI_Comm_idup(MPI_Comm comm, MPI_Comm *newcomm, MPI_Request *request) __attr #define FUNCNAME MPIR_Comm_idup_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Comm_idup_impl(MPIR_Comm *comm_ptr, MPIR_Comm **newcommp, MPID_Request **reqp) +int MPIR_Comm_idup_impl(MPIR_Comm *comm_ptr, MPIR_Comm **newcommp, MPIR_Request **reqp) { int mpi_errno = MPI_SUCCESS; MPIR_Attribute *new_attributes = 0; @@ -97,7 +97,7 @@ int MPI_Comm_idup(MPI_Comm comm, MPI_Comm *newcomm, MPI_Request *request) int mpi_errno = MPI_SUCCESS; MPIR_Comm *comm_ptr = NULL; MPIR_Comm *newcomm_ptr = NULL; - MPID_Request *dreq = NULL; + MPIR_Request *dreq = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_IDUP); MPID_THREAD_CS_ENTER(GLOBAL, MPIR_THREAD_GLOBAL_ALLFUNC_MUTEX); diff --git a/src/mpi/comm/contextid.c b/src/mpi/comm/contextid.c index f622e50..7946c04 100644 --- a/src/mpi/comm/contextid.c +++ b/src/mpi/comm/contextid.c @@ -1007,7 +1007,7 @@ static int sched_get_cid_nonblock(MPIR_Comm * comm_ptr, MPIR_Comm * newcomm, #define FUNCNAME MPIR_Get_contextid_nonblock #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Get_contextid_nonblock(MPIR_Comm * comm_ptr, MPIR_Comm * newcommp, MPID_Request ** req) +int MPIR_Get_contextid_nonblock(MPIR_Comm * comm_ptr, MPIR_Comm * newcommp, MPIR_Request ** req) { int mpi_errno = MPI_SUCCESS; int tag; @@ -1051,7 +1051,7 @@ int MPIR_Get_contextid_nonblock(MPIR_Comm * comm_ptr, MPIR_Comm * newcommp, MPID #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Get_intercomm_contextid_nonblock(MPIR_Comm * comm_ptr, MPIR_Comm * newcommp, - MPID_Request ** req) + MPIR_Request ** req) { int mpi_errno = MPI_SUCCESS; int tag; diff --git a/src/mpi/debugger/dbginit.c b/src/mpi/debugger/dbginit.c index 6d15931..74cdca1 100644 --- a/src/mpi/debugger/dbginit.c +++ b/src/mpi/debugger/dbginit.c @@ -334,7 +334,7 @@ void MPIR_DebuggerSetAborting( const char *msg ) be included in the request. Saving the context_id also simplifies matching these entries with a communicator */ typedef struct MPIR_Sendq { - MPID_Request *sreq; + MPIR_Request *sreq; int tag, rank, context_id; struct MPIR_Sendq *next; struct MPIR_Sendq *prev; @@ -348,7 +348,7 @@ static MPIR_Sendq *pool = 0; /* This routine is used to establish a queue of send requests to allow the debugger easier access to the active requests. Some devices may be able to provide this information without requiring this separate queue. */ -void MPIR_Sendq_remember( MPID_Request *req, +void MPIR_Sendq_remember( MPIR_Request *req, int rank, int tag, int context_id ) { MPIR_Sendq *p; @@ -379,7 +379,7 @@ fn_exit: MPID_THREAD_CS_EXIT(POBJ, req->pobj_mutex); } -void MPIR_Sendq_forget( MPID_Request *req ) +void MPIR_Sendq_forget( MPIR_Request *req ) { MPIR_Sendq *p, *prev; diff --git a/src/mpi/debugger/dbgstub.c b/src/mpi/debugger/dbgstub.c index 4dc7c8c..bf624ee 100644 --- a/src/mpi/debugger/dbgstub.c +++ b/src/mpi/debugger/dbgstub.c @@ -10,14 +10,14 @@ /* These are pointers to the static variables in src/mpid/ch3/src/ch3u_recvq.c that contains the *addresses* of the posted and unexpected queue head pointers */ -extern MPID_Request ** const MPID_Recvq_posted_head_ptr, +extern MPIR_Request ** const MPID_Recvq_posted_head_ptr, ** const MPID_Recvq_unexpected_head_ptr; #include "mpi_interface.h" /* This is from dbginit.c; it is not exported to other files */ typedef struct MPIR_Sendq { - MPID_Request *sreq; + MPIR_Request *sreq; int tag, rank, context_id; struct MPIR_Sendq *next; } MPIR_Sendq; @@ -81,7 +81,7 @@ mqs_type * dbgrI_find_type(mqs_image *image, char *name, else if (strcmp( name, "MPIDI_Message_match_parts_t" ) == 0) { curType = TYPE_MPIDI_MESSAGE_MATCH_PARTS; } - else if (strcmp( name, "MPID_Request" ) == 0) { + else if (strcmp( name, "MPIR_Request" ) == 0) { curType = TYPE_MPIR_REQUEST; } else if (strcmp( name, "MPIR_Sendq" ) == 0) { @@ -194,7 +194,7 @@ int dbgrI_field_offset(mqs_type *type, char *name) break; case TYPE_MPIR_REQUEST: { - MPID_Request c; + MPIR_Request c; if (strcmp( name, "dev" ) == 0) { off = ((char *)&c.dev - (char *)&c); } diff --git a/src/mpi/debugger/dll_mpich.c b/src/mpi/debugger/dll_mpich.c index abd55ca..b0af7f3 100644 --- a/src/mpi/debugger/dll_mpich.c +++ b/src/mpi/debugger/dll_mpich.c @@ -298,13 +298,13 @@ int mqs_image_has_queues (mqs_image *image, char **message) } } - /* Now the receive queues. The receive queues contain MPID_Request + /* Now the receive queues. The receive queues contain MPIR_Request objects, and the various fields are within types in that object. To simplify the eventual access, we compute all offsets relative to the request. This means diving into the types that make of the request definition */ { - mqs_type *req_type = dbgr_find_type( image, (char *)"MPID_Request", mqs_lang_c ); + mqs_type *req_type = dbgr_find_type( image, (char *)"MPIR_Request", mqs_lang_c ); if (req_type) { int dev_offs; dev_offs = dbgr_field_offset( req_type, (char *)"dev" ); diff --git a/src/mpi/debugger/mpich_dll_defs.h b/src/mpi/debugger/mpich_dll_defs.h index 749644e..a6a0be8 100644 --- a/src/mpi/debugger/mpich_dll_defs.h +++ b/src/mpi/debugger/mpich_dll_defs.h @@ -29,7 +29,7 @@ typedef struct int comm_next_offs; int comm_name_offs; - /* Fields in MPID_Request (including structures within the request) */ + /* Fields in MPIR_Request (including structures within the request) */ int req_status_offs; int req_cc_offs; int req_dev_offs; diff --git a/src/mpi/init/async.c b/src/mpi/init/async.c index 6f88f90..40dee1c 100644 --- a/src/mpi/init/async.c +++ b/src/mpi/init/async.c @@ -27,7 +27,7 @@ static volatile int progress_thread_done = 0; static void progress_fn(void * data) { int mpi_errno = MPI_SUCCESS; - MPID_Request *request_ptr = NULL; + MPIR_Request *request_ptr = NULL; MPI_Request request; MPI_Status status; @@ -119,7 +119,7 @@ int MPIR_Finalize_async_thread(void) { int mpi_errno = MPI_SUCCESS; #if MPICH_THREAD_LEVEL == MPI_THREAD_MULTIPLE - MPID_Request *request_ptr = NULL; + MPIR_Request *request_ptr = NULL; MPI_Request request; MPI_Status status; MPID_MPI_STATE_DECL(MPID_STATE_MPIR_FINALIZE_ASYNC_THREAD); diff --git a/src/mpi/pt2pt/bsend.c b/src/mpi/pt2pt/bsend.c index bba508d..f8b07c5 100644 --- a/src/mpi/pt2pt/bsend.c +++ b/src/mpi/pt2pt/bsend.c @@ -92,7 +92,7 @@ int MPI_Bsend(const void *buf, int count, MPI_Datatype datatype, int dest, int t static const char FCNAME[] = "MPI_Bsend"; int mpi_errno = MPI_SUCCESS; MPIR_Comm *comm_ptr = NULL; - MPID_Request *request_ptr = NULL; + MPIR_Request *request_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_BSEND); MPIR_ERRTEST_INITIALIZED_ORDIE(); diff --git a/src/mpi/pt2pt/bsend_init.c b/src/mpi/pt2pt/bsend_init.c index 78b97d0..a0869d2 100644 --- a/src/mpi/pt2pt/bsend_init.c +++ b/src/mpi/pt2pt/bsend_init.c @@ -64,7 +64,7 @@ int MPI_Bsend_init(const void *buf, int count, MPI_Datatype datatype, { static const char FCNAME[] = "MPI_Bsend_init"; int mpi_errno = MPI_SUCCESS; - MPID_Request *request_ptr = NULL; + MPIR_Request *request_ptr = NULL; MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_BSEND_INIT); diff --git a/src/mpi/pt2pt/bsendutil.c b/src/mpi/pt2pt/bsendutil.c index 7585d8e..a02d0f5 100644 --- a/src/mpi/pt2pt/bsendutil.c +++ b/src/mpi/pt2pt/bsendutil.c @@ -20,7 +20,7 @@ * MPIR_Bsend_attach - Performs the work of MPI_Buffer_attach * MPIR_Bsend_detach - Performs the work of MPI_Buffer_detach * MPIR_Bsend_isend - Essentially performs an MPI_Ibsend. Returns - * an MPID_Request that is also stored internally in the + * an MPIR_Request that is also stored internally in the * corresponding MPIR_Bsend_data_t entry * MPIR_Bsend_free_segment - Free a buffer that is no longer needed, * merging with adjacent segments @@ -209,7 +209,7 @@ int MPIR_Bsend_detach( void *bufferp, int *size ) #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Bsend_isend(const void *buf, int count, MPI_Datatype dtype, int dest, int tag, MPIR_Comm *comm_ptr, - MPIR_Bsend_kind_t kind, MPID_Request **request ) + MPIR_Bsend_kind_t kind, MPIR_Request **request ) { int mpi_errno = MPI_SUCCESS; MPIR_Bsend_data_t *p; @@ -326,7 +326,7 @@ int MPIR_Bsend_isend(const void *buf, int count, MPI_Datatype dtype, #define FUNCNAME MPIR_Bsend_free_seg #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Bsend_free_req_seg( MPID_Request* req ) +int MPIR_Bsend_free_req_seg( MPIR_Request* req ) { int mpi_errno = MPI_ERR_INTERN; MPIR_Bsend_data_t *active = BsendBuffer.active; diff --git a/src/mpi/pt2pt/bsendutil.h b/src/mpi/pt2pt/bsendutil.h index 997cf7e..065b34e 100644 --- a/src/mpi/pt2pt/bsendutil.h +++ b/src/mpi/pt2pt/bsendutil.h @@ -11,6 +11,6 @@ int MPIR_Bsend_attach( void *, int ); int MPIR_Bsend_detach( void *, int * ); int MPIR_Bsend_isend(const void *, int, MPI_Datatype, int, int, MPIR_Comm *, - MPIR_Bsend_kind_t, MPID_Request ** ); -int MPIR_Bsend_free_req_seg(MPID_Request * ); + MPIR_Bsend_kind_t, MPIR_Request ** ); +int MPIR_Bsend_free_req_seg(MPIR_Request * ); diff --git a/src/mpi/pt2pt/cancel.c b/src/mpi/pt2pt/cancel.c index 4384c92..929c1a7 100644 --- a/src/mpi/pt2pt/cancel.c +++ b/src/mpi/pt2pt/cancel.c @@ -30,7 +30,7 @@ int MPI_Cancel(MPI_Request *request) __attribute__((weak,alias("PMPI_Cancel"))); #define FUNCNAME MPIR_Cancel_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Cancel_impl(MPID_Request *request_ptr) +int MPIR_Cancel_impl(MPIR_Request *request_ptr) { int mpi_errno = MPI_SUCCESS; @@ -50,10 +50,10 @@ int MPIR_Cancel_impl(MPID_Request *request_ptr) break; } - case MPID_PREQUEST_SEND: + case MPIR_PREQUEST_SEND: { if (request_ptr->partner_request != NULL) { - if (request_ptr->partner_request->kind != MPID_UREQUEST) { + if (request_ptr->partner_request->kind != MPIR_UREQUEST) { /* jratt(a)us.ibm.com: I don't know about the bsend * comment below, but the CC stuff on the next * line is *really* needed for persistent Bsend @@ -86,7 +86,7 @@ int MPIR_Cancel_impl(MPID_Request *request_ptr) break; } - case MPID_PREQUEST_RECV: + case MPIR_PREQUEST_RECV: { if (request_ptr->partner_request != NULL) { mpi_errno = MPID_Cancel_recv(request_ptr->partner_request); @@ -97,7 +97,7 @@ int MPIR_Cancel_impl(MPID_Request *request_ptr) break; } - case MPID_UREQUEST: + case MPIR_UREQUEST: { mpi_errno = MPIR_Grequest_cancel(request_ptr, MPIR_cc_is_complete(&request_ptr->cc)); if (mpi_errno) MPIR_ERR_POP(mpi_errno); @@ -159,7 +159,7 @@ messages). int MPI_Cancel(MPI_Request *request) { int mpi_errno = MPI_SUCCESS; - MPID_Request * request_ptr; + MPIR_Request * request_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPI_CANCEL); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -168,7 +168,7 @@ int MPI_Cancel(MPI_Request *request) MPID_MPI_PT2PT_FUNC_ENTER(MPID_STATE_MPI_CANCEL); /* Convert MPI object handles to object pointers */ - MPID_Request_get_ptr( *request, request_ptr ); + MPIR_Request_get_ptr( *request, request_ptr ); /* Validate parameters if error checking is enabled */ # ifdef HAVE_ERROR_CHECKING @@ -176,7 +176,7 @@ int MPI_Cancel(MPI_Request *request) MPID_BEGIN_ERROR_CHECKS; { /* Validate request_ptr */ - MPID_Request_valid_ptr( request_ptr, mpi_errno ); + MPIR_Request_valid_ptr( request_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; } MPID_END_ERROR_CHECKS; diff --git a/src/mpi/pt2pt/greq_complete.c b/src/mpi/pt2pt/greq_complete.c index 78382f8..7ab42ee 100644 --- a/src/mpi/pt2pt/greq_complete.c +++ b/src/mpi/pt2pt/greq_complete.c @@ -33,7 +33,7 @@ int MPI_Grequest_complete(MPI_Request request) __attribute__((weak,alias("PMPI_G #define FUNCNAME MPIR_Grequest_complete #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -void MPIR_Grequest_complete_impl(MPID_Request *request_ptr) +void MPIR_Grequest_complete_impl(MPIR_Request *request_ptr) { /* Set the request as completed. This does not change the reference count on the generalized request */ @@ -67,7 +67,7 @@ Input Parameters: int MPI_Grequest_complete( MPI_Request request ) { int mpi_errno = MPI_SUCCESS; - MPID_Request *request_ptr; + MPIR_Request *request_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPI_GREQUEST_COMPLETE); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -87,15 +87,15 @@ int MPI_Grequest_complete( MPI_Request request ) # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Request_get_ptr( request, request_ptr ); + MPIR_Request_get_ptr( request, request_ptr ); /* Validate parameters if error checking is enabled */ # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS; { - MPID_Request_valid_ptr(request_ptr,mpi_errno); - if (request_ptr && request_ptr->kind != MPID_UREQUEST) { + MPIR_Request_valid_ptr(request_ptr,mpi_errno); + if (request_ptr && request_ptr->kind != MPIR_UREQUEST) { mpi_errno = MPIR_Err_create_code( MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_ARG, "**notgenreq", 0 ); } diff --git a/src/mpi/pt2pt/greq_start.c b/src/mpi/pt2pt/greq_start.c index 551e0a9..d8876cb 100644 --- a/src/mpi/pt2pt/greq_start.c +++ b/src/mpi/pt2pt/greq_start.c @@ -77,7 +77,7 @@ PMPI_LOCAL int MPIR_Grequest_free_classes_on_finalize(void *extra_data ATTRIBUTE int MPIR_Grequest_start_impl(MPI_Grequest_query_function *query_fn, MPI_Grequest_free_function *free_fn, MPI_Grequest_cancel_function *cancel_fn, - void *extra_state, MPID_Request **request_ptr) + void *extra_state, MPIR_Request **request_ptr) { int mpi_errno = MPI_SUCCESS; MPIU_CHKPMEM_DECL(1); @@ -87,7 +87,7 @@ int MPIR_Grequest_start_impl(MPI_Grequest_query_function *query_fn, *request_ptr = MPID_Request_create(); MPIR_ERR_CHKANDJUMP1(request_ptr == NULL, mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", "generalized request"); - (*request_ptr)->kind = MPID_UREQUEST; + (*request_ptr)->kind = MPIR_UREQUEST; MPIU_Object_set_ref( *request_ptr, 1 ); (*request_ptr)->cc_ptr = &(*request_ptr)->cc; MPIR_cc_set((*request_ptr)->cc_ptr, 1); @@ -179,7 +179,7 @@ int MPI_Grequest_start( MPI_Grequest_query_function *query_fn, void *extra_state, MPI_Request *request ) { int mpi_errno = MPI_SUCCESS; - MPID_Request *request_ptr; + MPIR_Request *request_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPI_GREQUEST_START); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -352,7 +352,7 @@ int MPIX_Grequest_class_allocate(MPIX_Grequest_class greq_class, MPI_Request *request) { int mpi_errno; - MPID_Request *lrequest_ptr; + MPIR_Request *lrequest_ptr; MPIR_Grequest_class *class_ptr; *request = MPI_REQUEST_NULL; @@ -406,7 +406,7 @@ int MPIX_Grequest_start( MPI_Grequest_query_function *query_fn, void *extra_state, MPI_Request *request ) { int mpi_errno; - MPID_Request *lrequest_ptr; + MPIR_Request *lrequest_ptr; *request = MPI_REQUEST_NULL; mpi_errno = MPIX_Grequest_start_impl(query_fn, free_fn, cancel_fn, poll_fn, wait_fn, extra_state, &lrequest_ptr); @@ -430,7 +430,7 @@ int MPIX_Grequest_start_impl( MPI_Grequest_query_function *query_fn, MPI_Grequest_cancel_function *cancel_fn, MPIX_Grequest_poll_function *poll_fn, MPIX_Grequest_wait_function *wait_fn, - void *extra_state, MPID_Request **request ) + void *extra_state, MPIR_Request **request ) { int mpi_errno; diff --git a/src/mpi/pt2pt/ibsend.c b/src/mpi/pt2pt/ibsend.c index d9bc9e7..680aa33 100644 --- a/src/mpi/pt2pt/ibsend.c +++ b/src/mpi/pt2pt/ibsend.c @@ -22,7 +22,7 @@ int MPI_Ibsend(const void *buf, int count, MPI_Datatype datatype, int dest, int /* -- End Profiling Symbol Block */ typedef struct { - MPID_Request *req; + MPIR_Request *req; int cancelled; } ibsend_req_info; @@ -59,7 +59,7 @@ PMPI_LOCAL int MPIR_Ibsend_cancel( void *extra, int complete ) int mpi_errno = MPI_SUCCESS; ibsend_req_info *ibsend_info = (ibsend_req_info *)extra; MPI_Status status; - MPID_Request *req = ibsend_info->req; + MPIR_Request *req = ibsend_info->req; MPI_Request req_hdl = req->handle; /* FIXME: There should be no unreferenced args! */ @@ -96,7 +96,7 @@ int MPIR_Ibsend_impl(const void *buf, int count, MPI_Datatype datatype, int dest MPIR_Comm *comm_ptr, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; - MPID_Request *request_ptr, *new_request_ptr; + MPIR_Request *request_ptr, *new_request_ptr; ibsend_req_info *ibinfo=0; /* We don't try tbsend in for MPI_Ibsend because we must create a diff --git a/src/mpi/pt2pt/improbe.c b/src/mpi/pt2pt/improbe.c index dd4a307..5d0320d 100644 --- a/src/mpi/pt2pt/improbe.c +++ b/src/mpi/pt2pt/improbe.c @@ -55,7 +55,7 @@ Output Parameters: int MPI_Improbe(int source, int tag, MPI_Comm comm, int *flag, MPI_Message *message, MPI_Status *status) { int mpi_errno = MPI_SUCCESS; - MPID_Request *msgp = NULL; + MPIR_Request *msgp = NULL; MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_IMPROBE); diff --git a/src/mpi/pt2pt/imrecv.c b/src/mpi/pt2pt/imrecv.c index c208e14..f82f62e 100644 --- a/src/mpi/pt2pt/imrecv.c +++ b/src/mpi/pt2pt/imrecv.c @@ -56,8 +56,8 @@ Output Parameters: int MPI_Imrecv(void *buf, int count, MPI_Datatype datatype, MPI_Message *message, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; - MPID_Request *rreq = NULL; - MPID_Request *msgp = NULL; + MPIR_Request *rreq = NULL; + MPIR_Request *msgp = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_IMRECV); MPID_THREAD_CS_ENTER(GLOBAL, MPIR_THREAD_GLOBAL_ALLFUNC_MUTEX); @@ -77,7 +77,7 @@ int MPI_Imrecv(void *buf, int count, MPI_Datatype datatype, MPI_Message *message # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Request_get_ptr(*message, msgp); + MPIR_Request_get_ptr(*message, msgp); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -95,7 +95,7 @@ int MPI_Imrecv(void *buf, int count, MPI_Datatype datatype, MPI_Message *message /* MPI_MESSAGE_NO_PROC should yield a "proc null" status */ if (*message != MPI_MESSAGE_NO_PROC) { - MPID_Request_valid_ptr(msgp, mpi_errno); + MPIR_Request_valid_ptr(msgp, mpi_errno); if (mpi_errno) MPIR_ERR_POP(mpi_errno); MPIR_ERR_CHKANDJUMP((msgp->kind != MPIR_REQUEST_MPROBE), mpi_errno, MPI_ERR_ARG, "**reqnotmsg"); diff --git a/src/mpi/pt2pt/irecv.c b/src/mpi/pt2pt/irecv.c index 3bea42f..8f89f4c 100644 --- a/src/mpi/pt2pt/irecv.c +++ b/src/mpi/pt2pt/irecv.c @@ -64,7 +64,7 @@ int MPI_Irecv(void *buf, int count, MPI_Datatype datatype, int source, static const char FCNAME[] = "MPI_Irecv"; int mpi_errno = MPI_SUCCESS; MPIR_Comm *comm_ptr = NULL; - MPID_Request *request_ptr = NULL; + MPIR_Request *request_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_IRECV); MPIR_ERRTEST_INITIALIZED_ORDIE(); diff --git a/src/mpi/pt2pt/irsend.c b/src/mpi/pt2pt/irsend.c index 74a7e48..14291ed 100644 --- a/src/mpi/pt2pt/irsend.c +++ b/src/mpi/pt2pt/irsend.c @@ -65,7 +65,7 @@ int MPI_Irsend(const void *buf, int count, MPI_Datatype datatype, int dest, int static const char FCNAME[] = "MPI_Irsend"; int mpi_errno = MPI_SUCCESS; MPIR_Comm *comm_ptr = NULL; - MPID_Request *request_ptr = NULL; + MPIR_Request *request_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_IRSEND); MPIR_ERRTEST_INITIALIZED_ORDIE(); diff --git a/src/mpi/pt2pt/isend.c b/src/mpi/pt2pt/isend.c index c4e8eb4..6622e11 100644 --- a/src/mpi/pt2pt/isend.c +++ b/src/mpi/pt2pt/isend.c @@ -63,7 +63,7 @@ int MPI_Isend(const void *buf, int count, MPI_Datatype datatype, int dest, int t { int mpi_errno = MPI_SUCCESS; MPIR_Comm *comm_ptr = NULL; - MPID_Request *request_ptr = NULL; + MPIR_Request *request_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_ISEND); MPIR_ERRTEST_INITIALIZED_ORDIE(); diff --git a/src/mpi/pt2pt/issend.c b/src/mpi/pt2pt/issend.c index 48b2192..4206cf4 100644 --- a/src/mpi/pt2pt/issend.c +++ b/src/mpi/pt2pt/issend.c @@ -64,7 +64,7 @@ int MPI_Issend(const void *buf, int count, MPI_Datatype datatype, int dest, int static const char FCNAME[] = "MPI_Issend"; int mpi_errno = MPI_SUCCESS; MPIR_Comm *comm_ptr = NULL; - MPID_Request *request_ptr = NULL; + MPIR_Request *request_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_ISSEND); MPIR_ERRTEST_INITIALIZED_ORDIE(); diff --git a/src/mpi/pt2pt/mpir_request.c b/src/mpi/pt2pt/mpir_request.c index 2e83ce6..97f066a 100644 --- a/src/mpi/pt2pt/mpir_request.c +++ b/src/mpi/pt2pt/mpir_request.c @@ -9,6 +9,11 @@ /* style:PMPIuse:PMPI_Status_f2c:2 sig:0 */ +MPIR_Request MPIR_Request_direct[MPIR_REQUEST_PREALLOC] = {{0}}; +MPIU_Object_alloc_t MPIR_Request_mem = { + 0, 0, 0, 0, MPIR_REQUEST, sizeof(MPIR_Request), MPIR_Request_direct, + MPIR_REQUEST_PREALLOC }; + #undef FUNCNAME #define FUNCNAME MPIR_Progress_wait_request #undef FCNAME @@ -19,16 +24,16 @@ A helper routine that implements the very common case of running the progress engine until the given request is complete. @*/ -int MPIR_Progress_wait_request(MPID_Request *req) +int MPIR_Progress_wait_request(MPIR_Request *req) { int mpi_errno = MPI_SUCCESS; - if (!MPID_Request_is_complete(req)) + if (!MPIR_Request_is_complete(req)) { MPID_Progress_state progress_state; MPID_Progress_start(&progress_state); - while (!MPID_Request_is_complete(req)) + while (!MPIR_Request_is_complete(req)) { mpi_errno = MPID_Progress_wait(&progress_state); if (mpi_errno != MPI_SUCCESS) @@ -60,7 +65,7 @@ fn_exit: call the routine MPIR_Sendq_forget; otherwise that macro will be a no-op. The implementation of the MPIR_Sendq_xxx is in src/mpi/debugger/dbginit.c . */ -int MPIR_Request_complete(MPI_Request * request, MPID_Request * request_ptr, +int MPIR_Request_complete(MPI_Request * request, MPIR_Request * request_ptr, MPI_Status * status, int * active) { int mpi_errno = MPI_SUCCESS; @@ -89,18 +94,18 @@ int MPIR_Request_complete(MPI_Request * request, MPID_Request * request_ptr, break; } - case MPID_PREQUEST_SEND: + case MPIR_PREQUEST_SEND: { if (request_ptr->partner_request != NULL) { - MPID_Request * prequest_ptr = request_ptr->partner_request; + MPIR_Request * prequest_ptr = request_ptr->partner_request; /* reset persistent request to inactive state */ MPIR_cc_set(&request_ptr->cc, 0); request_ptr->cc_ptr = &request_ptr->cc; request_ptr->partner_request = NULL; - if (prequest_ptr->kind != MPID_UREQUEST) + if (prequest_ptr->kind != MPIR_UREQUEST) { if (status != MPI_STATUS_IGNORE) { @@ -157,11 +162,11 @@ int MPIR_Request_complete(MPI_Request * request, MPID_Request * request_ptr, break; } - case MPID_PREQUEST_RECV: + case MPIR_PREQUEST_RECV: { if (request_ptr->partner_request != NULL) { - MPID_Request * prequest_ptr = request_ptr->partner_request; + MPIR_Request * prequest_ptr = request_ptr->partner_request; /* reset persistent request to inactive state */ MPIR_cc_set(&request_ptr->cc, 0); @@ -193,7 +198,7 @@ int MPIR_Request_complete(MPI_Request * request, MPID_Request * request_ptr, break; } - case MPID_UREQUEST: + case MPIR_UREQUEST: { int rc; @@ -215,8 +220,8 @@ int MPIR_Request_complete(MPI_Request * request, MPID_Request * request_ptr, break; } - case MPID_COLL_REQUEST: - case MPID_WIN_REQUEST: + case MPIR_COLL_REQUEST: + case MPIR_WIN_REQUEST: { mpi_errno = request_ptr->status.MPI_ERROR; MPIR_Request_extract_status(request_ptr, status); @@ -249,7 +254,7 @@ int MPIR_Request_complete(MPI_Request * request, MPID_Request * request_ptr, * [BRT] it is used by testall, although looking at testall now, I think the * algorithm can be change slightly and eliminate the need for this routine */ -int MPIR_Request_get_error(MPID_Request * request_ptr) +int MPIR_Request_get_error(MPIR_Request * request_ptr) { int mpi_errno = MPI_SUCCESS; @@ -257,17 +262,17 @@ int MPIR_Request_get_error(MPID_Request * request_ptr) { case MPIR_REQUEST_SEND: case MPIR_REQUEST_RECV: - case MPID_COLL_REQUEST: + case MPIR_COLL_REQUEST: { mpi_errno = request_ptr->status.MPI_ERROR; break; } - case MPID_PREQUEST_SEND: + case MPIR_PREQUEST_SEND: { if (request_ptr->partner_request != NULL) { - if (request_ptr->partner_request->kind == MPID_UREQUEST) + if (request_ptr->partner_request->kind == MPIR_UREQUEST) { /* This is needed for persistent Bsend requests */ mpi_errno = MPIR_Grequest_query( @@ -286,7 +291,7 @@ int MPIR_Request_get_error(MPID_Request * request_ptr) break; } - case MPID_PREQUEST_RECV: + case MPIR_PREQUEST_RECV: { if (request_ptr->partner_request != NULL) { @@ -300,7 +305,7 @@ int MPIR_Request_get_error(MPID_Request * request_ptr) break; } - case MPID_UREQUEST: + case MPIR_UREQUEST: { int rc; @@ -369,9 +374,9 @@ int MPIR_Request_get_error(MPID_Request * request_ptr) /* Set the language type to Fortran for this (generalized) request */ void MPIR_Grequest_set_lang_f77( MPI_Request greq ) { - MPID_Request *greq_ptr; + MPIR_Request *greq_ptr; - MPID_Request_get_ptr( greq, greq_ptr ); + MPIR_Request_get_ptr( greq, greq_ptr ); greq_ptr->greq_fns->greq_lang = MPIR_LANG_FORTRAN; } @@ -382,7 +387,7 @@ void MPIR_Grequest_set_lang_f77( MPI_Request greq ) #define FUNCNAME MPIR_Grequest_cancel #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Grequest_cancel(MPID_Request * request_ptr, int complete) +int MPIR_Grequest_cancel(MPIR_Request * request_ptr, int complete) { int rc; int mpi_errno = MPI_SUCCESS; @@ -433,7 +438,7 @@ int MPIR_Grequest_cancel(MPID_Request * request_ptr, int complete) #define FUNCNAME MPIR_Grequest_query #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Grequest_query(MPID_Request * request_ptr) +int MPIR_Grequest_query(MPIR_Request * request_ptr) { int rc; int mpi_errno = MPI_SUCCESS; @@ -484,7 +489,7 @@ int MPIR_Grequest_query(MPID_Request * request_ptr) #define FUNCNAME MPIR_Grequest_free #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Grequest_free(MPID_Request * request_ptr) +int MPIR_Grequest_free(MPIR_Request * request_ptr) { int rc; int mpi_errno = MPI_SUCCESS; @@ -537,7 +542,7 @@ int MPIR_Grequest_free(MPID_Request * request_ptr) #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Grequest_progress_poke(int count, - MPID_Request **request_ptrs, + MPIR_Request **request_ptrs, MPI_Status array_of_statuses[] ) { MPIX_Grequest_wait_function *wait_fn = NULL; @@ -553,8 +558,8 @@ int MPIR_Grequest_progress_poke(int count, * request classes those grequests are members of */ for (i=0, j=0, n_classes=1, n_native=0, n_greq=0; i< count; i++) { - if (request_ptrs[i] == NULL || MPID_Request_is_complete(request_ptrs[i])) continue; - if (request_ptrs[i]->kind == MPID_UREQUEST) + if (request_ptrs[i] == NULL || MPIR_Request_is_complete(request_ptrs[i])) continue; + if (request_ptrs[i]->kind == MPIR_UREQUEST) { n_greq += 1; wait_fn = request_ptrs[i]->greq_fns->wait_fn; @@ -577,8 +582,8 @@ int MPIR_Grequest_progress_poke(int count, for (i = 0; i< count; i++ ) { if (request_ptrs[i] != NULL && - request_ptrs[i]->kind == MPID_UREQUEST && - !MPID_Request_is_complete(request_ptrs[i]) && + request_ptrs[i]->kind == MPIR_UREQUEST && + !MPIR_Request_is_complete(request_ptrs[i]) && request_ptrs[i]->greq_fns->poll_fn != NULL) { mpi_errno = (request_ptrs[i]->greq_fns->poll_fn)(request_ptrs[i]->greq_fns->grequest_extra_state, &(array_of_statuses[i])); @@ -600,7 +605,7 @@ fn_fail: #define FUNCNAME MPIR_Grequest_waitall #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Grequest_waitall(int count, MPID_Request * const * request_ptrs) +int MPIR_Grequest_waitall(int count, MPIR_Request * const * request_ptrs) { void ** state_ptrs; int i; @@ -630,7 +635,7 @@ int MPIR_Grequest_waitall(int count, MPID_Request * const * request_ptrs) for (i = 0; i < count; ++i) { /* skip over requests we're not interested in */ - if (request_ptrs[i] == NULL || *request_ptrs[i]->cc_ptr == 0 || request_ptrs[i]->kind != MPID_UREQUEST) + if (request_ptrs[i] == NULL || *request_ptrs[i]->cc_ptr == 0 || request_ptrs[i]->kind != MPIR_UREQUEST) continue; if (n_greq == 0 || request_ptrs[i]->greq_fns->greq_class == curr_class) @@ -668,8 +673,8 @@ int MPIR_Grequest_waitall(int count, MPID_Request * const * request_ptrs) { /* skip over requests we're not interested in */ if (request_ptrs[i] == NULL || - MPID_Request_is_complete(request_ptrs[i]) || - request_ptrs[i]->kind != MPID_UREQUEST || + MPIR_Request_is_complete(request_ptrs[i]) || + request_ptrs[i]->kind != MPIR_UREQUEST || request_ptrs[i]->greq_fns->wait_fn == NULL) { continue; @@ -677,15 +682,15 @@ int MPIR_Grequest_waitall(int count, MPID_Request * const * request_ptrs) mpi_error = (request_ptrs[i]->greq_fns->wait_fn)(1, &request_ptrs[i]->greq_fns->grequest_extra_state, 0, NULL); if (mpi_error) MPIR_ERR_POP(mpi_error); - MPIU_Assert(MPID_Request_is_complete(request_ptrs[i])); + MPIU_Assert(MPIR_Request_is_complete(request_ptrs[i])); } MPID_Progress_start(&progress_state); for (i = 0; i < count; ++i) { if (request_ptrs[i] == NULL || - MPID_Request_is_complete(request_ptrs[i]) || - request_ptrs[i]->kind != MPID_UREQUEST) + MPIR_Request_is_complete(request_ptrs[i]) || + request_ptrs[i]->kind != MPIR_UREQUEST) { continue; } @@ -695,7 +700,7 @@ int MPIR_Grequest_waitall(int count, MPID_Request * const * request_ptrs) other thread, we'll make progress on regular requests too. The progress engine should permit the other thread to run at some point. */ - while (!MPID_Request_is_complete(request_ptrs[i])) + while (!MPIR_Request_is_complete(request_ptrs[i])) { mpi_error = MPID_Progress_wait(&progress_state); if (mpi_error != MPI_SUCCESS) diff --git a/src/mpi/pt2pt/mprobe.c b/src/mpi/pt2pt/mprobe.c index 9395f76..6765dc5 100644 --- a/src/mpi/pt2pt/mprobe.c +++ b/src/mpi/pt2pt/mprobe.c @@ -53,7 +53,7 @@ Output Parameters: int MPI_Mprobe(int source, int tag, MPI_Comm comm, MPI_Message *message, MPI_Status *status) { int mpi_errno = MPI_SUCCESS; - MPID_Request *msgp = NULL; + MPIR_Request *msgp = NULL; MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_MPROBE); diff --git a/src/mpi/pt2pt/mrecv.c b/src/mpi/pt2pt/mrecv.c index cc8ff49..a1d7b8c 100644 --- a/src/mpi/pt2pt/mrecv.c +++ b/src/mpi/pt2pt/mrecv.c @@ -56,7 +56,7 @@ Output Parameters: int MPI_Mrecv(void *buf, int count, MPI_Datatype datatype, MPI_Message *message, MPI_Status *status) { int mpi_errno = MPI_SUCCESS; - MPID_Request *msgp = NULL; + MPIR_Request *msgp = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_MRECV); MPID_THREAD_CS_ENTER(GLOBAL, MPIR_THREAD_GLOBAL_ALLFUNC_MUTEX); @@ -76,7 +76,7 @@ int MPI_Mrecv(void *buf, int count, MPI_Datatype datatype, MPI_Message *message, # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Request_get_ptr(*message, msgp); + MPIR_Request_get_ptr(*message, msgp); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -94,7 +94,7 @@ int MPI_Mrecv(void *buf, int count, MPI_Datatype datatype, MPI_Message *message, /* MPI_MESSAGE_NO_PROC should yield a "proc null" status */ if (*message != MPI_MESSAGE_NO_PROC) { - MPID_Request_valid_ptr(msgp, mpi_errno); + MPIR_Request_valid_ptr(msgp, mpi_errno); if (mpi_errno) MPIR_ERR_POP(mpi_errno); MPIR_ERR_CHKANDJUMP((msgp->kind != MPIR_REQUEST_MPROBE), mpi_errno, MPI_ERR_ARG, "**reqnotmsg"); diff --git a/src/mpi/pt2pt/recv.c b/src/mpi/pt2pt/recv.c index 074b3f1..04d50d7 100644 --- a/src/mpi/pt2pt/recv.c +++ b/src/mpi/pt2pt/recv.c @@ -70,7 +70,7 @@ int MPI_Recv(void *buf, int count, MPI_Datatype datatype, int source, int tag, static const char FCNAME[] = "MPI_Recv"; int mpi_errno = MPI_SUCCESS; MPIR_Comm *comm_ptr = NULL; - MPID_Request * request_ptr = NULL; + MPIR_Request * request_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_RECV); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -145,12 +145,12 @@ int MPI_Recv(void *buf, int count, MPI_Datatype datatype, int source, int tag, /* If a request was returned, then we need to block until the request is complete */ - if (!MPID_Request_is_complete(request_ptr)) + if (!MPIR_Request_is_complete(request_ptr)) { MPID_Progress_state progress_state; MPID_Progress_start(&progress_state); - while (!MPID_Request_is_complete(request_ptr)) + while (!MPIR_Request_is_complete(request_ptr)) { /* MT: Progress_wait may release the SINGLE_CS while it waits */ @@ -164,7 +164,7 @@ int MPI_Recv(void *buf, int count, MPI_Datatype datatype, int source, int tag, } if (unlikely(MPIR_CVAR_ENABLE_FT && - !MPID_Request_is_complete(request_ptr) && + !MPIR_Request_is_complete(request_ptr) && MPID_Request_is_anysource(request_ptr) && !MPID_Comm_AS_enabled(request_ptr->comm))) { /* --BEGIN ERROR HANDLING-- */ diff --git a/src/mpi/pt2pt/recv_init.c b/src/mpi/pt2pt/recv_init.c index a82475a..0981c29 100644 --- a/src/mpi/pt2pt/recv_init.c +++ b/src/mpi/pt2pt/recv_init.c @@ -66,7 +66,7 @@ int MPI_Recv_init(void *buf, int count, MPI_Datatype datatype, int source, static const char FCNAME[] = "MPI_Recv_init"; int mpi_errno = MPI_SUCCESS; MPIR_Comm *comm_ptr = NULL; - MPID_Request *request_ptr = NULL; + MPIR_Request *request_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_RECV_INIT); MPIR_ERRTEST_INITIALIZED_ORDIE(); diff --git a/src/mpi/pt2pt/request_free.c b/src/mpi/pt2pt/request_free.c index 5d7682c..8f91575 100644 --- a/src/mpi/pt2pt/request_free.c +++ b/src/mpi/pt2pt/request_free.c @@ -67,7 +67,7 @@ int MPI_Request_free(MPI_Request *request) { static const char FCNAME[] = "MPI_Request_free"; int mpi_errno = MPI_SUCCESS; - MPID_Request *request_ptr = NULL; + MPIR_Request *request_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_REQUEST_FREE); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -88,7 +88,7 @@ int MPI_Request_free(MPI_Request *request) # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Request_get_ptr( *request, request_ptr ); + MPIR_Request_get_ptr( *request, request_ptr ); /* Validate object pointers if error checking is enabled */ # ifdef HAVE_ERROR_CHECKING @@ -96,7 +96,7 @@ int MPI_Request_free(MPI_Request *request) MPID_BEGIN_ERROR_CHECKS; { /* Validate request_ptr */ - MPID_Request_valid_ptr( request_ptr, mpi_errno ); + MPIR_Request_valid_ptr( request_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; } MPID_END_ERROR_CHECKS; @@ -119,13 +119,13 @@ int MPI_Request_free(MPI_Request *request) break; } - case MPID_PREQUEST_SEND: + case MPIR_PREQUEST_SEND: { /* If this is an active persistent request, we must also release the partner request. */ if (request_ptr->partner_request != NULL) { - if (request_ptr->partner_request->kind == MPID_UREQUEST) + if (request_ptr->partner_request->kind == MPIR_UREQUEST) { /* This is needed for persistent Bsend requests */ mpi_errno = MPIR_Grequest_free( @@ -137,7 +137,7 @@ int MPI_Request_free(MPI_Request *request) } - case MPID_PREQUEST_RECV: + case MPIR_PREQUEST_RECV: { /* If this is an active persistent request, we must also release the partner request. */ @@ -148,7 +148,7 @@ int MPI_Request_free(MPI_Request *request) break; } - case MPID_UREQUEST: + case MPIR_UREQUEST: { mpi_errno = MPIR_Grequest_free(request_ptr); break; diff --git a/src/mpi/pt2pt/request_get_status.c b/src/mpi/pt2pt/request_get_status.c index b647abf..7af680a 100644 --- a/src/mpi/pt2pt/request_get_status.c +++ b/src/mpi/pt2pt/request_get_status.c @@ -57,7 +57,7 @@ int MPI_Request_get_status(MPI_Request request, int *flag, MPI_Status *status) { static const char FCNAME[] = "MPI_Request_get_status"; int mpi_errno = MPI_SUCCESS; - MPID_Request *request_ptr = NULL; + MPIR_Request *request_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_REQUEST_GET_STATUS); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -90,7 +90,7 @@ int MPI_Request_get_status(MPI_Request request, int *flag, MPI_Status *status) } /* Convert MPI object handles to object pointers */ - MPID_Request_get_ptr( request, request_ptr ); + MPIR_Request_get_ptr( request, request_ptr ); /* Validate parameters if error checking is enabled */ # ifdef HAVE_ERROR_CHECKING @@ -98,7 +98,7 @@ int MPI_Request_get_status(MPI_Request request, int *flag, MPI_Status *status) MPID_BEGIN_ERROR_CHECKS; { /* Validate request_ptr */ - MPID_Request_valid_ptr( request_ptr, mpi_errno ); + MPIR_Request_valid_ptr( request_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; } MPID_END_ERROR_CHECKS; @@ -107,13 +107,13 @@ int MPI_Request_get_status(MPI_Request request, int *flag, MPI_Status *status) /* ... body of routine ... */ - if (!MPID_Request_is_complete(request_ptr)) { + if (!MPIR_Request_is_complete(request_ptr)) { /* request not complete. poke the progress engine. Req #3130 */ mpi_errno = MPID_Progress_test(); if (mpi_errno != MPI_SUCCESS) goto fn_fail; } - if (MPID_Request_is_complete(request_ptr)) + if (MPIR_Request_is_complete(request_ptr)) { switch(request_ptr->kind) { @@ -134,13 +134,13 @@ int MPI_Request_get_status(MPI_Request request, int *flag, MPI_Status *status) break; } - case MPID_PREQUEST_SEND: + case MPIR_PREQUEST_SEND: { - MPID_Request * prequest_ptr = request_ptr->partner_request; + MPIR_Request * prequest_ptr = request_ptr->partner_request; if (prequest_ptr != NULL) { - if (prequest_ptr->kind != MPID_UREQUEST) + if (prequest_ptr->kind != MPIR_UREQUEST) { if (status != MPI_STATUS_IGNORE) { @@ -189,9 +189,9 @@ int MPI_Request_get_status(MPI_Request request, int *flag, MPI_Status *status) break; } - case MPID_PREQUEST_RECV: + case MPIR_PREQUEST_RECV: { - MPID_Request * prequest_ptr = request_ptr->partner_request; + MPIR_Request * prequest_ptr = request_ptr->partner_request; if (prequest_ptr != NULL) { @@ -209,7 +209,7 @@ int MPI_Request_get_status(MPI_Request request, int *flag, MPI_Status *status) break; } - case MPID_UREQUEST: + case MPIR_UREQUEST: { int rc; diff --git a/src/mpi/pt2pt/rsend.c b/src/mpi/pt2pt/rsend.c index 59341c3..4ac0800 100644 --- a/src/mpi/pt2pt/rsend.c +++ b/src/mpi/pt2pt/rsend.c @@ -61,7 +61,7 @@ int MPI_Rsend(const void *buf, int count, MPI_Datatype datatype, int dest, int t static const char FCNAME[] = "MPI_Rsend"; int mpi_errno = MPI_SUCCESS; MPIR_Comm *comm_ptr = NULL; - MPID_Request * request_ptr = NULL; + MPIR_Request * request_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_RSEND); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -130,12 +130,12 @@ int MPI_Rsend(const void *buf, int count, MPI_Datatype datatype, int dest, int t /* If a request was returned, then we need to block until the request is complete */ - if (!MPID_Request_is_complete(request_ptr)) + if (!MPIR_Request_is_complete(request_ptr)) { MPID_Progress_state progress_state; MPID_Progress_start(&progress_state); - while (!MPID_Request_is_complete(request_ptr)) + while (!MPIR_Request_is_complete(request_ptr)) { mpi_errno = MPID_Progress_wait(&progress_state); if (mpi_errno != MPI_SUCCESS) diff --git a/src/mpi/pt2pt/rsend_init.c b/src/mpi/pt2pt/rsend_init.c index faca25b..f05aba4 100644 --- a/src/mpi/pt2pt/rsend_init.c +++ b/src/mpi/pt2pt/rsend_init.c @@ -66,7 +66,7 @@ int MPI_Rsend_init(const void *buf, int count, MPI_Datatype datatype, int dest, static const char FCNAME[] = "MPI_Rsend_init"; int mpi_errno = MPI_SUCCESS; MPIR_Comm *comm_ptr = NULL; - MPID_Request *request_ptr = NULL; + MPIR_Request *request_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_RSEND_INIT); MPIR_ERRTEST_INITIALIZED_ORDIE(); diff --git a/src/mpi/pt2pt/send.c b/src/mpi/pt2pt/send.c index ffad786..cecc6dc 100644 --- a/src/mpi/pt2pt/send.c +++ b/src/mpi/pt2pt/send.c @@ -66,7 +66,7 @@ int MPI_Send(const void *buf, int count, MPI_Datatype datatype, int dest, int ta static const char FCNAME[] = "MPI_Send"; int mpi_errno = MPI_SUCCESS; MPIR_Comm *comm_ptr = NULL; - MPID_Request * request_ptr = NULL; + MPIR_Request * request_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_SEND); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -135,12 +135,12 @@ int MPI_Send(const void *buf, int count, MPI_Datatype datatype, int dest, int ta /* If a request was returned, then we need to block until the request is complete */ - if (!MPID_Request_is_complete(request_ptr)) + if (!MPIR_Request_is_complete(request_ptr)) { MPID_Progress_state progress_state; MPID_Progress_start(&progress_state); - while (!MPID_Request_is_complete(request_ptr)) + while (!MPIR_Request_is_complete(request_ptr)) { mpi_errno = MPID_Progress_wait(&progress_state); if (mpi_errno != MPI_SUCCESS) diff --git a/src/mpi/pt2pt/send_init.c b/src/mpi/pt2pt/send_init.c index 0b16f3e..d186ca2 100644 --- a/src/mpi/pt2pt/send_init.c +++ b/src/mpi/pt2pt/send_init.c @@ -66,7 +66,7 @@ int MPI_Send_init(const void *buf, int count, MPI_Datatype datatype, int dest, static const char FCNAME[] = "MPI_Send_init"; int mpi_errno = MPI_SUCCESS; MPIR_Comm *comm_ptr = NULL; - MPID_Request *request_ptr = NULL; + MPIR_Request *request_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_SEND_INIT); MPIR_ERRTEST_INITIALIZED_ORDIE(); diff --git a/src/mpi/pt2pt/sendrecv.c b/src/mpi/pt2pt/sendrecv.c index 7f938d3..f5005d3 100644 --- a/src/mpi/pt2pt/sendrecv.c +++ b/src/mpi/pt2pt/sendrecv.c @@ -76,8 +76,8 @@ int MPI_Sendrecv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, static const char FCNAME[] = "MPI_Sendrecv"; int mpi_errno = MPI_SUCCESS; MPIR_Comm *comm_ptr = NULL; - MPID_Request * sreq; - MPID_Request * rreq; + MPIR_Request * sreq; + MPIR_Request * rreq; MPID_MPI_STATE_DECL(MPID_STATE_MPI_SENDRECV); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -174,12 +174,12 @@ int MPI_Sendrecv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, /* --END ERROR HANDLING-- */ } - if (!MPID_Request_is_complete(sreq) || !MPID_Request_is_complete(rreq)) + if (!MPIR_Request_is_complete(sreq) || !MPIR_Request_is_complete(rreq)) { MPID_Progress_state progress_state; MPID_Progress_start(&progress_state); - while (!MPID_Request_is_complete(sreq) || !MPID_Request_is_complete(rreq)) + while (!MPIR_Request_is_complete(sreq) || !MPIR_Request_is_complete(rreq)) { mpi_errno = MPID_Progress_wait(&progress_state); if (mpi_errno != MPI_SUCCESS) @@ -191,7 +191,7 @@ int MPI_Sendrecv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, } if (unlikely(MPIR_CVAR_ENABLE_FT && - !MPID_Request_is_complete(rreq) && + !MPIR_Request_is_complete(rreq) && MPID_Request_is_anysource(rreq) && !MPID_Comm_AS_enabled(rreq->comm))) { /* --BEGIN ERROR HANDLING-- */ @@ -199,7 +199,7 @@ int MPI_Sendrecv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPIR_STATUS_SET_CANCEL_BIT(rreq->status, FALSE); MPIR_ERR_SET(rreq->status.MPI_ERROR, MPIX_ERR_PROC_FAILED, "**proc_failed"); mpi_errno = rreq->status.MPI_ERROR; - if (!MPID_Request_is_complete(sreq)) { + if (!MPIR_Request_is_complete(sreq)) { MPID_Cancel_send(sreq); MPIR_STATUS_SET_CANCEL_BIT(sreq->status, FALSE); } diff --git a/src/mpi/pt2pt/sendrecv_rep.c b/src/mpi/pt2pt/sendrecv_rep.c index ba013ec..aaa521b 100644 --- a/src/mpi/pt2pt/sendrecv_rep.c +++ b/src/mpi/pt2pt/sendrecv_rep.c @@ -141,8 +141,8 @@ int MPI_Sendrecv_replace(void *buf, int count, MPI_Datatype datatype, } # else { - MPID_Request * sreq; - MPID_Request * rreq; + MPIR_Request * sreq; + MPIR_Request * rreq; void * tmpbuf = NULL; MPI_Aint tmpbuf_size = 0; MPI_Aint tmpbuf_count = 0; @@ -173,12 +173,12 @@ int MPI_Sendrecv_replace(void *buf, int count, MPI_Datatype datatype, /* --END ERROR HANDLING-- */ } - if (!MPID_Request_is_complete(sreq) || !MPID_Request_is_complete(rreq)) + if (!MPIR_Request_is_complete(sreq) || !MPIR_Request_is_complete(rreq)) { MPID_Progress_state progress_state; MPID_Progress_start(&progress_state); - while (!MPID_Request_is_complete(sreq) || !MPID_Request_is_complete(rreq)) + while (!MPIR_Request_is_complete(sreq) || !MPIR_Request_is_complete(rreq)) { mpi_errno = MPID_Progress_wait(&progress_state); if (mpi_errno != MPI_SUCCESS) diff --git a/src/mpi/pt2pt/ssend.c b/src/mpi/pt2pt/ssend.c index 115f9a2..486614f 100644 --- a/src/mpi/pt2pt/ssend.c +++ b/src/mpi/pt2pt/ssend.c @@ -60,7 +60,7 @@ int MPI_Ssend(const void *buf, int count, MPI_Datatype datatype, int dest, int t static const char FCNAME[] = "MPI_Ssend"; int mpi_errno = MPI_SUCCESS; MPIR_Comm *comm_ptr = NULL; - MPID_Request * request_ptr = NULL; + MPIR_Request * request_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_SSEND); MPIR_ERRTEST_INITIALIZED_ORDIE(); diff --git a/src/mpi/pt2pt/ssend_init.c b/src/mpi/pt2pt/ssend_init.c index 0b1fab0..bc5a584 100644 --- a/src/mpi/pt2pt/ssend_init.c +++ b/src/mpi/pt2pt/ssend_init.c @@ -63,7 +63,7 @@ int MPI_Ssend_init(const void *buf, int count, MPI_Datatype datatype, int dest, static const char FCNAME[] = "MPI_Ssend_init"; int mpi_errno = MPI_SUCCESS; MPIR_Comm *comm_ptr = NULL; - MPID_Request *request_ptr = NULL; + MPIR_Request *request_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_SSEND_INIT); MPIR_ERRTEST_INITIALIZED_ORDIE(); diff --git a/src/mpi/pt2pt/start.c b/src/mpi/pt2pt/start.c index 975fff2..0ffb5c8 100644 --- a/src/mpi/pt2pt/start.c +++ b/src/mpi/pt2pt/start.c @@ -48,7 +48,7 @@ Input Parameters: int MPI_Start(MPI_Request *request) { static const char FCNAME[] = "MPI_Start"; - MPID_Request * request_ptr = NULL; + MPIR_Request * request_ptr = NULL; int mpi_errno = MPI_SUCCESS; MPID_MPI_STATE_DECL(MPID_STATE_MPI_START); @@ -70,14 +70,14 @@ int MPI_Start(MPI_Request *request) # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI request handle to a request object pointer */ - MPID_Request_get_ptr( *request, request_ptr ); + MPIR_Request_get_ptr( *request, request_ptr ); /* Validate object pointers if error checking is enabled */ # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS; { - MPID_Request_valid_ptr( request_ptr, mpi_errno ); + MPIR_Request_valid_ptr( request_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; MPIR_ERRTEST_PERSISTENT(request_ptr, mpi_errno); MPIR_ERRTEST_PERSISTENT_ACTIVE(request_ptr, mpi_errno); diff --git a/src/mpi/pt2pt/startall.c b/src/mpi/pt2pt/startall.c index fcf08ec..f970885 100644 --- a/src/mpi/pt2pt/startall.c +++ b/src/mpi/pt2pt/startall.c @@ -61,8 +61,8 @@ Input Parameters: int MPI_Startall(int count, MPI_Request array_of_requests[]) { static const char FCNAME[] = "MPI_Startall"; - MPID_Request * request_ptr_array[MPIR_REQUEST_PTR_ARRAY_SIZE]; - MPID_Request ** request_ptrs = request_ptr_array; + MPIR_Request * request_ptr_array[MPIR_REQUEST_PTR_ARRAY_SIZE]; + MPIR_Request ** request_ptrs = request_ptr_array; int i; int mpi_errno = MPI_SUCCESS; MPIU_CHKLMEM_DECL(1); @@ -92,12 +92,12 @@ int MPI_Startall(int count, MPI_Request array_of_requests[]) /* Convert MPI request handles to a request object pointers */ if (count > MPIR_REQUEST_PTR_ARRAY_SIZE) { - MPIU_CHKLMEM_MALLOC_ORJUMP(request_ptrs, MPID_Request **, count * sizeof(MPID_Request *), mpi_errno, "request pointers"); + MPIU_CHKLMEM_MALLOC_ORJUMP(request_ptrs, MPIR_Request **, count * sizeof(MPIR_Request *), mpi_errno, "request pointers"); } for (i = 0; i < count; i++) { - MPID_Request_get_ptr(array_of_requests[i], request_ptrs[i]); + MPIR_Request_get_ptr(array_of_requests[i], request_ptrs[i]); } /* Validate object pointers if error checking is enabled */ @@ -106,7 +106,7 @@ int MPI_Startall(int count, MPI_Request array_of_requests[]) MPID_BEGIN_ERROR_CHECKS; { for (i = 0; i < count; i++) { - MPID_Request_valid_ptr( request_ptrs[i], mpi_errno ); + MPIR_Request_valid_ptr( request_ptrs[i], mpi_errno ); if (mpi_errno) goto fn_fail; } for (i = 0; i < count; i++) { diff --git a/src/mpi/pt2pt/test.c b/src/mpi/pt2pt/test.c index 9a3a9ed..cbca7e9 100644 --- a/src/mpi/pt2pt/test.c +++ b/src/mpi/pt2pt/test.c @@ -33,7 +33,7 @@ int MPIR_Test_impl(MPI_Request *request, int *flag, MPI_Status *status) { int mpi_errno = MPI_SUCCESS; int active_flag; - MPID_Request *request_ptr = NULL; + MPIR_Request *request_ptr = NULL; /* If this is a null request handle, then return an empty status */ if (*request == MPI_REQUEST_NULL) { @@ -44,7 +44,7 @@ int MPIR_Test_impl(MPI_Request *request, int *flag, MPI_Status *status) *flag = FALSE; - MPID_Request_get_ptr( *request, request_ptr ); + MPIR_Request_get_ptr( *request, request_ptr ); /* If the request is already completed AND we want to avoid calling the progress engine, we could make the call to MPID_Progress_test @@ -52,7 +52,7 @@ int MPIR_Test_impl(MPI_Request *request, int *flag, MPI_Status *status) mpi_errno = MPID_Progress_test(); if (mpi_errno != MPI_SUCCESS) goto fn_fail; - if (request_ptr->kind == MPID_UREQUEST && + if (request_ptr->kind == MPIR_UREQUEST && request_ptr->greq_fns != NULL && request_ptr->greq_fns->poll_fn != NULL) { @@ -60,7 +60,7 @@ int MPIR_Test_impl(MPI_Request *request, int *flag, MPI_Status *status) if (mpi_errno) MPIR_ERR_POP(mpi_errno); } - if (MPID_Request_is_complete(request_ptr)) { + if (MPIR_Request_is_complete(request_ptr)) { mpi_errno = MPIR_Request_complete(request, request_ptr, status, &active_flag); *flag = TRUE; @@ -112,7 +112,7 @@ Output Parameters: int MPI_Test(MPI_Request *request, int *flag, MPI_Status *status) { int mpi_errno = MPI_SUCCESS; - MPID_Request *request_ptr = NULL; + MPIR_Request *request_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_TEST); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -132,7 +132,7 @@ int MPI_Test(MPI_Request *request, int *flag, MPI_Status *status) } # endif /* HAVE_ERROR_CHECKING */ - MPID_Request_get_ptr( *request, request_ptr ); + MPIR_Request_get_ptr( *request, request_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -142,7 +142,7 @@ int MPI_Test(MPI_Request *request, int *flag, MPI_Status *status) if (*request != MPI_REQUEST_NULL) { /* Validate request_ptr */ - MPID_Request_valid_ptr( request_ptr, mpi_errno ); + MPIR_Request_valid_ptr( request_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; } diff --git a/src/mpi/pt2pt/testall.c b/src/mpi/pt2pt/testall.c index 0200666..65ab270 100644 --- a/src/mpi/pt2pt/testall.c +++ b/src/mpi/pt2pt/testall.c @@ -38,8 +38,8 @@ int MPI_Testall(int count, MPI_Request array_of_requests[], int *flag, int MPIR_Testall_impl(int count, MPI_Request array_of_requests[], int *flag, MPI_Status array_of_statuses[]) { - MPID_Request * request_ptr_array[MPIR_REQUEST_PTR_ARRAY_SIZE]; - MPID_Request ** request_ptrs = request_ptr_array; + MPIR_Request * request_ptr_array[MPIR_REQUEST_PTR_ARRAY_SIZE]; + MPIR_Request ** request_ptrs = request_ptr_array; MPI_Status * status_ptr; int i; int n_completed; @@ -52,8 +52,8 @@ int MPIR_Testall_impl(int count, MPI_Request array_of_requests[], int *flag, /* Convert MPI request handles to a request object pointers */ if (count > MPIR_REQUEST_PTR_ARRAY_SIZE) { - MPIU_CHKLMEM_MALLOC_ORJUMP(request_ptrs, MPID_Request **, - count * sizeof(MPID_Request *), mpi_errno, "request pointers"); + MPIU_CHKLMEM_MALLOC_ORJUMP(request_ptrs, MPIR_Request **, + count * sizeof(MPIR_Request *), mpi_errno, "request pointers"); } n_completed = 0; @@ -61,13 +61,13 @@ int MPIR_Testall_impl(int count, MPI_Request array_of_requests[], int *flag, { if (array_of_requests[i] != MPI_REQUEST_NULL) { - MPID_Request_get_ptr(array_of_requests[i], request_ptrs[i]); + MPIR_Request_get_ptr(array_of_requests[i], request_ptrs[i]); /* Validate object pointers if error checking is enabled */ # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS; { - MPID_Request_valid_ptr( request_ptrs[i], mpi_errno ); + MPIR_Request_valid_ptr( request_ptrs[i], mpi_errno ); if (mpi_errno) goto fn_fail; } MPID_END_ERROR_CHECKS; @@ -87,7 +87,7 @@ int MPIR_Testall_impl(int count, MPI_Request array_of_requests[], int *flag, for (i = 0; i < count; i++) { if (request_ptrs[i] != NULL && - request_ptrs[i]->kind == MPID_UREQUEST && + request_ptrs[i]->kind == MPIR_UREQUEST && request_ptrs[i]->greq_fns->poll_fn != NULL) { mpi_errno = (request_ptrs[i]->greq_fns->poll_fn)(request_ptrs[i]->greq_fns->grequest_extra_state, @@ -96,7 +96,7 @@ int MPIR_Testall_impl(int count, MPI_Request array_of_requests[], int *flag, } if (request_ptrs[i] != NULL) { - if (MPID_Request_is_complete(request_ptrs[i])) + if (MPIR_Request_is_complete(request_ptrs[i])) { n_completed++; rc = MPIR_Request_get_error(request_ptrs[i]); @@ -126,7 +126,7 @@ int MPIR_Testall_impl(int count, MPI_Request array_of_requests[], int *flag, { if (request_ptrs[i] != NULL) { - if (MPID_Request_is_complete(request_ptrs[i])) + if (MPIR_Request_is_complete(request_ptrs[i])) { n_completed ++; status_ptr = (array_of_statuses != MPI_STATUSES_IGNORE) ? &array_of_statuses[i] : MPI_STATUS_IGNORE; diff --git a/src/mpi/pt2pt/testany.c b/src/mpi/pt2pt/testany.c index 430ea1e..9f5a7e8 100644 --- a/src/mpi/pt2pt/testany.c +++ b/src/mpi/pt2pt/testany.c @@ -68,8 +68,8 @@ int MPI_Testany(int count, MPI_Request array_of_requests[], int *indx, int *flag, MPI_Status *status) { static const char FCNAME[] = "MPI_Testany"; - MPID_Request * request_ptr_array[MPIR_REQUEST_PTR_ARRAY_SIZE]; - MPID_Request ** request_ptrs = request_ptr_array; + MPIR_Request * request_ptr_array[MPIR_REQUEST_PTR_ARRAY_SIZE]; + MPIR_Request ** request_ptrs = request_ptr_array; int i; int n_inactive; int active_flag; @@ -111,7 +111,7 @@ int MPI_Testany(int count, MPI_Request array_of_requests[], int *indx, /* Convert MPI request handles to a request object pointers */ if (count > MPIR_REQUEST_PTR_ARRAY_SIZE) { - MPIU_CHKLMEM_MALLOC_ORJUMP(request_ptrs, MPID_Request **, count * sizeof(MPID_Request *), mpi_errno, "request pointers"); + MPIU_CHKLMEM_MALLOC_ORJUMP(request_ptrs, MPIR_Request **, count * sizeof(MPIR_Request *), mpi_errno, "request pointers"); } n_inactive = 0; @@ -119,13 +119,13 @@ int MPI_Testany(int count, MPI_Request array_of_requests[], int *indx, { if (array_of_requests[i] != MPI_REQUEST_NULL) { - MPID_Request_get_ptr(array_of_requests[i], request_ptrs[i]); + MPIR_Request_get_ptr(array_of_requests[i], request_ptrs[i]); /* Validate object pointers if error checking is enabled */ # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS; { - MPID_Request_valid_ptr( request_ptrs[i], mpi_errno ); + MPIR_Request_valid_ptr( request_ptrs[i], mpi_errno ); if (mpi_errno) goto fn_fail; } MPID_END_ERROR_CHECKS; @@ -162,7 +162,7 @@ int MPI_Testany(int count, MPI_Request array_of_requests[], int *indx, for (i = 0; i < count; i++) { if (request_ptrs[i] != NULL && - request_ptrs[i]->kind == MPID_UREQUEST && + request_ptrs[i]->kind == MPIR_UREQUEST && request_ptrs[i]->greq_fns->poll_fn != NULL) { mpi_errno = (request_ptrs[i]->greq_fns->poll_fn)(request_ptrs[i]->greq_fns->grequest_extra_state, @@ -171,7 +171,7 @@ int MPI_Testany(int count, MPI_Request array_of_requests[], int *indx, } if (request_ptrs[i] != NULL) { - if (MPID_Request_is_complete(request_ptrs[i])) + if (MPIR_Request_is_complete(request_ptrs[i])) { mpi_errno = MPIR_Request_complete(&array_of_requests[i], request_ptrs[i], diff --git a/src/mpi/pt2pt/testsome.c b/src/mpi/pt2pt/testsome.c index 85c4bee..4412abf 100644 --- a/src/mpi/pt2pt/testsome.c +++ b/src/mpi/pt2pt/testsome.c @@ -70,8 +70,8 @@ int MPI_Testsome(int incount, MPI_Request array_of_requests[], int *outcount, int array_of_indices[], MPI_Status array_of_statuses[]) { static const char FCNAME[] = "MPI_Testsome"; - MPID_Request * request_ptr_array[MPIR_REQUEST_PTR_ARRAY_SIZE]; - MPID_Request ** request_ptrs = request_ptr_array; + MPIR_Request * request_ptr_array[MPIR_REQUEST_PTR_ARRAY_SIZE]; + MPIR_Request ** request_ptrs = request_ptr_array; MPI_Status * status_ptr; int i; int n_active; @@ -117,7 +117,7 @@ int MPI_Testsome(int incount, MPI_Request array_of_requests[], int *outcount, /* Convert MPI request handles to a request object pointers */ if (incount > MPIR_REQUEST_PTR_ARRAY_SIZE) { - MPIU_CHKLMEM_MALLOC_ORJUMP(request_ptrs, MPID_Request **, incount * sizeof(MPID_Request *), mpi_errno, "request pointers"); + MPIU_CHKLMEM_MALLOC_ORJUMP(request_ptrs, MPIR_Request **, incount * sizeof(MPIR_Request *), mpi_errno, "request pointers"); } n_inactive = 0; @@ -125,13 +125,13 @@ int MPI_Testsome(int incount, MPI_Request array_of_requests[], int *outcount, { if (array_of_requests[i] != MPI_REQUEST_NULL) { - MPID_Request_get_ptr(array_of_requests[i], request_ptrs[i]); + MPIR_Request_get_ptr(array_of_requests[i], request_ptrs[i]); /* Validate object pointers if error checking is enabled */ # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS; { - MPID_Request_valid_ptr( request_ptrs[i], mpi_errno ); + MPIR_Request_valid_ptr( request_ptrs[i], mpi_errno ); if (mpi_errno) goto fn_fail; } MPID_END_ERROR_CHECKS; @@ -162,7 +162,7 @@ int MPI_Testsome(int incount, MPI_Request array_of_requests[], int *outcount, for (i = 0; i < incount; i++) { if (request_ptrs[i] != NULL && - request_ptrs[i]->kind == MPID_UREQUEST && + request_ptrs[i]->kind == MPIR_UREQUEST && request_ptrs[i]->greq_fns->poll_fn != NULL) { mpi_errno = (request_ptrs[i]->greq_fns->poll_fn)(request_ptrs[i]->greq_fns->grequest_extra_state, @@ -172,7 +172,7 @@ int MPI_Testsome(int incount, MPI_Request array_of_requests[], int *outcount, status_ptr = (array_of_statuses != MPI_STATUSES_IGNORE) ? &array_of_statuses[n_active] : MPI_STATUS_IGNORE; if (request_ptrs[i] != NULL) { - if (MPID_Request_is_complete(request_ptrs[i])) + if (MPIR_Request_is_complete(request_ptrs[i])) { rc = MPIR_Request_complete(&array_of_requests[i], request_ptrs[i], status_ptr, &active_flag); if (active_flag) diff --git a/src/mpi/pt2pt/wait.c b/src/mpi/pt2pt/wait.c index 8408864..5b289c9 100644 --- a/src/mpi/pt2pt/wait.c +++ b/src/mpi/pt2pt/wait.c @@ -32,7 +32,7 @@ int MPIR_Wait_impl(MPI_Request *request, MPI_Status *status) { int mpi_errno = MPI_SUCCESS; int active_flag; - MPID_Request *request_ptr = NULL; + MPIR_Request *request_ptr = NULL; /* If this is a null request handle, then return an empty status */ if (*request == MPI_REQUEST_NULL) @@ -41,9 +41,9 @@ int MPIR_Wait_impl(MPI_Request *request, MPI_Status *status) goto fn_exit; } - MPID_Request_get_ptr(*request, request_ptr); + MPIR_Request_get_ptr(*request, request_ptr); - if (!MPID_Request_is_complete(request_ptr)) + if (!MPIR_Request_is_complete(request_ptr)) { MPID_Progress_state progress_state; @@ -58,10 +58,10 @@ int MPIR_Wait_impl(MPI_Request *request, MPI_Status *status) } MPID_Progress_start(&progress_state); - while (!MPID_Request_is_complete(request_ptr)) + while (!MPIR_Request_is_complete(request_ptr)) { mpi_errno = MPIR_Grequest_progress_poke(1, &request_ptr, status); - if (request_ptr->kind == MPID_UREQUEST && + if (request_ptr->kind == MPIR_UREQUEST && request_ptr->greq_fns->wait_fn != NULL) { if (mpi_errno) { @@ -85,7 +85,7 @@ int MPIR_Wait_impl(MPI_Request *request, MPI_Status *status) if (unlikely( MPIR_CVAR_ENABLE_FT && MPID_Request_is_anysource(request_ptr) && - !MPID_Request_is_complete(request_ptr) && + !MPIR_Request_is_complete(request_ptr) && !MPID_Comm_AS_enabled(request_ptr->comm))) { MPID_Progress_end(&progress_state); MPIR_ERR_SET(mpi_errno, MPIX_ERR_PROC_FAILED_PENDING, "**failure_pending"); @@ -135,7 +135,7 @@ Output Parameters: @*/ int MPI_Wait(MPI_Request *request, MPI_Status *status) { - MPID_Request * request_ptr = NULL; + MPIR_Request * request_ptr = NULL; int mpi_errno = MPI_SUCCESS; MPIR_Comm * comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WAIT); @@ -167,14 +167,14 @@ int MPI_Wait(MPI_Request *request, MPI_Status *status) } /* Convert MPI request handle to a request object pointer */ - MPID_Request_get_ptr(*request, request_ptr); + MPIR_Request_get_ptr(*request, request_ptr); /* Validate object pointers if error checking is enabled */ # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS; { - MPID_Request_valid_ptr( request_ptr, mpi_errno ); + MPIR_Request_valid_ptr( request_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; } MPID_END_ERROR_CHECKS; diff --git a/src/mpi/pt2pt/waitall.c b/src/mpi/pt2pt/waitall.c index d25137a..273753c 100644 --- a/src/mpi/pt2pt/waitall.c +++ b/src/mpi/pt2pt/waitall.c @@ -42,7 +42,7 @@ int MPI_Waitall(int count, MPI_Request array_of_requests[], MPI_Status array_of_ #define FUNCNAME request_complete_fastpath #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int request_complete_fastpath(MPI_Request *request, MPID_Request *request_ptr) +static inline int request_complete_fastpath(MPI_Request *request, MPIR_Request *request_ptr) { int mpi_errno = MPI_SUCCESS; @@ -71,8 +71,8 @@ int MPIR_Waitall_impl(int count, MPI_Request array_of_requests[], MPI_Status array_of_statuses[]) { int mpi_errno = MPI_SUCCESS; - MPID_Request * request_ptr_array[MPIR_REQUEST_PTR_ARRAY_SIZE]; - MPID_Request ** request_ptrs = request_ptr_array; + MPIR_Request * request_ptr_array[MPIR_REQUEST_PTR_ARRAY_SIZE]; + MPIR_Request ** request_ptrs = request_ptr_array; MPI_Status * status_ptr; MPID_Progress_state progress_state; int i, j; @@ -89,7 +89,7 @@ int MPIR_Waitall_impl(int count, MPI_Request array_of_requests[], /* Convert MPI request handles to a request object pointers */ if (count > MPIR_REQUEST_PTR_ARRAY_SIZE) { - MPIU_CHKLMEM_MALLOC(request_ptrs, MPID_Request **, count * sizeof(MPID_Request *), mpi_errno, "request pointers"); + MPIU_CHKLMEM_MALLOC(request_ptrs, MPIR_Request **, count * sizeof(MPIR_Request *), mpi_errno, "request pointers"); } n_greqs = 0; @@ -98,13 +98,13 @@ int MPIR_Waitall_impl(int count, MPI_Request array_of_requests[], { if (array_of_requests[i] != MPI_REQUEST_NULL) { - MPID_Request_get_ptr(array_of_requests[i], request_ptrs[i]); + MPIR_Request_get_ptr(array_of_requests[i], request_ptrs[i]); /* Validate object pointers if error checking is enabled */ # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS; { - MPID_Request_valid_ptr( request_ptrs[i], mpi_errno ); + MPIR_Request_valid_ptr( request_ptrs[i], mpi_errno ); if (mpi_errno) MPIR_ERR_POP(mpi_errno); MPIR_ERR_CHKANDJUMP1((request_ptrs[i]->kind == MPIR_REQUEST_MPROBE), mpi_errno, MPI_ERR_ARG, "**msgnotreq", "**msgnotreq %d", i); @@ -118,7 +118,7 @@ int MPIR_Waitall_impl(int count, MPI_Request array_of_requests[], optimize = FALSE; } - if (request_ptrs[i]->kind == MPID_UREQUEST) + if (request_ptrs[i]->kind == MPIR_UREQUEST) ++n_greqs; /* If one of the requests is an anysource on a communicator that's @@ -126,7 +126,7 @@ int MPIR_Waitall_impl(int count, MPI_Request array_of_requests[], * instead to prevent getting stuck in the progress engine. */ if (unlikely(MPIR_CVAR_ENABLE_FT && MPID_Request_is_anysource(request_ptrs[i]) && - !MPID_Request_is_complete(request_ptrs[i]) && + !MPIR_Request_is_complete(request_ptrs[i]) && !MPID_Comm_AS_enabled(request_ptrs[i]->comm))) { disabled_anysource = TRUE; } @@ -160,7 +160,7 @@ int MPIR_Waitall_impl(int count, MPI_Request array_of_requests[], if (optimize) { MPID_Progress_start(&progress_state); for (i = 0; i < count; ++i) { - while (!MPID_Request_is_complete(request_ptrs[i])) { + while (!MPIR_Request_is_complete(request_ptrs[i])) { mpi_errno = MPID_Progress_wait(&progress_state); /* must check and handle the error, can't guard with HAVE_ERROR_CHECKING, but it's * OK for the error case to be slower */ @@ -168,7 +168,7 @@ int MPIR_Waitall_impl(int count, MPI_Request array_of_requests[], /* --BEGIN ERROR HANDLING-- */ if (unlikely(MPIR_CVAR_ENABLE_FT && MPID_Request_is_anysource(request_ptrs[i]) && - !MPID_Request_is_complete(request_ptrs[i]) && + !MPIR_Request_is_complete(request_ptrs[i]) && !MPID_Comm_AS_enabled(request_ptrs[i]->comm))) { MPIR_ERR_SET(mpi_errno, MPI_ERR_IN_STATUS, "**instatus"); } @@ -209,10 +209,10 @@ int MPIR_Waitall_impl(int count, MPI_Request array_of_requests[], } /* wait for ith request to complete */ - while (!MPID_Request_is_complete(request_ptrs[i])) + while (!MPIR_Request_is_complete(request_ptrs[i])) { /* generalized requests should already be finished */ - MPIU_Assert(request_ptrs[i]->kind != MPID_UREQUEST); + MPIU_Assert(request_ptrs[i]->kind != MPIR_UREQUEST); mpi_errno = MPID_Progress_wait(&progress_state); if (mpi_errno != MPI_SUCCESS) { @@ -222,7 +222,7 @@ int MPIR_Waitall_impl(int count, MPI_Request array_of_requests[], /* --END ERROR HANDLING-- */ } else if (unlikely(MPIR_CVAR_ENABLE_FT && MPID_Request_is_anysource(request_ptrs[i]) && - !MPID_Request_is_complete(request_ptrs[i]) && + !MPIR_Request_is_complete(request_ptrs[i]) && !MPID_Comm_AS_enabled(request_ptrs[i]->comm))) { /* Check for pending failures */ MPID_Progress_end(&progress_state); @@ -234,7 +234,7 @@ int MPIR_Waitall_impl(int count, MPI_Request array_of_requests[], } } - if (MPID_Request_is_complete(request_ptrs[i])) { + if (MPIR_Request_is_complete(request_ptrs[i])) { /* complete the request and check the status */ status_ptr = (ignoring_statuses) ? MPI_STATUS_IGNORE : &array_of_statuses[i]; rc = MPIR_Request_complete(&array_of_requests[i], request_ptrs[i], status_ptr, &active_flag); diff --git a/src/mpi/pt2pt/waitany.c b/src/mpi/pt2pt/waitany.c index 0b8e75c..eb3b677 100644 --- a/src/mpi/pt2pt/waitany.c +++ b/src/mpi/pt2pt/waitany.c @@ -69,8 +69,8 @@ int MPI_Waitany(int count, MPI_Request array_of_requests[], int *indx, MPI_Status *status) { static const char FCNAME[] = "MPI_Waitany"; - MPID_Request * request_ptr_array[MPIR_REQUEST_PTR_ARRAY_SIZE]; - MPID_Request ** request_ptrs = request_ptr_array; + MPIR_Request * request_ptr_array[MPIR_REQUEST_PTR_ARRAY_SIZE]; + MPIR_Request ** request_ptrs = request_ptr_array; MPID_Progress_state progress_state; int i; int n_inactive; @@ -110,7 +110,7 @@ int MPI_Waitany(int count, MPI_Request array_of_requests[], int *indx, /* Convert MPI request handles to a request object pointers */ if (count > MPIR_REQUEST_PTR_ARRAY_SIZE) { - MPIU_CHKLMEM_MALLOC_ORJUMP(request_ptrs, MPID_Request **, count * sizeof(MPID_Request *), mpi_errno, "request pointers"); + MPIU_CHKLMEM_MALLOC_ORJUMP(request_ptrs, MPIR_Request **, count * sizeof(MPIR_Request *), mpi_errno, "request pointers"); } n_inactive = 0; @@ -133,13 +133,13 @@ int MPI_Waitany(int count, MPI_Request array_of_requests[], int *indx, #endif /* HAVE_ERROR_CHECKING */ if (array_of_requests[i] != MPI_REQUEST_NULL) { - MPID_Request_get_ptr(array_of_requests[i], request_ptrs[i]); + MPIR_Request_get_ptr(array_of_requests[i], request_ptrs[i]); /* Validate object pointers if error checking is enabled */ #ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS; { - MPID_Request_valid_ptr( request_ptrs[i], mpi_errno ); + MPIR_Request_valid_ptr( request_ptrs[i], mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_progress_end_fail; } MPID_END_ERROR_CHECKS; @@ -157,13 +157,13 @@ int MPI_Waitany(int count, MPI_Request array_of_requests[], int *indx, /* we found at least one non-null request */ found_nonnull_req = TRUE; - if (request_ptrs[i]->kind == MPID_UREQUEST && request_ptrs[i]->greq_fns->poll_fn != NULL) + if (request_ptrs[i]->kind == MPIR_UREQUEST && request_ptrs[i]->greq_fns->poll_fn != NULL) { /* this is a generalized request; make progress on it */ mpi_errno = (request_ptrs[i]->greq_fns->poll_fn)(request_ptrs[i]->greq_fns->grequest_extra_state, status); if (mpi_errno != MPI_SUCCESS) goto fn_progress_end_fail; } - if (MPID_Request_is_complete(request_ptrs[i])) + if (MPIR_Request_is_complete(request_ptrs[i])) { mpi_errno = MPIR_Request_complete(&array_of_requests[i], request_ptrs[i], status, diff --git a/src/mpi/pt2pt/waitsome.c b/src/mpi/pt2pt/waitsome.c index 7662c4d..01d58bf 100644 --- a/src/mpi/pt2pt/waitsome.c +++ b/src/mpi/pt2pt/waitsome.c @@ -87,8 +87,8 @@ int MPI_Waitsome(int incount, MPI_Request array_of_requests[], MPI_Status array_of_statuses[]) { static const char FCNAME[] = "MPI_Waitsome"; - MPID_Request * request_ptr_array[MPIR_REQUEST_PTR_ARRAY_SIZE]; - MPID_Request ** request_ptrs = request_ptr_array; + MPIR_Request * request_ptr_array[MPIR_REQUEST_PTR_ARRAY_SIZE]; + MPIR_Request ** request_ptrs = request_ptr_array; MPI_Status * status_ptr; MPID_Progress_state progress_state; int i; @@ -136,7 +136,7 @@ int MPI_Waitsome(int incount, MPI_Request array_of_requests[], /* Convert MPI request handles to a request object pointers */ if (incount > MPIR_REQUEST_PTR_ARRAY_SIZE) { - MPIU_CHKLMEM_MALLOC_ORJUMP(request_ptrs, MPID_Request **, incount * sizeof(MPID_Request *), mpi_errno, "request pointers"); + MPIU_CHKLMEM_MALLOC_ORJUMP(request_ptrs, MPIR_Request **, incount * sizeof(MPIR_Request *), mpi_errno, "request pointers"); } n_inactive = 0; @@ -144,13 +144,13 @@ int MPI_Waitsome(int incount, MPI_Request array_of_requests[], { if (array_of_requests[i] != MPI_REQUEST_NULL) { - MPID_Request_get_ptr(array_of_requests[i], request_ptrs[i]); + MPIR_Request_get_ptr(array_of_requests[i], request_ptrs[i]); /* Validate object pointers if error checking is enabled */ # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS; { - MPID_Request_valid_ptr( request_ptrs[i], mpi_errno ); + MPIR_Request_valid_ptr( request_ptrs[i], mpi_errno ); if (mpi_errno != MPI_SUCCESS) { goto fn_fail; @@ -166,7 +166,7 @@ int MPI_Waitsome(int incount, MPI_Request array_of_requests[], * instead to prevent getting stuck in the progress engine. */ if (unlikely(MPIR_CVAR_ENABLE_FT && MPID_Request_is_anysource(request_ptrs[i]) && - !MPID_Request_is_complete(request_ptrs[i]) && + !MPIR_Request_is_complete(request_ptrs[i]) && !MPID_Comm_AS_enabled(request_ptrs[i]->comm))) { disabled_anysource = TRUE; } @@ -212,7 +212,7 @@ int MPI_Waitsome(int incount, MPI_Request array_of_requests[], { if (request_ptrs[i] != NULL) { - if (MPID_Request_is_complete(request_ptrs[i])) + if (MPIR_Request_is_complete(request_ptrs[i])) { status_ptr = (array_of_statuses != MPI_STATUSES_IGNORE) ? &array_of_statuses[n_active] : MPI_STATUS_IGNORE; rc = MPIR_Request_complete(&array_of_requests[i], request_ptrs[i], status_ptr, &active_flag); diff --git a/src/mpi/rma/raccumulate.c b/src/mpi/rma/raccumulate.c index 2448242..9033db4 100644 --- a/src/mpi/rma/raccumulate.c +++ b/src/mpi/rma/raccumulate.c @@ -86,7 +86,7 @@ int MPI_Raccumulate(const void *origin_addr, int origin_count, MPI_Datatype static const char FCNAME[] = "MPI_Raccumulate"; int mpi_errno = MPI_SUCCESS; MPIR_Win *win_ptr = NULL; - MPID_Request *request_ptr = NULL; + MPIR_Request *request_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_RACCUMULATE); MPIR_ERRTEST_INITIALIZED_ORDIE(); diff --git a/src/mpi/rma/rget.c b/src/mpi/rma/rget.c index ef14445..cada257 100644 --- a/src/mpi/rma/rget.c +++ b/src/mpi/rma/rget.c @@ -81,7 +81,7 @@ int MPI_Rget(void *origin_addr, int origin_count, MPI_Datatype static const char FCNAME[] = "MPI_Rget"; int mpi_errno = MPI_SUCCESS; MPIR_Win *win_ptr = NULL; - MPID_Request *request_ptr = NULL; + MPIR_Request *request_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_RGET); MPIR_ERRTEST_INITIALIZED_ORDIE(); diff --git a/src/mpi/rma/rget_accumulate.c b/src/mpi/rma/rget_accumulate.c index 7300e49..61294ca 100644 --- a/src/mpi/rma/rget_accumulate.c +++ b/src/mpi/rma/rget_accumulate.c @@ -96,7 +96,7 @@ int MPI_Rget_accumulate(const void *origin_addr, int origin_count, static const char FCNAME[] = "MPI_Rget_accumulate"; int mpi_errno = MPI_SUCCESS; MPIR_Win *win_ptr = NULL; - MPID_Request *request_ptr = NULL; + MPIR_Request *request_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_RGET_ACCUMULATE); MPIR_ERRTEST_INITIALIZED_ORDIE(); diff --git a/src/mpi/rma/rput.c b/src/mpi/rma/rput.c index 69b7f51..aeae461 100644 --- a/src/mpi/rma/rput.c +++ b/src/mpi/rma/rput.c @@ -83,7 +83,7 @@ int MPI_Rput(const void *origin_addr, int origin_count, MPI_Datatype static const char FCNAME[] = "MPI_Rput"; int mpi_errno = MPI_SUCCESS; MPIR_Win *win_ptr = NULL; - MPID_Request *request_ptr = NULL; + MPIR_Request *request_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_RPUT); MPIR_ERRTEST_INITIALIZED_ORDIE(); diff --git a/src/mpi/rma/winutil.c b/src/mpi/rma/winutil.c index 0882139..508442f 100644 --- a/src/mpi/rma/winutil.c +++ b/src/mpi/rma/winutil.c @@ -8,12 +8,12 @@ /* FIXME: Move this into wincreate (having a separate file is unneccessary, and it leads to a false "missing coverage" report) */ -#ifndef MPID_WIN_PREALLOC -#define MPID_WIN_PREALLOC 8 +#ifndef MPIR_WIN_PREALLOC +#define MPIR_WIN_PREALLOC 8 #endif /* Preallocated window objects */ -MPIR_Win MPIR_Win_direct[MPID_WIN_PREALLOC] = { {0} }; +MPIR_Win MPIR_Win_direct[MPIR_WIN_PREALLOC] = { {0} }; MPIU_Object_alloc_t MPIR_Win_mem = { 0, 0, 0, 0, MPID_WIN, sizeof(MPIR_Win), MPIR_Win_direct, MPID_WIN_PREALLOC}; diff --git a/src/mpi/topo/dist_gr_create.c b/src/mpi/topo/dist_gr_create.c index 914a305..b2f3b30 100644 --- a/src/mpi/topo/dist_gr_create.c +++ b/src/mpi/topo/dist_gr_create.c @@ -75,7 +75,7 @@ int MPI_Dist_graph_create(MPI_Comm comm_old, int n, const int sources[], int mpi_errno = MPI_SUCCESS; MPIR_Comm *comm_ptr = NULL; MPIR_Comm *comm_dist_graph_ptr = NULL; - MPID_Request **reqs = NULL; + MPIR_Request **reqs = NULL; MPIR_Topology *topo_ptr = NULL; MPIR_Dist_graph_topology *dist_graph_ptr = NULL; int i; @@ -271,7 +271,7 @@ int MPI_Dist_graph_create(MPI_Comm comm_old, int n, const int sources[], idx = 0; /* must be 2*comm_size requests because we will possibly send inbound and * outbound edges to everyone in our communicator */ - MPIU_CHKLMEM_MALLOC(reqs, MPID_Request **, 2*comm_size*sizeof(MPID_Request *), mpi_errno, "temp request array"); + MPIU_CHKLMEM_MALLOC(reqs, MPIR_Request **, 2*comm_size*sizeof(MPIR_Request *), mpi_errno, "temp request array"); for (i = 0; i < comm_size; ++i) { if (rin_sizes[i]) { /* send edges where i is a destination to process i */ diff --git a/src/mpi/topo/inhb_allgather.c b/src/mpi/topo/inhb_allgather.c index 8d2b30e..1914779 100644 --- a/src/mpi/topo/inhb_allgather.c +++ b/src/mpi/topo/inhb_allgather.c @@ -86,7 +86,7 @@ int MPIR_Ineighbor_allgather_impl(const void *sendbuf, int sendcount, MPI_Dataty { int mpi_errno = MPI_SUCCESS; int tag = -1; - MPID_Request *reqp = NULL; + MPIR_Request *reqp = NULL; MPID_Sched_t s = MPID_SCHED_NULL; *request = MPI_REQUEST_NULL; diff --git a/src/mpi/topo/inhb_allgatherv.c b/src/mpi/topo/inhb_allgatherv.c index 8bb795f..5a361e4 100644 --- a/src/mpi/topo/inhb_allgatherv.c +++ b/src/mpi/topo/inhb_allgatherv.c @@ -90,7 +90,7 @@ int MPIR_Ineighbor_allgatherv_impl(const void *sendbuf, int sendcount, MPI_Datat { int mpi_errno = MPI_SUCCESS; int tag = -1; - MPID_Request *reqp = NULL; + MPIR_Request *reqp = NULL; MPID_Sched_t s = MPID_SCHED_NULL; *request = MPI_REQUEST_NULL; diff --git a/src/mpi/topo/inhb_alltoall.c b/src/mpi/topo/inhb_alltoall.c index 1a7e708..8b6b220 100644 --- a/src/mpi/topo/inhb_alltoall.c +++ b/src/mpi/topo/inhb_alltoall.c @@ -91,7 +91,7 @@ int MPIR_Ineighbor_alltoall_impl(const void *sendbuf, int sendcount, MPI_Datatyp { int mpi_errno = MPI_SUCCESS; int tag = -1; - MPID_Request *reqp = NULL; + MPIR_Request *reqp = NULL; MPID_Sched_t s = MPID_SCHED_NULL; *request = MPI_REQUEST_NULL; diff --git a/src/mpi/topo/inhb_alltoallv.c b/src/mpi/topo/inhb_alltoallv.c index 4ff4477..13841a1 100644 --- a/src/mpi/topo/inhb_alltoallv.c +++ b/src/mpi/topo/inhb_alltoallv.c @@ -95,7 +95,7 @@ int MPIR_Ineighbor_alltoallv_impl(const void *sendbuf, const int sendcounts[], c { int mpi_errno = MPI_SUCCESS; int tag = -1; - MPID_Request *reqp = NULL; + MPIR_Request *reqp = NULL; MPID_Sched_t s = MPID_SCHED_NULL; *request = MPI_REQUEST_NULL; diff --git a/src/mpi/topo/inhb_alltoallw.c b/src/mpi/topo/inhb_alltoallw.c index c7be13d..d2d9f1f 100644 --- a/src/mpi/topo/inhb_alltoallw.c +++ b/src/mpi/topo/inhb_alltoallw.c @@ -86,7 +86,7 @@ int MPIR_Ineighbor_alltoallw_impl(const void *sendbuf, const int sendcounts[], c { int mpi_errno = MPI_SUCCESS; int tag = -1; - MPID_Request *reqp = NULL; + MPIR_Request *reqp = NULL; MPID_Sched_t s = MPID_SCHED_NULL; *request = MPI_REQUEST_NULL; diff --git a/src/mpid/ch3/channels/nemesis/include/mpid_nem_impl.h b/src/mpid/ch3/channels/nemesis/include/mpid_nem_impl.h index b41720a..24d0f7d 100644 --- a/src/mpid/ch3/channels/nemesis/include/mpid_nem_impl.h +++ b/src/mpid/ch3/channels/nemesis/include/mpid_nem_impl.h @@ -25,7 +25,7 @@ int MPIDI_CH3I_Seg_destroy(void); int MPID_nem_check_alloc(int); int MPID_nem_mpich_init(void); int MPID_nem_coll_init (void); -int MPID_nem_send_iov(MPIDI_VC_t *vc, MPID_Request **sreq_ptr, MPL_IOV *iov, int n_iov); +int MPID_nem_send_iov(MPIDI_VC_t *vc, MPIR_Request **sreq_ptr, MPL_IOV *iov, int n_iov); int MPID_nem_lmt_pkthandler_init(MPIDI_CH3_PktHandler_Fcn *pktArray[], int arraySize); int MPID_nem_register_initcomp_cb(int (* callback)(void)); int MPID_nem_choose_netmod(void); @@ -33,9 +33,9 @@ int MPIDI_CH3I_comm_create(MPIR_Comm *comm, void *param); int MPIDI_CH3I_comm_destroy(MPIR_Comm *comm, void *param); /* rendezvous hooks */ -int MPID_nem_lmt_RndvSend(MPID_Request **sreq_p, const void * buf, MPI_Aint count, MPI_Datatype datatype, int dt_contig, +int MPID_nem_lmt_RndvSend(MPIR_Request **sreq_p, const void * buf, MPI_Aint count, MPI_Datatype datatype, int dt_contig, intptr_t data_sz, MPI_Aint dt_true_lb, int rank, int tag, MPIR_Comm * comm, int context_offset); -int MPID_nem_lmt_RndvRecv(struct MPIDI_VC *vc, MPID_Request *rreq); +int MPID_nem_lmt_RndvRecv(struct MPIDI_VC *vc, MPIR_Request *rreq); #define MPID_nem_mpich_release_fbox(cell) \ do { \ @@ -138,7 +138,7 @@ typedef union MPIDI_CH3_nem_pkt */ #define MPID_nem_lmt_send_RTS(vc, rts_pkt, s_cookie_buf, s_cookie_len) do { \ - MPID_Request *_rts_req; \ + MPIR_Request *_rts_req; \ MPL_IOV _iov[2]; \ \ MPL_DBG_MSG(MPIDI_CH3_DBG_OTHER,VERBOSE,"sending rndv RTS packet"); \ @@ -182,7 +182,7 @@ typedef union MPIDI_CH3_nem_pkt #define MPID_nem_lmt_send_CTS(vc, rreq, r_cookie_buf, r_cookie_len) do { \ MPID_PKT_DECL_CAST(_upkt, MPID_nem_pkt_lmt_cts_t, _cts_pkt); \ - MPID_Request *_cts_req; \ + MPIR_Request *_cts_req; \ MPL_IOV _iov[2]; \ \ MPL_DBG_MSG(MPIDI_CH3_DBG_OTHER,VERBOSE,"sending rndv CTS packet"); \ @@ -210,12 +210,12 @@ typedef union MPIDI_CH3_nem_pkt #define FUNCNAME MPID_nem_lmt_send_COOKIE #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPID_nem_lmt_send_COOKIE(MPIDI_VC_t *vc, MPID_Request *req, +static inline int MPID_nem_lmt_send_COOKIE(MPIDI_VC_t *vc, MPIR_Request *req, void *cookie_buf, MPI_Aint cookie_len) { int mpi_errno = MPI_SUCCESS; MPID_PKT_DECL_CAST(_upkt, MPID_nem_pkt_lmt_cookie_t, cookie_pkt); - MPID_Request *cookie_req; + MPIR_Request *cookie_req; MPL_IOV iov[2]; MPL_DBG_MSG(MPIDI_CH3_DBG_OTHER,VERBOSE,"sending rndv COOKIE packet"); @@ -262,7 +262,7 @@ fn_fail: #define MPID_nem_lmt_send_DONE(vc, rreq) do { \ MPID_PKT_DECL_CAST(_upkt, MPID_nem_pkt_lmt_done_t, _done_pkt); \ - MPID_Request *_done_req; \ + MPIR_Request *_done_req; \ \ MPL_DBG_MSG(MPIDI_CH3_DBG_OTHER,VERBOSE,"sending rndv DONE packet"); \ MPIDI_Pkt_init(_done_pkt, MPIDI_NEM_PKT_LMT_DONE); \ diff --git a/src/mpid/ch3/channels/nemesis/include/mpid_nem_nets.h b/src/mpid/ch3/channels/nemesis/include/mpid_nem_nets.h index 57b5448..4729e15 100644 --- a/src/mpid/ch3/channels/nemesis/include/mpid_nem_nets.h +++ b/src/mpid/ch3/channels/nemesis/include/mpid_nem_nets.h @@ -24,7 +24,7 @@ typedef int (* MPID_nem_net_module_vc_terminate_t)(MPIDI_VC_t *vc); typedef int (* MPID_nem_net_module_anysource_iprobe_t)(int tag, MPIR_Comm *comm, int context_offset, int *flag, MPI_Status *status); typedef int (* MPID_nem_net_module_anysource_improbe_t)(int tag, MPIR_Comm *comm, int context_offset, int *flag, - MPID_Request **message, MPI_Status *status); + MPIR_Request **message, MPI_Status *status); typedef void (* MPID_nem_net_module_vc_dbg_print_sendq_t)(FILE *stream, MPIDI_VC_t *vc); typedef int (* MPID_nem_net_module_get_ordering_t)(int *ordering); diff --git a/src/mpid/ch3/channels/nemesis/include/mpid_nem_post.h b/src/mpid/ch3/channels/nemesis/include/mpid_nem_post.h index 926a242..cf77ca8 100644 --- a/src/mpid/ch3/channels/nemesis/include/mpid_nem_post.h +++ b/src/mpid/ch3/channels/nemesis/include/mpid_nem_post.h @@ -37,7 +37,7 @@ int MPIDI_nem_ckpt_finalize(void); int MPIDI_nem_ckpt_start(void); int MPIDI_nem_ckpt_finish(void); int MPIDI_nem_ckpt_pkthandler_init(int (*pktArray[])(struct MPIDI_VC *vc, union MPIDI_CH3_Pkt *pkt, - intptr_t *buflen, MPID_Request **req ), int arraySize); + intptr_t *buflen, MPIR_Request **req ), int arraySize); #endif /* one-sided */ diff --git a/src/mpid/ch3/channels/nemesis/include/mpidi_ch3_impl.h b/src/mpid/ch3/channels/nemesis/include/mpidi_ch3_impl.h index 3188530..54fd0ab 100644 --- a/src/mpid/ch3/channels/nemesis/include/mpidi_ch3_impl.h +++ b/src/mpid/ch3/channels/nemesis/include/mpidi_ch3_impl.h @@ -19,9 +19,9 @@ extern void *MPIDI_CH3_packet_buffer; extern int MPIDI_CH3I_my_rank; -typedef GENERIC_Q_DECL(struct MPID_Request) MPIDI_CH3I_shm_sendq_t; +typedef GENERIC_Q_DECL(struct MPIR_Request) MPIDI_CH3I_shm_sendq_t; extern MPIDI_CH3I_shm_sendq_t MPIDI_CH3I_shm_sendq; -extern struct MPID_Request *MPIDI_CH3I_shm_active_send; +extern struct MPIR_Request *MPIDI_CH3I_shm_active_send; /* Send queue macros */ /* MT - not thread safe! */ @@ -57,30 +57,30 @@ int MPIDI_CH3I_Progress_deactivate_hook(int id); int MPIDI_CH3I_Shm_send_progress(void); int MPIDI_CH3I_Complete_sendq_with_error(MPIDI_VC_t * vc); -int MPIDI_CH3I_SendNoncontig( MPIDI_VC_t *vc, MPID_Request *sreq, void *header, intptr_t hdr_sz ); +int MPIDI_CH3I_SendNoncontig( MPIDI_VC_t *vc, MPIR_Request *sreq, void *header, intptr_t hdr_sz ); -int MPID_nem_lmt_shm_initiate_lmt(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *rts_pkt, MPID_Request *req); -int MPID_nem_lmt_shm_start_recv(MPIDI_VC_t *vc, MPID_Request *req, MPL_IOV s_cookie); -int MPID_nem_lmt_shm_start_send(MPIDI_VC_t *vc, MPID_Request *req, MPL_IOV r_cookie); -int MPID_nem_lmt_shm_handle_cookie(MPIDI_VC_t *vc, MPID_Request *req, MPL_IOV cookie); -int MPID_nem_lmt_shm_done_send(MPIDI_VC_t *vc, MPID_Request *req); -int MPID_nem_lmt_shm_done_recv(MPIDI_VC_t *vc, MPID_Request *req); +int MPID_nem_lmt_shm_initiate_lmt(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *rts_pkt, MPIR_Request *req); +int MPID_nem_lmt_shm_start_recv(MPIDI_VC_t *vc, MPIR_Request *req, MPL_IOV s_cookie); +int MPID_nem_lmt_shm_start_send(MPIDI_VC_t *vc, MPIR_Request *req, MPL_IOV r_cookie); +int MPID_nem_lmt_shm_handle_cookie(MPIDI_VC_t *vc, MPIR_Request *req, MPL_IOV cookie); +int MPID_nem_lmt_shm_done_send(MPIDI_VC_t *vc, MPIR_Request *req); +int MPID_nem_lmt_shm_done_recv(MPIDI_VC_t *vc, MPIR_Request *req); int MPID_nem_lmt_shm_vc_terminated(MPIDI_VC_t *vc); -int MPID_nem_lmt_dma_initiate_lmt(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *rts_pkt, MPID_Request *req); -int MPID_nem_lmt_dma_start_recv(MPIDI_VC_t *vc, MPID_Request *req, MPL_IOV s_cookie); -int MPID_nem_lmt_dma_start_send(MPIDI_VC_t *vc, MPID_Request *req, MPL_IOV r_cookie); -int MPID_nem_lmt_dma_handle_cookie(MPIDI_VC_t *vc, MPID_Request *req, MPL_IOV cookie); -int MPID_nem_lmt_dma_done_send(MPIDI_VC_t *vc, MPID_Request *req); -int MPID_nem_lmt_dma_done_recv(MPIDI_VC_t *vc, MPID_Request *req); +int MPID_nem_lmt_dma_initiate_lmt(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *rts_pkt, MPIR_Request *req); +int MPID_nem_lmt_dma_start_recv(MPIDI_VC_t *vc, MPIR_Request *req, MPL_IOV s_cookie); +int MPID_nem_lmt_dma_start_send(MPIDI_VC_t *vc, MPIR_Request *req, MPL_IOV r_cookie); +int MPID_nem_lmt_dma_handle_cookie(MPIDI_VC_t *vc, MPIR_Request *req, MPL_IOV cookie); +int MPID_nem_lmt_dma_done_send(MPIDI_VC_t *vc, MPIR_Request *req); +int MPID_nem_lmt_dma_done_recv(MPIDI_VC_t *vc, MPIR_Request *req); int MPID_nem_lmt_dma_vc_terminated(MPIDI_VC_t *vc); -int MPID_nem_lmt_vmsplice_initiate_lmt(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *rts_pkt, MPID_Request *req); -int MPID_nem_lmt_vmsplice_start_recv(MPIDI_VC_t *vc, MPID_Request *req, MPL_IOV s_cookie); -int MPID_nem_lmt_vmsplice_start_send(MPIDI_VC_t *vc, MPID_Request *req, MPL_IOV r_cookie); -int MPID_nem_lmt_vmsplice_handle_cookie(MPIDI_VC_t *vc, MPID_Request *req, MPL_IOV cookie); -int MPID_nem_lmt_vmsplice_done_send(MPIDI_VC_t *vc, MPID_Request *req); -int MPID_nem_lmt_vmsplice_done_recv(MPIDI_VC_t *vc, MPID_Request *req); +int MPID_nem_lmt_vmsplice_initiate_lmt(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *rts_pkt, MPIR_Request *req); +int MPID_nem_lmt_vmsplice_start_recv(MPIDI_VC_t *vc, MPIR_Request *req, MPL_IOV s_cookie); +int MPID_nem_lmt_vmsplice_start_send(MPIDI_VC_t *vc, MPIR_Request *req, MPL_IOV r_cookie); +int MPID_nem_lmt_vmsplice_handle_cookie(MPIDI_VC_t *vc, MPIR_Request *req, MPL_IOV cookie); +int MPID_nem_lmt_vmsplice_done_send(MPIDI_VC_t *vc, MPIR_Request *req); +int MPID_nem_lmt_vmsplice_done_recv(MPIDI_VC_t *vc, MPIR_Request *req); int MPID_nem_lmt_vmsplice_vc_terminated(MPIDI_VC_t *vc); int MPID_nem_handle_pkt(MPIDI_VC_t *vc, char *buf, intptr_t buflen); diff --git a/src/mpid/ch3/channels/nemesis/include/mpidi_ch3_post.h b/src/mpid/ch3/channels/nemesis/include/mpidi_ch3_post.h index 2bf6009..d5cde76 100644 --- a/src/mpid/ch3/channels/nemesis/include/mpidi_ch3_post.h +++ b/src/mpid/ch3/channels/nemesis/include/mpidi_ch3_post.h @@ -25,9 +25,9 @@ int MPIDI_CH3I_Progress(MPID_Progress_state *progress_state, int blocking); #define MPIDI_CH3_Progress_wait(progress_state) MPIDI_CH3I_Progress(progress_state, TRUE) #define MPIDI_CH3_Progress_poke() MPIDI_CH3I_Progress(NULL, FALSE) -void MPIDI_CH3I_Posted_recv_enqueued(MPID_Request *rreq); +void MPIDI_CH3I_Posted_recv_enqueued(MPIR_Request *rreq); /* returns non-zero when req has been matched by channel */ -int MPIDI_CH3I_Posted_recv_dequeued(MPID_Request *rreq); +int MPIDI_CH3I_Posted_recv_dequeued(MPIR_Request *rreq); /* * Enable optional functionality @@ -36,6 +36,6 @@ int MPIDI_CH3I_Posted_recv_dequeued(MPID_Request *rreq); #include "mpid_nem_post.h" -int MPIDI_CH3I_Register_anysource_notification(void (*enqueue_fn)(MPID_Request *rreq), int (*dequeue_fn)(MPID_Request *rreq)); +int MPIDI_CH3I_Register_anysource_notification(void (*enqueue_fn)(MPIR_Request *rreq), int (*dequeue_fn)(MPIR_Request *rreq)); #endif /* !defined(MPICH_MPIDI_CH3_POST_H_INCLUDED) */ diff --git a/src/mpid/ch3/channels/nemesis/include/mpidi_ch3_pre.h b/src/mpid/ch3/channels/nemesis/include/mpidi_ch3_pre.h index 3505ff3..3e80f7e 100644 --- a/src/mpid/ch3/channels/nemesis/include/mpidi_ch3_pre.h +++ b/src/mpid/ch3/channels/nemesis/include/mpidi_ch3_pre.h @@ -49,7 +49,7 @@ MPIDI_CH3I_VC_state_t; #define MPIDI_NEM_REQ_NETMOD_AREA_LEN 192 /* define functions for access MPID_nem_lmt_rts_queue_t */ -typedef GENERIC_Q_DECL(struct MPID_Request) MPID_nem_lmt_rts_queue_t; +typedef GENERIC_Q_DECL(struct MPIR_Request) MPID_nem_lmt_rts_queue_t; #define MPID_nem_lmt_rtsq_empty(q) GENERIC_Q_EMPTY (q) #define MPID_nem_lmt_rtsq_head(q) GENERIC_Q_HEAD (q) #define MPID_nem_lmt_rtsq_enqueue(qp, ep) do { \ @@ -66,7 +66,7 @@ typedef GENERIC_Q_DECL(struct MPID_Request) MPID_nem_lmt_rts_queue_t; } while (0) #define MPID_nem_lmt_rtsq_search_remove(qp, req_id, epp) do { \ GENERIC_Q_SEARCH_REMOVE(qp, _e->handle == (req_id), epp, \ - struct MPID_Request, dev.next); \ + struct MPIR_Request, dev.next); \ MPL_DBG_MSG_FMT(MPIDI_CH3_DBG_CHANNEL, VERBOSE, (MPL_DBG_FDEST, \ "MPID_nem_lmt_rtsq_search_remove req=%p (handle=%#x), queue=%p", \ *(epp), req_id, qp)); \ @@ -75,7 +75,7 @@ typedef GENERIC_Q_DECL(struct MPID_Request) MPID_nem_lmt_rts_queue_t; typedef struct MPIDI_CH3I_VC { int pg_rank; - struct MPID_Request *recv_active; + struct MPIR_Request *recv_active; int is_local; unsigned short send_seqno; @@ -102,10 +102,10 @@ typedef struct MPIDI_CH3I_VC message cannot be sent immediately, the function should create a request and return a pointer in sreq_ptr. The network module should complete the request once the message has been completely sent. */ int (* iStartContigMsg)(struct MPIDI_VC *vc, void *hdr, intptr_t hdr_sz, void *data, intptr_t data_sz, - struct MPID_Request **sreq_ptr); + struct MPIR_Request **sreq_ptr); /* iSentContig -- sends a message consisting of a header (hdr) and contiguous data (data), possibly of 0 size. The network module should complete the request once the message has been completely sent. */ - int (* iSendContig)(struct MPIDI_VC *vc, struct MPID_Request *sreq, void *hdr, intptr_t hdr_sz, + int (* iSendContig)(struct MPIDI_VC *vc, struct MPIR_Request *sreq, void *hdr, intptr_t hdr_sz, void *data, intptr_t data_sz); #ifdef ENABLE_CHECKPOINTING @@ -118,12 +118,12 @@ typedef struct MPIDI_CH3I_VC #endif /* LMT function pointers */ - int (* lmt_initiate_lmt)(struct MPIDI_VC *vc, union MPIDI_CH3_Pkt *rts_pkt, struct MPID_Request *req); - int (* lmt_start_recv)(struct MPIDI_VC *vc, struct MPID_Request *req, MPL_IOV s_cookie); - int (* lmt_start_send)(struct MPIDI_VC *vc, struct MPID_Request *sreq, MPL_IOV r_cookie); - int (* lmt_handle_cookie)(struct MPIDI_VC *vc, struct MPID_Request *req, MPL_IOV cookie); - int (* lmt_done_send)(struct MPIDI_VC *vc, struct MPID_Request *req); - int (* lmt_done_recv)(struct MPIDI_VC *vc, struct MPID_Request *req); + int (* lmt_initiate_lmt)(struct MPIDI_VC *vc, union MPIDI_CH3_Pkt *rts_pkt, struct MPIR_Request *req); + int (* lmt_start_recv)(struct MPIDI_VC *vc, struct MPIR_Request *req, MPL_IOV s_cookie); + int (* lmt_start_send)(struct MPIDI_VC *vc, struct MPIR_Request *sreq, MPL_IOV r_cookie); + int (* lmt_handle_cookie)(struct MPIDI_VC *vc, struct MPIR_Request *req, MPL_IOV cookie); + int (* lmt_done_send)(struct MPIDI_VC *vc, struct MPIR_Request *req); + int (* lmt_done_recv)(struct MPIDI_VC *vc, struct MPIR_Request *req); int (* lmt_vc_terminated)(struct MPIDI_VC *vc); /* LMT shared memory copy-buffer ptr */ @@ -167,7 +167,7 @@ struct MPIDI_CH3I_Request intptr_t header_sz; MPI_Request lmt_req_id; /* request id of remote side */ - struct MPID_Request *lmt_req; /* pointer to original send/recv request */ + struct MPIR_Request *lmt_req; /* pointer to original send/recv request */ intptr_t lmt_data_sz; /* data size to be transferred, after checking for truncation */ MPL_IOV lmt_tmp_cookie; /* temporary storage for received cookie */ void *s_cookie; /* temporary storage for the cookie data in case the packet can't be sent immediately */ @@ -184,7 +184,7 @@ struct MPIDI_CH3I_Request }; /* - * MPIDI_CH3_REQUEST_DECL (additions to MPID_Request) + * MPIDI_CH3_REQUEST_DECL (additions to MPIR_Request) */ #define MPIDI_CH3_REQUEST_DECL struct MPIDI_CH3I_Request ch; diff --git a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_cancel.c b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_cancel.c index 797ea63..794ff03 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_cancel.c +++ b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_cancel.c @@ -21,7 +21,7 @@ #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) /* returns zero in case request is canceled */ -int MPID_nem_llc_cancel_recv(struct MPIDI_VC *vc, struct MPID_Request *req) +int MPID_nem_llc_cancel_recv(struct MPIDI_VC *vc, struct MPIR_Request *req) { int canceled; MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_LLC_CANCEL_RECV); diff --git a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_impl.h b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_impl.h index b391a3e..667e0a4 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_impl.h +++ b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_impl.h @@ -22,15 +22,15 @@ extern int MPID_nem_llc_my_llc_rank; * GENERIC_Q_*: * src/mpid/ch3/channels/nemesis/include/mpid_nem_generic_queue.h */ -typedef GENERIC_Q_DECL(struct MPID_Request) rque_t; +typedef GENERIC_Q_DECL(struct MPIR_Request) rque_t; /* -typedef GENERIC_Q_DECL(struct MPID_Request) MPIDI_nem_llc_request_queue_t; +typedef GENERIC_Q_DECL(struct MPIR_Request) MPIDI_nem_llc_request_queue_t; */ typedef struct { uint64_t remote_endpoint_addr; void *endpoint; - rque_t send_queue; /* MPID_Request Queue */ + rque_t send_queue; /* MPIR_Request Queue */ unsigned int unsolicited_count; } MPID_nem_llc_vc_area; @@ -40,13 +40,13 @@ typedef struct { #define UNSOLICITED_NUM_INC(req) \ { \ - MPID_Request *sreq = req; \ + MPIR_Request *sreq = req; \ MPIDI_VC_t *vc = sreq->ch.vc; \ VC_FIELD(vc, unsolicited_count)++; \ } #define UNSOLICITED_NUM_DEC(req) \ { \ - MPID_Request *sreq = req; \ + MPIR_Request *sreq = req; \ MPIDI_VC_t *vc = sreq->ch.vc; \ VC_FIELD(vc, unsolicited_count)--; \ } @@ -80,37 +80,37 @@ int MPID_nem_llc_vc_terminate(MPIDI_VC_t * vc); int MPID_nem_llc_anysource_iprobe(int tag, MPIR_Comm * comm, int context_offset, int *flag, MPI_Status * status); int MPID_nem_llc_anysource_improbe(int tag, MPIR_Comm * comm, int context_offset, int *flag, - MPID_Request ** message, MPI_Status * status); + MPIR_Request ** message, MPI_Status * status); int MPID_nem_llc_get_ordering(int *ordering); -int MPID_nem_llc_iSendContig(MPIDI_VC_t * vc, MPID_Request * sreq, void *hdr, intptr_t hdr_sz, +int MPID_nem_llc_iSendContig(MPIDI_VC_t * vc, MPIR_Request * sreq, void *hdr, intptr_t hdr_sz, void *data, intptr_t data_sz); int MPID_nem_llc_iStartContigMsg(MPIDI_VC_t * vc, void *hdr, intptr_t hdr_sz, void *data, - intptr_t data_sz, MPID_Request ** sreq_ptr); -int MPID_nem_llc_SendNoncontig(MPIDI_VC_t * vc, MPID_Request * sreq, void *hdr, + intptr_t data_sz, MPIR_Request ** sreq_ptr); +int MPID_nem_llc_SendNoncontig(MPIDI_VC_t * vc, MPIR_Request * sreq, void *hdr, intptr_t hdr_sz); -int MPIDI_nem_llc_Rqst_iov_update(MPID_Request * mreq, intptr_t consume); +int MPIDI_nem_llc_Rqst_iov_update(MPIR_Request * mreq, intptr_t consume); int MPID_nem_llc_send_queued(MPIDI_VC_t * vc, rque_t * send_queue); int MPID_nem_llc_isend(struct MPIDI_VC *vc, const void *buf, int count, MPI_Datatype datatype, int dest, int tag, MPIR_Comm * comm, int context_offset, - struct MPID_Request **request); + struct MPIR_Request **request); int MPID_nem_llc_issend(struct MPIDI_VC *vc, const void *buf, int count, MPI_Datatype datatype, int dest, int tag, MPIR_Comm * comm, int context_offset, - struct MPID_Request **request); -int MPID_nem_llc_recv_posted(struct MPIDI_VC *vc, struct MPID_Request *req); + struct MPIR_Request **request); +int MPID_nem_llc_recv_posted(struct MPIDI_VC *vc, struct MPIR_Request *req); int MPID_nem_llc_kvs_put_binary(int from, const char *postfix, const uint8_t * buf, int length); int MPID_nem_llc_kvs_get_binary(int from, const char *postfix, char *buf, int length); -void MPID_nem_llc_anysource_posted(MPID_Request * req); -int MPID_nem_llc_anysource_matched(MPID_Request * req); +void MPID_nem_llc_anysource_posted(MPIR_Request * req); +int MPID_nem_llc_anysource_matched(MPIR_Request * req); int MPID_nem_llc_probe(MPIDI_VC_t * vc, int source, int tag, MPIR_Comm * comm, int context_offset, MPI_Status * status); int MPID_nem_llc_iprobe(MPIDI_VC_t * vc, int source, int tag, MPIR_Comm * comm, int context_offset, int *flag, MPI_Status * status); int MPID_nem_llc_improbe(MPIDI_VC_t * vc, int source, int tag, MPIR_Comm * comm, int context_offset, - int *flag, MPID_Request ** message, MPI_Status * status); -int MPID_nem_llc_cancel_recv(struct MPIDI_VC *vc, struct MPID_Request *req); + int *flag, MPIR_Request ** message, MPI_Status * status); +int MPID_nem_llc_cancel_recv(struct MPIDI_VC *vc, struct MPIR_Request *req); /* * temporary llc api diff --git a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_init.c b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_init.c index c1265d0..4ca395e 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_init.c +++ b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_init.c @@ -217,7 +217,7 @@ int MPID_nem_llc_anysource_iprobe(int tag, MPIR_Comm * comm, int context_offset, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_nem_llc_anysource_improbe(int tag, MPIR_Comm * comm, int context_offset, int *flag, - MPID_Request ** message, MPI_Status * status) + MPIR_Request ** message, MPI_Status * status) { return MPID_nem_llc_improbe(NULL, MPI_ANY_SOURCE, tag, comm, context_offset, flag, message, status); diff --git a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_poll.c b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_poll.c index d8d988d..d6015f9 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_poll.c +++ b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_poll.c @@ -55,8 +55,8 @@ int MPID_nem_llc_poll(int in_blocking_progress) static void MPID_nem_llc_send_handler(void *cba, uint64_t * p_reqid) { /* int mpi_errno = 0; */ - MPID_Request *sreq = cba; /* from llc_writev(,,,,cbarg,) */ - MPID_Request_kind_t kind; + MPIR_Request *sreq = cba; /* from llc_writev(,,,,cbarg,) */ + MPIR_Request_kind_t kind; /* MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_LLC_SEND_HANDLER); */ /* MPIDI_FUNC_ENTER(MPID_STATE_MPID_NEM_LLC_SEND_HANDLER); */ @@ -86,7 +86,7 @@ static void MPID_nem_llc_send_handler(void *cba, uint64_t * p_reqid) switch (kind) { unsigned int reqtype; case MPIR_REQUEST_SEND: - case MPID_PREQUEST_SEND:{ + case MPIR_PREQUEST_SEND:{ reqtype = MPIDI_Request_get_type(sreq); /* Free temporal buffer for non-contiguous data. @@ -123,7 +123,7 @@ static void MPID_nem_llc_send_handler(void *cba, uint64_t * p_reqid) /* sreq: src/mpid/ch3/include/mpidpre.h */ { MPIDI_VC_t *vc; - int (*reqFn) (MPIDI_VC_t * vc, MPID_Request * sreq, int *complete); + int (*reqFn) (MPIDI_VC_t * vc, MPIR_Request * sreq, int *complete); int complete; int r_mpi_errno; @@ -231,7 +231,7 @@ static void MPID_nem_llc_recv_handler(void *vp_vc, uint64_t raddr, void *buf, si #define FUNCNAME MPID_nem_llc_recv_posted #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_llc_recv_posted(struct MPIDI_VC *vc, struct MPID_Request *req) +int MPID_nem_llc_recv_posted(struct MPIDI_VC *vc, struct MPIR_Request *req) { int mpi_errno = MPI_SUCCESS, llc_errno; int dt_contig; @@ -346,7 +346,7 @@ int MPID_nem_llc_recv_posted(struct MPIDI_VC *vc, struct MPID_Request *req) #define FUNCNAME MPID_nem_llc_anysource_posted #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -void MPID_nem_llc_anysource_posted(MPID_Request * req) +void MPID_nem_llc_anysource_posted(MPIR_Request * req) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_LLC_AYSOURCE_POSTED); @@ -362,7 +362,7 @@ void MPID_nem_llc_anysource_posted(MPID_Request * req) #define FUNCNAME MPID_nem_llc_anysource_matched #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_llc_anysource_matched(MPID_Request * req) +int MPID_nem_llc_anysource_matched(MPIR_Request * req) { int matched = FALSE; diff --git a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_probe.c b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_probe.c index c6bc718..0e84902 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_probe.c +++ b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_probe.c @@ -113,7 +113,7 @@ int MPID_nem_llc_iprobe(MPIDI_VC_t * vc, int source, int tag, MPIR_Comm * comm, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_nem_llc_improbe(MPIDI_VC_t * vc, int source, int tag, MPIR_Comm * comm, int context_offset, - int *flag, MPID_Request ** message, MPI_Status * status) + int *flag, MPIR_Request ** message, MPI_Status * status) { int mpi_errno = MPI_SUCCESS; int rank; @@ -153,7 +153,7 @@ int MPID_nem_llc_improbe(MPIDI_VC_t * vc, int source, int tag, MPIR_Comm * comm, msg = LLC_mprobe(LLC_COMM_MPICH, rank, _tag, &mask, &probe); if (msg) { - MPID_Request *req; + MPIR_Request *req; *flag = 1; @@ -211,7 +211,7 @@ int MPID_nem_llc_improbe(MPIDI_VC_t * vc, int source, int tag, MPIR_Comm * comm, /* Wait until the reception of data is completed */ do { mpi_errno = MPID_nem_llc_poll(0); - } while (!MPID_Request_is_complete(req)); + } while (!MPIR_Request_is_complete(req)); // MPID_Request_complete(req); // This operation is done in llc_poll. diff --git a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_send.c b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_send.c index eeb0666..37ebaa5 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_send.c +++ b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_send.c @@ -22,7 +22,7 @@ #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_nem_llc_isend(struct MPIDI_VC *vc, const void *buf, int count, MPI_Datatype datatype, int dest, int tag, MPIR_Comm * comm, int context_offset, - struct MPID_Request **req_out) + struct MPIR_Request **req_out) { int mpi_errno = MPI_SUCCESS, llc_errno; int dt_contig; @@ -43,7 +43,7 @@ int MPID_nem_llc_isend(struct MPIDI_VC *vc, const void *buf, int count, MPI_Data LLC_comm_rank(LLC_COMM_MPICH, &LLC_my_rank); dprintf("llc_isend,LLC_my_rank=%d\n", LLC_my_rank); - struct MPID_Request *sreq = MPID_Request_create(); + struct MPIR_Request *sreq = MPID_Request_create(); MPIU_Assert(sreq != NULL); MPIU_Object_set_ref(sreq, 2); sreq->kind = MPIR_REQUEST_SEND; @@ -163,10 +163,10 @@ int MPID_nem_llc_isend(struct MPIDI_VC *vc, const void *buf, int count, MPI_Data #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_nem_llc_iStartContigMsg(MPIDI_VC_t * vc, void *hdr, intptr_t hdr_sz, void *data, - intptr_t data_sz, MPID_Request ** sreq_ptr) + intptr_t data_sz, MPIR_Request ** sreq_ptr) { int mpi_errno = MPI_SUCCESS; - MPID_Request *sreq = NULL; + MPIR_Request *sreq = NULL; MPID_nem_llc_vc_area *vc_llc = 0; int need_to_queue = 0; MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_LLC_ISTARTCONTIGMSG); @@ -254,7 +254,7 @@ int MPID_nem_llc_iStartContigMsg(MPIDI_VC_t * vc, void *hdr, intptr_t hdr_sz, vo #define FUNCNAME MPID_nem_llc_iSendContig #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_llc_iSendContig(MPIDI_VC_t * vc, MPID_Request * sreq, void *hdr, intptr_t hdr_sz, +int MPID_nem_llc_iSendContig(MPIDI_VC_t * vc, MPIR_Request * sreq, void *hdr, intptr_t hdr_sz, void *data, intptr_t data_sz) { int mpi_errno = MPI_SUCCESS; @@ -338,7 +338,7 @@ int MPID_nem_llc_iSendContig(MPIDI_VC_t * vc, MPID_Request * sreq, void *hdr, in #define FUNCNAME MPID_nem_llc_SendNoncontig #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_llc_SendNoncontig(MPIDI_VC_t * vc, MPID_Request * sreq, void *hdr, +int MPID_nem_llc_SendNoncontig(MPIDI_VC_t * vc, MPIR_Request * sreq, void *hdr, intptr_t hdr_sz) { int mpi_errno = MPI_SUCCESS; @@ -428,7 +428,7 @@ int MPID_nem_llc_send_queued(MPIDI_VC_t * vc, rque_t * send_queue) while (!MPIDI_CH3I_Sendq_empty(*send_queue)) { ssize_t ret = 0; - MPID_Request *sreq; + MPIR_Request *sreq; void *endpt = vc_llc->endpoint; MPL_IOV *iovs; int niov; @@ -472,7 +472,7 @@ int MPID_nem_llc_send_queued(MPIDI_VC_t * vc, rque_t * send_queue) #define FUNCNAME MPIDI_nem_llc_Rqst_iov_update #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_nem_llc_Rqst_iov_update(MPID_Request * mreq, intptr_t consume) +int MPIDI_nem_llc_Rqst_iov_update(MPIR_Request * mreq, intptr_t consume) { int ret = TRUE; /* intptr_t oconsume = consume; */ @@ -738,7 +738,7 @@ int llc_poll(int in_blocking_poll, llc_send_f sfnc, llc_recv_f rfnc) MPID_nem_llc_segv; } - /* Call send_handler. First arg is a pointer to MPID_Request */ + /* Call send_handler. First arg is a pointer to MPIR_Request */ (*sfnc) (((struct llc_cmd_area *) lcmd->usr_area)->cbarg, &reqid); /* Don't free iov_local[0].addr */ @@ -812,7 +812,7 @@ int llc_poll(int in_blocking_poll, llc_send_f sfnc, llc_recv_f rfnc) case LLC_EVENT_RECV_MATCHED:{ dprintf("llc_poll,EVENT_RECV_MATCHED\n"); lcmd = (LLC_cmd_t *) events[0].side.initiator.req_id; - MPID_Request *req = ((struct llc_cmd_area *) lcmd->usr_area)->cbarg; + MPIR_Request *req = ((struct llc_cmd_area *) lcmd->usr_area)->cbarg; if (req->kind != MPIR_REQUEST_MPROBE) { /* Unpack non-contiguous dt */ @@ -888,7 +888,7 @@ int llc_poll(int in_blocking_poll, llc_send_f sfnc, llc_recv_f rfnc) break; } case LLC_EVENT_TARGET_PROC_FAIL:{ - MPID_Request *req; + MPIR_Request *req; lcmd = (LLC_cmd_t *) events[0].side.initiator.req_id; MPIU_Assert(lcmd != 0); @@ -955,7 +955,7 @@ int llc_poll(int in_blocking_poll, llc_send_f sfnc, llc_recv_f rfnc) #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_nem_llc_issend(struct MPIDI_VC *vc, const void *buf, int count, MPI_Datatype datatype, int dest, int tag, MPIR_Comm * comm, int context_offset, - struct MPID_Request **request) + struct MPIR_Request **request) { int mpi_errno = MPI_SUCCESS, llc_errno; int dt_contig; @@ -976,7 +976,7 @@ int MPID_nem_llc_issend(struct MPIDI_VC *vc, const void *buf, int count, MPI_Dat LLC_comm_rank(LLC_COMM_MPICH, &LLC_my_rank); dprintf("llc_isend,LLC_my_rank=%d\n", LLC_my_rank); - struct MPID_Request *sreq = MPID_Request_create(); + struct MPIR_Request *sreq = MPID_Request_create(); MPIU_Assert(sreq != NULL); MPIU_Object_set_ref(sreq, 2); sreq->kind = MPIR_REQUEST_SEND; diff --git a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_cancel.c b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_cancel.c index e5ab577..74b7a9a 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_cancel.c +++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_cancel.c @@ -17,7 +17,7 @@ #define FUNCNAME MPID_nem_mxm_cancel_send #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_mxm_cancel_send(MPIDI_VC_t * vc, MPID_Request * req) +int MPID_nem_mxm_cancel_send(MPIDI_VC_t * vc, MPIR_Request * req) { int mpi_errno = MPI_SUCCESS; mxm_error_t ret = MXM_OK; @@ -52,7 +52,7 @@ int MPID_nem_mxm_cancel_send(MPIDI_VC_t * vc, MPID_Request * req) #define FUNCNAME MPID_nem_mxm_cancel_recv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_mxm_cancel_recv(MPIDI_VC_t * vc, MPID_Request * req) +int MPID_nem_mxm_cancel_recv(MPIDI_VC_t * vc, MPIR_Request * req) { int mpi_errno ATTRIBUTE((unused)) = MPI_SUCCESS; mxm_error_t ret = MXM_OK; diff --git a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_impl.h b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_impl.h index 4cc912b..661904b 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_impl.h +++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_impl.h @@ -33,40 +33,40 @@ int MPID_nem_mxm_vc_terminate(MPIDI_VC_t * vc); int MPID_nem_mxm_get_ordering(int *ordering); /* alternate interface */ -int MPID_nem_mxm_iSendContig(MPIDI_VC_t * vc, MPID_Request * sreq, void *hdr, intptr_t hdr_sz, +int MPID_nem_mxm_iSendContig(MPIDI_VC_t * vc, MPIR_Request * sreq, void *hdr, intptr_t hdr_sz, void *data, intptr_t data_sz); int MPID_nem_mxm_iStartContigMsg(MPIDI_VC_t * vc, void *hdr, intptr_t hdr_sz, void *data, - intptr_t data_sz, MPID_Request ** sreq_ptr); -int MPID_nem_mxm_SendNoncontig(MPIDI_VC_t * vc, MPID_Request * sreq, void *header, + intptr_t data_sz, MPIR_Request ** sreq_ptr); +int MPID_nem_mxm_SendNoncontig(MPIDI_VC_t * vc, MPIR_Request * sreq, void *header, intptr_t hdr_sz); /* direct interface */ -int MPID_nem_mxm_recv(MPIDI_VC_t * vc, MPID_Request * rreq); +int MPID_nem_mxm_recv(MPIDI_VC_t * vc, MPIR_Request * rreq); int MPID_nem_mxm_send(MPIDI_VC_t * vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, int rank, int tag, MPIR_Comm * comm, int context_offset, - MPID_Request ** sreq_p); + MPIR_Request ** sreq_p); int MPID_nem_mxm_ssend(MPIDI_VC_t * vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, int rank, int tag, MPIR_Comm * comm, int context_offset, - MPID_Request ** sreq_p); + MPIR_Request ** sreq_p); int MPID_nem_mxm_isend(MPIDI_VC_t * vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, int rank, int tag, MPIR_Comm * comm, int context_offset, - MPID_Request ** sreq_p); + MPIR_Request ** sreq_p); int MPID_nem_mxm_issend(MPIDI_VC_t * vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, int rank, int tag, MPIR_Comm * comm, int context_offset, - MPID_Request ** sreq_p); -int MPID_nem_mxm_cancel_send(MPIDI_VC_t * vc, MPID_Request * sreq); -int MPID_nem_mxm_cancel_recv(MPIDI_VC_t * vc, MPID_Request * rreq); + MPIR_Request ** sreq_p); +int MPID_nem_mxm_cancel_send(MPIDI_VC_t * vc, MPIR_Request * sreq); +int MPID_nem_mxm_cancel_recv(MPIDI_VC_t * vc, MPIR_Request * rreq); int MPID_nem_mxm_probe(MPIDI_VC_t * vc, int source, int tag, MPIR_Comm * comm, int context_offset, MPI_Status * status); int MPID_nem_mxm_iprobe(MPIDI_VC_t * vc, int source, int tag, MPIR_Comm * comm, int context_offset, int *flag, MPI_Status * status); int MPID_nem_mxm_improbe(MPIDI_VC_t * vc, int source, int tag, MPIR_Comm * comm, int context_offset, - int *flag, MPID_Request ** message, MPI_Status * status); + int *flag, MPIR_Request ** message, MPI_Status * status); int MPID_nem_mxm_anysource_iprobe(int tag, MPIR_Comm * comm, int context_offset, int *flag, MPI_Status * status); int MPID_nem_mxm_anysource_improbe(int tag, MPIR_Comm * comm, int context_offset, int *flag, - MPID_Request ** message, MPI_Status * status); + MPIR_Request ** message, MPI_Status * status); /* active message callback */ #define MXM_MPICH_HID_ADI_MSG 1 @@ -74,10 +74,10 @@ void MPID_nem_mxm_get_adi_msg(mxm_conn_h conn, mxm_imm_t imm, void *data, size_t length, size_t offset, int last); /* any source management */ -void MPID_nem_mxm_anysource_posted(MPID_Request * req); -int MPID_nem_mxm_anysource_matched(MPID_Request * req); +void MPID_nem_mxm_anysource_posted(MPIR_Request * req); +int MPID_nem_mxm_anysource_matched(MPIR_Request * req); -int _mxm_handle_sreq(MPID_Request * req); +int _mxm_handle_sreq(MPIR_Request * req); /* List type as queue * Operations, initialization etc @@ -174,7 +174,7 @@ typedef struct { } MPID_nem_mxm_req_t; typedef struct { - MPID_Request *ctx; + MPIR_Request *ctx; MPID_nem_mxm_req_t *mxm_req; mxm_req_buffer_t *iov_buf; int iov_count; @@ -184,7 +184,7 @@ typedef struct { /* macro for mxm private in REQ */ #define REQ_BASE(reqp) ((reqp) ? (MPID_nem_mxm_req_area *)((reqp)->ch.netmod_area.padding) : NULL) -typedef GENERIC_Q_DECL(struct MPID_Request) MPID_nem_mxm_reqq_t; +typedef GENERIC_Q_DECL(struct MPIR_Request) MPID_nem_mxm_reqq_t; #define MPID_nem_mxm_queue_empty(q) GENERIC_Q_EMPTY (q) #define MPID_nem_mxm_queue_head(q) GENERIC_Q_HEAD (q) #define MPID_nem_mxm_queue_enqueue(qp, ep) do { \ @@ -417,7 +417,7 @@ static inline char *_rank_val_to_str(int rank, char *out, int max) return out; } -static inline void _dbg_mxm_req(MPID_Request * req) +static inline void _dbg_mxm_req(MPIR_Request * req) { char tag_buf[128]; char rank_buf[128]; diff --git a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_poll.c b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_poll.c index 35b6391..3c922b1 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_poll.c +++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_poll.c @@ -13,11 +13,11 @@ #include "mxm_impl.h" static int _mxm_poll(void); -static int _mxm_handle_rreq(MPID_Request * req); +static int _mxm_handle_rreq(MPIR_Request * req); static void _mxm_recv_completion_cb(void *context); static int _mxm_irecv(MPID_nem_mxm_ep_t * ep, MPID_nem_mxm_req_area * req, int id, mxm_mq_h mxm_mq, mxm_tag_t mxm_tag); -static int _mxm_process_rdtype(MPID_Request ** rreq_p, MPI_Datatype datatype, +static int _mxm_process_rdtype(MPIR_Request ** rreq_p, MPI_Datatype datatype, MPIDU_Datatype* dt_ptr, intptr_t data_sz, const void *buf, int count, mxm_req_buffer_t ** iov_buf, int *iov_count); @@ -28,7 +28,7 @@ static int _mxm_process_rdtype(MPID_Request ** rreq_p, MPI_Datatype datatype, int MPID_nem_mxm_poll(int in_blocking_progress) { int mpi_errno = MPI_SUCCESS; - MPID_Request *req = NULL; + MPIR_Request *req = NULL; MPIDI_STATE_DECL(MPID_STATE_MXM_POLL); MPIDI_FUNC_ENTER(MPID_STATE_MXM_POLL); @@ -92,7 +92,7 @@ void MPID_nem_mxm_get_adi_msg(mxm_conn_h conn, mxm_imm_t imm, void *data, #define FUNCNAME MPID_nem_mxm_anysource_posted #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -void MPID_nem_mxm_anysource_posted(MPID_Request * req) +void MPID_nem_mxm_anysource_posted(MPIR_Request * req) { int mpi_errno = MPI_SUCCESS; @@ -114,7 +114,7 @@ void MPID_nem_mxm_anysource_posted(MPID_Request * req) #define FUNCNAME MPID_nem_mxm_anysource_matched #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_mxm_anysource_matched(MPID_Request * req) +int MPID_nem_mxm_anysource_matched(MPIR_Request * req) { mxm_error_t ret = MXM_OK; MPID_nem_mxm_req_area *req_area = NULL; @@ -152,7 +152,7 @@ int MPID_nem_mxm_anysource_matched(MPID_Request * req) #define FUNCNAME MPID_nem_mxm_recv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_mxm_recv(MPIDI_VC_t * vc, MPID_Request * rreq) +int MPID_nem_mxm_recv(MPIDI_VC_t * vc, MPIR_Request * rreq) { int mpi_errno = MPI_SUCCESS; intptr_t data_sz; @@ -228,7 +228,7 @@ int MPID_nem_mxm_recv(MPIDI_VC_t * vc, MPID_Request * rreq) } -static int _mxm_handle_rreq(MPID_Request * req) +static int _mxm_handle_rreq(MPIR_Request * req) { int complete = FALSE, found = FALSE; int dt_contig; @@ -345,7 +345,7 @@ static int _mxm_handle_rreq(MPID_Request * req) static void _mxm_recv_completion_cb(void *context) { - MPID_Request *req = (MPID_Request *) context; + MPIR_Request *req = (MPIR_Request *) context; mxm_recv_req_t *mxm_rreq; MPID_nem_mxm_req_area *req_area = NULL; @@ -436,12 +436,12 @@ static int _mxm_irecv(MPID_nem_mxm_ep_t * ep, MPID_nem_mxm_req_area * req, int i } -static int _mxm_process_rdtype(MPID_Request ** rreq_p, MPI_Datatype datatype, +static int _mxm_process_rdtype(MPIR_Request ** rreq_p, MPI_Datatype datatype, MPIDU_Datatype* dt_ptr, intptr_t data_sz, const void *buf, int count, mxm_req_buffer_t ** iov_buf, int *iov_count) { int mpi_errno = MPI_SUCCESS; - MPID_Request *rreq = *rreq_p; + MPIR_Request *rreq = *rreq_p; intptr_t last; MPL_IOV *iov; int n_iov = 0; diff --git a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_probe.c b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_probe.c index 21ec5a9..020ca84 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_probe.c +++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_probe.c @@ -110,7 +110,7 @@ int MPID_nem_mxm_iprobe(MPIDI_VC_t * vc, int source, int tag, MPIR_Comm * comm, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_nem_mxm_improbe(MPIDI_VC_t * vc, int source, int tag, MPIR_Comm * comm, int context_offset, - int *flag, MPID_Request ** message, MPI_Status * status) + int *flag, MPIR_Request ** message, MPI_Status * status) { int mpi_errno = MPI_SUCCESS; mxm_error_t err; @@ -131,7 +131,7 @@ int MPID_nem_mxm_improbe(MPIDI_VC_t * vc, int source, int tag, MPIR_Comm * comm, err = mxm_req_mprobe(&mxm_req, &mxm_msg); if (MXM_OK == err) { - MPID_Request *req; + MPIR_Request *req; *flag = 1; @@ -213,7 +213,7 @@ int MPID_nem_mxm_anysource_iprobe(int tag, MPIR_Comm * comm, int context_offset, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_nem_mxm_anysource_improbe(int tag, MPIR_Comm * comm, int context_offset, int *flag, - MPID_Request ** message, MPI_Status * status) + MPIR_Request ** message, MPI_Status * status) { return MPID_nem_mxm_improbe(NULL, MPI_ANY_SOURCE, tag, comm, context_offset, flag, message, status); diff --git a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c index 1af8e6b..49c489c 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c +++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c @@ -23,7 +23,7 @@ static void _mxm_send_completion_cb(void *context); static int _mxm_isend(MPID_nem_mxm_ep_t * ep, MPID_nem_mxm_req_area * req, int type, mxm_mq_h mxm_mq, int mxm_rank, int id, mxm_tag_t tag, int block); #if 0 /* Consider using this function in case non contiguous data */ -static int _mxm_process_sdtype(MPID_Request ** rreq_p, MPI_Datatype datatype, +static int _mxm_process_sdtype(MPIR_Request ** rreq_p, MPI_Datatype datatype, MPIDU_Datatype* dt_ptr, intptr_t data_sz, const void *buf, int count, mxm_req_buffer_t ** iov_buf, int *iov_count); #endif @@ -32,7 +32,7 @@ static int _mxm_process_sdtype(MPID_Request ** rreq_p, MPI_Datatype datatype, #define FUNCNAME MPID_nem_mxm_iSendContig #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_mxm_iSendContig(MPIDI_VC_t * vc, MPID_Request * sreq, void *hdr, intptr_t hdr_sz, +int MPID_nem_mxm_iSendContig(MPIDI_VC_t * vc, MPIR_Request * sreq, void *hdr, intptr_t hdr_sz, void *data, intptr_t data_sz) { int mpi_errno = MPI_SUCCESS; @@ -98,10 +98,10 @@ int MPID_nem_mxm_iSendContig(MPIDI_VC_t * vc, MPID_Request * sreq, void *hdr, in #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_nem_mxm_iStartContigMsg(MPIDI_VC_t * vc, void *hdr, intptr_t hdr_sz, void *data, - intptr_t data_sz, MPID_Request ** sreq_ptr) + intptr_t data_sz, MPIR_Request ** sreq_ptr) { int mpi_errno = MPI_SUCCESS; - MPID_Request *sreq = NULL; + MPIR_Request *sreq = NULL; MPID_nem_mxm_vc_area *vc_area = NULL; MPID_nem_mxm_req_area *req_area = NULL; @@ -162,7 +162,7 @@ int MPID_nem_mxm_iStartContigMsg(MPIDI_VC_t * vc, void *hdr, intptr_t hdr_sz, vo #define FUNCNAME MPID_nem_mxm_SendNoncontig #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_mxm_SendNoncontig(MPIDI_VC_t * vc, MPID_Request * sreq, void *hdr, +int MPID_nem_mxm_SendNoncontig(MPIDI_VC_t * vc, MPIR_Request * sreq, void *hdr, intptr_t hdr_sz) { int mpi_errno = MPI_SUCCESS; @@ -242,10 +242,10 @@ int MPID_nem_mxm_SendNoncontig(MPIDI_VC_t * vc, MPID_Request * sreq, void *hdr, #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_nem_mxm_send(MPIDI_VC_t * vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, int rank, int tag, MPIR_Comm * comm, int context_offset, - MPID_Request ** sreq_ptr) + MPIR_Request ** sreq_ptr) { int mpi_errno = MPI_SUCCESS; - MPID_Request *sreq = NULL; + MPIR_Request *sreq = NULL; MPIDU_Datatype*dt_ptr; int dt_contig; intptr_t data_sz; @@ -345,10 +345,10 @@ int MPID_nem_mxm_send(MPIDI_VC_t * vc, const void *buf, MPI_Aint count, MPI_Data #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_nem_mxm_ssend(MPIDI_VC_t * vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, int rank, int tag, MPIR_Comm * comm, int context_offset, - MPID_Request ** sreq_ptr) + MPIR_Request ** sreq_ptr) { int mpi_errno = MPI_SUCCESS; - MPID_Request *sreq = NULL; + MPIR_Request *sreq = NULL; MPIDU_Datatype*dt_ptr; int dt_contig; intptr_t data_sz; @@ -448,10 +448,10 @@ int MPID_nem_mxm_ssend(MPIDI_VC_t * vc, const void *buf, MPI_Aint count, MPI_Dat #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_nem_mxm_isend(MPIDI_VC_t * vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, int rank, int tag, MPIR_Comm * comm, int context_offset, - MPID_Request ** sreq_ptr) + MPIR_Request ** sreq_ptr) { int mpi_errno = MPI_SUCCESS; - MPID_Request *sreq = NULL; + MPIR_Request *sreq = NULL; MPIDU_Datatype*dt_ptr; int dt_contig; intptr_t data_sz; @@ -551,10 +551,10 @@ int MPID_nem_mxm_isend(MPIDI_VC_t * vc, const void *buf, MPI_Aint count, MPI_Dat #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_nem_mxm_issend(MPIDI_VC_t * vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, int rank, int tag, MPIR_Comm * comm, int context_offset, - MPID_Request ** sreq_ptr) + MPIR_Request ** sreq_ptr) { int mpi_errno = MPI_SUCCESS; - MPID_Request *sreq = NULL; + MPIR_Request *sreq = NULL; MPIDU_Datatype*dt_ptr; int dt_contig; intptr_t data_sz; @@ -648,7 +648,7 @@ int MPID_nem_mxm_issend(MPIDI_VC_t * vc, const void *buf, MPI_Aint count, MPI_Da } -int _mxm_handle_sreq(MPID_Request * req) +int _mxm_handle_sreq(MPIR_Request * req) { int complete = FALSE; MPID_nem_mxm_vc_area *vc_area = NULL; @@ -682,7 +682,7 @@ int _mxm_handle_sreq(MPID_Request * req) static void _mxm_send_completion_cb(void *context) { - MPID_Request *req = (MPID_Request *) context; + MPIR_Request *req = (MPIR_Request *) context; MPID_nem_mxm_vc_area *vc_area = NULL; MPID_nem_mxm_req_area *req_area = NULL; @@ -786,12 +786,12 @@ static int _mxm_isend(MPID_nem_mxm_ep_t * ep, MPID_nem_mxm_req_area * req, } #if 0 /* Consider using this function in case non contiguous data */ -static int _mxm_process_sdtype(MPID_Request ** sreq_p, MPI_Datatype datatype, +static int _mxm_process_sdtype(MPIR_Request ** sreq_p, MPI_Datatype datatype, MPIDU_Datatype* dt_ptr, intptr_t data_sz, const void *buf, int count, mxm_req_buffer_t ** iov_buf, int *iov_count) { int mpi_errno = MPI_SUCCESS; - MPID_Request *sreq = *sreq_p; + MPIR_Request *sreq = *sreq_p; intptr_t last; MPL_IOV *iov; int n_iov = 0; diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_cm.c b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_cm.c index ebdad1c..b935292 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_cm.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_cm.c @@ -94,7 +94,7 @@ static inline MPIDI_VC_t *ofi_wc_to_vc(cq_tagged_entry_t * wc) /* ------------------------------------------------------------------------ */ #undef FCNAME #define FCNAME DECL_FUNC(MPID_nem_ofi_conn_req_callback) -static inline int MPID_nem_ofi_conn_req_callback(cq_tagged_entry_t * wc, MPID_Request * rreq) +static inline int MPID_nem_ofi_conn_req_callback(cq_tagged_entry_t * wc, MPIR_Request * rreq) { int ret, len, mpi_errno = MPI_SUCCESS; char bc[OFI_KVSAPPSTRLEN]; @@ -159,7 +159,7 @@ static inline int MPID_nem_ofi_conn_req_callback(cq_tagged_entry_t * wc, MPID_Re #undef FCNAME #define FCNAME DECL_FUNC(MPID_nem_ofi_handle_packet) static inline int MPID_nem_ofi_handle_packet(cq_tagged_entry_t * wc ATTRIBUTE((unused)), - MPID_Request * rreq) + MPIR_Request * rreq) { int mpi_errno = MPI_SUCCESS; MPIDI_VC_t *vc; @@ -182,7 +182,7 @@ static inline int MPID_nem_ofi_handle_packet(cq_tagged_entry_t * wc ATTRIBUTE((u /* ------------------------------------------------------------------------ */ #undef FCNAME #define FCNAME DECL_FUNC(MPID_nem_ofi_cts_send_callback) -static inline int MPID_nem_ofi_cts_send_callback(cq_tagged_entry_t * wc, MPID_Request * sreq) +static inline int MPID_nem_ofi_cts_send_callback(cq_tagged_entry_t * wc, MPIR_Request * sreq) { int mpi_errno = MPI_SUCCESS; BEGIN_FUNC(FCNAME); @@ -202,13 +202,13 @@ static inline int MPID_nem_ofi_cts_send_callback(cq_tagged_entry_t * wc, MPID_Re /* ------------------------------------------------------------------------ */ #undef FCNAME #define FCNAME DECL_FUNC(MPID_nem_ofi_preposted_callback) -static inline int MPID_nem_ofi_preposted_callback(cq_tagged_entry_t * wc, MPID_Request * rreq) +static inline int MPID_nem_ofi_preposted_callback(cq_tagged_entry_t * wc, MPIR_Request * rreq) { int c, mpi_errno = MPI_SUCCESS; size_t pkt_len; char *pack_buffer = NULL; MPIDI_VC_t *vc; - MPID_Request *new_rreq, *sreq; + MPIR_Request *new_rreq, *sreq; BEGIN_FUNC(FCNAME); vc = ofi_wc_to_vc(wc); @@ -272,7 +272,7 @@ static inline int MPID_nem_ofi_preposted_callback(cq_tagged_entry_t * wc, MPID_R #undef FCNAME #define FCNAME DECL_FUNC(MPID_nem_ofi_connect_to_root_callback) int MPID_nem_ofi_connect_to_root_callback(cq_tagged_entry_t * wc ATTRIBUTE((unused)), - MPID_Request * sreq) + MPIR_Request * sreq) { int mpi_errno = MPI_SUCCESS; BEGIN_FUNC(FCNAME); @@ -296,7 +296,7 @@ int MPID_nem_ofi_connect_to_root_callback(cq_tagged_entry_t * wc ATTRIBUTE((unus int MPID_nem_ofi_cm_init(MPIDI_PG_t * pg_p, int pg_rank ATTRIBUTE((unused))) { int mpi_errno = MPI_SUCCESS; - MPID_Request *persistent_req, *conn_req; + MPIR_Request *persistent_req, *conn_req; BEGIN_FUNC(FCNAME); /* ------------------------------------- */ @@ -524,7 +524,7 @@ int MPID_nem_ofi_connect_to_root(const char *business_card, MPIDI_VC_t * new_vc) int len, ret, mpi_errno = MPI_SUCCESS, str_errno = MPI_SUCCESS; int my_bc_len = OFI_KVSAPPSTRLEN; char *addr = NULL, *bc = NULL, *my_bc = NULL; - MPID_Request *sreq; + MPIR_Request *sreq; uint64_t conn_req_send_bits; BEGIN_FUNC(FCNAME); diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h index 3dc4ccf..6c389f6 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h @@ -63,8 +63,8 @@ typedef struct fi_cq_tagged_entry cq_tagged_entry_t; typedef struct fi_cq_err_entry cq_err_entry_t; typedef struct fi_context context_t; typedef struct fi_msg_tagged msg_tagged_t; -typedef int (*event_callback_fn) (cq_tagged_entry_t * wc, MPID_Request *); -typedef int (*req_fn) (MPIDI_VC_t *, MPID_Request *, int *); +typedef int (*event_callback_fn) (cq_tagged_entry_t * wc, MPIR_Request *); +typedef int (*req_fn) (MPIDI_VC_t *, MPIR_Request *, int *); /* ******************************** */ /* Global Object for state tracking */ @@ -84,8 +84,8 @@ typedef struct { /* RTS-CTS-DATA exchanges */ int api_set; /* Used OFI API for send */ /* operations */ - MPID_Request *persistent_req; /* Unexpected request queue */ - MPID_Request *conn_req; /* Connection request */ + MPIR_Request *persistent_req; /* Unexpected request queue */ + MPIR_Request *conn_req; /* Connection request */ MPIDI_PG_t *pg_p; /* MPI Process group */ MPIDI_VC_t *cm_vcs; /* temporary VC's */ } MPID_nem_ofi_global_t __attribute__ ((aligned (MPID_NEM_CACHE_LINE_LEN))); @@ -120,7 +120,7 @@ typedef struct { MPIDI_VC_t *vc; /* VC paired with this request */ uint64_t tag; /* 64 bit tag request */ struct iovec iov[3]; /* scatter gather list */ - MPID_Request *parent; /* Parent request */ + MPIR_Request *parent; /* Parent request */ } MPID_nem_ofi_req_t; #define REQ_OFI(req) ((MPID_nem_ofi_req_t *)((req)->ch.netmod_area.padding)) @@ -240,15 +240,15 @@ fn_fail: \ /* ******************************** */ /* Request manipulation inlines */ /* ******************************** */ -static inline void MPID_nem_ofi_init_req(MPID_Request * req) +static inline void MPID_nem_ofi_init_req(MPIR_Request * req) { memset(REQ_OFI(req), 0, sizeof(MPID_nem_ofi_req_t)); } -static inline int MPID_nem_ofi_create_req(MPID_Request ** request, int refcnt) +static inline int MPID_nem_ofi_create_req(MPIR_Request ** request, int refcnt) { int mpi_errno = MPI_SUCCESS; - MPID_Request *req; + MPIR_Request *req; req = MPID_Request_create(); MPIU_Assert(req); MPIDI_Request_clear_dbg(req); @@ -258,12 +258,12 @@ static inline int MPID_nem_ofi_create_req(MPID_Request ** request, int refcnt) return mpi_errno; } -static inline int MPID_nem_ofi_create_req_lw(MPID_Request ** request, int refcnt) +static inline int MPID_nem_ofi_create_req_lw(MPIR_Request ** request, int refcnt) { int mpi_errno = MPI_SUCCESS; - MPID_Request *req; + MPIR_Request *req; - req = (MPID_Request *) MPIU_Handle_obj_alloc(&MPID_Request_mem); + req = (MPIR_Request *) MPIU_Handle_obj_alloc(&MPIR_Request_mem); if (req == NULL) MPID_Abort(NULL, MPI_ERR_NO_SPACE, -1, "Cannot allocate Request"); @@ -301,41 +301,41 @@ static inline int MPID_nem_ofi_create_req_lw(MPID_Request ** request, int refcnt _ret _fc_name(__VA_ARGS__); \ _ret _fc_name##_2(__VA_ARGS__); -DECLARE_TWO_API_SETS(int, MPID_nem_ofi_recv_posted, struct MPIDI_VC *vc, struct MPID_Request *req); +DECLARE_TWO_API_SETS(int, MPID_nem_ofi_recv_posted, struct MPIDI_VC *vc, struct MPIR_Request *req); DECLARE_TWO_API_SETS(int, MPID_nem_ofi_send, struct MPIDI_VC *vc, const void *buf, MPI_Aint count,\ MPI_Datatype datatype, int dest, int tag, MPIR_Comm * comm,\ - int context_offset, struct MPID_Request **request); + int context_offset, struct MPIR_Request **request); DECLARE_TWO_API_SETS(int, MPID_nem_ofi_isend, struct MPIDI_VC *vc, const void *buf, MPI_Aint count,\ MPI_Datatype datatype, int dest, int tag, MPIR_Comm * comm,\ - int context_offset, struct MPID_Request **request); + int context_offset, struct MPIR_Request **request); DECLARE_TWO_API_SETS(int, MPID_nem_ofi_ssend, struct MPIDI_VC *vc, const void *buf, MPI_Aint count,\ MPI_Datatype datatype, int dest, int tag, MPIR_Comm * comm, - int context_offset, struct MPID_Request **request); + int context_offset, struct MPIR_Request **request); DECLARE_TWO_API_SETS(int, MPID_nem_ofi_issend, struct MPIDI_VC *vc, const void *buf, MPI_Aint count,\ MPI_Datatype datatype, int dest, int tag, MPIR_Comm * comm,\ - int context_offset, struct MPID_Request **request); -int MPID_nem_ofi_cancel_send(struct MPIDI_VC *vc, struct MPID_Request *sreq); -int MPID_nem_ofi_cancel_recv(struct MPIDI_VC *vc, struct MPID_Request *rreq); + int context_offset, struct MPIR_Request **request); +int MPID_nem_ofi_cancel_send(struct MPIDI_VC *vc, struct MPIR_Request *sreq); +int MPID_nem_ofi_cancel_recv(struct MPIDI_VC *vc, struct MPIR_Request *rreq); DECLARE_TWO_API_SETS(int, MPID_nem_ofi_iprobe, struct MPIDI_VC *vc, int source, int tag, MPIR_Comm * comm, int context_offset, int *flag, MPI_Status * status); DECLARE_TWO_API_SETS(int, MPID_nem_ofi_improbe,struct MPIDI_VC *vc, int source, int tag, MPIR_Comm * comm, - int context_offset, int *flag, MPID_Request ** message, + int context_offset, int *flag, MPIR_Request ** message, MPI_Status * status); DECLARE_TWO_API_SETS(int, MPID_nem_ofi_anysource_iprobe,int tag, MPIR_Comm * comm, int context_offset, int *flag, MPI_Status * status); DECLARE_TWO_API_SETS(int, MPID_nem_ofi_anysource_improbe,int tag, MPIR_Comm * comm, int context_offset, - int *flag, MPID_Request ** message, MPI_Status * status); -DECLARE_TWO_API_SETS(void, MPID_nem_ofi_anysource_posted, MPID_Request * rreq); + int *flag, MPIR_Request ** message, MPI_Status * status); +DECLARE_TWO_API_SETS(void, MPID_nem_ofi_anysource_posted, MPIR_Request * rreq); -int MPID_nem_ofi_anysource_matched(MPID_Request * rreq); -int MPID_nem_ofi_send_data(cq_tagged_entry_t * wc, MPID_Request * sreq); -int MPID_nem_ofi_SendNoncontig(MPIDI_VC_t * vc, MPID_Request * sreq, +int MPID_nem_ofi_anysource_matched(MPIR_Request * rreq); +int MPID_nem_ofi_send_data(cq_tagged_entry_t * wc, MPIR_Request * sreq); +int MPID_nem_ofi_SendNoncontig(MPIDI_VC_t * vc, MPIR_Request * sreq, void *hdr, intptr_t hdr_sz); int MPID_nem_ofi_iStartContigMsg(MPIDI_VC_t * vc, void *hdr, intptr_t hdr_sz, - void *data, intptr_t data_sz, MPID_Request ** sreq_ptr); -int MPID_nem_ofi_iSendContig(MPIDI_VC_t * vc, MPID_Request * sreq, void *hdr, + void *data, intptr_t data_sz, MPIR_Request ** sreq_ptr); +int MPID_nem_ofi_iSendContig(MPIDI_VC_t * vc, MPIR_Request * sreq, void *hdr, intptr_t hdr_sz, void *data, intptr_t data_sz); /* ************************************************************************** */ diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_msg.c b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_msg.c index 19c1746..e6f88fe 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_msg.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_msg.c @@ -117,7 +117,7 @@ /* ------------------------------------------------------------------------ */ #undef FCNAME #define FCNAME DECL_FUNC(MPID_nem_ofi_data_callback) -static int MPID_nem_ofi_data_callback(cq_tagged_entry_t * wc, MPID_Request * sreq) +static int MPID_nem_ofi_data_callback(cq_tagged_entry_t * wc, MPIR_Request * sreq) { int complete = 0, mpi_errno = MPI_SUCCESS; MPIDI_VC_t *vc; @@ -166,10 +166,10 @@ static int MPID_nem_ofi_data_callback(cq_tagged_entry_t * wc, MPID_Request * sre /* ------------------------------------------------------------------------ */ #undef FCNAME #define FCNAME DECL_FUNC(MPID_nem_ofi_cts_recv_callback) -static int MPID_nem_ofi_cts_recv_callback(cq_tagged_entry_t * wc, MPID_Request * rreq) +static int MPID_nem_ofi_cts_recv_callback(cq_tagged_entry_t * wc, MPIR_Request * rreq) { int mpi_errno = MPI_SUCCESS; - MPID_Request *preq; + MPIR_Request *preq; MPIDI_VC_t *vc; BEGIN_FUNC(FCNAME); preq = REQ_OFI(rreq)->parent; @@ -214,13 +214,13 @@ static int MPID_nem_ofi_cts_recv_callback(cq_tagged_entry_t * wc, MPID_Request * #undef FCNAME #define FCNAME DECL_FUNC(MPID_nem_ofi_iSendContig) int MPID_nem_ofi_iSendContig(MPIDI_VC_t * vc, - MPID_Request * sreq, + MPIR_Request * sreq, void *hdr, intptr_t hdr_sz, void *data, intptr_t data_sz) { int pgid, c, mpi_errno = MPI_SUCCESS; char *pack_buffer = NULL; uint64_t match_bits; - MPID_Request *cts_req; + MPIR_Request *cts_req; intptr_t buf_offset = 0; size_t pkt_len; BEGIN_FUNC(FCNAME); @@ -272,13 +272,13 @@ int MPID_nem_ofi_iSendContig(MPIDI_VC_t * vc, #undef FCNAME #define FCNAME DECL_FUNC(MPID_nem_ofi_SendNoncontig) int MPID_nem_ofi_SendNoncontig(MPIDI_VC_t * vc, - MPID_Request * sreq, void *hdr, intptr_t hdr_sz) + MPIR_Request * sreq, void *hdr, intptr_t hdr_sz) { int c, pgid, mpi_errno = MPI_SUCCESS; char *pack_buffer; MPI_Aint data_sz; uint64_t match_bits; - MPID_Request *cts_req; + MPIR_Request *cts_req; intptr_t first, last; intptr_t buf_offset = 0; void *data = NULL; @@ -310,11 +310,11 @@ int MPID_nem_ofi_SendNoncontig(MPIDI_VC_t * vc, int MPID_nem_ofi_iStartContigMsg(MPIDI_VC_t * vc, void *hdr, intptr_t hdr_sz, - void *data, intptr_t data_sz, MPID_Request ** sreq_ptr) + void *data, intptr_t data_sz, MPIR_Request ** sreq_ptr) { int c, pgid, mpi_errno = MPI_SUCCESS; - MPID_Request *sreq; - MPID_Request *cts_req; + MPIR_Request *sreq; + MPIR_Request *cts_req; char *pack_buffer = NULL; uint64_t match_bits; size_t pkt_len; diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_probe_template.c b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_probe_template.c index 45440c9..5f46527 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_probe_template.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_probe_template.c @@ -17,7 +17,7 @@ #undef FCNAME #define FCNAME DECL_FUNC(peek_callback) static int -ADD_SUFFIX(peek_callback)(cq_tagged_entry_t * wc, MPID_Request * rreq) +ADD_SUFFIX(peek_callback)(cq_tagged_entry_t * wc, MPIR_Request * rreq) { int mpi_errno = MPI_SUCCESS; BEGIN_FUNC(FCNAME); @@ -41,13 +41,13 @@ int ADD_SUFFIX(MPID_nem_ofi_iprobe_impl)(struct MPIDI_VC *vc, int tag, MPIR_Comm * comm, int context_offset, - int *flag, MPI_Status * status, MPID_Request ** rreq_ptr) + int *flag, MPI_Status * status, MPIR_Request ** rreq_ptr) { int ret, mpi_errno = MPI_SUCCESS; fi_addr_t remote_proc = 0; uint64_t match_bits, mask_bits; size_t len; - MPID_Request rreq_s, *rreq; + MPIR_Request rreq_s, *rreq; BEGIN_FUNC(FCNAME); if (rreq_ptr) { @@ -155,7 +155,7 @@ int ADD_SUFFIX(MPID_nem_ofi_improbe)(struct MPIDI_VC *vc, int tag, MPIR_Comm * comm, int context_offset, - int *flag, MPID_Request ** message, MPI_Status * status) + int *flag, MPIR_Request ** message, MPI_Status * status) { int old_error = status->MPI_ERROR; int s; @@ -191,7 +191,7 @@ int ADD_SUFFIX(MPID_nem_ofi_anysource_iprobe)(int tag, int ADD_SUFFIX(MPID_nem_ofi_anysource_improbe)(int tag, MPIR_Comm * comm, int context_offset, - int *flag, MPID_Request ** message, MPI_Status * status) + int *flag, MPIR_Request ** message, MPI_Status * status) { int rc; BEGIN_FUNC(FCNAME); diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_progress.c b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_progress.c index 6bf5a01..d53e734 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_progress.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_progress.c @@ -15,9 +15,9 @@ /* ------------------------------------------------------------------------ */ /* This routine looks up the request that contains a context object */ /* ------------------------------------------------------------------------ */ -static inline MPID_Request *context_to_req(void *ofi_context) +static inline MPIR_Request *context_to_req(void *ofi_context) { - return (MPID_Request *) MPL_container_of(ofi_context, MPID_Request, ch.netmod_area.padding); + return (MPIR_Request *) MPL_container_of(ofi_context, MPIR_Request, ch.netmod_area.padding); } #define ADD_SUFFIX(name) name @@ -40,7 +40,7 @@ int MPID_nem_ofi_poll(int in_blocking_poll) cq_tagged_entry_t wc; cq_err_entry_t error; MPIDI_VC_t *vc; - MPID_Request *req; + MPIR_Request *req; req_fn reqFn; BEGIN_FUNC(FCNAME); do { diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_tagged.c b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_tagged.c index e616586..3d0d99d 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_tagged.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_tagged.c @@ -16,11 +16,11 @@ static inline int MPID_nem_ofi_sync_recv_callback(cq_tagged_entry_t * wc ATTRIBUTE((unused)), - MPID_Request * rreq); + MPIR_Request * rreq); static inline int MPID_nem_ofi_send_callback(cq_tagged_entry_t * wc ATTRIBUTE((unused)), - MPID_Request * sreq); + MPIR_Request * sreq); #define ADD_SUFFIX(name) name #undef API_SET @@ -38,7 +38,7 @@ MPID_nem_ofi_send_callback(cq_tagged_entry_t * wc ATTRIBUTE((unused)), #undef FCNAME #define FCNAME DECL_FUNC(MPID_nem_ofi_sync_recv_callback) static inline int MPID_nem_ofi_sync_recv_callback(cq_tagged_entry_t * wc ATTRIBUTE((unused)), - MPID_Request * rreq) + MPIR_Request * rreq) { int mpi_errno = MPI_SUCCESS; @@ -58,7 +58,7 @@ static inline int MPID_nem_ofi_sync_recv_callback(cq_tagged_entry_t * wc ATTRIBU #undef FCNAME #define FCNAME DECL_FUNC(MPID_nem_ofi_send_callback) static inline int MPID_nem_ofi_send_callback(cq_tagged_entry_t * wc ATTRIBUTE((unused)), - MPID_Request * sreq) + MPIR_Request * sreq) { int mpi_errno = MPI_SUCCESS; BEGIN_FUNC(FCNAME); @@ -94,14 +94,14 @@ static inline int MPID_nem_ofi_send_callback(cq_tagged_entry_t * wc ATTRIBUTE((u #undef FCNAME #define FCNAME DECL_FUNC(MPID_nem_ofi_cancel_send) -int MPID_nem_ofi_cancel_send(struct MPIDI_VC *vc ATTRIBUTE((unused)), struct MPID_Request *sreq) +int MPID_nem_ofi_cancel_send(struct MPIDI_VC *vc ATTRIBUTE((unused)), struct MPIR_Request *sreq) { DO_CANCEL(sreq); } #undef FCNAME #define FCNAME DECL_FUNC(MPID_nem_ofi_cancel_recv) -int MPID_nem_ofi_cancel_recv(struct MPIDI_VC *vc ATTRIBUTE((unused)), struct MPID_Request *rreq) +int MPID_nem_ofi_cancel_recv(struct MPIDI_VC *vc ATTRIBUTE((unused)), struct MPIR_Request *rreq) { DO_CANCEL(rreq); } @@ -109,7 +109,7 @@ int MPID_nem_ofi_cancel_recv(struct MPIDI_VC *vc ATTRIBUTE((unused)), struct MPI #undef FCNAME #define FCNAME DECL_FUNC(MPID_nem_ofi_anysource_matched) -int MPID_nem_ofi_anysource_matched(MPID_Request * rreq) +int MPID_nem_ofi_anysource_matched(MPIR_Request * rreq) { int matched = FALSE; int ret; diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_tagged_template.c b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_tagged_template.c index f9e9ffe..ea2fe3e 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_tagged_template.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_tagged_template.c @@ -19,13 +19,13 @@ #undef FCNAME #define FCNAME DECL_FUNC(MPID_nem_ofi_recv_callback) static inline -int ADD_SUFFIX(MPID_nem_ofi_recv_callback)(cq_tagged_entry_t * wc, MPID_Request * rreq) +int ADD_SUFFIX(MPID_nem_ofi_recv_callback)(cq_tagged_entry_t * wc, MPIR_Request * rreq) { int err0, err1, src, mpi_errno = MPI_SUCCESS; uint64_t ssend_bits; intptr_t sz; MPIDI_VC_t *vc; - MPID_Request *sync_req; + MPIR_Request *sync_req; BEGIN_FUNC(FCNAME); /* ---------------------------------------------------- */ /* Populate the MPI Status and unpack noncontig buffer */ @@ -109,7 +109,7 @@ int ADD_SUFFIX(MPID_nem_ofi_recv_callback)(cq_tagged_entry_t * wc, MPID_Request static inline int ADD_SUFFIX(send_normal)(struct MPIDI_VC *vc, const void *buf, int count, MPI_Datatype datatype, int dest, int tag, MPIR_Comm *comm, - int context_offset, MPID_Request **request, + int context_offset, MPIR_Request **request, int dt_contig, intptr_t data_sz, MPID_Datatype *dt_ptr, @@ -119,7 +119,7 @@ static inline int ADD_SUFFIX(send_normal)(struct MPIDI_VC *vc, int err0, err1, mpi_errno = MPI_SUCCESS; char *send_buffer; uint64_t match_bits, ssend_match, ssend_mask; - MPID_Request *sreq = NULL, *sync_req = NULL; + MPIR_Request *sreq = NULL, *sync_req = NULL; /* ---------------------------------------------------- */ /* Create the MPI request */ /* ---------------------------------------------------- */ @@ -269,7 +269,7 @@ ADD_SUFFIX(do_isend)(struct MPIDI_VC *vc, int tag, MPIR_Comm * comm, int context_offset, - struct MPID_Request **request, + struct MPIR_Request **request, int should_create_req, uint64_t send_type) { @@ -309,7 +309,7 @@ int ADD_SUFFIX(MPID_nem_ofi_send)(struct MPIDI_VC *vc, MPI_Aint count, MPI_Datatype datatype, int dest, - int tag, MPIR_Comm * comm, int context_offset, struct MPID_Request **request) + int tag, MPIR_Comm * comm, int context_offset, struct MPIR_Request **request) { int mpi_errno = MPI_SUCCESS; @@ -327,7 +327,7 @@ int ADD_SUFFIX(MPID_nem_ofi_isend)(struct MPIDI_VC *vc, MPI_Aint count, MPI_Datatype datatype, int dest, - int tag, MPIR_Comm * comm, int context_offset, struct MPID_Request **request) + int tag, MPIR_Comm * comm, int context_offset, struct MPIR_Request **request) { int mpi_errno = MPI_SUCCESS; BEGIN_FUNC(FCNAME); @@ -344,7 +344,7 @@ int ADD_SUFFIX(MPID_nem_ofi_ssend)(struct MPIDI_VC *vc, MPI_Aint count, MPI_Datatype datatype, int dest, - int tag, MPIR_Comm * comm, int context_offset, struct MPID_Request **request) + int tag, MPIR_Comm * comm, int context_offset, struct MPIR_Request **request) { int mpi_errno = MPI_SUCCESS; BEGIN_FUNC(FCNAME); @@ -362,7 +362,7 @@ int ADD_SUFFIX(MPID_nem_ofi_issend)(struct MPIDI_VC *vc, MPI_Datatype datatype, int dest, int tag, - MPIR_Comm * comm, int context_offset, struct MPID_Request **request) + MPIR_Comm * comm, int context_offset, struct MPIR_Request **request) { int mpi_errno = MPI_SUCCESS; BEGIN_FUNC(FCNAME); @@ -375,7 +375,7 @@ int ADD_SUFFIX(MPID_nem_ofi_issend)(struct MPIDI_VC *vc, #undef FCNAME #define FCNAME DECL_FUNC(MPID_nem_ofi_recv_posted) -int ADD_SUFFIX(MPID_nem_ofi_recv_posted)(struct MPIDI_VC *vc, struct MPID_Request *rreq) +int ADD_SUFFIX(MPID_nem_ofi_recv_posted)(struct MPIDI_VC *vc, struct MPIR_Request *rreq) { int mpi_errno = MPI_SUCCESS, dt_contig, src, tag; uint64_t match_bits = 0, mask_bits = 0; @@ -451,7 +451,7 @@ int ADD_SUFFIX(MPID_nem_ofi_recv_posted)(struct MPIDI_VC *vc, struct MPID_Reques #undef FCNAME #define FCNAME DECL_FUNC(MPID_nem_ofi_anysource_posted) -void ADD_SUFFIX(MPID_nem_ofi_anysource_posted)(MPID_Request * rreq) +void ADD_SUFFIX(MPID_nem_ofi_anysource_posted)(MPIR_Request * rreq) { int mpi_errno = MPI_SUCCESS; BEGIN_FUNC(FCNAME); diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h index 4bf4377..8f0d725 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h @@ -50,7 +50,7 @@ typedef struct { } MPID_nem_ptl_req_area; /* macro for ptl private in req */ -static inline MPID_nem_ptl_req_area * REQ_PTL(MPID_Request *req) { +static inline MPID_nem_ptl_req_area * REQ_PTL(MPIR_Request *req) { return (MPID_nem_ptl_req_area *)req->ch.netmod_area.padding; } @@ -141,10 +141,10 @@ int MPID_nem_ptl_nm_init(void); int MPID_nem_ptl_nm_finalize(void); int MPID_nem_ptl_nm_ctl_event_handler(const ptl_event_t *e); int MPID_nem_ptl_sendq_complete_with_error(MPIDI_VC_t *vc, int req_errno); -int MPID_nem_ptl_SendNoncontig(MPIDI_VC_t *vc, MPID_Request *sreq, void *hdr, intptr_t hdr_sz); +int MPID_nem_ptl_SendNoncontig(MPIDI_VC_t *vc, MPIR_Request *sreq, void *hdr, intptr_t hdr_sz); int MPID_nem_ptl_iStartContigMsg(MPIDI_VC_t *vc, void *hdr, intptr_t hdr_sz, void *data, intptr_t data_sz, - MPID_Request **sreq_ptr); -int MPID_nem_ptl_iSendContig(MPIDI_VC_t *vc, MPID_Request *sreq, void *hdr, intptr_t hdr_sz, + MPIR_Request **sreq_ptr); +int MPID_nem_ptl_iSendContig(MPIDI_VC_t *vc, MPIR_Request *sreq, void *hdr, intptr_t hdr_sz, void *data, intptr_t data_sz); int MPID_nem_ptl_poll_init(void); int MPID_nem_ptl_poll_finalize(void); @@ -154,41 +154,41 @@ int MPID_nem_ptl_get_id_from_bc(const char *business_card, ptl_process_t *id, pt ptl_pt_index_t *ptc, ptl_pt_index_t *ptr, ptl_pt_index_t *ptrg, ptl_pt_index_t *ptrc); /* comm override functions */ -int MPID_nem_ptl_recv_posted(struct MPIDI_VC *vc, struct MPID_Request *req); +int MPID_nem_ptl_recv_posted(struct MPIDI_VC *vc, struct MPIR_Request *req); /* isend is also used to implement send, rsend and irsend */ int MPID_nem_ptl_isend(struct MPIDI_VC *vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, - MPIR_Comm *comm, int context_offset, struct MPID_Request **request); + MPIR_Comm *comm, int context_offset, struct MPIR_Request **request); /* issend is also used to implement ssend */ int MPID_nem_ptl_issend(struct MPIDI_VC *vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, - MPIR_Comm *comm, int context_offset, struct MPID_Request **request); -int MPID_nem_ptl_cancel_send(struct MPIDI_VC *vc, struct MPID_Request *sreq); -int MPID_nem_ptl_cancel_recv(struct MPIDI_VC *vc, struct MPID_Request *rreq); + MPIR_Comm *comm, int context_offset, struct MPIR_Request **request); +int MPID_nem_ptl_cancel_send(struct MPIDI_VC *vc, struct MPIR_Request *sreq); +int MPID_nem_ptl_cancel_recv(struct MPIDI_VC *vc, struct MPIR_Request *rreq); int MPID_nem_ptl_probe(struct MPIDI_VC *vc, int source, int tag, MPIR_Comm *comm, int context_offset, MPI_Status *status); int MPID_nem_ptl_iprobe(struct MPIDI_VC *vc, int source, int tag, MPIR_Comm *comm, int context_offset, int *flag, MPI_Status *status); int MPID_nem_ptl_improbe(struct MPIDI_VC *vc, int source, int tag, MPIR_Comm *comm, int context_offset, int *flag, - MPID_Request **message, MPI_Status *status); + MPIR_Request **message, MPI_Status *status); int MPID_nem_ptl_anysource_iprobe(int tag, MPIR_Comm * comm, int context_offset, int *flag, MPI_Status * status); -int MPID_nem_ptl_anysource_improbe(int tag, MPIR_Comm * comm, int context_offset, int *flag, MPID_Request **message, +int MPID_nem_ptl_anysource_improbe(int tag, MPIR_Comm * comm, int context_offset, int *flag, MPIR_Request **message, MPI_Status * status); -void MPID_nem_ptl_anysource_posted(MPID_Request *rreq); -int MPID_nem_ptl_anysource_matched(MPID_Request *rreq); +void MPID_nem_ptl_anysource_posted(MPIR_Request *rreq); +int MPID_nem_ptl_anysource_matched(MPIR_Request *rreq); int MPID_nem_ptl_init_id(MPIDI_VC_t *vc); int MPID_nem_ptl_get_ordering(int *ordering); -int MPID_nem_ptl_lmt_initiate_lmt(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *rts_pkt, MPID_Request *req); -int MPID_nem_ptl_lmt_start_recv(MPIDI_VC_t *vc, MPID_Request *rreq, MPL_IOV s_cookie); -int MPID_nem_ptl_lmt_start_send(MPIDI_VC_t *vc, MPID_Request *sreq, MPL_IOV r_cookie); -int MPID_nem_ptl_lmt_handle_cookie(MPIDI_VC_t *vc, MPID_Request *req, MPL_IOV s_cookie); -int MPID_nem_ptl_lmt_done_send(MPIDI_VC_t *vc, MPID_Request *req); -int MPID_nem_ptl_lmt_done_recv(MPIDI_VC_t *vc, MPID_Request *req); +int MPID_nem_ptl_lmt_initiate_lmt(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *rts_pkt, MPIR_Request *req); +int MPID_nem_ptl_lmt_start_recv(MPIDI_VC_t *vc, MPIR_Request *rreq, MPL_IOV s_cookie); +int MPID_nem_ptl_lmt_start_send(MPIDI_VC_t *vc, MPIR_Request *sreq, MPL_IOV r_cookie); +int MPID_nem_ptl_lmt_handle_cookie(MPIDI_VC_t *vc, MPIR_Request *req, MPL_IOV s_cookie); +int MPID_nem_ptl_lmt_done_send(MPIDI_VC_t *vc, MPIR_Request *req); +int MPID_nem_ptl_lmt_done_recv(MPIDI_VC_t *vc, MPIR_Request *req); /* packet handlers */ int MPID_nem_ptl_pkt_cancel_send_req_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, - intptr_t *buflen, MPID_Request **rreqp); + intptr_t *buflen, MPIR_Request **rreqp); int MPID_nem_ptl_pkt_cancel_send_resp_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, - intptr_t *buflen, MPID_Request **rreqp); + intptr_t *buflen, MPIR_Request **rreqp); /* local packet types */ diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_lmt.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_lmt.c index a6f08ed..f6cdc06 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_lmt.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_lmt.c @@ -12,7 +12,7 @@ #define FUNCNAME MPID_nem_ptl_lmt_initiate_lmt #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_ptl_lmt_initiate_lmt(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *rts_pkt, MPID_Request *req) +int MPID_nem_ptl_lmt_initiate_lmt(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *rts_pkt, MPIR_Request *req) { /* Nothing to do here, but has to be defined for CH3 to follow the right path to MPID_nem_ptl_lmt_start_recv */ @@ -22,7 +22,7 @@ int MPID_nem_ptl_lmt_initiate_lmt(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *rts_pkt, MPID /* The following function is implemented in ptl_recv.c to make use of the handlers defined there */ -/* int MPID_nem_ptl_lmt_start_recv(MPIDI_VC_t *vc, MPID_Request *rreq, MPL_IOV s_cookie) */ +/* int MPID_nem_ptl_lmt_start_recv(MPIDI_VC_t *vc, MPIR_Request *rreq, MPL_IOV s_cookie) */ @@ -30,7 +30,7 @@ int MPID_nem_ptl_lmt_initiate_lmt(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *rts_pkt, MPID #define FUNCNAME MPID_nem_ptl_lmt_start_send #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_ptl_lmt_start_send(MPIDI_VC_t *vc, MPID_Request *sreq, MPL_IOV r_cookie) +int MPID_nem_ptl_lmt_start_send(MPIDI_VC_t *vc, MPIR_Request *sreq, MPL_IOV r_cookie) { MPIU_Assertp(0 && "This function shouldn't be called."); return MPI_ERR_INTERN; @@ -41,7 +41,7 @@ int MPID_nem_ptl_lmt_start_send(MPIDI_VC_t *vc, MPID_Request *sreq, MPL_IOV r_co #define FUNCNAME MPID_nem_ptl_lmt_handle_cookie #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_ptl_lmt_handle_cookie(MPIDI_VC_t *vc, MPID_Request *req, MPL_IOV s_cookie) +int MPID_nem_ptl_lmt_handle_cookie(MPIDI_VC_t *vc, MPIR_Request *req, MPL_IOV s_cookie) { MPIU_Assertp(0 && "This function shouldn't be called."); return MPI_ERR_INTERN; @@ -52,7 +52,7 @@ int MPID_nem_ptl_lmt_handle_cookie(MPIDI_VC_t *vc, MPID_Request *req, MPL_IOV s_ #define FUNCNAME MPID_nem_ptl_lmt_done_send #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_ptl_lmt_done_send(MPIDI_VC_t *vc, MPID_Request *req) +int MPID_nem_ptl_lmt_done_send(MPIDI_VC_t *vc, MPIR_Request *req) { MPIU_Assertp(0 && "This function shouldn't be called."); return MPI_ERR_INTERN; @@ -63,7 +63,7 @@ int MPID_nem_ptl_lmt_done_send(MPIDI_VC_t *vc, MPID_Request *req) #define FUNCNAME MPID_nem_ptl_lmt_done_recv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_ptl_lmt_done_recv(MPIDI_VC_t *vc, MPID_Request *req) +int MPID_nem_ptl_lmt_done_recv(MPIDI_VC_t *vc, MPIR_Request *req) { MPIU_Assertp(0 && "This function shouldn't be called."); return MPI_ERR_INTERN; diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c index bd385dc..2b59c89 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c @@ -25,7 +25,7 @@ static ptl_handle_me_t get_me_handle; /* AUX STUFF FOR REORDERING LOGIC */ -static GENERIC_Q_DECL(struct MPID_Request) reorder_queue; +static GENERIC_Q_DECL(struct MPIR_Request) reorder_queue; static char *expected_recv_ptr, *max_recv_ptr[NUM_RECV_BUFS]; static int expected_recv_idx; @@ -48,7 +48,7 @@ static inline void incr_expected_recv_ptr(size_t size) #define FUNCNAME handle_request #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int handle_request(MPID_Request *req) +static inline int handle_request(MPIR_Request *req) { int mpi_errno = MPID_nem_handle_pkt(req->ch.vc, TMPBUF(req), REQ_PTL(req)->bytes_put); incr_expected_recv_ptr(REQ_PTL(req)->bytes_put); @@ -64,19 +64,19 @@ static inline int handle_request(MPID_Request *req) #define FCNAME MPL_QUOTE(FUNCNAME) static inline int progress_reorder(void) { - MPID_Request *req; + MPIR_Request *req; int mpi_errno = MPI_SUCCESS; GENERIC_Q_SEARCH_REMOVE(&reorder_queue, REQ_PTL(_e)->recv_ptr == expected_recv_ptr, - &req, MPID_Request, dev.next); + &req, MPIR_Request, dev.next); while (req) { mpi_errno = handle_request(req); if (mpi_errno) MPIR_ERR_POP(mpi_errno); GENERIC_Q_SEARCH_REMOVE(&reorder_queue, REQ_PTL(_e)->recv_ptr == expected_recv_ptr, - &req, MPID_Request, dev.next); + &req, MPIR_Request, dev.next); } fn_exit: return mpi_errno; @@ -192,7 +192,7 @@ int MPID_nem_ptl_nm_finalize(void) #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) static inline int send_pkt(MPIDI_VC_t *vc, void *hdr_p, void *data_p, intptr_t data_sz, - MPID_Request *sreq) + MPIR_Request *sreq) { int mpi_errno = MPI_SUCCESS; MPID_nem_ptl_vc_area *const vc_ptl = VC_PTL(vc); @@ -258,7 +258,7 @@ static inline int send_pkt(MPIDI_VC_t *vc, void *hdr_p, void *data_p, intptr_t d #define FUNCNAME send_noncontig_pkt #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int send_noncontig_pkt(MPIDI_VC_t *vc, MPID_Request *sreq, void *hdr_p) +static int send_noncontig_pkt(MPIDI_VC_t *vc, MPIR_Request *sreq, void *hdr_p) { int mpi_errno = MPI_SUCCESS; MPID_nem_ptl_vc_area *const vc_ptl = VC_PTL(vc); @@ -333,7 +333,7 @@ static int send_noncontig_pkt(MPIDI_VC_t *vc, MPID_Request *sreq, void *hdr_p) #define FUNCNAME MPID_nem_ptl_SendNoncontig #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_ptl_SendNoncontig(MPIDI_VC_t *vc, MPID_Request *sreq, void *hdr, intptr_t hdr_sz) +int MPID_nem_ptl_SendNoncontig(MPIDI_VC_t *vc, MPIR_Request *sreq, void *hdr, intptr_t hdr_sz) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_PTL_SENDNONCONTIG); @@ -356,7 +356,7 @@ int MPID_nem_ptl_SendNoncontig(MPIDI_VC_t *vc, MPID_Request *sreq, void *hdr, in #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_nem_ptl_iStartContigMsg(MPIDI_VC_t *vc, void *hdr, intptr_t hdr_sz, void *data, - intptr_t data_sz, MPID_Request **sreq_ptr) + intptr_t data_sz, MPIR_Request **sreq_ptr) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_PTL_ISTARTCONTIGMSG); @@ -386,7 +386,7 @@ int MPID_nem_ptl_iStartContigMsg(MPIDI_VC_t *vc, void *hdr, intptr_t hdr_sz, voi #define FUNCNAME MPID_nem_ptl_iSendContig #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_ptl_iSendContig(MPIDI_VC_t *vc, MPID_Request *sreq, void *hdr, intptr_t hdr_sz, +int MPID_nem_ptl_iSendContig(MPIDI_VC_t *vc, MPIR_Request *sreq, void *hdr, intptr_t hdr_sz, void *data, intptr_t data_sz) { int mpi_errno = MPI_SUCCESS; @@ -409,9 +409,9 @@ int MPID_nem_ptl_iSendContig(MPIDI_VC_t *vc, MPID_Request *sreq, void *hdr, intp #define FUNCNAME on_data_avail #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int on_data_avail(MPID_Request * req) +static inline int on_data_avail(MPIR_Request * req) { - int (*reqFn) (MPIDI_VC_t *, MPID_Request *, int *); + int (*reqFn) (MPIDI_VC_t *, MPIR_Request *, int *); MPIDI_VC_t *vc = req->ch.vc; MPID_nem_ptl_vc_area *const vc_ptl = VC_PTL(vc); int mpi_errno = MPI_SUCCESS; @@ -484,7 +484,7 @@ int MPID_nem_ptl_nm_ctl_event_handler(const ptl_event_t *e) MPIR_ERR_POP(mpi_errno); } else { - MPID_Request *req = MPID_Request_create(); + MPIR_Request *req = MPID_Request_create(); /* This request is actually complete; just needs to wait to enforce ordering */ TMPBUF(req) = MPL_malloc(packet_sz); MPIU_Assert(TMPBUF(req)); @@ -501,7 +501,7 @@ int MPID_nem_ptl_nm_ctl_event_handler(const ptl_event_t *e) char *buf_ptr; ptl_size_t target_offset; - MPID_Request *req = MPID_Request_create(); + MPIR_Request *req = MPID_Request_create(); MPIU_Assert(req != NULL); MPIDI_CH3U_Request_decrement_cc(req, &incomplete); /* We'll increment it below */ REQ_PTL(req)->event_handler = MPID_nem_ptl_nm_ctl_event_handler; @@ -544,9 +544,9 @@ int MPID_nem_ptl_nm_ctl_event_handler(const ptl_event_t *e) case PTL_EVENT_GET: { MPI_Request handle = NPTL_MATCH_GET_TAG(e->match_bits); - MPID_Request *req = NULL; + MPIR_Request *req = NULL; - MPID_Request_get_ptr(handle, req); + MPIR_Request_get_ptr(handle, req); if (--REQ_PTL(req)->num_gets == 0) { MPL_free(TMPBUF(req)); if (REQ_PTL(req)->put_done) { @@ -561,7 +561,7 @@ int MPID_nem_ptl_nm_ctl_event_handler(const ptl_event_t *e) case PTL_EVENT_SEND: { - MPID_Request *const req = e->user_ptr; + MPIR_Request *const req = e->user_ptr; MPL_free(SENDBUF(req)); REQ_PTL(req)->put_done = 1; @@ -577,7 +577,7 @@ int MPID_nem_ptl_nm_ctl_event_handler(const ptl_event_t *e) case PTL_EVENT_REPLY: { int incomplete; - MPID_Request *const req = e->user_ptr; + MPIR_Request *const req = e->user_ptr; MPIDI_CH3U_Request_decrement_cc(req, &incomplete); if (!incomplete) { diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_poll.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_poll.c index 8365552..b580671 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_poll.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_poll.c @@ -183,7 +183,7 @@ int MPID_nem_ptl_poll(int is_blocking_poll) case PTL_EVENT_SEND: case PTL_EVENT_REPLY: case PTL_EVENT_SEARCH: { - MPID_Request * const req = event.user_ptr; + MPIR_Request * const req = event.user_ptr; MPL_DBG_MSG_P(MPIDI_CH3_DBG_CHANNEL, VERBOSE, "req = %p", req); MPL_DBG_MSG_P(MPIDI_CH3_DBG_CHANNEL, VERBOSE, "REQ_PTL(req)->event_handler = %p", REQ_PTL(req)->event_handler); if (REQ_PTL(req)->event_handler) { diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_probe.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_probe.c index 331d888..8c3d342 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_probe.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_probe.c @@ -13,7 +13,7 @@ static int handle_probe(const ptl_event_t *e) { int mpi_errno = MPI_SUCCESS; - MPID_Request *const req = e->user_ptr; + MPIR_Request *const req = e->user_ptr; MPIDI_STATE_DECL(MPID_STATE_HANDLE_PROBE); MPIDI_FUNC_ENTER(MPID_STATE_HANDLE_PROBE); @@ -44,7 +44,7 @@ static int handle_probe(const ptl_event_t *e) static int handle_mprobe(const ptl_event_t *e) { int mpi_errno = MPI_SUCCESS; - MPID_Request *const req = e->user_ptr; + MPIR_Request *const req = e->user_ptr; MPIU_CHKPMEM_DECL(1); MPIDI_STATE_DECL(MPID_STATE_HANDLE_PROBE); @@ -118,7 +118,7 @@ int MPID_nem_ptl_iprobe(MPIDI_VC_t *vc, int source, int tag, MPIR_Comm *comm, in int ret; ptl_process_t id_any; ptl_me_t me; - MPID_Request *req; + MPIR_Request *req; MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_PTL_IPROBE); MPIDI_FUNC_ENTER(MPID_STATE_MPID_NEM_PTL_IPROBE); @@ -165,7 +165,7 @@ int MPID_nem_ptl_iprobe(MPIDI_VC_t *vc, int source, int tag, MPIR_Comm *comm, in do { mpi_errno = MPID_nem_ptl_poll(FALSE); if (mpi_errno) MPIR_ERR_POP(mpi_errno); - } while (!MPID_Request_is_complete(req)); + } while (!MPIR_Request_is_complete(req)); *flag = REQ_PTL(req)->found; if (status != MPI_STATUS_IGNORE) @@ -185,14 +185,14 @@ int MPID_nem_ptl_iprobe(MPIDI_VC_t *vc, int source, int tag, MPIR_Comm *comm, in #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_nem_ptl_improbe(MPIDI_VC_t *vc, int source, int tag, MPIR_Comm *comm, int context_offset, int *flag, - MPID_Request **message, MPI_Status *status) + MPIR_Request **message, MPI_Status *status) { int mpi_errno = MPI_SUCCESS; MPID_nem_ptl_vc_area *const vc_ptl = VC_PTL(vc); int ret; ptl_process_t id_any; ptl_me_t me; - MPID_Request *req; + MPIR_Request *req; MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_PTL_IMPROBE); @@ -241,7 +241,7 @@ int MPID_nem_ptl_improbe(MPIDI_VC_t *vc, int source, int tag, MPIR_Comm *comm, i do { mpi_errno = MPID_nem_ptl_poll(FALSE); if (mpi_errno) MPIR_ERR_POP(mpi_errno); - } while (!MPID_Request_is_complete(req)); + } while (!MPIR_Request_is_complete(req)); *flag = REQ_PTL(req)->found; if (*flag) { @@ -285,7 +285,7 @@ int MPID_nem_ptl_anysource_iprobe(int tag, MPIR_Comm * comm, int context_offset, #define FUNCNAME MPID_nem_ptl_anysource_improbe #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_ptl_anysource_improbe(int tag, MPIR_Comm * comm, int context_offset, int *flag, MPID_Request **message, +int MPID_nem_ptl_anysource_improbe(int tag, MPIR_Comm * comm, int context_offset, int *flag, MPIR_Request **message, MPI_Status * status) { int mpi_errno = MPI_SUCCESS; @@ -307,12 +307,12 @@ int MPID_nem_ptl_anysource_improbe(int tag, MPIR_Comm * comm, int context_offset #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_nem_ptl_pkt_cancel_send_req_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, - intptr_t *buflen, MPID_Request **rreqp) + intptr_t *buflen, MPIR_Request **rreqp) { int ret, mpi_errno = MPI_SUCCESS; MPIDI_nem_ptl_pkt_cancel_send_req_t *req_pkt = (MPIDI_nem_ptl_pkt_cancel_send_req_t *)pkt; MPID_PKT_DECL_CAST(upkt, MPIDI_nem_ptl_pkt_cancel_send_resp_t, resp_pkt); - MPID_Request *search_req, *resp_req; + MPIR_Request *search_req, *resp_req; ptl_me_t me; MPID_nem_ptl_vc_area *const vc_ptl = VC_PTL(vc); @@ -353,7 +353,7 @@ int MPID_nem_ptl_pkt_cancel_send_req_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pk do { mpi_errno = MPID_nem_ptl_poll(FALSE); if (mpi_errno) MPIR_ERR_POP(mpi_errno); - } while (!MPID_Request_is_complete(search_req)); + } while (!MPIR_Request_is_complete(search_req)); /* send response */ resp_pkt->type = MPIDI_NEM_PKT_NETMOD; @@ -383,14 +383,14 @@ int MPID_nem_ptl_pkt_cancel_send_req_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pk #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_nem_ptl_pkt_cancel_send_resp_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, - intptr_t *buflen, MPID_Request **rreqp) + intptr_t *buflen, MPIR_Request **rreqp) { int mpi_errno = MPI_SUCCESS; - MPID_Request *sreq; + MPIR_Request *sreq; MPIDI_nem_ptl_pkt_cancel_send_resp_t *resp_pkt = (MPIDI_nem_ptl_pkt_cancel_send_resp_t *)pkt; int i, ret; - MPID_Request_get_ptr(resp_pkt->sender_req_id, sreq); + MPIR_Request_get_ptr(resp_pkt->sender_req_id, sreq); if (resp_pkt->ack) { MPIR_STATUS_SET_CANCEL_BIT(sreq->status, TRUE); diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_recv.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_recv.c index aa3ea1b..4f5953e 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_recv.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_recv.c @@ -14,7 +14,7 @@ static void dequeue_req(const ptl_event_t *e) { int found; - MPID_Request *const rreq = e->user_ptr; + MPIR_Request *const rreq = e->user_ptr; MPI_Aint s_len, r_len; /* At this point we know the ME is unlinked. Invalidate the handle to @@ -52,7 +52,7 @@ static void dequeue_req(const ptl_event_t *e) static int handler_recv_complete(const ptl_event_t *e) { int mpi_errno = MPI_SUCCESS; - MPID_Request *const rreq = e->user_ptr; + MPIR_Request *const rreq = e->user_ptr; int ret; int i; MPIDI_STATE_DECL(MPID_STATE_HANDLER_RECV_COMPLETE); @@ -89,7 +89,7 @@ static int handler_recv_complete(const ptl_event_t *e) static int handler_recv_dequeue_complete(const ptl_event_t *e) { int mpi_errno = MPI_SUCCESS; - MPID_Request *const rreq = e->user_ptr; + MPIR_Request *const rreq = e->user_ptr; int is_contig; MPI_Aint last; MPI_Aint dt_true_lb; @@ -145,7 +145,7 @@ static int handler_recv_dequeue_complete(const ptl_event_t *e) static int handler_recv_big_get(const ptl_event_t *e) { int mpi_errno = MPI_SUCCESS; - MPID_Request *const rreq = e->user_ptr; + MPIR_Request *const rreq = e->user_ptr; MPI_Aint last; MPIDI_STATE_DECL(MPID_STATE_HANDLER_RECV_UNPACK); @@ -179,7 +179,7 @@ static int handler_recv_big_get(const ptl_event_t *e) #define FUNCNAME big_get #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static void big_get(void *buf, ptl_size_t left_to_get, MPIDI_VC_t *vc, ptl_match_bits_t match_bits, MPID_Request *rreq) +static void big_get(void *buf, ptl_size_t left_to_get, MPIDI_VC_t *vc, ptl_match_bits_t match_bits, MPIR_Request *rreq) { int ret; MPID_nem_ptl_vc_area *vc_ptl; @@ -214,7 +214,7 @@ static void big_get(void *buf, ptl_size_t left_to_get, MPIDI_VC_t *vc, ptl_match static int handler_recv_unpack_complete(const ptl_event_t *e) { int mpi_errno = MPI_SUCCESS; - MPID_Request *const rreq = e->user_ptr; + MPIR_Request *const rreq = e->user_ptr; void *buf; MPI_Aint last; @@ -273,7 +273,7 @@ static int handler_recv_dequeue_unpack_complete(const ptl_event_t *e) static int handler_recv_dequeue_large(const ptl_event_t *e) { int mpi_errno = MPI_SUCCESS; - MPID_Request *const rreq = e->user_ptr; + MPIR_Request *const rreq = e->user_ptr; MPIDI_VC_t *vc; MPID_nem_ptl_vc_area *vc_ptl; int ret; @@ -373,7 +373,7 @@ static int handler_recv_dequeue_large(const ptl_event_t *e) static int handler_recv_dequeue_unpack_large(const ptl_event_t *e) { int mpi_errno = MPI_SUCCESS; - MPID_Request *const rreq = e->user_ptr; + MPIR_Request *const rreq = e->user_ptr; MPIDI_VC_t *vc; MPI_Aint last; void *buf; @@ -424,7 +424,7 @@ static int handler_recv_dequeue_unpack_large(const ptl_event_t *e) #define FUNCNAME MPID_nem_ptl_recv_posted #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_ptl_recv_posted(MPIDI_VC_t *vc, MPID_Request *rreq) +int MPID_nem_ptl_recv_posted(MPIDI_VC_t *vc, MPIR_Request *rreq) { int mpi_errno = MPI_SUCCESS; MPID_nem_ptl_vc_area *const vc_ptl = VC_PTL(vc); @@ -577,7 +577,7 @@ int MPID_nem_ptl_recv_posted(MPIDI_VC_t *vc, MPID_Request *rreq) #define FUNCNAME MPID_nem_ptl_anysource_posted #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -void MPID_nem_ptl_anysource_posted(MPID_Request *rreq) +void MPID_nem_ptl_anysource_posted(MPIR_Request *rreq) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_PTL_ANYSOURCE_POSTED); @@ -598,7 +598,7 @@ void MPID_nem_ptl_anysource_posted(MPID_Request *rreq) #define FUNCNAME cancel_recv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int cancel_recv(MPID_Request *rreq, int *cancelled) +static int cancel_recv(MPIR_Request *rreq, int *cancelled) { int mpi_errno = MPI_SUCCESS; int ptl_err = PTL_OK; @@ -630,7 +630,7 @@ static int cancel_recv(MPID_Request *rreq, int *cancelled) #define FUNCNAME MPID_nem_ptl_anysource_matched #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_ptl_anysource_matched(MPID_Request *rreq) +int MPID_nem_ptl_anysource_matched(MPIR_Request *rreq) { int mpi_errno, cancelled; @@ -657,7 +657,7 @@ int MPID_nem_ptl_anysource_matched(MPID_Request *rreq) #define FUNCNAME MPID_nem_ptl_cancel_recv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_ptl_cancel_recv(MPIDI_VC_t *vc, MPID_Request *rreq) +int MPID_nem_ptl_cancel_recv(MPIDI_VC_t *vc, MPIR_Request *rreq) { int mpi_errno, cancelled; @@ -684,7 +684,7 @@ int MPID_nem_ptl_cancel_recv(MPIDI_VC_t *vc, MPID_Request *rreq) #define FUNCNAME MPID_nem_ptl_lmt_start_recv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_ptl_lmt_start_recv(MPIDI_VC_t *vc, MPID_Request *rreq, MPL_IOV s_cookie) +int MPID_nem_ptl_lmt_start_recv(MPIDI_VC_t *vc, MPIR_Request *rreq, MPL_IOV s_cookie) { /* This function should only be called as a result of an Mrecv because of the CH3 protocol for Rendezvous Mrecvs. The regular CH3 protocol is not optimal for portals, since we don't need diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c index fb9a517..c7da822 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c @@ -11,7 +11,7 @@ #define FUNCNAME big_meappend #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static void big_meappend(void *buf, ptl_size_t left_to_send, MPIDI_VC_t *vc, ptl_match_bits_t match_bits, MPID_Request *sreq) +static void big_meappend(void *buf, ptl_size_t left_to_send, MPIDI_VC_t *vc, ptl_match_bits_t match_bits, MPIR_Request *sreq) { int i, ret, was_incomplete; MPID_nem_ptl_vc_area *vc_ptl; @@ -59,7 +59,7 @@ static void big_meappend(void *buf, ptl_size_t left_to_send, MPIDI_VC_t *vc, ptl static int handler_send(const ptl_event_t *e) { int mpi_errno = MPI_SUCCESS; - MPID_Request *const sreq = e->user_ptr; + MPIR_Request *const sreq = e->user_ptr; int i, ret; @@ -101,7 +101,7 @@ static int handler_send(const ptl_event_t *e) #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) static int send_msg(ptl_hdr_data_t ssend_flag, struct MPIDI_VC *vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, - int tag, MPIR_Comm *comm, int context_offset, struct MPID_Request **request) + int tag, MPIR_Comm *comm, int context_offset, struct MPIR_Request **request) { int mpi_errno = MPI_SUCCESS; MPID_nem_ptl_vc_area *const vc_ptl = VC_PTL(vc); @@ -110,7 +110,7 @@ static int send_msg(ptl_hdr_data_t ssend_flag, struct MPIDI_VC *vc, const void * int dt_contig; MPI_Aint dt_true_lb; MPIDU_Datatype*dt_ptr; - MPID_Request *sreq = NULL; + MPIR_Request *sreq = NULL; ptl_me_t me; int initial_iov_count, remaining_iov_count; ptl_md_t md; @@ -336,7 +336,7 @@ static int send_msg(ptl_hdr_data_t ssend_flag, struct MPIDI_VC *vc, const void * #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_nem_ptl_isend(struct MPIDI_VC *vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, - MPIR_Comm *comm, int context_offset, struct MPID_Request **request) + MPIR_Comm *comm, int context_offset, struct MPIR_Request **request) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_PTL_ISEND); @@ -355,7 +355,7 @@ int MPID_nem_ptl_isend(struct MPIDI_VC *vc, const void *buf, MPI_Aint count, MPI #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_nem_ptl_issend(struct MPIDI_VC *vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, - MPIR_Comm *comm, int context_offset, struct MPID_Request **request) + MPIR_Comm *comm, int context_offset, struct MPIR_Request **request) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_PTL_ISSEND); @@ -372,11 +372,11 @@ int MPID_nem_ptl_issend(struct MPIDI_VC *vc, const void *buf, MPI_Aint count, MP #define FUNCNAME MPID_nem_ptl_cancel_send #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_ptl_cancel_send(struct MPIDI_VC *vc, struct MPID_Request *sreq) +int MPID_nem_ptl_cancel_send(struct MPIDI_VC *vc, struct MPIR_Request *sreq) { int mpi_errno = MPI_SUCCESS; MPID_PKT_DECL_CAST(upkt, MPIDI_nem_ptl_pkt_cancel_send_req_t, csr_pkt); - MPID_Request *csr_sreq; + MPIR_Request *csr_sreq; int was_incomplete; MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_PTL_CANCEL_SEND); diff --git a/src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c b/src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c index ee592cf..bad6432 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c +++ b/src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c @@ -1580,9 +1580,9 @@ static int MPID_nem_tcp_recv_handler(sockconn_t *const sc) { /* there is a pending receive, receive it directly into the user buffer */ MPIDI_CH3I_VC *const sc_vc_ch = &sc_vc->ch; - MPID_Request *const rreq = sc_vc_ch->recv_active; + MPIR_Request *const rreq = sc_vc_ch->recv_active; MPL_IOV *iov = &rreq->dev.iov[rreq->dev.iov_offset]; - int (*reqFn)(MPIDI_VC_t *, MPID_Request *, int *); + int (*reqFn)(MPIDI_VC_t *, MPIR_Request *, int *); MPIU_Assert(rreq->dev.iov_count > 0); MPIU_Assert(rreq->dev.iov_count + rreq->dev.iov_offset <= MPL_IOV_LIMIT); diff --git a/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_ckpt.c b/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_ckpt.c index 0e7af16..1bded15 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_ckpt.c +++ b/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_ckpt.c @@ -37,7 +37,7 @@ fn_fail: #define FUNCNAME MPID_nem_tcp_ckpt_unpause_handler #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_tcp_pkt_unpause_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, intptr_t *buflen, MPID_Request **rreqp) +int MPID_nem_tcp_pkt_unpause_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, intptr_t *buflen, MPIR_Request **rreqp) { int mpi_errno = MPI_SUCCESS; MPID_nem_tcp_vc_area *vc_tcp = VC_TCP(vc); @@ -76,7 +76,7 @@ int MPID_nem_tcp_ckpt_continue_vc(MPIDI_VC_t *vc) { int mpi_errno = MPI_SUCCESS; MPID_PKT_DECL_CAST(upkt, MPIDI_nem_tcp_pkt_unpause_t, unpause_pkt); - MPID_Request *unpause_req; + MPIR_Request *unpause_req; MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_TCP_CKPT_CONTINUE_VC); MPIDI_FUNC_ENTER(MPID_STATE_MPID_NEM_TCP_CKPT_CONTINUE_VC); @@ -111,7 +111,7 @@ int MPID_nem_tcp_ckpt_restart_vc(MPIDI_VC_t *vc) int mpi_errno = MPI_SUCCESS; MPIDI_CH3_Pkt_t upkt; MPIDI_nem_tcp_pkt_unpause_t * const pkt = (MPIDI_nem_tcp_pkt_unpause_t *)&upkt; - MPID_Request *sreq; + MPIR_Request *sreq; MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_TCP_CKPT_RESTART_VC); MPIDI_FUNC_ENTER(MPID_STATE_MPID_NEM_TCP_CKPT_RESTART_VC); diff --git a/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_impl.h b/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_impl.h index 1cf13af..8a69317 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_impl.h +++ b/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_impl.h @@ -30,7 +30,7 @@ typedef enum{MPID_NEM_TCP_VC_STATE_DISCONNECTED, #define MPIDI_NEM_TCP_MAX_CONNECT_RETRIES 100 -typedef GENERIC_Q_DECL(struct MPID_Request) MPIDI_nem_tcp_request_queue_t; +typedef GENERIC_Q_DECL(struct MPIR_Request) MPIDI_nem_tcp_request_queue_t; /* The vc provides a generic buffer in which network modules can store private fields This removes all dependencies from the VC struction @@ -97,12 +97,12 @@ int MPID_nem_tcp_ckpt_cleanup(void); int MPID_nem_tcp_state_listening_handler(struct pollfd *const l_plfd, sockconn_t *const l_sc); int MPID_nem_tcp_send_queued(MPIDI_VC_t *vc, MPIDI_nem_tcp_request_queue_t *send_queue); -int MPID_nem_tcp_iSendContig(MPIDI_VC_t *vc, MPID_Request *sreq, void *hdr, intptr_t hdr_sz, void *data, intptr_t data_sz); +int MPID_nem_tcp_iSendContig(MPIDI_VC_t *vc, MPIR_Request *sreq, void *hdr, intptr_t hdr_sz, void *data, intptr_t data_sz); int MPID_nem_tcp_iStartContigMsg(MPIDI_VC_t *vc, void *hdr, intptr_t hdr_sz, void *data, intptr_t data_sz, - MPID_Request **sreq_ptr); + MPIR_Request **sreq_ptr); int MPID_nem_tcp_iStartContigMsg_paused(MPIDI_VC_t *vc, void *hdr, intptr_t hdr_sz, void *data, intptr_t data_sz, - MPID_Request **sreq_ptr); -int MPID_nem_tcp_SendNoncontig(MPIDI_VC_t *vc, MPID_Request *sreq, void *header, intptr_t hdr_sz); + MPIR_Request **sreq_ptr); +int MPID_nem_tcp_SendNoncontig(MPIDI_VC_t *vc, MPIR_Request *sreq, void *header, intptr_t hdr_sz); int MPID_nem_tcp_get_addr_port_from_bc(const char *business_card, struct in_addr *addr, in_port_t *port); void MPID_nem_tcp_vc_dbg_print_sendq(FILE *stream, MPIDI_VC_t *vc); @@ -113,7 +113,7 @@ int MPID_nem_tcp_vc_terminated(MPIDI_VC_t *vc); int MPID_nem_tcp_get_ordering(int *ordering); -int MPID_nem_tcp_pkt_unpause_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, intptr_t *buflen, MPID_Request **rreqp); +int MPID_nem_tcp_pkt_unpause_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, intptr_t *buflen, MPIR_Request **rreqp); /* Macros */ diff --git a/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_send.c b/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_send.c index fd45a61..417fbd1 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_send.c +++ b/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_send.c @@ -70,7 +70,7 @@ int MPID_nem_tcp_send_init(void) int MPID_nem_tcp_send_queued(MPIDI_VC_t *vc, MPIDI_nem_tcp_request_queue_t *send_queue) { int mpi_errno = MPI_SUCCESS; - MPID_Request *sreq; + MPIR_Request *sreq; intptr_t offset; MPL_IOV *iov; int complete; @@ -143,7 +143,7 @@ int MPID_nem_tcp_send_queued(MPIDI_VC_t *vc, MPIDI_nem_tcp_request_queue_t *send else { /* sent whole message */ - int (*reqFn)(MPIDI_VC_t *, MPID_Request *, int *); + int (*reqFn)(MPIDI_VC_t *, MPIR_Request *, int *); reqFn = sreq->dev.OnDataAvail; if (!reqFn) @@ -232,10 +232,10 @@ int MPID_nem_tcp_conn_est (MPIDI_VC_t *vc) #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_nem_tcp_iStartContigMsg(MPIDI_VC_t *vc, void *hdr, intptr_t hdr_sz, void *data, intptr_t data_sz, - MPID_Request **sreq_ptr) + MPIR_Request **sreq_ptr) { int mpi_errno = MPI_SUCCESS; - MPID_Request * sreq = NULL; + MPIR_Request * sreq = NULL; intptr_t offset = 0; MPID_nem_tcp_vc_area *vc_tcp = VC_TCP(vc); sockconn_t *sc = vc_tcp->sc; @@ -372,10 +372,10 @@ fn_fail: #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_nem_tcp_iStartContigMsg_paused(MPIDI_VC_t *vc, void *hdr, intptr_t hdr_sz, void *data, intptr_t data_sz, - MPID_Request **sreq_ptr) + MPIR_Request **sreq_ptr) { int mpi_errno = MPI_SUCCESS; - MPID_Request * sreq = NULL; + MPIR_Request * sreq = NULL; intptr_t offset = 0; MPID_nem_tcp_vc_area *vc_tcp = VC_TCP(vc); sockconn_t *sc = vc_tcp->sc; @@ -505,7 +505,7 @@ fn_fail: #define FUNCNAME MPID_nem_tcp_iSendContig #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_tcp_iSendContig(MPIDI_VC_t *vc, MPID_Request *sreq, void *hdr, intptr_t hdr_sz, +int MPID_nem_tcp_iSendContig(MPIDI_VC_t *vc, MPIR_Request *sreq, void *hdr, intptr_t hdr_sz, void *data, intptr_t data_sz) { int mpi_errno = MPI_SUCCESS; @@ -572,7 +572,7 @@ int MPID_nem_tcp_iSendContig(MPIDI_VC_t *vc, MPID_Request *sreq, void *hdr, intp if (offset == sizeof(MPIDI_CH3_Pkt_t) + sreq->dev.ext_hdr_sz + data_sz) { /* sent whole message */ - int (*reqFn)(MPIDI_VC_t *, MPID_Request *, int *); + int (*reqFn)(MPIDI_VC_t *, MPIR_Request *, int *); reqFn = sreq->dev.OnDataAvail; if (!reqFn) @@ -695,7 +695,7 @@ fn_fail: #define FUNCNAME MPID_nem_tcp_SendNoncontig #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_tcp_SendNoncontig(MPIDI_VC_t *vc, MPID_Request *sreq, void *header, intptr_t hdr_sz) +int MPID_nem_tcp_SendNoncontig(MPIDI_VC_t *vc, MPIR_Request *sreq, void *header, intptr_t hdr_sz) { int mpi_errno = MPI_SUCCESS; int iov_n; @@ -800,7 +800,7 @@ int MPID_nem_tcp_SendNoncontig(MPIDI_VC_t *vc, MPID_Request *sreq, void *header, if (complete) { /* sent whole iov */ - int (*reqFn)(MPIDI_VC_t *, MPID_Request *, int *); + int (*reqFn)(MPIDI_VC_t *, MPIR_Request *, int *); reqFn = sreq->dev.OnDataAvail; if (!reqFn) @@ -865,7 +865,7 @@ fn_fail: int MPID_nem_tcp_error_out_send_queue(struct MPIDI_VC *const vc, int req_errno) { int mpi_errno = MPI_SUCCESS; - MPID_Request *req; + MPIR_Request *req; MPID_nem_tcp_vc_area *const vc_tcp = VC_TCP(vc); MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_TCP_ERROR_OUT_SEND_QUEUE); diff --git a/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_utility.c b/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_utility.c index 90f685a..b2f8573 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_utility.c +++ b/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_utility.c @@ -209,7 +209,7 @@ int MPID_nem_tcp_is_sock_connected(int fd) void MPID_nem_tcp_vc_dbg_print_sendq(FILE *stream, MPIDI_VC_t *vc) { int i; - MPID_Request *sreq; + MPIR_Request *sreq; MPID_nem_tcp_vc_area *vc_tcp = VC_TCP(vc); fprintf(stream, ".. sc=%p fd=%d vc_tcp->state=%d\n", vc_tcp->sc, (vc_tcp->sc ? vc_tcp->sc->fd : -1), vc_tcp->state); diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_isend.c b/src/mpid/ch3/channels/nemesis/src/ch3_isend.c index 6144cc1..5192ead 100644 --- a/src/mpid/ch3/channels/nemesis/src/ch3_isend.c +++ b/src/mpid/ch3/channels/nemesis/src/ch3_isend.c @@ -15,7 +15,7 @@ #define FUNCNAME MPIDI_CH3_iSend #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3_iSend (MPIDI_VC_t *vc, MPID_Request *sreq, void * hdr, intptr_t hdr_sz) +int MPIDI_CH3_iSend (MPIDI_VC_t *vc, MPIR_Request *sreq, void * hdr, intptr_t hdr_sz) { int mpi_errno = MPI_SUCCESS; int again = 0; @@ -61,7 +61,7 @@ int MPIDI_CH3_iSend (MPIDI_VC_t *vc, MPID_Request *sreq, void * hdr, intptr_t hd } else { - int (*reqFn)(MPIDI_VC_t *, MPID_Request *, int *); + int (*reqFn)(MPIDI_VC_t *, MPIR_Request *, int *); reqFn = sreq->dev.OnDataAvail; if (!reqFn) diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_isendv.c b/src/mpid/ch3/channels/nemesis/src/ch3_isendv.c index 432d2f5..3bc9762 100644 --- a/src/mpid/ch3/channels/nemesis/src/ch3_isendv.c +++ b/src/mpid/ch3/channels/nemesis/src/ch3_isendv.c @@ -17,7 +17,7 @@ extern void *MPIDI_CH3_packet_buffer; #define FUNCNAME MPIDI_CH3_iSendv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3_iSendv (MPIDI_VC_t *vc, MPID_Request *sreq, MPL_IOV *iov, int n_iov) +int MPIDI_CH3_iSendv (MPIDI_VC_t *vc, MPIR_Request *sreq, MPL_IOV *iov, int n_iov) { int mpi_errno = MPI_SUCCESS; int again = 0; @@ -120,7 +120,7 @@ int MPIDI_CH3_iSendv (MPIDI_VC_t *vc, MPID_Request *sreq, MPL_IOV *iov, int n_io } else { - int (*reqFn)(MPIDI_VC_t *, MPID_Request *, int *); + int (*reqFn)(MPIDI_VC_t *, MPIR_Request *, int *); reqFn = sreq->dev.OnDataAvail; if (!reqFn) diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_istartmsg.c b/src/mpid/ch3/channels/nemesis/src/ch3_istartmsg.c index c0ce1ef..cb226e3 100644 --- a/src/mpid/ch3/channels/nemesis/src/ch3_istartmsg.c +++ b/src/mpid/ch3/channels/nemesis/src/ch3_istartmsg.c @@ -24,7 +24,7 @@ #define FUNCNAME MPIDI_CH3_iStartMsg #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3_iStartMsg (MPIDI_VC_t *vc, void *hdr, intptr_t hdr_sz, MPID_Request **sreq_ptr) +int MPIDI_CH3_iStartMsg (MPIDI_VC_t *vc, void *hdr, intptr_t hdr_sz, MPIR_Request **sreq_ptr) { int mpi_errno = MPI_SUCCESS; int again = 0; @@ -84,7 +84,7 @@ int MPIDI_CH3_iStartMsg (MPIDI_VC_t *vc, void *hdr, intptr_t hdr_sz, MPID_Reques enqueue_it: { - MPID_Request * sreq = NULL; + MPIR_Request * sreq = NULL; MPL_DBG_MSG(MPIDI_CH3_DBG_OTHER, TERSE, "enqueuing"); diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_istartmsgv.c b/src/mpid/ch3/channels/nemesis/src/ch3_istartmsgv.c index d3d77c0..2732eea 100644 --- a/src/mpid/ch3/channels/nemesis/src/ch3_istartmsgv.c +++ b/src/mpid/ch3/channels/nemesis/src/ch3_istartmsgv.c @@ -30,9 +30,9 @@ #define FUNCNAME MPIDI_CH3_iStartMsgv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3_iStartMsgv (MPIDI_VC_t *vc, MPL_IOV *iov, int n_iov, MPID_Request **sreq_ptr) +int MPIDI_CH3_iStartMsgv (MPIDI_VC_t *vc, MPL_IOV *iov, int n_iov, MPIR_Request **sreq_ptr) { - MPID_Request * sreq = *sreq_ptr = NULL; + MPIR_Request * sreq = *sreq_ptr = NULL; int mpi_errno = MPI_SUCCESS; int in_cs = FALSE; int again = 0; diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_progress.c b/src/mpid/ch3/channels/nemesis/src/ch3_progress.c index d02089b..d3b7a8f 100644 --- a/src/mpid/ch3/channels/nemesis/src/ch3_progress.c +++ b/src/mpid/ch3/channels/nemesis/src/ch3_progress.c @@ -19,7 +19,7 @@ typedef struct vc_term_element { struct vc_term_element *next; MPIDI_VC_t *vc; - MPID_Request *req; + MPIR_Request *req; } vc_term_element_t; static struct { vc_term_element_t *head, *tail; } vc_term_queue; @@ -39,10 +39,10 @@ static MPIDI_CH3_PktHandler_Fcn *pktArray[PKTARRAY_SIZE]; #endif #ifdef BY_PASS_PROGRESS -extern MPID_Request ** const MPID_Recvq_posted_head_ptr; -extern MPID_Request ** const MPID_Recvq_unexpected_head_ptr; -extern MPID_Request ** const MPID_Recvq_posted_tail_ptr; -extern MPID_Request ** const MPID_Recvq_unexpected_tail_ptr; +extern MPIR_Request ** const MPID_Recvq_posted_head_ptr; +extern MPIR_Request ** const MPID_Recvq_unexpected_head_ptr; +extern MPIR_Request ** const MPID_Recvq_posted_tail_ptr; +extern MPIR_Request ** const MPID_Recvq_unexpected_tail_ptr; #endif OPA_int_t MPIDI_CH3I_progress_completion_count = OPA_INT_T_INITIALIZER(0); @@ -64,9 +64,9 @@ static volatile int sigusr1_count = 0; static int my_sigusr1_count = 0; MPIDI_CH3I_shm_sendq_t MPIDI_CH3I_shm_sendq = {NULL, NULL}; -struct MPID_Request *MPIDI_CH3I_shm_active_send = NULL; +struct MPIR_Request *MPIDI_CH3I_shm_active_send = NULL; -static int pkt_NETMOD_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, intptr_t *buflen, MPID_Request **rreqp); +static int pkt_NETMOD_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, intptr_t *buflen, MPIR_Request **rreqp); static int shm_connection_terminated(MPIDI_VC_t * vc); static int check_terminating_vcs(void); @@ -78,8 +78,8 @@ int MPID_nem_local_lmt_pending = FALSE; typedef struct qn_ent { struct qn_ent *next; - void (*enqueue_fn)(MPID_Request *rreq); - int (*dequeue_fn)(MPID_Request *rreq); + void (*enqueue_fn)(MPIR_Request *rreq); + int (*dequeue_fn)(MPIR_Request *rreq); } qn_ent_t; static qn_ent_t *qn_head = NULL; @@ -116,7 +116,7 @@ static int check_terminating_vcs(void) MPIDI_FUNC_ENTER(MPID_STATE_CHECK_TERMINATING_VCS); - while (!TERMQ_EMPTY() && MPID_Request_is_complete(TERMQ_HEAD()->req)) { + while (!TERMQ_EMPTY() && MPIR_Request_is_complete(TERMQ_HEAD()->req)) { vc_term_element_t *ep; TERMQ_DEQUEUE(&ep); MPID_Request_release(ep->req); @@ -145,7 +145,7 @@ int MPIDI_CH3I_Shm_send_progress(void) int mpi_errno = MPI_SUCCESS; MPL_IOV *iov; int n_iov; - MPID_Request *sreq; + MPIR_Request *sreq; int again = 0; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3I_SHM_SEND_PROGRESS); @@ -487,7 +487,7 @@ int MPIDI_CH3I_Progress (MPID_Progress_state *progress_state, int is_blocking) do { - MPID_Request *rreq; + MPIR_Request *rreq; MPID_nem_cell_ptr_t cell; int in_fbox = 0; MPIDI_VC_t *vc; @@ -735,7 +735,7 @@ void MPIDI_CH3I_Progress_wakeup(void) int MPID_nem_handle_pkt(MPIDI_VC_t *vc, char *buf, intptr_t buflen) { int mpi_errno = MPI_SUCCESS; - MPID_Request *rreq = NULL; + MPIR_Request *rreq = NULL; int complete; MPIDI_CH3I_VC *vc_ch = &vc->ch; MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_HANDLE_PKT); @@ -877,7 +877,7 @@ int MPID_nem_handle_pkt(MPIDI_VC_t *vc, char *buf, intptr_t buflen) } else { - int (*reqFn)(MPIDI_VC_t *, MPID_Request *, int *); + int (*reqFn)(MPIDI_VC_t *, MPIR_Request *, int *); reqFn = rreq->dev.OnDataAvail; if (!reqFn) @@ -1146,7 +1146,7 @@ int MPIDI_CH3_Connection_terminate(MPIDI_VC_t * vc) int MPIDI_CH3I_Complete_sendq_with_error(MPIDI_VC_t * vc) { int mpi_errno = MPI_SUCCESS; - MPID_Request *req, *prev; + MPIR_Request *req, *prev; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3I_COMPLETE_SENDQ_WITH_ERROR); MPIDI_FUNC_ENTER(MPID_STATE_MPIDI_CH3I_COMPLETE_SENDQ_WITH_ERROR); @@ -1155,7 +1155,7 @@ int MPIDI_CH3I_Complete_sendq_with_error(MPIDI_VC_t * vc) prev = NULL; while (req) { if (req->ch.vc == vc) { - MPID_Request *next = req->dev.next; + MPIR_Request *next = req->dev.next; if (prev) prev->dev.next = next; else @@ -1191,7 +1191,7 @@ int MPIDI_CH3I_Complete_sendq_with_error(MPIDI_VC_t * vc) #define FUNCNAME pkt_NETMOD_handler #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int pkt_NETMOD_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, intptr_t *buflen, MPID_Request **rreqp) +static int pkt_NETMOD_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, intptr_t *buflen, MPIR_Request **rreqp) { int mpi_errno = MPI_SUCCESS; MPID_nem_pkt_netmod_t * const netmod_pkt = (MPID_nem_pkt_netmod_t *)pkt; @@ -1214,7 +1214,7 @@ fn_exit: #define FUNCNAME MPIDI_CH3I_Register_anysource_notification #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3I_Register_anysource_notification(void (*enqueue_fn)(MPID_Request *rreq), int (*dequeue_fn)(MPID_Request *rreq)) +int MPIDI_CH3I_Register_anysource_notification(void (*enqueue_fn)(MPIR_Request *rreq), int (*dequeue_fn)(MPIR_Request *rreq)) { int mpi_errno = MPI_SUCCESS; qn_ent_t *ent; @@ -1239,7 +1239,7 @@ int MPIDI_CH3I_Register_anysource_notification(void (*enqueue_fn)(MPID_Request * #define FUNCNAME MPIDI_CH3I_Anysource_posted #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static void anysource_posted(MPID_Request *rreq) +static void anysource_posted(MPIR_Request *rreq) { qn_ent_t *ent = qn_head; @@ -1258,7 +1258,7 @@ static void anysource_posted(MPID_Request *rreq) #define FUNCNAME MPIDI_CH3I_Anysource_matched #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int anysource_matched(MPID_Request *rreq) +static int anysource_matched(MPIR_Request *rreq) { int matched = FALSE; qn_ent_t *ent = qn_head; @@ -1288,7 +1288,7 @@ static int anysource_matched(MPID_Request *rreq) #define FUNCNAME MPIDI_CH3I_Posted_recv_enqueued #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -void MPIDI_CH3I_Posted_recv_enqueued(MPID_Request *rreq) +void MPIDI_CH3I_Posted_recv_enqueued(MPIR_Request *rreq) { MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3I_POSTED_RECV_ENQUEUED); @@ -1354,7 +1354,7 @@ void MPIDI_CH3I_Posted_recv_enqueued(MPID_Request *rreq) #define FUNCNAME MPIDI_CH3I_Posted_recv_dequeued #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3I_Posted_recv_dequeued(MPID_Request *rreq) +int MPIDI_CH3I_Posted_recv_dequeued(MPIR_Request *rreq) { int local_rank = -1; MPIDI_VC_t *vc; diff --git a/src/mpid/ch3/channels/nemesis/src/ch3i_eagernoncontig.c b/src/mpid/ch3/channels/nemesis/src/ch3i_eagernoncontig.c index 5247d9e..fe31782 100644 --- a/src/mpid/ch3/channels/nemesis/src/ch3i_eagernoncontig.c +++ b/src/mpid/ch3/channels/nemesis/src/ch3i_eagernoncontig.c @@ -18,7 +18,7 @@ /* MPIDI_CH3I_SendNoncontig - Sends a message by packing directly into cells. The caller must initialize sreq->dev.segment as well as segment_first and segment_size. */ -int MPIDI_CH3I_SendNoncontig( MPIDI_VC_t *vc, MPID_Request *sreq, void *header, intptr_t hdr_sz ) +int MPIDI_CH3I_SendNoncontig( MPIDI_VC_t *vc, MPIR_Request *sreq, void *header, intptr_t hdr_sz ) { int mpi_errno = MPI_SUCCESS; int again = 0; diff --git a/src/mpid/ch3/channels/nemesis/src/mpid_nem_ckpt.c b/src/mpid/ch3/channels/nemesis/src/mpid_nem_ckpt.c index 5cfc9b2..3b9ac78 100644 --- a/src/mpid/ch3/channels/nemesis/src/mpid_nem_ckpt.c +++ b/src/mpid/ch3/channels/nemesis/src/mpid_nem_ckpt.c @@ -425,7 +425,7 @@ int MPIDI_nem_ckpt_start(void) /* send markers to all other processes */ /* FIXME: we're only handling processes in our pg, so no dynamic connections */ for (i = 0; i < MPIDI_Process.my_pg->size; ++i) { - MPID_Request *req; + MPIR_Request *req; MPIDI_VC_t *vc; MPIDI_CH3I_VC *vc_ch; MPID_PKT_DECL_CAST(upkt, MPID_nem_pkt_ckpt_marker_t, ckpt_pkt); @@ -528,7 +528,7 @@ fn_fail: #define FUNCNAME pkt_ckpt_marker_handler #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int pkt_ckpt_marker_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, intptr_t *buflen, MPID_Request **req) +static int pkt_ckpt_marker_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, intptr_t *buflen, MPIR_Request **req) { int mpi_errno = MPI_SUCCESS; MPID_nem_pkt_ckpt_marker_t * const ckpt_pkt = (MPID_nem_pkt_ckpt_marker_t *)pkt; diff --git a/src/mpid/ch3/channels/nemesis/src/mpid_nem_debug.c b/src/mpid/ch3/channels/nemesis/src/mpid_nem_debug.c index 318c6a2..7ff1d69 100644 --- a/src/mpid/ch3/channels/nemesis/src/mpid_nem_debug.c +++ b/src/mpid/ch3/channels/nemesis/src/mpid_nem_debug.c @@ -59,7 +59,7 @@ void MPID_nem_dbg_print_vc_sendq(FILE *stream, MPIDI_VC_t *vc); #define FCNAME MPL_QUOTE(FUNCNAME) void MPID_nem_dbg_print_vc_sendq(FILE *stream, MPIDI_VC_t *vc) { - MPID_Request * sreq; + MPIR_Request * sreq; int i; MPIDI_CH3I_VC *vc_ch = &vc->ch; diff --git a/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt.c b/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt.c index fc345d1..f0b016a 100644 --- a/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt.c +++ b/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt.c @@ -39,15 +39,15 @@ cvars: } /* request completion actions */ -static int do_cts(MPIDI_VC_t *vc, MPID_Request *rreq, int *complete); -static int do_send(MPIDI_VC_t *vc, MPID_Request *rreq, int *complete); -static int do_cookie(MPIDI_VC_t *vc, MPID_Request *rreq, int *complete); +static int do_cts(MPIDI_VC_t *vc, MPIR_Request *rreq, int *complete); +static int do_send(MPIDI_VC_t *vc, MPIR_Request *rreq, int *complete); +static int do_cookie(MPIDI_VC_t *vc, MPIR_Request *rreq, int *complete); /* packet handlers */ -static int pkt_RTS_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, intptr_t *buflen, MPID_Request **rreqp); -static int pkt_CTS_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, intptr_t *buflen, MPID_Request **rreqp); -static int pkt_DONE_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, intptr_t *buflen, MPID_Request **rreqp); -static int pkt_COOKIE_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, intptr_t *buflen, MPID_Request **rreqp); +static int pkt_RTS_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, intptr_t *buflen, MPIR_Request **rreqp); +static int pkt_CTS_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, intptr_t *buflen, MPIR_Request **rreqp); +static int pkt_DONE_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, intptr_t *buflen, MPIR_Request **rreqp); +static int pkt_COOKIE_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, intptr_t *buflen, MPIR_Request **rreqp); #undef FUNCNAME #define FUNCNAME MPID_nem_lmt_pkthandler_init @@ -82,7 +82,7 @@ int MPID_nem_lmt_pkthandler_init(MPIDI_CH3_PktHandler_Fcn *pktArray[], int array #define FUNCNAME MPID_nem_lmt_RndvSend #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_lmt_RndvSend(MPID_Request **sreq_p, const void * buf, MPI_Aint count, +int MPID_nem_lmt_RndvSend(MPIR_Request **sreq_p, const void * buf, MPI_Aint count, MPI_Datatype datatype, int dt_contig ATTRIBUTE((unused)), intptr_t data_sz, MPI_Aint dt_true_lb ATTRIBUTE((unused)), int rank, int tag, MPIR_Comm * comm, int context_offset) @@ -90,7 +90,7 @@ int MPID_nem_lmt_RndvSend(MPID_Request **sreq_p, const void * buf, MPI_Aint coun int mpi_errno = MPI_SUCCESS; MPID_PKT_DECL_CAST(upkt, MPID_nem_pkt_lmt_rts_t, rts_pkt); MPIDI_VC_t *vc; - MPID_Request *sreq =*sreq_p; + MPIR_Request *sreq =*sreq_p; MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_LMT_RNDVSEND); MPIDI_FUNC_ENTER(MPID_STATE_MPID_NEM_LMT_RNDVSEND); @@ -146,7 +146,7 @@ int MPID_nem_lmt_RndvSend(MPID_Request **sreq_p, const void * buf, MPI_Aint coun #define FUNCNAME MPID_nem_lmt_RndvRecv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_lmt_RndvRecv(MPIDI_VC_t *vc, MPID_Request *rreq) +int MPID_nem_lmt_RndvRecv(MPIDI_VC_t *vc, MPIR_Request *rreq) { int mpi_errno = MPI_SUCCESS; int complete = 0; @@ -180,10 +180,10 @@ int MPID_nem_lmt_RndvRecv(MPIDI_VC_t *vc, MPID_Request *rreq) #define FUNCNAME pkt_RTS_handler #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int pkt_RTS_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, intptr_t *buflen, MPID_Request **rreqp) +static int pkt_RTS_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, intptr_t *buflen, MPIR_Request **rreqp) { int mpi_errno = MPI_SUCCESS; - MPID_Request * rreq; + MPIR_Request * rreq; int found; MPID_nem_pkt_lmt_rts_t * const rts_pkt = (MPID_nem_pkt_lmt_rts_t *)pkt; char *data_buf; @@ -301,11 +301,11 @@ static int pkt_RTS_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, intptr_t *bufle #define FUNCNAME pkt_CTS_handler #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int pkt_CTS_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, intptr_t *buflen, MPID_Request **rreqp) +static int pkt_CTS_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, intptr_t *buflen, MPIR_Request **rreqp) { MPID_nem_pkt_lmt_cts_t * const cts_pkt = (MPID_nem_pkt_lmt_cts_t *)pkt; - MPID_Request *sreq; - MPID_Request *rts_sreq; + MPIR_Request *sreq; + MPIR_Request *rts_sreq; char *data_buf; intptr_t data_len; int mpi_errno = MPI_SUCCESS; @@ -319,7 +319,7 @@ static int pkt_CTS_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, intptr_t *bufle data_len = *buflen - sizeof(MPIDI_CH3_Pkt_t); data_buf = (char *)pkt + sizeof(MPIDI_CH3_Pkt_t); - MPID_Request_get_ptr(cts_pkt->sender_req_id, sreq); + MPIR_Request_get_ptr(cts_pkt->sender_req_id, sreq); MPID_THREAD_CS_ENTER(POBJ, MPIR_THREAD_GLOBAL_ALLFUNC_MUTEX); if (MPIR_CVAR_ENABLE_FT) { @@ -332,9 +332,9 @@ static int pkt_CTS_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, intptr_t *bufle sreq->ch.lmt_data_sz = cts_pkt->data_sz; /* Release the RTS request if one exists. - MPID_Request_fetch_and_clear_rts_sreq() needs to be atomic to + MPIR_Request_fetch_and_clear_rts_sreq() needs to be atomic to prevent cancel send from cancelling the wrong (future) request. - If MPID_Request_fetch_and_clear_rts_sreq() returns a NULL + If MPIR_Request_fetch_and_clear_rts_sreq() returns a NULL rts_sreq, then MPID_Cancel_send() is responsible for releasing the RTS request object. */ MPIDI_Request_fetch_and_clear_rts_sreq(sreq, &rts_sreq); @@ -359,7 +359,7 @@ static int pkt_CTS_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, intptr_t *bufle else { /* create a recv req and set up to receive the cookie into the sreq's tmp_cookie */ - MPID_Request *rreq; + MPIR_Request *rreq; MPIU_CHKPMEM_MALLOC(sreq->ch.lmt_tmp_cookie.MPL_IOV_BUF, char *, cts_pkt->cookie_len, mpi_errno, "tmp cookie buf"); sreq->ch.lmt_tmp_cookie.MPL_IOV_LEN = cts_pkt->cookie_len; @@ -399,17 +399,17 @@ static int pkt_CTS_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, intptr_t *bufle #define FUNCNAME pkt_DONE_handler #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int pkt_DONE_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, intptr_t *buflen, MPID_Request **rreqp) +static int pkt_DONE_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, intptr_t *buflen, MPIR_Request **rreqp) { int mpi_errno = MPI_SUCCESS; MPID_nem_pkt_lmt_done_t * const done_pkt = (MPID_nem_pkt_lmt_done_t *)pkt; - MPID_Request *req; + MPIR_Request *req; MPIDI_STATE_DECL(MPID_STATE_PKT_DONE_HANDLER); MPIDI_FUNC_ENTER(MPID_STATE_PKT_DONE_HANDLER); *buflen = sizeof(MPIDI_CH3_Pkt_t); - MPID_Request_get_ptr(done_pkt->req_id, req); + MPIR_Request_get_ptr(done_pkt->req_id, req); MPID_THREAD_CS_ENTER(POBJ, MPIR_THREAD_GLOBAL_ALLFUNC_MUTEX); @@ -445,11 +445,11 @@ static int pkt_DONE_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, intptr_t *bufl #define FUNCNAME pkt_COOKIE_handler #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int pkt_COOKIE_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, intptr_t *buflen, MPID_Request **rreqp) +static int pkt_COOKIE_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, intptr_t *buflen, MPIR_Request **rreqp) { int mpi_errno = MPI_SUCCESS; MPID_nem_pkt_lmt_cookie_t * const cookie_pkt = (MPID_nem_pkt_lmt_cookie_t *)pkt; - MPID_Request *req; + MPIR_Request *req; char *data_buf; intptr_t data_len; MPIU_CHKPMEM_DECL(1); @@ -461,12 +461,12 @@ static int pkt_COOKIE_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, intptr_t *bu data_buf = (char *)pkt + sizeof(MPIDI_CH3_Pkt_t); if (cookie_pkt->from_sender) { - MPID_Request_get_ptr(cookie_pkt->receiver_req_id, req); + MPIR_Request_get_ptr(cookie_pkt->receiver_req_id, req); MPIU_Assert(req != NULL); req->ch.lmt_req_id = cookie_pkt->sender_req_id; } else { - MPID_Request_get_ptr(cookie_pkt->sender_req_id, req); + MPIR_Request_get_ptr(cookie_pkt->sender_req_id, req); MPIU_Assert(req != NULL); req->ch.lmt_req_id = cookie_pkt->receiver_req_id; } @@ -491,7 +491,7 @@ static int pkt_COOKIE_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, intptr_t *bu else { /* create a recv req and set up to receive the cookie into the rreq's tmp_cookie */ - MPID_Request *rreq; + MPIR_Request *rreq; MPIDI_Request_create_rreq(rreq, mpi_errno, goto fn_fail); MPIU_CHKPMEM_MALLOC(rreq->ch.lmt_tmp_cookie.MPL_IOV_BUF, char *, cookie_pkt->cookie_len, mpi_errno, "tmp cookie buf"); @@ -532,7 +532,7 @@ static int pkt_COOKIE_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, intptr_t *bu #define FUNCNAME do_cts #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int do_cts(MPIDI_VC_t *vc, MPID_Request *rreq, int *complete) +static int do_cts(MPIDI_VC_t *vc, MPIR_Request *rreq, int *complete) { int mpi_errno = MPI_SUCCESS; intptr_t data_sz; @@ -581,11 +581,11 @@ static int do_cts(MPIDI_VC_t *vc, MPID_Request *rreq, int *complete) #define FUNCNAME do_send #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int do_send(MPIDI_VC_t *vc, MPID_Request *rreq, int *complete) +static int do_send(MPIDI_VC_t *vc, MPIR_Request *rreq, int *complete) { int mpi_errno = MPI_SUCCESS; MPL_IOV r_cookie; - MPID_Request * const sreq = rreq->ch.lmt_req; + MPIR_Request * const sreq = rreq->ch.lmt_req; MPIDI_STATE_DECL(MPID_STATE_DO_SEND); MPIDI_FUNC_ENTER(MPID_STATE_DO_SEND); @@ -614,11 +614,11 @@ static int do_send(MPIDI_VC_t *vc, MPID_Request *rreq, int *complete) #define FUNCNAME do_cookie #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int do_cookie(MPIDI_VC_t *vc, MPID_Request *rreq, int *complete) +static int do_cookie(MPIDI_VC_t *vc, MPIR_Request *rreq, int *complete) { int mpi_errno = MPI_SUCCESS; MPL_IOV cookie; - MPID_Request *req = rreq->ch.lmt_req; + MPIR_Request *req = rreq->ch.lmt_req; MPIDI_STATE_DECL(MPID_STATE_DO_COOKIE); MPIDI_FUNC_ENTER(MPID_STATE_DO_COOKIE); diff --git a/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt_dma.c b/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt_dma.c index f0d39e2..4952eec 100644 --- a/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt_dma.c +++ b/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt_dma.c @@ -48,7 +48,7 @@ static volatile knem_status_t *knem_status = MAP_FAILED; struct lmt_dma_node { struct lmt_dma_node *next; MPIDI_VC_t *vc; /* seems like this should be in the request somewhere, but it's not */ - MPID_Request *req; /* do we need to store type too? */ + MPIR_Request *req; /* do we need to store type too? */ volatile knem_status_t *status_p; }; @@ -113,7 +113,7 @@ fn_fail: #define FUNCNAME do_dma_send #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int do_dma_send(MPIDI_VC_t *vc, MPID_Request *sreq, int send_iov_n, +static int do_dma_send(MPIDI_VC_t *vc, MPIR_Request *sreq, int send_iov_n, MPL_IOV send_iov[], knem_cookie_t *s_cookiep) { int mpi_errno = MPI_SUCCESS; @@ -228,7 +228,7 @@ fn_fail: #define FUNCNAME send_sreq_data #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int send_sreq_data(MPIDI_VC_t *vc, MPID_Request *sreq, knem_cookie_t *s_cookiep) +static int send_sreq_data(MPIDI_VC_t *vc, MPIR_Request *sreq, knem_cookie_t *s_cookiep) { int mpi_errno = MPI_SUCCESS; int dt_contig; @@ -293,10 +293,10 @@ fn_fail: #define FUNCNAME check_req_complete #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int check_req_complete(MPIDI_VC_t *vc, MPID_Request *req, int *complete) +static inline int check_req_complete(MPIDI_VC_t *vc, MPIR_Request *req, int *complete) { int mpi_errno = MPI_SUCCESS; - int (*reqFn)(MPIDI_VC_t *, MPID_Request *, int *); + int (*reqFn)(MPIDI_VC_t *, MPIR_Request *, int *); reqFn = req->dev.OnDataAvail; if (reqFn) { *complete = 0; @@ -320,7 +320,7 @@ fn_fail: #define FUNCNAME MPID_nem_lmt_dma_initiate_lmt #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_lmt_dma_initiate_lmt(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, MPID_Request *sreq) +int MPID_nem_lmt_dma_initiate_lmt(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, MPIR_Request *sreq) { int mpi_errno = MPI_SUCCESS; MPID_nem_pkt_lmt_rts_t * const rts_pkt = (MPID_nem_pkt_lmt_rts_t *)pkt; @@ -351,7 +351,7 @@ fn_fail: #define FUNCNAME MPID_nem_lmt_dma_start_recv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_lmt_dma_start_recv(MPIDI_VC_t *vc, MPID_Request *rreq, MPL_IOV s_cookie) +int MPID_nem_lmt_dma_start_recv(MPIDI_VC_t *vc, MPIR_Request *rreq, MPL_IOV s_cookie) { int mpi_errno = MPI_SUCCESS; int nodma; @@ -462,11 +462,11 @@ fn_fail: #define FUNCNAME MPID_nem_lmt_dma_done_send #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_lmt_dma_done_send(MPIDI_VC_t *vc, MPID_Request *sreq) +int MPID_nem_lmt_dma_done_send(MPIDI_VC_t *vc, MPIR_Request *sreq) { int mpi_errno = MPI_SUCCESS; int complete = 0; - int (*reqFn)(MPIDI_VC_t *, MPID_Request *, int *); + int (*reqFn)(MPIDI_VC_t *, MPIR_Request *, int *); MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_LMT_DMA_DONE_SEND); MPIDI_FUNC_ENTER(MPID_STATE_MPID_NEM_LMT_DMA_DONE_SEND); @@ -515,7 +515,7 @@ fn_fail: #define FUNCNAME MPID_nem_lmt_dma_handle_cookie #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_lmt_dma_handle_cookie(MPIDI_VC_t *vc, MPID_Request *req, MPL_IOV cookie) +int MPID_nem_lmt_dma_handle_cookie(MPIDI_VC_t *vc, MPIR_Request *req, MPL_IOV cookie) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_LMT_DMA_HANDLE_COOKIE); @@ -689,7 +689,7 @@ int MPID_nem_lmt_dma_vc_terminated(MPIDI_VC_t *vc) #define FUNCNAME MPID_nem_lmt_dma_start_send #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_lmt_dma_start_send(MPIDI_VC_t *vc, MPID_Request *req, MPL_IOV r_cookie) +int MPID_nem_lmt_dma_start_send(MPIDI_VC_t *vc, MPIR_Request *req, MPL_IOV r_cookie) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_LMT_DMA_START_SEND); @@ -705,7 +705,7 @@ int MPID_nem_lmt_dma_start_send(MPIDI_VC_t *vc, MPID_Request *req, MPL_IOV r_coo #define FUNCNAME MPID_nem_lmt_dma_done_recv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_lmt_dma_done_recv(MPIDI_VC_t *vc, MPID_Request *rreq) +int MPID_nem_lmt_dma_done_recv(MPIDI_VC_t *vc, MPIR_Request *rreq) { MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_LMT_DMA_DONE_RECV); diff --git a/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt_shm.c b/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt_shm.c index 6661cce..47bd392 100644 --- a/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt_shm.c +++ b/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt_shm.c @@ -33,8 +33,8 @@ static struct {lmt_shm_prog_element_t *head;} lmt_shm_progress_q = {NULL}; typedef struct MPID_nem_lmt_shm_wait_element { - int (* progress)(MPIDI_VC_t *vc, MPID_Request *req, int *done); - MPID_Request *req; + int (* progress)(MPIDI_VC_t *vc, MPIR_Request *req, int *done); + MPIR_Request *req; struct MPID_nem_lmt_shm_wait_element *next; } MPID_nem_lmt_shm_wait_element_t; @@ -106,8 +106,8 @@ typedef struct MPID_nem_copy_buf static inline int lmt_shm_progress_vc(MPIDI_VC_t *vc, int *done); -static int lmt_shm_send_progress(MPIDI_VC_t *vc, MPID_Request *req, int *done); -static int lmt_shm_recv_progress(MPIDI_VC_t *vc, MPID_Request *req, int *done); +static int lmt_shm_send_progress(MPIDI_VC_t *vc, MPIR_Request *req, int *done); +static int lmt_shm_recv_progress(MPIDI_VC_t *vc, MPIR_Request *req, int *done); static int MPID_nem_allocate_shm_region(MPID_nem_copy_buf_t **buf_p, MPIU_SHMW_Hnd_t handle); static int MPID_nem_attach_shm_region(MPID_nem_copy_buf_t **buf_p, MPIU_SHMW_Hnd_t handle); static int MPID_nem_detach_shm_region(MPID_nem_copy_buf_t **buf, MPIU_SHMW_Hnd_t handle); @@ -120,7 +120,7 @@ static int MPID_nem_delete_shm_region(MPID_nem_copy_buf_t **buf, MPIU_SHMW_Hnd_t #define FUNCNAME MPID_nem_lmt_shm_initiate_lmt #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_lmt_shm_initiate_lmt(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, MPID_Request *req) +int MPID_nem_lmt_shm_initiate_lmt(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, MPIR_Request *req) { int mpi_errno = MPI_SUCCESS; intptr_t data_sz; @@ -161,7 +161,7 @@ int MPID_nem_lmt_shm_initiate_lmt(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, MPID_Req #define FUNCNAME MPID_nem_lmt_shm_start_recv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_lmt_shm_start_recv(MPIDI_VC_t *vc, MPID_Request *req, MPL_IOV s_cookie) +int MPID_nem_lmt_shm_start_recv(MPIDI_VC_t *vc, MPIR_Request *req, MPL_IOV s_cookie) { int mpi_errno = MPI_SUCCESS; int done = FALSE; @@ -241,7 +241,7 @@ int MPID_nem_lmt_shm_start_recv(MPIDI_VC_t *vc, MPID_Request *req, MPL_IOV s_coo #define FUNCNAME MPID_nem_lmt_shm_start_send #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_lmt_shm_start_send(MPIDI_VC_t *vc, MPID_Request *req, MPL_IOV r_cookie) +int MPID_nem_lmt_shm_start_send(MPIDI_VC_t *vc, MPIR_Request *req, MPL_IOV r_cookie) { int mpi_errno = MPI_SUCCESS; int done = FALSE; @@ -338,7 +338,7 @@ static int get_next_req(MPIDI_VC_t *vc) MPIDI_CH3I_VC *vc_ch = &vc->ch; MPID_nem_copy_buf_t * const copy_buf = vc_ch->lmt_copy_buf; int prev_owner_rank; - MPID_Request *req; + MPIR_Request *req; MPIDI_STATE_DECL(MPID_STATE_GET_NEXT_REQ); MPIDI_FUNC_ENTER(MPID_STATE_GET_NEXT_REQ); @@ -440,7 +440,7 @@ static int get_next_req(MPIDI_VC_t *vc) #define FUNCNAME lmt_shm_send_progress #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int lmt_shm_send_progress(MPIDI_VC_t *vc, MPID_Request *req, int *done) +static int lmt_shm_send_progress(MPIDI_VC_t *vc, MPIR_Request *req, int *done) { int mpi_errno = MPI_SUCCESS; MPIDI_CH3I_VC *vc_ch = &vc->ch; @@ -532,7 +532,7 @@ static int lmt_shm_send_progress(MPIDI_VC_t *vc, MPID_Request *req, int *done) #define FUNCNAME lmt_shm_recv_progress #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int lmt_shm_recv_progress(MPIDI_VC_t *vc, MPID_Request *req, int *done) +static int lmt_shm_recv_progress(MPIDI_VC_t *vc, MPIR_Request *req, int *done) { int mpi_errno = MPI_SUCCESS; MPIDI_CH3I_VC *vc_ch = &vc->ch; @@ -666,7 +666,7 @@ static int lmt_shm_recv_progress(MPIDI_VC_t *vc, MPID_Request *req, int *done) #define FUNCNAME MPID_nem_lmt_shm_handle_cookie #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_lmt_shm_handle_cookie(MPIDI_VC_t *vc, MPID_Request *req, MPL_IOV cookie) +int MPID_nem_lmt_shm_handle_cookie(MPIDI_VC_t *vc, MPIR_Request *req, MPL_IOV cookie) { MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_LMT_SHM_HANDLE_COOKIE); @@ -680,7 +680,7 @@ int MPID_nem_lmt_shm_handle_cookie(MPIDI_VC_t *vc, MPID_Request *req, MPL_IOV co #define FUNCNAME MPID_nem_lmt_shm_done_send #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_lmt_shm_done_send(MPIDI_VC_t *vc, MPID_Request *req) +int MPID_nem_lmt_shm_done_send(MPIDI_VC_t *vc, MPIR_Request *req) { MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_LMT_SHM_DONE_SEND); @@ -694,7 +694,7 @@ int MPID_nem_lmt_shm_done_send(MPIDI_VC_t *vc, MPID_Request *req) #define FUNCNAME MPID_nem_lmt_shm_done_recv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_lmt_shm_done_recv(MPIDI_VC_t *vc, MPID_Request *req) +int MPID_nem_lmt_shm_done_recv(MPIDI_VC_t *vc, MPIR_Request *req) { MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_LMT_SHM_DONE_RECV); @@ -814,7 +814,7 @@ int MPID_nem_lmt_shm_vc_terminated(MPIDI_VC_t *vc) MPIDI_CH3I_VC *vc_ch = &vc->ch; MPID_nem_lmt_shm_wait_element_t *we; int req_errno = MPI_SUCCESS; - MPID_Request *req = NULL; + MPIR_Request *req = NULL; MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_LMT_SHM_VC_TERMINATED); MPIDI_FUNC_ENTER(MPID_STATE_MPID_NEM_LMT_SHM_VC_TERMINATED); diff --git a/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt_vmsplice.c b/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt_vmsplice.c index d8f1909..a8b21c6 100644 --- a/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt_vmsplice.c +++ b/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt_vmsplice.c @@ -24,7 +24,7 @@ MPL_SUPPRESS_OSX_HAS_NO_SYMBOLS_WARNING; struct lmt_vmsplice_node { struct lmt_vmsplice_node *next; int pipe_fd; - MPID_Request *req; + MPIR_Request *req; }; /* MT: this stack is not thread-safe */ @@ -58,10 +58,10 @@ static int adjust_partially_xferred_iov(MPL_IOV iov[], int *iov_offset, return complete; } -static inline int check_req_complete(MPIDI_VC_t *vc, MPID_Request *req, int *complete) +static inline int check_req_complete(MPIDI_VC_t *vc, MPIR_Request *req, int *complete) { int mpi_errno = MPI_SUCCESS; - int (*reqFn)(MPIDI_VC_t *, MPID_Request *, int *); + int (*reqFn)(MPIDI_VC_t *, MPIR_Request *, int *); reqFn = req->dev.OnDataAvail; if (reqFn) { *complete = 0; @@ -87,7 +87,7 @@ fn_fail: /* fills in req->dev.iov{,_offset,_count} based on the datatype info in the request, creating a segment if necessary */ -static int populate_iov_from_req(MPID_Request *req) +static int populate_iov_from_req(MPIR_Request *req) { int mpi_errno = MPI_SUCCESS; int dt_contig; @@ -135,7 +135,7 @@ fn_fail: return mpi_errno; } -static int do_vmsplice(MPID_Request *sreq, int pipe_fd, MPL_IOV iov[], +static int do_vmsplice(MPIR_Request *sreq, int pipe_fd, MPL_IOV iov[], int *iov_offset, int *iov_count, int *complete) { int mpi_errno = MPI_SUCCESS; @@ -175,7 +175,7 @@ fn_exit: #define FUNCNAME MPID_nem_lmt_vmsplice_initiate_lmt #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_lmt_vmsplice_initiate_lmt(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, MPID_Request *sreq) +int MPID_nem_lmt_vmsplice_initiate_lmt(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, MPIR_Request *sreq) { int mpi_errno = MPI_SUCCESS; MPID_nem_pkt_lmt_rts_t * const rts_pkt = (MPID_nem_pkt_lmt_rts_t *)pkt; @@ -216,7 +216,7 @@ fn_exit: return mpi_errno; } -static int do_readv(MPID_Request *rreq, int pipe_fd, MPL_IOV iov[], +static int do_readv(MPIR_Request *rreq, int pipe_fd, MPL_IOV iov[], int *iov_offset, int *iov_count, int *complete) { int mpi_errno = MPI_SUCCESS; @@ -255,7 +255,7 @@ fn_exit: #define FUNCNAME MPID_nem_lmt_vmsplice_start_recv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_lmt_vmsplice_start_recv(MPIDI_VC_t *vc, MPID_Request *rreq, MPL_IOV s_cookie) +int MPID_nem_lmt_vmsplice_start_recv(MPIDI_VC_t *vc, MPIR_Request *rreq, MPL_IOV s_cookie) { int mpi_errno = MPI_SUCCESS; int i; @@ -377,14 +377,14 @@ fn_fail: #define FUNCNAME MPID_nem_lmt_vmsplice_start_send #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_lmt_vmsplice_start_send(MPIDI_VC_t *vc, MPID_Request *sreq, MPL_IOV r_cookie) +int MPID_nem_lmt_vmsplice_start_send(MPIDI_VC_t *vc, MPIR_Request *sreq, MPL_IOV r_cookie) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_LMT_VMSPLICE_START_SEND); int pipe_fd; int complete; struct lmt_vmsplice_node *node = NULL; - int (*reqFn)(MPIDI_VC_t *, MPID_Request *, int *); + int (*reqFn)(MPIDI_VC_t *, MPIR_Request *, int *); MPIDI_CH3I_VC *vc_ch = &vc->ch; MPIDI_FUNC_ENTER(MPID_STATE_MPID_NEM_LMT_VMSPLICE_START_SEND); @@ -455,7 +455,7 @@ int MPIDI_CH3_MPID_nem_lmt_vmsplice_vc_terminated(MPIDI_VC_t *vc) #define FUNCNAME MPID_nem_lmt_vmsplice_done_recv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_lmt_vmsplice_done_recv(MPIDI_VC_t *vc, MPID_Request *rreq) +int MPID_nem_lmt_vmsplice_done_recv(MPIDI_VC_t *vc, MPIR_Request *rreq) { MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_LMT_VMSPLICE_DONE_RECV); @@ -471,7 +471,7 @@ int MPID_nem_lmt_vmsplice_done_recv(MPIDI_VC_t *vc, MPID_Request *rreq) #define FUNCNAME MPID_nem_lmt_vmsplice_done_send #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_lmt_vmsplice_done_send(MPIDI_VC_t *vc, MPID_Request *sreq) +int MPID_nem_lmt_vmsplice_done_send(MPIDI_VC_t *vc, MPIR_Request *sreq) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_LMT_VMSPLICE_DONE_SEND); @@ -489,7 +489,7 @@ int MPID_nem_lmt_vmsplice_done_send(MPIDI_VC_t *vc, MPID_Request *sreq) #define FUNCNAME MPID_nem_lmt_vmsplice_handle_cookie #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_lmt_vmsplice_handle_cookie(MPIDI_VC_t *vc, MPID_Request *req, MPL_IOV cookie) +int MPID_nem_lmt_vmsplice_handle_cookie(MPIDI_VC_t *vc, MPIR_Request *req, MPL_IOV cookie) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_LMT_VMSPLICE_HANDLE_COOKIE); diff --git a/src/mpid/ch3/channels/nemesis/src/mpid_nem_mpich.c b/src/mpid/ch3/channels/nemesis/src/mpid_nem_mpich.c index 401f7e4..dafd598 100644 --- a/src/mpid/ch3/channels/nemesis/src/mpid_nem_mpich.c +++ b/src/mpid/ch3/channels/nemesis/src/mpid_nem_mpich.c @@ -79,13 +79,13 @@ fn_fail: #define FUNCNAME MPID_nem_send_iov #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_send_iov(MPIDI_VC_t *vc, MPID_Request **sreq_ptr, MPL_IOV *iov, int n_iov) +int MPID_nem_send_iov(MPIDI_VC_t *vc, MPIR_Request **sreq_ptr, MPL_IOV *iov, int n_iov) { int mpi_errno = MPI_SUCCESS; intptr_t data_sz; int i; int iov_data_copied; - MPID_Request *sreq = *sreq_ptr; + MPIR_Request *sreq = *sreq_ptr; MPL_IOV *data_iov = &iov[1]; /* iov of just the data, not the header */ int data_n_iov = n_iov - 1; diff --git a/src/mpid/ch3/channels/sock/include/mpidi_ch3_impl.h b/src/mpid/ch3/channels/sock/include/mpidi_ch3_impl.h index 2cbc297..884b799 100644 --- a/src/mpid/ch3/channels/sock/include/mpidi_ch3_impl.h +++ b/src/mpid/ch3/channels/sock/include/mpidi_ch3_impl.h @@ -50,7 +50,7 @@ /* MT - not thread safe! */ #define MPIDI_CH3I_SendQ_dequeue(vcch) \ { \ - MPID_Request *req_ = vcch->sendq_head; \ + MPIR_Request *req_ = vcch->sendq_head; \ MPL_DBG_MSG(MPIDI_CH3_DBG_MSG,TYPICAL,"Dequeuing this request");\ vcch->sendq_head = vcch->sendq_head->dev.next; \ if (vcch->sendq_head == NULL) \ diff --git a/src/mpid/ch3/channels/sock/include/mpidi_ch3_pre.h b/src/mpid/ch3/channels/sock/include/mpidi_ch3_pre.h index df35084..a7a4ded 100644 --- a/src/mpid/ch3/channels/sock/include/mpidi_ch3_pre.h +++ b/src/mpid/ch3/channels/sock/include/mpidi_ch3_pre.h @@ -46,8 +46,8 @@ MPIDI_CH3I_VC_state_t; /* channel-specific fields for the VC structure */ typedef struct MPIDI_CH3I_VC { - struct MPID_Request * sendq_head; - struct MPID_Request * sendq_tail; + struct MPIR_Request * sendq_head; + struct MPIR_Request * sendq_tail; MPIDI_CH3I_VC_state_t state; struct MPIDU_Sock *sock; struct MPIDI_CH3I_Connection * conn; @@ -57,7 +57,7 @@ MPIDI_CH3I_VC; #define MPIDI_CH3_VC_DECL struct MPIDI_CH3I_VC ch; /* - * MPIDI_CH3_REQUEST_DECL (additions to MPID_Request) + * MPIDI_CH3_REQUEST_DECL (additions to MPIR_Request) * The socket channel makes no additions */ diff --git a/src/mpid/ch3/channels/sock/src/ch3_isend.c b/src/mpid/ch3/channels/sock/src/ch3_isend.c index 3773855..d354f87 100644 --- a/src/mpid/ch3/channels/sock/src/ch3_isend.c +++ b/src/mpid/ch3/channels/sock/src/ch3_isend.c @@ -10,7 +10,7 @@ #define FUNCNAME update_request #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static void update_request(MPID_Request * sreq, void * hdr, +static void update_request(MPIR_Request * sreq, void * hdr, intptr_t hdr_sz, MPIU_Size_t nb) { MPIDI_STATE_DECL(MPID_STATE_UPDATE_REQUEST); @@ -28,11 +28,11 @@ static void update_request(MPID_Request * sreq, void * hdr, #define FUNCNAME MPIDI_CH3_iSend #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3_iSend(MPIDI_VC_t * vc, MPID_Request * sreq, void * hdr, +int MPIDI_CH3_iSend(MPIDI_VC_t * vc, MPIR_Request * sreq, void * hdr, intptr_t hdr_sz) { int mpi_errno = MPI_SUCCESS; - int (*reqFn)(MPIDI_VC_t *, MPID_Request *, int *); + int (*reqFn)(MPIDI_VC_t *, MPIR_Request *, int *); MPIDI_CH3I_VC *vcch = &vc->ch; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3_ISEND); diff --git a/src/mpid/ch3/channels/sock/src/ch3_isendv.c b/src/mpid/ch3/channels/sock/src/ch3_isendv.c index 090991d..afba188 100644 --- a/src/mpid/ch3/channels/sock/src/ch3_isendv.c +++ b/src/mpid/ch3/channels/sock/src/ch3_isendv.c @@ -10,7 +10,7 @@ #define FUNCNAME update_request #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static void update_request(MPID_Request * sreq, MPL_IOV * iov, int iov_count, +static void update_request(MPIR_Request * sreq, MPL_IOV * iov, int iov_count, int iov_offset, MPIU_Size_t nb) { int i; @@ -40,12 +40,12 @@ static void update_request(MPID_Request * sreq, MPL_IOV * iov, int iov_count, #define FUNCNAME MPIDI_CH3_iSendv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3_iSendv(MPIDI_VC_t * vc, MPID_Request * sreq, +int MPIDI_CH3_iSendv(MPIDI_VC_t * vc, MPIR_Request * sreq, MPL_IOV * iov, int n_iov) { int mpi_errno = MPI_SUCCESS; MPIDI_CH3I_VC *vcch = &vc->ch; - int (*reqFn)(MPIDI_VC_t *, MPID_Request *, int *); + int (*reqFn)(MPIDI_VC_t *, MPIR_Request *, int *); MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3_ISENDV); MPIDI_FUNC_ENTER(MPID_STATE_MPIDI_CH3_ISENDV); diff --git a/src/mpid/ch3/channels/sock/src/ch3_istartmsg.c b/src/mpid/ch3/channels/sock/src/ch3_istartmsg.c index c9cd240..882d4cf 100644 --- a/src/mpid/ch3/channels/sock/src/ch3_istartmsg.c +++ b/src/mpid/ch3/channels/sock/src/ch3_istartmsg.c @@ -10,10 +10,10 @@ #define FUNCNAME create_request #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static MPID_Request * create_request(void * hdr, intptr_t hdr_sz, +static MPIR_Request * create_request(void * hdr, intptr_t hdr_sz, MPIU_Size_t nb) { - MPID_Request * sreq; + MPIR_Request * sreq; MPIDI_STATE_DECL(MPID_STATE_CREATE_REQUEST); MPIDI_FUNC_ENTER(MPID_STATE_CREATE_REQUEST); @@ -50,9 +50,9 @@ static MPID_Request * create_request(void * hdr, intptr_t hdr_sz, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3_iStartMsg(MPIDI_VC_t * vc, void * hdr, intptr_t hdr_sz, - MPID_Request ** sreq_ptr) + MPIR_Request ** sreq_ptr) { - MPID_Request * sreq = NULL; + MPIR_Request * sreq = NULL; MPIDI_CH3I_VC *vcch = &vc->ch; int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3_ISTARTMSG); diff --git a/src/mpid/ch3/channels/sock/src/ch3_istartmsgv.c b/src/mpid/ch3/channels/sock/src/ch3_istartmsgv.c index c316179..07214bb 100644 --- a/src/mpid/ch3/channels/sock/src/ch3_istartmsgv.c +++ b/src/mpid/ch3/channels/sock/src/ch3_istartmsgv.c @@ -10,10 +10,10 @@ #define FUNCNAME create_request #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static MPID_Request * create_request(MPL_IOV * iov, int iov_count, +static MPIR_Request * create_request(MPL_IOV * iov, int iov_count, int iov_offset, MPIU_Size_t nb) { - MPID_Request * sreq; + MPIR_Request * sreq; int i; MPIDI_STATE_DECL(MPID_STATE_CREATE_REQUEST); @@ -74,9 +74,9 @@ static MPID_Request * create_request(MPL_IOV * iov, int iov_count, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3_iStartMsgv(MPIDI_VC_t * vc, MPL_IOV * iov, int n_iov, - MPID_Request ** sreq_ptr) + MPIR_Request ** sreq_ptr) { - MPID_Request * sreq = NULL; + MPIR_Request * sreq = NULL; MPIDI_CH3I_VC *vcch = &vc->ch; int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3_ISTARTMSGV); diff --git a/src/mpid/ch3/channels/sock/src/ch3_progress.c b/src/mpid/ch3/channels/sock/src/ch3_progress.c index 9ff94a5..67d2dd4 100644 --- a/src/mpid/ch3/channels/sock/src/ch3_progress.c +++ b/src/mpid/ch3/channels/sock/src/ch3_progress.c @@ -15,7 +15,7 @@ static MPIDI_CH3_PktHandler_Fcn *pktArray[MPIDI_CH3_PKT_END_CH3+1]; -static int ReadMoreData( MPIDI_CH3I_Connection_t *, MPID_Request * ); +static int ReadMoreData( MPIDI_CH3I_Connection_t *, MPIR_Request * ); static int MPIDI_CH3i_Progress_wait(MPID_Progress_state * ); static int MPIDI_CH3i_Progress_test(void); @@ -467,7 +467,7 @@ static int MPIDI_CH3I_Progress_handle_sock_event(MPIDU_Sock_event_t * event) break; } - MPID_Request * rreq = conn->recv_active; + MPIR_Request * rreq = conn->recv_active; /* --BEGIN ERROR HANDLING-- */ if (event->error != MPI_SUCCESS) @@ -516,7 +516,7 @@ static int MPIDI_CH3I_Progress_handle_sock_event(MPIDU_Sock_event_t * event) } else /* incoming data */ { - int (*reqFn)(MPIDI_VC_t *, MPID_Request *, int *); + int (*reqFn)(MPIDI_VC_t *, MPIR_Request *, int *); int complete; reqFn = rreq->dev.OnDataAvail; @@ -577,8 +577,8 @@ static int MPIDI_CH3I_Progress_handle_sock_event(MPIDU_Sock_event_t * event) if (conn->send_active) { - MPID_Request * sreq = conn->send_active; - int (*reqFn)(MPIDI_VC_t *, MPID_Request *, int *); + MPIR_Request * sreq = conn->send_active; + int (*reqFn)(MPIDI_VC_t *, MPIR_Request *, int *); int complete; reqFn = sreq->dev.OnDataAvail; @@ -877,7 +877,7 @@ static int adjust_iov(MPL_IOV ** iovp, int * countp, MPIU_Size_t nb) /* end adjust_iov() */ -static int ReadMoreData( MPIDI_CH3I_Connection_t * conn, MPID_Request *rreq ) +static int ReadMoreData( MPIDI_CH3I_Connection_t * conn, MPIR_Request *rreq ) { int mpi_errno = MPI_SUCCESS; @@ -903,7 +903,7 @@ static int ReadMoreData( MPIDI_CH3I_Connection_t * conn, MPID_Request *rreq ) conn->vc, nb, rreq->handle)); if (nb > 0 && adjust_iov(&iovp, &rreq->dev.iov_count, nb)) { - int (*reqFn)(MPIDI_VC_t *, MPID_Request *, int *); + int (*reqFn)(MPIDI_VC_t *, MPIR_Request *, int *); int complete; reqFn = rreq->dev.OnDataAvail; diff --git a/src/mpid/ch3/include/mpid_rma_issue.h b/src/mpid/ch3/include/mpid_rma_issue.h index 26924cd..8210bdb 100644 --- a/src/mpid/ch3/include/mpid_rma_issue.h +++ b/src/mpid/ch3/include/mpid_rma_issue.h @@ -221,14 +221,14 @@ static int init_get_accum_ext_pkt(MPIDI_CH3_Pkt_flags_t flags, static int issue_from_origin_buffer(MPIDI_RMA_Op_t * rma_op, MPIDI_VC_t * vc, void *ext_hdr_ptr, MPI_Aint ext_hdr_sz, intptr_t stream_offset, intptr_t stream_size, - MPID_Request ** req_ptr) + MPIR_Request ** req_ptr) { MPI_Datatype target_datatype; MPIDU_Datatype*target_dtp = NULL, *origin_dtp = NULL; int is_origin_contig; MPL_IOV iov[MPL_IOV_LIMIT]; int iovcnt = 0; - MPID_Request *req = NULL; + MPIR_Request *req = NULL; MPI_Aint dt_true_lb; MPIDI_CH3_Pkt_flags_t flags; int is_empty_origin = FALSE; @@ -400,7 +400,7 @@ static int issue_put_op(MPIDI_RMA_Op_t * rma_op, MPIR_Win * win_ptr, MPIDI_VC_t *vc = NULL; MPIR_Comm *comm_ptr = win_ptr->comm_ptr; MPIDI_CH3_Pkt_put_t *put_pkt = &rma_op->pkt.put; - MPID_Request *curr_req = NULL; + MPIR_Request *curr_req = NULL; MPI_Datatype target_datatype; MPIDU_Datatype*target_dtp_ptr = NULL; MPIDI_CH3_Ext_pkt_put_derived_t *ext_hdr_ptr = NULL; @@ -500,7 +500,7 @@ static int issue_acc_op(MPIDI_RMA_Op_t * rma_op, MPIR_Win * win_ptr, MPIDI_Comm_get_vc_set_active(comm_ptr, rma_op->target_rank, &vc); if (rma_op->pkt.type == MPIDI_CH3_PKT_ACCUMULATE_IMMED) { - MPID_Request *curr_req = NULL; + MPIR_Request *curr_req = NULL; accum_pkt->flags |= flags; @@ -557,7 +557,7 @@ static int issue_acc_op(MPIDI_RMA_Op_t * rma_op, MPIR_Win * win_ptr, MPIU_Assert(rma_op->issued_stream_count >= 0); for (j = 0; j < stream_unit_count; j++) { intptr_t stream_offset, stream_size; - MPID_Request *curr_req = NULL; + MPIR_Request *curr_req = NULL; if (j < rma_op->issued_stream_count) continue; @@ -593,7 +593,7 @@ static int issue_acc_op(MPIDI_RMA_Op_t * rma_op, MPIR_Win * win_ptr, if (stream_unit_count > 1) { rma_op->multi_reqs = - (MPID_Request **) MPL_malloc(sizeof(MPID_Request *) * rma_op->reqs_size); + (MPIR_Request **) MPL_malloc(sizeof(MPIR_Request *) * rma_op->reqs_size); for (i = 0; i < rma_op->reqs_size; i++) rma_op->multi_reqs[i] = NULL; } @@ -666,8 +666,8 @@ static int issue_get_acc_op(MPIDI_RMA_Op_t * rma_op, MPIR_Win * win_ptr, MPIDI_Comm_get_vc_set_active(comm_ptr, rma_op->target_rank, &vc); if (rma_op->pkt.type == MPIDI_CH3_PKT_GET_ACCUM_IMMED) { - MPID_Request *resp_req = NULL; - MPID_Request *curr_req = NULL; + MPIR_Request *resp_req = NULL; + MPIR_Request *curr_req = NULL; get_accum_pkt->flags |= flags; @@ -741,7 +741,7 @@ static int issue_get_acc_op(MPIDI_RMA_Op_t * rma_op, MPIR_Win * win_ptr, if (rma_op->reqs_size > 1) { rma_op->multi_reqs = - (MPID_Request **) MPL_malloc(sizeof(MPID_Request *) * rma_op->reqs_size); + (MPIR_Request **) MPL_malloc(sizeof(MPIR_Request *) * rma_op->reqs_size); for (i = 0; i < rma_op->reqs_size; i++) rma_op->multi_reqs[i] = NULL; } @@ -750,8 +750,8 @@ static int issue_get_acc_op(MPIDI_RMA_Op_t * rma_op, MPIR_Win * win_ptr, for (j = 0; j < stream_unit_count; j++) { intptr_t stream_offset, stream_size; - MPID_Request *resp_req = NULL; - MPID_Request *curr_req = NULL; + MPIR_Request *resp_req = NULL; + MPIR_Request *curr_req = NULL; if (j < rma_op->issued_stream_count) continue; @@ -884,8 +884,8 @@ static int issue_get_op(MPIDI_RMA_Op_t * rma_op, MPIR_Win * win_ptr, MPIR_Comm *comm_ptr; MPIDU_Datatype*dtp; MPI_Datatype target_datatype; - MPID_Request *req = NULL; - MPID_Request *curr_req = NULL; + MPIR_Request *req = NULL; + MPIR_Request *curr_req = NULL; MPIDI_CH3_Ext_pkt_get_derived_t *ext_hdr_ptr = NULL; MPI_Aint ext_hdr_sz = 0; MPL_IOV iov[MPL_IOV_LIMIT]; @@ -1010,8 +1010,8 @@ static int issue_cas_op(MPIDI_RMA_Op_t * rma_op, MPIDI_VC_t *vc = NULL; MPIR_Comm *comm_ptr = win_ptr->comm_ptr; MPIDI_CH3_Pkt_cas_t *cas_pkt = &rma_op->pkt.cas; - MPID_Request *rmw_req = NULL; - MPID_Request *curr_req = NULL; + MPIR_Request *rmw_req = NULL; + MPIR_Request *curr_req = NULL; int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_ISSUE_CAS_OP); @@ -1073,8 +1073,8 @@ static int issue_fop_op(MPIDI_RMA_Op_t * rma_op, MPIDI_VC_t *vc = NULL; MPIR_Comm *comm_ptr = win_ptr->comm_ptr; MPIDI_CH3_Pkt_fop_t *fop_pkt = &rma_op->pkt.fop; - MPID_Request *resp_req = NULL; - MPID_Request *curr_req = NULL; + MPIR_Request *resp_req = NULL; + MPIR_Request *curr_req = NULL; int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_ISSUE_FOP_OP); diff --git a/src/mpid/ch3/include/mpid_rma_types.h b/src/mpid/ch3/include/mpid_rma_types.h index 4e3b9e4..7036da0 100644 --- a/src/mpid/ch3/include/mpid_rma_types.h +++ b/src/mpid/ch3/include/mpid_rma_types.h @@ -44,8 +44,8 @@ typedef struct MPIDI_RMA_Op { int result_count; MPI_Datatype result_datatype; - struct MPID_Request *single_req; /* used for unstreamed RMA ops */ - struct MPID_Request **multi_reqs; /* used for streamed RMA ops */ + struct MPIR_Request *single_req; /* used for unstreamed RMA ops */ + struct MPIR_Request **multi_reqs; /* used for streamed RMA ops */ MPI_Aint reqs_size; /* when reqs_size == 0, neither single_req nor multi_reqs is used; * when reqs_size == 1, single_req is used; * when reqs_size > 1, multi_reqs is used. */ @@ -59,7 +59,7 @@ typedef struct MPIDI_RMA_Op { int issued_stream_count; /* when >= 0, it specifies number of stream units that have been issued; * when < 0, it means all stream units of this operation haven been issued. */ - MPID_Request *ureq; + MPIR_Request *ureq; } MPIDI_RMA_Op_t; diff --git a/src/mpid/ch3/include/mpidimpl.h b/src/mpid/ch3/include/mpidimpl.h index 426aa50..8df8a17 100644 --- a/src/mpid/ch3/include/mpidimpl.h +++ b/src/mpid/ch3/include/mpidimpl.h @@ -193,12 +193,12 @@ extern MPIDI_Process_t MPIDI_Process; ---------------------*/ /* - * MPID_Requests + * MPIR_Requests * - * MPI Requests are handles to MPID_Request structures. These are used + * MPI Requests are handles to MPIR_Request structures. These are used * for most communication operations to provide a uniform way in which to * define pending operations. As such, they contain many fields that are - * only used by some operations (logically, an MPID_Request is a union type). + * only used by some operations (logically, an MPIR_Request is a union type). * * There are several kinds of requests. They are * Send, Receive, RMA, User, Persistent @@ -254,7 +254,7 @@ extern MPIDI_Process_t MPIDI_Process; # define MPIDI_Request_tls_alloc(req_) \ do { \ - (req_) = MPIU_Handle_obj_alloc(&MPID_Request_mem); \ + (req_) = MPIU_Handle_obj_alloc(&MPIR_Request_mem); \ MPL_DBG_MSG_P(MPIDI_CH3_DBG_CHANNEL,VERBOSE, \ "allocated request, handle=0x%08x", req_);\ } while (0) @@ -619,57 +619,57 @@ struct MPIR_Comm; typedef struct MPIDI_Comm_ops { /* Overriding calls in case of matching-capable interfaces */ - int (*recv_posted)(struct MPIDI_VC *vc, struct MPID_Request *req); + int (*recv_posted)(struct MPIDI_VC *vc, struct MPIR_Request *req); int (*send)(struct MPIDI_VC *vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, MPIR_Comm *comm, int context_offset, - struct MPID_Request **request); + struct MPIR_Request **request); int (*rsend)(struct MPIDI_VC *vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, MPIR_Comm *comm, int context_offset, - struct MPID_Request **request); + struct MPIR_Request **request); int (*ssend)(struct MPIDI_VC *vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, MPIR_Comm *comm, int context_offset, - struct MPID_Request **request ); + struct MPIR_Request **request ); int (*isend)(struct MPIDI_VC *vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, MPIR_Comm *comm, int context_offset, - struct MPID_Request **request ); + struct MPIR_Request **request ); int (*irsend)(struct MPIDI_VC *vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, MPIR_Comm *comm, int context_offset, - struct MPID_Request **request ); + struct MPIR_Request **request ); int (*issend)(struct MPIDI_VC *vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, MPIR_Comm *comm, int context_offset, - struct MPID_Request **request ); + struct MPIR_Request **request ); int (*send_init)(struct MPIDI_VC *vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, MPIR_Comm *comm, int context_offset, - struct MPID_Request **request ); + struct MPIR_Request **request ); int (*bsend_init)(struct MPIDI_VC *vc, const void *buf, int count, MPI_Datatype datatype, int dest, int tag, MPIR_Comm *comm, int context_offset, - struct MPID_Request **request); + struct MPIR_Request **request); int (*rsend_init)(struct MPIDI_VC *vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, MPIR_Comm *comm, int context_offset, - struct MPID_Request **request ); + struct MPIR_Request **request ); int (*ssend_init)(struct MPIDI_VC *vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, MPIR_Comm *comm, int context_offset, - struct MPID_Request **request ); - int (*startall)(struct MPIDI_VC *vc, int count, struct MPID_Request *requests[]); + struct MPIR_Request **request ); + int (*startall)(struct MPIDI_VC *vc, int count, struct MPIR_Request *requests[]); - int (*cancel_send)(struct MPIDI_VC *vc, struct MPID_Request *sreq); - int (*cancel_recv)(struct MPIDI_VC *vc, struct MPID_Request *rreq); + int (*cancel_send)(struct MPIDI_VC *vc, struct MPIR_Request *sreq); + int (*cancel_recv)(struct MPIDI_VC *vc, struct MPIR_Request *rreq); int (*probe)(struct MPIDI_VC *vc, int source, int tag, MPIR_Comm *comm, int context_offset, MPI_Status *status); int (*iprobe)(struct MPIDI_VC *vc, int source, int tag, MPIR_Comm *comm, int context_offset, int *flag, MPI_Status *status); int (*improbe)(struct MPIDI_VC *vc, int source, int tag, MPIR_Comm *comm, int context_offset, - int *flag, MPID_Request **message, MPI_Status *status); - int (*imrecv)(struct MPIDI_VC *vc, struct MPID_Request *req); + int *flag, MPIR_Request **message, MPI_Status *status); + int (*imrecv)(struct MPIDI_VC *vc, struct MPIR_Request *req); } MPIDI_Comm_ops_t; extern int (*MPIDI_Anysource_iprobe_fn)(int tag, MPIR_Comm * comm, int context_offset, int *flag, MPI_Status * status); extern int (*MPIDI_Anysource_improbe_fn)(int tag, MPIR_Comm * comm, int context_offset, - int *flag, MPID_Request **message, + int *flag, MPIR_Request **message, MPI_Status * status); #endif @@ -719,11 +719,11 @@ typedef struct MPIDI_VC /* rendezvous function pointers. Called to send a rendevous message or when one is matched */ - int (* rndvSend_fn)( struct MPID_Request **sreq_p, const void * buf, MPI_Aint count, + int (* rndvSend_fn)( struct MPIR_Request **sreq_p, const void * buf, MPI_Aint count, MPI_Datatype datatype, int dt_contig, intptr_t data_sz, MPI_Aint dt_true_lb, int rank, int tag, struct MPIR_Comm * comm, int context_offset ); - int (* rndvRecv_fn)( struct MPIDI_VC * vc, struct MPID_Request *rreq ); + int (* rndvRecv_fn)( struct MPIDI_VC * vc, struct MPIR_Request *rreq ); /* eager message threshold */ int eager_max_msg_sz; @@ -734,7 +734,7 @@ typedef struct MPIDI_VC noncontiguous message. Caller must initialize sreq->dev.segment, _first and _size. Contiguous messages are called directly from CH3 and cannot be overridden. */ - int (* sendNoncontig_fn)( struct MPIDI_VC *vc, struct MPID_Request *sreq, + int (* sendNoncontig_fn)( struct MPIDI_VC *vc, struct MPIR_Request *sreq, void *header, intptr_t hdr_sz ); #ifdef ENABLE_COMM_OVERRIDES @@ -994,7 +994,7 @@ const char * MPIDI_VC_GetStateString(int); /* Prototypes for internal device routines */ int MPIDI_Isend_self(const void *, MPI_Aint, MPI_Datatype, int, int, MPIR_Comm *, - int, int, MPID_Request **); + int, int, MPIR_Request **); /*-------------------------- BEGIN MPI PORT SECTION @@ -1134,20 +1134,20 @@ int MPIDI_CH3I_Progress_finalize(void); int MPIDI_CH3I_Put(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPIR_Win * win_ptr, - MPID_Request * ureq); + MPIR_Request * ureq); int MPIDI_CH3I_Get(void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPIR_Win * win_ptr, - MPID_Request * ureq); + MPIR_Request * ureq); int MPIDI_CH3I_Accumulate(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Op op, - MPIR_Win * win_ptr, MPID_Request * ureq); + MPIR_Win * win_ptr, MPIR_Request * ureq); int MPIDI_CH3I_Get_accumulate(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, void *result_addr, int result_count, MPI_Datatype result_datatype, int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Op op, - MPIR_Win * win_ptr, MPID_Request * ureq); + MPIR_Win * win_ptr, MPIR_Request * ureq); /*@ MPIDI_CH3_Progress_signal_completion - Inform the progress engine that a @@ -1285,7 +1285,7 @@ int MPID_PG_BCast( MPIR_Comm *peercomm_p, MPIR_Comm *comm_p, int root ); NULL. @*/ int MPIDI_CH3_iStartMsg(MPIDI_VC_t * vc, void * pkt, intptr_t pkt_sz, - MPID_Request **sreq_ptr); + MPIR_Request **sreq_ptr); /*@ @@ -1318,7 +1318,7 @@ int MPIDI_CH3_iStartMsg(MPIDI_VC_t * vc, void * pkt, intptr_t pkt_sz, NULL. @*/ int MPIDI_CH3_iStartMsgv(MPIDI_VC_t * vc, MPL_IOV * iov, int iov_n, - MPID_Request **sreq_ptr); + MPIR_Request **sreq_ptr); /*@ @@ -1349,7 +1349,7 @@ int MPIDI_CH3_iStartMsgv(MPIDI_VC_t * vc, MPL_IOV * iov, int iov_n, invoke the OnDataAvail routine in the request, if any; otherwise, is must set the request as complete. @*/ -int MPIDI_CH3_iSend(MPIDI_VC_t * vc, MPID_Request * sreq, void * pkt, +int MPIDI_CH3_iSend(MPIDI_VC_t * vc, MPIR_Request * sreq, void * pkt, intptr_t pkt_sz); @@ -1381,7 +1381,7 @@ int MPIDI_CH3_iSend(MPIDI_VC_t * vc, MPID_Request * sreq, void * pkt, If the send completes immediately, the channel implementation still must call the OnDataAvail routine in the request, if any. @*/ -int MPIDI_CH3_iSendv(MPIDI_VC_t * vc, MPID_Request * sreq, MPL_IOV * iov, +int MPIDI_CH3_iSendv(MPIDI_VC_t * vc, MPIR_Request * sreq, MPL_IOV * iov, int iov_n); /*@ @@ -1406,35 +1406,35 @@ int MPIDI_CH3_Connect_to_root(const char *, MPIDI_VC_t **); */ int MPIDI_CH3U_Recvq_init(void); int MPIDI_CH3U_Recvq_FU(int, int, int, MPI_Status * ); -MPID_Request * MPIDI_CH3U_Recvq_FDU(MPI_Request, MPIDI_Message_match *); -MPID_Request * MPIDI_CH3U_Recvq_FDU_matchonly(int source, int tag, int context_id, MPIR_Comm *comm, +MPIR_Request * MPIDI_CH3U_Recvq_FDU(MPI_Request, MPIDI_Message_match *); +MPIR_Request * MPIDI_CH3U_Recvq_FDU_matchonly(int source, int tag, int context_id, MPIR_Comm *comm, int *foundp); -MPID_Request * MPIDI_CH3U_Recvq_FDU_or_AEP(int source, int tag, +MPIR_Request * MPIDI_CH3U_Recvq_FDU_or_AEP(int source, int tag, int context_id, MPIR_Comm *comm, void *user_buf, MPI_Aint user_count, MPI_Datatype datatype, int * foundp); -int MPIDI_CH3U_Recvq_DP(MPID_Request * rreq); -MPID_Request * MPIDI_CH3U_Recvq_FDP_or_AEU(MPIDI_Message_match * match, +int MPIDI_CH3U_Recvq_DP(MPIR_Request * rreq); +MPIR_Request * MPIDI_CH3U_Recvq_FDP_or_AEU(MPIDI_Message_match * match, int * found); int MPIDI_CH3U_Recvq_count_unexp(void); int MPIDI_CH3U_Complete_posted_with_error(MPIDI_VC_t *vc); int MPIDI_CH3U_Clean_recvq(MPIR_Comm *comm_ptr); -int MPIDI_CH3U_Request_load_send_iov(MPID_Request * const sreq, +int MPIDI_CH3U_Request_load_send_iov(MPIR_Request * const sreq, MPL_IOV * const iov, int * const iov_n); -int MPIDI_CH3U_Request_load_recv_iov(MPID_Request * const rreq); -int MPIDI_CH3U_Request_unpack_uebuf(MPID_Request * rreq); -int MPIDI_CH3U_Request_unpack_srbuf(MPID_Request * rreq); +int MPIDI_CH3U_Request_load_recv_iov(MPIR_Request * const rreq); +int MPIDI_CH3U_Request_unpack_uebuf(MPIR_Request * rreq); +int MPIDI_CH3U_Request_unpack_srbuf(MPIR_Request * rreq); void MPIDI_CH3U_Buffer_copy(const void * const sbuf, MPI_Aint scount, MPI_Datatype sdt, int * smpi_errno, void * const rbuf, MPI_Aint rcount, MPI_Datatype rdt, intptr_t * rdata_sz, int * rmpi_errno); -int MPIDI_CH3U_Post_data_receive(int found, MPID_Request ** rreqp); -int MPIDI_CH3U_Post_data_receive_found(MPID_Request * rreqp); -int MPIDI_CH3U_Post_data_receive_unexpected(MPID_Request * rreqp); -int MPIDI_CH3U_Receive_data_found(MPID_Request *rreq, char *buf, intptr_t *buflen, int *complete); -int MPIDI_CH3U_Receive_data_unexpected(MPID_Request * rreq, char *buf, intptr_t *buflen, int *complete); +int MPIDI_CH3U_Post_data_receive(int found, MPIR_Request ** rreqp); +int MPIDI_CH3U_Post_data_receive_found(MPIR_Request * rreqp); +int MPIDI_CH3U_Post_data_receive_unexpected(MPIR_Request * rreqp); +int MPIDI_CH3U_Receive_data_found(MPIR_Request *rreq, char *buf, intptr_t *buflen, int *complete); +int MPIDI_CH3U_Receive_data_unexpected(MPIR_Request * rreq, char *buf, intptr_t *buflen, int *complete); /* Initialization routine for ch3u_comm.c */ int MPIDI_CH3I_Comm_init(void); @@ -1458,7 +1458,7 @@ int MPIDI_CH3U_Comm_register_destroy_hook(int (*hook_fn)(struct MPIR_Comm *, voi Input Parameters: . req - pointer to the request object @*/ -void MPIDI_CH3_Request_add_ref(MPID_Request * req); +void MPIDI_CH3_Request_add_ref(MPIR_Request * req); #endif /*@ @@ -1542,7 +1542,7 @@ int MPIDI_CH3_Get_business_card(int myRank, char *value, int length); if the channel has made guarantees about ordering. E*/ int MPIDI_CH3U_Handle_recv_pkt(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, - intptr_t *buflen, MPID_Request ** rreqp); + intptr_t *buflen, MPIR_Request ** rreqp); /*@ MPIDI_CH3U_Handle_recv_req - Process a receive request for which all of the @@ -1556,13 +1556,13 @@ int MPIDI_CH3U_Handle_recv_pkt(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, Output Parameter: . complete - data transfer for the request has completed @*/ -int MPIDI_CH3U_Handle_recv_req(MPIDI_VC_t * vc, MPID_Request * rreq, +int MPIDI_CH3U_Handle_recv_req(MPIDI_VC_t * vc, MPIR_Request * rreq, int * complete); /* Handle_send_req invokes the action (method/function) when data becomes available. It is an obsolete routine; the completion function should be invoked directly. */ -int MPIDI_CH3U_Handle_send_req(MPIDI_VC_t * vc, MPID_Request * sreq, +int MPIDI_CH3U_Handle_send_req(MPIDI_VC_t * vc, MPIR_Request * sreq, int *complete); int MPIDI_CH3U_Handle_connection(MPIDI_VC_t * vc, MPIDI_VC_Event_t event); @@ -1672,69 +1672,69 @@ int MPIDI_GetTagFromPort( const char *, int * ); /* Here are the packet handlers */ int MPIDI_CH3_PktHandler_EagerSend( MPIDI_VC_t *, MPIDI_CH3_Pkt_t *, - intptr_t *, MPID_Request ** ); + intptr_t *, MPIR_Request ** ); #ifdef USE_EAGER_SHORT int MPIDI_CH3_PktHandler_EagerShortSend( MPIDI_VC_t *, MPIDI_CH3_Pkt_t *, - intptr_t *, MPID_Request ** ); + intptr_t *, MPIR_Request ** ); #endif int MPIDI_CH3_PktHandler_ReadySend( MPIDI_VC_t *, MPIDI_CH3_Pkt_t *, - intptr_t *, MPID_Request ** ); + intptr_t *, MPIR_Request ** ); int MPIDI_CH3_PktHandler_EagerSyncSend( MPIDI_VC_t *, MPIDI_CH3_Pkt_t *, - intptr_t *, MPID_Request ** ); + intptr_t *, MPIR_Request ** ); int MPIDI_CH3_PktHandler_EagerSyncAck( MPIDI_VC_t *, MPIDI_CH3_Pkt_t *, - intptr_t *, MPID_Request ** ); + intptr_t *, MPIR_Request ** ); int MPIDI_CH3_PktHandler_RndvReqToSend( MPIDI_VC_t *, MPIDI_CH3_Pkt_t *, - intptr_t *, MPID_Request ** ); + intptr_t *, MPIR_Request ** ); int MPIDI_CH3_PktHandler_RndvClrToSend( MPIDI_VC_t *, MPIDI_CH3_Pkt_t *, - intptr_t *, MPID_Request ** ); + intptr_t *, MPIR_Request ** ); int MPIDI_CH3_PktHandler_RndvSend( MPIDI_VC_t *, MPIDI_CH3_Pkt_t *, - intptr_t *, MPID_Request ** ); + intptr_t *, MPIR_Request ** ); int MPIDI_CH3_PktHandler_CancelSendReq( MPIDI_VC_t *, MPIDI_CH3_Pkt_t *, - intptr_t *, MPID_Request ** ); + intptr_t *, MPIR_Request ** ); int MPIDI_CH3_PktHandler_CancelSendResp( MPIDI_VC_t *, MPIDI_CH3_Pkt_t *, - intptr_t *, MPID_Request ** ); + intptr_t *, MPIR_Request ** ); int MPIDI_CH3_PktHandler_Put( MPIDI_VC_t *, MPIDI_CH3_Pkt_t *, - intptr_t *, MPID_Request ** ); + intptr_t *, MPIR_Request ** ); int MPIDI_CH3_PktHandler_Accumulate( MPIDI_VC_t *, MPIDI_CH3_Pkt_t *, - intptr_t *, MPID_Request ** ); + intptr_t *, MPIR_Request ** ); int MPIDI_CH3_PktHandler_GetAccumulate( MPIDI_VC_t *, MPIDI_CH3_Pkt_t *, - intptr_t *, MPID_Request ** ); + intptr_t *, MPIR_Request ** ); int MPIDI_CH3_PktHandler_CAS( MPIDI_VC_t *, MPIDI_CH3_Pkt_t *, - intptr_t *, MPID_Request ** ); + intptr_t *, MPIR_Request ** ); int MPIDI_CH3_PktHandler_CASResp( MPIDI_VC_t *, MPIDI_CH3_Pkt_t *, - intptr_t *, MPID_Request ** ); + intptr_t *, MPIR_Request ** ); int MPIDI_CH3_PktHandler_FOP( MPIDI_VC_t *, MPIDI_CH3_Pkt_t *, - intptr_t *, MPID_Request ** ); + intptr_t *, MPIR_Request ** ); int MPIDI_CH3_PktHandler_FOPResp( MPIDI_VC_t *, MPIDI_CH3_Pkt_t *, - intptr_t *, MPID_Request ** ); + intptr_t *, MPIR_Request ** ); int MPIDI_CH3_PktHandler_Get_AccumResp( MPIDI_VC_t *, MPIDI_CH3_Pkt_t *, - intptr_t *, MPID_Request ** ); + intptr_t *, MPIR_Request ** ); int MPIDI_CH3_PktHandler_Get( MPIDI_VC_t *, MPIDI_CH3_Pkt_t *, - intptr_t *, MPID_Request ** ); + intptr_t *, MPIR_Request ** ); int MPIDI_CH3_PktHandler_GetResp( MPIDI_VC_t *, MPIDI_CH3_Pkt_t *, - intptr_t *, MPID_Request ** ); + intptr_t *, MPIR_Request ** ); int MPIDI_CH3_PktHandler_Lock( MPIDI_VC_t *, MPIDI_CH3_Pkt_t *, - intptr_t *, MPID_Request ** ); + intptr_t *, MPIR_Request ** ); int MPIDI_CH3_PktHandler_LockAck( MPIDI_VC_t *, MPIDI_CH3_Pkt_t *, - intptr_t *, MPID_Request ** ); + intptr_t *, MPIR_Request ** ); int MPIDI_CH3_PktHandler_LockOpAck( MPIDI_VC_t *, MPIDI_CH3_Pkt_t *, - intptr_t *, MPID_Request ** ); + intptr_t *, MPIR_Request ** ); int MPIDI_CH3_PktHandler_Unlock( MPIDI_VC_t *, MPIDI_CH3_Pkt_t *, - intptr_t *, MPID_Request ** ); + intptr_t *, MPIR_Request ** ); int MPIDI_CH3_PktHandler_Flush( MPIDI_VC_t *, MPIDI_CH3_Pkt_t *, - intptr_t *, MPID_Request ** ); + intptr_t *, MPIR_Request ** ); int MPIDI_CH3_PktHandler_Ack( MPIDI_VC_t *, MPIDI_CH3_Pkt_t *, - intptr_t *, MPID_Request ** ); + intptr_t *, MPIR_Request ** ); int MPIDI_CH3_PktHandler_DecrAtCnt( MPIDI_VC_t *, MPIDI_CH3_Pkt_t *, - intptr_t *, MPID_Request ** ); + intptr_t *, MPIR_Request ** ); int MPIDI_CH3_PktHandler_FlowCntlUpdate( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, - intptr_t *, MPID_Request ** ); + intptr_t *, MPIR_Request ** ); int MPIDI_CH3_PktHandler_Close( MPIDI_VC_t *, MPIDI_CH3_Pkt_t *, - intptr_t *, MPID_Request ** ); + intptr_t *, MPIR_Request ** ); int MPIDI_CH3_PktHandler_EndCH3( MPIDI_VC_t *, MPIDI_CH3_Pkt_t *, - intptr_t *, MPID_Request ** ); + intptr_t *, MPIR_Request ** ); int MPIDI_CH3_PktHandler_Revoke(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, - intptr_t *buflen, MPID_Request **rreqp); + intptr_t *buflen, MPIR_Request **rreqp); int MPIDI_CH3_PktHandler_Init( MPIDI_CH3_PktHandler_Fcn *[], int ); int MPIDI_CH3I_RMA_Make_progress_global(int *made_progress); @@ -1752,82 +1752,82 @@ int MPIDI_CH3_PktPrint_EagerSyncAck( FILE *fp, MPIDI_CH3_Pkt_t *pkt ); #endif /* Routines to create packets (used in implementing MPI communications */ -int MPIDI_CH3_EagerNoncontigSend( MPID_Request **, MPIDI_CH3_Pkt_type_t, +int MPIDI_CH3_EagerNoncontigSend( MPIR_Request **, MPIDI_CH3_Pkt_type_t, const void *, MPI_Aint, MPI_Datatype, intptr_t, int, int, MPIR_Comm *, int ); -int MPIDI_CH3_EagerContigSend( MPID_Request **, MPIDI_CH3_Pkt_type_t, +int MPIDI_CH3_EagerContigSend( MPIR_Request **, MPIDI_CH3_Pkt_type_t, const void *, intptr_t, int, int, MPIR_Comm *, int ); -int MPIDI_CH3_EagerContigShortSend( MPID_Request **, MPIDI_CH3_Pkt_type_t, +int MPIDI_CH3_EagerContigShortSend( MPIR_Request **, MPIDI_CH3_Pkt_type_t, const void *, intptr_t, int, int, MPIR_Comm *, int ); -int MPIDI_CH3_EagerContigIsend( MPID_Request **, MPIDI_CH3_Pkt_type_t, +int MPIDI_CH3_EagerContigIsend( MPIR_Request **, MPIDI_CH3_Pkt_type_t, const void *, intptr_t, int, int, MPIR_Comm *, int ); -int MPIDI_CH3_RndvSend( MPID_Request **, const void *, MPI_Aint, MPI_Datatype, +int MPIDI_CH3_RndvSend( MPIR_Request **, const void *, MPI_Aint, MPI_Datatype, int, intptr_t, MPI_Aint, int, int, MPIR_Comm *, int ); -int MPIDI_CH3_EagerSyncNoncontigSend( MPID_Request **, const void *, int, +int MPIDI_CH3_EagerSyncNoncontigSend( MPIR_Request **, const void *, int, MPI_Datatype, intptr_t, int, MPI_Aint, int, int, MPIR_Comm *, int ); -int MPIDI_CH3_EagerSyncZero(MPID_Request **, int, int, MPIR_Comm *, int ); +int MPIDI_CH3_EagerSyncZero(MPIR_Request **, int, int, MPIR_Comm *, int ); -int MPIDI_CH3_SendNoncontig_iov( struct MPIDI_VC *vc, struct MPID_Request *sreq, +int MPIDI_CH3_SendNoncontig_iov( struct MPIDI_VC *vc, struct MPIR_Request *sreq, void *header, intptr_t hdr_sz ); /* Routines to ack packets, called in the receive routines when a message is matched */ -int MPIDI_CH3_EagerSyncAck( MPIDI_VC_t *, MPID_Request * ); -int MPIDI_CH3_RecvFromSelf( MPID_Request *, void *, MPI_Aint, MPI_Datatype ); -int MPIDI_CH3_RecvRndv( MPIDI_VC_t *, MPID_Request * ); +int MPIDI_CH3_EagerSyncAck( MPIDI_VC_t *, MPIR_Request * ); +int MPIDI_CH3_RecvFromSelf( MPIR_Request *, void *, MPI_Aint, MPI_Datatype ); +int MPIDI_CH3_RecvRndv( MPIDI_VC_t *, MPIR_Request * ); /* Handler routines to continuing after an IOV is processed (assigned to the OnDataAvail field in the device part of a request) */ -int MPIDI_CH3_ReqHandler_RecvComplete( MPIDI_VC_t *, MPID_Request *, int * ); -int MPIDI_CH3_ReqHandler_UnpackUEBufComplete( MPIDI_VC_t *, MPID_Request *, +int MPIDI_CH3_ReqHandler_RecvComplete( MPIDI_VC_t *, MPIR_Request *, int * ); +int MPIDI_CH3_ReqHandler_UnpackUEBufComplete( MPIDI_VC_t *, MPIR_Request *, int * ); -int MPIDI_CH3_ReqHandler_ReloadIOV( MPIDI_VC_t *, MPID_Request *, int * ); +int MPIDI_CH3_ReqHandler_ReloadIOV( MPIDI_VC_t *, MPIR_Request *, int * ); -int MPIDI_CH3_ReqHandler_UnpackSRBufReloadIOV( MPIDI_VC_t *, MPID_Request *, +int MPIDI_CH3_ReqHandler_UnpackSRBufReloadIOV( MPIDI_VC_t *, MPIR_Request *, int * ); -int MPIDI_CH3_ReqHandler_UnpackSRBufComplete( MPIDI_VC_t *, MPID_Request *, +int MPIDI_CH3_ReqHandler_UnpackSRBufComplete( MPIDI_VC_t *, MPIR_Request *, int * ); int MPIDI_CH3_ReqHandler_PutDerivedDTRecvComplete( MPIDI_VC_t *, - MPID_Request *, int * ); -int MPIDI_CH3_ReqHandler_PutRecvComplete( MPIDI_VC_t *, MPID_Request *, + MPIR_Request *, int * ); +int MPIDI_CH3_ReqHandler_PutRecvComplete( MPIDI_VC_t *, MPIR_Request *, int * ); -int MPIDI_CH3_ReqHandler_AccumRecvComplete( MPIDI_VC_t *, MPID_Request *, +int MPIDI_CH3_ReqHandler_AccumRecvComplete( MPIDI_VC_t *, MPIR_Request *, int * ); -int MPIDI_CH3_ReqHandler_GaccumRecvComplete( MPIDI_VC_t *, MPID_Request *, +int MPIDI_CH3_ReqHandler_GaccumRecvComplete( MPIDI_VC_t *, MPIR_Request *, int * ); -int MPIDI_CH3_ReqHandler_FOPRecvComplete( MPIDI_VC_t *, MPID_Request *, +int MPIDI_CH3_ReqHandler_FOPRecvComplete( MPIDI_VC_t *, MPIR_Request *, int * ); int MPIDI_CH3_ReqHandler_AccumMetadataRecvComplete( MPIDI_VC_t *, - MPID_Request *, + MPIR_Request *, int * ); int MPIDI_CH3_ReqHandler_GaccumMetadataRecvComplete( MPIDI_VC_t *, - MPID_Request *, + MPIR_Request *, int * ); int MPIDI_CH3_ReqHandler_GetDerivedDTRecvComplete( MPIDI_VC_t *, - MPID_Request *, int * ); + MPIR_Request *, int * ); int MPIDI_CH3_ReqHandler_PiggybackLockOpRecvComplete( MPIDI_VC_t *, - MPID_Request *, int * ); + MPIR_Request *, int * ); /* Send Handlers */ -int MPIDI_CH3_ReqHandler_SendReloadIOV( MPIDI_VC_t *vc, MPID_Request *sreq, +int MPIDI_CH3_ReqHandler_SendReloadIOV( MPIDI_VC_t *vc, MPIR_Request *sreq, int *complete ); -int MPIDI_CH3_ReqHandler_GetSendComplete( MPIDI_VC_t *, MPID_Request *, +int MPIDI_CH3_ReqHandler_GetSendComplete( MPIDI_VC_t *, MPIR_Request *, int * ); -int MPIDI_CH3_ReqHandler_GaccumSendComplete( MPIDI_VC_t *, MPID_Request *, +int MPIDI_CH3_ReqHandler_GaccumSendComplete( MPIDI_VC_t *, MPIR_Request *, int * ); -int MPIDI_CH3_ReqHandler_CASSendComplete( MPIDI_VC_t *, MPID_Request *, +int MPIDI_CH3_ReqHandler_CASSendComplete( MPIDI_VC_t *, MPIR_Request *, int * ); -int MPIDI_CH3_ReqHandler_FOPSendComplete( MPIDI_VC_t *, MPID_Request *, +int MPIDI_CH3_ReqHandler_FOPSendComplete( MPIDI_VC_t *, MPIR_Request *, int * ); /* RMA operation request handler */ -int MPIDI_CH3_Req_handler_rma_op_complete(MPID_Request *); +int MPIDI_CH3_Req_handler_rma_op_complete(MPIR_Request *); #define MPIDI_CH3_GET_EAGER_THRESHOLD(eager_threshold_p, comm, vc) \ do { \ diff --git a/src/mpid/ch3/include/mpidpre.h b/src/mpid/ch3/include/mpidpre.h index 9847619..16045fe 100644 --- a/src/mpid/ch3/include/mpidpre.h +++ b/src/mpid/ch3/include/mpidpre.h @@ -10,8 +10,8 @@ #if !defined(MPICH_MPIDPRE_H_INCLUDED) #define MPICH_MPIDPRE_H_INCLUDED -/* Tell the compiler that we're going to declare struct MPID_Request later */ -struct MPID_Request; +/* Tell the compiler that we're going to declare struct MPIR_Request later */ +struct MPIR_Request; #if defined(HAVE_SYS_TYPES_H) #include <sys/types.h> @@ -32,7 +32,7 @@ struct MPID_Request; union MPIDI_CH3_Pkt; struct MPIDI_VC; -struct MPID_Request; +struct MPIR_Request; /* PktHandler function: vc (INPUT) -- vc on which the packet was received @@ -46,7 +46,7 @@ struct MPID_Request; (This decl needs to come before mpidi_ch3_pre.h) */ typedef int MPIDI_CH3_PktHandler_Fcn(struct MPIDI_VC *vc, union MPIDI_CH3_Pkt *pkt, - intptr_t *buflen, struct MPID_Request **req ); + intptr_t *buflen, struct MPIR_Request **req ); /* Include definitions from the channel which must exist before items in this file (mpidpre.h) or the file it includes (mpiimpl.h) can be defined. */ @@ -398,7 +398,7 @@ typedef struct MPIDI_Request { For example, when an operation described by an iov has completed. This replaces the MPIDI_CA_t (completion action) field used through MPICH 1.0.4. */ - int (*OnDataAvail)( struct MPIDI_VC *, struct MPID_Request *, int * ); + int (*OnDataAvail)( struct MPIDI_VC *, struct MPIR_Request *, int * ); /* OnFinal is used in the following case: OnDataAvail is set to a function, and that function has processed all of the data. At that point, the OnDataAvail function can @@ -407,7 +407,7 @@ typedef struct MPIDI_Request { as a get-response) when processing of the non-contiguous data completes. This value need not be initialized unless OnDataAvail is set to a non-null value (and then only in certain cases) */ - int (*OnFinal)( struct MPIDI_VC *, struct MPID_Request *, int * ); + int (*OnFinal)( struct MPIDI_VC *, struct MPIR_Request *, int * ); /* tmpbuf and tmpbuf_sz describe temporary storage used for things like unexpected eager messages and packing/unpacking @@ -464,7 +464,7 @@ typedef struct MPIDI_Request { Question: do we want to make this a link instead of reserving a fixed spot in the request? */ MPIDI_CH3_Pkt_t pending_pkt; - struct MPID_Request * next; + struct MPIR_Request * next; } MPIDI_Request; #define MPIR_REQUEST_DECL MPIDI_Request dev; diff --git a/src/mpid/ch3/include/mpidrma.h b/src/mpid/ch3/include/mpidrma.h index bb030fe..325682d 100644 --- a/src/mpid/ch3/include/mpidrma.h +++ b/src/mpid/ch3/include/mpidrma.h @@ -22,7 +22,7 @@ static inline int send_lock_msg(int dest, int lock_type, MPIR_Win * win_ptr) int mpi_errno = MPI_SUCCESS; MPIDI_CH3_Pkt_t upkt; MPIDI_CH3_Pkt_lock_t *lock_pkt = &upkt.lock; - MPID_Request *req = NULL; + MPIR_Request *req = NULL; MPIDI_VC_t *vc; MPIDI_STATE_DECL(MPID_STATE_SEND_LOCK_MSG); MPIDI_RMA_FUNC_ENTER(MPID_STATE_SEND_LOCK_MSG); @@ -69,7 +69,7 @@ static inline int send_unlock_msg(int dest, MPIR_Win * win_ptr, MPIDI_CH3_Pkt_fl int mpi_errno = MPI_SUCCESS; MPIDI_CH3_Pkt_t upkt; MPIDI_CH3_Pkt_unlock_t *unlock_pkt = &upkt.unlock; - MPID_Request *req = NULL; + MPIR_Request *req = NULL; MPIDI_VC_t *vc; MPIDI_STATE_DECL(MPID_STATE_SEND_UNLOCK_MSG); MPIDI_RMA_FUNC_ENTER(MPID_STATE_SEND_UNLOCK_MSG); @@ -115,7 +115,7 @@ static inline int MPIDI_CH3I_Send_lock_ack_pkt(MPIDI_VC_t * vc, MPIR_Win * win_p { MPIDI_CH3_Pkt_t upkt; MPIDI_CH3_Pkt_lock_ack_t *lock_ack_pkt = &upkt.lock_ack; - MPID_Request *req = NULL; + MPIR_Request *req = NULL; int mpi_errno; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3I_SEND_LOCK_ACK_PKT); @@ -162,7 +162,7 @@ static inline int MPIDI_CH3I_Send_lock_op_ack_pkt(MPIDI_VC_t * vc, MPIR_Win * wi { MPIDI_CH3_Pkt_t upkt; MPIDI_CH3_Pkt_lock_op_ack_t *lock_op_ack_pkt = &upkt.lock_op_ack; - MPID_Request *req = NULL; + MPIR_Request *req = NULL; int mpi_errno; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3I_SEND_LOCK_OP_ACK_PKT); @@ -207,7 +207,7 @@ static inline int MPIDI_CH3I_Send_ack_pkt(MPIDI_VC_t * vc, MPIR_Win * win_ptr, { MPIDI_CH3_Pkt_t upkt; MPIDI_CH3_Pkt_ack_t *ack_pkt = &upkt.ack; - MPID_Request *req; + MPIR_Request *req; int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3I_SEND_ACK_PKT); @@ -244,7 +244,7 @@ static inline int send_decr_at_cnt_msg(int dst, MPIR_Win * win_ptr, MPIDI_CH3_Pk MPIDI_CH3_Pkt_t upkt; MPIDI_CH3_Pkt_decr_at_counter_t *decr_at_cnt_pkt = &upkt.decr_at_cnt; MPIDI_VC_t *vc; - MPID_Request *request = NULL; + MPIR_Request *request = NULL; int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_SEND_DECR_AT_CNT_MSG); MPIDI_RMA_FUNC_ENTER(MPID_STATE_SEND_DECR_AT_CNT_MSG); @@ -286,7 +286,7 @@ static inline int send_flush_msg(int dest, MPIR_Win * win_ptr) int mpi_errno = MPI_SUCCESS; MPIDI_CH3_Pkt_t upkt; MPIDI_CH3_Pkt_flush_t *flush_pkt = &upkt.flush; - MPID_Request *req = NULL; + MPIR_Request *req = NULL; MPIDI_VC_t *vc; MPIDI_STATE_DECL(MPID_STATE_SEND_FLUSH_MSG); MPIDI_RMA_FUNC_ENTER(MPID_STATE_SEND_FLUSH_MSG); @@ -320,7 +320,7 @@ static inline int send_flush_msg(int dest, MPIR_Win * win_ptr) /* enqueue an unsatisfied origin in passive target at target side. */ static inline int enqueue_lock_origin(MPIR_Win * win_ptr, MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, - intptr_t * buflen, MPID_Request ** reqp) + intptr_t * buflen, MPIR_Request ** reqp) { MPIDI_RMA_Target_lock_entry_t *new_ptr = NULL; MPIDI_CH3_Pkt_flags_t flag; @@ -357,7 +357,7 @@ static inline int enqueue_lock_origin(MPIR_Win * win_ptr, MPIDI_VC_t * vc, MPI_Aint type_extent; intptr_t recv_data_sz = 0; intptr_t buf_size = 0; - MPID_Request *req = NULL; + MPIR_Request *req = NULL; MPI_Datatype target_dtp; int target_count; int complete = 0; @@ -645,7 +645,7 @@ static inline int check_and_set_req_completion(MPIR_Win * win_ptr, MPIDI_RMA_Tar { int i, mpi_errno = MPI_SUCCESS; int incomplete_req_cnt = 0; - MPID_Request **req = NULL; + MPIR_Request **req = NULL; MPIDI_STATE_DECL(MPID_STATE_CHECK_AND_SET_REQ_COMPLETION); MPIDI_RMA_FUNC_ENTER(MPID_STATE_CHECK_AND_SET_REQ_COMPLETION); @@ -661,7 +661,7 @@ static inline int check_and_set_req_completion(MPIR_Win * win_ptr, MPIDI_RMA_Tar if ((*req) == NULL) continue; - if (MPID_Request_is_complete((*req))) { + if (MPIR_Request_is_complete((*req))) { MPID_Request_release((*req)); (*req) = NULL; } @@ -1036,7 +1036,7 @@ static inline int do_accumulate_op(void *source_buf, int source_count, MPI_Datat static inline int check_piggyback_lock(MPIR_Win * win_ptr, MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, intptr_t * buflen, - int *acquire_lock_fail, MPID_Request ** reqp) + int *acquire_lock_fail, MPIR_Request ** reqp) { int lock_type; MPIDI_CH3_Pkt_flags_t flags; diff --git a/src/mpid/ch3/src/ch3u_buffer.c b/src/mpid/ch3/src/ch3u_buffer.c index 1df0d2c..d73c1b1 100644 --- a/src/mpid/ch3/src/ch3u_buffer.c +++ b/src/mpid/ch3/src/ch3u_buffer.c @@ -226,10 +226,10 @@ void MPIDI_CH3U_Buffer_copy( * This routine is called by mpid_recv and mpid_irecv when a request * matches a send-to-self message */ -int MPIDI_CH3_RecvFromSelf( MPID_Request *rreq, void *buf, MPI_Aint count, +int MPIDI_CH3_RecvFromSelf( MPIR_Request *rreq, void *buf, MPI_Aint count, MPI_Datatype datatype ) { - MPID_Request * const sreq = rreq->partner_request; + MPIR_Request * const sreq = rreq->partner_request; int mpi_errno = MPI_SUCCESS; if (sreq != NULL) diff --git a/src/mpid/ch3/src/ch3u_eager.c b/src/mpid/ch3/src/ch3u_eager.c index e34e35f..5baeb21 100644 --- a/src/mpid/ch3/src/ch3u_eager.c +++ b/src/mpid/ch3/src/ch3u_eager.c @@ -20,7 +20,7 @@ /* MPIDI_CH3_SendNoncontig_iov - Sends a message by loading an IOV and calling iSendv. The caller must initialize sreq->dev.segment as well as segment_first and segment_size. */ -int MPIDI_CH3_SendNoncontig_iov( MPIDI_VC_t *vc, MPID_Request *sreq, +int MPIDI_CH3_SendNoncontig_iov( MPIDI_VC_t *vc, MPIR_Request *sreq, void *header, intptr_t hdr_sz ) { int mpi_errno = MPI_SUCCESS; @@ -85,7 +85,7 @@ int MPIDI_CH3_SendNoncontig_iov( MPIDI_VC_t *vc, MPID_Request *sreq, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) /* MPIDI_CH3_EagerNoncontigSend - Eagerly send noncontiguous data */ -int MPIDI_CH3_EagerNoncontigSend( MPID_Request **sreq_p, +int MPIDI_CH3_EagerNoncontigSend( MPIR_Request **sreq_p, MPIDI_CH3_Pkt_type_t reqtype, const void * buf, MPI_Aint count, MPI_Datatype datatype, intptr_t data_sz, @@ -95,7 +95,7 @@ int MPIDI_CH3_EagerNoncontigSend( MPID_Request **sreq_p, { int mpi_errno = MPI_SUCCESS; MPIDI_VC_t * vc; - MPID_Request *sreq = *sreq_p; + MPIR_Request *sreq = *sreq_p; MPIDI_CH3_Pkt_t upkt; MPIDI_CH3_Pkt_eager_send_t * const eager_pkt = &upkt.eager_send; @@ -151,7 +151,7 @@ int MPIDI_CH3_EagerNoncontigSend( MPID_Request **sreq_p, #define FUNCNAME MPIDI_EagerContigSend #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3_EagerContigSend( MPID_Request **sreq_p, +int MPIDI_CH3_EagerContigSend( MPIR_Request **sreq_p, MPIDI_CH3_Pkt_type_t reqtype, const void * buf, intptr_t data_sz, int rank, int tag, MPIR_Comm * comm, int context_offset ) @@ -160,7 +160,7 @@ int MPIDI_CH3_EagerContigSend( MPID_Request **sreq_p, MPIDI_VC_t * vc; MPIDI_CH3_Pkt_t upkt; MPIDI_CH3_Pkt_eager_send_t * const eager_pkt = &upkt.eager_send; - MPID_Request *sreq = *sreq_p; + MPIR_Request *sreq = *sreq_p; MPL_IOV iov[2]; MPIDI_Pkt_init(eager_pkt, reqtype); @@ -217,8 +217,8 @@ int MPIDI_CH3_EagerContigSend( MPID_Request **sreq_p, #define FUNCNAME MPIDI_EagerContigShortSend #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3_EagerContigShortSend( MPID_Request **sreq_p, - MPIDI_CH3_Pkt_type_t reqtype, +int MPIDI_CH3_EagerContigShortSend( MPIR_Request **sreq_p, + MPIDI_CH3_Pkt_type_t reqtype, const void * buf, intptr_t data_sz, int rank, int tag, MPIR_Comm * comm, int context_offset ) @@ -228,7 +228,7 @@ int MPIDI_CH3_EagerContigShortSend( MPID_Request **sreq_p, MPIDI_CH3_Pkt_t upkt; MPIDI_CH3_Pkt_eagershort_send_t * const eagershort_pkt = &upkt.eagershort_send; - MPID_Request *sreq = *sreq_p; + MPIR_Request *sreq = *sreq_p; /* printf( "Sending short eager\n"); fflush(stdout); */ MPIDI_Pkt_init(eagershort_pkt, reqtype); @@ -289,10 +289,10 @@ int MPIDI_CH3_EagerContigShortSend( MPID_Request **sreq_p, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3_PktHandler_EagerShortSend( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, - intptr_t *buflen, MPID_Request **rreqp ) + intptr_t *buflen, MPIR_Request **rreqp ) { MPIDI_CH3_Pkt_eagershort_send_t * eagershort_pkt = &pkt->eagershort_send; - MPID_Request * rreq; + MPIR_Request * rreq; int found; int mpi_errno = MPI_SUCCESS; @@ -525,7 +525,7 @@ int MPIDI_CH3_PktHandler_EagerShortSend( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, #define FUNCNAME MPIDI_EagerContigIsend #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3_EagerContigIsend( MPID_Request **sreq_p, +int MPIDI_CH3_EagerContigIsend( MPIR_Request **sreq_p, MPIDI_CH3_Pkt_type_t reqtype, const void * buf, intptr_t data_sz, int rank, int tag, MPIR_Comm * comm, int context_offset ) @@ -534,7 +534,7 @@ int MPIDI_CH3_EagerContigIsend( MPID_Request **sreq_p, MPIDI_VC_t * vc; MPIDI_CH3_Pkt_t upkt; MPIDI_CH3_Pkt_eager_send_t * const eager_pkt = &upkt.eager_send; - MPID_Request *sreq = *sreq_p; + MPIR_Request *sreq = *sreq_p; MPL_IOV iov[MPL_IOV_LIMIT]; MPL_DBG_MSG_FMT(MPIDI_CH3_DBG_OTHER,VERBOSE,(MPL_DBG_FDEST, @@ -605,10 +605,10 @@ int MPIDI_CH3_EagerContigIsend( MPID_Request **sreq_p, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3_PktHandler_EagerSend( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, - intptr_t *buflen, MPID_Request **rreqp ) + intptr_t *buflen, MPIR_Request **rreqp ) { MPIDI_CH3_Pkt_eager_send_t * eager_pkt = &pkt->eager_send; - MPID_Request * rreq; + MPIR_Request * rreq; int found; int complete; char *data_buf; @@ -695,10 +695,10 @@ int MPIDI_CH3_PktHandler_EagerSend( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3_PktHandler_ReadySend( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, - intptr_t *buflen, MPID_Request **rreqp ) + intptr_t *buflen, MPIR_Request **rreqp ) { MPIDI_CH3_Pkt_ready_send_t * ready_pkt = &pkt->ready_send; - MPID_Request * rreq; + MPIR_Request * rreq; int found; int complete; char *data_buf; diff --git a/src/mpid/ch3/src/ch3u_eagersync.c b/src/mpid/ch3/src/ch3u_eagersync.c index cf09ea8..a0dbd95 100644 --- a/src/mpid/ch3/src/ch3u_eagersync.c +++ b/src/mpid/ch3/src/ch3u_eagersync.c @@ -26,7 +26,7 @@ most application codes should not be using synchronous sends in performance-critical operations. */ -int MPIDI_CH3_EagerSyncNoncontigSend( MPID_Request **sreq_p, +int MPIDI_CH3_EagerSyncNoncontigSend( MPIR_Request **sreq_p, const void * buf, int count, MPI_Datatype datatype, intptr_t data_sz, int dt_contig, MPI_Aint dt_true_lb, @@ -38,7 +38,7 @@ int MPIDI_CH3_EagerSyncNoncontigSend( MPID_Request **sreq_p, MPIDI_CH3_Pkt_t upkt; MPIDI_CH3_Pkt_eager_sync_send_t * const es_pkt = &upkt.eager_sync_send; MPIDI_VC_t * vc; - MPID_Request *sreq = *sreq_p; + MPIR_Request *sreq = *sreq_p; /* MT FIXME what are the two operations we are waiting for? the send and * the sync response? */ @@ -116,14 +116,14 @@ int MPIDI_CH3_EagerSyncNoncontigSend( MPID_Request **sreq_p, /* Send a zero-sized message with eager synchronous. This is a temporary routine, as we may want to replace this with a counterpart to the Eager Short message */ -int MPIDI_CH3_EagerSyncZero(MPID_Request **sreq_p, int rank, int tag, +int MPIDI_CH3_EagerSyncZero(MPIR_Request **sreq_p, int rank, int tag, MPIR_Comm * comm, int context_offset ) { int mpi_errno = MPI_SUCCESS; MPIDI_CH3_Pkt_t upkt; MPIDI_CH3_Pkt_eager_sync_send_t * const es_pkt = &upkt.eager_sync_send; MPIDI_VC_t * vc; - MPID_Request *sreq = *sreq_p; + MPIR_Request *sreq = *sreq_p; MPL_DBG_MSG(MPIDI_CH3_DBG_OTHER,VERBOSE,"sending zero length message"); @@ -167,12 +167,12 @@ int MPIDI_CH3_EagerSyncZero(MPID_Request **sreq_p, int rank, int tag, /* * These routines are called when a receive matches an eager sync send */ -int MPIDI_CH3_EagerSyncAck( MPIDI_VC_t *vc, MPID_Request *rreq ) +int MPIDI_CH3_EagerSyncAck( MPIDI_VC_t *vc, MPIR_Request *rreq ) { int mpi_errno = MPI_SUCCESS; MPIDI_CH3_Pkt_t upkt; MPIDI_CH3_Pkt_eager_sync_ack_t * const esa_pkt = &upkt.eager_sync_ack; - MPID_Request * esa_req; + MPIR_Request * esa_req; MPL_DBG_MSG(MPIDI_CH3_DBG_OTHER,VERBOSE,"sending eager sync ack"); MPIDI_Pkt_init(esa_pkt, MPIDI_CH3_PKT_EAGER_SYNC_ACK); @@ -213,10 +213,10 @@ int MPIDI_CH3_EagerSyncAck( MPIDI_VC_t *vc, MPID_Request *rreq ) #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3_PktHandler_EagerSyncSend( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, - intptr_t *buflen, MPID_Request **rreqp ) + intptr_t *buflen, MPIR_Request **rreqp ) { MPIDI_CH3_Pkt_eager_send_t * es_pkt = &pkt->eager_send; - MPID_Request * rreq; + MPIR_Request * rreq; int found; int complete; char *data_buf; @@ -253,7 +253,7 @@ int MPIDI_CH3_PktHandler_EagerSyncSend( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, { MPIDI_CH3_Pkt_t upkt; MPIDI_CH3_Pkt_eager_sync_ack_t * const esa_pkt = &upkt.eager_sync_ack; - MPID_Request * esa_req; + MPIR_Request * esa_req; if (rreq->dev.recv_data_sz == 0) { *buflen = sizeof(MPIDI_CH3_Pkt_t); @@ -346,16 +346,16 @@ int MPIDI_CH3_PktHandler_EagerSyncSend( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3_PktHandler_EagerSyncAck( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, - intptr_t *buflen, MPID_Request **rreqp ) + intptr_t *buflen, MPIR_Request **rreqp ) { MPIDI_CH3_Pkt_eager_sync_ack_t * esa_pkt = &pkt->eager_sync_ack; - MPID_Request * sreq; + MPIR_Request * sreq; int mpi_errno = MPI_SUCCESS; MPL_DBG_MSG_P(MPIDI_CH3_DBG_OTHER,VERBOSE, "received eager sync ack pkt, sreq=0x%08x", esa_pkt->sender_req_id); - MPID_Request_get_ptr(esa_pkt->sender_req_id, sreq); + MPIR_Request_get_ptr(esa_pkt->sender_req_id, sreq); /* decrement CC (but don't mark data transfer as complete since the transfer could still be in progress) */ diff --git a/src/mpid/ch3/src/ch3u_handle_connection.c b/src/mpid/ch3/src/ch3u_handle_connection.c index a4b680f..7850b96 100644 --- a/src/mpid/ch3/src/ch3u_handle_connection.c +++ b/src/mpid/ch3/src/ch3u_handle_connection.c @@ -216,7 +216,7 @@ int MPIDI_CH3U_VC_SendClose( MPIDI_VC_t *vc, int rank ) { MPIDI_CH3_Pkt_t upkt; MPIDI_CH3_Pkt_close_t * close_pkt = &upkt.close; - MPID_Request * sreq; + MPIR_Request * sreq; int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3U_VC_SENDCLOSE); @@ -277,7 +277,7 @@ int MPIDI_CH3U_VC_SendClose( MPIDI_VC_t *vc, int rank ) #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3_PktHandler_Close( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, - intptr_t *buflen, MPID_Request **rreqp ) + intptr_t *buflen, MPIR_Request **rreqp ) { MPIDI_CH3_Pkt_close_t * close_pkt = &pkt->close; int mpi_errno = MPI_SUCCESS; @@ -286,7 +286,7 @@ int MPIDI_CH3_PktHandler_Close( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, { MPIDI_CH3_Pkt_t upkt; MPIDI_CH3_Pkt_close_t * resp_pkt = &upkt.close; - MPID_Request * resp_sreq; + MPIR_Request * resp_sreq; MPIDI_Pkt_init(resp_pkt, MPIDI_CH3_PKT_CLOSE); resp_pkt->ack = TRUE; diff --git a/src/mpid/ch3/src/ch3u_handle_op_req.c b/src/mpid/ch3/src/ch3u_handle_op_req.c index bbfb294..6d54000 100644 --- a/src/mpid/ch3/src/ch3u_handle_op_req.c +++ b/src/mpid/ch3/src/ch3u_handle_op_req.c @@ -12,10 +12,10 @@ #define FUNCNAME MPIDI_CH3_Req_handler_rma_op_complete #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3_Req_handler_rma_op_complete(MPID_Request * sreq) +int MPIDI_CH3_Req_handler_rma_op_complete(MPIR_Request * sreq) { int mpi_errno = MPI_SUCCESS; - MPID_Request *ureq = NULL; + MPIR_Request *ureq = NULL; MPIR_Win *win_ptr = NULL; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3_REQ_HANDLER_RMA_OP_COMPLETE); @@ -33,7 +33,7 @@ int MPIDI_CH3_Req_handler_rma_op_complete(MPID_Request * sreq) if (sreq->dev.request_handle != MPI_REQUEST_NULL) { /* get user request */ - MPID_Request_get_ptr(sreq->dev.request_handle, ureq); + MPIR_Request_get_ptr(sreq->dev.request_handle, ureq); mpi_errno = MPID_Request_complete(ureq); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); diff --git a/src/mpid/ch3/src/ch3u_handle_recv_pkt.c b/src/mpid/ch3/src/ch3u_handle_recv_pkt.c index d6bf34a..a2ceb03 100644 --- a/src/mpid/ch3/src/ch3u_handle_recv_pkt.c +++ b/src/mpid/ch3/src/ch3u_handle_recv_pkt.c @@ -53,7 +53,7 @@ #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3U_Handle_ordered_recv_pkt(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, - intptr_t *buflen, MPID_Request ** rreqp) + intptr_t *buflen, MPIR_Request ** rreqp) { int mpi_errno = MPI_SUCCESS; static MPIDI_CH3_PktHandler_Fcn *pktArray[MPIDI_CH3_PKT_END_CH3+1]; @@ -102,7 +102,7 @@ int MPIDI_CH3U_Handle_ordered_recv_pkt(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, #define FUNCNAME MPIDI_CH3U_Receive_data_found #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3U_Receive_data_found(MPID_Request *rreq, char *buf, intptr_t *buflen, int *complete) +int MPIDI_CH3U_Receive_data_found(MPIR_Request *rreq, char *buf, intptr_t *buflen, int *complete) { int dt_contig; MPI_Aint dt_true_lb; @@ -235,7 +235,7 @@ fn_fail: #define FUNCNAME MPIDI_CH3U_Receive_data_unexpected #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3U_Receive_data_unexpected(MPID_Request * rreq, char *buf, intptr_t *buflen, int *complete) +int MPIDI_CH3U_Receive_data_unexpected(MPIR_Request * rreq, char *buf, intptr_t *buflen, int *complete) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3U_RECEIVE_DATA_UNEXPECTED); @@ -293,7 +293,7 @@ int MPIDI_CH3U_Receive_data_unexpected(MPID_Request * rreq, char *buf, intptr_t #define FUNCNAME MPIDI_CH3U_Post_data_receive_found #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3U_Post_data_receive_found(MPID_Request * rreq) +int MPIDI_CH3U_Post_data_receive_found(MPIR_Request * rreq) { int mpi_errno = MPI_SUCCESS; int dt_contig; @@ -370,7 +370,7 @@ int MPIDI_CH3U_Post_data_receive_found(MPID_Request * rreq) #define FUNCNAME MPIDI_CH3U_Post_data_receive_unexpected #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3U_Post_data_receive_unexpected(MPID_Request * rreq) +int MPIDI_CH3U_Post_data_receive_unexpected(MPIR_Request * rreq) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3U_POST_DATA_RECEIVE_UNEXPECTED); @@ -484,7 +484,7 @@ int MPIDI_CH3I_Try_acquire_win_lock(MPIR_Win *win_ptr, int requested_lock) #define FUNCNAME MPIDI_CH3_PktHandler_FlowCntlUpdate #undef FCNAME int MPIDI_CH3_PktHandler_FlowCntlUpdate( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, - intptr_t *buflen, MPID_Request **rreqp) + intptr_t *buflen, MPIR_Request **rreqp) { *buflen = sizeof(MPIDI_CH3_Pkt_t); return MPI_SUCCESS; @@ -498,7 +498,7 @@ int MPIDI_CH3_PktHandler_FlowCntlUpdate( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, int MPIDI_CH3_PktHandler_EndCH3( MPIDI_VC_t *vc ATTRIBUTE((unused)), MPIDI_CH3_Pkt_t *pkt ATTRIBUTE((unused)), intptr_t *buflen ATTRIBUTE((unused)), - MPID_Request **rreqp ATTRIBUTE((unused)) ) + MPIR_Request **rreqp ATTRIBUTE((unused)) ) { MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3_PKTHANDLER_ENDCH3); diff --git a/src/mpid/ch3/src/ch3u_handle_recv_req.c b/src/mpid/ch3/src/ch3u_handle_recv_req.c index 8412c86..7183cf1 100644 --- a/src/mpid/ch3/src/ch3u_handle_recv_req.c +++ b/src/mpid/ch3/src/ch3u_handle_recv_req.c @@ -7,18 +7,18 @@ #include "mpidimpl.h" #include "mpidrma.h" -static int create_derived_datatype(MPID_Request * req, MPIDI_RMA_dtype_info * dtype_info, +static int create_derived_datatype(MPIR_Request * req, MPIDI_RMA_dtype_info * dtype_info, MPIDU_Datatype** dtp); #undef FUNCNAME #define FUNCNAME MPIDI_CH3U_Handle_recv_req #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3U_Handle_recv_req(MPIDI_VC_t * vc, MPID_Request * rreq, int *complete) +int MPIDI_CH3U_Handle_recv_req(MPIDI_VC_t * vc, MPIR_Request * rreq, int *complete) { static int in_routine ATTRIBUTE((unused)) = FALSE; int mpi_errno = MPI_SUCCESS; - int (*reqFn) (MPIDI_VC_t *, MPID_Request *, int *); + int (*reqFn) (MPIDI_VC_t *, MPIR_Request *, int *); MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3U_HANDLE_RECV_REQ); MPIDI_FUNC_ENTER(MPID_STATE_MPIDI_CH3U_HANDLE_RECV_REQ); @@ -55,7 +55,7 @@ int MPIDI_CH3U_Handle_recv_req(MPIDI_VC_t * vc, MPID_Request * rreq, int *comple * * The convention for the names of routines that are called when data is * available is - * MPIDI_CH3_ReqHandler_<type>(MPIDI_VC_t *, MPID_Request *, int *) + * MPIDI_CH3_ReqHandler_<type>(MPIDI_VC_t *, MPIR_Request *, int *) * as in * MPIDI_CH3_ReqHandler_... * @@ -68,7 +68,7 @@ int MPIDI_CH3U_Handle_recv_req(MPIDI_VC_t * vc, MPID_Request * rreq, int *comple */ /* ----------------------------------------------------------------------- */ int MPIDI_CH3_ReqHandler_RecvComplete(MPIDI_VC_t * vc ATTRIBUTE((unused)), - MPID_Request * rreq, int *complete) + MPIR_Request * rreq, int *complete) { int mpi_errno = MPI_SUCCESS; @@ -90,7 +90,7 @@ int MPIDI_CH3_ReqHandler_RecvComplete(MPIDI_VC_t * vc ATTRIBUTE((unused)), #define FUNCNAME MPIDI_CH3_ReqHandler_PutRecvComplete #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3_ReqHandler_PutRecvComplete(MPIDI_VC_t * vc, MPID_Request * rreq, int *complete) +int MPIDI_CH3_ReqHandler_PutRecvComplete(MPIDI_VC_t * vc, MPIR_Request * rreq, int *complete) { int mpi_errno = MPI_SUCCESS; MPIR_Win *win_ptr; @@ -113,7 +113,7 @@ int MPIDI_CH3_ReqHandler_PutRecvComplete(MPIDI_VC_t * vc, MPID_Request * rreq, i * which leads to wrong execution. * Here we check if req is already completed to prevent processing the * same request twice. */ - if (MPID_Request_is_complete(rreq)) { + if (MPIR_Request_is_complete(rreq)) { *complete = FALSE; goto fn_exit; } @@ -152,7 +152,7 @@ int MPIDI_CH3_ReqHandler_PutRecvComplete(MPIDI_VC_t * vc, MPID_Request * rreq, i #define FUNCNAME MPIDI_CH3_ReqHandler_AccumRecvComplete #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3_ReqHandler_AccumRecvComplete(MPIDI_VC_t * vc, MPID_Request * rreq, int *complete) +int MPIDI_CH3_ReqHandler_AccumRecvComplete(MPIDI_VC_t * vc, MPIR_Request * rreq, int *complete) { int mpi_errno = MPI_SUCCESS; MPIR_Win *win_ptr; @@ -178,7 +178,7 @@ int MPIDI_CH3_ReqHandler_AccumRecvComplete(MPIDI_VC_t * vc, MPID_Request * rreq, * which leads to wrong execution. * Here we check if req is already completed to prevent processing the * same request twice. */ - if (MPID_Request_is_complete(rreq)) { + if (MPIR_Request_is_complete(rreq)) { *complete = FALSE; goto fn_exit; } @@ -251,13 +251,13 @@ int MPIDI_CH3_ReqHandler_AccumRecvComplete(MPIDI_VC_t * vc, MPID_Request * rreq, #define FUNCNAME MPIDI_CH3_ReqHandler_GaccumRecvComplete #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3_ReqHandler_GaccumRecvComplete(MPIDI_VC_t * vc, MPID_Request * rreq, int *complete) +int MPIDI_CH3_ReqHandler_GaccumRecvComplete(MPIDI_VC_t * vc, MPIR_Request * rreq, int *complete) { int mpi_errno = MPI_SUCCESS; MPIR_Win *win_ptr; MPIDI_CH3_Pkt_t upkt; MPIDI_CH3_Pkt_get_accum_resp_t *get_accum_resp_pkt = &upkt.get_accum_resp; - MPID_Request *resp_req; + MPIR_Request *resp_req; MPL_IOV iov[MPL_IOV_LIMIT]; int iovcnt; int is_contig; @@ -424,12 +424,12 @@ int MPIDI_CH3_ReqHandler_GaccumRecvComplete(MPIDI_VC_t * vc, MPID_Request * rreq #define FUNCNAME MPIDI_CH3_ReqHandler_FOPRecvComplete #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3_ReqHandler_FOPRecvComplete(MPIDI_VC_t * vc, MPID_Request * rreq, int *complete) +int MPIDI_CH3_ReqHandler_FOPRecvComplete(MPIDI_VC_t * vc, MPIR_Request * rreq, int *complete) { int mpi_errno = MPI_SUCCESS; MPIR_Win *win_ptr = NULL; MPI_Aint type_size; - MPID_Request *resp_req = NULL; + MPIR_Request *resp_req = NULL; MPL_IOV iov[MPL_IOV_LIMIT]; int iovcnt; MPIDI_CH3_Pkt_t upkt; @@ -560,7 +560,7 @@ int MPIDI_CH3_ReqHandler_FOPRecvComplete(MPIDI_VC_t * vc, MPID_Request * rreq, i #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3_ReqHandler_PutDerivedDTRecvComplete(MPIDI_VC_t * vc ATTRIBUTE((unused)), - MPID_Request * rreq, int *complete) + MPIR_Request * rreq, int *complete) { int mpi_errno = MPI_SUCCESS; MPIDU_Datatype*new_dtp = NULL; @@ -608,7 +608,7 @@ int MPIDI_CH3_ReqHandler_PutDerivedDTRecvComplete(MPIDI_VC_t * vc ATTRIBUTE((unu #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3_ReqHandler_AccumMetadataRecvComplete(MPIDI_VC_t * vc ATTRIBUTE((unused)), - MPID_Request * rreq, int *complete) + MPIR_Request * rreq, int *complete) { int mpi_errno = MPI_SUCCESS; MPIDU_Datatype*new_dtp = NULL; @@ -723,7 +723,7 @@ int MPIDI_CH3_ReqHandler_AccumMetadataRecvComplete(MPIDI_VC_t * vc ATTRIBUTE((un #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3_ReqHandler_GaccumMetadataRecvComplete(MPIDI_VC_t * vc, - MPID_Request * rreq, int *complete) + MPIR_Request * rreq, int *complete) { int mpi_errno = MPI_SUCCESS; MPIDU_Datatype*new_dtp = NULL; @@ -856,14 +856,14 @@ int MPIDI_CH3_ReqHandler_GaccumMetadataRecvComplete(MPIDI_VC_t * vc, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3_ReqHandler_GetDerivedDTRecvComplete(MPIDI_VC_t * vc, - MPID_Request * rreq, int *complete) + MPIR_Request * rreq, int *complete) { int mpi_errno = MPI_SUCCESS; MPIDU_Datatype*new_dtp = NULL; MPIDI_RMA_dtype_info *dtype_info = NULL; MPIDI_CH3_Pkt_t upkt; MPIDI_CH3_Pkt_get_resp_t *get_resp_pkt = &upkt.get_resp; - MPID_Request *sreq; + MPIR_Request *sreq; MPIR_Win *win_ptr; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3_REQHANDLER_GETDERIVEDDTRECVCOMPLETE); @@ -947,7 +947,7 @@ int MPIDI_CH3_ReqHandler_GetDerivedDTRecvComplete(MPIDI_VC_t * vc, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3_ReqHandler_UnpackUEBufComplete(MPIDI_VC_t * vc ATTRIBUTE((unused)), - MPID_Request * rreq, int *complete) + MPIR_Request * rreq, int *complete) { int recv_pending; int mpi_errno = MPI_SUCCESS; @@ -987,7 +987,7 @@ int MPIDI_CH3_ReqHandler_UnpackUEBufComplete(MPIDI_VC_t * vc ATTRIBUTE((unused)) #define FUNCNAME MPIDI_CH3_ReqHandler_UnpackSRBufComplete #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3_ReqHandler_UnpackSRBufComplete(MPIDI_VC_t * vc, MPID_Request * rreq, int *complete) +int MPIDI_CH3_ReqHandler_UnpackSRBufComplete(MPIDI_VC_t * vc, MPIR_Request * rreq, int *complete) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3_REQHANDLER_UNPACKSRBUFCOMPLETE); @@ -1030,7 +1030,7 @@ int MPIDI_CH3_ReqHandler_UnpackSRBufComplete(MPIDI_VC_t * vc, MPID_Request * rre #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3_ReqHandler_UnpackSRBufReloadIOV(MPIDI_VC_t * vc ATTRIBUTE((unused)), - MPID_Request * rreq, int *complete) + MPIR_Request * rreq, int *complete) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3_REQHANDLER_UNPACKSRBUFRELOADIOV); @@ -1053,7 +1053,7 @@ int MPIDI_CH3_ReqHandler_UnpackSRBufReloadIOV(MPIDI_VC_t * vc ATTRIBUTE((unused) #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3_ReqHandler_ReloadIOV(MPIDI_VC_t * vc ATTRIBUTE((unused)), - MPID_Request * rreq, int *complete) + MPIR_Request * rreq, int *complete) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3_REQHANDLER_RELOADIOV); @@ -1077,7 +1077,7 @@ int MPIDI_CH3_ReqHandler_ReloadIOV(MPIDI_VC_t * vc ATTRIBUTE((unused)), #define FUNCNAME create_derived_datatype #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int create_derived_datatype(MPID_Request * req, MPIDI_RMA_dtype_info * dtype_info, +static int create_derived_datatype(MPIR_Request * req, MPIDI_RMA_dtype_info * dtype_info, MPIDU_Datatype** dtp) { MPIDU_Datatype*new_dtp; @@ -1184,7 +1184,7 @@ static inline int perform_get_in_lock_queue(MPIR_Win * win_ptr, MPIDI_CH3_Pkt_t upkt; MPIDI_CH3_Pkt_get_resp_t *get_resp_pkt = &upkt.get_resp; MPIDI_CH3_Pkt_get_t *get_pkt = &((target_lock_entry->pkt).get); - MPID_Request *sreq = NULL; + MPIR_Request *sreq = NULL; MPI_Aint type_size; size_t len; int iovcnt; @@ -1358,7 +1358,7 @@ static inline int perform_get_acc_in_lock_queue(MPIR_Win * win_ptr, MPIDI_CH3_Pkt_t upkt; MPIDI_CH3_Pkt_get_accum_resp_t *get_accum_resp_pkt = &upkt.get_accum_resp; MPIDI_CH3_Pkt_get_accum_t *get_accum_pkt = &((target_lock_entry->pkt).get_accum); - MPID_Request *sreq = NULL; + MPIR_Request *sreq = NULL; MPI_Aint type_size; size_t len; int iovcnt; @@ -1550,7 +1550,7 @@ static inline int perform_fop_in_lock_queue(MPIR_Win * win_ptr, MPIDI_CH3_Pkt_t upkt; MPIDI_CH3_Pkt_fop_resp_t *fop_resp_pkt = &upkt.fop_resp; MPIDI_CH3_Pkt_fop_t *fop_pkt = &((target_lock_entry->pkt).fop); - MPID_Request *resp_req = NULL; + MPIR_Request *resp_req = NULL; MPI_Aint type_size; MPL_IOV iov[MPL_IOV_LIMIT]; int iovcnt; @@ -1668,7 +1668,7 @@ static inline int perform_fop_in_lock_queue(MPIR_Win * win_ptr, MPIR_ERR_CHKANDJUMP(mpi_errno != MPI_SUCCESS, mpi_errno, MPI_ERR_OTHER, "**ch3|rmamsg"); if (resp_req != NULL) { - if (!MPID_Request_is_complete(resp_req)) { + if (!MPIR_Request_is_complete(resp_req)) { /* sending process is not completed, set proper OnDataAvail * (it is initialized to NULL by lower layer) */ resp_req->dev.target_win_handle = fop_pkt->target_win_handle; @@ -1721,7 +1721,7 @@ static inline int perform_cas_in_lock_queue(MPIR_Win * win_ptr, MPIDI_CH3_Pkt_t upkt; MPIDI_CH3_Pkt_cas_resp_t *cas_resp_pkt = &upkt.cas_resp; MPIDI_CH3_Pkt_cas_t *cas_pkt = &((target_lock_entry->pkt).cas); - MPID_Request *send_req = NULL; + MPIR_Request *send_req = NULL; MPI_Aint len; int mpi_errno = MPI_SUCCESS; @@ -1768,7 +1768,7 @@ static inline int perform_cas_in_lock_queue(MPIR_Win * win_ptr, MPIR_ERR_CHKANDJUMP(mpi_errno != MPI_SUCCESS, mpi_errno, MPI_ERR_OTHER, "**ch3|rmamsg"); if (send_req != NULL) { - if (!MPID_Request_is_complete(send_req)) { + if (!MPIR_Request_is_complete(send_req)) { /* sending process is not completed, set proper OnDataAvail * (it is initialized to NULL by lower layer) */ send_req->dev.target_win_handle = cas_pkt->target_win_handle; @@ -1989,7 +1989,7 @@ int MPIDI_CH3I_Release_lock(MPIR_Win * win_ptr) #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3_ReqHandler_PiggybackLockOpRecvComplete(MPIDI_VC_t * vc, - MPID_Request * rreq, int *complete) + MPIR_Request * rreq, int *complete) { int requested_lock; MPI_Win target_win_handle; diff --git a/src/mpid/ch3/src/ch3u_handle_revoke_pkt.c b/src/mpid/ch3/src/ch3u_handle_revoke_pkt.c index c412135..d50886c 100644 --- a/src/mpid/ch3/src/ch3u_handle_revoke_pkt.c +++ b/src/mpid/ch3/src/ch3u_handle_revoke_pkt.c @@ -11,7 +11,7 @@ #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3_PktHandler_Revoke(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, - intptr_t *buflen, MPID_Request **rreqp) + intptr_t *buflen, MPIR_Request **rreqp) { MPIDI_CH3_Pkt_revoke_t *revoke_pkt = &pkt->revoke; int mpi_errno = MPI_SUCCESS; diff --git a/src/mpid/ch3/src/ch3u_handle_send_req.c b/src/mpid/ch3/src/ch3u_handle_send_req.c index 4b81289..2de7dce 100644 --- a/src/mpid/ch3/src/ch3u_handle_send_req.c +++ b/src/mpid/ch3/src/ch3u_handle_send_req.c @@ -11,10 +11,10 @@ #define FUNCNAME MPIDI_CH3U_Handle_send_req #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3U_Handle_send_req(MPIDI_VC_t * vc, MPID_Request * sreq, int *complete) +int MPIDI_CH3U_Handle_send_req(MPIDI_VC_t * vc, MPIR_Request * sreq, int *complete) { int mpi_errno = MPI_SUCCESS; - int (*reqFn) (MPIDI_VC_t *, MPID_Request *, int *); + int (*reqFn) (MPIDI_VC_t *, MPIR_Request *, int *); MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3U_HANDLE_SEND_REQ); MPIDI_FUNC_ENTER(MPID_STATE_MPIDI_CH3U_HANDLE_SEND_REQ); @@ -49,7 +49,7 @@ int MPIDI_CH3U_Handle_send_req(MPIDI_VC_t * vc, MPID_Request * sreq, int *comple /* ----------------------------------------------------------------------- */ int MPIDI_CH3_ReqHandler_GetSendComplete(MPIDI_VC_t * vc ATTRIBUTE((unused)), - MPID_Request * sreq, int *complete) + MPIR_Request * sreq, int *complete) { int mpi_errno = MPI_SUCCESS; MPIR_Win *win_ptr; @@ -68,7 +68,7 @@ int MPIDI_CH3_ReqHandler_GetSendComplete(MPIDI_VC_t * vc ATTRIBUTE((unused)), * which leads to wrong execution. * Here we check if req is already completed to prevent processing the * same request twice. */ - if (MPID_Request_is_complete(sreq)) { + if (MPIR_Request_is_complete(sreq)) { *complete = FALSE; goto fn_exit; } @@ -107,7 +107,7 @@ int MPIDI_CH3_ReqHandler_GetSendComplete(MPIDI_VC_t * vc ATTRIBUTE((unused)), #define FUNCNAME MPIDI_CH3_ReqHandler_GaccumSendComplete #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3_ReqHandler_GaccumSendComplete(MPIDI_VC_t * vc, MPID_Request * rreq, int *complete) +int MPIDI_CH3_ReqHandler_GaccumSendComplete(MPIDI_VC_t * vc, MPIR_Request * rreq, int *complete) { int mpi_errno = MPI_SUCCESS; MPIR_Win *win_ptr; @@ -129,7 +129,7 @@ int MPIDI_CH3_ReqHandler_GaccumSendComplete(MPIDI_VC_t * vc, MPID_Request * rreq * which leads to wrong execution. * Here we check if req is already completed to prevent processing the * same request twice. */ - if (MPID_Request_is_complete(rreq)) { + if (MPIR_Request_is_complete(rreq)) { *complete = FALSE; goto fn_exit; } @@ -176,7 +176,7 @@ int MPIDI_CH3_ReqHandler_GaccumSendComplete(MPIDI_VC_t * vc, MPID_Request * rreq #define FUNCNAME MPIDI_CH3_ReqHandler_CASSendComplete #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3_ReqHandler_CASSendComplete(MPIDI_VC_t * vc, MPID_Request * rreq, int *complete) +int MPIDI_CH3_ReqHandler_CASSendComplete(MPIDI_VC_t * vc, MPIR_Request * rreq, int *complete) { int mpi_errno = MPI_SUCCESS; MPIR_Win *win_ptr; @@ -198,7 +198,7 @@ int MPIDI_CH3_ReqHandler_CASSendComplete(MPIDI_VC_t * vc, MPID_Request * rreq, i * which leads to wrong execution. * Here we check if req is already completed to prevent processing the * same request twice. */ - if (MPID_Request_is_complete(rreq)) { + if (MPIR_Request_is_complete(rreq)) { *complete = FALSE; goto fn_exit; } @@ -244,7 +244,7 @@ int MPIDI_CH3_ReqHandler_CASSendComplete(MPIDI_VC_t * vc, MPID_Request * rreq, i #define FUNCNAME MPIDI_CH3_ReqHandler_FOPSendComplete #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3_ReqHandler_FOPSendComplete(MPIDI_VC_t * vc, MPID_Request * rreq, int *complete) +int MPIDI_CH3_ReqHandler_FOPSendComplete(MPIDI_VC_t * vc, MPIR_Request * rreq, int *complete) { int mpi_errno = MPI_SUCCESS; MPIR_Win *win_ptr; @@ -266,7 +266,7 @@ int MPIDI_CH3_ReqHandler_FOPSendComplete(MPIDI_VC_t * vc, MPID_Request * rreq, i * which leads to wrong execution. * Here we check if req is already completed to prevent processing the * same request twice. */ - if (MPID_Request_is_complete(rreq)) { + if (MPIR_Request_is_complete(rreq)) { *complete = FALSE; goto fn_exit; } @@ -309,7 +309,7 @@ int MPIDI_CH3_ReqHandler_FOPSendComplete(MPIDI_VC_t * vc, MPID_Request * rreq, i } -int MPIDI_CH3_ReqHandler_SendReloadIOV(MPIDI_VC_t * vc ATTRIBUTE((unused)), MPID_Request * sreq, +int MPIDI_CH3_ReqHandler_SendReloadIOV(MPIDI_VC_t * vc ATTRIBUTE((unused)), MPIR_Request * sreq, int *complete) { int mpi_errno; diff --git a/src/mpid/ch3/src/ch3u_recvq.c b/src/mpid/ch3/src/ch3u_recvq.c index c9742e6..96daa93 100644 --- a/src/mpid/ch3/src/ch3u_recvq.c +++ b/src/mpid/ch3/src/ch3u_recvq.c @@ -43,10 +43,10 @@ * */ -static MPID_Request * recvq_posted_head = 0; -static MPID_Request * recvq_posted_tail = 0; -static MPID_Request * recvq_unexpected_head = 0; -static MPID_Request * recvq_unexpected_tail = 0; +static MPIR_Request * recvq_posted_head = 0; +static MPIR_Request * recvq_posted_tail = 0; +static MPIR_Request * recvq_unexpected_head = 0; +static MPIR_Request * recvq_unexpected_tail = 0; /* Export the location of the queue heads if debugger support is enabled. * This allows the queue code to rely on the local variables for the @@ -55,8 +55,8 @@ static MPID_Request * recvq_unexpected_tail = 0; * access the message queues. */ #ifdef HAVE_DEBUGGER_SUPPORT -MPID_Request ** const MPID_Recvq_posted_head_ptr = &recvq_posted_head; -MPID_Request ** const MPID_Recvq_unexpected_head_ptr = &recvq_unexpected_head; +MPIR_Request ** const MPID_Recvq_posted_head_ptr = &recvq_posted_head; +MPIR_Request ** const MPID_Recvq_unexpected_head_ptr = &recvq_unexpected_head; #endif /* If the MPIDI_Message_match structure fits into a pointer size, we @@ -213,7 +213,7 @@ fn_fail: #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3U_Recvq_FU(int source, int tag, int context_id, MPI_Status *s) { - MPID_Request * rreq; + MPIR_Request * rreq; int found = 0; MPIDI_Message_match match, mask; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3U_RECVQ_FU); @@ -290,14 +290,14 @@ int MPIDI_CH3U_Recvq_FU(int source, int tag, int context_id, MPI_Status *s) #define FUNCNAME MPIDI_CH3U_Recvq_FDU #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -MPID_Request * MPIDI_CH3U_Recvq_FDU(MPI_Request sreq_id, +MPIR_Request * MPIDI_CH3U_Recvq_FDU(MPI_Request sreq_id, MPIDI_Message_match * match) { - MPID_Request * rreq; - MPID_Request * prev_rreq; - MPID_Request * cur_rreq; - MPID_Request * matching_prev_rreq; - MPID_Request * matching_cur_rreq; + MPIR_Request * rreq; + MPIR_Request * prev_rreq; + MPIR_Request * cur_rreq; + MPIR_Request * matching_prev_rreq; + MPIR_Request * matching_cur_rreq; MPIDI_Message_match mask; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3U_RECVQ_FDU); @@ -373,10 +373,10 @@ MPID_Request * MPIDI_CH3U_Recvq_FDU(MPI_Request sreq_id, #define FUNCNAME MPIDI_CH3U_Recvq_FDU_matchonly #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -MPID_Request * MPIDI_CH3U_Recvq_FDU_matchonly(int source, int tag, int context_id, MPIR_Comm *comm, int *foundp) +MPIR_Request * MPIDI_CH3U_Recvq_FDU_matchonly(int source, int tag, int context_id, MPIR_Comm *comm, int *foundp) { int found = FALSE; - MPID_Request *rreq, *prev_rreq; + MPIR_Request *rreq, *prev_rreq; MPIDI_Message_match match; MPIDI_Message_match mask; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3U_RECVQ_FDU_MATCHONLY); @@ -490,13 +490,13 @@ lock_exit: #define FUNCNAME MPIDI_CH3U_Recvq_FDU_or_AEP #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -MPID_Request * MPIDI_CH3U_Recvq_FDU_or_AEP(int source, int tag, +MPIR_Request * MPIDI_CH3U_Recvq_FDU_or_AEP(int source, int tag, int context_id, MPIR_Comm *comm, void *user_buf, MPI_Aint user_count, MPI_Datatype datatype, int * foundp) { int mpi_errno = MPI_SUCCESS; int found = FALSE; - MPID_Request *rreq, *prev_rreq; + MPIR_Request *rreq, *prev_rreq; MPIDI_Message_match match; MPIDI_Message_match mask; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3U_RECVQ_FDU_OR_AEP); @@ -669,11 +669,11 @@ MPID_Request * MPIDI_CH3U_Recvq_FDU_or_AEP(int source, int tag, #define FUNCNAME MPIDI_CH3U_Recvq_DP #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3U_Recvq_DP(MPID_Request * rreq) +int MPIDI_CH3U_Recvq_DP(MPIR_Request * rreq) { int found; - MPID_Request * cur_rreq; - MPID_Request * prev_rreq; + MPIR_Request * cur_rreq; + MPIR_Request * prev_rreq; int dequeue_failed; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3U_RECVQ_DP); @@ -742,12 +742,12 @@ int MPIDI_CH3U_Recvq_DP(MPID_Request * rreq) #define FUNCNAME MPIDI_CH3U_Recvq_FDP_or_AEU #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -MPID_Request * MPIDI_CH3U_Recvq_FDP_or_AEU(MPIDI_Message_match * match, +MPIR_Request * MPIDI_CH3U_Recvq_FDP_or_AEU(MPIDI_Message_match * match, int * foundp) { int found; - MPID_Request * rreq; - MPID_Request * prev_rreq; + MPIR_Request * rreq; + MPIR_Request * prev_rreq; int channel_matched; int error_bit_masked = 0, proc_failure_bit_masked = 0; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3U_RECVQ_FDP_OR_AEU); @@ -861,7 +861,7 @@ MPID_Request * MPIDI_CH3U_Recvq_FDP_or_AEU(MPIDI_Message_match * match, } /* returns TRUE iff the request was sent on the vc */ -static inline int req_uses_vc(const MPID_Request* req, const MPIDI_VC_t *vc) +static inline int req_uses_vc(const MPIR_Request* req, const MPIDI_VC_t *vc) { MPIDI_VC_t *vc1; @@ -875,9 +875,9 @@ static inline int req_uses_vc(const MPID_Request* req, const MPIDI_VC_t *vc) #define FCNAME MPL_QUOTE(FUNCNAME) /* This dequeues req from the posted recv queue, set req's error code to comm_fail, and updates the req pointer. Note that this creates a new error code if one hasn't already been created (i.e., if *error is MPI_SUCCESS). */ -static inline void dequeue_and_set_error(MPID_Request **req, MPID_Request *prev_req, MPID_Request **head, MPID_Request **tail, int *error, int rank) +static inline void dequeue_and_set_error(MPIR_Request **req, MPIR_Request *prev_req, MPIR_Request **head, MPIR_Request **tail, int *error, int rank) { - MPID_Request *next = (*req)->dev.next; + MPIR_Request *next = (*req)->dev.next; /* remove from queue */ if (*head == *req) { @@ -916,7 +916,7 @@ int MPIDI_CH3U_Clean_recvq(MPIR_Comm *comm_ptr) { int mpi_errno = MPI_SUCCESS; int error = MPI_SUCCESS; - MPID_Request *rreq, *prev_rreq = NULL; + MPIR_Request *rreq, *prev_rreq = NULL; MPIDI_Message_match match; MPIDI_Message_match mask; MPIDI_STATE_DECL(MPIDI_CH3U_CLEAN_RECVQ); @@ -1126,7 +1126,7 @@ int MPIDI_CH3U_Clean_recvq(MPIR_Comm *comm_ptr) int MPIDI_CH3U_Complete_posted_with_error(MPIDI_VC_t *vc) { int mpi_errno = MPI_SUCCESS; - MPID_Request *req, *prev_req; + MPIR_Request *req, *prev_req; int error = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPIDU_COMPLETE_POSTED_WITH_ERROR); @@ -1197,7 +1197,7 @@ void MPIDI_CH3U_Dbg_print_recvq(FILE *stream); #define FCNAME MPL_QUOTE(FUNCNAME) void MPIDI_CH3U_Dbg_print_recvq(FILE *stream) { - MPID_Request * rreq; + MPIR_Request * rreq; int i; char tag_buf[128]; char rank_buf[128]; @@ -1252,7 +1252,7 @@ void MPIDI_CH3U_Dbg_print_recvq(FILE *stream) int MPIDI_CH3U_Recvq_count_unexp(void) { int count = 0; - MPID_Request *req = recvq_unexpected_head; + MPIR_Request *req = recvq_unexpected_head; while (req) { diff --git a/src/mpid/ch3/src/ch3u_request.c b/src/mpid/ch3/src/ch3u_request.c index bbf4587..934b493 100644 --- a/src/mpid/ch3/src/ch3u_request.c +++ b/src/mpid/ch3/src/ch3u_request.c @@ -17,32 +17,24 @@ */ /* Routines and data structures for request allocation and deallocation */ -#ifndef MPIR_REQUEST_PREALLOC -#define MPIR_REQUEST_PREALLOC 8 -#endif /* Max depth of recursive calls of MPID_Request_complete */ #define REQUEST_CB_DEPTH 2 -MPID_Request MPID_Request_direct[MPIR_REQUEST_PREALLOC] = {{0}}; -MPIU_Object_alloc_t MPID_Request_mem = { - 0, 0, 0, 0, MPIR_REQUEST, sizeof(MPID_Request), MPID_Request_direct, - MPIR_REQUEST_PREALLOC }; - /* See the comments above about request creation. Some routines will use macros in mpidimpl.h *instead* of this routine */ #undef FUNCNAME #define FUNCNAME MPID_Request_create #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -MPID_Request * MPID_Request_create(void) +MPIR_Request * MPID_Request_create(void) { - MPID_Request * req; + MPIR_Request * req; MPIDI_STATE_DECL(MPID_STATE_MPIR_REQUEST_CREATE); MPIDI_FUNC_ENTER(MPID_STATE_MPIR_REQUEST_CREATE); - req = MPIU_Handle_obj_alloc(&MPID_Request_mem); + req = MPIU_Handle_obj_alloc(&MPIR_Request_mem); if (req != NULL) { MPL_DBG_MSG_P(MPIDI_CH3_DBG_CHANNEL,VERBOSE, @@ -80,7 +72,7 @@ MPID_Request * MPID_Request_create(void) req->request_completed_cb = NULL; req->dev.datatype_ptr = NULL; req->dev.segment_ptr = NULL; - /* Masks and flags for channel device state in an MPID_Request */ + /* Masks and flags for channel device state in an MPIR_Request */ req->dev.state = 0; req->dev.cancel_pending = FALSE; /* FIXME: RMA ops shouldn't need to be set except when creating a @@ -137,7 +129,7 @@ MPID_Request * MPID_Request_create(void) #define FUNCNAME MPIDI_CH3U_Request_load_send_iov #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3U_Request_load_send_iov(MPID_Request * const sreq, +int MPIDI_CH3U_Request_load_send_iov(MPIR_Request * const sreq, MPL_IOV * const iov, int * const iov_n) { MPI_Aint last; @@ -249,7 +241,7 @@ int MPIDI_CH3U_Request_load_send_iov(MPID_Request * const sreq, #define FUNCNAME MPIDI_CH3U_Request_load_recv_iov #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3U_Request_load_recv_iov(MPID_Request * const rreq) +int MPIDI_CH3U_Request_load_recv_iov(MPIR_Request * const rreq) { MPI_Aint last; static intptr_t orig_segment_first = MPIDI_LOAD_RECV_IOV_ORIG_SEGMENT_FIRST_UNSET; @@ -458,7 +450,7 @@ int MPIDI_CH3U_Request_load_recv_iov(MPID_Request * const rreq) #define FUNCNAME MPIDI_CH3U_Request_unpack_srbuf #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3U_Request_unpack_srbuf(MPID_Request * rreq) +int MPIDI_CH3U_Request_unpack_srbuf(MPIR_Request * rreq) { MPI_Aint last; int tmpbuf_last; @@ -535,7 +527,7 @@ int MPIDI_CH3U_Request_unpack_srbuf(MPID_Request * rreq) #define FUNCNAME MPIDI_CH3U_Request_unpack_uebuf #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3U_Request_unpack_uebuf(MPID_Request * rreq) +int MPIDI_CH3U_Request_unpack_uebuf(MPIR_Request * rreq) { int dt_contig; MPI_Aint dt_true_lb; @@ -612,7 +604,7 @@ int MPIDI_CH3U_Request_unpack_uebuf(MPID_Request * rreq) return mpi_errno; } -int MPID_Request_complete(MPID_Request *req) +int MPID_Request_complete(MPIR_Request *req) { int incomplete; int mpi_errno = MPI_SUCCESS; @@ -642,7 +634,7 @@ int MPID_Request_complete(MPID_Request *req) goto fn_exit; } -void MPID_Request_release(MPID_Request *req) +void MPID_Request_release(MPIR_Request *req) { int inuse; @@ -700,6 +692,6 @@ void MPID_Request_release(MPID_Request *req) MPL_free(req->dev.ext_hdr_ptr); } - MPIU_Handle_obj_free(&MPID_Request_mem, req); + MPIU_Handle_obj_free(&MPIR_Request_mem, req); } } diff --git a/src/mpid/ch3/src/ch3u_rma_ops.c b/src/mpid/ch3/src/ch3u_rma_ops.c index 3fb570a..6d20ba2 100644 --- a/src/mpid/ch3/src/ch3u_rma_ops.c +++ b/src/mpid/ch3/src/ch3u_rma_ops.c @@ -41,7 +41,7 @@ cvars: int MPIDI_CH3I_Put(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPIR_Win * win_ptr, - MPID_Request * ureq) + MPIR_Request * ureq) { int mpi_errno = MPI_SUCCESS; int dt_contig ATTRIBUTE((unused)), rank; @@ -218,7 +218,7 @@ int MPIDI_CH3I_Put(const void *origin_addr, int origin_count, MPI_Datatype int MPIDI_CH3I_Get(void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPIR_Win * win_ptr, - MPID_Request * ureq) + MPIR_Request * ureq) { int mpi_errno = MPI_SUCCESS; intptr_t orig_data_sz, target_data_sz; @@ -388,7 +388,7 @@ int MPIDI_CH3I_Get(void *origin_addr, int origin_count, MPI_Datatype int MPIDI_CH3I_Accumulate(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Op op, - MPIR_Win * win_ptr, MPID_Request * ureq) + MPIR_Win * win_ptr, MPIR_Request * ureq) { int mpi_errno = MPI_SUCCESS; intptr_t data_sz; @@ -600,7 +600,7 @@ int MPIDI_CH3I_Get_accumulate(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, void *result_addr, int result_count, MPI_Datatype result_datatype, int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Op op, - MPIR_Win * win_ptr, MPID_Request * ureq) + MPIR_Win * win_ptr, MPIR_Request * ureq) { int mpi_errno = MPI_SUCCESS; intptr_t orig_data_sz, target_data_sz; diff --git a/src/mpid/ch3/src/ch3u_rma_pkthandler.c b/src/mpid/ch3/src/ch3u_rma_pkthandler.c index 52bb9e0..26341aa 100644 --- a/src/mpid/ch3/src/ch3u_rma_pkthandler.c +++ b/src/mpid/ch3/src/ch3u_rma_pkthandler.c @@ -258,10 +258,10 @@ static int MPIDI_CH3_ExtPktHandler_GetAccumulate(MPIDI_CH3_Pkt_flags_t flags, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3_PktHandler_Put(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, - intptr_t * buflen, MPID_Request ** rreqp) + intptr_t * buflen, MPIR_Request ** rreqp) { MPIDI_CH3_Pkt_put_t *put_pkt = &pkt->put; - MPID_Request *req = NULL; + MPIR_Request *req = NULL; int complete = 0; char *data_buf = NULL; intptr_t data_len; @@ -432,10 +432,10 @@ int MPIDI_CH3_PktHandler_Put(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3_PktHandler_Get(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, - intptr_t * buflen, MPID_Request ** rreqp) + intptr_t * buflen, MPIR_Request ** rreqp) { MPIDI_CH3_Pkt_get_t *get_pkt = &pkt->get; - MPID_Request *req = NULL; + MPIR_Request *req = NULL; MPL_IOV iov[MPL_IOV_LIMIT]; int complete = 0; char *data_buf = NULL; @@ -645,10 +645,10 @@ int MPIDI_CH3_PktHandler_Get(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3_PktHandler_Accumulate(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, - intptr_t * buflen, MPID_Request ** rreqp) + intptr_t * buflen, MPIR_Request ** rreqp) { MPIDI_CH3_Pkt_accum_t *accum_pkt = &pkt->accum; - MPID_Request *req = NULL; + MPIR_Request *req = NULL; MPI_Aint extent; int complete = 0; char *data_buf = NULL; @@ -857,10 +857,10 @@ int MPIDI_CH3_PktHandler_Accumulate(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3_PktHandler_GetAccumulate(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, - intptr_t * buflen, MPID_Request ** rreqp) + intptr_t * buflen, MPIR_Request ** rreqp) { MPIDI_CH3_Pkt_get_accum_t *get_accum_pkt = &pkt->get_accum; - MPID_Request *req = NULL; + MPIR_Request *req = NULL; MPI_Aint extent; int complete = 0; char *data_buf = NULL; @@ -892,7 +892,7 @@ int MPIDI_CH3_PktHandler_GetAccumulate(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, if (pkt->type == MPIDI_CH3_PKT_GET_ACCUM_IMMED) { size_t len; void *src = NULL, *dest = NULL; - MPID_Request *resp_req = NULL; + MPIR_Request *resp_req = NULL; MPIDI_CH3_Pkt_t upkt; MPIDI_CH3_Pkt_get_accum_resp_t *get_accum_resp_pkt = &upkt.get_accum_resp; MPL_IOV iov[MPL_IOV_LIMIT]; @@ -1145,15 +1145,15 @@ int MPIDI_CH3_PktHandler_GetAccumulate(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3_PktHandler_CAS(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, - intptr_t * buflen, MPID_Request ** rreqp) + intptr_t * buflen, MPIR_Request ** rreqp) { int mpi_errno = MPI_SUCCESS; MPIDI_CH3_Pkt_t upkt; MPIDI_CH3_Pkt_cas_resp_t *cas_resp_pkt = &upkt.cas_resp; MPIDI_CH3_Pkt_cas_t *cas_pkt = &pkt->cas; MPIR_Win *win_ptr; - MPID_Request *req; - MPID_Request *rreq = NULL; + MPIR_Request *req; + MPIR_Request *rreq = NULL; MPI_Aint len; int acquire_lock_fail = 0; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3_PKTHANDLER_CAS); @@ -1219,7 +1219,7 @@ int MPIDI_CH3_PktHandler_CAS(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, MPIR_ERR_CHKANDJUMP(mpi_errno != MPI_SUCCESS, mpi_errno, MPI_ERR_OTHER, "**ch3|rmamsg"); if (req != NULL) { - if (!MPID_Request_is_complete(req)) { + if (!MPIR_Request_is_complete(req)) { /* sending process is not completed, set proper OnDataAvail * (it is initialized to NULL by lower layer) */ req->dev.target_win_handle = cas_pkt->target_win_handle; @@ -1258,11 +1258,11 @@ int MPIDI_CH3_PktHandler_CAS(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3_PktHandler_CASResp(MPIDI_VC_t * vc ATTRIBUTE((unused)), MPIDI_CH3_Pkt_t * pkt, - intptr_t * buflen, MPID_Request ** rreqp) + intptr_t * buflen, MPIR_Request ** rreqp) { int mpi_errno = MPI_SUCCESS; MPIDI_CH3_Pkt_cas_resp_t *cas_resp_pkt = &pkt->cas_resp; - MPID_Request *req; + MPIR_Request *req; MPI_Aint len; MPIR_Win *win_ptr; int target_rank = cas_resp_pkt->target_rank; @@ -1274,7 +1274,7 @@ int MPIDI_CH3_PktHandler_CASResp(MPIDI_VC_t * vc ATTRIBUTE((unused)), MPIR_T_PVAR_TIMER_START(RMA, rma_rmapkt_cas_resp); - MPID_Request_get_ptr(cas_resp_pkt->request_handle, req); + MPIR_Request_get_ptr(cas_resp_pkt->request_handle, req); MPIR_Win_get_ptr(req->dev.source_win_handle, win_ptr); /* decrement ack_counter on this target */ @@ -1319,14 +1319,14 @@ int MPIDI_CH3_PktHandler_CASResp(MPIDI_VC_t * vc ATTRIBUTE((unused)), #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3_PktHandler_FOP(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, - intptr_t * buflen, MPID_Request ** rreqp) + intptr_t * buflen, MPIR_Request ** rreqp) { int mpi_errno = MPI_SUCCESS; MPIDI_CH3_Pkt_fop_t *fop_pkt = &pkt->fop; MPIDI_CH3_Pkt_t upkt; MPIDI_CH3_Pkt_fop_resp_t *fop_resp_pkt = &upkt.fop_resp; - MPID_Request *resp_req = NULL; - MPID_Request *rreq = NULL; + MPIR_Request *resp_req = NULL; + MPIR_Request *rreq = NULL; int acquire_lock_fail = 0; MPIR_Win *win_ptr = NULL; MPI_Aint type_size; @@ -1398,7 +1398,7 @@ int MPIDI_CH3_PktHandler_FOP(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, MPIR_ERR_CHKANDJUMP(mpi_errno != MPI_SUCCESS, mpi_errno, MPI_ERR_OTHER, "**ch3|rmamsg"); if (resp_req != NULL) { - if (!MPID_Request_is_complete(resp_req)) { + if (!MPIR_Request_is_complete(resp_req)) { /* sending process is not completed, set proper OnDataAvail * (it is initialized to NULL by lower layer) */ resp_req->dev.target_win_handle = fop_pkt->target_win_handle; @@ -1425,7 +1425,7 @@ int MPIDI_CH3_PktHandler_FOP(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, else { MPIU_Assert(pkt->type == MPIDI_CH3_PKT_FOP); - MPID_Request *req = NULL; + MPIR_Request *req = NULL; char *data_buf = NULL; intptr_t data_len; MPI_Aint extent; @@ -1508,11 +1508,11 @@ int MPIDI_CH3_PktHandler_FOP(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3_PktHandler_FOPResp(MPIDI_VC_t * vc ATTRIBUTE((unused)), MPIDI_CH3_Pkt_t * pkt, - intptr_t * buflen, MPID_Request ** rreqp) + intptr_t * buflen, MPIR_Request ** rreqp) { int mpi_errno = MPI_SUCCESS; MPIDI_CH3_Pkt_fop_resp_t *fop_resp_pkt = &pkt->fop_resp; - MPID_Request *req = NULL; + MPIR_Request *req = NULL; MPIR_Win *win_ptr = NULL; MPI_Aint type_size; intptr_t data_len; @@ -1527,7 +1527,7 @@ int MPIDI_CH3_PktHandler_FOPResp(MPIDI_VC_t * vc ATTRIBUTE((unused)), MPIR_T_PVAR_TIMER_START(RMA, rma_rmapkt_fop_resp); - MPID_Request_get_ptr(fop_resp_pkt->request_handle, req); + MPIR_Request_get_ptr(fop_resp_pkt->request_handle, req); MPIR_Win_get_ptr(req->dev.source_win_handle, win_ptr); /* decrement ack_counter */ @@ -1597,10 +1597,10 @@ int MPIDI_CH3_PktHandler_FOPResp(MPIDI_VC_t * vc ATTRIBUTE((unused)), #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3_PktHandler_Get_AccumResp(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, - intptr_t * buflen, MPID_Request ** rreqp) + intptr_t * buflen, MPIR_Request ** rreqp) { MPIDI_CH3_Pkt_get_accum_resp_t *get_accum_resp_pkt = &pkt->get_accum_resp; - MPID_Request *req; + MPIR_Request *req; int complete = 0; char *data_buf = NULL; intptr_t data_len; @@ -1616,7 +1616,7 @@ int MPIDI_CH3_PktHandler_Get_AccumResp(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, MPIR_T_PVAR_TIMER_START(RMA, rma_rmapkt_get_accum_resp); - MPID_Request_get_ptr(get_accum_resp_pkt->request_handle, req); + MPIR_Request_get_ptr(get_accum_resp_pkt->request_handle, req); MPIR_Win_get_ptr(req->dev.source_win_handle, win_ptr); /* decrement ack_counter on target */ @@ -1735,7 +1735,7 @@ int MPIDI_CH3_PktHandler_Get_AccumResp(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3_PktHandler_Lock(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, - intptr_t * buflen, MPID_Request ** rreqp) + intptr_t * buflen, MPIR_Request ** rreqp) { MPIDI_CH3_Pkt_lock_t *lock_pkt = &pkt->lock; MPIR_Win *win_ptr = NULL; @@ -1770,7 +1770,7 @@ int MPIDI_CH3_PktHandler_Lock(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, } else { - MPID_Request *req = NULL; + MPIR_Request *req = NULL; mpi_errno = enqueue_lock_origin(win_ptr, vc, pkt, buflen, &req); if (mpi_errno != MPI_SUCCESS) MPIR_ERR_POP(mpi_errno); @@ -1791,10 +1791,10 @@ int MPIDI_CH3_PktHandler_Lock(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3_PktHandler_GetResp(MPIDI_VC_t * vc ATTRIBUTE((unused)), MPIDI_CH3_Pkt_t * pkt, - intptr_t * buflen, MPID_Request ** rreqp) + intptr_t * buflen, MPIR_Request ** rreqp) { MPIDI_CH3_Pkt_get_resp_t *get_resp_pkt = &pkt->get_resp; - MPID_Request *req; + MPIR_Request *req; int complete = 0; char *data_buf = NULL; intptr_t data_len; @@ -1810,7 +1810,7 @@ int MPIDI_CH3_PktHandler_GetResp(MPIDI_VC_t * vc ATTRIBUTE((unused)), MPIR_T_PVAR_TIMER_START(RMA, rma_rmapkt_get_resp); - MPID_Request_get_ptr(get_resp_pkt->request_handle, req); + MPIR_Request_get_ptr(get_resp_pkt->request_handle, req); MPIR_Win_get_ptr(req->dev.source_win_handle, win_ptr); /* decrement ack_counter on target */ @@ -1877,7 +1877,7 @@ int MPIDI_CH3_PktHandler_GetResp(MPIDI_VC_t * vc ATTRIBUTE((unused)), #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3_PktHandler_LockAck(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, - intptr_t * buflen, MPID_Request ** rreqp) + intptr_t * buflen, MPIR_Request ** rreqp) { MPIDI_CH3_Pkt_lock_ack_t *lock_ack_pkt = &pkt->lock_ack; MPIR_Win *win_ptr = NULL; @@ -1899,8 +1899,8 @@ int MPIDI_CH3_PktHandler_LockAck(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, else { MPIU_Assert(lock_ack_pkt->request_handle != MPI_REQUEST_NULL); - MPID_Request *req_ptr = NULL; - MPID_Request_get_ptr(lock_ack_pkt->request_handle, req_ptr); + MPIR_Request *req_ptr = NULL; + MPIR_Request_get_ptr(lock_ack_pkt->request_handle, req_ptr); MPIU_Assert(req_ptr->dev.source_win_handle != MPI_REQUEST_NULL); MPIR_Win_get_ptr(req_ptr->dev.source_win_handle, win_ptr); } @@ -1925,7 +1925,7 @@ int MPIDI_CH3_PktHandler_LockAck(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3_PktHandler_LockOpAck(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, - intptr_t * buflen, MPID_Request ** rreqp) + intptr_t * buflen, MPIR_Request ** rreqp) { MPIDI_CH3_Pkt_lock_op_ack_t *lock_op_ack_pkt = &pkt->lock_op_ack; MPIR_Win *win_ptr = NULL; @@ -1944,8 +1944,8 @@ int MPIDI_CH3_PktHandler_LockOpAck(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, else { MPIU_Assert(lock_op_ack_pkt->request_handle != MPI_REQUEST_NULL); - MPID_Request *req_ptr = NULL; - MPID_Request_get_ptr(lock_op_ack_pkt->request_handle, req_ptr); + MPIR_Request *req_ptr = NULL; + MPIR_Request_get_ptr(lock_op_ack_pkt->request_handle, req_ptr); MPIU_Assert(req_ptr->dev.source_win_handle != MPI_REQUEST_NULL); MPIR_Win_get_ptr(req_ptr->dev.source_win_handle, win_ptr); } @@ -1980,7 +1980,7 @@ int MPIDI_CH3_PktHandler_LockOpAck(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3_PktHandler_Ack(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, - intptr_t * buflen, MPID_Request ** rreqp) + intptr_t * buflen, MPIR_Request ** rreqp) { MPIDI_CH3_Pkt_ack_t *ack_pkt = &pkt->ack; MPIR_Win *win_ptr = NULL; @@ -2021,7 +2021,7 @@ int MPIDI_CH3_PktHandler_Ack(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3_PktHandler_DecrAtCnt(MPIDI_VC_t * vc ATTRIBUTE((unused)), MPIDI_CH3_Pkt_t * pkt, - intptr_t * buflen, MPID_Request ** rreqp) + intptr_t * buflen, MPIR_Request ** rreqp) { MPIDI_CH3_Pkt_decr_at_counter_t *decr_at_cnt_pkt = &pkt->decr_at_cnt; MPIR_Win *win_ptr; @@ -2063,7 +2063,7 @@ int MPIDI_CH3_PktHandler_DecrAtCnt(MPIDI_VC_t * vc ATTRIBUTE((unused)), #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3_PktHandler_Unlock(MPIDI_VC_t * vc ATTRIBUTE((unused)), MPIDI_CH3_Pkt_t * pkt, - intptr_t * buflen, MPID_Request ** rreqp) + intptr_t * buflen, MPIR_Request ** rreqp) { int mpi_errno = MPI_SUCCESS; MPIDI_CH3_Pkt_unlock_t *unlock_pkt = &pkt->unlock; @@ -2106,7 +2106,7 @@ int MPIDI_CH3_PktHandler_Unlock(MPIDI_VC_t * vc ATTRIBUTE((unused)), #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3_PktHandler_Flush(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, - intptr_t * buflen, MPID_Request ** rreqp) + intptr_t * buflen, MPIR_Request ** rreqp) { int mpi_errno = MPI_SUCCESS; MPIDI_CH3_Pkt_flush_t *flush_pkt = &pkt->flush; diff --git a/src/mpid/ch3/src/ch3u_rma_reqops.c b/src/mpid/ch3/src/ch3u_rma_reqops.c index 9534a85..4393c52 100644 --- a/src/mpid/ch3/src/ch3u_rma_reqops.c +++ b/src/mpid/ch3/src/ch3u_rma_reqops.c @@ -15,14 +15,14 @@ int MPID_Rput(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPIR_Win * win_ptr, - MPID_Request ** request) + MPIR_Request ** request) { int mpi_errno = MPI_SUCCESS; int dt_contig ATTRIBUTE((unused)); MPIDU_Datatype*dtp; MPI_Aint dt_true_lb ATTRIBUTE((unused)); intptr_t data_sz; - MPID_Request *ureq; + MPIR_Request *ureq; MPIDI_STATE_DECL(MPID_STATE_MPID_RPUT); MPIDI_FUNC_ENTER(MPID_STATE_MPID_RPUT); @@ -39,7 +39,7 @@ int MPID_Rput(const void *origin_addr, int origin_count, /* Create user request, initially cc=1, ref=1 */ ureq = MPID_Request_create(); MPIR_ERR_CHKANDJUMP(ureq == NULL, mpi_errno, MPI_ERR_OTHER, "**nomemreq"); - ureq->kind = MPID_WIN_REQUEST; + ureq->kind = MPIR_WIN_REQUEST; /* This request is referenced by user and ch3 by default. */ MPIU_Object_set_ref(ureq, 2); @@ -78,14 +78,14 @@ int MPID_Rput(const void *origin_addr, int origin_count, int MPID_Rget(void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPIR_Win * win_ptr, - MPID_Request ** request) + MPIR_Request ** request) { int mpi_errno = MPI_SUCCESS; int dt_contig ATTRIBUTE((unused)); MPIDU_Datatype*dtp; MPI_Aint dt_true_lb ATTRIBUTE((unused)); intptr_t data_sz; - MPID_Request *ureq; + MPIR_Request *ureq; MPIDI_STATE_DECL(MPID_STATE_MPID_RGET); MPIDI_FUNC_ENTER(MPID_STATE_MPID_RGET); @@ -102,7 +102,7 @@ int MPID_Rget(void *origin_addr, int origin_count, /* Create user request, initially cc=1, ref=1 */ ureq = MPID_Request_create(); MPIR_ERR_CHKANDJUMP(ureq == NULL, mpi_errno, MPI_ERR_OTHER, "**nomemreq"); - ureq->kind = MPID_WIN_REQUEST; + ureq->kind = MPIR_WIN_REQUEST; /* This request is referenced by user and ch3 by default. */ MPIU_Object_set_ref(ureq, 2); @@ -141,14 +141,14 @@ int MPID_Rget(void *origin_addr, int origin_count, int MPID_Raccumulate(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Op op, MPIR_Win * win_ptr, - MPID_Request ** request) + MPIR_Request ** request) { int mpi_errno = MPI_SUCCESS; int dt_contig ATTRIBUTE((unused)); MPIDU_Datatype*dtp; MPI_Aint dt_true_lb ATTRIBUTE((unused)); intptr_t data_sz; - MPID_Request *ureq; + MPIR_Request *ureq; MPIDI_STATE_DECL(MPID_STATE_MPID_RACCUMULATE); MPIDI_FUNC_ENTER(MPID_STATE_MPID_RACCUMULATE); @@ -163,7 +163,7 @@ int MPID_Raccumulate(const void *origin_addr, int origin_count, /* Create user request, initially cc=1, ref=1 */ ureq = MPID_Request_create(); MPIR_ERR_CHKANDJUMP(ureq == NULL, mpi_errno, MPI_ERR_OTHER, "**nomemreq"); - ureq->kind = MPID_WIN_REQUEST; + ureq->kind = MPIR_WIN_REQUEST; /* This request is referenced by user and ch3 by default. */ MPIU_Object_set_ref(ureq, 2); @@ -205,14 +205,14 @@ int MPID_Rget_accumulate(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, void *result_addr, int result_count, MPI_Datatype result_datatype, int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Op op, - MPIR_Win * win_ptr, MPID_Request ** request) + MPIR_Win * win_ptr, MPIR_Request ** request) { int mpi_errno = MPI_SUCCESS; int dt_contig ATTRIBUTE((unused)); MPIDU_Datatype*dtp; MPI_Aint dt_true_lb ATTRIBUTE((unused)); intptr_t data_sz, trg_data_sz; - MPID_Request *ureq; + MPIR_Request *ureq; MPIDI_STATE_DECL(MPID_STATE_MPID_RGET_ACCUMULATE); MPIDI_FUNC_ENTER(MPID_STATE_MPID_RGET_ACCUMULATE); @@ -227,7 +227,7 @@ int MPID_Rget_accumulate(const void *origin_addr, int origin_count, /* Create user request, initially cc=1, ref=1 */ ureq = MPID_Request_create(); MPIR_ERR_CHKANDJUMP(ureq == NULL, mpi_errno, MPI_ERR_OTHER, "**nomemreq"); - ureq->kind = MPID_WIN_REQUEST; + ureq->kind = MPIR_WIN_REQUEST; /* This request is referenced by user and ch3 by default. */ MPIU_Object_set_ref(ureq, 2); diff --git a/src/mpid/ch3/src/ch3u_rma_sync.c b/src/mpid/ch3/src/ch3u_rma_sync.c index 9695f3c..93d16c5 100644 --- a/src/mpid/ch3/src/ch3u_rma_sync.c +++ b/src/mpid/ch3/src/ch3u_rma_sync.c @@ -431,7 +431,7 @@ static inline int flush_all(MPIR_Win * win_ptr) #define FUNCNAME fence_barrier_complete #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int fence_barrier_complete(MPID_Request * sreq) +static int fence_barrier_complete(MPIR_Request * sreq) { int mpi_errno = MPI_SUCCESS; MPIR_Win *win_ptr = NULL; @@ -532,13 +532,13 @@ int MPID_Win_fence(int assert, MPIR_Win * win_ptr) win_ptr->states.access_state = MPIDI_RMA_FENCE_GRANTED; } else { - MPID_Request *req_ptr; + MPIR_Request *req_ptr; /* Set window access state properly. */ win_ptr->states.access_state = MPIDI_RMA_FENCE_ISSUED; - MPID_Request_get_ptr(fence_sync_req, req_ptr); - if (!MPID_Request_is_complete(req_ptr)) { + MPIR_Request_get_ptr(fence_sync_req, req_ptr); + if (!MPIR_Request_is_complete(req_ptr)) { req_ptr->dev.source_win_handle = win_ptr->handle; req_ptr->request_completed_cb = fence_barrier_complete; win_ptr->sync_request_cnt++; @@ -657,12 +657,12 @@ int MPID_Win_fence(int assert, MPIR_Win * win_ptr) win_ptr->states.access_state = MPIDI_RMA_FENCE_GRANTED; } else { - MPID_Request *req_ptr; + MPIR_Request *req_ptr; win_ptr->states.access_state = MPIDI_RMA_FENCE_ISSUED; - MPID_Request_get_ptr(fence_sync_req, req_ptr); - if (!MPID_Request_is_complete(req_ptr)) { + MPIR_Request_get_ptr(fence_sync_req, req_ptr); + if (!MPIR_Request_is_complete(req_ptr)) { req_ptr->dev.source_win_handle = win_ptr->handle; req_ptr->request_completed_cb = fence_barrier_complete; win_ptr->sync_request_cnt++; @@ -761,7 +761,7 @@ int MPID_Win_post(MPIR_Group * post_grp_ptr, int assert, MPIR_Win * win_ptr) dst = post_ranks_in_win_grp[i]; if (dst != rank) { - MPID_Request *req_ptr; + MPIR_Request *req_ptr; mpi_errno = MPID_Isend(&i, 0, MPI_INT, dst, SYNC_POST_TAG, win_comm_ptr, MPIR_CONTEXT_INTRA_PT2PT, &req_ptr); if (mpi_errno != MPI_SUCCESS) @@ -803,7 +803,7 @@ int MPID_Win_post(MPIR_Group * post_grp_ptr, int assert, MPIR_Win * win_ptr) #define FUNCNAME start_req_complete #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int start_req_complete(MPID_Request * req) +static int start_req_complete(MPIR_Request * req) { int mpi_errno = MPI_SUCCESS; MPIR_Win *win_ptr = NULL; @@ -886,7 +886,7 @@ int MPID_Win_start(MPIR_Group * group_ptr, int assert, MPIR_Win * win_ptr) intra_cnt = 0; for (i = 0; i < win_ptr->start_grp_size; i++) { - MPID_Request *req_ptr; + MPIR_Request *req_ptr; MPIDI_VC_t *orig_vc = NULL, *target_vc = NULL; int src = win_ptr->start_ranks_in_win_grp[i]; @@ -903,7 +903,7 @@ int MPID_Win_start(MPIR_Group * group_ptr, int assert, MPIR_Win * win_ptr) intra_start_req[intra_cnt++] = req_ptr->handle; } else { - if (!MPID_Request_is_complete(req_ptr)) { + if (!MPIR_Request_is_complete(req_ptr)) { req_ptr->dev.source_win_handle = win_ptr->handle; req_ptr->request_completed_cb = start_req_complete; win_ptr->sync_request_cnt++; diff --git a/src/mpid/ch3/src/ch3u_rndv.c b/src/mpid/ch3/src/ch3u_rndv.c index cbb3885..a044460 100644 --- a/src/mpid/ch3/src/ch3u_rndv.c +++ b/src/mpid/ch3/src/ch3u_rndv.c @@ -16,7 +16,7 @@ #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) /* MPIDI_CH3_RndvSend - Send a request to perform a rendezvous send */ -int MPIDI_CH3_RndvSend( MPID_Request **sreq_p, const void * buf, MPI_Aint count, +int MPIDI_CH3_RndvSend( MPIR_Request **sreq_p, const void * buf, MPI_Aint count, MPI_Datatype datatype, int dt_contig, intptr_t data_sz, MPI_Aint dt_true_lb, int rank, @@ -25,8 +25,8 @@ int MPIDI_CH3_RndvSend( MPID_Request **sreq_p, const void * buf, MPI_Aint count, MPIDI_CH3_Pkt_t upkt; MPIDI_CH3_Pkt_rndv_req_to_send_t * const rts_pkt = &upkt.rndv_req_to_send; MPIDI_VC_t * vc; - MPID_Request * rts_sreq; - MPID_Request *sreq =*sreq_p; + MPIR_Request * rts_sreq; + MPIR_Request *sreq =*sreq_p; int mpi_errno = MPI_SUCCESS; MPL_DBG_MSG_D(MPIDI_CH3_DBG_OTHER,VERBOSE, @@ -108,9 +108,9 @@ int MPIDI_CH3_RndvSend( MPID_Request **sreq_p, const void * buf, MPI_Aint count, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3_PktHandler_RndvReqToSend( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, - intptr_t *buflen, MPID_Request **rreqp ) + intptr_t *buflen, MPIR_Request **rreqp ) { - MPID_Request * rreq; + MPIR_Request * rreq; int found; MPIDI_CH3_Pkt_rndv_req_to_send_t * rts_pkt = &pkt->rndv_req_to_send; int mpi_errno = MPI_SUCCESS; @@ -144,7 +144,7 @@ int MPIDI_CH3_PktHandler_RndvReqToSend( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, if (found) { - MPID_Request * cts_req; + MPIR_Request * cts_req; MPIDI_CH3_Pkt_t upkt; MPIDI_CH3_Pkt_rndv_clr_to_send_t * cts_pkt = &upkt.rndv_clr_to_send; @@ -196,11 +196,11 @@ int MPIDI_CH3_PktHandler_RndvReqToSend( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3_PktHandler_RndvClrToSend( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, - intptr_t *buflen, MPID_Request **rreqp ) + intptr_t *buflen, MPIR_Request **rreqp ) { MPIDI_CH3_Pkt_rndv_clr_to_send_t * cts_pkt = &pkt->rndv_clr_to_send; - MPID_Request * sreq; - MPID_Request * rts_sreq; + MPIR_Request * sreq; + MPIR_Request * rts_sreq; MPIDI_CH3_Pkt_t upkt; MPIDI_CH3_Pkt_rndv_send_t * rs_pkt = &upkt.rndv_send; int dt_contig; @@ -211,7 +211,7 @@ int MPIDI_CH3_PktHandler_RndvClrToSend( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, MPL_DBG_MSG(MPIDI_CH3_DBG_OTHER,VERBOSE,"received rndv CTS pkt"); - MPID_Request_get_ptr(cts_pkt->sender_req_id, sreq); + MPIR_Request_get_ptr(cts_pkt->sender_req_id, sreq); MPL_DBG_MSG_FMT(MPIDI_CH3_DBG_OTHER,TERSE,(MPL_DBG_FDEST,"received cts, count=" MPI_AINT_FMT_DEC_SPEC "\n", sreq->dev.user_count)); sreq->dev.OnDataAvail = 0; @@ -281,18 +281,18 @@ int MPIDI_CH3_PktHandler_RndvClrToSend( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3_PktHandler_RndvSend( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, - intptr_t *buflen, MPID_Request **rreqp ) + intptr_t *buflen, MPIR_Request **rreqp ) { MPIDI_CH3_Pkt_rndv_send_t * rs_pkt = &pkt->rndv_send; int mpi_errno = MPI_SUCCESS; int complete; char *data_buf; intptr_t data_len; - MPID_Request *req; + MPIR_Request *req; MPL_DBG_MSG(MPIDI_CH3_DBG_OTHER,VERBOSE,"received rndv send (data) pkt"); - MPID_Request_get_ptr(rs_pkt->receiver_req_id, req); + MPIR_Request_get_ptr(rs_pkt->receiver_req_id, req); data_len = ((*buflen - sizeof(MPIDI_CH3_Pkt_t) >= req->dev.recv_data_sz) ? req->dev.recv_data_sz : *buflen - sizeof(MPIDI_CH3_Pkt_t)); @@ -342,13 +342,13 @@ int MPIDI_CH3_PktHandler_RndvSend( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, #define FUNCNAME MPIDI_CH3_RecvRndv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3_RecvRndv( MPIDI_VC_t * vc, MPID_Request *rreq ) +int MPIDI_CH3_RecvRndv( MPIDI_VC_t * vc, MPIR_Request *rreq ) { int mpi_errno = MPI_SUCCESS; /* A rendezvous request-to-send (RTS) message has arrived. We need to send a CTS message to the remote process. */ - MPID_Request * cts_req; + MPIR_Request * cts_req; MPIDI_CH3_Pkt_t upkt; MPIDI_CH3_Pkt_rndv_clr_to_send_t * cts_pkt = &upkt.rndv_clr_to_send; diff --git a/src/mpid/ch3/src/mpid_cancel_recv.c b/src/mpid/ch3/src/mpid_cancel_recv.c index feb923b..3c8a025 100644 --- a/src/mpid/ch3/src/mpid_cancel_recv.c +++ b/src/mpid/ch3/src/mpid_cancel_recv.c @@ -10,7 +10,7 @@ #define FUNCNAME MPID_Cancel_recv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Cancel_recv(MPID_Request * rreq) +int MPID_Cancel_recv(MPIR_Request * rreq) { int netmod_cancelled = TRUE; int mpi_errno = MPI_SUCCESS; diff --git a/src/mpid/ch3/src/mpid_cancel_send.c b/src/mpid/ch3/src/mpid_cancel_send.c index 8a51df6..a0e2eae 100644 --- a/src/mpid/ch3/src/mpid_cancel_send.c +++ b/src/mpid/ch3/src/mpid_cancel_send.c @@ -14,7 +14,7 @@ #define FUNCNAME MPID_Cancel_send #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Cancel_send(MPID_Request * sreq) +int MPID_Cancel_send(MPIR_Request * sreq) { MPIDI_VC_t * vc; int proto; @@ -51,7 +51,7 @@ int MPID_Cancel_send(MPID_Request * sreq) if (proto == MPIDI_REQUEST_SELF_MSG) { - MPID_Request * rreq; + MPIR_Request * rreq; MPL_DBG_MSG(MPIDI_CH3_DBG_OTHER,VERBOSE, "attempting to cancel message sent to self"); @@ -111,7 +111,7 @@ int MPID_Cancel_send(MPID_Request * sreq) if (proto == MPIDI_REQUEST_RNDV_MSG) { - MPID_Request * rts_sreq; + MPIR_Request * rts_sreq; /* The cancellation of the RTS request needs to be atomic through the destruction of the RTS request to avoid conflict with release of the RTS request if the CTS is received @@ -172,7 +172,7 @@ int MPID_Cancel_send(MPID_Request * sreq) int was_incomplete; MPIDI_CH3_Pkt_t upkt; MPIDI_CH3_Pkt_cancel_send_req_t * const csr_pkt = &upkt.cancel_send_req; - MPID_Request * csr_sreq; + MPIR_Request * csr_sreq; MPL_DBG_MSG_FMT(MPIDI_CH3_DBG_OTHER,VERBOSE,(MPL_DBG_FDEST, "sending cancel request to %d for 0x%08x", @@ -227,14 +227,14 @@ int MPID_Cancel_send(MPID_Request * sreq) */ int MPIDI_CH3_PktHandler_CancelSendReq( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, - intptr_t *buflen, MPID_Request **rreqp ) + intptr_t *buflen, MPIR_Request **rreqp ) { MPIDI_CH3_Pkt_cancel_send_req_t * req_pkt = &pkt->cancel_send_req; - MPID_Request * rreq; + MPIR_Request * rreq; int ack; MPIDI_CH3_Pkt_t upkt; MPIDI_CH3_Pkt_cancel_send_resp_t * resp_pkt = &upkt.cancel_send_resp; - MPID_Request * resp_sreq; + MPIR_Request * resp_sreq; int mpi_errno = MPI_SUCCESS; MPL_DBG_MSG_FMT(MPIDI_CH3_DBG_OTHER,VERBOSE,(MPL_DBG_FDEST, @@ -291,10 +291,10 @@ int MPIDI_CH3_PktHandler_CancelSendReq( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, int MPIDI_CH3_PktHandler_CancelSendResp( MPIDI_VC_t *vc ATTRIBUTE((unused)), MPIDI_CH3_Pkt_t *pkt, - intptr_t *buflen, MPID_Request **rreqp ) + intptr_t *buflen, MPIR_Request **rreqp ) { MPIDI_CH3_Pkt_cancel_send_resp_t * resp_pkt = &pkt->cancel_send_resp; - MPID_Request * sreq; + MPIR_Request * sreq; int mpi_errno = MPI_SUCCESS; MPL_DBG_MSG_FMT(MPIDI_CH3_DBG_OTHER,VERBOSE,(MPL_DBG_FDEST, @@ -303,7 +303,7 @@ int MPIDI_CH3_PktHandler_CancelSendResp( MPIDI_VC_t *vc ATTRIBUTE((unused)), *buflen = sizeof(MPIDI_CH3_Pkt_t); - MPID_Request_get_ptr(resp_pkt->sender_req_id, sreq); + MPIR_Request_get_ptr(resp_pkt->sender_req_id, sreq); if (resp_pkt->ack) { diff --git a/src/mpid/ch3/src/mpid_comm_failure_ack.c b/src/mpid/ch3/src/mpid_comm_failure_ack.c index c219db3..d05c7f0 100644 --- a/src/mpid/ch3/src/mpid_comm_failure_ack.c +++ b/src/mpid/ch3/src/mpid_comm_failure_ack.c @@ -86,7 +86,7 @@ int MPID_Comm_AS_enabled(MPIR_Comm *comm_ptr) { #define FUNCNAME MPID_Request_is_anysource #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Request_is_anysource(MPID_Request *request_ptr) { +int MPID_Request_is_anysource(MPIR_Request *request_ptr) { int ret = 0; if (request_ptr->kind == MPIR_REQUEST_RECV) diff --git a/src/mpid/ch3/src/mpid_comm_revoke.c b/src/mpid/ch3/src/mpid_comm_revoke.c index 1bfc210..5c1cc3e 100644 --- a/src/mpid/ch3/src/mpid_comm_revoke.c +++ b/src/mpid/ch3/src/mpid_comm_revoke.c @@ -25,7 +25,7 @@ int MPID_Comm_revoke(MPIR_Comm *comm_ptr, int is_remote) MPL_IOV iov[MPL_IOV_LIMIT]; int mpi_errno = MPI_SUCCESS; int i, size, my_rank; - MPID_Request *request; + MPIR_Request *request; MPIDI_CH3_Pkt_t upkt; MPIDI_CH3_Pkt_revoke_t *revoke_pkt = &upkt.revoke; MPIDI_STATE_DECL(MPID_STATE_MPID_COMM_REVOKE); diff --git a/src/mpid/ch3/src/mpid_improbe.c b/src/mpid/ch3/src/mpid_improbe.c index 3430427..ed7fbbe 100644 --- a/src/mpid/ch3/src/mpid_improbe.c +++ b/src/mpid/ch3/src/mpid_improbe.c @@ -7,7 +7,7 @@ #include "mpidimpl.h" int (*MPIDI_Anysource_improbe_fn)(int tag, MPIR_Comm * comm, int context_offset, - int *flag, MPID_Request **message, + int *flag, MPIR_Request **message, MPI_Status * status) = NULL; #undef FUNCNAME @@ -15,7 +15,7 @@ int (*MPIDI_Anysource_improbe_fn)(int tag, MPIR_Comm * comm, int context_offset, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_Improbe(int source, int tag, MPIR_Comm *comm, int context_offset, - int *flag, MPID_Request **message, MPI_Status *status) + int *flag, MPIR_Request **message, MPI_Status *status) { int mpi_errno = MPI_SUCCESS; int context_id = comm->recvcontext_id + context_offset; diff --git a/src/mpid/ch3/src/mpid_imrecv.c b/src/mpid/ch3/src/mpid_imrecv.c index 49b96d2..99292b5 100644 --- a/src/mpid/ch3/src/mpid_imrecv.c +++ b/src/mpid/ch3/src/mpid_imrecv.c @@ -11,10 +11,10 @@ #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_Imrecv(void *buf, int count, MPI_Datatype datatype, - MPID_Request *message, MPID_Request **rreqp) + MPIR_Request *message, MPIR_Request **rreqp) { int mpi_errno = MPI_SUCCESS; - MPID_Request *rreq; + MPIR_Request *rreq; MPIR_Comm *comm; MPIDI_VC_t *vc = NULL; @@ -74,7 +74,7 @@ int MPID_Imrecv(void *buf, int count, MPI_Datatype datatype, MPIDI_Request_decr_pending(rreq); MPIDI_Request_check_pending(rreq, &recv_pending); - if (MPID_Request_is_complete(rreq)) { + if (MPIR_Request_is_complete(rreq)) { /* is it ever possible to have (cc==0 && recv_pending>0) ? */ MPIU_Assert(!recv_pending); diff --git a/src/mpid/ch3/src/mpid_irecv.c b/src/mpid/ch3/src/mpid_irecv.c index 2fae936..bc56710 100644 --- a/src/mpid/ch3/src/mpid_irecv.c +++ b/src/mpid/ch3/src/mpid_irecv.c @@ -12,9 +12,9 @@ #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_Irecv(void * buf, MPI_Aint count, MPI_Datatype datatype, int rank, int tag, MPIR_Comm * comm, int context_offset, - MPID_Request ** request) + MPIR_Request ** request) { - MPID_Request * rreq; + MPIR_Request * rreq; int found; int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPID_IRECV); @@ -81,7 +81,7 @@ int MPID_Irecv(void * buf, MPI_Aint count, MPI_Datatype datatype, int rank, int MPIDI_Request_decr_pending(rreq); MPIDI_Request_check_pending(rreq, &recv_pending); - if (MPID_Request_is_complete(rreq)) { + if (MPIR_Request_is_complete(rreq)) { /* is it ever possible to have (cc==0 && recv_pending>0) ? */ MPIU_Assert(!recv_pending); diff --git a/src/mpid/ch3/src/mpid_irsend.c b/src/mpid/ch3/src/mpid_irsend.c index 052da4d..def0046 100644 --- a/src/mpid/ch3/src/mpid_irsend.c +++ b/src/mpid/ch3/src/mpid_irsend.c @@ -16,7 +16,7 @@ #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_Irsend(const void * buf, int count, MPI_Datatype datatype, int rank, int tag, MPIR_Comm * comm, int context_offset, - MPID_Request ** request) + MPIR_Request ** request) { MPIDI_CH3_Pkt_t upkt; MPIDI_CH3_Pkt_ready_send_t * const ready_pkt = &upkt.ready_send; @@ -24,7 +24,7 @@ int MPID_Irsend(const void * buf, int count, MPI_Datatype datatype, int rank, in int dt_contig; MPI_Aint dt_true_lb; MPIDU_Datatype* dt_ptr; - MPID_Request * sreq; + MPIR_Request * sreq; MPIDI_VC_t * vc; #if defined(MPID_USE_SEQUENCE_NUMBERS) MPID_Seqnum_t seqnum; diff --git a/src/mpid/ch3/src/mpid_isend.c b/src/mpid/ch3/src/mpid_isend.c index 0fb10af..3b98f39 100644 --- a/src/mpid/ch3/src/mpid_isend.c +++ b/src/mpid/ch3/src/mpid_isend.c @@ -29,13 +29,13 @@ #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_Isend(const void * buf, MPI_Aint count, MPI_Datatype datatype, int rank, int tag, MPIR_Comm * comm, int context_offset, - MPID_Request ** request) + MPIR_Request ** request) { intptr_t data_sz; int dt_contig; MPI_Aint dt_true_lb; MPIDU_Datatype* dt_ptr; - MPID_Request * sreq; + MPIR_Request * sreq; MPIDI_VC_t * vc=0; #if defined(MPID_USE_SEQUENCE_NUMBERS) MPID_Seqnum_t seqnum; diff --git a/src/mpid/ch3/src/mpid_issend.c b/src/mpid/ch3/src/mpid_issend.c index 61ca463..450ed2a 100644 --- a/src/mpid/ch3/src/mpid_issend.c +++ b/src/mpid/ch3/src/mpid_issend.c @@ -16,13 +16,13 @@ #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_Issend(const void * buf, int count, MPI_Datatype datatype, int rank, int tag, MPIR_Comm * comm, int context_offset, - MPID_Request ** request) + MPIR_Request ** request) { intptr_t data_sz; int dt_contig; MPI_Aint dt_true_lb; MPIDU_Datatype* dt_ptr; - MPID_Request * sreq; + MPIR_Request * sreq; MPIDI_VC_t * vc=0; #if defined(MPID_USE_SEQUENCE_NUMBERS) MPID_Seqnum_t seqnum; diff --git a/src/mpid/ch3/src/mpid_mprobe.c b/src/mpid/ch3/src/mpid_mprobe.c index 12dc9fe..163495a 100644 --- a/src/mpid/ch3/src/mpid_mprobe.c +++ b/src/mpid/ch3/src/mpid_mprobe.c @@ -11,7 +11,7 @@ #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_Mprobe(int source, int tag, MPIR_Comm *comm, int context_offset, - MPID_Request **message, MPI_Status *status) + MPIR_Request **message, MPI_Status *status) { int mpi_errno = MPI_SUCCESS; MPID_Progress_state progress_state; diff --git a/src/mpid/ch3/src/mpid_mrecv.c b/src/mpid/ch3/src/mpid_mrecv.c index 2aedeac..986321f 100644 --- a/src/mpid/ch3/src/mpid_mrecv.c +++ b/src/mpid/ch3/src/mpid_mrecv.c @@ -11,12 +11,12 @@ #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_Mrecv(void *buf, int count, MPI_Datatype datatype, - MPID_Request *message, MPI_Status *status) + MPIR_Request *message, MPI_Status *status) { int mpi_errno = MPI_SUCCESS; MPI_Request req_handle; /* dummy for MPIR_Request_complete */ int active_flag; /* dummy for MPIR_Request_complete */ - MPID_Request *rreq = NULL; + MPIR_Request *rreq = NULL; if (message == NULL) { /* treat as though MPI_MESSAGE_NO_PROC was passed */ @@ -31,11 +31,11 @@ int MPID_Mrecv(void *buf, int count, MPI_Datatype datatype, mpi_errno = MPID_Imrecv(buf, count, datatype, message, &rreq); if (mpi_errno) MPIR_ERR_POP(mpi_errno); - if (!MPID_Request_is_complete(rreq)) { + if (!MPIR_Request_is_complete(rreq)) { MPID_Progress_state progress_state; MPID_Progress_start(&progress_state); - while (!MPID_Request_is_complete(rreq)) + while (!MPIR_Request_is_complete(rreq)) { mpi_errno = MPID_Progress_wait(&progress_state); if (mpi_errno) { diff --git a/src/mpid/ch3/src/mpid_recv.c b/src/mpid/ch3/src/mpid_recv.c index eb70e1f..c738b9b 100644 --- a/src/mpid/ch3/src/mpid_recv.c +++ b/src/mpid/ch3/src/mpid_recv.c @@ -12,7 +12,7 @@ #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_Recv(void * buf, MPI_Aint count, MPI_Datatype datatype, int rank, int tag, MPIR_Comm * comm, int context_offset, - MPI_Status * status, MPID_Request ** request) + MPI_Status * status, MPIR_Request ** request) { /* FIXME: in the common case, we want to simply complete the message and make as few updates as possible. @@ -22,7 +22,7 @@ int MPID_Recv(void * buf, MPI_Aint count, MPI_Datatype datatype, int rank, int t message was not found in the unexpected queue. */ int mpi_errno = MPI_SUCCESS; - MPID_Request * rreq; + MPIR_Request * rreq; int found; MPIDI_STATE_DECL(MPID_STATE_MPID_RECV); @@ -85,7 +85,7 @@ int MPID_Recv(void * buf, MPI_Aint count, MPI_Datatype datatype, int rank, int t MPIDI_Request_decr_pending(rreq); MPIDI_Request_check_pending(rreq, &recv_pending); - if (MPID_Request_is_complete(rreq)) { + if (MPIR_Request_is_complete(rreq)) { /* is it ever possible to have (cc==0 && recv_pending>0) ? */ MPIU_Assert(!recv_pending); diff --git a/src/mpid/ch3/src/mpid_rsend.c b/src/mpid/ch3/src/mpid_rsend.c index 2351a72..019d792 100644 --- a/src/mpid/ch3/src/mpid_rsend.c +++ b/src/mpid/ch3/src/mpid_rsend.c @@ -20,13 +20,13 @@ #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_Rsend(const void * buf, int count, MPI_Datatype datatype, int rank, int tag, MPIR_Comm * comm, int context_offset, - MPID_Request ** request) + MPIR_Request ** request) { intptr_t data_sz; int dt_contig; MPI_Aint dt_true_lb; MPIDU_Datatype* dt_ptr; - MPID_Request * sreq = NULL; + MPIR_Request * sreq = NULL; MPIDI_VC_t * vc; #if defined(MPID_USE_SEQUENCE_NUMBERS) MPID_Seqnum_t seqnum; diff --git a/src/mpid/ch3/src/mpid_send.c b/src/mpid/ch3/src/mpid_send.c index 609dcca..9b7ed2c 100644 --- a/src/mpid/ch3/src/mpid_send.c +++ b/src/mpid/ch3/src/mpid_send.c @@ -17,13 +17,13 @@ #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_Send(const void * buf, MPI_Aint count, MPI_Datatype datatype, int rank, int tag, MPIR_Comm * comm, int context_offset, - MPID_Request ** request) + MPIR_Request ** request) { intptr_t data_sz; int dt_contig; MPI_Aint dt_true_lb; MPIDU_Datatype* dt_ptr; - MPID_Request * sreq = NULL; + MPIR_Request * sreq = NULL; MPIDI_VC_t * vc; #if defined(MPID_USE_SEQUENCE_NUMBERS) MPID_Seqnum_t seqnum; diff --git a/src/mpid/ch3/src/mpid_ssend.c b/src/mpid/ch3/src/mpid_ssend.c index e7bf48b..7b582d4 100644 --- a/src/mpid/ch3/src/mpid_ssend.c +++ b/src/mpid/ch3/src/mpid_ssend.c @@ -16,13 +16,13 @@ #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_Ssend(const void * buf, MPI_Aint count, MPI_Datatype datatype, int rank, int tag, MPIR_Comm * comm, int context_offset, - MPID_Request ** request) + MPIR_Request ** request) { intptr_t data_sz; int dt_contig; MPI_Aint dt_true_lb; MPIDU_Datatype * dt_ptr; - MPID_Request * sreq = NULL; + MPIR_Request * sreq = NULL; MPIDI_VC_t * vc; #if defined(MPID_USE_SEQUENCE_NUMBERS) MPID_Seqnum_t seqnum; diff --git a/src/mpid/ch3/src/mpid_startall.c b/src/mpid/ch3/src/mpid_startall.c index c76defd..0adec4b 100644 --- a/src/mpid/ch3/src/mpid_startall.c +++ b/src/mpid/ch3/src/mpid_startall.c @@ -32,7 +32,7 @@ \ MPIU_Object_set_ref((sreq_), 1); \ MPIR_cc_set(&(sreq_)->cc, 0); \ - (sreq_)->kind = MPID_PREQUEST_SEND; \ + (sreq_)->kind = MPIR_PREQUEST_SEND; \ (sreq_)->comm = comm; \ MPIR_Comm_add_ref(comm); \ (sreq_)->dev.match.parts.rank = rank; \ @@ -52,7 +52,7 @@ #define FUNCNAME MPID_Startall #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Startall(int count, MPID_Request * requests[]) +int MPID_Startall(int count, MPIR_Request * requests[]) { int i; int rc; @@ -63,7 +63,7 @@ int MPID_Startall(int count, MPID_Request * requests[]) for (i = 0; i < count; i++) { - MPID_Request * const preq = requests[i]; + MPIR_Request * const preq = requests[i]; /* FIXME: The odd 7th arg (match.context_id - comm->context_id) is probably to get the context offset. Do we really need the @@ -112,7 +112,7 @@ int MPID_Startall(int count, MPID_Request * requests[]) &sreq_handle); if (rc == MPI_SUCCESS) { - MPID_Request_get_ptr(sreq_handle, preq->partner_request); + MPIR_Request_get_ptr(sreq_handle, preq->partner_request); } break; } @@ -163,9 +163,9 @@ int MPID_Startall(int count, MPID_Request * requests[]) #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_Send_init(const void * buf, int count, MPI_Datatype datatype, int rank, int tag, MPIR_Comm * comm, int context_offset, - MPID_Request ** request) + MPIR_Request ** request) { - MPID_Request * sreq; + MPIR_Request * sreq; int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPID_SEND_INIT); @@ -193,9 +193,9 @@ int MPID_Send_init(const void * buf, int count, MPI_Datatype datatype, int rank, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_Ssend_init(const void * buf, int count, MPI_Datatype datatype, int rank, int tag, MPIR_Comm * comm, int context_offset, - MPID_Request ** request) + MPIR_Request ** request) { - MPID_Request * sreq; + MPIR_Request * sreq; int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPID_SSEND_INIT); @@ -223,9 +223,9 @@ int MPID_Ssend_init(const void * buf, int count, MPI_Datatype datatype, int rank #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_Rsend_init(const void * buf, int count, MPI_Datatype datatype, int rank, int tag, MPIR_Comm * comm, int context_offset, - MPID_Request ** request) + MPIR_Request ** request) { - MPID_Request * sreq; + MPIR_Request * sreq; int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPID_RSEND_INIT); @@ -253,9 +253,9 @@ int MPID_Rsend_init(const void * buf, int count, MPI_Datatype datatype, int rank #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_Bsend_init(const void * buf, int count, MPI_Datatype datatype, int rank, int tag, MPIR_Comm * comm, int context_offset, - MPID_Request ** request) + MPIR_Request ** request) { - MPID_Request * sreq; + MPIR_Request * sreq; int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPID_BSEND_INIT); @@ -291,9 +291,9 @@ int MPID_Bsend_init(const void * buf, int count, MPI_Datatype datatype, int rank #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_Recv_init(void * buf, int count, MPI_Datatype datatype, int rank, int tag, MPIR_Comm * comm, int context_offset, - MPID_Request ** request) + MPIR_Request ** request) { - MPID_Request * rreq; + MPIR_Request * rreq; int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPID_RECV_INIT); @@ -309,7 +309,7 @@ int MPID_Recv_init(void * buf, int count, MPI_Datatype datatype, int rank, int t } MPIU_Object_set_ref(rreq, 1); - rreq->kind = MPID_PREQUEST_RECV; + rreq->kind = MPIR_PREQUEST_RECV; rreq->comm = comm; MPIR_cc_set(&rreq->cc, 0); MPIR_Comm_add_ref(comm); diff --git a/src/mpid/ch3/src/mpidi_isend_self.c b/src/mpid/ch3/src/mpidi_isend_self.c index e28c6f1..f9dc247 100644 --- a/src/mpid/ch3/src/mpidi_isend_self.c +++ b/src/mpid/ch3/src/mpidi_isend_self.c @@ -17,11 +17,11 @@ #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_Isend_self(const void * buf, MPI_Aint count, MPI_Datatype datatype, int rank, int tag, MPIR_Comm * comm, int context_offset, - int type, MPID_Request ** request) + int type, MPIR_Request ** request) { MPIDI_Message_match match; - MPID_Request * sreq; - MPID_Request * rreq; + MPIR_Request * sreq; + MPIR_Request * rreq; MPIDI_VC_t * vc; #if defined(MPID_USE_SEQUENCE_NUMBERS) MPID_Seqnum_t seqnum; diff --git a/src/mpid/ch3/util/sock/ch3usock.h b/src/mpid/ch3/util/sock/ch3usock.h index edc1c26..aebfdf3 100644 --- a/src/mpid/ch3/util/sock/ch3usock.h +++ b/src/mpid/ch3/util/sock/ch3usock.h @@ -34,8 +34,8 @@ typedef struct MPIDI_CH3I_Connection MPIDI_VC_t * vc; MPIDU_Sock_t sock; MPIDI_CH3I_Conn_state state; - struct MPID_Request * send_active; - struct MPID_Request * recv_active; + struct MPIR_Request * send_active; + struct MPIR_Request * recv_active; MPIDI_CH3_Pkt_t pkt; char * pg_id; MPL_IOV iov[2]; diff --git a/src/mpid/ch3/util/unordered/unordered.c b/src/mpid/ch3/util/unordered/unordered.c index 6c6098d..bb971fb 100644 --- a/src/mpid/ch3/util/unordered/unordered.c +++ b/src/mpid/ch3/util/unordered/unordered.c @@ -26,7 +26,7 @@ int MPIDI_CH3U_Handle_unordered_recv_pkt(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt) #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3U_Handle_unordered_recv_pkt(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t * pkt, - MPID_Request ** rreqp) + MPIR_Request ** rreqp) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3U_HANDLE_UNORDERED_RECV_PKT); diff --git a/src/mpid/common/hcoll/hcoll.h b/src/mpid/common/hcoll/hcoll.h index ace0545..1bed92d 100644 --- a/src/mpid/common/hcoll/hcoll.h +++ b/src/mpid/common/hcoll/hcoll.h @@ -28,14 +28,14 @@ int hcoll_Allgather(const void *sbuf, int scount, MPI_Datatype sdtype, int hcoll_Allreduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, MPIR_Errflag_t *err); -int hcoll_Ibarrier_req(MPIR_Comm * comm_ptr, MPID_Request ** request); +int hcoll_Ibarrier_req(MPIR_Comm * comm_ptr, MPIR_Request ** request); int hcoll_Ibcast_req(void *buffer, int count, MPI_Datatype datatype, int root, - MPIR_Comm * comm_ptr, MPID_Request ** request); + MPIR_Comm * comm_ptr, MPIR_Request ** request); int hcoll_Iallgather_req(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm * comm_ptr, - MPID_Request ** request); + MPIR_Request ** request); int hcoll_Iallreduce_req(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, MPIR_Comm * comm_ptr, MPID_Request ** request); + MPI_Op op, MPIR_Comm * comm_ptr, MPIR_Request ** request); int hcoll_do_progress(int *made_progress); #endif diff --git a/src/mpid/common/hcoll/hcoll_ops.c b/src/mpid/common/hcoll/hcoll_ops.c index 2ab0c3f..9a05622 100644 --- a/src/mpid/common/hcoll/hcoll_ops.c +++ b/src/mpid/common/hcoll/hcoll_ops.c @@ -181,7 +181,7 @@ int hcoll_Allgather(const void *sbuf, int scount, MPI_Datatype sdtype, #define FUNCNAME hcoll_Ibarrier_req #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int hcoll_Ibarrier_req(MPIR_Comm * comm_ptr, MPID_Request ** request) +int hcoll_Ibarrier_req(MPIR_Comm * comm_ptr, MPIR_Request ** request) { int rc; void **rt_handle; @@ -198,7 +198,7 @@ int hcoll_Ibarrier_req(MPIR_Comm * comm_ptr, MPID_Request ** request) (comm_ptr->hcoll_priv.hcoll_origin_coll_fns != NULL) ? comm_ptr->hcoll_priv.hcoll_origin_coll_fns->Ibarrier_req : NULL; rc = MPI_Ibarrier(comm, &req); - MPID_Request_get_ptr(req, *request); + MPIR_Request_get_ptr(req, *request); comm_ptr->coll_fns->Ibarrier_req = ptr; MPL_DBG_MSG(MPIR_DBG_HCOLL, VERBOSE, "RUNNING FALLBACK IBARRIER - done."); } @@ -210,7 +210,7 @@ int hcoll_Ibarrier_req(MPIR_Comm * comm_ptr, MPID_Request ** request) #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int hcoll_Ibcast_req(void *buffer, int count, MPI_Datatype datatype, int root, - MPIR_Comm * comm_ptr, MPID_Request ** request) + MPIR_Comm * comm_ptr, MPIR_Request ** request) { int rc; void **rt_handle; @@ -246,7 +246,7 @@ int hcoll_Ibcast_req(void *buffer, int count, MPI_Datatype datatype, int root, (comm_ptr->hcoll_priv.hcoll_origin_coll_fns != NULL) ? comm_ptr->hcoll_priv.hcoll_origin_coll_fns->Ibcast_req : NULL; rc = MPI_Ibcast(buffer, count, datatype, root, comm, &req); - MPID_Request_get_ptr(req, *request); + MPIR_Request_get_ptr(req, *request); comm_ptr->coll_fns->Ibcast_req = ptr; MPL_DBG_MSG(MPIR_DBG_HCOLL, VERBOSE, "RUNNING FALLBACK IBCAST - done."); } @@ -259,7 +259,7 @@ int hcoll_Ibcast_req(void *buffer, int count, MPI_Datatype datatype, int root, #define FCNAME MPL_QUOTE(FUNCNAME) int hcoll_Iallgather_req(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm * comm_ptr, - MPID_Request ** request) + MPIR_Request ** request) { int is_homogeneous = 1, use_fallback = 0; MPI_Comm comm = comm_ptr->handle; @@ -304,7 +304,7 @@ int hcoll_Iallgather_req(const void *sendbuf, int sendcount, MPI_Datatype sendty (comm_ptr->hcoll_priv.hcoll_origin_coll_fns != NULL) ? comm_ptr->hcoll_priv.hcoll_origin_coll_fns->Iallgather_req : NULL; rc = MPI_Iallgather(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm, &req); - MPID_Request_get_ptr(req, *request); + MPIR_Request_get_ptr(req, *request); comm_ptr->coll_fns->Iallgather_req = ptr; MPL_DBG_MSG(MPIR_DBG_HCOLL, VERBOSE, "RUNNING FALLBACK IALLGATHER - done."); } @@ -316,7 +316,7 @@ int hcoll_Iallgather_req(const void *sendbuf, int sendcount, MPI_Datatype sendty #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int hcoll_Iallreduce_req(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, MPIR_Comm * comm_ptr, MPID_Request ** request) + MPI_Op op, MPIR_Comm * comm_ptr, MPIR_Request ** request) { dte_data_representation_t Dtype; hcoll_dte_op_t *Op; @@ -359,7 +359,7 @@ int hcoll_Iallreduce_req(const void *sendbuf, void *recvbuf, int count, MPI_Data (comm_ptr->hcoll_priv.hcoll_origin_coll_fns != NULL) ? comm_ptr->hcoll_priv.hcoll_origin_coll_fns->Iallreduce_req : NULL; rc = MPI_Iallreduce(sendbuf, recvbuf, count, datatype, op, comm, &req); - MPID_Request_get_ptr(req, *request); + MPIR_Request_get_ptr(req, *request); comm_ptr->coll_fns->Iallreduce_req = ptr; MPL_DBG_MSG(MPIR_DBG_HCOLL, VERBOSE, "RUNNING FALLBACK IALLREDUCE done."); } diff --git a/src/mpid/common/hcoll/hcoll_rte.c b/src/mpid/common/hcoll/hcoll_rte.c index dd99c23..bf86405 100644 --- a/src/mpid/common/hcoll/hcoll_rte.c +++ b/src/mpid/common/hcoll/hcoll_rte.c @@ -126,7 +126,7 @@ static int recv_nb(struct dte_data_representation_t data, { int mpi_errno; MPI_Datatype dtype; - MPID_Request *request; + MPIR_Request *request; MPIR_Comm *comm; int context_offset; size_t size; @@ -193,7 +193,7 @@ static int send_nb(dte_data_representation_t data, { int mpi_errno; MPI_Datatype dtype; - MPID_Request *request; + MPIR_Request *request; MPIR_Comm *comm; int context_offset; size_t size; @@ -254,14 +254,14 @@ static int send_nb(dte_data_representation_t data, #define FCNAME MPL_QUOTE(FUNCNAME) static int test(rte_request_handle_t * request, int *completed) { - MPID_Request *req; - req = (MPID_Request *) request->data; + MPIR_Request *req; + req = (MPIR_Request *) request->data; if (HCOLRTE_REQUEST_ACTIVE != request->status) { *completed = true; return HCOLL_SUCCESS; } - *completed = (int) MPID_Request_is_complete(req); + *completed = (int) MPIR_Request_is_complete(req); if (*completed) { MPID_Request_release(req); request->status = HCOLRTE_REQUEST_DONE; @@ -385,9 +385,9 @@ static int group_id(rte_grp_handle_t group) #define FCNAME MPL_QUOTE(FUNCNAME) static void *get_coll_handle(void) { - MPID_Request *req; + MPIR_Request *req; req = MPID_Request_create(); - req->kind = MPID_COLL_REQUEST; + req->kind = MPIR_COLL_REQUEST; return (void *) req; } @@ -398,9 +398,9 @@ static void *get_coll_handle(void) static int coll_handle_test(void *handle) { int completed; - MPID_Request *req; - req = (MPID_Request *) handle; - completed = (int) MPID_Request_is_complete(req); + MPIR_Request *req; + req = (MPIR_Request *) handle; + completed = (int) MPIR_Request_is_complete(req); return completed; } @@ -410,9 +410,9 @@ static int coll_handle_test(void *handle) #define FCNAME MPL_QUOTE(FUNCNAME) static void coll_handle_free(void *handle) { - MPID_Request *req; + MPIR_Request *req; if (NULL != handle) { - req = (MPID_Request *) handle; + req = (MPIR_Request *) handle; MPID_Request_release(req); } } @@ -423,9 +423,9 @@ static void coll_handle_free(void *handle) #define FCNAME MPL_QUOTE(FUNCNAME) static void coll_handle_complete(void *handle) { - MPID_Request *req; + MPIR_Request *req; if (NULL != handle) { - req = (MPID_Request *) handle; + req = (MPIR_Request *) handle; MPID_Request_complete(req); } } diff --git a/src/mpid/common/sched/mpidu_sched.c b/src/mpid/common/sched/mpidu_sched.c index be5f452..56e7ec3 100644 --- a/src/mpid/common/sched/mpidu_sched.c +++ b/src/mpid/common/sched/mpidu_sched.c @@ -127,7 +127,7 @@ int MPIDU_Sched_next_tag(MPIR_Comm * comm_ptr, int *tag) static int MPIDU_Sched_start_entry(struct MPIDU_Sched *s, size_t idx, struct MPIDU_Sched_entry *e) { int mpi_errno = MPI_SUCCESS, ret_errno = MPI_SUCCESS; - MPID_Request *r = s->req; + MPIR_Request *r = s->req; MPIR_Comm *comm; MPIU_Assert(e->status == MPIDU_SCHED_ENTRY_STATUS_NOT_STARTED); @@ -389,10 +389,10 @@ int MPIDU_Sched_clone(MPID_Sched_t orig, MPID_Sched_t * cloned) #define FCNAME MPL_QUOTE(FUNCNAME) /* sets (*sp) to MPID_SCHED_NULL and gives you back a request pointer in (*req). * The caller is giving up ownership of the opaque schedule object. */ -int MPIDU_Sched_start(MPID_Sched_t * sp, MPIR_Comm * comm, int tag, MPID_Request ** req) +int MPIDU_Sched_start(MPID_Sched_t * sp, MPIR_Comm * comm, int tag, MPIR_Request ** req) { int mpi_errno = MPI_SUCCESS; - MPID_Request *r; + MPIR_Request *r; struct MPIDU_Sched *s = *sp; *req = NULL; @@ -410,7 +410,7 @@ int MPIDU_Sched_start(MPID_Sched_t * sp, MPIR_Comm * comm, int tag, MPID_Request r = MPID_Request_create(); if (!r) MPIR_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**nomem"); - r->kind = MPID_COLL_REQUEST; + r->kind = MPIR_COLL_REQUEST; /* FIXME is this right when comm/datatype GC is used? */ MPIR_Comm_add_ref(comm); r->comm = comm; @@ -887,7 +887,7 @@ static int MPIDU_Sched_progress_state(struct MPIDU_Sched_state *state, int *made switch (e->type) { case MPIDU_SCHED_ENTRY_SEND: - if (e->u.send.sreq != NULL && MPID_Request_is_complete(e->u.send.sreq)) { + if (e->u.send.sreq != NULL && MPIR_Request_is_complete(e->u.send.sreq)) { MPL_DBG_MSG_FMT(MPIR_DBG_COMM, VERBOSE, (MPL_DBG_FDEST, "completed SEND entry %d, sreq=%p\n", (int) i, e->u.send.sreq)); @@ -902,7 +902,7 @@ static int MPIDU_Sched_progress_state(struct MPIDU_Sched_state *state, int *made } break; case MPIDU_SCHED_ENTRY_RECV: - if (e->u.recv.rreq != NULL && MPID_Request_is_complete(e->u.recv.rreq)) { + if (e->u.recv.rreq != NULL && MPIR_Request_is_complete(e->u.recv.rreq)) { MPL_DBG_MSG_FMT(MPIR_DBG_COMM, VERBOSE, (MPL_DBG_FDEST, "completed RECV entry %d, rreq=%p\n", (int) i, e->u.recv.rreq)); diff --git a/src/mpid/common/sched/mpidu_sched.h b/src/mpid/common/sched/mpidu_sched.h index 1b21a68..85003ed 100644 --- a/src/mpid/common/sched/mpidu_sched.h +++ b/src/mpid/common/sched/mpidu_sched.h @@ -34,7 +34,7 @@ struct MPIDU_Sched_send { MPI_Datatype datatype; int dest; struct MPIR_Comm *comm; - struct MPID_Request *sreq; + struct MPIR_Request *sreq; int is_sync; /* TRUE iff this send is an ssend */ }; @@ -44,7 +44,7 @@ struct MPIDU_Sched_recv { MPI_Datatype datatype; int src; struct MPIR_Comm *comm; - struct MPID_Request *rreq; + struct MPIR_Request *rreq; MPI_Status *status; }; @@ -111,7 +111,7 @@ struct MPIDU_Sched { size_t idx; /* index into entries array of first yet-outstanding entry */ int num_entries; /* number of populated entries, num_entries <= size */ int tag; - struct MPID_Request *req; /* really needed? could cause MT problems... */ + struct MPIR_Request *req; /* really needed? could cause MT problems... */ struct MPIDU_Sched_entry *entries; struct MPIDU_Sched *next; /* linked-list next pointer */ @@ -125,7 +125,7 @@ int MPIDU_Sched_next_tag(struct MPIR_Comm *comm_ptr, int *tag); int MPIDU_Sched_create(MPID_Sched_t * sp); int MPIDU_Sched_clone(MPID_Sched_t orig, MPID_Sched_t * cloned); int MPIDU_Sched_start(MPID_Sched_t * sp, struct MPIR_Comm *comm, int tag, - struct MPID_Request **req); + struct MPIR_Request **req); int MPIDU_Sched_send(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, struct MPIR_Comm *comm, MPID_Sched_t s); int MPIDU_Sched_recv(void *buf, MPI_Aint count, MPI_Datatype datatype, int src, diff --git a/src/mpid/include/mpidu_pre.h b/src/mpid/include/mpidu_pre.h index 469e459..3ad4314 100644 --- a/src/mpid/include/mpidu_pre.h +++ b/src/mpid/include/mpidu_pre.h @@ -11,7 +11,7 @@ /* some common MPI forward declarations */ -struct MPID_Request; +struct MPIR_Request; struct MPIR_Comm; /* Scheduling forward declarations */ diff --git a/src/mpid/pamid/include/mpidi_datatypes.h b/src/mpid/pamid/include/mpidi_datatypes.h index 941ad71..fbff89a 100644 --- a/src/mpid/pamid/include/mpidi_datatypes.h +++ b/src/mpid/pamid/include/mpidi_datatypes.h @@ -41,10 +41,10 @@ #if (MPIU_HANDLE_ALLOCATION_METHOD == MPIU_HANDLE_ALLOCATION_THREAD_LOCAL) && defined(__BGQ__) -struct MPID_Request; +struct MPIR_Request; typedef struct { - struct MPID_Request * head; + struct MPIR_Request * head; size_t count; } MPIDI_RequestHandle_t; #endif @@ -268,10 +268,10 @@ typedef struct size_t length; } MPIDI_MsgEnvelope; -/** \brief This defines the portion of MPID_Request that is specific to the Device */ +/** \brief This defines the portion of MPIR_Request that is specific to the Device */ struct MPIDI_Request { - struct MPID_Request *next; /**< Link to next req. in queue */ + struct MPIR_Request *next; /**< Link to next req. in queue */ struct MPIDU_Datatype*datatype_ptr; /**< Info about the datatype */ pami_work_t post_request; /**< */ @@ -292,10 +292,10 @@ struct MPIDI_Request MPIDI_CA ca; /**< Completion action */ pami_memregion_t memregion; /**< Rendezvous recv memregion */ #ifdef OUT_OF_ORDER_HANDLING - struct MPID_Request *prev; /**< Link to prev req. in queue */ + struct MPIR_Request *prev; /**< Link to prev req. in queue */ void *nextR; /** < pointer to next recv for the out-of-order list, the out-of-order list is a list per source */ void *prevR; /** < pointer to prev recv for the out-of-order list, the out-of-order list is a list per source */ - struct MPID_Request *oo_peer; /** < pointer to the matched post recv request to complete in the out-of-order case */ + struct MPIR_Request *oo_peer; /** < pointer to the matched post recv request to complete in the out-of-order case */ #endif #ifdef RDMA_FAILOVER uint32_t memregion_used:16; @@ -523,7 +523,7 @@ struct MPIDI_Win } lock; } sync; int request_based; /* flag for request based rma */ - struct MPID_Request *rreq; /* anchor of MPID_Request for request based rma */ + struct MPIR_Request *rreq; /* anchor of MPIR_Request for request based rma */ }; /** diff --git a/src/mpid/pamid/include/mpidi_hooks.h b/src/mpid/pamid/include/mpidi_hooks.h index 1e8985c..00d4844 100644 --- a/src/mpid/pamid/include/mpidi_hooks.h +++ b/src/mpid/pamid/include/mpidi_hooks.h @@ -50,7 +50,7 @@ typedef size_t intptr_t; /** \brief Our progress engine does not require state */ #define MPID_PROGRESS_STATE_DECL -/** \brief This defines the portion of MPID_Request that is specific to the Device */ +/** \brief This defines the portion of MPIR_Request that is specific to the Device */ #define MPID_DEV_REQUEST_DECL struct MPIDI_Request mpid; /** \brief This defines the portion of MPIR_Comm that is specific to the Device */ diff --git a/src/mpid/pamid/include/mpidi_prototypes.h b/src/mpid/pamid/include/mpidi_prototypes.h index e1ae621..fc683ba 100644 --- a/src/mpid/pamid/include/mpidi_prototypes.h +++ b/src/mpid/pamid/include/mpidi_prototypes.h @@ -40,21 +40,21 @@ void MPIDI_Recvq_init(); void MPIDI_Recvq_finalize(); int MPIDI_Recvq_FU (int s, int t, int c, MPI_Status * status); -MPID_Request * MPIDI_Recvq_FDUR (MPI_Request req, int source, int tag, int context_id); -int MPIDI_Recvq_FDPR (MPID_Request * req); +MPIR_Request * MPIDI_Recvq_FDUR (MPI_Request req, int source, int tag, int context_id); +int MPIDI_Recvq_FDPR (MPIR_Request * req); #ifndef OUT_OF_ORDER_HANDLING -MPID_Request * MPIDI_Recvq_FDP_or_AEU(MPID_Request *newreq, int s, int t, int c, int * foundp); -MPID_Request * MPIDI_Recvq_FDU (int source, int tag, int context_id, int * foundp); -MPID_Request * MPIDI_Recvq_AEU (MPID_Request *newreq, int source, int tag, int context_id); +MPIR_Request * MPIDI_Recvq_FDP_or_AEU(MPIR_Request *newreq, int s, int t, int c, int * foundp); +MPIR_Request * MPIDI_Recvq_FDU (int source, int tag, int context_id, int * foundp); +MPIR_Request * MPIDI_Recvq_AEU (MPIR_Request *newreq, int source, int tag, int context_id); #else -MPID_Request * MPIDI_Recvq_FDP_or_AEU(MPID_Request *newreq, int s, pami_task_t ps, int t, int c, int sq, int * foundp); -MPID_Request * MPIDI_Recvq_FDU (int source, pami_task_t pami_source, int tag, int context_id, int * foundp); -MPID_Request * MPIDI_Recvq_AEU (MPID_Request *newreq, int source, pami_task_t pami_source, int tag, int context_id, int msg_seqno); +MPIR_Request * MPIDI_Recvq_FDP_or_AEU(MPIR_Request *newreq, int s, pami_task_t ps, int t, int c, int sq, int * foundp); +MPIR_Request * MPIDI_Recvq_FDU (int source, pami_task_t pami_source, int tag, int context_id, int * foundp); +MPIR_Request * MPIDI_Recvq_AEU (MPIR_Request *newreq, int source, pami_task_t pami_source, int tag, int context_id, int msg_seqno); #endif void MPIDI_Recvq_DumpQueues (int verbose); #ifdef OUT_OF_ORDER_HANDLING -void MPIDI_Recvq_enqueue_ool (pami_task_t s, MPID_Request * r); -void MPIDI_Recvq_insert_ool (MPID_Request *q,MPID_Request *e); +void MPIDI_Recvq_enqueue_ool (pami_task_t s, MPIR_Request * r); +void MPIDI_Recvq_insert_ool (MPIR_Request *q,MPIR_Request *e); #endif /** \} */ @@ -76,8 +76,8 @@ pami_result_t MPIDI_Isend_handoff_internal(pami_context_t context, void * sreq); void MPIDI_RecvMsg_procnull(MPIR_Comm * comm, unsigned is_blocking, MPI_Status * status, - MPID_Request ** request); -void MPIDI_RecvMsg_Unexp(MPID_Request * rreq, void * buf, MPI_Aint count, MPI_Datatype datatype); + MPIR_Request ** request); +void MPIDI_RecvMsg_Unexp(MPIR_Request * rreq, void * buf, MPI_Aint count, MPI_Datatype datatype); /** * \defgroup MPID_CALLBACKS MPID callbacks for communication @@ -164,10 +164,10 @@ void MPIDI_Recvfrom_remote_world_disconnect (pami_context_t context, #ifdef OUT_OF_ORDER_HANDLING void MPIDI_Recvq_process_out_of_order_msgs(pami_task_t src, pami_context_t context); int MPIDI_Recvq_search_recv_posting_queue(int src, int tag, int context_id, - MPID_Request **handleptr ); + MPIR_Request **handleptr ); #endif -void MPIDI_Callback_process_unexp(MPID_Request *newreq, +void MPIDI_Callback_process_unexp(MPIR_Request *newreq, pami_context_t context, const MPIDI_MsgInfo * msginfo, size_t sndlen, @@ -176,18 +176,18 @@ void MPIDI_Callback_process_unexp(MPID_Request *newreq, pami_recv_t * recv, unsigned isSync); void MPIDI_Callback_process_trunc(pami_context_t context, - MPID_Request *rreq, + MPIR_Request *rreq, pami_recv_t *recv, const void *sndbuf); void MPIDI_Callback_process_userdefined_dt(pami_context_t context, const void * sndbuf, size_t sndlen, - MPID_Request * rreq); + MPIR_Request * rreq); /** \} */ /** \brief Acknowledge an MPI_Ssend() */ -void MPIDI_SyncAck_post(pami_context_t context, MPID_Request * req, unsigned rank); +void MPIDI_SyncAck_post(pami_context_t context, MPIR_Request * req, unsigned rank); pami_result_t MPIDI_SyncAck_handoff(pami_context_t context, void * inputReq); /** \brief This is the general PT2PT control message call-back */ void MPIDI_ControlCB(pami_context_t context, @@ -287,11 +287,11 @@ void MPIDI_Coll_register (void); int MPIDO_Bcast(void *buffer, int count, MPI_Datatype dt, int root, MPIR_Comm *comm_ptr, int *mpierrno); int MPIDO_Bcast_simple(void *buffer, int count, MPI_Datatype dt, int root, MPIR_Comm *comm_ptr, int *mpierrno); int MPIDO_CSWrapper_bcast(pami_xfer_t *bcast, void *comm); -int MPIDO_Ibcast(void *buffer, int count, MPI_Datatype datatype, int root, MPIR_Comm *comm_ptr, MPID_Request **request); +int MPIDO_Ibcast(void *buffer, int count, MPI_Datatype datatype, int root, MPIR_Comm *comm_ptr, MPIR_Request **request); int MPIDO_Barrier(MPIR_Comm *comm_ptr, int *mpierrno); int MPIDO_Barrier_simple(MPIR_Comm *comm_ptr, int *mpierrno); int MPIDO_CSWrapper_barrier(pami_xfer_t *barrier, void *comm); -int MPIDO_Ibarrier(MPIR_Comm *comm_ptr, MPID_Request **request); +int MPIDO_Ibarrier(MPIR_Comm *comm_ptr, MPIR_Request **request); int MPIDO_Allreduce(const void *sbuffer, void *rbuffer, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, int *mpierrno); @@ -300,14 +300,14 @@ int MPIDO_Allreduce_simple(const void *sbuffer, void *rbuffer, int count, int MPIDO_CSWrapper_allreduce(pami_xfer_t *allreduce, void *comm); int MPIDO_Iallreduce(const void *sbuffer, void *rbuffer, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, - MPID_Request ** request); + MPIR_Request ** request); int MPIDO_Reduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPIR_Comm *comm_ptr, int *mpierrno); int MPIDO_Reduce_simple(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPIR_Comm *comm_ptr, int *mpierrno); int MPIDO_CSWrapper_reduce(pami_xfer_t *reduce, void *comm); int MPIDO_Ireduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, int root, MPIR_Comm *comm_ptr, MPID_Request **request); + MPI_Op op, int root, MPIR_Comm *comm_ptr, MPIR_Request **request); int MPIDO_Allgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, int *mpierrno); @@ -317,7 +317,7 @@ int MPIDO_Allgather_simple(const void *sendbuf, int sendcount, MPI_Datatype send int MPIDO_CSWrapper_allgather(pami_xfer_t *allgather, void *comm); int MPIDO_Iallgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, - MPID_Request **request); + MPIR_Request **request); int MPIDO_Allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, @@ -329,7 +329,7 @@ int MPIDO_CSWrapper_allgatherv(pami_xfer_t *allgatherv, void *comm); int MPIDO_Iallgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, MPIR_Comm * comm_ptr, - MPID_Request ** request); + MPIR_Request ** request); int MPIDO_Gather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, @@ -340,7 +340,7 @@ int MPIDO_Gather_simple(const void *sendbuf, int sendcount, MPI_Datatype sendtyp int MPIDO_CSWrapper_gather(pami_xfer_t *gather, void *comm); int MPIDO_Igather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPIR_Comm * comm_ptr, MPID_Request **request); + int root, MPIR_Comm * comm_ptr, MPIR_Request **request); int MPIDO_Gatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, @@ -351,7 +351,7 @@ int MPIDO_Gatherv_simple(const void *sendbuf, int sendcount, MPI_Datatype sendty int MPIDO_CSWrapper_gatherv(pami_xfer_t *gatherv, void *comm); int MPIDO_Igatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, - int root, MPIR_Comm * comm_ptr, MPID_Request **request); + int root, MPIR_Comm * comm_ptr, MPIR_Request **request); int MPIDO_Scan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, int *mpierrno); @@ -359,14 +359,14 @@ int MPIDO_Scan_simple(const void *sendbuf, void *recvbuf, int count, MPI_Datatyp MPI_Op op, MPIR_Comm * comm_ptr, int *mpierrno); int MPIDO_CSWrapper_scan(pami_xfer_t *scan, void *comm); int MPIDO_Iscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, MPIR_Comm * comm_ptr, MPID_Request **request); + MPI_Op op, MPIR_Comm * comm_ptr, MPIR_Request **request); int MPIDO_Exscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, int *mpierrno); int MPIDO_Exscan_simple(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, int *mpierrno); int MPIDO_Iexscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, MPIR_Comm * comm_ptr, MPID_Request **request); + MPI_Op op, MPIR_Comm * comm_ptr, MPIR_Request **request); int MPIDO_Scatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, @@ -377,7 +377,7 @@ int MPIDO_Scatter_simple(const void *sendbuf, int sendcount, MPI_Datatype sendty int MPIDO_CSWrapper_scatter(pami_xfer_t *scatter, void *comm); int MPIDO_Iscatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPIR_Comm * comm_ptr, MPID_Request **request); + int root, MPIR_Comm * comm_ptr, MPIR_Request **request); int MPIDO_Scatterv(const void *sendbuf, const int *sendcounts, const int *displs, MPI_Datatype sendtype, @@ -391,7 +391,7 @@ int MPIDO_CSWrapper_scatterv(pami_xfer_t *scatterv, void *comm); int MPIDO_Iscatterv(const void *sendbuf, const int *sendcounts, const int *displs, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPIR_Comm * comm_ptr, MPID_Request **request); + int root, MPIR_Comm * comm_ptr, MPIR_Request **request); int MPIDO_Alltoallv(const void *sendbuf, const int *sendcounts, const int *senddispls, MPI_Datatype sendtype, @@ -408,7 +408,7 @@ int MPIDO_Ialltoallv(const void *sendbuf, const int *sendcounts, const int *send MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *recvdispls, MPI_Datatype recvtype, - MPIR_Comm *comm_ptr, MPID_Request **request); + MPIR_Comm *comm_ptr, MPIR_Request **request); int MPIDO_Alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, @@ -419,13 +419,13 @@ int MPIDO_Alltoall_simple(const void *sendbuf, int sendcount, MPI_Datatype sendt int MPIDO_CSWrapper_alltoall(pami_xfer_t *alltoall, void *comm); int MPIDO_Ialltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPIR_Comm *comm_ptr, MPID_Request **request); + MPIR_Comm *comm_ptr, MPIR_Request **request); int MPIDO_Ialltoallw(const void *sendbuf, const int *sendcounts, const int *senddispls, const MPI_Datatype * sendtypes, void *recvbuf, const int *recvcounts, const int *recvdispls, const MPI_Datatype * recvtypes, - MPIR_Comm *comm_ptr, MPID_Request **request); + MPIR_Comm *comm_ptr, MPIR_Request **request); int MPIDO_Reduce_scatter(const void *sendbuf, void *recvbuf, int *recvcounts, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, int *mpierrno); @@ -435,10 +435,10 @@ int MPIDO_Reduce_scatter_block(const void *sendbuf, void *recvbuf, int recvcount int MPIDO_Ireduce_scatter_block(const void *sendbuf, void *recvbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, - MPID_Request **request); + MPIR_Request **request); int MPIDO_Ireduce_scatter(const void *sendbuf, void *recvbuf, const int *recvcounts, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Request **request); + MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPIR_Request **request); int MPIDI_Datatype_to_pami(MPI_Datatype dt, pami_type_t *pdt, diff --git a/src/mpid/pamid/src/coll/allgather/mpido_iallgather.c b/src/mpid/pamid/src/coll/allgather/mpido_iallgather.c index f8a4405..34b8bbd 100644 --- a/src/mpid/pamid/src/coll/allgather/mpido_iallgather.c +++ b/src/mpid/pamid/src/coll/allgather/mpido_iallgather.c @@ -31,13 +31,13 @@ MPIDO_Iallgather(const void *sendbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm * comm_ptr, - MPID_Request ** request) + MPIR_Request ** request) { /*if (unlikely((data_size == 0) || (user_selected_type == MPID_COLL_USE_MPICH)))*/ { /* * If the mpich mpir non-blocking collectives are enabled, return without - * first constructing the MPID_Request. This signals to the + * first constructing the MPIR_Request. This signals to the * MPIR_Iallgather_impl() function to invoke the mpich nbc implementation * of MPI_Iallgather(). */ @@ -58,11 +58,11 @@ MPIDO_Iallgather(const void *sendbuf, /* * The blocking allgather has completed - create and complete a - * MPID_Request object so the MPIR_Iallgather_impl() function does not + * MPIR_Request object so the MPIR_Iallgather_impl() function does not * perform an additional iallgather. */ - MPID_Request * mpid_request = MPID_Request_create_inline(); - mpid_request->kind = MPID_COLL_REQUEST; + MPIR_Request * mpid_request = MPID_Request_create_inline(); + mpid_request->kind = MPIR_COLL_REQUEST; *request = mpid_request; MPIDI_Request_complete_norelease_inline(mpid_request); diff --git a/src/mpid/pamid/src/coll/allgatherv/mpido_iallgatherv.c b/src/mpid/pamid/src/coll/allgatherv/mpido_iallgatherv.c index b919b5d..1b9efb0 100644 --- a/src/mpid/pamid/src/coll/allgatherv/mpido_iallgatherv.c +++ b/src/mpid/pamid/src/coll/allgatherv/mpido_iallgatherv.c @@ -32,7 +32,7 @@ MPIDO_Iallgatherv(const void *sendbuf, const int *displs, MPI_Datatype recvtype, MPIR_Comm * comm_ptr, - MPID_Request ** request) + MPIR_Request ** request) { TRACE_ERR("Entering MPIDO_Iallgatherv\n"); @@ -41,7 +41,7 @@ MPIDO_Iallgatherv(const void *sendbuf, { /* * If the mpich mpir non-blocking collectives are enabled, return without - * first constructing the MPID_Request. This signals to the + * first constructing the MPIR_Request. This signals to the * MPIR_Iallgather_impl() function to invoke the mpich nbc implementation * of MPI_Iallgather(). */ @@ -62,11 +62,11 @@ MPIDO_Iallgatherv(const void *sendbuf, /* * The blocking allgather has completed - create and complete a - * MPID_Request object so the MPIR_Iallgather_impl() function does not + * MPIR_Request object so the MPIR_Iallgather_impl() function does not * perform an additional iallgather. */ - MPID_Request * mpid_request = MPID_Request_create_inline(); - mpid_request->kind = MPID_COLL_REQUEST; + MPIR_Request * mpid_request = MPID_Request_create_inline(); + mpid_request->kind = MPIR_COLL_REQUEST; *request = mpid_request; MPIDI_Request_complete_norelease_inline(mpid_request); diff --git a/src/mpid/pamid/src/coll/allreduce/mpido_iallreduce.c b/src/mpid/pamid/src/coll/allreduce/mpido_iallreduce.c index 91dec6c..3f0c219 100644 --- a/src/mpid/pamid/src/coll/allreduce/mpido_iallreduce.c +++ b/src/mpid/pamid/src/coll/allreduce/mpido_iallreduce.c @@ -30,7 +30,7 @@ int MPIDO_Iallreduce(const void *sendbuf, MPI_Datatype dt, MPI_Op op, MPIR_Comm *comm_ptr, - MPID_Request **request) + MPIR_Request **request) { TRACE_ERR("Entering mpido_iallreduce\n"); @@ -38,7 +38,7 @@ int MPIDO_Iallreduce(const void *sendbuf, { /* * If the mpich mpir non-blocking collectives are enabled, return without - * first constructing the MPID_Request. This signals to the + * first constructing the MPIR_Request. This signals to the * MPIR_Iallreduce_impl() function to invoke the mpich nbc implementation * of MPI_Iallreduce(). */ @@ -58,11 +58,11 @@ int MPIDO_Iallreduce(const void *sendbuf, /* * The blocking allreduce has completed - create and complete a - * MPID_Request object so the MPIR_Iallreduce_impl() function does not + * MPIR_Request object so the MPIR_Iallreduce_impl() function does not * perform an additional iallreduce. */ - MPID_Request * mpid_request = MPID_Request_create_inline(); - mpid_request->kind = MPID_COLL_REQUEST; + MPIR_Request * mpid_request = MPID_Request_create_inline(); + mpid_request->kind = MPIR_COLL_REQUEST; *request = mpid_request; MPIDI_Request_complete_norelease_inline(mpid_request); diff --git a/src/mpid/pamid/src/coll/alltoall/mpido_ialltoall.c b/src/mpid/pamid/src/coll/alltoall/mpido_ialltoall.c index 682eae0..90f014b 100644 --- a/src/mpid/pamid/src/coll/alltoall/mpido_ialltoall.c +++ b/src/mpid/pamid/src/coll/alltoall/mpido_ialltoall.c @@ -31,7 +31,7 @@ int MPIDO_Ialltoall(const void *sendbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, - MPID_Request **request) + MPIR_Request **request) { TRACE_ERR("Entering MPIDO_Ialltoall\n"); @@ -39,7 +39,7 @@ int MPIDO_Ialltoall(const void *sendbuf, { /* * If the mpich mpir non-blocking collectives are enabled, return without - * first constructing the MPID_Request. This signals to the + * first constructing the MPIR_Request. This signals to the * MPIR_Ialltoall_impl() function to invoke the mpich nbc implementation * of MPI_Ialltoall(). */ @@ -60,11 +60,11 @@ int MPIDO_Ialltoall(const void *sendbuf, /* * The blocking allitoall has completed - create and complete a - * MPID_Request object so the MPIR_Ialltoall_impl() function does not + * MPIR_Request object so the MPIR_Ialltoall_impl() function does not * perform an additional ialltoall. */ - MPID_Request * mpid_request = MPID_Request_create_inline(); - mpid_request->kind = MPID_COLL_REQUEST; + MPIR_Request * mpid_request = MPID_Request_create_inline(); + mpid_request->kind = MPIR_COLL_REQUEST; *request = mpid_request; MPIDI_Request_complete_norelease_inline(mpid_request); diff --git a/src/mpid/pamid/src/coll/alltoallv/mpido_ialltoallv.c b/src/mpid/pamid/src/coll/alltoallv/mpido_ialltoallv.c index ef5dff1..5c88f07 100644 --- a/src/mpid/pamid/src/coll/alltoallv/mpido_ialltoallv.c +++ b/src/mpid/pamid/src/coll/alltoallv/mpido_ialltoallv.c @@ -32,7 +32,7 @@ int MPIDO_Ialltoallv(const void *sendbuf, const int *recvdispls, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, - MPID_Request **request) + MPIR_Request **request) { if(comm_ptr->rank == 0) TRACE_ERR("Entering MPIDO_Ialltoallv\n"); @@ -41,7 +41,7 @@ int MPIDO_Ialltoallv(const void *sendbuf, { /* * If the mpich mpir non-blocking collectives are enabled, return without - * first constructing the MPID_Request. This signals to the + * first constructing the MPIR_Request. This signals to the * MPIR_Ialltoalliv_impl() function to invoke the mpich nbc implementation * of MPI_Ialltoallv(). */ @@ -62,11 +62,11 @@ int MPIDO_Ialltoallv(const void *sendbuf, /* * The blocking alltoallv has completed - create and complete a - * MPID_Request object so the MPIR_Ialltoallv_impl() function does not + * MPIR_Request object so the MPIR_Ialltoallv_impl() function does not * perform an additional ialltoallv. */ - MPID_Request * mpid_request = MPID_Request_create_inline(); - mpid_request->kind = MPID_COLL_REQUEST; + MPIR_Request * mpid_request = MPID_Request_create_inline(); + mpid_request->kind = MPIR_COLL_REQUEST; *request = mpid_request; MPIDI_Request_complete_norelease_inline(mpid_request); diff --git a/src/mpid/pamid/src/coll/alltoallw/mpido_ialltoallw.c b/src/mpid/pamid/src/coll/alltoallw/mpido_ialltoallw.c index 61bd705..0f82a4f 100644 --- a/src/mpid/pamid/src/coll/alltoallw/mpido_ialltoallw.c +++ b/src/mpid/pamid/src/coll/alltoallw/mpido_ialltoallw.c @@ -32,7 +32,7 @@ int MPIDO_Ialltoallw(const void *sendbuf, const int *recvdispls, const MPI_Datatype *recvtypes, MPIR_Comm *comm_ptr, - MPID_Request **request) + MPIR_Request **request) { if(comm_ptr->rank == 0) TRACE_ERR("Entering MPIDO_Ialltoallw\n"); @@ -41,7 +41,7 @@ int MPIDO_Ialltoallw(const void *sendbuf, { /* * If the mpich mpir non-blocking collectives are enabled, return without - * first constructing the MPID_Request. This signals to the + * first constructing the MPIR_Request. This signals to the * MPIR_Ialltoallw_impl() function to invoke the mpich nbc implementation * of MPI_Ialltoallw(). */ @@ -62,11 +62,11 @@ int MPIDO_Ialltoallw(const void *sendbuf, /* * The blocking alltoallw has completed - create and complete a - * MPID_Request object so the MPIR_Ialltoallw_impl() function does not + * MPIR_Request object so the MPIR_Ialltoallw_impl() function does not * perform an additional ialltoallw. */ - MPID_Request * mpid_request = MPID_Request_create_inline(); - mpid_request->kind = MPID_COLL_REQUEST; + MPIR_Request * mpid_request = MPID_Request_create_inline(); + mpid_request->kind = MPIR_COLL_REQUEST; *request = mpid_request; MPIDI_Request_complete_norelease_inline(mpid_request); diff --git a/src/mpid/pamid/src/coll/barrier/mpido_ibarrier.c b/src/mpid/pamid/src/coll/barrier/mpido_ibarrier.c index 61d2fcf..fc48a0b 100644 --- a/src/mpid/pamid/src/coll/barrier/mpido_ibarrier.c +++ b/src/mpid/pamid/src/coll/barrier/mpido_ibarrier.c @@ -26,11 +26,11 @@ static void cb_ibarrier(void *ctxt, void *clientdata, pami_result_t err) { - MPID_Request *mpid_request = (MPID_Request *) clientdata; + MPIR_Request *mpid_request = (MPIR_Request *) clientdata; MPIDI_Request_complete_norelease_inline(mpid_request); } -int MPIDO_Ibarrier(MPIR_Comm *comm_ptr, MPID_Request **request) +int MPIDO_Ibarrier(MPIR_Comm *comm_ptr, MPIR_Request **request) { TRACE_ERR("Entering MPIDO_Ibarrier\n"); @@ -53,8 +53,8 @@ int MPIDO_Ibarrier(MPIR_Comm *comm_ptr, MPID_Request **request) int mpierrno = 0; int rc = MPIR_Barrier(comm_ptr, &mpierrno); - MPID_Request * mpid_request = MPID_Request_create_inline(); - mpid_request->kind = MPID_COLL_REQUEST; + MPIR_Request * mpid_request = MPID_Request_create_inline(); + mpid_request->kind = MPIR_COLL_REQUEST; *request = mpid_request; MPIDI_Request_complete_norelease_inline(mpid_request); diff --git a/src/mpid/pamid/src/coll/bcast/mpido_ibcast.c b/src/mpid/pamid/src/coll/bcast/mpido_ibcast.c index b5b6c58..630e379 100644 --- a/src/mpid/pamid/src/coll/bcast/mpido_ibcast.c +++ b/src/mpid/pamid/src/coll/bcast/mpido_ibcast.c @@ -29,13 +29,13 @@ int MPIDO_Ibcast(void *buffer, MPI_Datatype datatype, int root, MPIR_Comm *comm_ptr, - MPID_Request **request) + MPIR_Request **request) { TRACE_ERR("in mpido_ibcast\n"); /* * If the mpich mpir non-blocking collectives are enabled, return without - * first constructing the MPID_Request. This signals to MPIR_Ibcast_impl + * first constructing the MPIR_Request. This signals to MPIR_Ibcast_impl * to invoke the mpich nbc implementation of MPI_Ibcast(). */ if (MPIDI_Process.mpir_nbc != 0) @@ -52,11 +52,11 @@ int MPIDO_Ibcast(void *buffer, int rc = MPIR_Bcast_intra(buffer, count, datatype, root, comm_ptr, &mpierrno); /* - * The blocking bcast has completed - create and complete a MPID_Request + * The blocking bcast has completed - create and complete a MPIR_Request * object so the MPIR_Ibcast_impl() function does not perform the bcast. */ - MPID_Request * mpid_request = MPID_Request_create_inline(); - mpid_request->kind = MPID_COLL_REQUEST; + MPIR_Request * mpid_request = MPID_Request_create_inline(); + mpid_request->kind = MPIR_COLL_REQUEST; *request = mpid_request; MPIDI_Request_complete_norelease_inline(mpid_request); diff --git a/src/mpid/pamid/src/coll/exscan/mpido_iexscan.c b/src/mpid/pamid/src/coll/exscan/mpido_iexscan.c index 1e63087..4d2b90f 100644 --- a/src/mpid/pamid/src/coll/exscan/mpido_iexscan.c +++ b/src/mpid/pamid/src/coll/exscan/mpido_iexscan.c @@ -25,13 +25,13 @@ int MPIDO_Iexscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, MPIR_Comm * comm_ptr, MPID_Request **request) + MPI_Op op, MPIR_Comm * comm_ptr, MPIR_Request **request) { /*if (unlikely((data_size == 0) || (user_selected_type == MPID_COLL_USE_MPICH)))*/ { /* * If the mpich mpir non-blocking collectives are enabled, return without - * first constructing the MPID_Request. This signals to the + * first constructing the MPIR_Request. This signals to the * MPIR_Iexscan_impl() function to invoke the mpich nbc implementation * of MPI_Iexscan(). */ @@ -50,11 +50,11 @@ int MPIDO_Iexscan(const void *sendbuf, void *recvbuf, /* * The blocking exscan has completed - create and complete a - * MPID_Request object so the MPIR_Iexscan_impl() function does not + * MPIR_Request object so the MPIR_Iexscan_impl() function does not * perform an additional iexscan. */ - MPID_Request * mpid_request = MPID_Request_create_inline(); - mpid_request->kind = MPID_COLL_REQUEST; + MPIR_Request * mpid_request = MPID_Request_create_inline(); + mpid_request->kind = MPIR_COLL_REQUEST; *request = mpid_request; MPIDI_Request_complete_norelease_inline(mpid_request); diff --git a/src/mpid/pamid/src/coll/gather/mpido_igather.c b/src/mpid/pamid/src/coll/gather/mpido_igather.c index 63c1b25..1ce2b4f 100644 --- a/src/mpid/pamid/src/coll/gather/mpido_igather.c +++ b/src/mpid/pamid/src/coll/gather/mpido_igather.c @@ -30,13 +30,13 @@ int MPIDO_Igather(const void *sendbuf, MPI_Datatype recvtype, int root, MPIR_Comm *comm_ptr, - MPID_Request **request) + MPIR_Request **request) { /*if (unlikely((data_size == 0) || (user_selected_type == MPID_COLL_USE_MPICH)))*/ { /* * If the mpich mpir non-blocking collectives are enabled, return without - * first constructing the MPID_Request. This signals to the + * first constructing the MPIR_Request. This signals to the * MPIR_Igather_impl() function to invoke the mpich nbc implementation * of MPI_Igather(). */ @@ -57,11 +57,11 @@ int MPIDO_Igather(const void *sendbuf, /* * The blocking gather has completed - create and complete a - * MPID_Request object so the MPIR_Igather_impl() function does not + * MPIR_Request object so the MPIR_Igather_impl() function does not * perform an additional igather. */ - MPID_Request * mpid_request = MPID_Request_create_inline(); - mpid_request->kind = MPID_COLL_REQUEST; + MPIR_Request * mpid_request = MPID_Request_create_inline(); + mpid_request->kind = MPIR_COLL_REQUEST; *request = mpid_request; MPIDI_Request_complete_norelease_inline(mpid_request); diff --git a/src/mpid/pamid/src/coll/gatherv/mpido_igatherv.c b/src/mpid/pamid/src/coll/gatherv/mpido_igatherv.c index 07b5d69..b6be41b 100644 --- a/src/mpid/pamid/src/coll/gatherv/mpido_igatherv.c +++ b/src/mpid/pamid/src/coll/gatherv/mpido_igatherv.c @@ -32,7 +32,7 @@ int MPIDO_Igatherv(const void *sendbuf, MPI_Datatype recvtype, int root, MPIR_Comm * comm_ptr, - MPID_Request **request) + MPIR_Request **request) { TRACE_ERR("Entering MPIDO_Igatherv\n"); @@ -41,7 +41,7 @@ int MPIDO_Igatherv(const void *sendbuf, { /* * If the mpich mpir non-blocking collectives are enabled, return without - * first constructing the MPID_Request. This signals to the + * first constructing the MPIR_Request. This signals to the * MPIR_Igatherv_impl() function to invoke the mpich nbc implementation * of MPI_Igatherv(). */ @@ -62,11 +62,11 @@ int MPIDO_Igatherv(const void *sendbuf, /* * The blocking gather has completed - create and complete a - * MPID_Request object so the MPIR_Igatherv_impl() function does not + * MPIR_Request object so the MPIR_Igatherv_impl() function does not * perform an additional igatherv. */ - MPID_Request * mpid_request = MPID_Request_create_inline(); - mpid_request->kind = MPID_COLL_REQUEST; + MPIR_Request * mpid_request = MPID_Request_create_inline(); + mpid_request->kind = MPIR_COLL_REQUEST; *request = mpid_request; MPIDI_Request_complete_norelease_inline(mpid_request); diff --git a/src/mpid/pamid/src/coll/ired_scat/mpido_ired_scat.c b/src/mpid/pamid/src/coll/ired_scat/mpido_ired_scat.c index 00cd85a..3e841bc 100644 --- a/src/mpid/pamid/src/coll/ired_scat/mpido_ired_scat.c +++ b/src/mpid/pamid/src/coll/ired_scat/mpido_ired_scat.c @@ -29,7 +29,7 @@ int MPIDO_Ireduce_scatter(const void *sendbuf, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, - MPID_Request **request) + MPIR_Request **request) { TRACE_ERR("Entering MPIDO_Ireduce_scatter\n"); @@ -37,7 +37,7 @@ int MPIDO_Ireduce_scatter(const void *sendbuf, { /* * If the mpich mpir non-blocking collectives are enabled, return without - * first constructing the MPID_Request. This signals to the + * first constructing the MPIR_Request. This signals to the * MPIR_Ireduce_scatter_impl() function to invoke the mpich nbc * implementation of MPI_Ireduce_scatter(). */ @@ -57,11 +57,11 @@ int MPIDO_Ireduce_scatter(const void *sendbuf, /* * The blocking gather has completed - create and complete a - * MPID_Request object so the MPIR_Ireduce_scatter_impl() function + * MPIR_Request object so the MPIR_Ireduce_scatter_impl() function * does not perform an additional ireduce_scatter. */ - MPID_Request * mpid_request = MPID_Request_create_inline(); - mpid_request->kind = MPID_COLL_REQUEST; + MPIR_Request * mpid_request = MPID_Request_create_inline(); + mpid_request->kind = MPIR_COLL_REQUEST; *request = mpid_request; MPIDI_Request_complete_norelease_inline(mpid_request); diff --git a/src/mpid/pamid/src/coll/ired_scat_block/mpido_ired_scat_block.c b/src/mpid/pamid/src/coll/ired_scat_block/mpido_ired_scat_block.c index 7bd5f41..8027664 100644 --- a/src/mpid/pamid/src/coll/ired_scat_block/mpido_ired_scat_block.c +++ b/src/mpid/pamid/src/coll/ired_scat_block/mpido_ired_scat_block.c @@ -29,7 +29,7 @@ int MPIDO_Ireduce_scatter_block(const void *sendbuf, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, - MPID_Request **request) + MPIR_Request **request) { TRACE_ERR("Entering MPIDO_Ireduce_scatter_block\n"); @@ -37,7 +37,7 @@ int MPIDO_Ireduce_scatter_block(const void *sendbuf, { /* * If the mpich mpir non-blocking collectives are enabled, return without - * first constructing the MPID_Request. This signals to the + * first constructing the MPIR_Request. This signals to the * MPIR_Ireduce_scatter_block_impl() function to invoke the mpich nbc * implementation of MPI_Ireduce_scatter_block(). */ @@ -57,11 +57,11 @@ int MPIDO_Ireduce_scatter_block(const void *sendbuf, /* * The blocking gather has completed - create and complete a - * MPID_Request object so the MPIR_Ireduce_scatter_block_impl() function + * MPIR_Request object so the MPIR_Ireduce_scatter_block_impl() function * does not perform an additional ireduce_scatter_block. */ - MPID_Request * mpid_request = MPID_Request_create_inline(); - mpid_request->kind = MPID_COLL_REQUEST; + MPIR_Request * mpid_request = MPID_Request_create_inline(); + mpid_request->kind = MPIR_COLL_REQUEST; *request = mpid_request; MPIDI_Request_complete_norelease_inline(mpid_request); diff --git a/src/mpid/pamid/src/coll/reduce/mpido_ireduce.c b/src/mpid/pamid/src/coll/reduce/mpido_ireduce.c index ba2fcbf..a610b77 100644 --- a/src/mpid/pamid/src/coll/reduce/mpido_ireduce.c +++ b/src/mpid/pamid/src/coll/reduce/mpido_ireduce.c @@ -30,14 +30,14 @@ int MPIDO_Ireduce(const void *sendbuf, MPI_Op op, int root, MPIR_Comm *comm_ptr, - MPID_Request **request) + MPIR_Request **request) { /*if (unlikely((data_size == 0) || (user_selected_type == MPID_COLL_USE_MPICH)))*/ { /* * If the mpich mpir non-blocking collectives are enabled, return without - * first constructing the MPID_Request. This signals to the + * first constructing the MPIR_Request. This signals to the * MPIR_Ireduce_impl() function to invoke the mpich nbc * implementation of MPI_Ireduce(). */ @@ -57,11 +57,11 @@ int MPIDO_Ireduce(const void *sendbuf, /* * The blocking reduce has completed - create and complete a - * MPID_Request object so the MPIR_Ireduce_impl() function + * MPIR_Request object so the MPIR_Ireduce_impl() function * does not perform an additional ireduce. */ - MPID_Request * mpid_request = MPID_Request_create_inline(); - mpid_request->kind = MPID_COLL_REQUEST; + MPIR_Request * mpid_request = MPID_Request_create_inline(); + mpid_request->kind = MPIR_COLL_REQUEST; *request = mpid_request; MPIDI_Request_complete_norelease_inline(mpid_request); diff --git a/src/mpid/pamid/src/coll/scan/mpido_scan.c b/src/mpid/pamid/src/coll/scan/mpido_scan.c index 6de0160..efb17eb 100644 --- a/src/mpid/pamid/src/coll/scan/mpido_scan.c +++ b/src/mpid/pamid/src/coll/scan/mpido_scan.c @@ -44,13 +44,13 @@ int MPIDO_Scan(const void *sendbuf, void *recvbuf, int MPIDO_Iscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, MPIR_Comm * comm_ptr, MPID_Request **request) + MPI_Op op, MPIR_Comm * comm_ptr, MPIR_Request **request) { /*if (unlikely((data_size == 0) || (user_selected_type == MPID_COLL_USE_MPICH)))*/ { /* * If the mpich mpir non-blocking collectives are enabled, return without - * first constructing the MPID_Request. This signals to the + * first constructing the MPIR_Request. This signals to the * MPIR_Iscan_impl() function to invoke the mpich nbc * implementation of MPI_Iscan(). */ @@ -70,11 +70,11 @@ int MPIDO_Iscan(const void *sendbuf, void *recvbuf, /* * The blocking scan has completed - create and complete a - * MPID_Request object so the MPIR_Iscan_impl() function + * MPIR_Request object so the MPIR_Iscan_impl() function * does not perform an additional iscan. */ - MPID_Request * mpid_request = MPID_Request_create_inline(); - mpid_request->kind = MPID_COLL_REQUEST; + MPIR_Request * mpid_request = MPID_Request_create_inline(); + mpid_request->kind = MPIR_COLL_REQUEST; *request = mpid_request; MPIDI_Request_complete_norelease_inline(mpid_request); diff --git a/src/mpid/pamid/src/coll/scatter/mpido_iscatter.c b/src/mpid/pamid/src/coll/scatter/mpido_iscatter.c index 6dd302d..98f12f9 100644 --- a/src/mpid/pamid/src/coll/scatter/mpido_iscatter.c +++ b/src/mpid/pamid/src/coll/scatter/mpido_iscatter.c @@ -32,13 +32,13 @@ int MPIDO_Iscatter(const void *sendbuf, MPI_Datatype recvtype, int root, MPIR_Comm *comm_ptr, - MPID_Request **request) + MPIR_Request **request) { /*if (unlikely((data_size == 0) || (user_selected_type == MPID_COLL_USE_MPICH)))*/ { /* * If the mpich mpir non-blocking collectives are enabled, return without - * first constructing the MPID_Request. This signals to the + * first constructing the MPIR_Request. This signals to the * MPIR_Iscatter_impl() function to invoke the mpich nbc * implementation of MPI_Iscatter(). */ @@ -59,11 +59,11 @@ int MPIDO_Iscatter(const void *sendbuf, /* * The blocking scatter has completed - create and complete a - * MPID_Request object so the MPIR_Iscatter_impl() function + * MPIR_Request object so the MPIR_Iscatter_impl() function * does not perform an additional iscatter. */ - MPID_Request * mpid_request = MPID_Request_create_inline(); - mpid_request->kind = MPID_COLL_REQUEST; + MPIR_Request * mpid_request = MPID_Request_create_inline(); + mpid_request->kind = MPIR_COLL_REQUEST; *request = mpid_request; MPIDI_Request_complete_norelease_inline(mpid_request); diff --git a/src/mpid/pamid/src/coll/scatterv/mpido_iscatterv.c b/src/mpid/pamid/src/coll/scatterv/mpido_iscatterv.c index 47e3781..203b68b 100644 --- a/src/mpid/pamid/src/coll/scatterv/mpido_iscatterv.c +++ b/src/mpid/pamid/src/coll/scatterv/mpido_iscatterv.c @@ -31,13 +31,13 @@ int MPIDO_Iscatterv(const void *sendbuf, MPI_Datatype recvtype, int root, MPIR_Comm *comm_ptr, - MPID_Request **request) + MPIR_Request **request) { /*if (unlikely((data_size == 0) || (user_selected_type == MPID_COLL_USE_MPICH)))*/ { /* * If the mpich mpir non-blocking collectives are enabled, return without - * first constructing the MPID_Request. This signals to the + * first constructing the MPIR_Request. This signals to the * MPIR_Iscatterv_impl() function to invoke the mpich nbc * implementation of MPI_Iscatterv(). */ @@ -58,11 +58,11 @@ int MPIDO_Iscatterv(const void *sendbuf, /* * The blocking scatterv has completed - create and complete a - * MPID_Request object so the MPIR_Iscatterv_impl() function + * MPIR_Request object so the MPIR_Iscatterv_impl() function * does not perform an additional iscatterv. */ - MPID_Request * mpid_request = MPID_Request_create_inline(); - mpid_request->kind = MPID_COLL_REQUEST; + MPIR_Request * mpid_request = MPID_Request_create_inline(); + mpid_request->kind = MPIR_COLL_REQUEST; *request = mpid_request; MPIDI_Request_complete_norelease_inline(mpid_request); diff --git a/src/mpid/pamid/src/misc/mpid_unimpl.c b/src/mpid/pamid/src/misc/mpid_unimpl.c index 82d09d8..5e12cc3 100644 --- a/src/mpid/pamid/src/misc/mpid_unimpl.c +++ b/src/mpid/pamid/src/misc/mpid_unimpl.c @@ -103,7 +103,7 @@ int MPID_Comm_AS_enabled(MPIR_Comm *comm_ptr) return 1; } -int MPID_Request_is_anysource(MPID_Request *request_ptr) +int MPID_Request_is_anysource(MPIR_Request *request_ptr) { /* This function must not abort in the default case since it is used in many * MPI functions. As long as the device does not implement FT, it doesn't diff --git a/src/mpid/pamid/src/mpid_improbe.c b/src/mpid/pamid/src/mpid_improbe.c index b97f15c..eba7b17 100644 --- a/src/mpid/pamid/src/mpid_improbe.c +++ b/src/mpid/pamid/src/mpid_improbe.c @@ -7,11 +7,11 @@ #include "mpidimpl.h" int MPID_Improbe(int source, int tag, MPIR_Comm *comm, int context_offset, - int *flag, MPID_Request **message, MPI_Status *status) + int *flag, MPIR_Request **message, MPI_Status *status) { const int context = comm->recvcontext_id + context_offset; int foundp = FALSE; - MPID_Request * rreq = NULL; + MPIR_Request * rreq = NULL; if (source == MPI_PROC_NULL) { diff --git a/src/mpid/pamid/src/mpid_imrecv.c b/src/mpid/pamid/src/mpid_imrecv.c index d1d7c85..a7f9242 100644 --- a/src/mpid/pamid/src/mpid_imrecv.c +++ b/src/mpid/pamid/src/mpid_imrecv.c @@ -7,11 +7,11 @@ #include "mpidimpl.h" int MPID_Imrecv(void *buf, int count, MPI_Datatype datatype, - MPID_Request *message, MPID_Request **rreqp) + MPIR_Request *message, MPIR_Request **rreqp) { int mpi_errno = MPI_SUCCESS; - MPID_Request * rreq; + MPIR_Request * rreq; /* ---------------------------------------- */ /* NULL rank means empty request */ diff --git a/src/mpid/pamid/src/mpid_mprobe.c b/src/mpid/pamid/src/mpid_mprobe.c index 995259b..740c6f9 100644 --- a/src/mpid/pamid/src/mpid_mprobe.c +++ b/src/mpid/pamid/src/mpid_mprobe.c @@ -7,11 +7,11 @@ #include "mpidimpl.h" int MPID_Mprobe(int source, int tag, MPIR_Comm *comm, int context_offset, - MPID_Request **message, MPI_Status *status) + MPIR_Request **message, MPI_Status *status) { const int context = comm->recvcontext_id + context_offset; int foundp; - MPID_Request * rreq = NULL; + MPIR_Request * rreq = NULL; if (source == MPI_PROC_NULL) { diff --git a/src/mpid/pamid/src/mpid_mrecv.c b/src/mpid/pamid/src/mpid_mrecv.c index fdd2b70..a6cde3f 100644 --- a/src/mpid/pamid/src/mpid_mrecv.c +++ b/src/mpid/pamid/src/mpid_mrecv.c @@ -7,12 +7,12 @@ #include "mpidimpl.h" int MPID_Mrecv(void *buf, int count, MPI_Datatype datatype, - MPID_Request *message, MPI_Status *status) + MPIR_Request *message, MPI_Status *status) { int mpi_errno = MPI_SUCCESS; MPI_Request req_handle; /* dummy for MPIR_Request_complete */ int active_flag; /* dummy for MPIR_Request_complete */ - MPID_Request *rreq = NULL; + MPIR_Request *rreq = NULL; if (message == NULL) { /* treat as though MPI_MESSAGE_NO_PROC was passed */ @@ -26,7 +26,7 @@ int MPID_Mrecv(void *buf, int count, MPI_Datatype datatype, * and eligible for immediate completion. */ mpi_errno = MPID_Imrecv(buf, count, datatype, message, &rreq); - MPID_PROGRESS_WAIT_WHILE(!MPID_Request_is_complete(rreq)); + MPID_PROGRESS_WAIT_WHILE(!MPIR_Request_is_complete(rreq)); mpi_errno = MPIR_Request_complete(&req_handle, rreq, status, &active_flag); return mpi_errno; diff --git a/src/mpid/pamid/src/mpid_recvq.c b/src/mpid/pamid/src/mpid_recvq.c index ca88e4c..e478cbb 100644 --- a/src/mpid/pamid/src/mpid_recvq.c +++ b/src/mpid/pamid/src/mpid_recvq.c @@ -38,9 +38,9 @@ struct MPIDI_Recvq_t MPIDI_Recvq; #ifdef HAVE_DEBUGGER_SUPPORT -struct MPID_Request ** const MPID_Recvq_posted_head_ptr = +struct MPIR_Request ** const MPID_Recvq_posted_head_ptr = &MPIDI_Recvq.posted_head; -struct MPID_Request ** const MPID_Recvq_unexpected_head_ptr = +struct MPIR_Request ** const MPID_Recvq_unexpected_head_ptr = &MPIDI_Recvq.unexpected_head; #endif /* HAVE_DEBUGGER_SUPPORT */ @@ -82,7 +82,7 @@ MPIDI_Recvq_finalize() int MPIDI_Recvq_FU(int source, int tag, int context_id, MPI_Status * status) { - MPID_Request * rreq; + MPIR_Request * rreq; int found = FALSE; void * it; #ifdef USE_STATISTICS @@ -311,13 +311,13 @@ MPIDI_Recvq_FU(int source, int tag, int context_id, MPI_Status * status) * \param[in] context_id Find by Context ID (communicator) * \return The matching UE request or NULL */ -MPID_Request * +MPIR_Request * MPIDI_Recvq_FDUR(MPI_Request req, int source, int tag, int context_id) { - MPID_Request * prev_rreq = NULL; /* previous request in queue */ - MPID_Request * cur_rreq = NULL; /* current request in queue */ - MPID_Request * matching_cur_rreq = NULL; /* matching request in queue */ - MPID_Request * matching_prev_rreq = NULL; /* previous in queue to match */ + MPIR_Request * prev_rreq = NULL; /* previous request in queue */ + MPIR_Request * cur_rreq = NULL; /* current request in queue */ + MPIR_Request * matching_cur_rreq = NULL; /* matching request in queue */ + MPIR_Request * matching_prev_rreq = NULL; /* previous in queue to match */ void * it = NULL; #ifdef USE_STATISTICS unsigned search_length = 0; @@ -403,16 +403,16 @@ MPIDI_Recvq_FDUR(MPI_Request req, int source, int tag, int context_id) * \return The matching UE request or the new posted request */ #ifndef OUT_OF_ORDER_HANDLING -MPID_Request * +MPIR_Request * MPIDI_Recvq_FDU(int source, int tag, int context_id, int * foundp) #else -MPID_Request * +MPIR_Request * MPIDI_Recvq_FDU(int source, pami_task_t pami_source, int tag, int context_id, int * foundp) #endif { int found = FALSE; - MPID_Request * rreq = NULL; - MPID_Request * prev_rreq; + MPIR_Request * rreq = NULL; + MPIR_Request * prev_rreq; void * it; #ifdef USE_STATISTICS unsigned search_length = 0; @@ -631,10 +631,10 @@ MPIDI_Recvq_FDU(int source, pami_task_t pami_source, int tag, int context_id, in * \return The matching posted request or NULL */ int -MPIDI_Recvq_FDPR(MPID_Request * req) +MPIDI_Recvq_FDPR(MPIR_Request * req) { - MPID_Request * cur_rreq = NULL; - MPID_Request * prev_rreq = NULL; + MPIR_Request * cur_rreq = NULL; + MPIR_Request * prev_rreq = NULL; int found = FALSE; #ifdef USE_STATISTICS unsigned search_length = 0; @@ -692,14 +692,14 @@ MPIDI_Recvq_FDPR(MPID_Request * req) * \return The matching posted request or the new UE request */ #ifndef OUT_OF_ORDER_HANDLING -MPID_Request * -MPIDI_Recvq_FDP_or_AEU(MPID_Request *newreq, int source, int tag, int context_id, int * foundp) +MPIR_Request * +MPIDI_Recvq_FDP_or_AEU(MPIR_Request *newreq, int source, int tag, int context_id, int * foundp) #else -MPID_Request * -MPIDI_Recvq_FDP_or_AEU(MPID_Request *newreq, int source, pami_task_t pami_source, int tag, int context_id, int msg_seqno, int * foundp) +MPIR_Request * +MPIDI_Recvq_FDP_or_AEU(MPIR_Request *newreq, int source, pami_task_t pami_source, int tag, int context_id, int msg_seqno, int * foundp) #endif { - MPID_Request * rreq; + MPIR_Request * rreq; int found = FALSE; #ifndef OUT_OF_ORDER_HANDLING @@ -730,17 +730,17 @@ MPIDI_Recvq_FDP_or_AEU(MPID_Request *newreq, int source, pami_task_t pami_source * \return The matching posted request or the new UE request */ #ifndef OUT_OF_ORDER_HANDLING -MPID_Request * -MPIDI_Recvq_AEU(MPID_Request *newreq, int source, int tag, int context_id) +MPIR_Request * +MPIDI_Recvq_AEU(MPIR_Request *newreq, int source, int tag, int context_id) #else -MPID_Request * -MPIDI_Recvq_AEU(MPID_Request *newreq, int source, pami_task_t pami_source, int tag, int context_id, int msg_seqno) +MPIR_Request * +MPIDI_Recvq_AEU(MPIR_Request *newreq, int source, pami_task_t pami_source, int tag, int context_id, int msg_seqno) #endif { /* A matching request was not found in the posted queue, so we need to allocate a new request and add it to the unexpected queue */ - MPID_Request *rreq; + MPIR_Request *rreq; rreq = newreq; rreq->kind = MPIR_REQUEST_RECV; TRACE_MEMSET_R(pami_source,msg_seqno,recv_status); @@ -756,7 +756,7 @@ MPIDI_Recvq_AEU(MPID_Request *newreq, int source, pami_task_t pami_source, int t #endif MPIDI_Recvq_append(MPIDI_Recvq.unexpected, rreq); #else /* OUT_OF_ORDER_HANDLING */ - MPID_Request *q; + MPIR_Request *q; MPIDI_In_cntr_t *in_cntr; int insert, i; @@ -822,7 +822,7 @@ MPIDI_Recvq_DumpQueues(int verbose) if(verbose < MPIDI_VERBOSE_SUMMARY_ALL) return; - MPID_Request * rreq = MPIDI_Recvq.posted_head; + MPIR_Request * rreq = MPIDI_Recvq.posted_head; unsigned i=0, numposted=0, numue=0; unsigned postedbytes=0, uebytes=0; @@ -884,9 +884,9 @@ MPIDI_Recvq_DumpQueues(int verbose) * Insert a request in the OutOfOrderList, make sure this list is * arranged in the ascending order. */ -void MPIDI_Recvq_enqueue_ool(pami_task_t src, MPID_Request *req) +void MPIDI_Recvq_enqueue_ool(pami_task_t src, MPIR_Request *req) { - MPID_Request *q; + MPIR_Request *q; void *head; int insert,i; MPIDI_In_cntr_t *in_cntr; @@ -916,7 +916,7 @@ void MPIDI_Recvq_enqueue_ool(pami_task_t src, MPID_Request *req) in_cntr->OutOfOrderList=req; } } else { - MPIDI_Recvq_insert_ool((MPID_Request *)q->mpid.nextR,req); + MPIDI_Recvq_insert_ool((MPIR_Request *)q->mpid.nextR,req); } } } else { /* empty list */ @@ -928,17 +928,17 @@ void MPIDI_Recvq_enqueue_ool(pami_task_t src, MPID_Request *req) #if (MPIDI_STATISTICS) MPID_NSTAT(mpid_statp->unorderedMsgs); #endif -} /* void MPIDI_Recvq_insert_ool(pami_task_t src, MPID_Request *N) */ +} /* void MPIDI_Recvq_insert_ool(pami_task_t src, MPIR_Request *N) */ /** * MPIDI_Recvq_insert_ool: place e between q and q->prevR * */ -void MPIDI_Recvq_insert_ool(MPID_Request *q,MPID_Request *e) +void MPIDI_Recvq_insert_ool(MPIR_Request *q,MPIR_Request *e) { (e)->mpid.prevR = (q)->mpid.prevR; - ((MPID_Request *)((q)->mpid.prevR))->mpid.nextR = (e); + ((MPIR_Request *)((q)->mpid.prevR))->mpid.nextR = (e); (e)->mpid.nextR = (q); (q)->mpid.prevR = (e); } diff --git a/src/mpid/pamid/src/mpid_recvq.h b/src/mpid/pamid/src/mpid_recvq.h index 5e88363..5d1864d 100644 --- a/src/mpid/pamid/src/mpid_recvq.h +++ b/src/mpid/pamid/src/mpid_recvq.h @@ -25,10 +25,10 @@ struct MPIDI_Recvq_t { - struct MPID_Request * posted_head; /**< \brief The Head of the Posted queue */ - struct MPID_Request * posted_tail; /**< \brief The Tail of the Posted queue */ - struct MPID_Request * unexpected_head; /**< \brief The Head of the Unexpected queue */ - struct MPID_Request * unexpected_tail; /**< \brief The Tail of the Unexpected queue */ + struct MPIR_Request * posted_head; /**< \brief The Head of the Posted queue */ + struct MPIR_Request * posted_tail; /**< \brief The Tail of the Posted queue */ + struct MPIR_Request * unexpected_head; /**< \brief The Head of the Unexpected queue */ + struct MPIR_Request * unexpected_tail; /**< \brief The Tail of the Unexpected queue */ }; extern struct MPIDI_Recvq_t MPIDI_Recvq; @@ -154,14 +154,14 @@ MPIDI_Recvq_FU_r(int source, int tag, int context, MPI_Status * status) * \return The matching UE request or the new posted request */ #ifndef OUT_OF_ORDER_HANDLING -static inline MPID_Request * -MPIDI_Recvq_FDU_or_AEP(MPID_Request *newreq, int source, int tag, int context_id, int * foundp) +static inline MPIR_Request * +MPIDI_Recvq_FDU_or_AEP(MPIR_Request *newreq, int source, int tag, int context_id, int * foundp) #else -static inline MPID_Request * -MPIDI_Recvq_FDU_or_AEP(MPID_Request *newreq, int source, pami_task_t pami_source, int tag, int context_id, int * foundp) +static inline MPIR_Request * +MPIDI_Recvq_FDU_or_AEP(MPIR_Request *newreq, int source, pami_task_t pami_source, int tag, int context_id, int * foundp) #endif { - MPID_Request * rreq = NULL; + MPIR_Request * rreq = NULL; /* We have unexpected messages, so search unexpected queue */ #ifdef QUEUE_BINARY_SEARCH_SUPPORT if(MPIDI_Process.queue_binary_search_support_on) @@ -241,7 +241,7 @@ MPIDI_Token_cntr_t *MPIDI_Token_cntr; typedef struct MPIDI_In_cntr { uint n_OutOfOrderMsgs:16; /* the number of out-of-order messages received */ uint nMsgs; /* the number of received messages */ - MPID_Request *OutOfOrderList; /* link list of out-of-order messages */ + MPIR_Request *OutOfOrderList; /* link list of out-of-order messages */ } MPIDI_In_cntr_t; /** @@ -268,15 +268,15 @@ MPIDI_Out_cntr_t *MPIDI_Out_cntr; * \return The matching posted request or the new UE request */ #ifndef OUT_OF_ORDER_HANDLING -static inline MPID_Request * +static inline MPIR_Request * MPIDI_Recvq_FDP(size_t source, size_t tag, size_t context_id) #else -static inline MPID_Request * +static inline MPIR_Request * MPIDI_Recvq_FDP(size_t source, pami_task_t pami_source, int tag, int context_id, int msg_seqno) #endif { - MPID_Request * rreq; - MPID_Request * prev_rreq = NULL; + MPIR_Request * rreq; + MPIR_Request * prev_rreq = NULL; #ifdef USE_STATISTICS unsigned search_length = 0; #endif @@ -413,8 +413,8 @@ MPIDI_Recvq_FDP(size_t source, pami_task_t pami_source, int tag, int context_id, } else if (in_cntr->n_OutOfOrderMsgs > 0) { \ in_cntr->OutOfOrderList=req->mpid.nextR; \ /* remove req from out of order list */ \ - ((MPID_Request *)(req)->mpid.prevR)->mpid.nextR = (req)->mpid.nextR; \ - ((MPID_Request *)(req)->mpid.nextR)->mpid.prevR = (req)->mpid.prevR; \ + ((MPIR_Request *)(req)->mpid.prevR)->mpid.nextR = (req)->mpid.nextR; \ + ((MPIR_Request *)(req)->mpid.nextR)->mpid.prevR = (req)->mpid.prevR; \ (req)->mpid.nextR=NULL; \ (req)->mpid.prevR=NULL; \ } \ diff --git a/src/mpid/pamid/src/mpid_request.c b/src/mpid/pamid/src/mpid_request.c index d456689..1102cda 100644 --- a/src/mpid/pamid/src/mpid_request.c +++ b/src/mpid/pamid/src/mpid_request.c @@ -39,11 +39,11 @@ /* these are referenced by src/mpi/pt2pt/wait.c in PMPI_Wait! */ -MPID_Request MPID_Request_direct[MPIR_REQUEST_PREALLOC] __attribute__((__aligned__(64))); -MPIU_Object_alloc_t MPID_Request_mem = +MPIR_Request MPIR_Request_direct[MPIR_REQUEST_PREALLOC] __attribute__((__aligned__(64))); +MPIU_Object_alloc_t MPIR_Request_mem = { - 0, 0, 0, 0, MPIR_REQUEST, sizeof(MPID_Request), - MPID_Request_direct, + 0, 0, 0, 0, MPIR_REQUEST, sizeof(MPIR_Request), + MPIR_Request_direct, MPIR_REQUEST_PREALLOC }; @@ -52,14 +52,14 @@ MPIU_Object_alloc_t MPID_Request_mem = void MPIDI_Request_allocate_pool() { int i; - MPID_Request *prev, *cur; + MPIR_Request *prev, *cur; /* batch allocate a linked list of requests */ MPIU_THREAD_CS_ENTER(HANDLEALLOC,); - prev = MPIU_Handle_obj_alloc_unsafe(&MPID_Request_mem); + prev = MPIU_Handle_obj_alloc_unsafe(&MPIR_Request_mem); MPID_assert(prev != NULL); prev->mpid.next = NULL; for (i = 1; i < MPIR_REQUEST_TLS_MAX; ++i) { - cur = MPIU_Handle_obj_alloc_unsafe(&MPID_Request_mem); + cur = MPIU_Handle_obj_alloc_unsafe(&MPIR_Request_mem); MPID_assert(cur != NULL); cur->mpid.next = prev; prev = cur; @@ -72,7 +72,7 @@ void MPIDI_Request_allocate_pool() void -MPIDI_Request_uncomplete(MPID_Request *req) +MPIDI_Request_uncomplete(MPIR_Request *req) { int count; MPIU_Object_add_ref(req); @@ -81,7 +81,7 @@ MPIDI_Request_uncomplete(MPID_Request *req) void -MPID_Request_set_completed(MPID_Request *req) +MPID_Request_set_completed(MPIR_Request *req) { MPIR_cc_set(&req->cc, 0); MPIDI_Progress_signal(); diff --git a/src/mpid/pamid/src/mpid_request.h b/src/mpid/pamid/src/mpid_request.h index 6a785d2..04bafa4 100644 --- a/src/mpid/pamid/src/mpid_request.h +++ b/src/mpid/pamid/src/mpid_request.h @@ -37,13 +37,13 @@ #define MPID_Request_discard MPID_Request_discard_inline -extern MPIU_Object_alloc_t MPID_Request_mem; +extern MPIU_Object_alloc_t MPIR_Request_mem; #if TOKEN_FLOW_CONTROL extern void MPIDI_mm_free(void *,size_t); #endif typedef enum {mpiuMalloc=1,mpidiBufMM} MPIDI_mallocType; -void MPIDI_Request_uncomplete(MPID_Request *req); +void MPIDI_Request_uncomplete(MPIR_Request *req); #if (MPIU_HANDLE_ALLOCATION_METHOD == MPIU_HANDLE_ALLOCATION_THREAD_LOCAL) && defined(__BGQ__) void MPIDI_Request_allocate_pool(); #endif @@ -77,7 +77,7 @@ void MPIDI_Request_allocate_pool(); (_req)->mpid.envelope.msginfo.MPIctxt=(_ctxtid); \ }) -#define MPIDI_Msginfo_getPeerRequest(_msg) ({ MPID_Request *req=NULL; MPID_Request_get_ptr((_msg)->req, req); MPID_assert(req != NULL); req; }) +#define MPIDI_Msginfo_getPeerRequest(_msg) ({ MPIR_Request *req=NULL; MPIR_Request_get_ptr((_msg)->req, req); MPID_assert(req != NULL); req; }) #define MPIDI_Msginfo_getPeerRequestH(_msg) ({ (_msg)->req; }) #define MPIDI_Msginfo_cpyPeerRequestH(_dst,_src) ({ (_dst)->req = (_src)->req; MPI_SUCCESS; }) #define MPIDI_Request_getPeerRequest(_req) MPIDI_Msginfo_getPeerRequest(&(_req)->mpid.envelope.msginfo) @@ -118,7 +118,7 @@ void MPIDI_Request_allocate_pool(); } \ else \ { \ - MPIU_Handle_obj_free(&MPID_Request_mem, req); \ + MPIU_Handle_obj_free(&MPIR_Request_mem, req); \ } \ }) @@ -126,12 +126,12 @@ void MPIDI_Request_allocate_pool(); # define MPIDI_Request_tls_alloc(req) \ ({ \ - (req) = MPIU_Handle_obj_alloc(&MPID_Request_mem); \ + (req) = MPIU_Handle_obj_alloc(&MPIR_Request_mem); \ if (req == NULL) \ MPID_Abort(NULL, MPI_ERR_NO_SPACE, -1, "Cannot allocate Request"); \ }) -# define MPIDI_Request_tls_free(req) MPIU_Handle_obj_free(&MPID_Request_mem, (req)) +# define MPIDI_Request_tls_free(req) MPIU_Handle_obj_free(&MPIR_Request_mem, (req)) #endif @@ -145,10 +145,10 @@ void MPIDI_Request_allocate_pool(); * \brief Create a very generic request * \note This should only ever be called by more specific allocators */ -static inline MPID_Request * +static inline MPIR_Request * MPIDI_Request_create_basic() { - MPID_Request * req = NULL; + MPIR_Request * req = NULL; MPIDI_Request_tls_alloc(req); MPID_assert(req != NULL); @@ -171,10 +171,10 @@ MPIDI_Request_create_basic() /** * \brief Create new request without initalizing */ -static inline MPID_Request * +static inline MPIR_Request * MPIDI_Request_create2_fast() { - MPID_Request * req; + MPIR_Request * req; req = MPIDI_Request_create_basic(); MPIU_Object_set_ref(req, 2); @@ -186,7 +186,7 @@ MPIDI_Request_create2_fast() * \brief Create and initialize a new request */ static inline void -MPIDI_Request_initialize(MPID_Request * req) +MPIDI_Request_initialize(MPIR_Request * req) { req->greq_fns = NULL; @@ -217,10 +217,10 @@ MPIDI_Request_initialize(MPID_Request * req) /** * \brief Create and initialize a new request */ -static inline MPID_Request * +static inline MPIR_Request * MPID_Request_create_inline() { - MPID_Request * req; + MPIR_Request * req; req = MPIDI_Request_create_basic(); MPIU_Object_set_ref(req, 1); @@ -234,20 +234,20 @@ MPID_Request_create_inline() /** * \brief Create and initialize a new request */ -static inline MPID_Request * +static inline MPIR_Request * MPIDI_Request_create2() { - MPID_Request * req; + MPIR_Request * req; req = MPID_Request_create(); MPIU_Object_set_ref(req, 2); return req; } -static inline MPID_Request * +static inline MPIR_Request * MPIDI_Request_create1() { - MPID_Request * req; + MPIR_Request * req; req = MPID_Request_create(); MPIU_Object_set_ref(req, 1); @@ -268,7 +268,7 @@ MPIDI_Request_create1() static inline void -MPID_Request_release_inline(MPID_Request *req) +MPID_Request_release_inline(MPIR_Request *req) { int count; MPID_assert(HANDLE_GET_MPI_KIND(req->handle) == MPIR_REQUEST); @@ -301,7 +301,7 @@ MPID_Request_release_inline(MPID_Request *req) /* This request was never used, at most had uebuf allocated. */ static inline void -MPID_Request_discard_inline(MPID_Request *req) +MPID_Request_discard_inline(MPIR_Request *req) { if (req->mpid.uebuf_malloc == mpiuMalloc) { MPL_free(req->mpid.uebuf); @@ -320,7 +320,7 @@ MPID_Request_discard_inline(MPID_Request *req) MPIDI_Request_complete_norelease_inline(req_) static inline void -MPIDI_Request_complete_inline(MPID_Request *req) +MPIDI_Request_complete_inline(MPIR_Request *req) { int count; MPIR_cc_decr(req->cc_ptr, &count); @@ -335,7 +335,7 @@ MPIDI_Request_complete_inline(MPID_Request *req) static inline void -MPIDI_Request_complete_norelease_inline(MPID_Request *req) +MPIDI_Request_complete_norelease_inline(MPIR_Request *req) { int count; MPIR_cc_decr(req->cc_ptr, &count); diff --git a/src/mpid/pamid/src/onesided/mpid_1s.c b/src/mpid/pamid/src/onesided/mpid_1s.c index 65131f6..c7e11f8 100644 --- a/src/mpid/pamid/src/onesided/mpid_1s.c +++ b/src/mpid/pamid/src/onesided/mpid_1s.c @@ -55,7 +55,7 @@ MPIDI_Win_DoneCB(pami_context_t context, ((req->type >= MPIDI_WIN_REQUEST_COMPARE_AND_SWAP) && (req->origin.completed == req->origin.dt.num_contig))) { - MPID_Request * req_handle = req->req_handle; + MPIR_Request * req_handle = req->req_handle; if (req->buffer_free) { MPL_free(req->buffer); diff --git a/src/mpid/pamid/src/onesided/mpid_win_get_accumulate.c b/src/mpid/pamid/src/onesided/mpid_win_get_accumulate.c index 6e14005..bd5cbf3 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_get_accumulate.c +++ b/src/mpid/pamid/src/onesided/mpid_win_get_accumulate.c @@ -175,7 +175,7 @@ MPIDI_Win_GetAccDoneCB(pami_context_t context, if (req->origin.completed == req->target.dt.num_contig + 1) { - MPID_Request * req_handle = req->req_handle; + MPIR_Request * req_handle = req->req_handle; if (req->buffer_free) { MPL_free(req->buffer); diff --git a/src/mpid/pamid/src/onesided/mpid_win_reqops.c b/src/mpid/pamid/src/onesided/mpid_win_reqops.c index 859c1a6..0807f53 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_reqops.c +++ b/src/mpid/pamid/src/onesided/mpid_win_reqops.c @@ -48,7 +48,7 @@ MPID_Rput(const void *origin_addr, int target_count, MPI_Datatype target_datatype, MPIR_Win *win, - MPID_Request **request) + MPIR_Request **request) { int mpi_errno = MPI_SUCCESS; @@ -58,9 +58,9 @@ MPID_Rput(const void *origin_addr, return mpi_errno, "**rmasync"); } - MPID_Request *rreq = MPIDI_Request_create1(); + MPIR_Request *rreq = MPIDI_Request_create1(); *request = rreq; - rreq->kind = MPID_WIN_REQUEST; + rreq->kind = MPIR_WIN_REQUEST; win->mpid.rreq = rreq; win->mpid.request_based = 1; @@ -100,7 +100,7 @@ MPID_Rget(void *origin_addr, int target_count, MPI_Datatype target_datatype, MPIR_Win *win, - MPID_Request **request) + MPIR_Request **request) { int mpi_errno = MPI_SUCCESS; @@ -110,8 +110,8 @@ MPID_Rget(void *origin_addr, return mpi_errno, "**rmasync"); } - MPID_Request *rreq = MPIDI_Request_create1(); - rreq->kind = MPID_WIN_REQUEST; + MPIR_Request *rreq = MPIDI_Request_create1(); + rreq->kind = MPIR_WIN_REQUEST; *request = rreq; win->mpid.rreq = rreq; win->mpid.request_based = 1; @@ -159,7 +159,7 @@ MPID_Raccumulate(const void *origin_addr, MPI_Datatype target_datatype, MPI_Op op, MPIR_Win *win, - MPID_Request **request) + MPIR_Request **request) { int mpi_errno = MPI_SUCCESS; @@ -169,8 +169,8 @@ MPID_Raccumulate(const void *origin_addr, return mpi_errno, "**rmasync"); } - MPID_Request *rreq = MPIDI_Request_create1(); - rreq->kind = MPID_WIN_REQUEST; + MPIR_Request *rreq = MPIDI_Request_create1(); + rreq->kind = MPIR_WIN_REQUEST; *request = rreq; win->mpid.rreq = rreq; win->mpid.request_based = 1; @@ -223,7 +223,7 @@ MPID_Rget_accumulate(const void *origin_addr, MPI_Datatype target_datatype, MPI_Op op, MPIR_Win *win, - MPID_Request **request) + MPIR_Request **request) { int mpi_errno = MPI_SUCCESS; @@ -234,8 +234,8 @@ MPID_Rget_accumulate(const void *origin_addr, return mpi_errno, "**rmasync"); } - MPID_Request *rreq = MPIDI_Request_create1(); - rreq->kind = MPID_WIN_REQUEST; + MPIR_Request *rreq = MPIDI_Request_create1(); + rreq->kind = MPIR_WIN_REQUEST; *request = rreq; win->mpid.rreq = rreq; win->mpid.request_based = 1; diff --git a/src/mpid/pamid/src/onesided/mpidi_onesided.h b/src/mpid/pamid/src/onesided/mpidi_onesided.h index f54b73d..369866f 100644 --- a/src/mpid/pamid/src/onesided/mpidi_onesided.h +++ b/src/mpid/pamid/src/onesided/mpidi_onesided.h @@ -286,7 +286,7 @@ typedef struct MPIDI_Win_request pami_type_t pami_datatype; int request_based; /* flag for request based rma */ - MPID_Request *req_handle; /* anchor of MPID_Request struc for request based rma*/ + MPIR_Request *req_handle; /* anchor of MPIR_Request struc for request based rma*/ } MPIDI_Win_request; MPIDI_Win_request zero_req; /* used for init. request structure to 0 */ diff --git a/src/mpid/pamid/src/pt2pt/mpid_cancel.c b/src/mpid/pamid/src/pt2pt/mpid_cancel.c index 439d687..987d73e 100644 --- a/src/mpid/pamid/src/pt2pt/mpid_cancel.c +++ b/src/mpid/pamid/src/pt2pt/mpid_cancel.c @@ -23,7 +23,7 @@ int -MPID_Cancel_recv(MPID_Request * rreq) +MPID_Cancel_recv(MPIR_Request * rreq) { MPID_assert(rreq->kind == MPIR_REQUEST_RECV); if (MPIDI_Recvq_FDPR(rreq)) @@ -47,7 +47,7 @@ MPID_Cancel_recv(MPID_Request * rreq) static inline pami_result_t MPIDI_CancelReq_post(pami_context_t context, void * _req) { - MPID_Request * req = (MPID_Request*)_req; + MPIR_Request * req = (MPIR_Request*)_req; MPID_assert(req != NULL); /* ------------------------------------------------- */ @@ -90,7 +90,7 @@ MPIDI_CancelReq_post(pami_context_t context, void * _req) int -MPID_Cancel_send(MPID_Request * sreq) +MPID_Cancel_send(MPIR_Request * sreq) { MPID_assert(sreq != NULL); diff --git a/src/mpid/pamid/src/pt2pt/mpid_irecv.h b/src/mpid/pamid/src/pt2pt/mpid_irecv.h index 0517846..a0b6daf 100644 --- a/src/mpid/pamid/src/pt2pt/mpid_irecv.h +++ b/src/mpid/pamid/src/pt2pt/mpid_irecv.h @@ -50,7 +50,7 @@ MPID_Irecv_inline(void * buf, int tag, MPIR_Comm * comm, int context_offset, - MPID_Request ** request) + MPIR_Request ** request) { return MPIDI_Recv(buf, count, diff --git a/src/mpid/pamid/src/pt2pt/mpid_isend.h b/src/mpid/pamid/src/pt2pt/mpid_isend.h index fee78f3..368c402 100644 --- a/src/mpid/pamid/src/pt2pt/mpid_isend.h +++ b/src/mpid/pamid/src/pt2pt/mpid_isend.h @@ -40,7 +40,7 @@ MPIDI_Context_hash(pami_task_t rank, unsigned ctxt, unsigned bias, unsigned ncon #endif } static inline void -MPIDI_Context_endpoint(MPID_Request * req, pami_endpoint_t * e) +MPIDI_Context_endpoint(MPIR_Request * req, pami_endpoint_t * e) { pami_task_t remote = MPIDI_Request_getPeerRank_pami(req); pami_task_t local = MPIR_Process.comm_world->rank; @@ -51,7 +51,7 @@ MPIDI_Context_endpoint(MPID_Request * req, pami_endpoint_t * e) MPID_assert(rc == PAMI_SUCCESS); } static inline pami_context_t -MPIDI_Context_local(MPID_Request * req) +MPIDI_Context_local(MPIR_Request * req) { pami_task_t remote = MPIDI_Request_getPeerRank_comm(req); unsigned lctxt = MPIDI_Context_hash(remote, req->comm->context_id, 0, MPIDI_Process.avail_contexts); @@ -86,7 +86,7 @@ MPID_Isend_inline(const void * buf, int tag, MPIR_Comm * comm, int context_offset, - MPID_Request ** request) + MPIR_Request ** request) { /* ---------------------------------------------------- */ /* special case: PROC null handled by handoff function */ @@ -95,7 +95,7 @@ MPID_Isend_inline(const void * buf, /* --------------------- */ /* create a send request */ /* --------------------- */ - MPID_Request * sreq = *request = MPIDI_Request_create2_fast(); + MPIR_Request * sreq = *request = MPIDI_Request_create2_fast(); unsigned context_id = comm->context_id; /* match info */ diff --git a/src/mpid/pamid/src/pt2pt/mpid_issend.c b/src/mpid/pamid/src/pt2pt/mpid_issend.c index b7f1175..21510a5 100644 --- a/src/mpid/pamid/src/pt2pt/mpid_issend.c +++ b/src/mpid/pamid/src/pt2pt/mpid_issend.c @@ -47,7 +47,7 @@ int MPID_Issend(const void * buf, int tag, MPIR_Comm * comm, int context_offset, - MPID_Request ** request) + MPIR_Request ** request) { return MPIDI_Send(buf, count, diff --git a/src/mpid/pamid/src/pt2pt/mpid_recv.c b/src/mpid/pamid/src/pt2pt/mpid_recv.c index 86c86e0..15c88b9 100644 --- a/src/mpid/pamid/src/pt2pt/mpid_recv.c +++ b/src/mpid/pamid/src/pt2pt/mpid_recv.c @@ -45,7 +45,7 @@ int MPID_Recv(void * buf, MPIR_Comm * comm, int context_offset, MPI_Status * status, - MPID_Request ** request) + MPIR_Request ** request) { return MPIDI_Recv(buf, count, diff --git a/src/mpid/pamid/src/pt2pt/mpid_send.h b/src/mpid/pamid/src/pt2pt/mpid_send.h index 421d2aa..86c23f1 100644 --- a/src/mpid/pamid/src/pt2pt/mpid_send.h +++ b/src/mpid/pamid/src/pt2pt/mpid_send.h @@ -49,7 +49,7 @@ MPID_Send_inline(const void * buf, int tag, MPIR_Comm * comm, int context_offset, - MPID_Request ** request) + MPIR_Request ** request) { return MPIDI_Send(buf, count, diff --git a/src/mpid/pamid/src/pt2pt/mpid_ssend.c b/src/mpid/pamid/src/pt2pt/mpid_ssend.c index 87fb36d..58ce5f9 100644 --- a/src/mpid/pamid/src/pt2pt/mpid_ssend.c +++ b/src/mpid/pamid/src/pt2pt/mpid_ssend.c @@ -43,7 +43,7 @@ int MPID_Ssend(const void * buf, int tag, MPIR_Comm * comm, int context_offset, - MPID_Request ** request) + MPIR_Request ** request) { return MPIDI_Send(buf, count, diff --git a/src/mpid/pamid/src/pt2pt/mpidi_callback_eager.c b/src/mpid/pamid/src/pt2pt/mpidi_callback_eager.c index 583474f..147d58c 100644 --- a/src/mpid/pamid/src/pt2pt/mpidi_callback_eager.c +++ b/src/mpid/pamid/src/pt2pt/mpidi_callback_eager.c @@ -76,7 +76,7 @@ MPIDI_RecvCB(pami_context_t context, MPID_assert(_msginfo != NULL); MPID_assert(msginfo_size == sizeof(MPIDI_MsgInfo)); - MPID_Request * rreq = NULL; + MPIR_Request * rreq = NULL; source=PAMIX_Endpoint_query(sender); /* -------------------- */ @@ -109,7 +109,7 @@ MPIDI_RecvCB(pami_context_t context, MPID_NSTAT(mpid_statp->earlyArrivals); #endif MPIU_THREAD_CS_EXIT(MSGQUEUE,0); - MPID_Request *newreq = MPIDI_Request_create2(); + MPIR_Request *newreq = MPIDI_Request_create2(); MPID_assert(newreq != NULL); if (TOKEN_FLOW_CONTROL_ON) { @@ -152,7 +152,7 @@ MPIDI_RecvCB(pami_context_t context, if (unlikely(rreq == NULL)) { MPIDI_Callback_process_unexp(newreq, context, msginfo, sndlen, sender, sndbuf, recv, msginfo->isSync); - int completed = MPID_Request_is_complete(newreq); + int completed = MPIR_Request_is_complete(newreq); if (TOKEN_FLOW_CONTROL_ON) { #if TOKEN_FLOW_CONTROL diff --git a/src/mpid/pamid/src/pt2pt/mpidi_callback_rzv.c b/src/mpid/pamid/src/pt2pt/mpidi_callback_rzv.c index b0922fe..40ae04c 100644 --- a/src/mpid/pamid/src/pt2pt/mpidi_callback_rzv.c +++ b/src/mpid/pamid/src/pt2pt/mpidi_callback_rzv.c @@ -43,7 +43,7 @@ MPIDI_RecvRzvCB_impl(pami_context_t context, const MPIDI_MsgEnvelope * envelope = (const MPIDI_MsgEnvelope *)_msginfo; const MPIDI_MsgInfo * msginfo = (const MPIDI_MsgInfo *)&envelope->msginfo; - MPID_Request * rreq = NULL; + MPIR_Request * rreq = NULL; int found; pami_task_t source; #if TOKEN_FLOW_CONTROL @@ -57,7 +57,7 @@ MPIDI_RecvRzvCB_impl(pami_context_t context, unsigned tag = msginfo->MPItag; unsigned context_id = msginfo->MPIctxt; - MPID_Request *newreq = MPIDI_Request_create2(); + MPIR_Request *newreq = MPIDI_Request_create2(); MPIU_THREAD_CS_ENTER(MSGQUEUE,0); source = PAMIX_Endpoint_query(sender); MPIDI_Receive_tokens(msginfo,source); diff --git a/src/mpid/pamid/src/pt2pt/mpidi_callback_short.c b/src/mpid/pamid/src/pt2pt/mpidi_callback_short.c index 3f9914a..65feda1 100644 --- a/src/mpid/pamid/src/pt2pt/mpidi_callback_short.c +++ b/src/mpid/pamid/src/pt2pt/mpidi_callback_short.c @@ -52,7 +52,7 @@ MPIDI_RecvShortCB(pami_context_t context, MPID_assert(_msginfo != NULL); const MPIDI_MsgInfo *msginfo = (const MPIDI_MsgInfo *)_msginfo; - MPID_Request * rreq = NULL; + MPIR_Request * rreq = NULL; pami_task_t source; #if TOKEN_FLOW_CONTROL int rettoks=0; @@ -81,7 +81,7 @@ MPIDI_RecvShortCB(pami_context_t context, MPID_NSTAT(mpid_statp->earlyArrivals); #endif MPIU_THREAD_CS_EXIT(MSGQUEUE,0); - MPID_Request *newreq = MPIDI_Request_create2(); + MPIR_Request *newreq = MPIDI_Request_create2(); MPID_assert(newreq != NULL); if (sndlen) { diff --git a/src/mpid/pamid/src/pt2pt/mpidi_callback_util.c b/src/mpid/pamid/src/pt2pt/mpidi_callback_util.c index 834e93a..8e43697 100644 --- a/src/mpid/pamid/src/pt2pt/mpidi_callback_util.c +++ b/src/mpid/pamid/src/pt2pt/mpidi_callback_util.c @@ -24,7 +24,7 @@ /* MSGQUEUE lock must be held by caller */ void -MPIDI_Callback_process_unexp(MPID_Request *newreq, +MPIDI_Callback_process_unexp(MPIR_Request *newreq, pami_context_t context, const MPIDI_MsgInfo * msginfo, size_t sndlen, @@ -33,7 +33,7 @@ MPIDI_Callback_process_unexp(MPID_Request *newreq, pami_recv_t * recv, unsigned isSync) { - MPID_Request *rreq = NULL; + MPIR_Request *rreq = NULL; /* ---------------------------------------------------- */ /* Fallback position: */ @@ -106,7 +106,7 @@ MPIDI_Callback_process_unexp(MPID_Request *newreq, /* MSGQUEUE lock is not held */ void MPIDI_Callback_process_trunc(pami_context_t context, - MPID_Request *rreq, + MPIR_Request *rreq, pami_recv_t *recv, const void *sndbuf) { @@ -141,7 +141,7 @@ void MPIDI_Callback_process_userdefined_dt(pami_context_t context, const void * sndbuf, size_t sndlen, - MPID_Request * rreq) + MPIR_Request * rreq) { unsigned dt_contig, dt_size; MPIDU_Datatype*dt_ptr; diff --git a/src/mpid/pamid/src/pt2pt/mpidi_control.c b/src/mpid/pamid/src/pt2pt/mpidi_control.c index 9710ca4..c4d48f6 100644 --- a/src/mpid/pamid/src/pt2pt/mpidi_control.c +++ b/src/mpid/pamid/src/pt2pt/mpidi_control.c @@ -73,7 +73,7 @@ MPIDI_RecvRzvDoneCB(pami_context_t context, void * cookie, pami_result_t result) { - MPID_Request * rreq = (MPID_Request*)cookie; + MPIR_Request * rreq = (MPIR_Request*)cookie; MPID_assert(rreq != NULL); TRACE_ERR("RZV Done for req=%p addr=%p *addr[0]=%#016llx *addr[1]=%#016llx\n", @@ -120,7 +120,7 @@ MPIDI_RecvRzvDoneCB_zerobyte(pami_context_t context, void * cookie, pami_result_t result) { - MPID_Request * rreq = (MPID_Request*)cookie; + MPIR_Request * rreq = (MPIR_Request*)cookie; MPID_assert(rreq != NULL); /* Is it neccesary to save the original value of the 'type' field ?? */ @@ -147,7 +147,7 @@ MPIDI_RecvRzvDoneCB_zerobyte(pami_context_t context, */ void MPIDI_SyncAck_post(pami_context_t context, - MPID_Request * req, + MPIR_Request * req, unsigned peer) { MPIDI_Request_setControl(req, MPIDI_CONTROL_SSEND_ACKNOWLEDGE); @@ -174,7 +174,7 @@ pami_result_t MPIDI_SyncAck_handoff(pami_context_t context, void * inputReq) { - MPID_Request *req = inputReq; + MPIR_Request *req = inputReq; MPIDI_Request_setControl(req, MPIDI_CONTROL_SSEND_ACKNOWLEDGE); MPIDI_MsgInfo * info = &req->mpid.envelope.msginfo; unsigned peer = MPIDI_Request_getPeerRank_pami(req); @@ -196,7 +196,7 @@ MPIDI_SyncAck_proc(pami_context_t context, unsigned peer) { MPID_assert(info != NULL); - MPID_Request *req = MPIDI_Msginfo_getPeerRequest(info); + MPIR_Request *req = MPIDI_Msginfo_getPeerRequest(info); MPID_assert(req != NULL); MPIDI_Request_complete(req); } @@ -210,7 +210,7 @@ MPIDI_SyncAck_proc(pami_context_t context, */ static inline void MPIDI_RzvAck_proc_req(pami_context_t context, - MPID_Request * req) + MPIR_Request * req) { #ifdef USE_PAMI_RDMA pami_result_t rc; @@ -244,7 +244,7 @@ MPIDI_RzvAck_proc(pami_context_t context, pami_task_t peer) { MPID_assert(info != NULL); - MPID_Request *req = MPIDI_Msginfo_getPeerRequest(info); + MPIR_Request *req = MPIDI_Msginfo_getPeerRequest(info); MPID_assert(req != NULL); MPIDI_RzvAck_proc_req(context, req); } @@ -263,7 +263,7 @@ MPIDI_CancelReq_proc(pami_context_t context, { MPIDI_CONTROL type; MPIDI_MsgInfo ackinfo; - MPID_Request * sreq; + MPIR_Request * sreq; MPID_assert(info != NULL); @@ -307,7 +307,7 @@ MPIDI_CancelAck_proc(pami_context_t context, pami_task_t peer) { MPID_assert(info != NULL); - MPID_Request *req = MPIDI_Msginfo_getPeerRequest(info); + MPIR_Request *req = MPIDI_Msginfo_getPeerRequest(info); MPID_assert(req != NULL); TRACE_ERR("Cancel result: my_request=%p result=%s\n", diff --git a/src/mpid/pamid/src/pt2pt/mpidi_done.c b/src/mpid/pamid/src/pt2pt/mpidi_done.c index edb6d3e..0e767d4 100644 --- a/src/mpid/pamid/src/pt2pt/mpidi_done.c +++ b/src/mpid/pamid/src/pt2pt/mpidi_done.c @@ -33,7 +33,7 @@ MPIDI_SendDoneCB(pami_context_t context, void * clientdata, pami_result_t result) { - TRACE_SET_S_BIT((((MPID_Request *) clientdata)->mpid.partner_id),(((MPID_Request *) clientdata)->mpid.idx),fl.f.sendComp); + TRACE_SET_S_BIT((((MPIR_Request *) clientdata)->mpid.partner_id),(((MPIR_Request *) clientdata)->mpid.idx),fl.f.sendComp); MPIDI_SendDoneCB_inline(context, clientdata, result); @@ -41,7 +41,7 @@ MPIDI_SendDoneCB(pami_context_t context, static inline void -MPIDI_RecvDoneCB_copy(MPID_Request * rreq) +MPIDI_RecvDoneCB_copy(MPIR_Request * rreq) { int smpi_errno; MPID_assert(rreq->mpid.uebuf != NULL); @@ -72,7 +72,7 @@ MPIDI_RecvDoneCB(pami_context_t context, void * clientdata, pami_result_t result) { - MPID_Request * rreq = (MPID_Request*)clientdata; + MPIR_Request * rreq = (MPIR_Request*)clientdata; MPID_assert(rreq != NULL); switch (MPIDI_Request_getCA(rreq)) { @@ -93,7 +93,7 @@ MPIDI_RecvDoneCB(pami_context_t context, } } #ifdef OUT_OF_ORDER_HANDLING - MPID_Request * oo_peer = rreq->mpid.oo_peer; + MPIR_Request * oo_peer = rreq->mpid.oo_peer; if (oo_peer) { MPIR_STATUS_SET_COUNT(oo_peer->status, MPIR_STATUS_GET_COUNT(rreq->status)); MPIDI_Request_complete(oo_peer); @@ -122,7 +122,7 @@ MPIDI_RecvDoneCB_mutexed(pami_context_t context, void * clientdata, pami_result_t result) { - MPID_Request * rreq = (MPID_Request*)clientdata; + MPIR_Request * rreq = (MPIR_Request*)clientdata; MPIU_THREAD_CS_ENTER(MSGQUEUE, 0); MPIDI_RecvDoneCB(context, clientdata, result); @@ -144,7 +144,7 @@ void MPIDI_Recvq_process_out_of_order_msgs(pami_task_t src, pami_context_t conte /* a recv is posted, then process the message. */ /*******************************************************/ MPIDI_In_cntr_t *in_cntr; - MPID_Request *ooreq, *rreq, *prev_rreq; + MPIR_Request *ooreq, *rreq, *prev_rreq; pami_get_simple_t xferP; intptr_t _count=0; int matched; @@ -246,10 +246,10 @@ void MPIDI_Recvq_process_out_of_order_msgs(pami_task_t src, pami_context_t conte * element from the queue and return in *request; else return NULL */ int MPIDI_Search_recv_posting_queue(int src, int tag, int context_id, - MPID_Request **request, void** it ) + MPIR_Request **request, void** it ) { - MPID_Request * rreq; - MPID_Request * prev_rreq = NULL; + MPIR_Request * rreq; + MPIR_Request * prev_rreq = NULL; *request = NULL; #ifdef QUEUE_BINARY_SEARCH_SUPPORT diff --git a/src/mpid/pamid/src/pt2pt/mpidi_recv.h b/src/mpid/pamid/src/pt2pt/mpidi_recv.h index 8df22ff..f2c1594 100644 --- a/src/mpid/pamid/src/pt2pt/mpidi_recv.h +++ b/src/mpid/pamid/src/pt2pt/mpidi_recv.h @@ -143,9 +143,9 @@ MPIDI_Recv(void * buf, int context_offset, unsigned is_blocking, MPI_Status * status, - MPID_Request ** request) + MPIR_Request ** request) { - MPID_Request * rreq; + MPIR_Request * rreq; int found; int mpi_errno = MPI_SUCCESS; @@ -166,7 +166,7 @@ MPIDI_Recv(void * buf, /* find our request in the unexpected queue */ /* or allocate one in the posted queue */ /* ---------------------------------------- */ - MPID_Request *newreq = MPIDI_Request_create2(); + MPIR_Request *newreq = MPIDI_Request_create2(); MPIU_THREAD_CS_ENTER(MSGQUEUE,0); #ifndef OUT_OF_ORDER_HANDLING rreq = MPIDI_Recvq_FDU_or_AEP(newreq, rank, diff --git a/src/mpid/pamid/src/pt2pt/mpidi_recvmsg.c b/src/mpid/pamid/src/pt2pt/mpidi_recvmsg.c index 343b675..2765072 100644 --- a/src/mpid/pamid/src/pt2pt/mpidi_recvmsg.c +++ b/src/mpid/pamid/src/pt2pt/mpidi_recvmsg.c @@ -24,7 +24,7 @@ void -MPIDI_RecvMsg_Unexp(MPID_Request * rreq, +MPIDI_RecvMsg_Unexp(MPIR_Request * rreq, void * buf, MPI_Aint count, MPI_Datatype datatype) @@ -140,7 +140,7 @@ void MPIDI_RecvMsg_procnull(MPIR_Comm * comm, unsigned is_blocking, MPI_Status * status, - MPID_Request ** request) + MPIR_Request ** request) { if (is_blocking) { @@ -149,7 +149,7 @@ MPIDI_RecvMsg_procnull(MPIR_Comm * comm, } else { - MPID_Request * rreq; + MPIR_Request * rreq; rreq = MPIDI_Request_create2(); MPIR_Status_set_procnull(&rreq->status); rreq->kind = MPIR_REQUEST_RECV; diff --git a/src/mpid/pamid/src/pt2pt/mpidi_rendezvous.c b/src/mpid/pamid/src/pt2pt/mpidi_rendezvous.c index f8c77ad..a218865 100644 --- a/src/mpid/pamid/src/pt2pt/mpidi_rendezvous.c +++ b/src/mpid/pamid/src/pt2pt/mpidi_rendezvous.c @@ -24,14 +24,14 @@ inline void MPIDI_RendezvousTransfer_use_pami_rget(pami_context_t context, pami_endpoint_t dest, - MPID_Request *rreq) + MPIR_Request *rreq) __attribute__((__always_inline__)); #ifdef RDMA_FAILOVER inline void MPIDI_RendezvousTransfer_use_pami_get(pami_context_t context, pami_endpoint_t dest, void *rcvbuf, - MPID_Request *rreq) + MPIR_Request *rreq) __attribute__((__always_inline__)); #endif @@ -40,7 +40,7 @@ pami_result_t MPIDI_RendezvousTransfer(pami_context_t context, void * _rreq) { - MPID_Request * rreq = (MPID_Request*) _rreq; + MPIR_Request * rreq = (MPIR_Request*) _rreq; void *rcvbuf; size_t rcvlen; @@ -174,7 +174,7 @@ MPIDI_RendezvousTransfer(pami_context_t context, inline void MPIDI_RendezvousTransfer_use_pami_rget(pami_context_t context, pami_endpoint_t dest, - MPID_Request *rreq) + MPIR_Request *rreq) { pami_result_t rc; pami_rget_simple_t params = { @@ -212,7 +212,7 @@ inline void MPIDI_RendezvousTransfer_use_pami_get(pami_context_t context, pami_endpoint_t dest, void *rcvbuf, - MPID_Request *rreq) + MPIR_Request *rreq) { pami_result_t rc; int val=0; @@ -250,7 +250,7 @@ MPIDI_RendezvousTransfer_use_pami_get(pami_context_t context, pami_result_t MPIDI_RendezvousTransfer_SyncAck (pami_context_t context, void * _rreq) { - MPID_Request *rreq = (MPID_Request*)_rreq; + MPIR_Request *rreq = (MPIR_Request*)_rreq; // Do the sync ack transfer here. MPIDI_SyncAck_post (context, rreq, MPIDI_Request_getPeerRank_pami(rreq)); diff --git a/src/mpid/pamid/src/pt2pt/mpidi_send.h b/src/mpid/pamid/src/pt2pt/mpidi_send.h index 6df35a9..911c872 100644 --- a/src/mpid/pamid/src/pt2pt/mpidi_send.h +++ b/src/mpid/pamid/src/pt2pt/mpidi_send.h @@ -35,7 +35,7 @@ MPIDI_SendDoneCB_inline(pami_context_t context, void * clientdata, pami_result_t result) { - MPID_Request * sreq = (MPID_Request*)clientdata; + MPIR_Request * sreq = (MPIR_Request*)clientdata; MPID_assert(sreq != NULL); MPIDI_Request_complete(sreq); } @@ -82,9 +82,9 @@ MPIDI_Send(const void * buf, int context_offset, unsigned is_blocking, unsigned is_sync, - MPID_Request ** request) + MPIR_Request ** request) { - MPID_Request * sreq = NULL; + MPIR_Request * sreq = NULL; /* --------------------- */ /* create a send request */ diff --git a/src/mpid/pamid/src/pt2pt/mpidi_sendmsg.c b/src/mpid/pamid/src/pt2pt/mpidi_sendmsg.c index 71f5ec5..a26b6fd 100644 --- a/src/mpid/pamid/src/pt2pt/mpidi_sendmsg.c +++ b/src/mpid/pamid/src/pt2pt/mpidi_sendmsg.c @@ -27,7 +27,7 @@ #if TOKEN_FLOW_CONTROL #define MPIDI_Piggy_back_tokens MPIDI_Piggy_back_tokens_inline static inline void * -MPIDI_Piggy_back_tokens_inline(int dest,MPID_Request *shd,size_t len) +MPIDI_Piggy_back_tokens_inline(int dest,MPIR_Request *shd,size_t len) { int rettoks=0; if (MPIDI_Token_cntr[dest].rettoks) @@ -41,7 +41,7 @@ MPIDI_Piggy_back_tokens_inline(int dest,MPID_Request *shd,size_t len) static inline void MPIDI_SendMsg_short(pami_context_t context, - MPID_Request * sreq, + MPIR_Request * sreq, pami_endpoint_t dest, void * sndbuf, unsigned sndlen, @@ -89,14 +89,14 @@ MPIDI_SendMsg_short(pami_context_t context, static void MPIDI_SendMsg_eager(pami_context_t context, - MPID_Request * sreq, + MPIR_Request * sreq, pami_endpoint_t dest, void * sndbuf, unsigned sndlen) __attribute__((__noinline__)); static void MPIDI_SendMsg_eager(pami_context_t context, - MPID_Request * sreq, + MPIR_Request * sreq, pami_endpoint_t dest, void * sndbuf, unsigned sndlen) @@ -133,14 +133,14 @@ MPIDI_SendMsg_eager(pami_context_t context, static void MPIDI_SendMsg_rzv(pami_context_t context, - MPID_Request * sreq, + MPIR_Request * sreq, pami_endpoint_t dest, void * sndbuf, size_t sndlen) __attribute__((__noinline__)); static void MPIDI_SendMsg_rzv(pami_context_t context, - MPID_Request * sreq, + MPIR_Request * sreq, pami_endpoint_t dest, void * sndbuf, size_t sndlen) @@ -246,12 +246,12 @@ MPIDI_SendMsg_rzv(pami_context_t context, static void MPIDI_SendMsg_rzv_zerobyte(pami_context_t context, - MPID_Request * sreq, + MPIR_Request * sreq, pami_endpoint_t dest) __attribute__((__noinline__)); static void MPIDI_SendMsg_rzv_zerobyte(pami_context_t context, - MPID_Request * sreq, + MPIR_Request * sreq, pami_endpoint_t dest) { pami_result_t rc; @@ -304,12 +304,12 @@ MPIDI_SendMsg_rzv_zerobyte(pami_context_t context, static void -MPIDI_SendMsg_process_userdefined_dt(MPID_Request * sreq, +MPIDI_SendMsg_process_userdefined_dt(MPIR_Request * sreq, void ** sndbuf, size_t * data_sz) __attribute__((__noinline__)); static void -MPIDI_SendMsg_process_userdefined_dt(MPID_Request * sreq, +MPIDI_SendMsg_process_userdefined_dt(MPIR_Request * sreq, void ** _sndbuf, size_t * _data_sz) { @@ -410,7 +410,7 @@ MPIDI_SendMsg_process_userdefined_dt(MPID_Request * sreq, static inline void MPIDI_SendMsg(pami_context_t context, - MPID_Request * sreq, + MPIR_Request * sreq, unsigned isSync, const unsigned isInternal) { @@ -678,7 +678,7 @@ pami_result_t MPIDI_Send_handoff(pami_context_t context, void * _sreq) { - MPID_Request * sreq = (MPID_Request*)_sreq; + MPIR_Request * sreq = (MPIR_Request*)_sreq; MPID_assert(sreq != NULL); MPIDI_SendMsg(context, sreq, 0, 0); @@ -690,7 +690,7 @@ pami_result_t MPIDI_Ssend_handoff(pami_context_t context, void * _sreq) { - MPID_Request * sreq = (MPID_Request*)_sreq; + MPIR_Request * sreq = (MPIR_Request*)_sreq; MPID_assert(sreq != NULL); MPIDI_SendMsg(context, sreq, 1, 0); @@ -716,7 +716,7 @@ pami_result_t MPIDI_Isend_handoff(pami_context_t context, void * _sreq) { - MPID_Request * sreq = (MPID_Request*)_sreq; + MPIR_Request * sreq = (MPIR_Request*)_sreq; MPID_assert(sreq != NULL); /* This initializes all the fields not set in MPI_Isend() */ @@ -731,7 +731,7 @@ pami_result_t MPIDI_Isend_handoff_internal(pami_context_t context, void * _sreq) { - MPID_Request * sreq = (MPID_Request*)_sreq; + MPIR_Request * sreq = (MPIR_Request*)_sreq; MPID_assert(sreq != NULL); /* This initializes all the fields not set in MPI_Isend() */ diff --git a/src/mpid/pamid/src/pt2pt/persistent/mpid_recv_init.c b/src/mpid/pamid/src/pt2pt/persistent/mpid_recv_init.c index 7fa26eb..50e0249 100644 --- a/src/mpid/pamid/src/pt2pt/persistent/mpid_recv_init.c +++ b/src/mpid/pamid/src/pt2pt/persistent/mpid_recv_init.c @@ -31,11 +31,11 @@ int MPID_Recv_init(void * buf, int tag, MPIR_Comm * comm, int context_offset, - MPID_Request ** request) + MPIR_Request ** request) { - MPID_Request * rreq = *request = MPIDI_Request_create2(); + MPIR_Request * rreq = *request = MPIDI_Request_create2(); - rreq->kind = MPID_PREQUEST_RECV; + rreq->kind = MPIR_PREQUEST_RECV; rreq->comm = comm; MPIR_Comm_add_ref(comm); MPIDI_Request_setMatch(rreq, tag, rank, comm->recvcontext_id+context_offset); diff --git a/src/mpid/pamid/src/pt2pt/persistent/mpid_send_init.c b/src/mpid/pamid/src/pt2pt/persistent/mpid_send_init.c index cbe6465..08427cf 100644 --- a/src/mpid/pamid/src/pt2pt/persistent/mpid_send_init.c +++ b/src/mpid/pamid/src/pt2pt/persistent/mpid_send_init.c @@ -37,11 +37,11 @@ MPID_PSendRequest(const void * buf, int tag, MPIR_Comm * comm, int context_offset, - MPID_Request ** request) + MPIR_Request ** request) { - MPID_Request* sreq = *request = MPIDI_Request_create2(); + MPIR_Request* sreq = *request = MPIDI_Request_create2(); - sreq->kind = MPID_PREQUEST_SEND; + sreq->kind = MPIR_PREQUEST_SEND; sreq->comm = comm; MPIR_Comm_add_ref(comm); MPIDI_Request_setMatch(sreq, tag, rank, comm->context_id+context_offset); @@ -73,7 +73,7 @@ int MPID_Send_init(const void * buf, int tag, MPIR_Comm * comm, int context_offset, - MPID_Request ** request) + MPIR_Request ** request) { int mpi_errno = MPID_PSendRequest(buf, count, @@ -102,7 +102,7 @@ int MPID_Ssend_init(const void * buf, int tag, MPIR_Comm * comm, int context_offset, - MPID_Request ** request) + MPIR_Request ** request) { int mpi_errno = MPID_PSendRequest(buf, count, @@ -131,7 +131,7 @@ int MPID_Bsend_init(const void * buf, int tag, MPIR_Comm * comm, int context_offset, - MPID_Request ** request) + MPIR_Request ** request) { int mpi_errno = MPID_PSendRequest(buf, count, diff --git a/src/mpid/pamid/src/pt2pt/persistent/mpid_startall.c b/src/mpid/pamid/src/pt2pt/persistent/mpid_startall.c index a8fac4b..ed8639f 100644 --- a/src/mpid/pamid/src/pt2pt/persistent/mpid_startall.c +++ b/src/mpid/pamid/src/pt2pt/persistent/mpid_startall.c @@ -22,12 +22,12 @@ #include <mpidimpl.h> #include <../mpi/pt2pt/bsendutil.h> -int MPID_Startall(int count, MPID_Request * requests[]) +int MPID_Startall(int count, MPIR_Request * requests[]) { int rc=MPI_SUCCESS, i; for (i = 0; i < count; i++) { - MPID_Request * const preq = requests[i]; + MPIR_Request * const preq = requests[i]; switch(MPIDI_Request_getPType(preq)) { case MPIDI_REQUEST_PTYPE_RECV: diff --git a/src/util/mem/handlemem.c b/src/util/mem/handlemem.c index 6c0d591..8abcb3c 100644 --- a/src/util/mem/handlemem.c +++ b/src/util/mem/handlemem.c @@ -441,7 +441,7 @@ void MPIU_Handle_obj_free( MPIU_Object_alloc_t *objmem, void *object ) /* Necessary to prevent annotations from being misinterpreted. HB/HA arcs * will be drawn between a req object in across a free/alloc boundary * otherwise. Specifically, stores to obj->next when obj is actually an - * MPID_Request falsely look like a race to DRD and Helgrind because of the + * MPIR_Request falsely look like a race to DRD and Helgrind because of the * other lockfree synchronization used with requests. */ MPL_VG_ANNOTATE_NEW_MEMORY(obj, objmem->size); } http://git.mpich.org/mpich.git/commitdiff/5439a3232b586c420431b73907f35a5ad… commit 5439a3232b586c420431b73907f35a5add593527 Author: Wesley Bland <wesley.bland(a)intel.com> Date: Tue Apr 19 08:46:46 2016 -0500 Rename lots of smaller objects from MPID to MPIR Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/maint/decode_handle b/maint/decode_handle index 8887171..934b61f 100755 --- a/maint/decode_handle +++ b/maint/decode_handle @@ -60,7 +60,7 @@ while (scalar @ARGV) { ## code from src/include/mpihandlemem.h from which this script was derived ## ----8<---- ## -## typedef enum MPID_Object_kind { +## typedef enum MPIR_Object_kind { ## MPID_COMM = 0x1, ## MPID_GROUP = 0x2, ## MPID_DATATYPE = 0x3, @@ -71,11 +71,11 @@ while (scalar @ARGV) { ## MPID_WIN = 0x8, ## MPID_KEYVAL = 0x9, ## MPID_ATTR = 0xa, -## MPID_REQUEST = 0xb, +## MPIR_REQUEST = 0xb, ## MPID_PROCGROUP = 0xc, /* These are internal device objects */ ## MPID_VCONN = 0xd, ## MPID_GREQ_CLASS = 0xf -## } MPID_Object_kind; +## } MPIR_Object_kind; ## ## #define HANDLE_MPI_KIND_SHIFT 26 ## #define HANDLE_GET_MPI_KIND(a) ( ((a)&0x3c000000) >> HANDLE_MPI_KIND_SHIFT ) diff --git a/src/include/mpi_lang.h b/src/include/mpi_lang.h index 20994fd..4810dd2 100644 --- a/src/include/mpi_lang.h +++ b/src/include/mpi_lang.h @@ -41,7 +41,7 @@ extern "C" { */ typedef int -(MPID_Attr_copy_proxy)( +(MPIR_Attr_copy_proxy)( MPI_Comm_copy_attr_function* user_function, int handle, int keyval, @@ -54,7 +54,7 @@ int typedef int -(MPID_Attr_delete_proxy)( +(MPIR_Attr_delete_proxy)( MPI_Comm_delete_attr_function* user_function, int handle, int keyval, @@ -66,8 +66,8 @@ int void MPIR_Keyval_set_proxy( int keyval, - MPID_Attr_copy_proxy copy_proxy, - MPID_Attr_delete_proxy delete_proxy + MPIR_Attr_copy_proxy copy_proxy, + MPIR_Attr_delete_proxy delete_proxy ); #if defined(__cplusplus) diff --git a/src/include/mpierrs.h b/src/include/mpierrs.h index d567ffe..87aaf04 100644 --- a/src/include/mpierrs.h +++ b/src/include/mpierrs.h @@ -206,7 +206,7 @@ cvars: } #define MPIR_ERRTEST_COMM_INTRA(comm_ptr, err ) \ - if ((comm_ptr)->comm_kind != MPID_INTRACOMM) { \ + if ((comm_ptr)->comm_kind != MPIR_INTRACOMM) { \ err = MPIR_Err_create_code(MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, \ MPI_ERR_COMM,"**commnotintra",0); \ goto fn_fail; \ @@ -433,7 +433,7 @@ cvars: } \ else \ { \ - MPIR_ERRTEST_VALID_HANDLE((request_), MPID_REQUEST, (err_), MPI_ERR_REQUEST, "**request"); \ + MPIR_ERRTEST_VALID_HANDLE((request_), MPIR_REQUEST, (err_), MPI_ERR_REQUEST, "**request"); \ } \ } @@ -441,7 +441,7 @@ cvars: { \ if ((request_) != MPI_REQUEST_NULL) \ { \ - MPIR_ERRTEST_VALID_HANDLE((request_), MPID_REQUEST, (err_), MPI_ERR_REQUEST, "**request"); \ + MPIR_ERRTEST_VALID_HANDLE((request_), MPIR_REQUEST, (err_), MPI_ERR_REQUEST, "**request"); \ } \ } @@ -450,7 +450,7 @@ cvars: { \ if ((request_) != MPI_REQUEST_NULL) \ { \ - if (HANDLE_GET_MPI_KIND(request_) != MPID_REQUEST) { \ + if (HANDLE_GET_MPI_KIND(request_) != MPIR_REQUEST) { \ MPIR_ERR_SETANDSTMT2(err_,MPI_ERR_REQUEST,goto fn_fail, \ "**request_invalid_kind","**request_invalid_kind %d %d", \ i_, HANDLE_GET_MPI_KIND(request_)); \ diff --git a/src/include/mpihandlemem.h b/src/include/mpihandlemem.h index 29abfa2..9a245af 100644 --- a/src/include/mpihandlemem.h +++ b/src/include/mpihandlemem.h @@ -34,7 +34,7 @@ and for the handles. This is a 4 bit value. 0 is reserved for so that all-zero handles can be flagged as an error. */ /*E - MPID_Object_kind - Object kind (communicator, window, or file) + MPIR_Object_kind - Object kind (communicator, window, or file) Notes: This enum is used by keyvals and errhandlers to indicate the type of @@ -57,7 +57,7 @@ Module: Attribute-DS E*/ -typedef enum MPID_Object_kind { +typedef enum MPIR_Object_kind { MPID_COMM = 0x1, MPID_GROUP = 0x2, MPID_DATATYPE = 0x3, @@ -68,11 +68,11 @@ typedef enum MPID_Object_kind { MPID_WIN = 0x8, MPID_KEYVAL = 0x9, MPID_ATTR = 0xa, - MPID_REQUEST = 0xb, + MPIR_REQUEST = 0xb, MPID_PROCGROUP = 0xc, /* These are internal device objects */ MPID_VCONN = 0xd, MPID_GREQ_CLASS = 0xf - } MPID_Object_kind; + } MPIR_Object_kind; #define HANDLE_MPI_KIND_SHIFT 26 #define HANDLE_GET_MPI_KIND(a) ( ((a)&0x3c000000) >> HANDLE_MPI_KIND_SHIFT ) @@ -381,7 +381,7 @@ typedef struct MPIU_Object_alloc_t { int initialized; /* */ void *(*indirect)[]; /* Pointer to indirect object blocks */ int indirect_size; /* Number of allocated indirect blocks */ - MPID_Object_kind kind; /* Kind of object this is for */ + MPIR_Object_kind kind; /* Kind of object this is for */ int size; /* Size of an individual object */ void *direct; /* Pointer to direct block, used for allocation */ diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index 680046e..21e3095 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -320,7 +320,7 @@ extern MPID_Thread_tls_t MPIR_Per_thread_key; #include "mpi_lang.h" /* Known language bindings */ /*E - MPID_Lang_t - Known language bindings for MPI + MPIR_Lang_t - Known language bindings for MPI A few operations in MPI need to know what language they were called from or created by. This type enumerates the possible languages so that @@ -330,15 +330,15 @@ extern MPID_Thread_tls_t MPIR_Per_thread_key; Module: Attribute-DS E*/ -typedef enum MPID_Lang_t { MPID_LANG_C +typedef enum MPIR_Lang_t { MPIR_LANG_C #ifdef HAVE_FORTRAN_BINDING - , MPID_LANG_FORTRAN - , MPID_LANG_FORTRAN90 + , MPIR_LANG_FORTRAN + , MPIR_LANG_FORTRAN90 #endif #ifdef HAVE_CXX_BINDING - , MPID_LANG_CXX + , MPIR_LANG_CXX #endif -} MPID_Lang_t; +} MPIR_Lang_t; /* Macros for the MPI handles (e.g., the object that encodes an MPI_Datatype) */ @@ -356,18 +356,18 @@ void MPIR_DatatypeAttrFinalize( void ); /* TODO examine generated assembly for this construct, it's probably suboptimal * on Blue Gene. An if/else if/else might help the compiler out. It also lets * us hint that one case is likely(), usually the BUILTIN case. */ -#define MPID_Getb_ptr(kind,a,bmsk,ptr) \ +#define MPIR_Getb_ptr(kind,a,bmsk,ptr) \ { \ switch (HANDLE_GET_KIND(a)) { \ case HANDLE_KIND_BUILTIN: \ - ptr=MPID_##kind##_builtin+((a)&(bmsk)); \ + ptr=MPIR_##kind##_builtin+((a)&(bmsk)); \ break; \ case HANDLE_KIND_DIRECT: \ - ptr=MPID_##kind##_direct+HANDLE_INDEX(a); \ + ptr=MPIR_##kind##_direct+HANDLE_INDEX(a); \ break; \ case HANDLE_KIND_INDIRECT: \ - ptr=((MPID_##kind*) \ - MPIU_Handle_get_ptr_indirect(a,&MPID_##kind##_mem)); \ + ptr=((MPIR_##kind*) \ + MPIU_Handle_get_ptr_indirect(a,&MPIR_##kind##_mem)); \ break; \ case HANDLE_KIND_INVALID: \ default: \ @@ -378,15 +378,15 @@ void MPIR_DatatypeAttrFinalize( void ); /* Convert handles to objects for MPI types that do _not_ have any predefined objects */ -#define MPID_Get_ptr(kind,a,ptr) \ +#define MPIR_Get_ptr(kind,a,ptr) \ { \ switch (HANDLE_GET_KIND(a)) { \ case HANDLE_KIND_DIRECT: \ - ptr=MPID_##kind##_direct+HANDLE_INDEX(a); \ + ptr=MPIR_##kind##_direct+HANDLE_INDEX(a); \ break; \ case HANDLE_KIND_INDIRECT: \ - ptr=((MPID_##kind*) \ - MPIU_Handle_get_ptr_indirect(a,&MPID_##kind##_mem)); \ + ptr=((MPIR_##kind*) \ + MPIU_Handle_get_ptr_indirect(a,&MPIR_##kind##_mem)); \ break; \ case HANDLE_KIND_INVALID: \ case HANDLE_KIND_BUILTIN: \ @@ -398,14 +398,14 @@ void MPIR_DatatypeAttrFinalize( void ); /* FIXME: the masks should be defined with the handle definitions instead of inserted here as literals */ -#define MPIR_Comm_get_ptr(a,ptr) MPID_Getb_ptr(Comm,a,0x03ffffff,ptr) -#define MPIR_Group_get_ptr(a,ptr) MPID_Getb_ptr(Group,a,0x03ffffff,ptr) -#define MPIR_Errhandler_get_ptr(a,ptr) MPID_Getb_ptr(Errhandler,a,0x3,ptr) -#define MPIR_Op_get_ptr(a,ptr) MPID_Getb_ptr(Op,a,0x000000ff,ptr) -#define MPIR_Info_get_ptr(a,ptr) MPID_Getb_ptr(Info,a,0x03ffffff,ptr) -#define MPIR_Win_get_ptr(a,ptr) MPID_Get_ptr(Win,a,ptr) -#define MPID_Request_get_ptr(a,ptr) MPID_Get_ptr(Request,a,ptr) -#define MPIR_Grequest_class_get_ptr(a,ptr) MPID_Get_ptr(Grequest_class,a,ptr) +#define MPIR_Comm_get_ptr(a,ptr) MPIR_Getb_ptr(Comm,a,0x03ffffff,ptr) +#define MPIR_Group_get_ptr(a,ptr) MPIR_Getb_ptr(Group,a,0x03ffffff,ptr) +#define MPIR_Errhandler_get_ptr(a,ptr) MPIR_Getb_ptr(Errhandler,a,0x3,ptr) +#define MPIR_Op_get_ptr(a,ptr) MPIR_Getb_ptr(Op,a,0x000000ff,ptr) +#define MPIR_Info_get_ptr(a,ptr) MPIR_Getb_ptr(Info,a,0x03ffffff,ptr) +#define MPIR_Win_get_ptr(a,ptr) MPIR_Get_ptr(Win,a,ptr) +#define MPID_Request_get_ptr(a,ptr) MPIR_Get_ptr(Request,a,ptr) +#define MPIR_Grequest_class_get_ptr(a,ptr) MPIR_Get_ptr(Grequest_class,a,ptr) /* Keyvals have a special format. This is roughly MPID_Get_ptrb, but the handle index is in a smaller bit field. In addition, there is no storage for the builtin keyvals. @@ -435,21 +435,21 @@ void MPIR_DatatypeAttrFinalize( void ); /* Valid pointer checks */ /* This test is lame. Should eventually include cookie test and in-range addresses */ -#define MPID_Valid_ptr(kind,ptr,err) \ +#define MPIR_Valid_ptr(kind,ptr,err) \ {if (!(ptr)) { err = MPIR_Err_create_code( MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_OTHER, \ "**nullptrtype", "**nullptrtype %s", #kind ); } } -#define MPID_Valid_ptr_class(kind,ptr,errclass,err) \ +#define MPIR_Valid_ptr_class(kind,ptr,errclass,err) \ {if (!(ptr)) { err = MPIR_Err_create_code( MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, errclass, \ "**nullptrtype", "**nullptrtype %s", #kind ); } } -#define MPIR_Info_valid_ptr(ptr,err) MPID_Valid_ptr_class(Info,ptr,MPI_ERR_INFO,err) +#define MPIR_Info_valid_ptr(ptr,err) MPIR_Valid_ptr_class(Info,ptr,MPI_ERR_INFO,err) /* Check not only for a null pointer but for an invalid communicator, such as one that has been freed. Let's try the ref_count as the test for now */ /* ticket #1441: check (refcount<=0) to cover the case of 0, an "over-free" of * -1 or similar, and the 0xecec... case when --enable-g=mem is used */ #define MPIR_Comm_valid_ptr(ptr,err,ignore_rev) { \ - MPID_Valid_ptr_class(Comm,ptr,MPI_ERR_COMM,err); \ + MPIR_Valid_ptr_class(Comm,ptr,MPI_ERR_COMM,err); \ if ((ptr) && MPIU_Object_get_ref(ptr) <= 0) { \ MPIR_ERR_SET(err,MPI_ERR_COMM,"**comm"); \ ptr = 0; \ @@ -457,12 +457,11 @@ void MPIR_DatatypeAttrFinalize( void ); MPIR_ERR_SET(err,MPIX_ERR_REVOKED,"**comm"); \ } \ } -#define MPIR_Group_valid_ptr(ptr,err) MPID_Valid_ptr_class(Group,ptr,MPI_ERR_GROUP,err) -#define MPIR_Win_valid_ptr(ptr,err) MPID_Valid_ptr_class(Win,ptr,MPI_ERR_WIN,err) -#define MPIR_Op_valid_ptr(ptr,err) MPID_Valid_ptr_class(Op,ptr,MPI_ERR_OP,err) -#define MPIR_Errhandler_valid_ptr(ptr,err) MPID_Valid_ptr_class(Errhandler,ptr,MPI_ERR_ARG,err) -#define MPID_Request_valid_ptr(ptr,err) MPID_Valid_ptr_class(Request,ptr,MPI_ERR_REQUEST,err) -#define MPIR_Keyval_valid_ptr(ptr,err) MPID_Valid_ptr_class(Keyval,ptr,MPI_ERR_KEYVAL,err) +#define MPIR_Win_valid_ptr(ptr,err) MPIR_Valid_ptr_class(Win,ptr,MPI_ERR_WIN,err) +#define MPIR_Op_valid_ptr(ptr,err) MPIR_Valid_ptr_class(Op,ptr,MPI_ERR_OP,err) +#define MPIR_Errhandler_valid_ptr(ptr,err) MPIR_Valid_ptr_class(Errhandler,ptr,MPI_ERR_ARG,err) +#define MPID_Request_valid_ptr(ptr,err) MPIR_Valid_ptr_class(Request,ptr,MPI_ERR_REQUEST,err) +#define MPIR_Keyval_valid_ptr(ptr,err) MPIR_Valid_ptr_class(Keyval,ptr,MPI_ERR_KEYVAL,err) #define MPIR_DATATYPE_IS_PREDEFINED(type) \ ((HANDLE_GET_KIND(type) == HANDLE_KIND_BUILTIN) || \ @@ -481,16 +480,16 @@ void MPIR_DatatypeAttrFinalize( void ); properly aligned quantity. For systems with no alignment rules, all of these masks are zero, and this part of test can be eliminated. */ -#define MPID_Pointer_is_invalid(p,alignment) ((p) == 0) +#define MPIR_Pointer_is_invalid(p,alignment) ((p) == 0) /* Fixme: The following MPID_ALIGNED_xxx values are temporary. They need to be computed by configure and included in the mpichconf.h file. Note that they cannot be set conservatively (i.e., as sizeof(object)), since the runtime system may generate objects with lesser alignment rules if the processor allows them. */ -#define MPID_ALIGNED_PTR_INT 1 -#define MPID_ALIGNED_PTR_LONG 1 -#define MPID_ALIGNED_PTR_VOIDP 1 +#define MPIR_ALIGNED_PTR_INT 1 +#define MPIR_ALIGNED_PTR_LONG 1 +#define MPIR_ALIGNED_PTR_VOIDP 1 /* ------------------------------------------------------------------------- */ /* end of code that should the following be moved into mpihandlemem.h ?*/ /* ------------------------------------------------------------------------- */ @@ -576,8 +575,8 @@ typedef struct MPIR_Info { } MPIR_Info; extern MPIU_Object_alloc_t MPIR_Info_mem; /* Preallocated info objects */ -#define MPID_INFO_N_BUILTIN 2 -extern MPIR_Info MPIR_Info_builtin[MPID_INFO_N_BUILTIN]; +#define MPIR_INFO_N_BUILTIN 2 +extern MPIR_Info MPIR_Info_builtin[MPIR_INFO_N_BUILTIN]; extern MPIR_Info MPIR_Info_direct[]; /* ------------------------------------------------------------------------- */ @@ -657,8 +656,8 @@ typedef union MPIR_Errhandler_fn { S*/ typedef struct MPIR_Errhandler { MPIU_OBJECT_HEADER; /* adds handle and ref_count fields */ - MPID_Lang_t language; - MPID_Object_kind kind; + MPIR_Lang_t language; + MPIR_Object_kind kind; MPIR_Errhandler_fn errfn; /* Other, device-specific information */ #ifdef MPID_DEV_ERRHANDLER_DECL @@ -845,7 +844,7 @@ typedef struct MPIR_Copy_function { * Currently the lang-indpendent funcs are used only for keyvals */ MPI_Comm_copy_attr_function *user_function; - MPID_Attr_copy_proxy *proxy; + MPIR_Attr_copy_proxy *proxy; /* The C++ function is the same as the C function */ } MPIR_Copy_function; @@ -889,7 +888,7 @@ typedef struct MPIR_Delete_function { * Currently the lang-indpendent funcs are used only for keyvals */ MPI_Comm_delete_attr_function *user_function; - MPID_Attr_delete_proxy *proxy; + MPIR_Attr_delete_proxy *proxy; } MPIR_Delete_function; /*S @@ -901,7 +900,7 @@ typedef struct MPIR_Delete_function { S*/ typedef struct MPIR_Keyval { MPIU_OBJECT_HEADER; /* adds handle and ref_count fields */ - MPID_Object_kind kind; + MPIR_Object_kind kind; int was_freed; void *extra_state; MPIR_Copy_function copyfn; @@ -929,9 +928,9 @@ typedef struct MPIR_Keyval { to work with the datatype code used in the I/O library. While this is really a limitation in the current Datatype implementation. */ #ifdef USE_AINT_FOR_ATTRVAL -typedef MPI_Aint MPID_AttrVal_t; +typedef MPI_Aint MPIR_AttrVal_t; #else -typedef void * MPID_AttrVal_t; +typedef void * MPIR_AttrVal_t; #endif /* Attributes need no ref count or handle, but since we want to use the @@ -983,7 +982,7 @@ typedef struct MPIR_Attribute { MPIR_AttrType attrType; /* Type of the attribute */ long pre_sentinal; /* Used to detect user errors in accessing the value */ - MPID_AttrVal_t value; /* Stored value. An Aint must be at least + MPIR_AttrVal_t value; /* Stored value. An Aint must be at least as large as an address - some builds may make an Aint larger than a void * */ long post_sentinal; /* Like pre_sentinal */ @@ -1071,8 +1070,8 @@ typedef struct MPIR_Group { extern MPIU_Object_alloc_t MPIR_Group_mem; /* Preallocated group objects */ -#define MPID_GROUP_N_BUILTIN 1 -extern MPIR_Group MPIR_Group_builtin[MPID_GROUP_N_BUILTIN]; +#define MPIR_GROUP_N_BUILTIN 1 +extern MPIR_Group MPIR_Group_builtin[MPIR_GROUP_N_BUILTIN]; extern MPIR_Group MPIR_Group_direct[]; /* Object for empty group */ @@ -1092,17 +1091,17 @@ void MPIR_Group_setup_lpid_list( MPIR_Group * ); MPIR_Comm_kind_t - Name the two types of communicators E*/ typedef enum MPIR_Comm_kind_t { - MPID_INTRACOMM = 0, - MPID_INTERCOMM = 1 } MPIR_Comm_kind_t; + MPIR_INTRACOMM = 0, + MPIR_INTERCOMM = 1 } MPIR_Comm_kind_t; /* ideally we could add these to MPIR_Comm_kind_t, but there's too much existing * code that assumes that the only valid values are INTRACOMM or INTERCOMM */ typedef enum MPIR_Comm_hierarchy_kind_t { - MPID_HIERARCHY_FLAT = 0, /* no hierarchy */ - MPID_HIERARCHY_PARENT = 1, /* has subcommunicators */ - MPID_HIERARCHY_NODE_ROOTS = 2, /* is the subcomm for node roots */ - MPID_HIERARCHY_NODE = 3, /* is the subcomm for a node */ - MPID_HIERARCHY_SIZE /* cardinality of this enum */ + MPIR_HIERARCHY_FLAT = 0, /* no hierarchy */ + MPIR_HIERARCHY_PARENT = 1, /* has subcommunicators */ + MPIR_HIERARCHY_NODE_ROOTS = 2, /* is the subcomm for node roots */ + MPIR_HIERARCHY_NODE = 3, /* is the subcomm for a node */ + MPIR_HIERARCHY_SIZE /* cardinality of this enum */ } MPIR_Comm_hierarchy_kind_t; /* Communicators */ @@ -1218,7 +1217,7 @@ typedef struct MPIR_Comm { MPIR_Group *local_group, /* Groups in communicator. */ *remote_group; /* The local and remote groups are the same for intra communicators */ - MPIR_Comm_kind_t comm_kind; /* MPID_INTRACOMM or MPID_INTERCOMM */ + MPIR_Comm_kind_t comm_kind; /* MPIR_INTRACOMM or MPIR_INTERCOMM */ char name[MPI_MAX_OBJECT_NAME]; /* Required for MPI-2 */ MPIR_Errhandler *errhandler; /* Pointer to the error handler structure */ struct MPIR_Comm *local_comm; /* Defined only for intercomms, holds @@ -1336,8 +1335,8 @@ int MPIR_Comm_apply_hints(MPIR_Comm *comm_ptr, MPIR_Info *info_ptr); a private (non-user accessible) dup of comm world that is provided if needed in MPI_Finalize. Having a separate version of comm_world avoids possible interference with User code */ -#define MPID_COMM_N_BUILTIN 3 -extern MPIR_Comm MPID_Comm_builtin[MPID_COMM_N_BUILTIN]; +#define MPIR_COMM_N_BUILTIN 3 +extern MPIR_Comm MPIR_Comm_builtin[MPIR_COMM_N_BUILTIN]; extern MPIR_Comm MPIR_Comm_direct[]; /* This is the handle for the internal MPI_COMM_WORLD . The "2" at the end of the handle is 3-1 (e.g., the index in the builtin array) */ @@ -1346,10 +1345,10 @@ extern MPIR_Comm MPIR_Comm_direct[]; /* The following preprocessor macros provide bitfield access information for * context ID values. They follow a uniform naming pattern: * - * MPID_CONTEXT_foo_WIDTH - the width in bits of the field - * MPID_CONTEXT_foo_MASK - A valid bit mask for bit-wise AND and OR operations + * MPIR_CONTEXT_foo_WIDTH - the width in bits of the field + * MPIR_CONTEXT_foo_MASK - A valid bit mask for bit-wise AND and OR operations * with exactly all of the bits in the field set. - * MPID_CONTEXT_foo_SHIFT - The number of bits that the field should be shifted + * MPIR_CONTEXT_foo_SHIFT - The number of bits that the field should be shifted * rightwards to place it in the least significant bits * of the ID. There may still be higher order bits * from other fields, so the _MASK should be used first @@ -1358,39 +1357,39 @@ extern MPIR_Comm MPIR_Comm_direct[]; */ /* yields an rvalue that is the value of the field_name_ in the least significant bits */ -#define MPID_CONTEXT_READ_FIELD(field_name_,id_) \ - (((id_) & MPID_CONTEXT_##field_name_##_MASK) >> MPID_CONTEXT_##field_name_##_SHIFT) +#define MPIR_CONTEXT_READ_FIELD(field_name_,id_) \ + (((id_) & MPIR_CONTEXT_##field_name_##_MASK) >> MPIR_CONTEXT_##field_name_##_SHIFT) /* yields an rvalue that is the old_id_ with field_name_ set to field_val_ */ -#define MPID_CONTEXT_SET_FIELD(field_name_,old_id_,field_val_) \ - ((old_id_ & ~MPID_CONTEXT_##field_name_##_MASK) | ((field_val_) << MPID_CONTEXT_##field_name_##_SHIFT)) +#define MPIR_CONTEXT_SET_FIELD(field_name_,old_id_,field_val_) \ + ((old_id_ & ~MPIR_CONTEXT_##field_name_##_MASK) | ((field_val_) << MPIR_CONTEXT_##field_name_##_SHIFT)) /* Context suffixes for separating pt2pt and collective communication */ -#define MPID_CONTEXT_SUFFIX_WIDTH (1) -#define MPID_CONTEXT_SUFFIX_SHIFT (0) -#define MPID_CONTEXT_SUFFIX_MASK ((1 << MPID_CONTEXT_SUFFIX_WIDTH) - 1) -#define MPID_CONTEXT_INTRA_PT2PT (0) -#define MPID_CONTEXT_INTRA_COLL (1) -#define MPID_CONTEXT_INTER_PT2PT (0) -#define MPID_CONTEXT_INTER_COLL (1) +#define MPIR_CONTEXT_SUFFIX_WIDTH (1) +#define MPIR_CONTEXT_SUFFIX_SHIFT (0) +#define MPIR_CONTEXT_SUFFIX_MASK ((1 << MPIR_CONTEXT_SUFFIX_WIDTH) - 1) +#define MPIR_CONTEXT_INTRA_PT2PT (0) +#define MPIR_CONTEXT_INTRA_COLL (1) +#define MPIR_CONTEXT_INTER_PT2PT (0) +#define MPIR_CONTEXT_INTER_COLL (1) /* Used to derive context IDs for sub-communicators from a parent communicator's context ID value. This field comes after the one bit suffix. values are shifted left by 1. */ -#define MPID_CONTEXT_SUBCOMM_WIDTH (2) -#define MPID_CONTEXT_SUBCOMM_SHIFT (MPID_CONTEXT_SUFFIX_WIDTH + MPID_CONTEXT_SUFFIX_SHIFT) -#define MPID_CONTEXT_SUBCOMM_MASK (((1 << MPID_CONTEXT_SUBCOMM_WIDTH) - 1) << MPID_CONTEXT_SUBCOMM_SHIFT) +#define MPIR_CONTEXT_SUBCOMM_WIDTH (2) +#define MPIR_CONTEXT_SUBCOMM_SHIFT (MPIR_CONTEXT_SUFFIX_WIDTH + MPIR_CONTEXT_SUFFIX_SHIFT) +#define MPIR_CONTEXT_SUBCOMM_MASK (((1 << MPIR_CONTEXT_SUBCOMM_WIDTH) - 1) << MPIR_CONTEXT_SUBCOMM_SHIFT) /* these values may be added/subtracted directly to/from an existing context ID * in order to determine the context ID of the child/parent */ -#define MPID_CONTEXT_PARENT_OFFSET (0 << MPID_CONTEXT_SUBCOMM_SHIFT) -#define MPID_CONTEXT_INTRANODE_OFFSET (1 << MPID_CONTEXT_SUBCOMM_SHIFT) -#define MPID_CONTEXT_INTERNODE_OFFSET (2 << MPID_CONTEXT_SUBCOMM_SHIFT) +#define MPIR_CONTEXT_PARENT_OFFSET (0 << MPIR_CONTEXT_SUBCOMM_SHIFT) +#define MPIR_CONTEXT_INTRANODE_OFFSET (1 << MPIR_CONTEXT_SUBCOMM_SHIFT) +#define MPIR_CONTEXT_INTERNODE_OFFSET (2 << MPIR_CONTEXT_SUBCOMM_SHIFT) /* this field (IS_LOCALCOM) is used to derive a context ID for local * communicators of intercommunicators without communication */ -#define MPID_CONTEXT_IS_LOCALCOMM_WIDTH (1) -#define MPID_CONTEXT_IS_LOCALCOMM_SHIFT (MPID_CONTEXT_SUBCOMM_SHIFT + MPID_CONTEXT_SUBCOMM_WIDTH) -#define MPID_CONTEXT_IS_LOCALCOMM_MASK (((1 << MPID_CONTEXT_IS_LOCALCOMM_WIDTH) - 1) << MPID_CONTEXT_IS_LOCALCOMM_SHIFT) +#define MPIR_CONTEXT_IS_LOCALCOMM_WIDTH (1) +#define MPIR_CONTEXT_IS_LOCALCOMM_SHIFT (MPIR_CONTEXT_SUBCOMM_SHIFT + MPIR_CONTEXT_SUBCOMM_WIDTH) +#define MPIR_CONTEXT_IS_LOCALCOMM_MASK (((1 << MPIR_CONTEXT_IS_LOCALCOMM_WIDTH) - 1) << MPIR_CONTEXT_IS_LOCALCOMM_SHIFT) /* MPIR_MAX_CONTEXT_MASK is the number of ints that make up the bit vector that * describes the context ID prefix space. @@ -1398,7 +1397,7 @@ extern MPIR_Comm MPIR_Comm_direct[]; * The following must hold: * (num_bits_in_vector) <= (maximum_context_id_prefix) * which is the following in concrete terms: - * MPIR_MAX_CONTEXT_MASK*MPIR_CONTEXT_INT_BITS <= 2**(MPIR_CONTEXT_ID_BITS - (MPID_CONTEXT_PREFIX_SHIFT + MPID_CONTEXT_DYNAMIC_PROC_WIDTH)) + * MPIR_MAX_CONTEXT_MASK*MPIR_CONTEXT_INT_BITS <= 2**(MPIR_CONTEXT_ID_BITS - (MPIR_CONTEXT_PREFIX_SHIFT + MPIR_CONTEXT_DYNAMIC_PROC_WIDTH)) * * We currently always assume MPIR_CONTEXT_INT_BITS is 32, regardless of the * value of sizeof(int)*CHAR_BITS. We also make the assumption that CHAR_BITS==8. @@ -1407,19 +1406,19 @@ extern MPIR_Comm MPIR_Comm_direct[]; */ /* number of bits to shift right by in order to obtain the context ID prefix */ -#define MPID_CONTEXT_PREFIX_SHIFT (MPID_CONTEXT_IS_LOCALCOMM_SHIFT + MPID_CONTEXT_IS_LOCALCOMM_WIDTH) -#define MPID_CONTEXT_PREFIX_WIDTH (MPIR_CONTEXT_ID_BITS - (MPID_CONTEXT_PREFIX_SHIFT + MPID_CONTEXT_DYNAMIC_PROC_WIDTH)) -#define MPID_CONTEXT_PREFIX_MASK (((1 << MPID_CONTEXT_PREFIX_WIDTH) - 1) << MPID_CONTEXT_PREFIX_SHIFT) +#define MPIR_CONTEXT_PREFIX_SHIFT (MPIR_CONTEXT_IS_LOCALCOMM_SHIFT + MPIR_CONTEXT_IS_LOCALCOMM_WIDTH) +#define MPIR_CONTEXT_PREFIX_WIDTH (MPIR_CONTEXT_ID_BITS - (MPIR_CONTEXT_PREFIX_SHIFT + MPIR_CONTEXT_DYNAMIC_PROC_WIDTH)) +#define MPIR_CONTEXT_PREFIX_MASK (((1 << MPIR_CONTEXT_PREFIX_WIDTH) - 1) << MPIR_CONTEXT_PREFIX_SHIFT) -#define MPID_CONTEXT_DYNAMIC_PROC_WIDTH (1) /* the upper half is reserved for dynamic procs */ -#define MPID_CONTEXT_DYNAMIC_PROC_SHIFT (MPIR_CONTEXT_ID_BITS - MPID_CONTEXT_DYNAMIC_PROC_WIDTH) /* the upper half is reserved for dynamic procs */ -#define MPID_CONTEXT_DYNAMIC_PROC_MASK (((1 << MPID_CONTEXT_DYNAMIC_PROC_WIDTH) - 1) << MPID_CONTEXT_DYNAMIC_PROC_SHIFT) +#define MPIR_CONTEXT_DYNAMIC_PROC_WIDTH (1) /* the upper half is reserved for dynamic procs */ +#define MPIR_CONTEXT_DYNAMIC_PROC_SHIFT (MPIR_CONTEXT_ID_BITS - MPIR_CONTEXT_DYNAMIC_PROC_WIDTH) /* the upper half is reserved for dynamic procs */ +#define MPIR_CONTEXT_DYNAMIC_PROC_MASK (((1 << MPIR_CONTEXT_DYNAMIC_PROC_WIDTH) - 1) << MPIR_CONTEXT_DYNAMIC_PROC_SHIFT) /* should probably be (sizeof(int)*CHAR_BITS) once we make the code CHAR_BITS-clean */ #define MPIR_CONTEXT_INT_BITS (32) #define MPIR_CONTEXT_ID_BITS (sizeof(MPIU_Context_id_t)*8) /* 8 --> CHAR_BITS eventually */ #define MPIR_MAX_CONTEXT_MASK \ - ((1 << (MPIR_CONTEXT_ID_BITS - (MPID_CONTEXT_PREFIX_SHIFT + MPID_CONTEXT_DYNAMIC_PROC_WIDTH))) / MPIR_CONTEXT_INT_BITS) + ((1 << (MPIR_CONTEXT_ID_BITS - (MPIR_CONTEXT_PREFIX_SHIFT + MPIR_CONTEXT_DYNAMIC_PROC_WIDTH))) / MPIR_CONTEXT_INT_BITS) /* Utility routines. Where possible, these are kept in the source directory with the other comm routines (src/mpi/comm, in mpicomm.h). However, @@ -1434,12 +1433,12 @@ void MPIR_Free_contextid( MPIU_Context_id_t ); /* Requests */ /* This currently defines a single structure type for all requests. Eventually, we may want a union type, as used in MPICH-1 */ -/* NOTE-R1: MPID_REQUEST_MPROBE signifies that this is a request created by +/* NOTE-R1: MPIR_REQUEST_MPROBE signifies that this is a request created by * MPI_Mprobe or MPI_Improbe. Since we use MPI_Request objects as our * MPI_Message objects, we use this separate kind in order to provide stronger * error checking. Once a message (backed by a request) is promoted to a real * request by calling MPI_Mrecv/MPI_Imrecv, we actually modify the kind to be - * MPID_REQUEST_RECV in order to keep completion logic as simple as possible. */ + * MPIR_REQUEST_RECV in order to keep completion logic as simple as possible. */ /*E MPID_Request_kind - Kinds of MPI Requests @@ -1448,14 +1447,14 @@ void MPIR_Free_contextid( MPIU_Context_id_t ); E*/ typedef enum MPID_Request_kind_t { - MPID_REQUEST_UNDEFINED, - MPID_REQUEST_SEND, - MPID_REQUEST_RECV, + MPIR_REQUEST_UNDEFINED, + MPIR_REQUEST_SEND, + MPIR_REQUEST_RECV, MPID_PREQUEST_SEND, MPID_PREQUEST_RECV, MPID_UREQUEST, MPID_COLL_REQUEST, - MPID_REQUEST_MPROBE, /* see NOTE-R1 */ + MPIR_REQUEST_MPROBE, /* see NOTE-R1 */ MPID_WIN_REQUEST, MPID_LAST_REQUEST_KIND #ifdef MPID_DEV_REQUEST_KIND_DECL @@ -1478,7 +1477,7 @@ struct MPIR_Grequest_fns { MPIX_Grequest_wait_function *wait_fn; void *grequest_extra_state; MPIX_Grequest_class greq_class; - MPID_Lang_t greq_lang; /* language that defined + MPIR_Lang_t greq_lang; /* language that defined the generalize req */ }; @@ -1790,13 +1789,13 @@ int MPID_Mem_was_alloced( void *ptr ); /* brad : this isn't used or implemented Module: Collective-DS E*/ -typedef enum MPIR_Op_kind { MPID_OP_NULL=0, MPID_OP_MAX=1, MPID_OP_MIN=2, - MPID_OP_SUM=3, MPID_OP_PROD=4, - MPID_OP_LAND=5, MPID_OP_BAND=6, MPID_OP_LOR=7, MPID_OP_BOR=8, - MPID_OP_LXOR=9, MPID_OP_BXOR=10, MPID_OP_MAXLOC=11, - MPID_OP_MINLOC=12, MPID_OP_REPLACE=13, - MPID_OP_NO_OP=14, - MPID_OP_USER_NONCOMMUTE=32, MPID_OP_USER=33 } +typedef enum MPIR_Op_kind { MPIR_OP_NULL=0, MPIR_OP_MAX=1, MPIR_OP_MIN=2, + MPIR_OP_SUM=3, MPIR_OP_PROD=4, + MPIR_OP_LAND=5, MPIR_OP_BAND=6, MPIR_OP_LOR=7, MPIR_OP_BOR=8, + MPIR_OP_LXOR=9, MPIR_OP_BXOR=10, MPIR_OP_MAXLOC=11, + MPIR_OP_MINLOC=12, MPIR_OP_REPLACE=13, + MPIR_OP_NO_OP=14, + MPIR_OP_USER_NONCOMMUTE=32, MPIR_OP_USER=33 } MPIR_Op_kind; /*S @@ -1861,11 +1860,11 @@ typedef union MPIR_User_function { typedef struct MPIR_Op { MPIU_OBJECT_HEADER; /* adds handle and ref_count fields */ MPIR_Op_kind kind; - MPID_Lang_t language; + MPIR_Lang_t language; MPIR_User_function function; } MPIR_Op; -#define MPID_OP_N_BUILTIN 15 -extern MPIR_Op MPIR_Op_builtin[MPID_OP_N_BUILTIN]; +#define MPIR_OP_N_BUILTIN 15 +extern MPIR_Op MPIR_Op_builtin[MPIR_OP_N_BUILTIN]; extern MPIR_Op MPIR_Op_direct[]; extern MPIU_Object_alloc_t MPIR_Op_mem; @@ -2045,7 +2044,7 @@ typedef struct MPIR_TopoOps { typedef struct MPIR_Commops { int (*split_type)(MPIR_Comm *, int, int, MPIR_Info *, MPIR_Comm **); } MPIR_Commops; -extern struct MPIR_Commops *MPID_Comm_fns; /* Communicator creation functions */ +extern struct MPIR_Commops *MPIR_Comm_fns; /* Communicator creation functions */ /* Per process data */ @@ -3764,7 +3763,7 @@ int MPID_Comm_get_lpid(MPIR_Comm *comm_ptr, int idx, int * lpid_ptr, MPIU_BOOL i /* These functions are used in the implementation of collective and other internal operations. They are wrappers around MPID send/recv functions. They do sends/receives by setting the context offset to - MPID_CONTEXT_INTRA(INTER)_COLL. */ + MPIR_CONTEXT_INTRA(INTER)_COLL. */ int MPIR_Localcopy(const void *sendbuf, MPI_Aint sendcount, MPI_Datatype sendtype, void *recvbuf, MPI_Aint recvcount, MPI_Datatype recvtype); int MPIC_Wait(MPID_Request * request_ptr, MPIR_Errflag_t *errflag); diff --git a/src/mpi/attr/attrutil.c b/src/mpi/attr/attrutil.c index bcef21a..4daa2de 100644 --- a/src/mpi/attr/attrutil.c +++ b/src/mpi/attr/attrutil.c @@ -223,7 +223,7 @@ int MPIR_Attr_dup_list( int handle, MPIR_Attribute *old_attrs, new_p->pre_sentinal = 0; /* FIXME: This is not correct in some cases (size(MPI_Aint)> sizeof(intptr_t)) */ - new_p->value = (MPID_AttrVal_t)(intptr_t)new_value; + new_p->value = (MPIR_AttrVal_t)(intptr_t)new_value; new_p->post_sentinal = 0; new_p->next = 0; @@ -368,8 +368,8 @@ MPIR_Attr_delete_c_proxy( void MPIR_Keyval_set_proxy( int keyval, - MPID_Attr_copy_proxy copy_proxy, - MPID_Attr_delete_proxy delete_proxy + MPIR_Attr_copy_proxy copy_proxy, + MPIR_Attr_delete_proxy delete_proxy ) { MPIR_Keyval* keyval_ptr; diff --git a/src/mpi/attr/comm_set_attr.c b/src/mpi/attr/comm_set_attr.c index 55daf8d..edd3e6e 100644 --- a/src/mpi/attr/comm_set_attr.c +++ b/src/mpi/attr/comm_set_attr.c @@ -65,7 +65,7 @@ int MPIR_Comm_set_attr_impl(MPIR_Comm *comm_ptr, int comm_keyval, void *attribut dual casts are a sign that this is faulty. This will need to be fixed in the type/win set_attr routines as well. */ - p->value = (MPID_AttrVal_t)(intptr_t)attribute_val; + p->value = (MPIR_AttrVal_t)(intptr_t)attribute_val; /* printf( "Updating attr at %x\n", &p->value ); */ /* Does not change the reference count on the keyval */ break; @@ -81,7 +81,7 @@ int MPIR_Comm_set_attr_impl(MPIR_Comm *comm_ptr, int comm_keyval, void *attribut new_p->attrType = attrType; new_p->pre_sentinal = 0; /* FIXME: See the comment above on this dual cast. */ - new_p->value = (MPID_AttrVal_t)(intptr_t)attribute_val; + new_p->value = (MPIR_AttrVal_t)(intptr_t)attribute_val; new_p->post_sentinal = 0; new_p->next = comm_ptr->attributes; MPIR_Keyval_add_ref( keyval_ptr ); diff --git a/src/mpi/attr/type_set_attr.c b/src/mpi/attr/type_set_attr.c index d5b1881..2c0e38d 100644 --- a/src/mpi/attr/type_set_attr.c +++ b/src/mpi/attr/type_set_attr.c @@ -95,7 +95,7 @@ int MPIR_TypeSetAttr(MPI_Datatype datatype, int type_keyval, void *attribute_val goto fn_fail; } /* --END ERROR HANDLING-- */ - p->value = (MPID_AttrVal_t)(intptr_t)attribute_val; + p->value = (MPIR_AttrVal_t)(intptr_t)attribute_val; p->attrType = attrType; break; } @@ -106,7 +106,7 @@ int MPIR_TypeSetAttr(MPI_Datatype datatype, int type_keyval, void *attribute_val new_p->keyval = keyval_ptr; new_p->attrType = attrType; new_p->pre_sentinal = 0; - new_p->value = (MPID_AttrVal_t)(intptr_t)attribute_val; + new_p->value = (MPIR_AttrVal_t)(intptr_t)attribute_val; new_p->post_sentinal = 0; new_p->next = p->next; MPIR_Keyval_add_ref( keyval_ptr ); @@ -125,7 +125,7 @@ int MPIR_TypeSetAttr(MPI_Datatype datatype, int type_keyval, void *attribute_val new_p->keyval = keyval_ptr; new_p->attrType = attrType; new_p->pre_sentinal = 0; - new_p->value = (MPID_AttrVal_t)(intptr_t)attribute_val; + new_p->value = (MPIR_AttrVal_t)(intptr_t)attribute_val; new_p->post_sentinal = 0; new_p->next = 0; MPIR_Keyval_add_ref( keyval_ptr ); diff --git a/src/mpi/attr/win_set_attr.c b/src/mpi/attr/win_set_attr.c index bcfdbcb..2509d43 100644 --- a/src/mpi/attr/win_set_attr.c +++ b/src/mpi/attr/win_set_attr.c @@ -100,7 +100,7 @@ int MPIR_WinSetAttr( MPI_Win win, int win_keyval, void *attribute_val, goto fn_fail; } /* --END ERROR HANDLING-- */ - p->value = (MPID_AttrVal_t)(intptr_t)attribute_val; + p->value = (MPIR_AttrVal_t)(intptr_t)attribute_val; p->attrType = attrType; /* Does not change the reference count on the keyval */ break; @@ -112,7 +112,7 @@ int MPIR_WinSetAttr( MPI_Win win, int win_keyval, void *attribute_val, new_p->keyval = keyval_ptr; new_p->attrType = attrType; new_p->pre_sentinal = 0; - new_p->value = (MPID_AttrVal_t)(intptr_t)attribute_val; + new_p->value = (MPIR_AttrVal_t)(intptr_t)attribute_val; new_p->post_sentinal = 0; new_p->next = p->next; MPIR_Keyval_add_ref( keyval_ptr ); @@ -131,7 +131,7 @@ int MPIR_WinSetAttr( MPI_Win win, int win_keyval, void *attribute_val, new_p->attrType = attrType; new_p->keyval = keyval_ptr; new_p->pre_sentinal = 0; - new_p->value = (MPID_AttrVal_t)(intptr_t)attribute_val; + new_p->value = (MPIR_AttrVal_t)(intptr_t)attribute_val; new_p->post_sentinal = 0; new_p->next = 0; MPIR_Keyval_add_ref( keyval_ptr ); diff --git a/src/mpi/coll/allgather.c b/src/mpi/coll/allgather.c index 6ea261e..f4ff7d4 100644 --- a/src/mpi/coll/allgather.c +++ b/src/mpi/coll/allgather.c @@ -791,7 +791,7 @@ int MPIR_Allgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, { int mpi_errno = MPI_SUCCESS; - if (comm_ptr->comm_kind == MPID_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_INTRACOMM) { /* intracommunicator */ mpi_errno = MPIR_Allgather_intra(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, @@ -934,7 +934,7 @@ int MPI_Allgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; - if (comm_ptr->comm_kind == MPID_INTERCOMM) { + if (comm_ptr->comm_kind == MPIR_INTERCOMM) { MPIR_ERRTEST_SENDBUF_INPLACE(sendbuf, sendcount, mpi_errno); } else { /* catch common aliasing cases */ diff --git a/src/mpi/coll/allgatherv.c b/src/mpi/coll/allgatherv.c index 0b3d969..53a0ac7 100644 --- a/src/mpi/coll/allgatherv.c +++ b/src/mpi/coll/allgatherv.c @@ -896,7 +896,7 @@ int MPIR_Allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, { int mpi_errno = MPI_SUCCESS; - if (comm_ptr->comm_kind == MPID_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_INTRACOMM) { /* intracommunicator */ mpi_errno = MPIR_Allgatherv_intra(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, @@ -1046,7 +1046,7 @@ int MPI_Allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; - if (comm_ptr->comm_kind == MPID_INTERCOMM) + if (comm_ptr->comm_kind == MPIR_INTERCOMM) MPIR_ERRTEST_SENDBUF_INPLACE(sendbuf, sendcount, mpi_errno); if (sendbuf != MPI_IN_PLACE) { MPIR_ERRTEST_COUNT(sendcount, mpi_errno); @@ -1061,7 +1061,7 @@ int MPI_Allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPIR_ERRTEST_USERBUFFER(sendbuf,sendcount,sendtype,mpi_errno); /* catch common aliasing cases */ - if (comm_ptr->comm_kind == MPID_INTRACOMM && + if (comm_ptr->comm_kind == MPIR_INTRACOMM && sendtype == recvtype && recvcounts[comm_ptr->rank] != 0 && sendcount != 0) { @@ -1071,7 +1071,7 @@ int MPI_Allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, } } - if (comm_ptr->comm_kind == MPID_INTRACOMM) + if (comm_ptr->comm_kind == MPIR_INTRACOMM) comm_size = comm_ptr->local_size; else comm_size = comm_ptr->remote_size; diff --git a/src/mpi/coll/allred_group.c b/src/mpi/coll/allred_group.c index 360e69f..1c37ac9 100644 --- a/src/mpi/coll/allred_group.c +++ b/src/mpi/coll/allred_group.c @@ -370,7 +370,7 @@ int MPIR_Allreduce_group(void *sendbuf, void *recvbuf, int count, { int mpi_errno = MPI_SUCCESS; - MPIR_ERR_CHKANDJUMP(comm_ptr->comm_kind != MPID_INTRACOMM, mpi_errno, MPI_ERR_OTHER, "**commnotintra"); + MPIR_ERR_CHKANDJUMP(comm_ptr->comm_kind != MPIR_INTRACOMM, mpi_errno, MPI_ERR_OTHER, "**commnotintra"); mpi_errno = MPIR_Allreduce_group_intra(sendbuf, recvbuf, count, datatype, op, comm_ptr, group_ptr, tag, errflag); diff --git a/src/mpi/coll/allreduce.c b/src/mpi/coll/allreduce.c index 4b4cc71..413b816 100644 --- a/src/mpi/coll/allreduce.c +++ b/src/mpi/coll/allreduce.c @@ -718,7 +718,7 @@ int MPIR_Allreduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype d { int mpi_errno = MPI_SUCCESS; - if (comm_ptr->comm_kind == MPID_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_INTRACOMM) { /* intracommunicator */ mpi_errno = MPIR_Allreduce_intra(sendbuf, recvbuf, count, datatype, op, comm_ptr, errflag); if (mpi_errno) MPIR_ERR_POP(mpi_errno); @@ -758,7 +758,7 @@ int MPIR_Allreduce_impl(const void *sendbuf, void *recvbuf, int count, MPI_Datat } else { - if (comm_ptr->comm_kind == MPID_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_INTRACOMM) { /* intracommunicator */ mpi_errno = MPIR_Allreduce_intra(sendbuf, recvbuf, count, datatype, op, comm_ptr, errflag); if (mpi_errno) MPIR_ERR_POP(mpi_errno); @@ -860,7 +860,7 @@ int MPI_Allreduce(const void *sendbuf, void *recvbuf, int count, if (mpi_errno != MPI_SUCCESS) goto fn_fail; } - if (comm_ptr->comm_kind == MPID_INTERCOMM) { + if (comm_ptr->comm_kind == MPIR_INTERCOMM) { MPIR_ERRTEST_SENDBUF_INPLACE(sendbuf, count, mpi_errno); } else { if (count != 0 && sendbuf != MPI_IN_PLACE) diff --git a/src/mpi/coll/alltoall.c b/src/mpi/coll/alltoall.c index 0c2eb86..bc371b9 100644 --- a/src/mpi/coll/alltoall.c +++ b/src/mpi/coll/alltoall.c @@ -559,7 +559,7 @@ int MPIR_Alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, { int mpi_errno = MPI_SUCCESS; - if (comm_ptr->comm_kind == MPID_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_INTRACOMM) { /* intracommunicator */ mpi_errno = MPIR_Alltoall_intra(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, @@ -688,7 +688,7 @@ int MPI_Alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, if (mpi_errno != MPI_SUCCESS) goto fn_fail; } - if (comm_ptr->comm_kind == MPID_INTRACOMM && + if (comm_ptr->comm_kind == MPIR_INTRACOMM && sendbuf != MPI_IN_PLACE && sendcount == recvcount && sendtype == recvtype && @@ -706,7 +706,7 @@ int MPI_Alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, if (mpi_errno != MPI_SUCCESS) goto fn_fail; } - if (comm_ptr->comm_kind == MPID_INTERCOMM) { + if (comm_ptr->comm_kind == MPIR_INTERCOMM) { MPIR_ERRTEST_SENDBUF_INPLACE(sendbuf, sendcount, mpi_errno); } MPIR_ERRTEST_RECVBUF_INPLACE(recvbuf, recvcount, mpi_errno); diff --git a/src/mpi/coll/alltoallv.c b/src/mpi/coll/alltoallv.c index f9ca9ee..2c0b9af 100644 --- a/src/mpi/coll/alltoallv.c +++ b/src/mpi/coll/alltoallv.c @@ -334,7 +334,7 @@ int MPIR_Alltoallv(const void *sendbuf, const int *sendcounts, const int *sdispl { int mpi_errno = MPI_SUCCESS; - if (comm_ptr->comm_kind == MPID_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_INTRACOMM) { /* intracommunicator */ mpi_errno = MPIR_Alltoallv_intra(sendbuf, sendcounts, sdispls, sendtype, recvbuf, recvcounts, @@ -465,12 +465,12 @@ int MPI_Alltoallv(const void *sendbuf, const int *sendcounts, { MPID_Datatype *sendtype_ptr=NULL, *recvtype_ptr=NULL; int i, comm_size; - int check_send = (comm_ptr->comm_kind == MPID_INTRACOMM && sendbuf != MPI_IN_PLACE); + int check_send = (comm_ptr->comm_kind == MPIR_INTRACOMM && sendbuf != MPI_IN_PLACE); MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; - if (comm_ptr->comm_kind == MPID_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_INTRACOMM) { comm_size = comm_ptr->local_size; if (sendbuf != MPI_IN_PLACE && sendtype == recvtype && sendcounts == recvcounts) @@ -478,7 +478,7 @@ int MPI_Alltoallv(const void *sendbuf, const int *sendcounts, } else comm_size = comm_ptr->remote_size; - if (comm_ptr->comm_kind == MPID_INTERCOMM && sendbuf == MPI_IN_PLACE) { + if (comm_ptr->comm_kind == MPIR_INTERCOMM && sendbuf == MPI_IN_PLACE) { MPIR_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**sendbuf_inplace"); } diff --git a/src/mpi/coll/alltoallw.c b/src/mpi/coll/alltoallw.c index 6382621..d106baf 100644 --- a/src/mpi/coll/alltoallw.c +++ b/src/mpi/coll/alltoallw.c @@ -329,7 +329,7 @@ int MPIR_Alltoallw(const void *sendbuf, const int sendcounts[], const int sdispl { int mpi_errno = MPI_SUCCESS; - if (comm_ptr->comm_kind == MPID_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_INTRACOMM) { /* intracommunicator */ mpi_errno = MPIR_Alltoallw_intra(sendbuf, sendcounts, sdispls, sendtypes, recvbuf, recvcounts, @@ -465,13 +465,13 @@ int MPI_Alltoallw(const void *sendbuf, const int sendcounts[], MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; - check_send = (comm_ptr->comm_kind == MPID_INTRACOMM && sendbuf != MPI_IN_PLACE); + check_send = (comm_ptr->comm_kind == MPIR_INTRACOMM && sendbuf != MPI_IN_PLACE); - if (comm_ptr->comm_kind == MPID_INTERCOMM && sendbuf == MPI_IN_PLACE) { + if (comm_ptr->comm_kind == MPIR_INTERCOMM && sendbuf == MPI_IN_PLACE) { MPIR_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**sendbuf_inplace"); } - if (comm_ptr->comm_kind == MPID_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_INTRACOMM) { comm_size = comm_ptr->local_size; if (sendbuf != MPI_IN_PLACE && sendcounts == recvcounts && sendtypes == recvtypes) diff --git a/src/mpi/coll/barrier.c b/src/mpi/coll/barrier.c index 389cb8c..8785e3f 100644 --- a/src/mpi/coll/barrier.c +++ b/src/mpi/coll/barrier.c @@ -285,7 +285,7 @@ int MPIR_Barrier(MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; - if (comm_ptr->comm_kind == MPID_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_INTRACOMM) { /* intracommunicator */ mpi_errno = MPIR_Barrier_intra( comm_ptr, errflag ); if (mpi_errno) MPIR_ERR_POP(mpi_errno); diff --git a/src/mpi/coll/bcast.c b/src/mpi/coll/bcast.c index 34b64be..29bb9a4 100644 --- a/src/mpi/coll/bcast.c +++ b/src/mpi/coll/bcast.c @@ -1470,7 +1470,7 @@ inline int MPIR_Bcast(void *buffer, int count, MPI_Datatype datatype, int root, { int mpi_errno = MPI_SUCCESS; - if (comm_ptr->comm_kind == MPID_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_INTRACOMM) { /* intracommunicator */ mpi_errno = MPIR_Bcast_intra( buffer, count, datatype, root, comm_ptr, errflag ); if (mpi_errno) MPIR_ERR_POP(mpi_errno); @@ -1558,7 +1558,7 @@ int MPI_Bcast( void *buffer, int count, MPI_Datatype datatype, int root, if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPIR_ERRTEST_COUNT(count, mpi_errno); MPIR_ERRTEST_DATATYPE(datatype, "datatype", mpi_errno); - if (comm_ptr->comm_kind == MPID_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_INTRACOMM) { MPIR_ERRTEST_INTRA_ROOT(comm_ptr, root, mpi_errno); } else { diff --git a/src/mpi/coll/collutil.h b/src/mpi/coll/collutil.h index a3a2f75..be16930 100644 --- a/src/mpi/coll/collutil.h +++ b/src/mpi/coll/collutil.h @@ -38,7 +38,7 @@ static inline int MPIR_Op_is_commutative(MPI_Op op) } else { MPIR_Op_get_ptr(op, op_ptr); - if (op_ptr->kind == MPID_OP_USER_NONCOMMUTE) + if (op_ptr->kind == MPIR_OP_USER_NONCOMMUTE) return FALSE; else return TRUE; diff --git a/src/mpi/coll/exscan.c b/src/mpi/coll/exscan.c index 2ff8684..1c13fe5 100644 --- a/src/mpi/coll/exscan.c +++ b/src/mpi/coll/exscan.c @@ -124,7 +124,7 @@ int MPIR_Exscan ( } else { MPIR_Op_get_ptr(op, op_ptr); - if (op_ptr->kind == MPID_OP_USER_NONCOMMUTE) + if (op_ptr->kind == MPIR_OP_USER_NONCOMMUTE) is_commutative = 0; else is_commutative = 1; diff --git a/src/mpi/coll/gather.c b/src/mpi/coll/gather.c index 7548e46..b67ea4e 100644 --- a/src/mpi/coll/gather.c +++ b/src/mpi/coll/gather.c @@ -678,7 +678,7 @@ int MPIR_Gather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, { int mpi_errno = MPI_SUCCESS; - if (comm_ptr->comm_kind == MPID_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_INTRACOMM) { /* intracommunicator */ mpi_errno = MPIR_Gather_intra(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, @@ -807,7 +807,7 @@ int MPI_Gather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; - if (comm_ptr->comm_kind == MPID_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_INTRACOMM) { MPIR_ERRTEST_INTRA_ROOT(comm_ptr, root, mpi_errno); if (sendbuf != MPI_IN_PLACE) { @@ -848,7 +848,7 @@ int MPI_Gather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPIR_ERRTEST_SENDBUF_INPLACE(sendbuf, sendcount, mpi_errno); } - if (comm_ptr->comm_kind == MPID_INTERCOMM) { + if (comm_ptr->comm_kind == MPIR_INTERCOMM) { MPIR_ERRTEST_INTER_ROOT(comm_ptr, root, mpi_errno); if (root == MPI_ROOT) { diff --git a/src/mpi/coll/gatherv.c b/src/mpi/coll/gatherv.c index 84a0a3d..43a4e7c 100644 --- a/src/mpi/coll/gatherv.c +++ b/src/mpi/coll/gatherv.c @@ -101,9 +101,9 @@ int MPIR_Gatherv ( MPIDU_ERR_CHECK_MULTIPLE_THREADS_ENTER( comm_ptr ); /* If rank == root, then I recv lots, otherwise I send */ - if (((comm_ptr->comm_kind == MPID_INTRACOMM) && (root == rank)) || - ((comm_ptr->comm_kind == MPID_INTERCOMM) && (root == MPI_ROOT))) { - if (comm_ptr->comm_kind == MPID_INTRACOMM) + if (((comm_ptr->comm_kind == MPIR_INTRACOMM) && (root == rank)) || + ((comm_ptr->comm_kind == MPIR_INTERCOMM) && (root == MPI_ROOT))) { + if (comm_ptr->comm_kind == MPIR_INTRACOMM) comm_size = comm_ptr->local_size; else comm_size = comm_ptr->remote_size; @@ -119,7 +119,7 @@ int MPIR_Gatherv ( reqs = 0; for (i = 0; i < comm_size; i++) { if (recvcounts[i]) { - if ((comm_ptr->comm_kind == MPID_INTRACOMM) && (i == rank)) { + if ((comm_ptr->comm_kind == MPIR_INTRACOMM) && (i == rank)) { if (sendbuf != MPI_IN_PLACE) { mpi_errno = MPIR_Localcopy(sendbuf, sendcount, sendtype, ((char *)recvbuf+displs[rank]*extent), @@ -320,7 +320,7 @@ int MPI_Gatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; - if (comm_ptr->comm_kind == MPID_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_INTRACOMM) { MPIR_ERRTEST_INTRA_ROOT(comm_ptr, root, mpi_errno); if (sendbuf != MPI_IN_PLACE) { @@ -370,7 +370,7 @@ int MPI_Gatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPIR_ERRTEST_SENDBUF_INPLACE(sendbuf, sendcount, mpi_errno); } - if (comm_ptr->comm_kind == MPID_INTERCOMM) { + if (comm_ptr->comm_kind == MPIR_INTERCOMM) { MPIR_ERRTEST_INTER_ROOT(comm_ptr, root, mpi_errno); if (root == MPI_ROOT) { diff --git a/src/mpi/coll/helper_fns.c b/src/mpi/coll/helper_fns.c index ed06cd2..c4c08b2 100644 --- a/src/mpi/coll/helper_fns.c +++ b/src/mpi/coll/helper_fns.c @@ -16,7 +16,7 @@ /* These functions are used in the implementation of collective operations. They are wrappers around MPID send/recv functions. They do sends/receives by setting the context offset to - MPID_CONTEXT_INTRA_COLL or MPID_CONTEXT_INTER_COLL. */ + MPIR_CONTEXT_INTRA_COLL or MPIR_CONTEXT_INTER_COLL. */ #undef FUNCNAME #define FUNCNAME MPIC_Probe @@ -30,8 +30,8 @@ int MPIC_Probe(int source, int tag, MPI_Comm comm, MPI_Status *status) MPIR_Comm_get_ptr( comm, comm_ptr ); - context_id = (comm_ptr->comm_kind == MPID_INTRACOMM) ? - MPID_CONTEXT_INTRA_COLL : MPID_CONTEXT_INTER_COLL; + context_id = (comm_ptr->comm_kind == MPIR_INTRACOMM) ? + MPIR_CONTEXT_INTRA_COLL : MPIR_CONTEXT_INTER_COLL; mpi_errno = MPID_Probe(source, tag, comm_ptr, context_id, status); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -212,7 +212,7 @@ int MPIC_Wait(MPID_Request * request_ptr, MPIR_Errflag_t *errflag) MPL_DBG_MSG_S(MPIR_DBG_PT2PT, TYPICAL, "IN: errflag = %s", *errflag?"TRUE":"FALSE"); - if (request_ptr->kind == MPID_REQUEST_SEND) + if (request_ptr->kind == MPIR_REQUEST_SEND) request_ptr->status.MPI_TAG = 0; if (!MPID_Request_is_complete(request_ptr)) @@ -228,7 +228,7 @@ int MPIC_Wait(MPID_Request * request_ptr, MPIR_Errflag_t *errflag) MPID_Progress_end(&progress_state); } - if (request_ptr->kind == MPID_REQUEST_RECV) + if (request_ptr->kind == MPIR_REQUEST_RECV) MPIR_Process_status(&request_ptr->status, errflag); MPIR_TAG_CLEAR_ERROR_BITS(request_ptr->status.MPI_TAG); @@ -292,8 +292,8 @@ int MPIC_Send(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, MPIR_TAG_SET_ERROR_BIT(tag); } - context_id = (comm_ptr->comm_kind == MPID_INTRACOMM) ? - MPID_CONTEXT_INTRA_COLL : MPID_CONTEXT_INTER_COLL; + context_id = (comm_ptr->comm_kind == MPIR_INTRACOMM) ? + MPIR_CONTEXT_INTRA_COLL : MPIR_CONTEXT_INTER_COLL; mpi_errno = MPID_Send(buf, count, datatype, dest, tag, comm_ptr, context_id, &request_ptr); @@ -342,8 +342,8 @@ int MPIC_Recv(void *buf, MPI_Aint count, MPI_Datatype datatype, int source, int MPIR_ERR_CHKANDJUMP1((count < 0), mpi_errno, MPI_ERR_COUNT, "**countneg", "**countneg %d", count); - context_id = (comm_ptr->comm_kind == MPID_INTRACOMM) ? - MPID_CONTEXT_INTRA_COLL : MPID_CONTEXT_INTER_COLL; + context_id = (comm_ptr->comm_kind == MPIR_INTRACOMM) ? + MPIR_CONTEXT_INTRA_COLL : MPIR_CONTEXT_INTER_COLL; if (status == MPI_STATUS_IGNORE) status = &mystatus; @@ -399,8 +399,8 @@ int MPIC_Ssend(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, MPIR_ERR_CHKANDJUMP1((count < 0), mpi_errno, MPI_ERR_COUNT, "**countneg", "**countneg %d", count); - context_id = (comm_ptr->comm_kind == MPID_INTRACOMM) ? - MPID_CONTEXT_INTRA_COLL : MPID_CONTEXT_INTER_COLL; + context_id = (comm_ptr->comm_kind == MPIR_INTRACOMM) ? + MPIR_CONTEXT_INTRA_COLL : MPIR_CONTEXT_INTER_COLL; switch(*errflag) { case MPIR_ERR_NONE: @@ -462,8 +462,8 @@ int MPIC_Sendrecv(const void *sendbuf, MPI_Aint sendcount, MPI_Datatype sendtype MPIR_ERR_CHKANDJUMP1((recvcount < 0), mpi_errno, MPI_ERR_COUNT, "**countneg", "**countneg %d", recvcount); - context_id = (comm_ptr->comm_kind == MPID_INTRACOMM) ? - MPID_CONTEXT_INTRA_COLL : MPID_CONTEXT_INTER_COLL; + context_id = (comm_ptr->comm_kind == MPIR_INTRACOMM) ? + MPIR_CONTEXT_INTRA_COLL : MPIR_CONTEXT_INTER_COLL; if (status == MPI_STATUS_IGNORE) status = &mystatus; switch(*errflag) { @@ -557,8 +557,8 @@ int MPIC_Sendrecv_replace(void *buf, int count, MPI_Datatype datatype, MPIR_TAG_SET_ERROR_BIT(sendtag); } - context_id_offset = (comm_ptr->comm_kind == MPID_INTRACOMM) ? - MPID_CONTEXT_INTRA_COLL : MPID_CONTEXT_INTER_COLL; + context_id_offset = (comm_ptr->comm_kind == MPIR_INTRACOMM) ? + MPIR_CONTEXT_INTRA_COLL : MPIR_CONTEXT_INTER_COLL; if (count > 0 && dest != MPI_PROC_NULL) { MPIR_Pack_size_impl(count, datatype, &tmpbuf_size); @@ -641,8 +641,8 @@ int MPIC_Isend(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, MPIR_TAG_SET_ERROR_BIT(tag); } - context_id = (comm_ptr->comm_kind == MPID_INTRACOMM) ? - MPID_CONTEXT_INTRA_COLL : MPID_CONTEXT_INTER_COLL; + context_id = (comm_ptr->comm_kind == MPIR_INTRACOMM) ? + MPIR_CONTEXT_INTRA_COLL : MPIR_CONTEXT_INTER_COLL; mpi_errno = MPID_Isend(buf, count, datatype, dest, tag, comm_ptr, context_id, request_ptr); @@ -682,8 +682,8 @@ int MPIC_Issend(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest MPIR_TAG_SET_ERROR_BIT(tag); } - context_id = (comm_ptr->comm_kind == MPID_INTRACOMM) ? - MPID_CONTEXT_INTRA_COLL : MPID_CONTEXT_INTER_COLL; + context_id = (comm_ptr->comm_kind == MPIR_INTRACOMM) ? + MPIR_CONTEXT_INTRA_COLL : MPIR_CONTEXT_INTER_COLL; mpi_errno = MPID_Issend(buf, count, datatype, dest, tag, comm_ptr, context_id, request_ptr); @@ -712,8 +712,8 @@ int MPIC_Irecv(void *buf, MPI_Aint count, MPI_Datatype datatype, int source, MPIR_ERR_CHKANDJUMP1((count < 0), mpi_errno, MPI_ERR_COUNT, "**countneg", "**countneg %d", count); - context_id = (comm_ptr->comm_kind == MPID_INTRACOMM) ? - MPID_CONTEXT_INTRA_COLL : MPID_CONTEXT_INTER_COLL; + context_id = (comm_ptr->comm_kind == MPIR_INTRACOMM) ? + MPIR_CONTEXT_INTRA_COLL : MPIR_CONTEXT_INTER_COLL; mpi_errno = MPID_Irecv(buf, count, datatype, source, tag, comm_ptr, context_id, request_ptr); diff --git a/src/mpi/coll/iallgather.c b/src/mpi/coll/iallgather.c index d1e2578..0f50655 100644 --- a/src/mpi/coll/iallgather.c +++ b/src/mpi/coll/iallgather.c @@ -708,7 +708,7 @@ int MPI_Iallgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPIR_ERRTEST_ARGNULL(request,"request", mpi_errno); /* catch common aliasing cases */ - if (comm_ptr->comm_kind == MPID_INTRACOMM && recvbuf != MPI_IN_PLACE && sendtype == recvtype && sendcount == recvcount && sendcount != 0) { + if (comm_ptr->comm_kind == MPIR_INTRACOMM && recvbuf != MPI_IN_PLACE && sendtype == recvtype && sendcount == recvcount && sendcount != 0) { int recvtype_size; MPID_Datatype_get_size_macro(recvtype, recvtype_size); MPIR_ERRTEST_ALIAS_COLL(sendbuf, (char*)recvbuf + comm_ptr->rank*recvcount*recvtype_size, mpi_errno); diff --git a/src/mpi/coll/iallgatherv.c b/src/mpi/coll/iallgatherv.c index 13dbfbd..c440134 100644 --- a/src/mpi/coll/iallgatherv.c +++ b/src/mpi/coll/iallgatherv.c @@ -802,7 +802,7 @@ int MPI_Iallgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, v } /* catch common aliasing cases */ - if (comm_ptr->comm_kind == MPID_INTRACOMM && + if (comm_ptr->comm_kind == MPIR_INTRACOMM && sendtype == recvtype && recvcounts[comm_ptr->rank] != 0 && sendcount != 0) { diff --git a/src/mpi/coll/iallreduce.c b/src/mpi/coll/iallreduce.c index b7d36f1..c5bebf2 100644 --- a/src/mpi/coll/iallreduce.c +++ b/src/mpi/coll/iallreduce.c @@ -439,7 +439,7 @@ int MPIR_Iallreduce_intra(const void *sendbuf, void *recvbuf, int count, MPI_Dat int mpi_errno = MPI_SUCCESS; int comm_size, is_homogeneous, pof2, type_size; - MPIU_Assert(comm_ptr->comm_kind == MPID_INTRACOMM); + MPIU_Assert(comm_ptr->comm_kind == MPIR_INTRACOMM); is_homogeneous = TRUE; #ifdef MPID_HAS_HETERO @@ -509,7 +509,7 @@ int MPIR_Iallreduce_inter(const void *sendbuf, void *recvbuf, int count, MPI_Dat int rank, root; MPIR_Comm *lcomm_ptr = NULL; - MPIU_Assert(comm_ptr->comm_kind == MPID_INTERCOMM); + MPIU_Assert(comm_ptr->comm_kind == MPIR_INTERCOMM); rank = comm_ptr->rank; @@ -758,7 +758,7 @@ int MPI_Iallreduce(const void *sendbuf, void *recvbuf, int count, } if (mpi_errno != MPI_SUCCESS) goto fn_fail; - if (comm_ptr->comm_kind == MPID_INTERCOMM) + if (comm_ptr->comm_kind == MPIR_INTERCOMM) MPIR_ERRTEST_SENDBUF_INPLACE(sendbuf, count, mpi_errno); if (sendbuf != MPI_IN_PLACE) @@ -766,7 +766,7 @@ int MPI_Iallreduce(const void *sendbuf, void *recvbuf, int count, MPIR_ERRTEST_ARGNULL(request,"request", mpi_errno); - if (comm_ptr->comm_kind == MPID_INTRACOMM && count != 0 && sendbuf != MPI_IN_PLACE) + if (comm_ptr->comm_kind == MPIR_INTRACOMM && count != 0 && sendbuf != MPI_IN_PLACE) MPIR_ERRTEST_ALIAS_COLL(sendbuf, recvbuf, mpi_errno); /* TODO more checks may be appropriate (counts, in_place, buffer aliasing, etc) */ diff --git a/src/mpi/coll/ialltoall.c b/src/mpi/coll/ialltoall.c index b532ccf..7da0b26 100644 --- a/src/mpi/coll/ialltoall.c +++ b/src/mpi/coll/ialltoall.c @@ -637,7 +637,7 @@ int MPI_Ialltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPIR_ERRTEST_ARGNULL(request,"request", mpi_errno); - if (comm_ptr->comm_kind == MPID_INTRACOMM && + if (comm_ptr->comm_kind == MPIR_INTRACOMM && sendbuf != MPI_IN_PLACE && sendcount == recvcount && sendtype == recvtype && diff --git a/src/mpi/coll/ialltoallv.c b/src/mpi/coll/ialltoallv.c index 84bd456..ec4484a 100644 --- a/src/mpi/coll/ialltoallv.c +++ b/src/mpi/coll/ialltoallv.c @@ -47,7 +47,7 @@ int MPIR_Ialltoallv_intra(const void *sendbuf, const int sendcounts[], const int int dst, rank; MPIR_SCHED_CHKPMEM_DECL(1); - MPIU_Assert(comm_ptr->comm_kind == MPID_INTRACOMM); + MPIU_Assert(comm_ptr->comm_kind == MPIR_INTRACOMM); comm_size = comm_ptr->local_size; rank = comm_ptr->rank; @@ -182,7 +182,7 @@ int MPIR_Ialltoallv_inter(const void *sendbuf, const int sendcounts[], const int int src, dst, rank, sendcount, recvcount; char *sendaddr, *recvaddr; - MPIU_Assert(comm_ptr->comm_kind == MPID_INTERCOMM); + MPIU_Assert(comm_ptr->comm_kind == MPIR_INTERCOMM); local_size = comm_ptr->local_size; remote_size = comm_ptr->remote_size; @@ -373,7 +373,7 @@ int MPI_Ialltoallv(const void *sendbuf, const int sendcounts[], const int sdispl MPIR_ERRTEST_ARGNULL(request,"request", mpi_errno); - if (comm_ptr->comm_kind == MPID_INTRACOMM && + if (comm_ptr->comm_kind == MPIR_INTRACOMM && sendbuf != MPI_IN_PLACE && sendcounts == recvcounts && sendtype == recvtype) diff --git a/src/mpi/coll/ialltoallw.c b/src/mpi/coll/ialltoallw.c index 27428b8..2dc71af 100644 --- a/src/mpi/coll/ialltoallw.c +++ b/src/mpi/coll/ialltoallw.c @@ -354,7 +354,7 @@ int MPI_Ialltoallw(const void *sendbuf, const int sendcounts[], const int sdispl MPIR_ERRTEST_ARGNULL(sdispls,"sdispls", mpi_errno); MPIR_ERRTEST_ARGNULL(sendtypes,"sendtypes", mpi_errno); - if (comm_ptr->comm_kind == MPID_INTRACOMM && + if (comm_ptr->comm_kind == MPIR_INTRACOMM && sendcounts == recvcounts && sendtypes == recvtypes) MPIR_ERRTEST_ALIAS_COLL(sendbuf,recvbuf,mpi_errno); @@ -362,7 +362,7 @@ int MPI_Ialltoallw(const void *sendbuf, const int sendcounts[], const int sdispl MPIR_ERRTEST_ARGNULL(recvcounts,"recvcounts", mpi_errno); MPIR_ERRTEST_ARGNULL(rdispls,"rdispls", mpi_errno); MPIR_ERRTEST_ARGNULL(recvtypes,"recvtypes", mpi_errno); - if (comm_ptr->comm_kind == MPID_INTERCOMM && sendbuf == MPI_IN_PLACE) { + if (comm_ptr->comm_kind == MPIR_INTERCOMM && sendbuf == MPI_IN_PLACE) { MPIR_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**sendbuf_inplace"); } MPIR_ERRTEST_ARGNULL(request,"request", mpi_errno); diff --git a/src/mpi/coll/ibarrier.c b/src/mpi/coll/ibarrier.c index f8acb46..dd8bf78 100644 --- a/src/mpi/coll/ibarrier.c +++ b/src/mpi/coll/ibarrier.c @@ -58,7 +58,7 @@ int MPIR_Ibarrier_intra(MPIR_Comm *comm_ptr, MPID_Sched_t s) int mpi_errno = MPI_SUCCESS; int size, rank, src, dst, mask; - MPIU_Assert(comm_ptr->comm_kind == MPID_INTRACOMM); + MPIU_Assert(comm_ptr->comm_kind == MPIR_INTRACOMM); size = comm_ptr->local_size; rank = comm_ptr->rank; @@ -103,7 +103,7 @@ int MPIR_Ibarrier_inter(MPIR_Comm *comm_ptr, MPID_Sched_t s) MPIR_SCHED_CHKPMEM_DECL(1); char *buf = NULL; - MPIU_Assert(comm_ptr->comm_kind == MPID_INTERCOMM); + MPIU_Assert(comm_ptr->comm_kind == MPIR_INTERCOMM); rank = comm_ptr->rank; @@ -178,7 +178,7 @@ int MPIR_Ibarrier_impl(MPIR_Comm *comm_ptr, MPI_Request *request) *request = MPI_REQUEST_NULL; - if (comm_ptr->local_size != 1 || comm_ptr->comm_kind == MPID_INTERCOMM) { + if (comm_ptr->local_size != 1 || comm_ptr->comm_kind == MPIR_INTERCOMM) { mpi_errno = MPID_Sched_next_tag(comm_ptr, &tag); if (mpi_errno) MPIR_ERR_POP(mpi_errno); mpi_errno = MPID_Sched_create(&s); diff --git a/src/mpi/coll/ibcast.c b/src/mpi/coll/ibcast.c index 9682ba8..482c915 100644 --- a/src/mpi/coll/ibcast.c +++ b/src/mpi/coll/ibcast.c @@ -867,7 +867,7 @@ int MPIR_Ibcast_intra(void *buffer, int count, MPI_Datatype datatype, int root, int comm_size, is_homogeneous ATTRIBUTE((unused)); MPI_Aint type_size, nbytes; - MPIU_Assert(comm_ptr->comm_kind == MPID_INTRACOMM); + MPIU_Assert(comm_ptr->comm_kind == MPIR_INTRACOMM); is_homogeneous = 1; #ifdef MPID_HAS_HETERO @@ -916,7 +916,7 @@ int MPIR_Ibcast_inter(void *buffer, int count, MPI_Datatype datatype, int root, { int mpi_errno = MPI_SUCCESS; - MPIU_Assert(comm_ptr->comm_kind == MPID_INTERCOMM); + MPIU_Assert(comm_ptr->comm_kind == MPIR_INTERCOMM); /* Intercommunicator broadcast. * Root sends to rank 0 in remote group. Remote group does local diff --git a/src/mpi/coll/igather.c b/src/mpi/coll/igather.c index 350a4c2..fa20b6c 100644 --- a/src/mpi/coll/igather.c +++ b/src/mpi/coll/igather.c @@ -83,7 +83,7 @@ int MPIR_Igather_binomial(const void *sendbuf, int sendcount, MPI_Datatype sendt is_homogeneous = !comm_ptr->is_hetero; #endif - MPIU_Assert(comm_ptr->comm_kind == MPID_INTRACOMM); + MPIU_Assert(comm_ptr->comm_kind == MPIR_INTRACOMM); /* Use binomial tree algorithm. */ @@ -625,7 +625,7 @@ int MPI_Igather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; - if (comm_ptr->comm_kind == MPID_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_INTRACOMM) { MPIR_ERRTEST_INTRA_ROOT(comm_ptr, root, mpi_errno); if (sendbuf != MPI_IN_PLACE) { @@ -666,7 +666,7 @@ int MPI_Igather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPIR_ERRTEST_SENDBUF_INPLACE(sendbuf, sendcount, mpi_errno); } - if (comm_ptr->comm_kind == MPID_INTERCOMM) { + if (comm_ptr->comm_kind == MPIR_INTERCOMM) { MPIR_ERRTEST_INTER_ROOT(comm_ptr, root, mpi_errno); if (root == MPI_ROOT) { diff --git a/src/mpi/coll/igatherv.c b/src/mpi/coll/igatherv.c index 3e5cdfa..36df4f6 100644 --- a/src/mpi/coll/igatherv.c +++ b/src/mpi/coll/igatherv.c @@ -46,10 +46,10 @@ int MPIR_Igatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, voi rank = comm_ptr->rank; /* If rank == root, then I recv lots, otherwise I send */ - if (((comm_ptr->comm_kind == MPID_INTRACOMM) && (root == rank)) || - ((comm_ptr->comm_kind == MPID_INTERCOMM) && (root == MPI_ROOT))) + if (((comm_ptr->comm_kind == MPIR_INTRACOMM) && (root == rank)) || + ((comm_ptr->comm_kind == MPIR_INTERCOMM) && (root == MPI_ROOT))) { - if (comm_ptr->comm_kind == MPID_INTRACOMM) + if (comm_ptr->comm_kind == MPIR_INTRACOMM) comm_size = comm_ptr->local_size; else comm_size = comm_ptr->remote_size; @@ -60,7 +60,7 @@ int MPIR_Igatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, voi for (i = 0; i < comm_size; i++) { if (recvcounts[i]) { - if ((comm_ptr->comm_kind == MPID_INTRACOMM) && (i == rank)) { + if ((comm_ptr->comm_kind == MPIR_INTRACOMM) && (i == rank)) { if (sendbuf != MPI_IN_PLACE) { mpi_errno = MPID_Sched_copy(sendbuf, sendcount, sendtype, ((char *)recvbuf+displs[rank]*extent), @@ -209,7 +209,7 @@ int MPI_Igatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; - if (comm_ptr->comm_kind == MPID_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_INTRACOMM) { MPIR_ERRTEST_INTRA_ROOT(comm_ptr, root, mpi_errno); if (sendbuf != MPI_IN_PLACE) { @@ -259,7 +259,7 @@ int MPI_Igatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void MPIR_ERRTEST_SENDBUF_INPLACE(sendbuf, sendcount, mpi_errno); } - if (comm_ptr->comm_kind == MPID_INTERCOMM) { + if (comm_ptr->comm_kind == MPIR_INTERCOMM) { MPIR_ERRTEST_INTER_ROOT(comm_ptr, root, mpi_errno); if (root == MPI_ROOT) { diff --git a/src/mpi/coll/ired_scat.c b/src/mpi/coll/ired_scat.c index b69ddfd..29c1ad8 100644 --- a/src/mpi/coll/ired_scat.c +++ b/src/mpi/coll/ired_scat.c @@ -1128,7 +1128,7 @@ int MPI_Ireduce_scatter(const void *sendbuf, void *recvbuf, const int recvcounts while (i < comm_ptr->remote_size && recvcounts[i] == 0) ++i; - if (comm_ptr->comm_kind == MPID_INTRACOMM && sendbuf != MPI_IN_PLACE && i < comm_ptr->remote_size) + if (comm_ptr->comm_kind == MPIR_INTRACOMM && sendbuf != MPI_IN_PLACE && i < comm_ptr->remote_size) MPIR_ERRTEST_ALIAS_COLL(sendbuf, recvbuf, mpi_errno) /* TODO more checks may be appropriate (counts, in_place, etc) */ } diff --git a/src/mpi/coll/ired_scat_block.c b/src/mpi/coll/ired_scat_block.c index 4c64c14..0a0d243 100644 --- a/src/mpi/coll/ired_scat_block.c +++ b/src/mpi/coll/ired_scat_block.c @@ -1025,7 +1025,7 @@ int MPI_Ireduce_scatter_block(const void *sendbuf, void *recvbuf, MPIR_ERRTEST_ARGNULL(request,"request", mpi_errno); - if (comm_ptr->comm_kind == MPID_INTRACOMM && sendbuf != MPI_IN_PLACE && recvcount != 0) + if (comm_ptr->comm_kind == MPIR_INTRACOMM && sendbuf != MPI_IN_PLACE && recvcount != 0) MPIR_ERRTEST_ALIAS_COLL(sendbuf, recvbuf, mpi_errno) /* TODO more checks may be appropriate (counts, in_place, etc) */ } diff --git a/src/mpi/coll/ireduce.c b/src/mpi/coll/ireduce.c index 5d4066a..43eaabc 100644 --- a/src/mpi/coll/ireduce.c +++ b/src/mpi/coll/ireduce.c @@ -42,7 +42,7 @@ int MPIR_Ireduce_binomial(const void *sendbuf, void *recvbuf, int count, MPI_Dat void *tmp_buf; MPIR_SCHED_CHKPMEM_DECL(2); - MPIU_Assert(comm_ptr->comm_kind == MPID_INTRACOMM); + MPIU_Assert(comm_ptr->comm_kind == MPIR_INTRACOMM); if (count == 0) return MPI_SUCCESS; @@ -544,7 +544,7 @@ int MPIR_Ireduce_intra(const void *sendbuf, void *recvbuf, int count, MPI_Dataty int mpi_errno = MPI_SUCCESS; int pof2, type_size, comm_size; - MPIU_Assert(comm_ptr->comm_kind == MPID_INTRACOMM); + MPIU_Assert(comm_ptr->comm_kind == MPIR_INTRACOMM); comm_size = comm_ptr->local_size; @@ -592,7 +592,7 @@ int MPIR_Ireduce_SMP(const void *sendbuf, void *recvbuf, int count, MPI_Datatype if (!MPIR_CVAR_ENABLE_SMP_COLLECTIVES || !MPIR_CVAR_ENABLE_SMP_REDUCE) MPID_Abort(comm_ptr, MPI_ERR_OTHER, 1, "SMP collectives are disabled!"); MPIU_Assert(MPIR_Comm_is_node_aware(comm_ptr)); - MPIU_Assert(comm_ptr->comm_kind == MPID_INTRACOMM); + MPIU_Assert(comm_ptr->comm_kind == MPIR_INTRACOMM); nc = comm_ptr->node_comm; nrc = comm_ptr->node_roots_comm; @@ -699,7 +699,7 @@ int MPIR_Ireduce_inter(const void *sendbuf, void *recvbuf, int count, MPI_Dataty void *tmp_buf = NULL; MPIR_SCHED_CHKPMEM_DECL(1); - MPIU_Assert(comm_ptr->comm_kind == MPID_INTERCOMM); + MPIU_Assert(comm_ptr->comm_kind == MPIR_INTERCOMM); /* Intercommunicator reduce. Remote group does a local intracommunicator @@ -883,7 +883,7 @@ int MPI_Ireduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype data MPIR_ERRTEST_ARGNULL(request,"request", mpi_errno); - if (comm_ptr->comm_kind == MPID_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_INTRACOMM) { if (sendbuf != MPI_IN_PLACE) MPIR_ERRTEST_USERBUFFER(sendbuf,count,datatype,mpi_errno); diff --git a/src/mpi/coll/iscatter.c b/src/mpi/coll/iscatter.c index 7904433..69dc81d 100644 --- a/src/mpi/coll/iscatter.c +++ b/src/mpi/coll/iscatter.c @@ -639,7 +639,7 @@ int MPI_Iscatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, { MPID_Datatype *sendtype_ptr, *recvtype_ptr; MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); - if (comm_ptr->comm_kind == MPID_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_INTRACOMM) { MPIR_ERRTEST_INTRA_ROOT(comm_ptr, root, mpi_errno); if (comm_ptr->rank == root) { @@ -679,7 +679,7 @@ int MPI_Iscatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, } } - if (comm_ptr->comm_kind == MPID_INTERCOMM) { + if (comm_ptr->comm_kind == MPIR_INTERCOMM) { MPIR_ERRTEST_INTER_ROOT(comm_ptr, root, mpi_errno); if (root == MPI_ROOT) { diff --git a/src/mpi/coll/iscatterv.c b/src/mpi/coll/iscatterv.c index fc6e84c..8a34f0b 100644 --- a/src/mpi/coll/iscatterv.c +++ b/src/mpi/coll/iscatterv.c @@ -62,10 +62,10 @@ int MPIR_Iscatterv(const void *sendbuf, const int sendcounts[], const int displs rank = comm_ptr->rank; /* If I'm the root, then scatter */ - if (((comm_ptr->comm_kind == MPID_INTRACOMM) && (root == rank)) || - ((comm_ptr->comm_kind == MPID_INTERCOMM) && (root == MPI_ROOT))) + if (((comm_ptr->comm_kind == MPIR_INTRACOMM) && (root == rank)) || + ((comm_ptr->comm_kind == MPIR_INTERCOMM) && (root == MPI_ROOT))) { - if (comm_ptr->comm_kind == MPID_INTRACOMM) + if (comm_ptr->comm_kind == MPIR_INTRACOMM) comm_size = comm_ptr->local_size; else comm_size = comm_ptr->remote_size; @@ -81,7 +81,7 @@ int MPIR_Iscatterv(const void *sendbuf, const int sendcounts[], const int displs for (i = 0; i < comm_size; i++) { if (sendcounts[i]) { - if ((comm_ptr->comm_kind == MPID_INTRACOMM) && (i == rank)) { + if ((comm_ptr->comm_kind == MPIR_INTRACOMM) && (i == rank)) { if (recvbuf != MPI_IN_PLACE) { mpi_errno = MPID_Sched_copy(((char *)sendbuf+displs[rank]*extent), sendcounts[rank], sendtype, @@ -218,7 +218,7 @@ int MPI_Iscatterv(const void *sendbuf, const int sendcounts[], const int displs[ MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; - if (comm_ptr->comm_kind == MPID_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_INTRACOMM) { MPIR_ERRTEST_INTRA_ROOT(comm_ptr, root, mpi_errno); rank = comm_ptr->rank; comm_size = comm_ptr->local_size; @@ -272,7 +272,7 @@ int MPI_Iscatterv(const void *sendbuf, const int sendcounts[], const int displs[ } } - if (comm_ptr->comm_kind == MPID_INTERCOMM) { + if (comm_ptr->comm_kind == MPIR_INTERCOMM) { MPIR_ERRTEST_INTER_ROOT(comm_ptr, root, mpi_errno); if (root == MPI_ROOT) { comm_size = comm_ptr->remote_size; diff --git a/src/mpi/coll/op_commutative.c b/src/mpi/coll/op_commutative.c index 05719d4..81dded3 100644 --- a/src/mpi/coll/op_commutative.c +++ b/src/mpi/coll/op_commutative.c @@ -82,7 +82,7 @@ int MPI_Op_commutative(MPI_Op op, int *commute) *commute = 1; } else { - if (op_ptr->kind == MPID_OP_USER_NONCOMMUTE) + if (op_ptr->kind == MPIR_OP_USER_NONCOMMUTE) *commute = 0; else *commute = 1; diff --git a/src/mpi/coll/op_create.c b/src/mpi/coll/op_create.c index 8a8cd68..d9cc324 100644 --- a/src/mpi/coll/op_create.c +++ b/src/mpi/coll/op_create.c @@ -25,17 +25,17 @@ int MPI_Op_create(MPI_User_function *user_fn, int commute, MPI_Op *op) __attribu #undef MPI_Op_create #define MPI_Op_create PMPI_Op_create -#ifndef MPID_OP_PREALLOC -#define MPID_OP_PREALLOC 16 +#ifndef MPIR_OP_PREALLOC +#define MPIR_OP_PREALLOC 16 #endif /* Preallocated op objects */ -MPIR_Op MPIR_Op_builtin[MPID_OP_N_BUILTIN] = { {0} }; -MPIR_Op MPIR_Op_direct[MPID_OP_PREALLOC] = { {0} }; +MPIR_Op MPIR_Op_builtin[MPIR_OP_N_BUILTIN] = { {0} }; +MPIR_Op MPIR_Op_direct[MPIR_OP_PREALLOC] = { {0} }; MPIU_Object_alloc_t MPIR_Op_mem = { 0, 0, 0, 0, MPID_OP, sizeof(MPIR_Op), MPIR_Op_direct, - MPID_OP_PREALLOC, }; + MPIR_OP_PREALLOC, }; #ifdef HAVE_CXX_BINDING void MPIR_Op_set_cxx( MPI_Op op, void (*opcall)(void) ) @@ -43,7 +43,7 @@ void MPIR_Op_set_cxx( MPI_Op op, void (*opcall)(void) ) MPIR_Op *op_ptr; MPIR_Op_get_ptr( op, op_ptr ); - op_ptr->language = MPID_LANG_CXX; + op_ptr->language = MPIR_LANG_CXX; MPIR_Process.cxx_call_op_fn = (void (*)(const void *, void *, int, MPI_Datatype, MPI_User_function *))opcall; } @@ -58,7 +58,7 @@ void MPIR_Op_set_fc( MPI_Op op ) MPIR_Op *op_ptr; MPIR_Op_get_ptr( op, op_ptr ); - op_ptr->language = MPID_LANG_FORTRAN; + op_ptr->language = MPIR_LANG_FORTRAN; } #endif @@ -123,8 +123,8 @@ int MPI_Op_create(MPI_User_function *user_fn, int commute, MPI_Op *op) } /* --END ERROR HANDLING-- */ - op_ptr->language = MPID_LANG_C; - op_ptr->kind = commute ? MPID_OP_USER : MPID_OP_USER_NONCOMMUTE; + op_ptr->language = MPIR_LANG_C; + op_ptr->kind = commute ? MPIR_OP_USER : MPIR_OP_USER_NONCOMMUTE; op_ptr->function.c_function = (void (*)(const void *, void *, const int *, const MPI_Datatype *))user_fn; MPIU_Object_set_ref(op_ptr,1); diff --git a/src/mpi/coll/op_free.c b/src/mpi/coll/op_free.c index 36e161e..9307de5 100644 --- a/src/mpi/coll/op_free.c +++ b/src/mpi/coll/op_free.c @@ -74,7 +74,7 @@ int MPI_Op_free(MPI_Op *op) { MPIR_Op_valid_ptr( op_ptr, mpi_errno ); if (!mpi_errno) { - if (op_ptr->kind < MPID_OP_USER_NONCOMMUTE) { + if (op_ptr->kind < MPIR_OP_USER_NONCOMMUTE) { mpi_errno = MPIR_Err_create_code( MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_OP, "**permop", 0 ); diff --git a/src/mpi/coll/red_scat.c b/src/mpi/coll/red_scat.c index 1285048..4b212dc 100644 --- a/src/mpi/coll/red_scat.c +++ b/src/mpi/coll/red_scat.c @@ -280,7 +280,7 @@ int MPIR_Reduce_scatter_intra(const void *sendbuf, void *recvbuf, const int recv } else { MPIR_Op_get_ptr(op, op_ptr); - if (op_ptr->kind == MPID_OP_USER_NONCOMMUTE) + if (op_ptr->kind == MPIR_OP_USER_NONCOMMUTE) is_commutative = 0; else is_commutative = 1; @@ -1048,7 +1048,7 @@ int MPIR_Reduce_scatter(const void *sendbuf, void *recvbuf, const int recvcounts { int mpi_errno = MPI_SUCCESS; - if (comm_ptr->comm_kind == MPID_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_INTRACOMM) { /* intracommunicator */ mpi_errno = MPIR_Reduce_scatter_intra(sendbuf, recvbuf, recvcounts, datatype, op, comm_ptr, errflag); @@ -1193,7 +1193,7 @@ int MPI_Reduce_scatter(const void *sendbuf, void *recvbuf, const int recvcounts[ } MPIR_ERRTEST_RECVBUF_INPLACE(recvbuf, recvcounts[comm_ptr->rank], mpi_errno); - if (comm_ptr->comm_kind == MPID_INTERCOMM) { + if (comm_ptr->comm_kind == MPIR_INTERCOMM) { MPIR_ERRTEST_SENDBUF_INPLACE(sendbuf, sum, mpi_errno); } else if (sendbuf != MPI_IN_PLACE && sum != 0) MPIR_ERRTEST_ALIAS_COLL(sendbuf, recvbuf, mpi_errno) diff --git a/src/mpi/coll/red_scat_block.c b/src/mpi/coll/red_scat_block.c index 7472e00..0599e18 100644 --- a/src/mpi/coll/red_scat_block.c +++ b/src/mpi/coll/red_scat_block.c @@ -284,7 +284,7 @@ int MPIR_Reduce_scatter_block_intra ( } else { MPIR_Op_get_ptr(op, op_ptr); - if (op_ptr->kind == MPID_OP_USER_NONCOMMUTE) + if (op_ptr->kind == MPIR_OP_USER_NONCOMMUTE) is_commutative = 0; else is_commutative = 1; @@ -1017,7 +1017,7 @@ int MPIR_Reduce_scatter_block(const void *sendbuf, void *recvbuf, { int mpi_errno = MPI_SUCCESS; - if (comm_ptr->comm_kind == MPID_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_INTRACOMM) { /* intracommunicator */ mpi_errno = MPIR_Reduce_scatter_block_intra(sendbuf, recvbuf, recvcount, datatype, op, comm_ptr, errflag); if (mpi_errno) MPIR_ERR_POP(mpi_errno); @@ -1054,7 +1054,7 @@ int MPIR_Reduce_scatter_block_impl(const void *sendbuf, void *recvbuf, if (mpi_errno) MPIR_ERR_POP(mpi_errno); /* --END USEREXTENSION-- */ } else { - if (comm_ptr->comm_kind == MPID_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_INTRACOMM) { /* intracommunicator */ mpi_errno = MPIR_Reduce_scatter_block_intra(sendbuf, recvbuf, recvcount, datatype, op, comm_ptr, errflag); if (mpi_errno) MPIR_ERR_POP(mpi_errno); @@ -1158,7 +1158,7 @@ int MPI_Reduce_scatter_block(const void *sendbuf, void *recvbuf, } MPIR_ERRTEST_RECVBUF_INPLACE(recvbuf, recvcount, mpi_errno); - if (comm_ptr->comm_kind == MPID_INTERCOMM) { + if (comm_ptr->comm_kind == MPIR_INTERCOMM) { MPIR_ERRTEST_SENDBUF_INPLACE(sendbuf, recvcount, mpi_errno); } else if (sendbuf != MPI_IN_PLACE && recvcount != 0) MPIR_ERRTEST_ALIAS_COLL(sendbuf, recvbuf, mpi_errno) diff --git a/src/mpi/coll/reduce.c b/src/mpi/coll/reduce.c index 9c53a12..3e69b70 100644 --- a/src/mpi/coll/reduce.c +++ b/src/mpi/coll/reduce.c @@ -753,7 +753,7 @@ int MPIR_Reduce_intra ( is_commutative = 1; else { MPIR_Op_get_ptr(op, op_ptr); - is_commutative = (op_ptr->kind == MPID_OP_USER_NONCOMMUTE) ? 0 : 1; + is_commutative = (op_ptr->kind == MPIR_OP_USER_NONCOMMUTE) ? 0 : 1; } MPID_Datatype_get_size_macro(datatype, type_size); @@ -1039,7 +1039,7 @@ int MPIR_Reduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype data { int mpi_errno = MPI_SUCCESS; - if (comm_ptr->comm_kind == MPID_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_INTRACOMM) { /* intracommunicator */ mpi_errno = MPIR_Reduce_intra(sendbuf, recvbuf, count, datatype, op, root, comm_ptr, errflag); @@ -1077,7 +1077,7 @@ int MPIR_Reduce_impl(const void *sendbuf, void *recvbuf, int count, MPI_Datatype if (mpi_errno) MPIR_ERR_POP(mpi_errno); /* --END USEREXTENSION-- */ } else { - if (comm_ptr->comm_kind == MPID_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_INTRACOMM) { /* intracommunicator */ mpi_errno = MPIR_Reduce_intra(sendbuf, recvbuf, count, datatype, op, root, comm_ptr, errflag); @@ -1175,7 +1175,7 @@ int MPI_Reduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datat MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; - if (comm_ptr->comm_kind == MPID_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_INTRACOMM) { MPIR_ERRTEST_INTRA_ROOT(comm_ptr, root, mpi_errno); MPIR_ERRTEST_COUNT(count, mpi_errno); @@ -1203,7 +1203,7 @@ int MPI_Reduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datat MPIR_ERRTEST_SENDBUF_INPLACE(sendbuf, count, mpi_errno); } - if (comm_ptr->comm_kind == MPID_INTERCOMM) { + if (comm_ptr->comm_kind == MPIR_INTERCOMM) { MPIR_ERRTEST_INTER_ROOT(comm_ptr, root, mpi_errno); if (root == MPI_ROOT) { diff --git a/src/mpi/coll/reduce_local.c b/src/mpi/coll/reduce_local.c index e8fa5d4..d76c155 100644 --- a/src/mpi/coll/reduce_local.c +++ b/src/mpi/coll/reduce_local.c @@ -65,14 +65,14 @@ int MPIR_Reduce_local_impl(const void *inbuf, void *inoutbuf, int count, MPI_Dat MPIR_Op_get_ptr(op, op_ptr); #ifdef HAVE_CXX_BINDING - if (op_ptr->language == MPID_LANG_CXX) { + if (op_ptr->language == MPIR_LANG_CXX) { uop = (MPI_User_function *) op_ptr->function.c_function; is_cxx_uop = 1; } else #endif { - if (op_ptr->language == MPID_LANG_C) { + if (op_ptr->language == MPIR_LANG_C) { uop = (MPI_User_function *) op_ptr->function.c_function; } else { diff --git a/src/mpi/coll/scan.c b/src/mpi/coll/scan.c index bc4a554..4c3f964 100644 --- a/src/mpi/coll/scan.c +++ b/src/mpi/coll/scan.c @@ -112,7 +112,7 @@ static int MPIR_Scan_generic ( } else { MPIR_Op_get_ptr(op, op_ptr); - if (op_ptr->kind == MPID_OP_USER_NONCOMMUTE) + if (op_ptr->kind == MPIR_OP_USER_NONCOMMUTE) is_commutative = 0; else is_commutative = 1; diff --git a/src/mpi/coll/scatter.c b/src/mpi/coll/scatter.c index 3f6e95d..1aac657 100644 --- a/src/mpi/coll/scatter.c +++ b/src/mpi/coll/scatter.c @@ -577,7 +577,7 @@ int MPIR_Scatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, { int mpi_errno = MPI_SUCCESS; - if (comm_ptr->comm_kind == MPID_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_INTRACOMM) { /* intracommunicator */ mpi_errno = MPIR_Scatter_intra(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, @@ -706,7 +706,7 @@ int MPI_Scatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; - if (comm_ptr->comm_kind == MPID_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_INTRACOMM) { MPIR_ERRTEST_INTRA_ROOT(comm_ptr, root, mpi_errno); rank = comm_ptr->rank; @@ -747,7 +747,7 @@ int MPI_Scatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, } } - if (comm_ptr->comm_kind == MPID_INTERCOMM) { + if (comm_ptr->comm_kind == MPIR_INTERCOMM) { MPIR_ERRTEST_INTER_ROOT(comm_ptr, root, mpi_errno); if (root == MPI_ROOT) { diff --git a/src/mpi/coll/scatterv.c b/src/mpi/coll/scatterv.c index e0347ff..f29eebb 100644 --- a/src/mpi/coll/scatterv.c +++ b/src/mpi/coll/scatterv.c @@ -71,9 +71,9 @@ int MPIR_Scatterv(const void *sendbuf, const int *sendcounts, const int *displs, MPIDU_ERR_CHECK_MULTIPLE_THREADS_ENTER( comm_ptr ); /* If I'm the root, then scatter */ - if (((comm_ptr->comm_kind == MPID_INTRACOMM) && (root == rank)) || - ((comm_ptr->comm_kind == MPID_INTERCOMM) && (root == MPI_ROOT))) { - if (comm_ptr->comm_kind == MPID_INTRACOMM) + if (((comm_ptr->comm_kind == MPIR_INTRACOMM) && (root == rank)) || + ((comm_ptr->comm_kind == MPIR_INTERCOMM) && (root == MPI_ROOT))) { + if (comm_ptr->comm_kind == MPIR_INTRACOMM) comm_size = comm_ptr->local_size; else comm_size = comm_ptr->remote_size; @@ -93,7 +93,7 @@ int MPIR_Scatterv(const void *sendbuf, const int *sendcounts, const int *displs, reqs = 0; for (i = 0; i < comm_size; i++) { if (sendcounts[i]) { - if ((comm_ptr->comm_kind == MPID_INTRACOMM) && (i == rank)) { + if ((comm_ptr->comm_kind == MPIR_INTRACOMM) && (i == rank)) { if (recvbuf != MPI_IN_PLACE) { mpi_errno = MPIR_Localcopy(((char *)sendbuf+displs[rank]*extent), sendcounts[rank], sendtype, @@ -267,7 +267,7 @@ int MPI_Scatterv(const void *sendbuf, const int *sendcounts, const int *displs, MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; - if (comm_ptr->comm_kind == MPID_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_INTRACOMM) { MPIR_ERRTEST_INTRA_ROOT(comm_ptr, root, mpi_errno); rank = comm_ptr->rank; comm_size = comm_ptr->local_size; @@ -320,7 +320,7 @@ int MPI_Scatterv(const void *sendbuf, const int *sendcounts, const int *displs, } } - if (comm_ptr->comm_kind == MPID_INTERCOMM) { + if (comm_ptr->comm_kind == MPIR_INTERCOMM) { MPIR_ERRTEST_INTER_ROOT(comm_ptr, root, mpi_errno); if (root == MPI_ROOT) { comm_size = comm_ptr->remote_size; diff --git a/src/mpi/comm/comm_compare.c b/src/mpi/comm/comm_compare.c index 05ac7a0..e9f4322 100644 --- a/src/mpi/comm/comm_compare.c +++ b/src/mpi/comm/comm_compare.c @@ -118,7 +118,7 @@ int MPI_Comm_compare(MPI_Comm comm1, MPI_Comm comm2, int *result) else if (comm1 == comm2) { *result = MPI_IDENT; } - else if (comm_ptr1->comm_kind == MPID_INTRACOMM) { + else if (comm_ptr1->comm_kind == MPIR_INTRACOMM) { MPIR_Group *group_ptr1, *group_ptr2; mpi_errno = MPIR_Comm_group_impl(comm_ptr1, &group_ptr1); diff --git a/src/mpi/comm/comm_create.c b/src/mpi/comm/comm_create.c index fae94f9..f58f7bd 100644 --- a/src/mpi/comm/comm_create.c +++ b/src/mpi/comm/comm_create.c @@ -79,7 +79,7 @@ int MPIR_Comm_create_calculate_mapping(MPIR_Group *group_ptr, MPIR_Group_setup_lpid_list( group_ptr ); /* Optimize for groups contained within MPI_COMM_WORLD. */ - if (comm_ptr->comm_kind == MPID_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_INTRACOMM) { int wsize; subsetOfWorld = 1; wsize = MPIR_Process.comm_world->local_size; @@ -169,7 +169,7 @@ int MPIR_Comm_create_map(int local_n, MPIR_Comm_map_irregular(newcomm, mapping_comm, local_mapping, local_n, MPIR_COMM_MAP_DIR_L2L, NULL); - if (mapping_comm->comm_kind == MPID_INTERCOMM) { + if (mapping_comm->comm_kind == MPIR_INTERCOMM) { MPIR_Comm_map_irregular(newcomm, mapping_comm, remote_mapping, remote_n, MPIR_COMM_MAP_DIR_R2R, NULL); } @@ -198,7 +198,7 @@ int MPIR_Comm_create_intra(MPIR_Comm *comm_ptr, MPIR_Group *group_ptr, MPID_MPI_FUNC_ENTER(MPID_STATE_MPIR_COMM_CREATE_INTRA); - MPIU_Assert(comm_ptr->comm_kind == MPID_INTRACOMM); + MPIU_Assert(comm_ptr->comm_kind == MPIR_INTRACOMM); n = group_ptr->size; *newcomm_ptr = NULL; @@ -299,7 +299,7 @@ PMPI_LOCAL int MPIR_Comm_create_inter(MPIR_Comm *comm_ptr, MPIR_Group *group_ptr MPID_MPI_FUNC_ENTER(MPID_STATE_MPIR_COMM_CREATE_INTER); - MPIU_Assert(comm_ptr->comm_kind == MPID_INTERCOMM); + MPIU_Assert(comm_ptr->comm_kind == MPIR_INTERCOMM); /* Create a new communicator from the specified group members */ @@ -536,12 +536,12 @@ int MPI_Comm_create(MPI_Comm comm, MPI_Group group, MPI_Comm *newcomm) /* ... body of routine ... */ - if (comm_ptr->comm_kind == MPID_INTRACOMM) { + if (comm_ptr->comm_kind == MPIR_INTRACOMM) { mpi_errno = MPIR_Comm_create_intra(comm_ptr, group_ptr, &newcomm_ptr); if (mpi_errno) MPIR_ERR_POP(mpi_errno); } else { - MPIU_Assert(comm_ptr->comm_kind == MPID_INTERCOMM); + MPIU_Assert(comm_ptr->comm_kind == MPIR_INTERCOMM); mpi_errno = MPIR_Comm_create_inter(comm_ptr, group_ptr, &newcomm_ptr); if (mpi_errno) MPIR_ERR_POP(mpi_errno); } diff --git a/src/mpi/comm/comm_create_group.c b/src/mpi/comm/comm_create_group.c index c092d98..e5e1573 100644 --- a/src/mpi/comm/comm_create_group.c +++ b/src/mpi/comm/comm_create_group.c @@ -44,7 +44,7 @@ int MPIR_Comm_create_group(MPIR_Comm * comm_ptr, MPIR_Group * group_ptr, int tag MPID_MPI_STATE_DECL(MPID_STATE_MPIR_COMM_CREATE_GROUP); MPID_MPI_FUNC_ENTER(MPID_STATE_MPIR_COMM_CREATE_GROUP); - MPIU_Assert(comm_ptr->comm_kind == MPID_INTRACOMM); + MPIU_Assert(comm_ptr->comm_kind == MPIR_INTRACOMM); n = group_ptr->size; *newcomm_ptr = NULL; diff --git a/src/mpi/comm/comm_idup.c b/src/mpi/comm/comm_idup.c index 4b4aff9..c80d3e5 100644 --- a/src/mpi/comm/comm_idup.c +++ b/src/mpi/comm/comm_idup.c @@ -55,7 +55,7 @@ int MPIR_Comm_idup_impl(MPIR_Comm *comm_ptr, MPIR_Comm **newcommp, MPID_Request /* We now have a mostly-valid new communicator, so begin the process of * allocating a context ID to use for actual communication */ - if (comm_ptr->comm_kind == MPID_INTERCOMM) { + if (comm_ptr->comm_kind == MPIR_INTERCOMM) { mpi_errno = MPIR_Get_intercomm_contextid_nonblock(comm_ptr, *newcommp, reqp); if (mpi_errno) MPIR_ERR_POP(mpi_errno); } diff --git a/src/mpi/comm/comm_remote_group.c b/src/mpi/comm/comm_remote_group.c index ba69093..fc7f82d 100644 --- a/src/mpi/comm/comm_remote_group.c +++ b/src/mpi/comm/comm_remote_group.c @@ -130,7 +130,7 @@ int MPI_Comm_remote_group(MPI_Comm comm, MPI_Group *group) /* Validate comm_ptr */ MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); /* If comm_ptr is not valid, it will be reset to null */ - if (comm_ptr && comm_ptr->comm_kind != MPID_INTERCOMM) { + if (comm_ptr && comm_ptr->comm_kind != MPIR_INTERCOMM) { mpi_errno = MPIR_Err_create_code( MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_COMM, "**commnotinter", 0 ); diff --git a/src/mpi/comm/comm_remote_size.c b/src/mpi/comm/comm_remote_size.c index 5523d96..f713767 100644 --- a/src/mpi/comm/comm_remote_size.c +++ b/src/mpi/comm/comm_remote_size.c @@ -84,7 +84,7 @@ int MPI_Comm_remote_size(MPI_Comm comm, int *size) /* Validate comm_ptr */ MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); /* If comm_ptr is not valid, it will be reset to null */ - if (comm_ptr && comm_ptr->comm_kind != MPID_INTERCOMM) { + if (comm_ptr && comm_ptr->comm_kind != MPIR_INTERCOMM) { mpi_errno = MPIR_Err_create_code( MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_COMM, "**commnotinter", 0 ); diff --git a/src/mpi/comm/comm_split.c b/src/mpi/comm/comm_split.c index c61c8f5..5c3dbd7 100644 --- a/src/mpi/comm/comm_split.c +++ b/src/mpi/comm/comm_split.c @@ -153,7 +153,7 @@ int MPIR_Comm_split_impl(MPIR_Comm *comm_ptr, int color, int key, MPIR_Comm **ne /* Get the communicator to use in collectives on the local group of processes */ - if (comm_ptr->comm_kind == MPID_INTERCOMM) { + if (comm_ptr->comm_kind == MPIR_INTERCOMM) { if (!comm_ptr->local_comm) { MPIR_Setup_intercomm_localcomm( comm_ptr ); } @@ -191,7 +191,7 @@ int MPIR_Comm_split_impl(MPIR_Comm *comm_ptr, int color, int key, MPIR_Comm **ne /* If we're an intercomm, we need to do the same thing for the remote table, as we need to know the size of the remote group of the same color before deciding to create the communicator */ - if (comm_ptr->comm_kind == MPID_INTERCOMM) { + if (comm_ptr->comm_kind == MPIR_INTERCOMM) { splittype mypair; /* For the remote group, the situation is more complicated. We need to find the size of our "partner" group in the @@ -253,7 +253,7 @@ int MPIR_Comm_split_impl(MPIR_Comm *comm_ptr, int color, int key, MPIR_Comm **ne MPIU_Assert(new_context_id != 0); /* In the intercomm case, we need to exchange the context ids */ - if (comm_ptr->comm_kind == MPID_INTERCOMM) { + if (comm_ptr->comm_kind == MPIR_INTERCOMM) { if (comm_ptr->rank == 0) { mpi_errno = MPIC_Sendrecv( &new_context_id, 1, MPIU_CONTEXT_ID_T_DATATYPE, 0, 0, &remote_context_id, 1, MPIU_CONTEXT_ID_T_DATATYPE, @@ -301,7 +301,7 @@ int MPIR_Comm_split_impl(MPIR_Comm *comm_ptr, int color, int key, MPIR_Comm **ne process in the input communicator */ MPIU_Sort_inttable( keytable, new_size ); - if (comm_ptr->comm_kind == MPID_INTERCOMM) { + if (comm_ptr->comm_kind == MPIR_INTERCOMM) { MPIU_CHKLMEM_MALLOC(remotekeytable,sorttype*, new_remote_size*sizeof(sorttype), mpi_errno,"remote keytable"); diff --git a/src/mpi/comm/comm_split_type.c b/src/mpi/comm/comm_split_type.c index db2aeb7..f7407e7 100644 --- a/src/mpi/comm/comm_split_type.c +++ b/src/mpi/comm/comm_split_type.c @@ -77,7 +77,7 @@ int MPIR_Comm_split_type_impl(MPIR_Comm * comm_ptr, int split_type, int key, split_type = MPI_UNDEFINED; } - if (MPID_Comm_fns == NULL || MPID_Comm_fns->split_type == NULL) { + if (MPIR_Comm_fns == NULL || MPIR_Comm_fns->split_type == NULL) { int color = (split_type == MPI_COMM_TYPE_SHARED) ? comm_ptr->rank : MPI_UNDEFINED; /* The default implementation is to either pass MPI_UNDEFINED @@ -87,7 +87,7 @@ int MPIR_Comm_split_type_impl(MPIR_Comm * comm_ptr, int split_type, int key, } else { mpi_errno = - MPID_Comm_fns->split_type(comm_ptr, split_type, key, info_ptr, newcomm_ptr); + MPIR_Comm_fns->split_type(comm_ptr, split_type, key, info_ptr, newcomm_ptr); } if (mpi_errno) MPIR_ERR_POP(mpi_errno); diff --git a/src/mpi/comm/comm_test_inter.c b/src/mpi/comm/comm_test_inter.c index 56d7340..b64e1bd 100644 --- a/src/mpi/comm/comm_test_inter.c +++ b/src/mpi/comm/comm_test_inter.c @@ -92,7 +92,7 @@ int MPI_Comm_test_inter(MPI_Comm comm, int *flag) /* ... body of routine ... */ - *flag = (comm_ptr->comm_kind == MPID_INTERCOMM); + *flag = (comm_ptr->comm_kind == MPIR_INTERCOMM); /* ... end of body of routine ... */ diff --git a/src/mpi/comm/commutil.c b/src/mpi/comm/commutil.c index 7e4b7cf..0aa40a4 100644 --- a/src/mpi/comm/commutil.c +++ b/src/mpi/comm/commutil.c @@ -19,7 +19,7 @@ /* Preallocated comm objects */ /* initialized in initthread.c */ -MPIR_Comm MPID_Comm_builtin[MPID_COMM_N_BUILTIN] = { {0} }; +MPIR_Comm MPIR_Comm_builtin[MPIR_COMM_N_BUILTIN] = { {0} }; MPIR_Comm MPIR_Comm_direct[MPID_COMM_PREALLOC] = { {0} }; MPIU_Object_alloc_t MPIR_Comm_mem = { @@ -34,7 +34,7 @@ MPIU_Object_alloc_t MPIR_Comm_mem = { }; /* Communicator creation functions */ -struct MPIR_Commops *MPID_Comm_fns = NULL; +struct MPIR_Commops *MPIR_Comm_fns = NULL; struct MPIR_Comm_hint_fn_elt { char name[MPI_MAX_INFO_KEY]; MPIR_Comm_hint_fn_t fn; @@ -90,7 +90,7 @@ int MPIR_Comm_init(MPIR_Comm * comm_p) comm_p->name[0] = '\0'; comm_p->info = NULL; - comm_p->hierarchy_kind = MPID_HIERARCHY_FLAT; + comm_p->hierarchy_kind = MPIR_HIERARCHY_FLAT; comm_p->node_comm = NULL; comm_p->node_roots_comm = NULL; comm_p->intranode_table = NULL; @@ -173,7 +173,7 @@ int MPIR_Setup_intercomm_localcomm(MPIR_Comm * intercomm_ptr) /* use the parent intercomm's recv ctx as the basis for our ctx */ localcomm_ptr->recvcontext_id = - MPID_CONTEXT_SET_FIELD(IS_LOCALCOMM, intercomm_ptr->recvcontext_id, 1); + MPIR_CONTEXT_SET_FIELD(IS_LOCALCOMM, intercomm_ptr->recvcontext_id, 1); localcomm_ptr->context_id = localcomm_ptr->recvcontext_id; MPL_DBG_MSG_FMT(MPIR_DBG_COMM, TYPICAL, @@ -183,7 +183,7 @@ int MPIR_Setup_intercomm_localcomm(MPIR_Comm * intercomm_ptr) localcomm_ptr->recvcontext_id)); /* Save the kind of the communicator */ - localcomm_ptr->comm_kind = MPID_INTRACOMM; + localcomm_ptr->comm_kind = MPIR_INTRACOMM; /* Set the sizes and ranks */ localcomm_ptr->remote_size = intercomm_ptr->local_size; @@ -213,7 +213,7 @@ int MPIR_Setup_intercomm_localcomm(MPIR_Comm * intercomm_ptr) /* holds default collop "vtables" for _intracomms_, where * default[hierarchy_kind] is the pointer to the collop struct for that * hierarchy kind */ -static struct MPIR_Collops *default_collops[MPID_HIERARCHY_SIZE] = { NULL }; +static struct MPIR_Collops *default_collops[MPIR_HIERARCHY_SIZE] = { NULL }; /* default for intercomms */ static struct MPIR_Collops *ic_default_collops = NULL; @@ -225,7 +225,7 @@ static struct MPIR_Collops *ic_default_collops = NULL; static int cleanup_default_collops(void *unused) { int i; - for (i = 0; i < MPID_HIERARCHY_SIZE; ++i) { + for (i = 0; i < MPIR_HIERARCHY_SIZE; ++i) { if (default_collops[i]) { MPIU_Assert(default_collops[i]->ref_count >= 1); if (--default_collops[i]->ref_count == 0) @@ -250,10 +250,10 @@ static int init_default_collops(void) int mpi_errno = MPI_SUCCESS; int i; struct MPIR_Collops *ops = NULL; - MPIU_CHKPMEM_DECL(MPID_HIERARCHY_SIZE + 1); + MPIU_CHKPMEM_DECL(MPIR_HIERARCHY_SIZE + 1); /* first initialize the intracomms */ - for (i = 0; i < MPID_HIERARCHY_SIZE; ++i) { + for (i = 0; i < MPIR_HIERARCHY_SIZE; ++i) { MPIU_CHKPMEM_CALLOC(ops, struct MPIR_Collops *, sizeof(struct MPIR_Collops), mpi_errno, "default intracomm collops"); ops->ref_count = 1; /* force existence until finalize time */ @@ -289,17 +289,17 @@ static int init_default_collops(void) /* override defaults, such as for SMP */ switch (i) { - case MPID_HIERARCHY_FLAT: + case MPIR_HIERARCHY_FLAT: break; - case MPID_HIERARCHY_PARENT: + case MPIR_HIERARCHY_PARENT: ops->Ibcast_sched = &MPIR_Ibcast_SMP; ops->Iscan_sched = &MPIR_Iscan_SMP; ops->Iallreduce_sched = &MPIR_Iallreduce_SMP; ops->Ireduce_sched = &MPIR_Ireduce_SMP; break; - case MPID_HIERARCHY_NODE: + case MPIR_HIERARCHY_NODE: break; - case MPID_HIERARCHY_NODE_ROOTS: + case MPIR_HIERARCHY_NODE_ROOTS: break; /* --BEGIN ERROR HANDLING-- */ @@ -388,7 +388,7 @@ static int set_collops(MPIR_Comm * comm) initialized = TRUE; } - if (comm->comm_kind == MPID_INTRACOMM) { + if (comm->comm_kind == MPIR_INTRACOMM) { /* FIXME MT what protects access to this structure and ic_default_collops? */ comm->coll_fns = default_collops[comm->hierarchy_kind]; } @@ -549,7 +549,7 @@ int MPIR_Comm_commit(MPIR_Comm * comm) MPIR_Comm_map_free(comm); - if (comm->comm_kind == MPID_INTRACOMM) { + if (comm->comm_kind == MPIR_INTRACOMM) { mpi_errno = MPIU_Find_local_and_external(comm, &num_local, &local_rank, &local_procs, @@ -592,11 +592,11 @@ int MPIR_Comm_commit(MPIR_Comm * comm) if (mpi_errno) MPIR_ERR_POP(mpi_errno); - comm->node_comm->context_id = comm->context_id + MPID_CONTEXT_INTRANODE_OFFSET; + comm->node_comm->context_id = comm->context_id + MPIR_CONTEXT_INTRANODE_OFFSET; comm->node_comm->recvcontext_id = comm->node_comm->context_id; comm->node_comm->rank = local_rank; - comm->node_comm->comm_kind = MPID_INTRACOMM; - comm->node_comm->hierarchy_kind = MPID_HIERARCHY_NODE; + comm->node_comm->comm_kind = MPIR_INTRACOMM; + comm->node_comm->hierarchy_kind = MPIR_HIERARCHY_NODE; comm->node_comm->local_comm = NULL; MPL_DBG_MSG_D(MPIR_DBG_COMM, VERBOSE, "Create node_comm=%p\n", comm->node_comm); @@ -626,11 +626,11 @@ int MPIR_Comm_commit(MPIR_Comm * comm) if (mpi_errno) MPIR_ERR_POP(mpi_errno); - comm->node_roots_comm->context_id = comm->context_id + MPID_CONTEXT_INTERNODE_OFFSET; + comm->node_roots_comm->context_id = comm->context_id + MPIR_CONTEXT_INTERNODE_OFFSET; comm->node_roots_comm->recvcontext_id = comm->node_roots_comm->context_id; comm->node_roots_comm->rank = external_rank; - comm->node_roots_comm->comm_kind = MPID_INTRACOMM; - comm->node_roots_comm->hierarchy_kind = MPID_HIERARCHY_NODE_ROOTS; + comm->node_roots_comm->comm_kind = MPIR_INTRACOMM; + comm->node_roots_comm->hierarchy_kind = MPIR_HIERARCHY_NODE_ROOTS; comm->node_roots_comm->local_comm = NULL; comm->node_roots_comm->local_size = num_external; @@ -652,7 +652,7 @@ int MPIR_Comm_commit(MPIR_Comm * comm) MPIR_Comm_map_free(comm->node_roots_comm); } - comm->hierarchy_kind = MPID_HIERARCHY_PARENT; + comm->hierarchy_kind = MPIR_HIERARCHY_PARENT; } fn_exit: @@ -672,7 +672,7 @@ int MPIR_Comm_commit(MPIR_Comm * comm) collective communication, for example. */ int MPIR_Comm_is_node_aware(MPIR_Comm * comm) { - return (comm->hierarchy_kind == MPID_HIERARCHY_PARENT); + return (comm->hierarchy_kind == MPIR_HIERARCHY_PARENT); } /* Returns true if the communicator is node-aware and processes in all the nodes @@ -727,7 +727,7 @@ int MPIR_Comm_copy(MPIR_Comm * comm_ptr, int size, MPIR_Comm ** outcomm_ptr) /* If there is a context id cache in oldcomm, use it here. Otherwise, * use the appropriate algorithm to get a new context id. Be careful * of intercomms here */ - if (comm_ptr->comm_kind == MPID_INTERCOMM) { + if (comm_ptr->comm_kind == MPIR_INTERCOMM) { mpi_errno = MPIR_Get_intercomm_contextid(comm_ptr, &new_context_id, &new_recvcontext_id); if (mpi_errno) MPIR_ERR_POP(mpi_errno); @@ -769,7 +769,7 @@ int MPIR_Comm_copy(MPIR_Comm * comm_ptr, int size, MPIR_Comm ** outcomm_ptr) * test that matches the test on rank above. */ if (size == comm_ptr->local_size) { /* Duplicate the network address mapping */ - if (comm_ptr->comm_kind == MPID_INTRACOMM) + if (comm_ptr->comm_kind == MPIR_INTRACOMM) MPIR_Comm_map_dup(newcomm_ptr, comm_ptr, MPIR_COMM_MAP_DIR_L2L); else MPIR_Comm_map_dup(newcomm_ptr, comm_ptr, MPIR_COMM_MAP_DIR_R2R); @@ -777,7 +777,7 @@ int MPIR_Comm_copy(MPIR_Comm * comm_ptr, int size, MPIR_Comm ** outcomm_ptr) else { int i; - if (comm_ptr->comm_kind == MPID_INTRACOMM) + if (comm_ptr->comm_kind == MPIR_INTRACOMM) MPIR_Comm_map_irregular(newcomm_ptr, comm_ptr, NULL, size, MPIR_COMM_MAP_DIR_L2L, &map); else MPIR_Comm_map_irregular(newcomm_ptr, comm_ptr, NULL, size, MPIR_COMM_MAP_DIR_R2R, &map); @@ -789,13 +789,13 @@ int MPIR_Comm_copy(MPIR_Comm * comm_ptr, int size, MPIR_Comm ** outcomm_ptr) } /* If it is an intercomm, duplicate the local network address references */ - if (comm_ptr->comm_kind == MPID_INTERCOMM) { + if (comm_ptr->comm_kind == MPIR_INTERCOMM) { MPIR_Comm_map_dup(newcomm_ptr, comm_ptr, MPIR_COMM_MAP_DIR_L2L); } /* Set the sizes and ranks */ newcomm_ptr->rank = comm_ptr->rank; - if (comm_ptr->comm_kind == MPID_INTERCOMM) { + if (comm_ptr->comm_kind == MPIR_INTERCOMM) { newcomm_ptr->local_size = comm_ptr->local_size; newcomm_ptr->remote_size = comm_ptr->remote_size; newcomm_ptr->is_low_group = comm_ptr->is_low_group; @@ -870,13 +870,13 @@ int MPIR_Comm_copy_data(MPIR_Comm * comm_ptr, MPIR_Comm ** outcomm_ptr) newcomm_ptr->comm_kind = comm_ptr->comm_kind; newcomm_ptr->local_comm = 0; - if (comm_ptr->comm_kind == MPID_INTRACOMM) + if (comm_ptr->comm_kind == MPIR_INTRACOMM) MPIR_Comm_map_dup(newcomm_ptr, comm_ptr, MPIR_COMM_MAP_DIR_L2L); else MPIR_Comm_map_dup(newcomm_ptr, comm_ptr, MPIR_COMM_MAP_DIR_R2R); /* If it is an intercomm, duplicate the network address mapping */ - if (comm_ptr->comm_kind == MPID_INTERCOMM) { + if (comm_ptr->comm_kind == MPIR_INTERCOMM) { MPIR_Comm_map_dup(newcomm_ptr, comm_ptr, MPIR_COMM_MAP_DIR_L2L); } @@ -970,7 +970,7 @@ int MPIR_Comm_delete_internal(MPIR_Comm * comm_ptr) comm_ptr->coll_fns = NULL; } - if (comm_ptr->comm_kind == MPID_INTERCOMM && comm_ptr->local_comm) + if (comm_ptr->comm_kind == MPIR_INTERCOMM && comm_ptr->local_comm) MPIR_Comm_release(comm_ptr->local_comm); /* Free the local and remote groups, if they exist */ diff --git a/src/mpi/comm/contextid.c b/src/mpi/comm/contextid.c index 2a53918..f622e50 100644 --- a/src/mpi/comm/contextid.c +++ b/src/mpi/comm/contextid.c @@ -48,7 +48,7 @@ const int ALL_OWN_MASK_FLAG = MPIR_MAX_CONTEXT_MASK; #ifdef MPL_USE_DBG_LOGGING static void dump_context_id(MPIU_Context_id_t context_id, char *out_str, int len) { - int subcomm_type = MPID_CONTEXT_READ_FIELD(SUBCOMM, context_id); + int subcomm_type = MPIR_CONTEXT_READ_FIELD(SUBCOMM, context_id); const char *subcomm_type_name = NULL; switch (subcomm_type) { @@ -69,11 +69,11 @@ static void dump_context_id(MPIU_Context_id_t context_id, char *out_str, int len "context_id=%d (%#x): DYNAMIC_PROC=%d PREFIX=%#x IS_LOCALCOMM=%d SUBCOMM=%s SUFFIX=%s", context_id, context_id, - MPID_CONTEXT_READ_FIELD(DYNAMIC_PROC, context_id), - MPID_CONTEXT_READ_FIELD(PREFIX, context_id), - MPID_CONTEXT_READ_FIELD(IS_LOCALCOMM, context_id), + MPIR_CONTEXT_READ_FIELD(DYNAMIC_PROC, context_id), + MPIR_CONTEXT_READ_FIELD(PREFIX, context_id), + MPIR_CONTEXT_READ_FIELD(IS_LOCALCOMM, context_id), subcomm_type_name, - (MPID_CONTEXT_READ_FIELD(SUFFIX, context_id) ? "coll" : "pt2pt")); + (MPIR_CONTEXT_READ_FIELD(SUFFIX, context_id) ? "coll" : "pt2pt")); } #endif @@ -223,7 +223,7 @@ static int locate_context_bit(uint32_t local_mask[]) if (val & 0xAAAAAAAA) { j += 1; } - context_id = (MPIR_CONTEXT_INT_BITS * i + j) << MPID_CONTEXT_PREFIX_SHIFT; + context_id = (MPIR_CONTEXT_INT_BITS * i + j) << MPIR_CONTEXT_PREFIX_SHIFT; return context_id; } } @@ -236,7 +236,7 @@ static int locate_context_bit(uint32_t local_mask[]) static int allocate_context_bit(uint32_t mask[], MPIU_Context_id_t id) { int raw_prefix, idx, bitpos; - raw_prefix = MPID_CONTEXT_READ_FIELD(PREFIX, id); + raw_prefix = MPIR_CONTEXT_READ_FIELD(PREFIX, id); idx = raw_prefix / MPIR_CONTEXT_INT_BITS; bitpos = raw_prefix % MPIR_CONTEXT_INT_BITS; @@ -481,7 +481,7 @@ int MPIR_Get_contextid_sparse_group(MPIR_Comm * comm_ptr, MPIR_Group * group_ptr st.local_mask[ALL_OWN_MASK_FLAG] = 0; /* Now, try to get a context id */ - MPIU_Assert(comm_ptr->comm_kind == MPID_INTRACOMM); + MPIU_Assert(comm_ptr->comm_kind == MPIR_INTRACOMM); /* In the global and brief-global cases, note that this routine will * release that global lock when it needs to wait. That will allow * other processes to enter the global or brief global critical section. @@ -685,7 +685,7 @@ static int sched_cb_gcn_bcast(MPIR_Comm * comm, int tag, void *state) int mpi_errno = MPI_SUCCESS; struct gcn_state *st = state; - if (st->gcn_cid_kind == MPID_INTERCOMM) { + if (st->gcn_cid_kind == MPIR_INTERCOMM) { if (st->comm_ptr_inter->rank == 0) { mpi_errno = MPID_Sched_recv(st->ctx1, 1, MPIU_CONTEXT_ID_T_DATATYPE, 0, st->comm_ptr_inter, @@ -966,7 +966,7 @@ static int sched_get_cid_nonblock(MPIR_Comm * comm_ptr, MPIR_Comm * newcomm, MPIU_CHKPMEM_MALLOC(st, struct gcn_state *, sizeof(struct gcn_state), mpi_errno, "gcn_state"); st->ctx0 = ctx0; st->ctx1 = ctx1; - if (gcn_cid_kind == MPID_INTRACOMM) { + if (gcn_cid_kind == MPIR_INTRACOMM) { st->comm_ptr = comm_ptr; st->comm_ptr_inter = NULL; } @@ -1028,7 +1028,7 @@ int MPIR_Get_contextid_nonblock(MPIR_Comm * comm_ptr, MPIR_Comm * newcommp, MPID /* add some entries to it */ mpi_errno = sched_get_cid_nonblock(comm_ptr, newcommp, &newcommp->context_id, &newcommp->recvcontext_id, - s, MPID_INTRACOMM); + s, MPIR_INTRACOMM); if (mpi_errno) MPIR_ERR_POP(mpi_errno); @@ -1080,7 +1080,7 @@ int MPIR_Get_intercomm_contextid_nonblock(MPIR_Comm * comm_ptr, MPIR_Comm * newc /* first get a context ID over the local comm */ mpi_errno = sched_get_cid_nonblock(comm_ptr, newcommp, &newcommp->recvcontext_id, &newcommp->context_id, - s, MPID_INTERCOMM); + s, MPIR_INTERCOMM); if (mpi_errno) MPIR_ERR_POP(mpi_errno); @@ -1187,7 +1187,7 @@ void MPIR_Free_contextid(MPIU_Context_id_t context_id) MPID_MPI_FUNC_ENTER(MPID_STATE_MPIR_FREE_CONTEXTID); /* Convert the context id to the bit position */ - raw_prefix = MPID_CONTEXT_READ_FIELD(PREFIX, context_id); + raw_prefix = MPIR_CONTEXT_READ_FIELD(PREFIX, context_id); idx = raw_prefix / MPIR_CONTEXT_INT_BITS; bitpos = raw_prefix % MPIR_CONTEXT_INT_BITS; @@ -1200,7 +1200,7 @@ void MPIR_Free_contextid(MPIU_Context_id_t context_id) /* The low order bits for dynamic context IDs don't have meaning the * same way that low bits of non-dynamic ctx IDs do. So we have to * check the dynamic case first. */ - if (MPID_CONTEXT_READ_FIELD(DYNAMIC_PROC, context_id)) { + if (MPIR_CONTEXT_READ_FIELD(DYNAMIC_PROC, context_id)) { MPL_DBG_MSG_D(MPIR_DBG_COMM, VERBOSE, "skipping dynamic process ctx id, context_id=%d", context_id); goto fn_exit; } @@ -1209,7 +1209,7 @@ void MPIR_Free_contextid(MPIU_Context_id_t context_id) * localcomms have the same value. To avoid a double-free situation we just * don't free the context ID for localcomms and assume it will be cleaned up * when the parent intercomm is itself completely freed. */ - if (MPID_CONTEXT_READ_FIELD(IS_LOCALCOMM, context_id)) { + if (MPIR_CONTEXT_READ_FIELD(IS_LOCALCOMM, context_id)) { #ifdef MPL_USE_DBG_LOGGING char dump_str[1024]; dump_context_id(context_id, dump_str, sizeof(dump_str)); @@ -1217,7 +1217,7 @@ void MPIR_Free_contextid(MPIU_Context_id_t context_id) #endif goto fn_exit; } - else if (MPID_CONTEXT_READ_FIELD(SUBCOMM, context_id)) { + else if (MPIR_CONTEXT_READ_FIELD(SUBCOMM, context_id)) { MPL_DBG_MSG_D(MPIR_DBG_COMM, VERBOSE, "skipping non-parent communicator ctx id, context_id=%d", context_id); goto fn_exit; diff --git a/src/mpi/comm/intercomm_create.c b/src/mpi/comm/intercomm_create.c index 6d61393..88f6571 100644 --- a/src/mpi/comm/intercomm_create.c +++ b/src/mpi/comm/intercomm_create.c @@ -330,7 +330,7 @@ int MPIR_Intercomm_create_impl(MPIR_Comm *local_comm_ptr, int local_leader, (*new_intercomm_ptr)->remote_size = remote_size; (*new_intercomm_ptr)->local_size = local_comm_ptr->local_size; (*new_intercomm_ptr)->rank = local_comm_ptr->rank; - (*new_intercomm_ptr)->comm_kind = MPID_INTERCOMM; + (*new_intercomm_ptr)->comm_kind = MPIR_INTERCOMM; (*new_intercomm_ptr)->local_comm = 0; (*new_intercomm_ptr)->is_low_group = is_low_group; @@ -503,7 +503,7 @@ int MPI_Intercomm_create(MPI_Comm local_comm, int local_leader, process that is the local leader (local_comm_ptr->rank == local_leader because we can then use peer_comm_ptr->rank to get the rank in peer_comm of the local leader. */ - if (peer_comm_ptr->comm_kind == MPID_INTRACOMM && + if (peer_comm_ptr->comm_kind == MPIR_INTRACOMM && local_comm_ptr->rank == local_leader && peer_comm_ptr->rank == remote_leader) { MPIR_ERR_SET(mpi_errno,MPI_ERR_RANK,"**ranksdistinct"); diff --git a/src/mpi/comm/intercomm_merge.c b/src/mpi/comm/intercomm_merge.c index 22c41d0..b84d8f0 100644 --- a/src/mpi/comm/intercomm_merge.c +++ b/src/mpi/comm/intercomm_merge.c @@ -153,7 +153,7 @@ int MPIR_Intercomm_merge_impl(MPIR_Comm *comm_ptr, int high, MPIR_Comm **new_int (*new_intracomm_ptr)->recvcontext_id = (*new_intracomm_ptr)->context_id; (*new_intracomm_ptr)->remote_size = (*new_intracomm_ptr)->local_size = new_size; (*new_intracomm_ptr)->rank = -1; - (*new_intracomm_ptr)->comm_kind = MPID_INTRACOMM; + (*new_intracomm_ptr)->comm_kind = MPIR_INTRACOMM; /* Now we know which group comes first. Build the new mapping from the existing comm */ @@ -187,7 +187,7 @@ int MPIR_Intercomm_merge_impl(MPIR_Comm *comm_ptr, int high, MPIR_Comm **new_int (*new_intracomm_ptr)->remote_size = (*new_intracomm_ptr)->local_size = new_size; (*new_intracomm_ptr)->rank = -1; - (*new_intracomm_ptr)->comm_kind = MPID_INTRACOMM; + (*new_intracomm_ptr)->comm_kind = MPIR_INTRACOMM; (*new_intracomm_ptr)->context_id = new_context_id; (*new_intracomm_ptr)->recvcontext_id = new_context_id; @@ -284,7 +284,7 @@ int MPI_Intercomm_merge(MPI_Comm intercomm, int high, MPI_Comm *newintracomm) /* Validate comm_ptr */ MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); /* If comm_ptr is not valid, it will be reset to null */ - if (comm_ptr && comm_ptr->comm_kind != MPID_INTERCOMM) { + if (comm_ptr && comm_ptr->comm_kind != MPIR_INTERCOMM) { mpi_errno = MPIR_Err_create_code( MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, MPI_ERR_COMM, "**commnotinter", 0 ); diff --git a/src/mpi/debugger/dbgstub.c b/src/mpi/debugger/dbgstub.c index 0df28d8..4dc7c8c 100644 --- a/src/mpi/debugger/dbgstub.c +++ b/src/mpi/debugger/dbgstub.c @@ -46,7 +46,7 @@ enum { TYPE_UNKNOWN = 0, TYPE_MPIR_COMM_LIST = 2, TYPE_MPIDI_REQUEST = 3, TYPE_MPIDI_MESSAGE_MATCH = 4, - TYPE_MPID_REQUEST = 5, + TYPE_MPIR_REQUEST = 5, TYPE_MPIR_SENDQ = 6, TYPE_MPIDI_MESSAGE_MATCH_PARTS = 7, } KnownTypes; @@ -57,7 +57,7 @@ enum { TYPE_UNKNOWN = 0, static int knownTypesArray[] = { TYPE_UNKNOWN, TYPE_MPID_COMM, TYPE_MPIR_COMM_LIST, TYPE_MPIDI_REQUEST, - TYPE_MPIDI_MESSAGE_MATCH, TYPE_MPID_REQUEST, + TYPE_MPIDI_MESSAGE_MATCH, TYPE_MPIR_REQUEST, TYPE_MPIR_SENDQ, TYPE_MPIDI_MESSAGE_MATCH_PARTS }; @@ -82,7 +82,7 @@ mqs_type * dbgrI_find_type(mqs_image *image, char *name, curType = TYPE_MPIDI_MESSAGE_MATCH_PARTS; } else if (strcmp( name, "MPID_Request" ) == 0) { - curType = TYPE_MPID_REQUEST; + curType = TYPE_MPIR_REQUEST; } else if (strcmp( name, "MPIR_Sendq" ) == 0) { curType = TYPE_MPIR_SENDQ; @@ -192,7 +192,7 @@ int dbgrI_field_offset(mqs_type *type, char *name) } } break; - case TYPE_MPID_REQUEST: + case TYPE_MPIR_REQUEST: { MPID_Request c; if (strcmp( name, "dev" ) == 0) { diff --git a/src/mpi/errhan/comm_call_errhandler.c b/src/mpi/errhan/comm_call_errhandler.c index b993e83..04fa93d 100644 --- a/src/mpi/errhan/comm_call_errhandler.c +++ b/src/mpi/errhan/comm_call_errhandler.c @@ -125,20 +125,20 @@ int MPI_Comm_call_errhandler(MPI_Comm comm, int errorcode) /* Process any user-defined error handling function */ switch (comm_ptr->errhandler->language) { - case MPID_LANG_C: + case MPIR_LANG_C: (*comm_ptr->errhandler->errfn.C_Comm_Handler_function)( &comm_ptr->handle, &errorcode ); break; #ifdef HAVE_CXX_BINDING - case MPID_LANG_CXX: + case MPIR_LANG_CXX: MPIR_Process.cxx_call_errfn( 0, &comm_ptr->handle, &errorcode, (void (*)(void))comm_ptr->errhandler->errfn.C_Comm_Handler_function ); break; #endif #ifdef HAVE_FORTRAN_BINDING - case MPID_LANG_FORTRAN90: - case MPID_LANG_FORTRAN: + case MPIR_LANG_FORTRAN90: + case MPIR_LANG_FORTRAN: { /* If int and MPI_Fint aren't the same size, we need to convert. As this is not performance critical, we diff --git a/src/mpi/errhan/comm_create_errhandler.c b/src/mpi/errhan/comm_create_errhandler.c index a42c819..012f5d1 100644 --- a/src/mpi/errhan/comm_create_errhandler.c +++ b/src/mpi/errhan/comm_create_errhandler.c @@ -39,7 +39,7 @@ int MPIR_Comm_create_errhandler_impl(MPI_Comm_errhandler_function *comm_errhandl errhan_ptr = (MPIR_Errhandler *)MPIU_Handle_obj_alloc( &MPIR_Errhandler_mem ); MPIR_ERR_CHKANDJUMP(!errhan_ptr, mpi_errno, MPI_ERR_OTHER, "**nomem"); - errhan_ptr->language = MPID_LANG_C; + errhan_ptr->language = MPIR_LANG_C; errhan_ptr->kind = MPID_COMM; MPIU_Object_set_ref(errhan_ptr,1); errhan_ptr->errfn.C_Comm_Handler_function = comm_errhandler_fn; diff --git a/src/mpi/errhan/errutil.c b/src/mpi/errhan/errutil.c index 67f4ae7..df7038d 100644 --- a/src/mpi/errhan/errutil.c +++ b/src/mpi/errhan/errutil.c @@ -181,7 +181,7 @@ void MPIR_Errhandler_set_cxx( MPI_Errhandler errhand, void (*errcall)(void) ) MPIR_Errhandler *errhand_ptr; MPIR_Errhandler_get_ptr( errhand, errhand_ptr ); - errhand_ptr->language = MPID_LANG_CXX; + errhand_ptr->language = MPIR_LANG_CXX; MPIR_Process.cxx_call_errfn = (void (*)( int, int *, int *, void (*)(void) ))errcall; } @@ -193,7 +193,7 @@ void MPIR_Errhandler_set_fc( MPI_Errhandler errhand ) MPIR_Errhandler *errhand_ptr; MPIR_Errhandler_get_ptr( errhand, errhand_ptr ); - errhand_ptr->language = MPID_LANG_FORTRAN; + errhand_ptr->language = MPIR_LANG_FORTRAN; } #endif @@ -306,12 +306,12 @@ int MPIR_Err_return_comm( MPIR_Comm *comm_ptr, const char fcname[], because MPICH-1 expected that */ switch (comm_ptr->errhandler->language) { - case MPID_LANG_C: + case MPIR_LANG_C: (*comm_ptr->errhandler->errfn.C_Comm_Handler_function)( &comm_ptr->handle, &errcode, 0 ); break; #ifdef HAVE_CXX_BINDING - case MPID_LANG_CXX: + case MPIR_LANG_CXX: (*MPIR_Process.cxx_call_errfn)( 0, &comm_ptr->handle, &errcode, (void (*)(void))*comm_ptr->errhandler->errfn.C_Comm_Handler_function ); /* The C++ code throws an exception if the error handler @@ -321,8 +321,8 @@ int MPIR_Err_return_comm( MPIR_Comm *comm_ptr, const char fcname[], break; #endif /* CXX_BINDING */ #ifdef HAVE_FORTRAN_BINDING - case MPID_LANG_FORTRAN90: - case MPID_LANG_FORTRAN: + case MPIR_LANG_FORTRAN90: + case MPIR_LANG_FORTRAN: { /* If int and MPI_Fint aren't the same size, we need to convert. As this is not performance critical, we @@ -384,12 +384,12 @@ int MPIR_Err_return_win( MPIR_Win *win_ptr, const char fcname[], int errcode ) because MPICH-1 expected that */ switch (win_ptr->errhandler->language) { - case MPID_LANG_C: + case MPIR_LANG_C: (*win_ptr->errhandler->errfn.C_Win_Handler_function)( &win_ptr->handle, &errcode, 0 ); break; #ifdef HAVE_CXX_BINDING - case MPID_LANG_CXX: + case MPIR_LANG_CXX: (*MPIR_Process.cxx_call_errfn)( 2, &win_ptr->handle, &errcode, (void (*)(void))*win_ptr->errhandler->errfn.C_Win_Handler_function ); /* The C++ code throws an exception if the error handler @@ -399,8 +399,8 @@ int MPIR_Err_return_win( MPIR_Win *win_ptr, const char fcname[], int errcode ) break; #endif /* CXX_BINDING */ #ifdef HAVE_FORTRAN_BINDING - case MPID_LANG_FORTRAN90: - case MPID_LANG_FORTRAN: + case MPIR_LANG_FORTRAN90: + case MPIR_LANG_FORTRAN: { /* If int and MPI_Fint aren't the same size, we need to convert. As this is not performance critical, we diff --git a/src/mpi/errhan/file_call_errhandler.c b/src/mpi/errhan/file_call_errhandler.c index f83ac89..d5ea20b 100644 --- a/src/mpi/errhan/file_call_errhandler.c +++ b/src/mpi/errhan/file_call_errhandler.c @@ -100,11 +100,11 @@ int MPI_File_call_errhandler(MPI_File fh, int errorcode) } switch (e->language) { - case MPID_LANG_C: + case MPIR_LANG_C: (*e->errfn.C_File_Handler_function)( &fh, &errorcode ); break; #ifdef HAVE_CXX_BINDING - case MPID_LANG_CXX: + case MPIR_LANG_CXX: /* See HAVE_LANGUAGE_FORTRAN below for an explanation */ { void *fh1 = (void *)&fh; (*MPIR_Process.cxx_call_errfn)( 1, fh1, &errorcode, @@ -113,8 +113,8 @@ int MPI_File_call_errhandler(MPI_File fh, int errorcode) break; #endif #ifdef HAVE_FORTRAN_BINDING - case MPID_LANG_FORTRAN90: - case MPID_LANG_FORTRAN: + case MPIR_LANG_FORTRAN90: + case MPIR_LANG_FORTRAN: /* The assignemt to a local variable prevents the compiler from generating a warning about a type-punned pointer. Since the value is really const (but MPI didn't define error handlers diff --git a/src/mpi/errhan/file_create_errhandler.c b/src/mpi/errhan/file_create_errhandler.c index ba80287..2a85f62 100644 --- a/src/mpi/errhan/file_create_errhandler.c +++ b/src/mpi/errhan/file_create_errhandler.c @@ -76,7 +76,7 @@ int MPI_File_create_errhandler(MPI_File_errhandler_function *file_errhandler_fn, errhan_ptr = (MPIR_Errhandler *)MPIU_Handle_obj_alloc( &MPIR_Errhandler_mem ); MPIR_ERR_CHKANDJUMP(!errhan_ptr,mpi_errno,MPI_ERR_OTHER,"**nomem"); - errhan_ptr->language = MPID_LANG_C; + errhan_ptr->language = MPIR_LANG_C; errhan_ptr->kind = MPID_FILE; MPIU_Object_set_ref(errhan_ptr,1); errhan_ptr->errfn.C_File_Handler_function = file_errhandler_fn; diff --git a/src/mpi/errhan/file_set_errhandler.c b/src/mpi/errhan/file_set_errhandler.c index 19c16d1..8755ee0 100644 --- a/src/mpi/errhan/file_set_errhandler.c +++ b/src/mpi/errhan/file_set_errhandler.c @@ -207,7 +207,7 @@ void MPIR_Get_file_error_routine( MPI_Errhandler e, interface. This is MPIR_File_call_cxx_errhandler. See file_call_errhandler.c */ #ifdef HAVE_CXX_BINDING - if (e_ptr->language == MPID_LANG_CXX) *kind = 3; + if (e_ptr->language == MPIR_LANG_CXX) *kind = 3; #endif } } diff --git a/src/mpi/errhan/win_call_errhandler.c b/src/mpi/errhan/win_call_errhandler.c index df732b5..a3f6bcc 100644 --- a/src/mpi/errhan/win_call_errhandler.c +++ b/src/mpi/errhan/win_call_errhandler.c @@ -118,20 +118,20 @@ int MPI_Win_call_errhandler(MPI_Win win, int errorcode) } #endif switch (win_ptr->errhandler->language) { - case MPID_LANG_C: + case MPIR_LANG_C: (*win_ptr->errhandler->errfn.C_Win_Handler_function)( &win_ptr->handle, &errorcode ); break; #ifdef HAVE_CXX_BINDING - case MPID_LANG_CXX: + case MPIR_LANG_CXX: MPIR_Process.cxx_call_errfn( 2, &win_ptr->handle, &errorcode, (void (*)(void))win_ptr->errhandler->errfn.C_Win_Handler_function ); break; #endif #ifdef HAVE_FORTRAN_BINDING - case MPID_LANG_FORTRAN90: - case MPID_LANG_FORTRAN: + case MPIR_LANG_FORTRAN90: + case MPIR_LANG_FORTRAN: { /* If int and MPI_Fint aren't the same size, we need to convert. As this is not performance critical, we diff --git a/src/mpi/errhan/win_create_errhandler.c b/src/mpi/errhan/win_create_errhandler.c index 40aef0e..65845c6 100644 --- a/src/mpi/errhan/win_create_errhandler.c +++ b/src/mpi/errhan/win_create_errhandler.c @@ -79,7 +79,7 @@ int MPI_Win_create_errhandler(MPI_Win_errhandler_function *win_errhandler_fn, errhan_ptr = (MPIR_Errhandler *)MPIU_Handle_obj_alloc( &MPIR_Errhandler_mem ); MPIR_ERR_CHKANDJUMP1(!errhan_ptr,mpi_errno,MPI_ERR_OTHER,"**nomem", "**nomem %s", "MPI_Errhandler"); - errhan_ptr->language = MPID_LANG_C; + errhan_ptr->language = MPIR_LANG_C; errhan_ptr->kind = MPID_WIN; MPIU_Object_set_ref(errhan_ptr,1); errhan_ptr->errfn.C_Win_Handler_function = win_errhandler_fn; diff --git a/src/mpi/group/grouputil.c b/src/mpi/group/grouputil.c index 591756e..23f01c2 100644 --- a/src/mpi/group/grouputil.c +++ b/src/mpi/group/grouputil.c @@ -12,7 +12,7 @@ #endif /* Preallocated group objects */ -MPIR_Group MPIR_Group_builtin[MPID_GROUP_N_BUILTIN] = { {0} }; +MPIR_Group MPIR_Group_builtin[MPIR_GROUP_N_BUILTIN] = { {0} }; MPIR_Group MPIR_Group_direct[MPID_GROUP_PREALLOC] = { {0} }; MPIU_Object_alloc_t MPIR_Group_mem = { 0, 0, 0, 0, MPID_GROUP, sizeof(MPIR_Group), MPIR_Group_direct, @@ -24,7 +24,7 @@ int MPIR_Group_init(void) { int mpi_errno = MPI_SUCCESS; - MPIU_Assert(MPID_GROUP_N_BUILTIN == 1); /* update this func if this ever triggers */ + MPIU_Assert(MPIR_GROUP_N_BUILTIN == 1); /* update this func if this ever triggers */ MPIR_Group_builtin[0].handle = MPI_GROUP_EMPTY; MPIU_Object_set_ref(&MPIR_Group_builtin[0], 1); @@ -378,7 +378,7 @@ int MPIR_Group_check_subset( MPIR_Group *group_ptr, MPIR_Comm *comm_ptr ) int mpi_errno = MPI_SUCCESS; int g1_idx, g2_idx, l1_pid, l2_pid, i; MPIR_Group_pmap_t *vmap=0; - int vsize = comm_ptr->comm_kind == MPID_INTERCOMM ? comm_ptr->local_size : + int vsize = comm_ptr->comm_kind == MPIR_INTERCOMM ? comm_ptr->local_size : comm_ptr->remote_size; MPIU_CHKLMEM_DECL(1); diff --git a/src/mpi/init/async.c b/src/mpi/init/async.c index eb0af4a..6f88f90 100644 --- a/src/mpi/init/async.c +++ b/src/mpi/init/async.c @@ -46,7 +46,7 @@ static void progress_fn(void * data) * this comment. */ mpi_errno = MPID_Irecv(NULL, 0, MPI_CHAR, 0, WAKE_TAG, progress_comm_ptr, - MPID_CONTEXT_INTRA_PT2PT, &request_ptr); + MPIR_CONTEXT_INTRA_PT2PT, &request_ptr); MPIU_Assert(!mpi_errno); request = request_ptr->handle; mpi_errno = MPIR_Wait_impl(&request, &status); @@ -127,7 +127,7 @@ int MPIR_Finalize_async_thread(void) MPID_MPI_FUNC_ENTER(MPID_STATE_MPIR_FINALIZE_ASYNC_THREAD); mpi_errno = MPID_Isend(NULL, 0, MPI_CHAR, 0, WAKE_TAG, progress_comm_ptr, - MPID_CONTEXT_INTRA_PT2PT, &request_ptr); + MPIR_CONTEXT_INTRA_PT2PT, &request_ptr); MPIU_Assert(!mpi_errno); request = request_ptr->handle; mpi_errno = MPIR_Wait_impl(&request, &status); diff --git a/src/mpi/init/initthread.c b/src/mpi/init/initthread.c index d68ac5f..867c104 100644 --- a/src/mpi/init/initthread.c +++ b/src/mpi/init/initthread.c @@ -418,33 +418,33 @@ int MPIR_Init_thread(int * argc, char ***argv, int required, int * provided) (partially) initialize predefined communicators. comm_parent is intially NULL and will be allocated by the device if the process group was started using one of the MPI_Comm_spawn functions. */ - MPIR_Process.comm_world = MPID_Comm_builtin + 0; + MPIR_Process.comm_world = MPIR_Comm_builtin + 0; MPIR_Comm_init(MPIR_Process.comm_world); MPIR_Process.comm_world->handle = MPI_COMM_WORLD; - MPIR_Process.comm_world->context_id = 0 << MPID_CONTEXT_PREFIX_SHIFT; - MPIR_Process.comm_world->recvcontext_id = 0 << MPID_CONTEXT_PREFIX_SHIFT; - MPIR_Process.comm_world->comm_kind = MPID_INTRACOMM; + MPIR_Process.comm_world->context_id = 0 << MPIR_CONTEXT_PREFIX_SHIFT; + MPIR_Process.comm_world->recvcontext_id = 0 << MPIR_CONTEXT_PREFIX_SHIFT; + MPIR_Process.comm_world->comm_kind = MPIR_INTRACOMM; /* This initialization of the comm name could be done only when comm_get_name is called */ MPL_strncpy(MPIR_Process.comm_world->name, "MPI_COMM_WORLD", MPI_MAX_OBJECT_NAME); - MPIR_Process.comm_self = MPID_Comm_builtin + 1; + MPIR_Process.comm_self = MPIR_Comm_builtin + 1; MPIR_Comm_init(MPIR_Process.comm_self); MPIR_Process.comm_self->handle = MPI_COMM_SELF; - MPIR_Process.comm_self->context_id = 1 << MPID_CONTEXT_PREFIX_SHIFT; - MPIR_Process.comm_self->recvcontext_id = 1 << MPID_CONTEXT_PREFIX_SHIFT; - MPIR_Process.comm_self->comm_kind = MPID_INTRACOMM; + MPIR_Process.comm_self->context_id = 1 << MPIR_CONTEXT_PREFIX_SHIFT; + MPIR_Process.comm_self->recvcontext_id = 1 << MPIR_CONTEXT_PREFIX_SHIFT; + MPIR_Process.comm_self->comm_kind = MPIR_INTRACOMM; MPL_strncpy(MPIR_Process.comm_self->name, "MPI_COMM_SELF", MPI_MAX_OBJECT_NAME); #ifdef MPID_NEEDS_ICOMM_WORLD - MPIR_Process.icomm_world = MPID_Comm_builtin + 2; + MPIR_Process.icomm_world = MPIR_Comm_builtin + 2; MPIR_Comm_init(MPIR_Process.icomm_world); MPIR_Process.icomm_world->handle = MPIR_ICOMM_WORLD; - MPIR_Process.icomm_world->context_id = 2 << MPID_CONTEXT_PREFIX_SHIFT; - MPIR_Process.icomm_world->recvcontext_id= 2 << MPID_CONTEXT_PREFIX_SHIFT; - MPIR_Process.icomm_world->comm_kind = MPID_INTRACOMM; + MPIR_Process.icomm_world->context_id = 2 << MPIR_CONTEXT_PREFIX_SHIFT; + MPIR_Process.icomm_world->recvcontext_id= 2 << MPIR_CONTEXT_PREFIX_SHIFT; + MPIR_Process.icomm_world->comm_kind = MPIR_INTRACOMM; MPL_strncpy(MPIR_Process.icomm_world->name, "MPI_ICOMM_WORLD", MPI_MAX_OBJECT_NAME); diff --git a/src/mpi/pt2pt/bsend_init.c b/src/mpi/pt2pt/bsend_init.c index 9035571..78b97d0 100644 --- a/src/mpi/pt2pt/bsend_init.c +++ b/src/mpi/pt2pt/bsend_init.c @@ -120,7 +120,7 @@ int MPI_Bsend_init(const void *buf, int count, MPI_Datatype datatype, /* ... body of routine ... */ mpi_errno = MPID_Bsend_init(buf, count, datatype, dest, tag, comm_ptr, - MPID_CONTEXT_INTRA_PT2PT, &request_ptr); + MPIR_CONTEXT_INTRA_PT2PT, &request_ptr); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPIR_SENDQ_REMEMBER(request_ptr, dest, tag, comm_ptr->context_id); diff --git a/src/mpi/pt2pt/bsendutil.c b/src/mpi/pt2pt/bsendutil.c index 95c52ae..7585d8e 100644 --- a/src/mpi/pt2pt/bsendutil.c +++ b/src/mpi/pt2pt/bsendutil.c @@ -272,7 +272,7 @@ int MPIR_Bsend_isend(const void *buf, int count, MPI_Datatype dtype, because this call must not block */ mpi_errno = MPID_Isend(msg->msgbuf, msg->count, MPI_PACKED, dest, tag, comm_ptr, - MPID_CONTEXT_INTRA_PT2PT, &p->request ); + MPIR_CONTEXT_INTRA_PT2PT, &p->request ); MPIR_ERR_CHKINTERNAL(mpi_errno, mpi_errno, "Bsend internal error: isend returned err"); /* If the error is "request not available", we should put this on the pending list. This will depend on diff --git a/src/mpi/pt2pt/cancel.c b/src/mpi/pt2pt/cancel.c index 742f833..4384c92 100644 --- a/src/mpi/pt2pt/cancel.c +++ b/src/mpi/pt2pt/cancel.c @@ -36,14 +36,14 @@ int MPIR_Cancel_impl(MPID_Request *request_ptr) switch (request_ptr->kind) { - case MPID_REQUEST_SEND: + case MPIR_REQUEST_SEND: { mpi_errno = MPID_Cancel_send(request_ptr); if (mpi_errno) MPIR_ERR_POP(mpi_errno); break; } - case MPID_REQUEST_RECV: + case MPIR_REQUEST_RECV: { mpi_errno = MPID_Cancel_recv(request_ptr); if (mpi_errno) MPIR_ERR_POP(mpi_errno); diff --git a/src/mpi/pt2pt/greq_start.c b/src/mpi/pt2pt/greq_start.c index 85696df..551e0a9 100644 --- a/src/mpi/pt2pt/greq_start.c +++ b/src/mpi/pt2pt/greq_start.c @@ -100,7 +100,7 @@ int MPIR_Grequest_start_impl(MPI_Grequest_query_function *query_fn, (*request_ptr)->greq_fns->poll_fn = NULL; (*request_ptr)->greq_fns->wait_fn = NULL; (*request_ptr)->greq_fns->grequest_extra_state = extra_state; - (*request_ptr)->greq_fns->greq_lang = MPID_LANG_C; + (*request_ptr)->greq_fns->greq_lang = MPIR_LANG_C; /* Add an additional reference to the greq. One of them will be * released when we complete the request, and the second one, when diff --git a/src/mpi/pt2pt/improbe.c b/src/mpi/pt2pt/improbe.c index 31974a6..dd4a307 100644 --- a/src/mpi/pt2pt/improbe.c +++ b/src/mpi/pt2pt/improbe.c @@ -96,7 +96,7 @@ int MPI_Improbe(int source, int tag, MPI_Comm comm, int *flag, MPI_Message *mess /* ... body of routine ... */ *message = MPI_MESSAGE_NULL; - mpi_errno = MPID_Improbe(source, tag, comm_ptr, MPID_CONTEXT_INTRA_PT2PT, flag, &msgp, status); + mpi_errno = MPID_Improbe(source, tag, comm_ptr, MPIR_CONTEXT_INTRA_PT2PT, flag, &msgp, status); if (mpi_errno) MPIR_ERR_POP(mpi_errno); if (*flag) { diff --git a/src/mpi/pt2pt/imrecv.c b/src/mpi/pt2pt/imrecv.c index 693aa1d..c208e14 100644 --- a/src/mpi/pt2pt/imrecv.c +++ b/src/mpi/pt2pt/imrecv.c @@ -97,7 +97,7 @@ int MPI_Imrecv(void *buf, int count, MPI_Datatype datatype, MPI_Message *message if (*message != MPI_MESSAGE_NO_PROC) { MPID_Request_valid_ptr(msgp, mpi_errno); if (mpi_errno) MPIR_ERR_POP(mpi_errno); - MPIR_ERR_CHKANDJUMP((msgp->kind != MPID_REQUEST_MPROBE), + MPIR_ERR_CHKANDJUMP((msgp->kind != MPIR_REQUEST_MPROBE), mpi_errno, MPI_ERR_ARG, "**reqnotmsg"); } diff --git a/src/mpi/pt2pt/iprobe.c b/src/mpi/pt2pt/iprobe.c index 3729a95..53a2641 100644 --- a/src/mpi/pt2pt/iprobe.c +++ b/src/mpi/pt2pt/iprobe.c @@ -103,7 +103,7 @@ int MPI_Iprobe(int source, int tag, MPI_Comm comm, int *flag, /* ... body of routine ... */ /* FIXME: Is this correct for intercomms? */ - mpi_errno = MPID_Iprobe(source, tag, comm_ptr, MPID_CONTEXT_INTRA_PT2PT, + mpi_errno = MPID_Iprobe(source, tag, comm_ptr, MPIR_CONTEXT_INTRA_PT2PT, flag, status); if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/pt2pt/irecv.c b/src/mpi/pt2pt/irecv.c index ab950a3..3bea42f 100644 --- a/src/mpi/pt2pt/irecv.c +++ b/src/mpi/pt2pt/irecv.c @@ -124,7 +124,7 @@ int MPI_Irecv(void *buf, int count, MPI_Datatype datatype, int source, /* ... body of routine ... */ mpi_errno = MPID_Irecv(buf, count, datatype, source, tag, comm_ptr, - MPID_CONTEXT_INTRA_PT2PT, &request_ptr); + MPIR_CONTEXT_INTRA_PT2PT, &request_ptr); /* return the handle of the request to the user */ /* MPIU_OBJ_HANDLE_PUBLISH is unnecessary for irecv, lower-level access is * responsible for its own consistency, while upper-level field access is diff --git a/src/mpi/pt2pt/irsend.c b/src/mpi/pt2pt/irsend.c index 12a05c5..74a7e48 100644 --- a/src/mpi/pt2pt/irsend.c +++ b/src/mpi/pt2pt/irsend.c @@ -125,7 +125,7 @@ int MPI_Irsend(const void *buf, int count, MPI_Datatype datatype, int dest, int /* ... body of routine ... */ mpi_errno = MPID_Irsend(buf, count, datatype, dest, tag, comm_ptr, - MPID_CONTEXT_INTRA_PT2PT, &request_ptr); + MPIR_CONTEXT_INTRA_PT2PT, &request_ptr); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPIR_SENDQ_REMEMBER(request_ptr,dest,tag,comm_ptr->context_id); diff --git a/src/mpi/pt2pt/isend.c b/src/mpi/pt2pt/isend.c index 780d5bb..c4e8eb4 100644 --- a/src/mpi/pt2pt/isend.c +++ b/src/mpi/pt2pt/isend.c @@ -123,7 +123,7 @@ int MPI_Isend(const void *buf, int count, MPI_Datatype datatype, int dest, int t /* ... body of routine ... */ mpi_errno = MPID_Isend(buf, count, datatype, dest, tag, comm_ptr, - MPID_CONTEXT_INTRA_PT2PT, &request_ptr); + MPIR_CONTEXT_INTRA_PT2PT, &request_ptr); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPIR_SENDQ_REMEMBER(request_ptr,dest,tag,comm_ptr->context_id); diff --git a/src/mpi/pt2pt/issend.c b/src/mpi/pt2pt/issend.c index b8042a2..48b2192 100644 --- a/src/mpi/pt2pt/issend.c +++ b/src/mpi/pt2pt/issend.c @@ -124,7 +124,7 @@ int MPI_Issend(const void *buf, int count, MPI_Datatype datatype, int dest, int /* ... body of routine ... */ mpi_errno = MPID_Issend(buf, count, datatype, dest, tag, comm_ptr, - MPID_CONTEXT_INTRA_PT2PT, &request_ptr); + MPIR_CONTEXT_INTRA_PT2PT, &request_ptr); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPIR_SENDQ_REMEMBER(request_ptr,dest,tag,comm_ptr->context_id); diff --git a/src/mpi/pt2pt/mpir_request.c b/src/mpi/pt2pt/mpir_request.c index 19791d0..2e83ce6 100644 --- a/src/mpi/pt2pt/mpir_request.c +++ b/src/mpi/pt2pt/mpir_request.c @@ -68,7 +68,7 @@ int MPIR_Request_complete(MPI_Request * request, MPID_Request * request_ptr, *active = TRUE; switch(request_ptr->kind) { - case MPID_REQUEST_SEND: + case MPIR_REQUEST_SEND: { if (status != MPI_STATUS_IGNORE) { @@ -80,7 +80,7 @@ int MPIR_Request_complete(MPI_Request * request, MPID_Request * request_ptr, if (NULL != request) *request = MPI_REQUEST_NULL; break; } - case MPID_REQUEST_RECV: + case MPIR_REQUEST_RECV: { MPIR_Request_extract_status(request_ptr, status); mpi_errno = request_ptr->status.MPI_ERROR; @@ -255,8 +255,8 @@ int MPIR_Request_get_error(MPID_Request * request_ptr) switch(request_ptr->kind) { - case MPID_REQUEST_SEND: - case MPID_REQUEST_RECV: + case MPIR_REQUEST_SEND: + case MPIR_REQUEST_RECV: case MPID_COLL_REQUEST: { mpi_errno = request_ptr->status.MPI_ERROR; @@ -308,9 +308,9 @@ int MPIR_Request_get_error(MPID_Request * request_ptr) switch (request_ptr->greq_fns->greq_lang) { - case MPID_LANG_C: + case MPIR_LANG_C: #ifdef HAVE_CXX_BINDING - case MPID_LANG_CXX: + case MPIR_LANG_CXX: #endif rc = (request_ptr->greq_fns->query_fn)( request_ptr->greq_fns->grequest_extra_state, @@ -319,8 +319,8 @@ int MPIR_Request_get_error(MPID_Request * request_ptr) MPI_ERR_OTHER,;, "**user", "**userquery %d", rc); break; #ifdef HAVE_FORTRAN_BINDING - case MPID_LANG_FORTRAN: - case MPID_LANG_FORTRAN90: + case MPIR_LANG_FORTRAN: + case MPIR_LANG_FORTRAN90: { MPI_Fint ierr; MPI_Fint is[sizeof(MPI_Status)/sizeof(int)]; @@ -373,7 +373,7 @@ void MPIR_Grequest_set_lang_f77( MPI_Request greq ) MPID_Request_get_ptr( greq, greq_ptr ); - greq_ptr->greq_fns->greq_lang = MPID_LANG_FORTRAN; + greq_ptr->greq_fns->greq_lang = MPIR_LANG_FORTRAN; } #endif @@ -389,9 +389,9 @@ int MPIR_Grequest_cancel(MPID_Request * request_ptr, int complete) switch (request_ptr->greq_fns->greq_lang) { - case MPID_LANG_C: + case MPIR_LANG_C: #ifdef HAVE_CXX_BINDING - case MPID_LANG_CXX: + case MPIR_LANG_CXX: #endif rc = (request_ptr->greq_fns->cancel_fn)( request_ptr->greq_fns->grequest_extra_state, complete); @@ -399,8 +399,8 @@ int MPIR_Grequest_cancel(MPID_Request * request_ptr, int complete) MPI_ERR_OTHER,;, "**user", "**usercancel %d", rc); break; #ifdef HAVE_FORTRAN_BINDING - case MPID_LANG_FORTRAN: - case MPID_LANG_FORTRAN90: + case MPIR_LANG_FORTRAN: + case MPIR_LANG_FORTRAN90: { MPI_Fint ierr; MPI_Fint icomplete = complete; @@ -440,9 +440,9 @@ int MPIR_Grequest_query(MPID_Request * request_ptr) switch (request_ptr->greq_fns->greq_lang) { - case MPID_LANG_C: + case MPIR_LANG_C: #ifdef HAVE_CXX_BINDING - case MPID_LANG_CXX: + case MPIR_LANG_CXX: #endif rc = (request_ptr->greq_fns->query_fn)(request_ptr->greq_fns->grequest_extra_state, &request_ptr->status); @@ -450,8 +450,8 @@ int MPIR_Grequest_query(MPID_Request * request_ptr) {;}, "**user", "**userquery %d", rc); break; #ifdef HAVE_FORTRAN_BINDING - case MPID_LANG_FORTRAN: - case MPID_LANG_FORTRAN90: + case MPIR_LANG_FORTRAN: + case MPIR_LANG_FORTRAN90: { MPI_Fint ierr; MPI_Fint is[sizeof(MPI_Status)/sizeof(int)]; @@ -491,17 +491,17 @@ int MPIR_Grequest_free(MPID_Request * request_ptr) switch (request_ptr->greq_fns->greq_lang) { - case MPID_LANG_C: + case MPIR_LANG_C: #ifdef HAVE_CXX_BINDING - case MPID_LANG_CXX: + case MPIR_LANG_CXX: #endif rc = (request_ptr->greq_fns->free_fn)(request_ptr->greq_fns->grequest_extra_state); MPIR_ERR_CHKANDSTMT1((rc != MPI_SUCCESS), mpi_errno, MPI_ERR_OTHER, {;}, "**user", "**userfree %d", rc); break; #ifdef HAVE_FORTRAN_BINDING - case MPID_LANG_FORTRAN: - case MPID_LANG_FORTRAN90: + case MPIR_LANG_FORTRAN: + case MPIR_LANG_FORTRAN90: { MPI_Fint ierr; diff --git a/src/mpi/pt2pt/mprobe.c b/src/mpi/pt2pt/mprobe.c index 4141e15..9395f76 100644 --- a/src/mpi/pt2pt/mprobe.c +++ b/src/mpi/pt2pt/mprobe.c @@ -92,7 +92,7 @@ int MPI_Mprobe(int source, int tag, MPI_Comm comm, MPI_Message *message, MPI_Sta /* ... body of routine ... */ *message = MPI_MESSAGE_NULL; - mpi_errno = MPID_Mprobe(source, tag, comm_ptr, MPID_CONTEXT_INTRA_PT2PT, &msgp, status); + mpi_errno = MPID_Mprobe(source, tag, comm_ptr, MPIR_CONTEXT_INTRA_PT2PT, &msgp, status); if (mpi_errno) MPIR_ERR_POP(mpi_errno); if (msgp == NULL) { diff --git a/src/mpi/pt2pt/mrecv.c b/src/mpi/pt2pt/mrecv.c index f1c1fa0..cc8ff49 100644 --- a/src/mpi/pt2pt/mrecv.c +++ b/src/mpi/pt2pt/mrecv.c @@ -96,7 +96,7 @@ int MPI_Mrecv(void *buf, int count, MPI_Datatype datatype, MPI_Message *message, if (*message != MPI_MESSAGE_NO_PROC) { MPID_Request_valid_ptr(msgp, mpi_errno); if (mpi_errno) MPIR_ERR_POP(mpi_errno); - MPIR_ERR_CHKANDJUMP((msgp->kind != MPID_REQUEST_MPROBE), + MPIR_ERR_CHKANDJUMP((msgp->kind != MPIR_REQUEST_MPROBE), mpi_errno, MPI_ERR_ARG, "**reqnotmsg"); } diff --git a/src/mpi/pt2pt/probe.c b/src/mpi/pt2pt/probe.c index 81c33d6..114d40f 100644 --- a/src/mpi/pt2pt/probe.c +++ b/src/mpi/pt2pt/probe.c @@ -97,7 +97,7 @@ int MPI_Probe(int source, int tag, MPI_Comm comm, MPI_Status *status) /* ... body of routine ... */ - mpi_errno = MPID_Probe(source, tag, comm_ptr, MPID_CONTEXT_INTRA_PT2PT, status); + mpi_errno = MPID_Probe(source, tag, comm_ptr, MPIR_CONTEXT_INTRA_PT2PT, status); if (mpi_errno != MPI_SUCCESS) goto fn_fail; /* ... end of body of routine ... */ diff --git a/src/mpi/pt2pt/recv.c b/src/mpi/pt2pt/recv.c index aea1854..074b3f1 100644 --- a/src/mpi/pt2pt/recv.c +++ b/src/mpi/pt2pt/recv.c @@ -135,7 +135,7 @@ int MPI_Recv(void *buf, int count, MPI_Datatype datatype, int source, int tag, decides to block internally. MPID_Recv in that case will re-aquire the SINGLE_CS before returnning */ mpi_errno = MPID_Recv(buf, count, datatype, source, tag, comm_ptr, - MPID_CONTEXT_INTRA_PT2PT, status, &request_ptr); + MPIR_CONTEXT_INTRA_PT2PT, status, &request_ptr); if (mpi_errno != MPI_SUCCESS) goto fn_fail; if (request_ptr == NULL) diff --git a/src/mpi/pt2pt/recv_init.c b/src/mpi/pt2pt/recv_init.c index 494df48..a82475a 100644 --- a/src/mpi/pt2pt/recv_init.c +++ b/src/mpi/pt2pt/recv_init.c @@ -126,7 +126,7 @@ int MPI_Recv_init(void *buf, int count, MPI_Datatype datatype, int source, /* ... body of routine ... */ mpi_errno = MPID_Recv_init(buf, count, datatype, source, tag, comm_ptr, - MPID_CONTEXT_INTRA_PT2PT, &request_ptr); + MPIR_CONTEXT_INTRA_PT2PT, &request_ptr); if (mpi_errno != MPI_SUCCESS) goto fn_fail; /* return the handle of the request to the user */ diff --git a/src/mpi/pt2pt/request_free.c b/src/mpi/pt2pt/request_free.c index 0f5a4ea..5d7682c 100644 --- a/src/mpi/pt2pt/request_free.c +++ b/src/mpi/pt2pt/request_free.c @@ -109,12 +109,12 @@ int MPI_Request_free(MPI_Request *request) switch (request_ptr->kind) { - case MPID_REQUEST_SEND: + case MPIR_REQUEST_SEND: { MPIR_SENDQ_FORGET(request_ptr); break; } - case MPID_REQUEST_RECV: + case MPIR_REQUEST_RECV: { break; } diff --git a/src/mpi/pt2pt/request_get_status.c b/src/mpi/pt2pt/request_get_status.c index 529b02a..b647abf 100644 --- a/src/mpi/pt2pt/request_get_status.c +++ b/src/mpi/pt2pt/request_get_status.c @@ -117,7 +117,7 @@ int MPI_Request_get_status(MPI_Request request, int *flag, MPI_Status *status) { switch(request_ptr->kind) { - case MPID_REQUEST_SEND: + case MPIR_REQUEST_SEND: { if (status != MPI_STATUS_IGNORE) { @@ -127,7 +127,7 @@ int MPI_Request_get_status(MPI_Request request, int *flag, MPI_Status *status) break; } - case MPID_REQUEST_RECV: + case MPIR_REQUEST_RECV: { MPIR_Request_extract_status(request_ptr, status); mpi_errno = request_ptr->status.MPI_ERROR; diff --git a/src/mpi/pt2pt/rsend.c b/src/mpi/pt2pt/rsend.c index 8b29f89..59341c3 100644 --- a/src/mpi/pt2pt/rsend.c +++ b/src/mpi/pt2pt/rsend.c @@ -120,7 +120,7 @@ int MPI_Rsend(const void *buf, int count, MPI_Datatype datatype, int dest, int t /* ... body of routine ... */ mpi_errno = MPID_Rsend(buf, count, datatype, dest, tag, comm_ptr, - MPID_CONTEXT_INTRA_PT2PT, &request_ptr); + MPIR_CONTEXT_INTRA_PT2PT, &request_ptr); if (mpi_errno != MPI_SUCCESS) goto fn_fail; if (request_ptr == NULL) diff --git a/src/mpi/pt2pt/rsend_init.c b/src/mpi/pt2pt/rsend_init.c index 68aa5d2..faca25b 100644 --- a/src/mpi/pt2pt/rsend_init.c +++ b/src/mpi/pt2pt/rsend_init.c @@ -126,7 +126,7 @@ int MPI_Rsend_init(const void *buf, int count, MPI_Datatype datatype, int dest, /* ... body of routine ... */ mpi_errno = MPID_Rsend_init(buf, count, datatype, dest, tag, comm_ptr, - MPID_CONTEXT_INTRA_PT2PT, &request_ptr); + MPIR_CONTEXT_INTRA_PT2PT, &request_ptr); if (mpi_errno != MPI_SUCCESS) goto fn_fail; /* return the handle of the request to the user */ diff --git a/src/mpi/pt2pt/send.c b/src/mpi/pt2pt/send.c index df2a4b3..ffad786 100644 --- a/src/mpi/pt2pt/send.c +++ b/src/mpi/pt2pt/send.c @@ -125,7 +125,7 @@ int MPI_Send(const void *buf, int count, MPI_Datatype datatype, int dest, int ta /* ... body of routine ... */ mpi_errno = MPID_Send(buf, count, datatype, dest, tag, comm_ptr, - MPID_CONTEXT_INTRA_PT2PT, &request_ptr); + MPIR_CONTEXT_INTRA_PT2PT, &request_ptr); if (mpi_errno != MPI_SUCCESS) goto fn_fail; if (request_ptr == NULL) diff --git a/src/mpi/pt2pt/send_init.c b/src/mpi/pt2pt/send_init.c index fa54159..0b16f3e 100644 --- a/src/mpi/pt2pt/send_init.c +++ b/src/mpi/pt2pt/send_init.c @@ -126,7 +126,7 @@ int MPI_Send_init(const void *buf, int count, MPI_Datatype datatype, int dest, /* ... body of routine ... */ mpi_errno = MPID_Send_init(buf, count, datatype, dest, tag, comm_ptr, - MPID_CONTEXT_INTRA_PT2PT, &request_ptr); + MPIR_CONTEXT_INTRA_PT2PT, &request_ptr); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPIR_SENDQ_REMEMBER(request_ptr, dest, tag, comm_ptr->context_id); diff --git a/src/mpi/pt2pt/sendrecv.c b/src/mpi/pt2pt/sendrecv.c index 36a5f45..7f938d3 100644 --- a/src/mpi/pt2pt/sendrecv.c +++ b/src/mpi/pt2pt/sendrecv.c @@ -160,11 +160,11 @@ int MPI_Sendrecv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, /* ... body of routine ... */ - mpi_errno = MPID_Irecv(recvbuf, recvcount, recvtype, source, recvtag, comm_ptr, MPID_CONTEXT_INTRA_PT2PT, &rreq); + mpi_errno = MPID_Irecv(recvbuf, recvcount, recvtype, source, recvtag, comm_ptr, MPIR_CONTEXT_INTRA_PT2PT, &rreq); if (mpi_errno != MPI_SUCCESS) goto fn_fail; /* FIXME - Performance for small messages might be better if MPID_Send() were used here instead of MPID_Isend() */ - mpi_errno = MPID_Isend(sendbuf, sendcount, sendtype, dest, sendtag, comm_ptr, MPID_CONTEXT_INTRA_PT2PT, &sreq); + mpi_errno = MPID_Isend(sendbuf, sendcount, sendtype, dest, sendtag, comm_ptr, MPIR_CONTEXT_INTRA_PT2PT, &sreq); if (mpi_errno != MPI_SUCCESS) { /* --BEGIN ERROR HANDLING-- */ diff --git a/src/mpi/pt2pt/sendrecv_rep.c b/src/mpi/pt2pt/sendrecv_rep.c index 7569cd0..ba013ec 100644 --- a/src/mpi/pt2pt/sendrecv_rep.c +++ b/src/mpi/pt2pt/sendrecv_rep.c @@ -158,11 +158,11 @@ int MPI_Sendrecv_replace(void *buf, int count, MPI_Datatype datatype, } mpi_errno = MPID_Irecv(buf, count, datatype, source, recvtag, - comm_ptr, MPID_CONTEXT_INTRA_PT2PT, &rreq); + comm_ptr, MPIR_CONTEXT_INTRA_PT2PT, &rreq); if (mpi_errno != MPI_SUCCESS) goto fn_fail; mpi_errno = MPID_Isend(tmpbuf, tmpbuf_count, MPI_PACKED, dest, - sendtag, comm_ptr, MPID_CONTEXT_INTRA_PT2PT, + sendtag, comm_ptr, MPIR_CONTEXT_INTRA_PT2PT, &sreq); if (mpi_errno != MPI_SUCCESS) { diff --git a/src/mpi/pt2pt/ssend.c b/src/mpi/pt2pt/ssend.c index 8512fe6..115f9a2 100644 --- a/src/mpi/pt2pt/ssend.c +++ b/src/mpi/pt2pt/ssend.c @@ -119,7 +119,7 @@ int MPI_Ssend(const void *buf, int count, MPI_Datatype datatype, int dest, int t /* ... body of routine ... */ mpi_errno = MPID_Ssend(buf, count, datatype, dest, tag, comm_ptr, - MPID_CONTEXT_INTRA_PT2PT, &request_ptr); + MPIR_CONTEXT_INTRA_PT2PT, &request_ptr); if (mpi_errno != MPI_SUCCESS) goto fn_fail; if (request_ptr == NULL) diff --git a/src/mpi/pt2pt/ssend_init.c b/src/mpi/pt2pt/ssend_init.c index 05ec5d2..0b1fab0 100644 --- a/src/mpi/pt2pt/ssend_init.c +++ b/src/mpi/pt2pt/ssend_init.c @@ -123,7 +123,7 @@ int MPI_Ssend_init(const void *buf, int count, MPI_Datatype datatype, int dest, /* ... body of routine ... */ mpi_errno = MPID_Ssend_init(buf, count, datatype, dest, tag, comm_ptr, - MPID_CONTEXT_INTRA_PT2PT, &request_ptr); + MPIR_CONTEXT_INTRA_PT2PT, &request_ptr); if (mpi_errno != MPI_SUCCESS) goto fn_fail; /* return the handle of the request to the user */ diff --git a/src/mpi/pt2pt/startall.c b/src/mpi/pt2pt/startall.c index 75034e7..fcf08ec 100644 --- a/src/mpi/pt2pt/startall.c +++ b/src/mpi/pt2pt/startall.c @@ -7,8 +7,8 @@ #include "mpiimpl.h" -#if !defined(MPID_REQUEST_PTR_ARRAY_SIZE) -#define MPID_REQUEST_PTR_ARRAY_SIZE 16 +#if !defined(MPIR_REQUEST_PTR_ARRAY_SIZE) +#define MPIR_REQUEST_PTR_ARRAY_SIZE 16 #endif /* -- Begin Profiling Symbol Block for routine MPI_Startall */ @@ -61,7 +61,7 @@ Input Parameters: int MPI_Startall(int count, MPI_Request array_of_requests[]) { static const char FCNAME[] = "MPI_Startall"; - MPID_Request * request_ptr_array[MPID_REQUEST_PTR_ARRAY_SIZE]; + MPID_Request * request_ptr_array[MPIR_REQUEST_PTR_ARRAY_SIZE]; MPID_Request ** request_ptrs = request_ptr_array; int i; int mpi_errno = MPI_SUCCESS; @@ -90,7 +90,7 @@ int MPI_Startall(int count, MPI_Request array_of_requests[]) # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI request handles to a request object pointers */ - if (count > MPID_REQUEST_PTR_ARRAY_SIZE) + if (count > MPIR_REQUEST_PTR_ARRAY_SIZE) { MPIU_CHKLMEM_MALLOC_ORJUMP(request_ptrs, MPID_Request **, count * sizeof(MPID_Request *), mpi_errno, "request pointers"); } @@ -126,7 +126,7 @@ int MPI_Startall(int count, MPI_Request array_of_requests[]) /* ... end of body of routine ... */ fn_exit: - if (count > MPID_REQUEST_PTR_ARRAY_SIZE) + if (count > MPIR_REQUEST_PTR_ARRAY_SIZE) { MPIU_CHKLMEM_FREEALL(); } diff --git a/src/mpi/pt2pt/testall.c b/src/mpi/pt2pt/testall.c index 67a2c30..0200666 100644 --- a/src/mpi/pt2pt/testall.c +++ b/src/mpi/pt2pt/testall.c @@ -7,8 +7,8 @@ #include "mpiimpl.h" -#if !defined(MPID_REQUEST_PTR_ARRAY_SIZE) -#define MPID_REQUEST_PTR_ARRAY_SIZE 16 +#if !defined(MPIR_REQUEST_PTR_ARRAY_SIZE) +#define MPIR_REQUEST_PTR_ARRAY_SIZE 16 #endif /* -- Begin Profiling Symbol Block for routine MPI_Testall */ @@ -38,7 +38,7 @@ int MPI_Testall(int count, MPI_Request array_of_requests[], int *flag, int MPIR_Testall_impl(int count, MPI_Request array_of_requests[], int *flag, MPI_Status array_of_statuses[]) { - MPID_Request * request_ptr_array[MPID_REQUEST_PTR_ARRAY_SIZE]; + MPID_Request * request_ptr_array[MPIR_REQUEST_PTR_ARRAY_SIZE]; MPID_Request ** request_ptrs = request_ptr_array; MPI_Status * status_ptr; int i; @@ -50,7 +50,7 @@ int MPIR_Testall_impl(int count, MPI_Request array_of_requests[], int *flag, MPIU_CHKLMEM_DECL(1); /* Convert MPI request handles to a request object pointers */ - if (count > MPID_REQUEST_PTR_ARRAY_SIZE) + if (count > MPIR_REQUEST_PTR_ARRAY_SIZE) { MPIU_CHKLMEM_MALLOC_ORJUMP(request_ptrs, MPID_Request **, count * sizeof(MPID_Request *), mpi_errno, "request pointers"); @@ -172,7 +172,7 @@ int MPIR_Testall_impl(int count, MPI_Request array_of_requests[], int *flag, *flag = (n_completed == count) ? TRUE : FALSE; fn_exit: - if (count > MPID_REQUEST_PTR_ARRAY_SIZE) + if (count > MPIR_REQUEST_PTR_ARRAY_SIZE) { MPIU_CHKLMEM_FREEALL(); } diff --git a/src/mpi/pt2pt/testany.c b/src/mpi/pt2pt/testany.c index cee17db..430ea1e 100644 --- a/src/mpi/pt2pt/testany.c +++ b/src/mpi/pt2pt/testany.c @@ -7,8 +7,8 @@ #include "mpiimpl.h" -#if !defined(MPID_REQUEST_PTR_ARRAY_SIZE) -#define MPID_REQUEST_PTR_ARRAY_SIZE 16 +#if !defined(MPIR_REQUEST_PTR_ARRAY_SIZE) +#define MPIR_REQUEST_PTR_ARRAY_SIZE 16 #endif /* -- Begin Profiling Symbol Block for routine MPI_Testany */ @@ -68,7 +68,7 @@ int MPI_Testany(int count, MPI_Request array_of_requests[], int *indx, int *flag, MPI_Status *status) { static const char FCNAME[] = "MPI_Testany"; - MPID_Request * request_ptr_array[MPID_REQUEST_PTR_ARRAY_SIZE]; + MPID_Request * request_ptr_array[MPIR_REQUEST_PTR_ARRAY_SIZE]; MPID_Request ** request_ptrs = request_ptr_array; int i; int n_inactive; @@ -109,7 +109,7 @@ int MPI_Testany(int count, MPI_Request array_of_requests[], int *indx, /* ... body of routine ... */ /* Convert MPI request handles to a request object pointers */ - if (count > MPID_REQUEST_PTR_ARRAY_SIZE) + if (count > MPIR_REQUEST_PTR_ARRAY_SIZE) { MPIU_CHKLMEM_MALLOC_ORJUMP(request_ptrs, MPID_Request **, count * sizeof(MPID_Request *), mpi_errno, "request pointers"); } @@ -215,7 +215,7 @@ int MPI_Testany(int count, MPI_Request array_of_requests[], int *indx, /* ... end of body of routine ... */ fn_exit: - if (count > MPID_REQUEST_PTR_ARRAY_SIZE) + if (count > MPIR_REQUEST_PTR_ARRAY_SIZE) { MPIU_CHKLMEM_FREEALL(); } diff --git a/src/mpi/pt2pt/testsome.c b/src/mpi/pt2pt/testsome.c index 9ec15eb..85c4bee 100644 --- a/src/mpi/pt2pt/testsome.c +++ b/src/mpi/pt2pt/testsome.c @@ -7,8 +7,8 @@ #include "mpiimpl.h" -#if !defined(MPID_REQUEST_PTR_ARRAY_SIZE) -#define MPID_REQUEST_PTR_ARRAY_SIZE 16 +#if !defined(MPIR_REQUEST_PTR_ARRAY_SIZE) +#define MPIR_REQUEST_PTR_ARRAY_SIZE 16 #endif /* -- Begin Profiling Symbol Block for routine MPI_Testsome */ @@ -70,7 +70,7 @@ int MPI_Testsome(int incount, MPI_Request array_of_requests[], int *outcount, int array_of_indices[], MPI_Status array_of_statuses[]) { static const char FCNAME[] = "MPI_Testsome"; - MPID_Request * request_ptr_array[MPID_REQUEST_PTR_ARRAY_SIZE]; + MPID_Request * request_ptr_array[MPIR_REQUEST_PTR_ARRAY_SIZE]; MPID_Request ** request_ptrs = request_ptr_array; MPI_Status * status_ptr; int i; @@ -115,7 +115,7 @@ int MPI_Testsome(int incount, MPI_Request array_of_requests[], int *outcount, *outcount = 0; /* Convert MPI request handles to a request object pointers */ - if (incount > MPID_REQUEST_PTR_ARRAY_SIZE) + if (incount > MPIR_REQUEST_PTR_ARRAY_SIZE) { MPIU_CHKLMEM_MALLOC_ORJUMP(request_ptrs, MPID_Request **, incount * sizeof(MPID_Request *), mpi_errno, "request pointers"); } @@ -238,7 +238,7 @@ int MPI_Testsome(int incount, MPI_Request array_of_requests[], int *outcount, /* ... end of body of routine ... */ fn_exit: - if (incount > MPID_REQUEST_PTR_ARRAY_SIZE) + if (incount > MPIR_REQUEST_PTR_ARRAY_SIZE) { MPIU_CHKLMEM_FREEALL(); } diff --git a/src/mpi/pt2pt/waitall.c b/src/mpi/pt2pt/waitall.c index f8d78d9..d25137a 100644 --- a/src/mpi/pt2pt/waitall.c +++ b/src/mpi/pt2pt/waitall.c @@ -7,9 +7,9 @@ #include "mpiimpl.h" -#if !defined(MPID_REQUEST_PTR_ARRAY_SIZE) +#if !defined(MPIR_REQUEST_PTR_ARRAY_SIZE) /* use a larger default size of 64 in order to enhance SQMR performance */ -#define MPID_REQUEST_PTR_ARRAY_SIZE 64 +#define MPIR_REQUEST_PTR_ARRAY_SIZE 64 #endif /* -- Begin Profiling Symbol Block for routine MPI_Waitall */ @@ -32,7 +32,7 @@ int MPI_Waitall(int count, MPI_Request array_of_requests[], MPI_Status array_of_ /* The "fastpath" version of MPIR_Request_complete. It only handles - * MPID_REQUEST_SEND and MPID_REQUEST_RECV kinds, and it does not attempt to + * MPIR_REQUEST_SEND and MPIR_REQUEST_RECV kinds, and it does not attempt to * deal with status structures under the assumption that bleeding fast code will * pass either MPI_STATUS_IGNORE or MPI_STATUSES_IGNORE as appropriate. This * routine (or some a variation of it) is an unfortunately necessary stunt to @@ -46,9 +46,9 @@ static inline int request_complete_fastpath(MPI_Request *request, MPID_Request * { int mpi_errno = MPI_SUCCESS; - MPIU_Assert(request_ptr->kind == MPID_REQUEST_SEND || request_ptr->kind == MPID_REQUEST_RECV); + MPIU_Assert(request_ptr->kind == MPIR_REQUEST_SEND || request_ptr->kind == MPIR_REQUEST_RECV); - if (request_ptr->kind == MPID_REQUEST_SEND) { + if (request_ptr->kind == MPIR_REQUEST_SEND) { /* FIXME: are Ibsend requests added to the send queue? */ MPIR_SENDQ_FORGET(request_ptr); } @@ -71,7 +71,7 @@ int MPIR_Waitall_impl(int count, MPI_Request array_of_requests[], MPI_Status array_of_statuses[]) { int mpi_errno = MPI_SUCCESS; - MPID_Request * request_ptr_array[MPID_REQUEST_PTR_ARRAY_SIZE]; + MPID_Request * request_ptr_array[MPIR_REQUEST_PTR_ARRAY_SIZE]; MPID_Request ** request_ptrs = request_ptr_array; MPI_Status * status_ptr; MPID_Progress_state progress_state; @@ -87,7 +87,7 @@ int MPIR_Waitall_impl(int count, MPI_Request array_of_requests[], MPIU_CHKLMEM_DECL(1); /* Convert MPI request handles to a request object pointers */ - if (count > MPID_REQUEST_PTR_ARRAY_SIZE) + if (count > MPIR_REQUEST_PTR_ARRAY_SIZE) { MPIU_CHKLMEM_MALLOC(request_ptrs, MPID_Request **, count * sizeof(MPID_Request *), mpi_errno, "request pointers"); } @@ -106,14 +106,14 @@ int MPIR_Waitall_impl(int count, MPI_Request array_of_requests[], { MPID_Request_valid_ptr( request_ptrs[i], mpi_errno ); if (mpi_errno) MPIR_ERR_POP(mpi_errno); - MPIR_ERR_CHKANDJUMP1((request_ptrs[i]->kind == MPID_REQUEST_MPROBE), + MPIR_ERR_CHKANDJUMP1((request_ptrs[i]->kind == MPIR_REQUEST_MPROBE), mpi_errno, MPI_ERR_ARG, "**msgnotreq", "**msgnotreq %d", i); } MPID_END_ERROR_CHECKS; } # endif - if (request_ptrs[i]->kind != MPID_REQUEST_RECV && - request_ptrs[i]->kind != MPID_REQUEST_SEND) + if (request_ptrs[i]->kind != MPIR_REQUEST_RECV && + request_ptrs[i]->kind != MPIR_REQUEST_SEND) { optimize = FALSE; } @@ -287,7 +287,7 @@ int MPIR_Waitall_impl(int count, MPI_Request array_of_requests[], MPID_Progress_end(&progress_state); fn_exit: - if (count > MPID_REQUEST_PTR_ARRAY_SIZE) + if (count > MPIR_REQUEST_PTR_ARRAY_SIZE) { MPIU_CHKLMEM_FREEALL(); } diff --git a/src/mpi/pt2pt/waitany.c b/src/mpi/pt2pt/waitany.c index 6a713e4..0b8e75c 100644 --- a/src/mpi/pt2pt/waitany.c +++ b/src/mpi/pt2pt/waitany.c @@ -7,8 +7,8 @@ #include "mpiimpl.h" -#if !defined(MPID_REQUEST_PTR_ARRAY_SIZE) -#define MPID_REQUEST_PTR_ARRAY_SIZE 16 +#if !defined(MPIR_REQUEST_PTR_ARRAY_SIZE) +#define MPIR_REQUEST_PTR_ARRAY_SIZE 16 #endif /* -- Begin Profiling Symbol Block for routine MPI_Waitany */ @@ -69,7 +69,7 @@ int MPI_Waitany(int count, MPI_Request array_of_requests[], int *indx, MPI_Status *status) { static const char FCNAME[] = "MPI_Waitany"; - MPID_Request * request_ptr_array[MPID_REQUEST_PTR_ARRAY_SIZE]; + MPID_Request * request_ptr_array[MPIR_REQUEST_PTR_ARRAY_SIZE]; MPID_Request ** request_ptrs = request_ptr_array; MPID_Progress_state progress_state; int i; @@ -108,7 +108,7 @@ int MPI_Waitany(int count, MPI_Request array_of_requests[], int *indx, /* ... body of routine ... */ /* Convert MPI request handles to a request object pointers */ - if (count > MPID_REQUEST_PTR_ARRAY_SIZE) + if (count > MPIR_REQUEST_PTR_ARRAY_SIZE) { MPIU_CHKLMEM_MALLOC_ORJUMP(request_ptrs, MPID_Request **, count * sizeof(MPID_Request *), mpi_errno, "request pointers"); } @@ -220,7 +220,7 @@ int MPI_Waitany(int count, MPI_Request array_of_requests[], int *indx, /* ... end of body of routine ... */ fn_exit: - if (count > MPID_REQUEST_PTR_ARRAY_SIZE) + if (count > MPIR_REQUEST_PTR_ARRAY_SIZE) { MPIU_CHKLMEM_FREEALL(); } diff --git a/src/mpi/pt2pt/waitsome.c b/src/mpi/pt2pt/waitsome.c index 95dc784..7662c4d 100644 --- a/src/mpi/pt2pt/waitsome.c +++ b/src/mpi/pt2pt/waitsome.c @@ -7,8 +7,8 @@ #include "mpiimpl.h" -#if !defined(MPID_REQUEST_PTR_ARRAY_SIZE) -#define MPID_REQUEST_PTR_ARRAY_SIZE 16 +#if !defined(MPIR_REQUEST_PTR_ARRAY_SIZE) +#define MPIR_REQUEST_PTR_ARRAY_SIZE 16 #endif /* -- Begin Profiling Symbol Block for routine MPI_Waitsome */ @@ -87,7 +87,7 @@ int MPI_Waitsome(int incount, MPI_Request array_of_requests[], MPI_Status array_of_statuses[]) { static const char FCNAME[] = "MPI_Waitsome"; - MPID_Request * request_ptr_array[MPID_REQUEST_PTR_ARRAY_SIZE]; + MPID_Request * request_ptr_array[MPIR_REQUEST_PTR_ARRAY_SIZE]; MPID_Request ** request_ptrs = request_ptr_array; MPI_Status * status_ptr; MPID_Progress_state progress_state; @@ -134,7 +134,7 @@ int MPI_Waitsome(int incount, MPI_Request array_of_requests[], *outcount = 0; /* Convert MPI request handles to a request object pointers */ - if (incount > MPID_REQUEST_PTR_ARRAY_SIZE) + if (incount > MPIR_REQUEST_PTR_ARRAY_SIZE) { MPIU_CHKLMEM_MALLOC_ORJUMP(request_ptrs, MPID_Request **, incount * sizeof(MPID_Request *), mpi_errno, "request pointers"); } @@ -291,7 +291,7 @@ int MPI_Waitsome(int incount, MPI_Request array_of_requests[], /* ... end of body of routine ... */ fn_exit: - if (incount > MPID_REQUEST_PTR_ARRAY_SIZE) + if (incount > MPIR_REQUEST_PTR_ARRAY_SIZE) { MPIU_CHKLMEM_FREEALL(); } diff --git a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_poll.c b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_poll.c index c929207..d8d988d 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_poll.c +++ b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_poll.c @@ -85,7 +85,7 @@ static void MPID_nem_llc_send_handler(void *cba, uint64_t * p_reqid) kind = sreq->kind; switch (kind) { unsigned int reqtype; - case MPID_REQUEST_SEND: + case MPIR_REQUEST_SEND: case MPID_PREQUEST_SEND:{ reqtype = MPIDI_Request_get_type(sreq); diff --git a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_probe.c b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_probe.c index c7c8c56..c6bc718 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_probe.c +++ b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_probe.c @@ -159,7 +159,7 @@ int MPID_nem_llc_improbe(MPIDI_VC_t * vc, int source, int tag, MPIR_Comm * comm, req = MPID_Request_create(); MPIU_Object_set_ref(req, 2); - req->kind = MPID_REQUEST_MPROBE; + req->kind = MPIR_REQUEST_MPROBE; req->comm = comm; MPIR_Comm_add_ref(comm); req->ch.vc = vc; diff --git a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_send.c b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_send.c index 22b0cf4..eeb0666 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_send.c +++ b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_send.c @@ -46,7 +46,7 @@ int MPID_nem_llc_isend(struct MPIDI_VC *vc, const void *buf, int count, MPI_Data struct MPID_Request *sreq = MPID_Request_create(); MPIU_Assert(sreq != NULL); MPIU_Object_set_ref(sreq, 2); - sreq->kind = MPID_REQUEST_SEND; + sreq->kind = MPIR_REQUEST_SEND; /* Used in llc_poll --> MPID_nem_llc_send_handler */ sreq->ch.vc = vc; @@ -189,7 +189,7 @@ int MPID_nem_llc_iStartContigMsg(MPIDI_VC_t * vc, void *hdr, intptr_t hdr_sz, vo sreq = MPID_Request_create(); MPIU_Assert(sreq != NULL); MPIU_Object_set_ref(sreq, 2); - sreq->kind = MPID_REQUEST_SEND; + sreq->kind = MPIR_REQUEST_SEND; sreq->ch.vc = vc; sreq->dev.OnDataAvail = 0; @@ -264,8 +264,8 @@ int MPID_nem_llc_iSendContig(MPIDI_VC_t * vc, MPID_Request * sreq, void *hdr, in MPIDI_FUNC_ENTER(MPID_STATE_MPID_NEM_LLC_ISENDCONTIGMSG); - if (sreq->kind == MPID_REQUEST_UNDEFINED) { - sreq->kind = MPID_REQUEST_SEND; + if (sreq->kind == MPIR_REQUEST_UNDEFINED) { + sreq->kind = MPIR_REQUEST_SEND; } dprintf("llc_iSendConitig,sreq=%p,hdr=%p,hdr_sz=%ld,data=%p,data_sz=%ld\n", sreq, hdr, hdr_sz, data, data_sz); @@ -814,7 +814,7 @@ int llc_poll(int in_blocking_poll, llc_send_f sfnc, llc_recv_f rfnc) lcmd = (LLC_cmd_t *) events[0].side.initiator.req_id; MPID_Request *req = ((struct llc_cmd_area *) lcmd->usr_area)->cbarg; - if (req->kind != MPID_REQUEST_MPROBE) { + if (req->kind != MPIR_REQUEST_MPROBE) { /* Unpack non-contiguous dt */ int is_contig; MPIDU_Datatype_is_contig(req->dev.datatype, &is_contig); @@ -979,7 +979,7 @@ int MPID_nem_llc_issend(struct MPIDI_VC *vc, const void *buf, int count, MPI_Dat struct MPID_Request *sreq = MPID_Request_create(); MPIU_Assert(sreq != NULL); MPIU_Object_set_ref(sreq, 2); - sreq->kind = MPID_REQUEST_SEND; + sreq->kind = MPIR_REQUEST_SEND; /* Used in llc_poll --> MPID_nem_llc_send_handler */ sreq->ch.vc = vc; diff --git a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_probe.c b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_probe.c index b433f62..21ec5a9 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_probe.c +++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_probe.c @@ -137,7 +137,7 @@ int MPID_nem_mxm_improbe(MPIDI_VC_t * vc, int source, int tag, MPIR_Comm * comm, req = MPID_Request_create(); MPIU_Object_set_ref(req, 2); - req->kind = MPID_REQUEST_MPROBE; + req->kind = MPIR_REQUEST_MPROBE; req->comm = comm; MPIR_Comm_add_ref(comm); req->ch.vc = vc; diff --git a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c index a143e17..1af8e6b 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c +++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c @@ -117,7 +117,7 @@ int MPID_nem_mxm_iStartContigMsg(MPIDI_VC_t * vc, void *hdr, intptr_t hdr_sz, vo MPIU_Assert(sreq != NULL); MPIU_Object_set_ref(sreq, 2); MPIU_Memcpy(&(sreq->dev.pending_pkt), (char *) hdr, sizeof(MPIDI_CH3_Pkt_t)); - sreq->kind = MPID_REQUEST_SEND; + sreq->kind = MPIR_REQUEST_SEND; sreq->dev.OnDataAvail = NULL; sreq->dev.tmpbuf = NULL; diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_cm.c b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_cm.c index 9669fd4..ebdad1c 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_cm.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_cm.c @@ -551,7 +551,7 @@ int MPID_nem_ofi_connect_to_root(const char *business_card, MPIDI_VC_t * new_vc) my_bc_len = OFI_KVSAPPSTRLEN - my_bc_len; MPID_nem_ofi_create_req(&sreq, 1); - sreq->kind = MPID_REQUEST_SEND; + sreq->kind = MPIR_REQUEST_SEND; sreq->dev.OnDataAvail = NULL; sreq->dev.next = NULL; REQ_OFI(sreq)->event_callback = MPID_nem_ofi_connect_to_root_callback; diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h index 0b55dc0..3dc4ccf 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h @@ -268,10 +268,10 @@ static inline int MPID_nem_ofi_create_req_lw(MPID_Request ** request, int refcnt MPID_Abort(NULL, MPI_ERR_NO_SPACE, -1, "Cannot allocate Request"); MPIU_Assert(req != NULL); - MPIU_Assert(HANDLE_GET_MPI_KIND(req->handle) == MPID_REQUEST); + MPIU_Assert(HANDLE_GET_MPI_KIND(req->handle) == MPIR_REQUEST); MPIU_Object_set_ref(req, refcnt); - req->kind = MPID_REQUEST_SEND; + req->kind = MPIR_REQUEST_SEND; MPIR_cc_set(&req->cc, 0); // request is already completed req->cc_ptr = &req->cc; req->status.MPI_ERROR = MPI_SUCCESS; diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_msg.c b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_msg.c index 659ebe5..19c1746 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_msg.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_msg.c @@ -322,7 +322,7 @@ int MPID_nem_ofi_iStartContigMsg(MPIDI_VC_t * vc, MPIU_Assert(hdr_sz <= (intptr_t) sizeof(MPIDI_CH3_Pkt_t)); MPID_nem_ofi_create_req(&sreq, 2); - sreq->kind = MPID_REQUEST_SEND; + sreq->kind = MPIR_REQUEST_SEND; sreq->dev.OnDataAvail = NULL; sreq->dev.next = NULL; pkt_len = sizeof(MPIDI_CH3_Pkt_t) + data_sz; diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_probe_template.c b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_probe_template.c index 05f61fa..45440c9 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_probe_template.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_probe_template.c @@ -52,7 +52,7 @@ int ADD_SUFFIX(MPID_nem_ofi_iprobe_impl)(struct MPIDI_VC *vc, BEGIN_FUNC(FCNAME); if (rreq_ptr) { MPIDI_CH3I_NM_OFI_RC(MPID_nem_ofi_create_req(&rreq, 1)); - rreq->kind = MPID_REQUEST_RECV; + rreq->kind = MPIR_REQUEST_RECV; *rreq_ptr = rreq; rreq->comm = comm; @@ -165,7 +165,7 @@ int ADD_SUFFIX(MPID_nem_ofi_improbe)(struct MPIDI_VC *vc, tag, comm, context_offset, flag, status, message); if (*flag) { status->MPI_ERROR = old_error; - (*message)->kind = MPID_REQUEST_MPROBE; + (*message)->kind = MPIR_REQUEST_MPROBE; } END_FUNC(FCNAME); return s; diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_progress.c b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_progress.c index f48e021..6bf5a01 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_progress.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_progress.c @@ -94,10 +94,10 @@ int MPID_nem_ofi_poll(int in_blocking_poll) /* Other kinds of requests, this is fatal. */ /* ----------------------------------------------------- */ req = context_to_req(error.op_context); - if (req->kind == MPID_REQUEST_SEND) { + if (req->kind == MPIR_REQUEST_SEND) { mpi_errno = REQ_OFI(req)->event_callback(NULL, req); } - else if (req->kind == MPID_REQUEST_RECV) { + else if (req->kind == MPIR_REQUEST_RECV) { mpi_errno = REQ_OFI(req)->event_callback(&wc, req); req->status.MPI_ERROR = MPI_ERR_TRUNCATE; req->status.MPI_TAG = error.tag; diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_tag_layout.h b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_tag_layout.h index d925d74..5c092cb 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_tag_layout.h +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_tag_layout.h @@ -13,7 +13,7 @@ * *********************************************************************************/ #define MPID_PROTOCOL_MASK (0x00000000F0000000ULL) -#define MPID_CONTEXT_MASK (0x0000FFFF00000000ULL) +#define MPIR_CONTEXT_MASK (0x0000FFFF00000000ULL) #define MPID_SOURCE_MASK (0xFFFF000000000000ULL) #define MPID_TAG_MASK (0x000000000FFFFFFFULL) #define MPID_PGID_MASK (0xFFFFFFFF00000000ULL) diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_tagged_template.c b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_tagged_template.c index f0f2f00..f9e9ffe 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_tagged_template.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_tagged_template.c @@ -124,7 +124,7 @@ static inline int ADD_SUFFIX(send_normal)(struct MPIDI_VC *vc, /* Create the MPI request */ /* ---------------------------------------------------- */ MPID_nem_ofi_create_req(&sreq, 2); - sreq->kind = MPID_REQUEST_SEND; + sreq->kind = MPIR_REQUEST_SEND; sreq->dev.OnDataAvail = NULL; REQ_OFI(sreq)->event_callback = MPID_nem_ofi_send_callback; REQ_OFI(sreq)->vc = vc; diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h index e58564a..4bf4377 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h @@ -70,7 +70,7 @@ static inline MPID_nem_ptl_req_area * REQ_PTL(MPID_Request *req) { #define MPID_nem_ptl_request_create_sreq(sreq_, errno_, comm_) do { \ (sreq_) = MPID_Request_create(); \ MPIU_Object_set_ref((sreq_), 2); \ - (sreq_)->kind = MPID_REQUEST_SEND; \ + (sreq_)->kind = MPIR_REQUEST_SEND; \ MPIR_Comm_add_ref(comm_); \ (sreq_)->comm = comm_; \ (sreq_)->status.MPI_ERROR = MPI_SUCCESS; \ diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c index ca2562f..bd385dc 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c @@ -368,7 +368,7 @@ int MPID_nem_ptl_iStartContigMsg(MPIDI_VC_t *vc, void *hdr, intptr_t hdr_sz, voi *sreq_ptr = MPID_Request_create(); MPIU_Assert(*sreq_ptr != NULL); MPIU_Object_set_ref(*sreq_ptr, 2); - (*sreq_ptr)->kind = MPID_REQUEST_SEND; + (*sreq_ptr)->kind = MPIR_REQUEST_SEND; (*sreq_ptr)->dev.OnDataAvail = NULL; (*sreq_ptr)->dev.user_buf = NULL; diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_probe.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_probe.c index f70940d..331d888 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_probe.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_probe.c @@ -207,7 +207,7 @@ int MPID_nem_ptl_improbe(MPIDI_VC_t *vc, int source, int tag, MPIR_Comm *comm, i MPIR_ERR_CHKANDJUMP1(!req, mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", "MPID_Request_create"); MPIU_Object_set_ref(req, 2); /* 1 ref for progress engine and 1 ref for us */ REQ_PTL(req)->event_handler = handle_mprobe; - req->kind = MPID_REQUEST_MPROBE; + req->kind = MPIR_REQUEST_MPROBE; /* create a dummy ME to use for searching the list */ me.start = NULL; @@ -327,7 +327,7 @@ int MPID_nem_ptl_pkt_cancel_send_req_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pk MPID_nem_ptl_init_req(search_req); MPIR_ERR_CHKANDJUMP1(!search_req, mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", "MPID_Request_create"); MPIU_Object_set_ref(search_req, 2); /* 1 ref for progress engine and 1 ref for us */ - search_req->kind = MPID_REQUEST_MPROBE; + search_req->kind = MPIR_REQUEST_MPROBE; /* create a dummy ME to use for searching the list */ me.start = NULL; diff --git a/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_send.c b/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_send.c index 53ca9a7..fd45a61 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_send.c +++ b/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_send.c @@ -309,7 +309,7 @@ int MPID_nem_tcp_iStartContigMsg(MPIDI_VC_t *vc, void *hdr, intptr_t hdr_sz, voi sreq = MPID_Request_create(); MPIU_Assert (sreq != NULL); MPIU_Object_set_ref (sreq, 2); - sreq->kind = MPID_REQUEST_SEND; + sreq->kind = MPIR_REQUEST_SEND; sreq->dev.OnDataAvail = 0; sreq->ch.vc = vc; @@ -448,7 +448,7 @@ int MPID_nem_tcp_iStartContigMsg_paused(MPIDI_VC_t *vc, void *hdr, intptr_t hdr_ sreq = MPID_Request_create(); MPIU_Assert (sreq != NULL); MPIU_Object_set_ref (sreq, 2); - sreq->kind = MPID_REQUEST_SEND; + sreq->kind = MPIR_REQUEST_SEND; sreq->dev.OnDataAvail = 0; sreq->ch.vc = vc; diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_init.c b/src/mpid/ch3/channels/nemesis/src/ch3_init.c index ce58a44..53fac87 100644 --- a/src/mpid/ch3/channels/nemesis/src/ch3_init.c +++ b/src/mpid/ch3/channels/nemesis/src/ch3_init.c @@ -83,7 +83,7 @@ int MPIDI_CH3_Init(int has_parent, MPIDI_PG_t *pg_p, int pg_rank) MPIDI_FUNC_ENTER(MPID_STATE_MPIDI_CH3_INIT); /* Override split_type */ - MPID_Comm_fns = &comm_fns; + MPIR_Comm_fns = &comm_fns; mpi_errno = MPID_nem_init (pg_rank, pg_p, has_parent); if (mpi_errno) MPIR_ERR_POP (mpi_errno); diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_istartmsg.c b/src/mpid/ch3/channels/nemesis/src/ch3_istartmsg.c index 6cdec55..c0ce1ef 100644 --- a/src/mpid/ch3/channels/nemesis/src/ch3_istartmsg.c +++ b/src/mpid/ch3/channels/nemesis/src/ch3_istartmsg.c @@ -92,7 +92,7 @@ int MPIDI_CH3_iStartMsg (MPIDI_VC_t *vc, void *hdr, intptr_t hdr_sz, MPID_Reques sreq = MPID_Request_create(); MPIU_Assert (sreq != NULL); MPIU_Object_set_ref (sreq, 2); - sreq->kind = MPID_REQUEST_SEND; + sreq->kind = MPIR_REQUEST_SEND; sreq->dev.pending_pkt = *(MPIDI_CH3_Pkt_t *) hdr; sreq->dev.iov[0].MPL_IOV_BUF = (char *) &sreq->dev.pending_pkt; diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_istartmsgv.c b/src/mpid/ch3/channels/nemesis/src/ch3_istartmsgv.c index 7fd6309..d3d77c0 100644 --- a/src/mpid/ch3/channels/nemesis/src/ch3_istartmsgv.c +++ b/src/mpid/ch3/channels/nemesis/src/ch3_istartmsgv.c @@ -120,7 +120,7 @@ int MPIDI_CH3_iStartMsgv (MPIDI_VC_t *vc, MPL_IOV *iov, int n_iov, MPID_Request sreq = MPID_Request_create(); MPIU_Assert(sreq != NULL); MPIU_Object_set_ref(sreq, 2); - sreq->kind = MPID_REQUEST_SEND; + sreq->kind = MPIR_REQUEST_SEND; for (j = 0; j < remaining_n_iov; ++j) { sreq->dev.iov[j] = remaining_iov[j]; @@ -151,7 +151,7 @@ int MPIDI_CH3_iStartMsgv (MPIDI_VC_t *vc, MPL_IOV *iov, int n_iov, MPID_Request sreq = MPID_Request_create(); MPIU_Assert(sreq != NULL); MPIU_Object_set_ref(sreq, 2); - sreq->kind = MPID_REQUEST_SEND; + sreq->kind = MPIR_REQUEST_SEND; sreq->dev.pending_pkt = *(MPIDI_CH3_Pkt_t *) iov[0].MPL_IOV_BUF; sreq->dev.iov[0].MPL_IOV_BUF = (char *) &sreq->dev.pending_pkt; diff --git a/src/mpid/ch3/channels/nemesis/src/ch3i_comm.c b/src/mpid/ch3/channels/nemesis/src/ch3i_comm.c index d340adc..1bfef18 100644 --- a/src/mpid/ch3/channels/nemesis/src/ch3i_comm.c +++ b/src/mpid/ch3/channels/nemesis/src/ch3i_comm.c @@ -33,7 +33,7 @@ int MPIDI_CH3I_comm_create(MPIR_Comm *comm, void *param) #endif /* set up intranode barrier iff this is an intranode communicator */ - if (comm->hierarchy_kind == MPID_HIERARCHY_NODE) { + if (comm->hierarchy_kind == MPIR_HIERARCHY_NODE) { MPIR_Collops *cf, **cf_p; comm->dev.ch.barrier_vars = NULL; @@ -96,7 +96,7 @@ int MPIDI_CH3I_comm_destroy(MPIR_Comm *comm, void *param) goto fn_exit; #endif - if (comm->hierarchy_kind == MPID_HIERARCHY_NODE) { + if (comm->hierarchy_kind == MPIR_HIERARCHY_NODE) { MPIR_Collops *cf = comm->coll_fns; /* replace previous coll_fns table */ @@ -168,7 +168,7 @@ static int barrier(MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) int prev; int sense; - MPIU_Assert(comm_ptr->hierarchy_kind == MPID_HIERARCHY_NODE); + MPIU_Assert(comm_ptr->hierarchy_kind == MPIR_HIERARCHY_NODE); /* Trivial barriers return immediately */ if (comm_ptr->local_size == 1) diff --git a/src/mpid/ch3/channels/nemesis/src/mpid_nem_mpich.c b/src/mpid/ch3/channels/nemesis/src/mpid_nem_mpich.c index 0eff9dc..401f7e4 100644 --- a/src/mpid/ch3/channels/nemesis/src/mpid_nem_mpich.c +++ b/src/mpid/ch3/channels/nemesis/src/mpid_nem_mpich.c @@ -99,7 +99,7 @@ int MPID_nem_send_iov(MPIDI_VC_t *vc, MPID_Request **sreq_ptr, MPL_IOV *iov, int sreq = MPID_Request_create(); MPIU_Assert(sreq != NULL); MPIU_Object_set_ref(sreq, 2); - sreq->kind = MPID_REQUEST_SEND; + sreq->kind = MPIR_REQUEST_SEND; sreq->dev.OnDataAvail = 0; } diff --git a/src/mpid/ch3/channels/sock/src/ch3_istartmsg.c b/src/mpid/ch3/channels/sock/src/ch3_istartmsg.c index e526174..c9cd240 100644 --- a/src/mpid/ch3/channels/sock/src/ch3_istartmsg.c +++ b/src/mpid/ch3/channels/sock/src/ch3_istartmsg.c @@ -24,7 +24,7 @@ static MPID_Request * create_request(void * hdr, intptr_t hdr_sz, return NULL; /* --END ERROR HANDLING-- */ MPIU_Object_set_ref(sreq, 2); - sreq->kind = MPID_REQUEST_SEND; + sreq->kind = MPIR_REQUEST_SEND; MPIU_Assert(hdr_sz == sizeof(MPIDI_CH3_Pkt_t)); sreq->dev.pending_pkt = *(MPIDI_CH3_Pkt_t *) hdr; sreq->dev.iov[0].MPL_IOV_BUF = @@ -130,7 +130,7 @@ int MPIDI_CH3_iStartMsg(MPIDI_VC_t * vc, void * hdr, intptr_t hdr_sz, if (!sreq) { MPIR_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomem"); } - sreq->kind = MPID_REQUEST_SEND; + sreq->kind = MPIR_REQUEST_SEND; MPIR_cc_set(&(sreq->cc), 0); sreq->status.MPI_ERROR = MPIR_Err_create_code( rc, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, @@ -198,7 +198,7 @@ int MPIDI_CH3_iStartMsg(MPIDI_VC_t * vc, void * hdr, intptr_t hdr_sz, if (!sreq) { MPIR_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomem"); } - sreq->kind = MPID_REQUEST_SEND; + sreq->kind = MPIR_REQUEST_SEND; MPIR_cc_set(&sreq->cc, 0); sreq->status.MPI_ERROR = MPIR_Err_create_code( MPI_SUCCESS, diff --git a/src/mpid/ch3/channels/sock/src/ch3_istartmsgv.c b/src/mpid/ch3/channels/sock/src/ch3_istartmsgv.c index 7218cdf..c316179 100644 --- a/src/mpid/ch3/channels/sock/src/ch3_istartmsgv.c +++ b/src/mpid/ch3/channels/sock/src/ch3_istartmsgv.c @@ -25,7 +25,7 @@ static MPID_Request * create_request(MPL_IOV * iov, int iov_count, return NULL; /* --END ERROR HANDLING-- */ MPIU_Object_set_ref(sreq, 2); - sreq->kind = MPID_REQUEST_SEND; + sreq->kind = MPIR_REQUEST_SEND; for (i = 0; i < iov_count; i++) { @@ -162,7 +162,7 @@ int MPIDI_CH3_iStartMsgv(MPIDI_VC_t * vc, MPL_IOV * iov, int n_iov, if (sreq == NULL) { MPIR_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomem"); } - sreq->kind = MPID_REQUEST_SEND; + sreq->kind = MPIR_REQUEST_SEND; MPIR_cc_set(&(sreq->cc), 0); sreq->status.MPI_ERROR = MPIR_Err_create_code( rc, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, @@ -230,7 +230,7 @@ int MPIDI_CH3_iStartMsgv(MPIDI_VC_t * vc, MPL_IOV * iov, int n_iov, if (sreq == NULL) { MPIR_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomem"); } - sreq->kind = MPID_REQUEST_SEND; + sreq->kind = MPIR_REQUEST_SEND; MPIR_cc_set(&(sreq->cc), 0); sreq->status.MPI_ERROR = MPIR_Err_create_code( MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, diff --git a/src/mpid/ch3/include/mpid_rma_issue.h b/src/mpid/ch3/include/mpid_rma_issue.h index fad831e..26924cd 100644 --- a/src/mpid/ch3/include/mpid_rma_issue.h +++ b/src/mpid/ch3/include/mpid_rma_issue.h @@ -318,7 +318,7 @@ static int issue_from_origin_buffer(MPIDI_RMA_Op_t * rma_op, MPIDI_VC_t * vc, MPIR_ERR_CHKANDJUMP(req == NULL, mpi_errno, MPI_ERR_OTHER, "**nomemreq"); MPIU_Object_set_ref(req, 2); - req->kind = MPID_REQUEST_SEND; + req->kind = MPIR_REQUEST_SEND; /* set extended packet header, it is freed when the request is freed. */ if (ext_hdr_sz > 0) { diff --git a/src/mpid/ch3/include/mpidimpl.h b/src/mpid/ch3/include/mpidimpl.h index 148d6aa..426aa50 100644 --- a/src/mpid/ch3/include/mpidimpl.h +++ b/src/mpid/ch3/include/mpidimpl.h @@ -250,7 +250,7 @@ extern MPIDI_Process_t MPIDI_Process; */ /* FIXME XXX DJG for TLS hack */ -#define MPID_REQUEST_TLS_MAX 128 +#define MPIR_REQUEST_TLS_MAX 128 # define MPIDI_Request_tls_alloc(req_) \ do { \ @@ -289,7 +289,7 @@ extern MPIDI_Process_t MPIDI_Process; { \ (sreq_) = MPID_Request_create(); \ MPIU_Object_set_ref((sreq_), 2); \ - (sreq_)->kind = MPID_REQUEST_SEND; \ + (sreq_)->kind = MPIR_REQUEST_SEND; \ (sreq_)->comm = comm; \ (sreq_)->partner_request = NULL; \ MPIR_Comm_add_ref(comm); \ @@ -308,7 +308,7 @@ extern MPIDI_Process_t MPIDI_Process; { \ (rreq_) = MPID_Request_create(); \ MPIU_Object_set_ref((rreq_), 2); \ - (rreq_)->kind = MPID_REQUEST_RECV; \ + (rreq_)->kind = MPIR_REQUEST_RECV; \ (rreq_)->partner_request = NULL; \ } @@ -321,7 +321,7 @@ extern MPIDI_Process_t MPIDI_Process; MPIU_Object_set_ref((rreq_), 1); \ /* MT FIXME should these be handled by MPID_Request_create? */ \ MPIR_cc_set(&(rreq_)->cc, 0); \ - (rreq_)->kind = MPID_REQUEST_RECV; \ + (rreq_)->kind = MPIR_REQUEST_RECV; \ MPIR_Status_set_procnull(&(rreq_)->status); \ } \ else { \ diff --git a/src/mpid/ch3/include/mpidpre.h b/src/mpid/ch3/include/mpidpre.h index 15bf662..9847619 100644 --- a/src/mpid/ch3/include/mpidpre.h +++ b/src/mpid/ch3/include/mpidpre.h @@ -466,15 +466,15 @@ typedef struct MPIDI_Request { MPIDI_CH3_Pkt_t pending_pkt; struct MPID_Request * next; } MPIDI_Request; -#define MPID_REQUEST_DECL MPIDI_Request dev; +#define MPIR_REQUEST_DECL MPIDI_Request dev; #if defined(MPIDI_CH3_REQUEST_DECL) #define MPID_DEV_REQUEST_DECL \ -MPID_REQUEST_DECL \ +MPIR_REQUEST_DECL \ MPIDI_CH3_REQUEST_DECL #else #define MPID_DEV_REQUEST_DECL \ -MPID_REQUEST_DECL +MPIR_REQUEST_DECL #endif #ifdef MPIDI_CH3_REQUEST_KIND_DECL diff --git a/src/mpid/ch3/src/ch3u_comm.c b/src/mpid/ch3/src/ch3u_comm.c index f3db897..d37a709 100644 --- a/src/mpid/ch3/src/ch3u_comm.c +++ b/src/mpid/ch3/src/ch3u_comm.c @@ -201,10 +201,10 @@ int MPIDI_CH3I_Comm_create_hook(MPIR_Comm *comm) /* do some sanity checks */ MPL_LL_FOREACH(comm->mapper_head, mapper) { - if (mapper->src_comm->comm_kind == MPID_INTRACOMM) + if (mapper->src_comm->comm_kind == MPIR_INTRACOMM) MPIU_Assert(mapper->dir == MPIR_COMM_MAP_DIR_L2L || mapper->dir == MPIR_COMM_MAP_DIR_L2R); - if (comm->comm_kind == MPID_INTRACOMM) + if (comm->comm_kind == MPIR_INTRACOMM) MPIU_Assert(mapper->dir == MPIR_COMM_MAP_DIR_L2L || mapper->dir == MPIR_COMM_MAP_DIR_R2L); } @@ -228,14 +228,14 @@ int MPIDI_CH3I_Comm_create_hook(MPIR_Comm *comm) continue; if (mapper->dir == MPIR_COMM_MAP_DIR_L2L) { - if (src_comm->comm_kind == MPID_INTRACOMM && comm->comm_kind == MPID_INTRACOMM) { + if (src_comm->comm_kind == MPIR_INTRACOMM && comm->comm_kind == MPIR_INTRACOMM) { dup_vcrt(src_comm->dev.vcrt, &comm->dev.vcrt, mapper, mapper->src_comm->local_size, vcrt_size, vcrt_offset); } - else if (src_comm->comm_kind == MPID_INTRACOMM && comm->comm_kind == MPID_INTERCOMM) + else if (src_comm->comm_kind == MPIR_INTRACOMM && comm->comm_kind == MPIR_INTERCOMM) dup_vcrt(src_comm->dev.vcrt, &comm->dev.local_vcrt, mapper, mapper->src_comm->local_size, vcrt_size, vcrt_offset); - else if (src_comm->comm_kind == MPID_INTERCOMM && comm->comm_kind == MPID_INTRACOMM) { + else if (src_comm->comm_kind == MPIR_INTERCOMM && comm->comm_kind == MPIR_INTRACOMM) { dup_vcrt(src_comm->dev.local_vcrt, &comm->dev.vcrt, mapper, mapper->src_comm->local_size, vcrt_size, vcrt_offset); } @@ -244,8 +244,8 @@ int MPIDI_CH3I_Comm_create_hook(MPIR_Comm *comm) mapper->src_comm->local_size, vcrt_size, vcrt_offset); } else { /* mapper->dir == MPIR_COMM_MAP_DIR_R2L */ - MPIU_Assert(src_comm->comm_kind == MPID_INTERCOMM); - if (comm->comm_kind == MPID_INTRACOMM) { + MPIU_Assert(src_comm->comm_kind == MPIR_INTERCOMM); + if (comm->comm_kind == MPIR_INTRACOMM) { dup_vcrt(src_comm->dev.vcrt, &comm->dev.vcrt, mapper, mapper->src_comm->remote_size, vcrt_size, vcrt_offset); } @@ -274,10 +274,10 @@ int MPIDI_CH3I_Comm_create_hook(MPIR_Comm *comm) mapper->dir == MPIR_COMM_MAP_DIR_R2L) continue; - MPIU_Assert(comm->comm_kind == MPID_INTERCOMM); + MPIU_Assert(comm->comm_kind == MPIR_INTERCOMM); if (mapper->dir == MPIR_COMM_MAP_DIR_L2R) { - if (src_comm->comm_kind == MPID_INTRACOMM) + if (src_comm->comm_kind == MPIR_INTRACOMM) dup_vcrt(src_comm->dev.vcrt, &comm->dev.vcrt, mapper, mapper->src_comm->local_size, vcrt_size, vcrt_offset); else @@ -285,14 +285,14 @@ int MPIDI_CH3I_Comm_create_hook(MPIR_Comm *comm) mapper->src_comm->local_size, vcrt_size, vcrt_offset); } else { /* mapper->dir == MPIR_COMM_MAP_DIR_R2R */ - MPIU_Assert(src_comm->comm_kind == MPID_INTERCOMM); + MPIU_Assert(src_comm->comm_kind == MPIR_INTERCOMM); dup_vcrt(src_comm->dev.vcrt, &comm->dev.vcrt, mapper, mapper->src_comm->remote_size, vcrt_size, vcrt_offset); } vcrt_offset += map_size(*mapper); } - if (comm->comm_kind == MPID_INTERCOMM) { + if (comm->comm_kind == MPIR_INTERCOMM) { /* setup the vcrt for the local_comm in the intercomm */ if (comm->local_comm) { comm->local_comm->dev.vcrt = comm->dev.local_vcrt; @@ -332,7 +332,7 @@ int MPIDI_CH3I_Comm_destroy_hook(MPIR_Comm *comm) mpi_errno = MPIDI_VCRT_Release(comm->dev.vcrt, comm->dev.is_disconnected); if (mpi_errno) MPIR_ERR_POP(mpi_errno); - if (comm->comm_kind == MPID_INTERCOMM) { + if (comm->comm_kind == MPIR_INTERCOMM) { mpi_errno = MPIDI_VCRT_Release(comm->dev.local_vcrt, comm->dev.is_disconnected); if (mpi_errno) MPIR_ERR_POP(mpi_errno); } @@ -578,9 +578,9 @@ void MPIDI_CH3I_Comm_find(MPIU_Context_id_t context_id, MPIR_Comm **comm) MPIDI_FUNC_ENTER(MPIDI_STATE_MPIDI_CH3I_COMM_FIND); COMM_FOREACH((*comm)) { - if ((*comm)->context_id == context_id || ((*comm)->context_id + MPID_CONTEXT_INTRA_COLL) == context_id || - ((*comm)->node_comm && ((*comm)->node_comm->context_id == context_id || ((*comm)->node_comm->context_id + MPID_CONTEXT_INTRA_COLL) == context_id)) || - ((*comm)->node_roots_comm && ((*comm)->node_roots_comm->context_id == context_id || ((*comm)->node_roots_comm->context_id + MPID_CONTEXT_INTRA_COLL) == context_id)) ) { + if ((*comm)->context_id == context_id || ((*comm)->context_id + MPIR_CONTEXT_INTRA_COLL) == context_id || + ((*comm)->node_comm && ((*comm)->node_comm->context_id == context_id || ((*comm)->node_comm->context_id + MPIR_CONTEXT_INTRA_COLL) == context_id)) || + ((*comm)->node_roots_comm && ((*comm)->node_roots_comm->context_id == context_id || ((*comm)->node_roots_comm->context_id + MPIR_CONTEXT_INTRA_COLL) == context_id)) ) { MPL_DBG_MSG_D(MPIDI_CH3_DBG_OTHER,VERBOSE,"Found matching context id: %d", (*comm)->context_id); break; } diff --git a/src/mpid/ch3/src/ch3u_handle_recv_req.c b/src/mpid/ch3/src/ch3u_handle_recv_req.c index e978945..8412c86 100644 --- a/src/mpid/ch3/src/ch3u_handle_recv_req.c +++ b/src/mpid/ch3/src/ch3u_handle_recv_req.c @@ -882,7 +882,7 @@ int MPIDI_CH3_ReqHandler_GetDerivedDTRecvComplete(MPIDI_VC_t * vc, sreq = MPID_Request_create(); MPIR_ERR_CHKANDJUMP(sreq == NULL, mpi_errno, MPI_ERR_OTHER, "**nomemreq"); - sreq->kind = MPID_REQUEST_SEND; + sreq->kind = MPIR_REQUEST_SEND; MPIDI_Request_set_type(sreq, MPIDI_REQUEST_TYPE_GET_RESP); sreq->dev.OnDataAvail = MPIDI_CH3_ReqHandler_GetSendComplete; sreq->dev.OnFinal = MPIDI_CH3_ReqHandler_GetSendComplete; @@ -1205,7 +1205,7 @@ static inline int perform_get_in_lock_queue(MPIR_Win * win_ptr, MPIU_Object_set_ref(sreq, 1); MPIDI_Request_set_type(sreq, MPIDI_REQUEST_TYPE_GET_RESP); - sreq->kind = MPID_REQUEST_SEND; + sreq->kind = MPIR_REQUEST_SEND; sreq->dev.OnDataAvail = MPIDI_CH3_ReqHandler_GetSendComplete; sreq->dev.OnFinal = MPIDI_CH3_ReqHandler_GetSendComplete; @@ -1381,7 +1381,7 @@ static inline int perform_get_acc_in_lock_queue(MPIR_Win * win_ptr, MPIU_Object_set_ref(sreq, 1); MPIDI_Request_set_type(sreq, MPIDI_REQUEST_TYPE_GET_ACCUM_RESP); - sreq->kind = MPID_REQUEST_SEND; + sreq->kind = MPIR_REQUEST_SEND; sreq->dev.OnDataAvail = MPIDI_CH3_ReqHandler_GaccumSendComplete; sreq->dev.OnFinal = MPIDI_CH3_ReqHandler_GaccumSendComplete; diff --git a/src/mpid/ch3/src/ch3u_port.c b/src/mpid/ch3/src/ch3u_port.c index 5a6f5be..3b76447 100644 --- a/src/mpid/ch3/src/ch3u_port.c +++ b/src/mpid/ch3/src/ch3u_port.c @@ -259,7 +259,7 @@ static int MPIDI_CH3I_Initialize_tmp_comm(MPIR_Comm **comm_pptr, * If the same process opens connections to the multiple * processes, this context ID might get out of sync. */ - tmp_comm->context_id = MPID_CONTEXT_SET_FIELD(DYNAMIC_PROC, context_id_offset, 1); + tmp_comm->context_id = MPIR_CONTEXT_SET_FIELD(DYNAMIC_PROC, context_id_offset, 1); tmp_comm->recvcontext_id = tmp_comm->context_id; /* sanity: the INVALID context ID value could potentially conflict with the @@ -273,7 +273,7 @@ static int MPIDI_CH3I_Initialize_tmp_comm(MPIR_Comm **comm_pptr, /* Fill in new intercomm */ tmp_comm->local_size = 1; tmp_comm->rank = 0; - tmp_comm->comm_kind = MPID_INTERCOMM; + tmp_comm->comm_kind = MPIR_INTERCOMM; tmp_comm->local_comm = NULL; tmp_comm->is_low_group = is_low_group; @@ -1164,7 +1164,7 @@ static int SetupNewIntercomm( MPIR_Comm *comm_ptr, int remote_comm_size, intercomm->rank = comm_ptr->rank; intercomm->local_group = NULL; intercomm->remote_group = NULL; - intercomm->comm_kind = MPID_INTERCOMM; + intercomm->comm_kind = MPIR_INTERCOMM; intercomm->local_comm = NULL; intercomm->coll_fns = NULL; diff --git a/src/mpid/ch3/src/ch3u_recvq.c b/src/mpid/ch3/src/ch3u_recvq.c index cdda99a..c9742e6 100644 --- a/src/mpid/ch3/src/ch3u_recvq.c +++ b/src/mpid/ch3/src/ch3u_recvq.c @@ -936,7 +936,7 @@ int MPIDI_CH3U_Clean_recvq(MPIR_Comm *comm_ptr) while (NULL != rreq) { /* We'll have to do this matching twice. Once for the pt2pt context id * and once for the collective context id */ - match.parts.context_id = comm_ptr->recvcontext_id + MPID_CONTEXT_INTRA_PT2PT; + match.parts.context_id = comm_ptr->recvcontext_id + MPIR_CONTEXT_INTRA_PT2PT; if (MATCH_WITH_LEFT_RIGHT_MASK(rreq->dev.match, match, mask)) { MPL_DBG_MSG_FMT(MPIDI_CH3_DBG_OTHER,VERBOSE,(MPL_DBG_FDEST, @@ -946,7 +946,7 @@ int MPIDI_CH3U_Clean_recvq(MPIR_Comm *comm_ptr) continue; } - match.parts.context_id = comm_ptr->recvcontext_id + MPID_CONTEXT_INTRA_COLL; + match.parts.context_id = comm_ptr->recvcontext_id + MPIR_CONTEXT_INTRA_COLL; if (MATCH_WITH_LEFT_RIGHT_MASK(rreq->dev.match, match, mask)) { if (MPIR_TAG_MASK_ERROR_BITS(rreq->dev.match.parts.tag) != MPIR_AGREE_TAG && @@ -961,8 +961,8 @@ int MPIDI_CH3U_Clean_recvq(MPIR_Comm *comm_ptr) if (MPIR_Comm_is_node_aware(comm_ptr)) { int offset; - offset = (comm_ptr->comm_kind == MPID_INTRACOMM) ? MPID_CONTEXT_INTRA_PT2PT : MPID_CONTEXT_INTER_PT2PT; - match.parts.context_id = comm_ptr->recvcontext_id + MPID_CONTEXT_INTRANODE_OFFSET + offset; + offset = (comm_ptr->comm_kind == MPIR_INTRACOMM) ? MPIR_CONTEXT_INTRA_PT2PT : MPIR_CONTEXT_INTER_PT2PT; + match.parts.context_id = comm_ptr->recvcontext_id + MPIR_CONTEXT_INTRANODE_OFFSET + offset; if (MATCH_WITH_LEFT_RIGHT_MASK(rreq->dev.match, match, mask)) { if (MPIR_TAG_MASK_ERROR_BITS(rreq->dev.match.parts.tag) != MPIR_AGREE_TAG && @@ -975,8 +975,8 @@ int MPIDI_CH3U_Clean_recvq(MPIR_Comm *comm_ptr) } } - offset = (comm_ptr->comm_kind == MPID_INTRACOMM) ? MPID_CONTEXT_INTRA_COLL : MPID_CONTEXT_INTER_COLL; - match.parts.context_id = comm_ptr->recvcontext_id + MPID_CONTEXT_INTRANODE_OFFSET + offset; + offset = (comm_ptr->comm_kind == MPIR_INTRACOMM) ? MPIR_CONTEXT_INTRA_COLL : MPIR_CONTEXT_INTER_COLL; + match.parts.context_id = comm_ptr->recvcontext_id + MPIR_CONTEXT_INTRANODE_OFFSET + offset; if (MATCH_WITH_LEFT_RIGHT_MASK(rreq->dev.match, match, mask)) { if (MPIR_TAG_MASK_ERROR_BITS(rreq->dev.match.parts.tag) != MPIR_AGREE_TAG && @@ -989,8 +989,8 @@ int MPIDI_CH3U_Clean_recvq(MPIR_Comm *comm_ptr) } } - offset = (comm_ptr->comm_kind == MPID_INTRACOMM) ? MPID_CONTEXT_INTRA_PT2PT : MPID_CONTEXT_INTER_PT2PT; - match.parts.context_id = comm_ptr->recvcontext_id + MPID_CONTEXT_INTERNODE_OFFSET + offset; + offset = (comm_ptr->comm_kind == MPIR_INTRACOMM) ? MPIR_CONTEXT_INTRA_PT2PT : MPIR_CONTEXT_INTER_PT2PT; + match.parts.context_id = comm_ptr->recvcontext_id + MPIR_CONTEXT_INTERNODE_OFFSET + offset; if (MATCH_WITH_LEFT_RIGHT_MASK(rreq->dev.match, match, mask)) { if (MPIR_TAG_MASK_ERROR_BITS(rreq->dev.match.parts.tag) != MPIR_AGREE_TAG && @@ -1003,8 +1003,8 @@ int MPIDI_CH3U_Clean_recvq(MPIR_Comm *comm_ptr) } } - offset = (comm_ptr->comm_kind == MPID_INTRACOMM) ? MPID_CONTEXT_INTRA_COLL : MPID_CONTEXT_INTER_COLL; - match.parts.context_id = comm_ptr->recvcontext_id + MPID_CONTEXT_INTERNODE_OFFSET + offset; + offset = (comm_ptr->comm_kind == MPIR_INTRACOMM) ? MPIR_CONTEXT_INTRA_COLL : MPIR_CONTEXT_INTER_COLL; + match.parts.context_id = comm_ptr->recvcontext_id + MPIR_CONTEXT_INTERNODE_OFFSET + offset; if (MATCH_WITH_LEFT_RIGHT_MASK(rreq->dev.match, match, mask)) { if (MPIR_TAG_MASK_ERROR_BITS(rreq->dev.match.parts.tag) != MPIR_AGREE_TAG && @@ -1028,7 +1028,7 @@ int MPIDI_CH3U_Clean_recvq(MPIR_Comm *comm_ptr) while (NULL != rreq) { /* We'll have to do this matching twice. Once for the pt2pt context id * and once for the collective context id */ - match.parts.context_id = comm_ptr->recvcontext_id + MPID_CONTEXT_INTRA_PT2PT; + match.parts.context_id = comm_ptr->recvcontext_id + MPIR_CONTEXT_INTRA_PT2PT; if (MATCH_WITH_LEFT_RIGHT_MASK(rreq->dev.match, match, mask)) { MPL_DBG_MSG_FMT(MPIDI_CH3_DBG_OTHER,VERBOSE,(MPL_DBG_FDEST, @@ -1038,7 +1038,7 @@ int MPIDI_CH3U_Clean_recvq(MPIR_Comm *comm_ptr) continue; } - match.parts.context_id = comm_ptr->recvcontext_id + MPID_CONTEXT_INTRA_COLL; + match.parts.context_id = comm_ptr->recvcontext_id + MPIR_CONTEXT_INTRA_COLL; if (MATCH_WITH_LEFT_RIGHT_MASK(rreq->dev.match, match, mask)) { if (MPIR_TAG_MASK_ERROR_BITS(rreq->dev.match.parts.tag) != MPIR_AGREE_TAG && @@ -1053,8 +1053,8 @@ int MPIDI_CH3U_Clean_recvq(MPIR_Comm *comm_ptr) if (MPIR_Comm_is_node_aware(comm_ptr)) { int offset; - offset = (comm_ptr->comm_kind == MPID_INTRACOMM) ? MPID_CONTEXT_INTRA_PT2PT : MPID_CONTEXT_INTER_PT2PT; - match.parts.context_id = comm_ptr->recvcontext_id + MPID_CONTEXT_INTRANODE_OFFSET + offset; + offset = (comm_ptr->comm_kind == MPIR_INTRACOMM) ? MPIR_CONTEXT_INTRA_PT2PT : MPIR_CONTEXT_INTER_PT2PT; + match.parts.context_id = comm_ptr->recvcontext_id + MPIR_CONTEXT_INTRANODE_OFFSET + offset; if (MATCH_WITH_LEFT_RIGHT_MASK(rreq->dev.match, match, mask)) { if (MPIR_TAG_MASK_ERROR_BITS(rreq->dev.match.parts.tag) != MPIR_AGREE_TAG && @@ -1067,8 +1067,8 @@ int MPIDI_CH3U_Clean_recvq(MPIR_Comm *comm_ptr) } } - offset = (comm_ptr->comm_kind == MPID_INTRACOMM) ? MPID_CONTEXT_INTRA_COLL : MPID_CONTEXT_INTER_COLL; - match.parts.context_id = comm_ptr->recvcontext_id + MPID_CONTEXT_INTRANODE_OFFSET + offset; + offset = (comm_ptr->comm_kind == MPIR_INTRACOMM) ? MPIR_CONTEXT_INTRA_COLL : MPIR_CONTEXT_INTER_COLL; + match.parts.context_id = comm_ptr->recvcontext_id + MPIR_CONTEXT_INTRANODE_OFFSET + offset; if (MATCH_WITH_LEFT_RIGHT_MASK(rreq->dev.match, match, mask)) { if (MPIR_TAG_MASK_ERROR_BITS(rreq->dev.match.parts.tag) != MPIR_AGREE_TAG && @@ -1081,8 +1081,8 @@ int MPIDI_CH3U_Clean_recvq(MPIR_Comm *comm_ptr) } } - offset = (comm_ptr->comm_kind == MPID_INTRACOMM) ? MPID_CONTEXT_INTRA_PT2PT : MPID_CONTEXT_INTER_PT2PT; - match.parts.context_id = comm_ptr->recvcontext_id + MPID_CONTEXT_INTERNODE_OFFSET + offset; + offset = (comm_ptr->comm_kind == MPIR_INTRACOMM) ? MPIR_CONTEXT_INTRA_PT2PT : MPIR_CONTEXT_INTER_PT2PT; + match.parts.context_id = comm_ptr->recvcontext_id + MPIR_CONTEXT_INTERNODE_OFFSET + offset; if (MATCH_WITH_LEFT_RIGHT_MASK(rreq->dev.match, match, mask)) { if (MPIR_TAG_MASK_ERROR_BITS(rreq->dev.match.parts.tag) != MPIR_AGREE_TAG && @@ -1095,8 +1095,8 @@ int MPIDI_CH3U_Clean_recvq(MPIR_Comm *comm_ptr) } } - offset = (comm_ptr->comm_kind == MPID_INTRACOMM) ? MPID_CONTEXT_INTRA_COLL : MPID_CONTEXT_INTER_COLL; - match.parts.context_id = comm_ptr->recvcontext_id + MPID_CONTEXT_INTERNODE_OFFSET + offset; + offset = (comm_ptr->comm_kind == MPIR_INTRACOMM) ? MPIR_CONTEXT_INTRA_COLL : MPIR_CONTEXT_INTER_COLL; + match.parts.context_id = comm_ptr->recvcontext_id + MPIR_CONTEXT_INTERNODE_OFFSET + offset; if (MATCH_WITH_LEFT_RIGHT_MASK(rreq->dev.match, match, mask)) { if (MPIR_TAG_MASK_ERROR_BITS(rreq->dev.match.parts.tag) != MPIR_AGREE_TAG && diff --git a/src/mpid/ch3/src/ch3u_request.c b/src/mpid/ch3/src/ch3u_request.c index bf965ab..bbf4587 100644 --- a/src/mpid/ch3/src/ch3u_request.c +++ b/src/mpid/ch3/src/ch3u_request.c @@ -17,17 +17,17 @@ */ /* Routines and data structures for request allocation and deallocation */ -#ifndef MPID_REQUEST_PREALLOC -#define MPID_REQUEST_PREALLOC 8 +#ifndef MPIR_REQUEST_PREALLOC +#define MPIR_REQUEST_PREALLOC 8 #endif /* Max depth of recursive calls of MPID_Request_complete */ #define REQUEST_CB_DEPTH 2 -MPID_Request MPID_Request_direct[MPID_REQUEST_PREALLOC] = {{0}}; +MPID_Request MPID_Request_direct[MPIR_REQUEST_PREALLOC] = {{0}}; MPIU_Object_alloc_t MPID_Request_mem = { - 0, 0, 0, 0, MPID_REQUEST, sizeof(MPID_Request), MPID_Request_direct, - MPID_REQUEST_PREALLOC }; + 0, 0, 0, 0, MPIR_REQUEST, sizeof(MPID_Request), MPID_Request_direct, + MPIR_REQUEST_PREALLOC }; /* See the comments above about request creation. Some routines will use macros in mpidimpl.h *instead* of this routine */ @@ -38,9 +38,9 @@ MPIU_Object_alloc_t MPID_Request_mem = { MPID_Request * MPID_Request_create(void) { MPID_Request * req; - MPIDI_STATE_DECL(MPID_STATE_MPID_REQUEST_CREATE); + MPIDI_STATE_DECL(MPID_STATE_MPIR_REQUEST_CREATE); - MPIDI_FUNC_ENTER(MPID_STATE_MPID_REQUEST_CREATE); + MPIDI_FUNC_ENTER(MPID_STATE_MPIR_REQUEST_CREATE); req = MPIU_Handle_obj_alloc(&MPID_Request_mem); if (req != NULL) @@ -48,8 +48,8 @@ MPID_Request * MPID_Request_create(void) MPL_DBG_MSG_P(MPIDI_CH3_DBG_CHANNEL,VERBOSE, "allocated request, handle=0x%08x", req->handle); #ifdef MPICH_DBG_OUTPUT - /*MPIU_Assert(HANDLE_GET_MPI_KIND(req->handle) == MPID_REQUEST);*/ - if (HANDLE_GET_MPI_KIND(req->handle) != MPID_REQUEST) + /*MPIU_Assert(HANDLE_GET_MPI_KIND(req->handle) == MPIR_REQUEST);*/ + if (HANDLE_GET_MPI_KIND(req->handle) != MPIR_REQUEST) { int mpi_errno; mpi_errno = MPIR_Err_create_code(MPI_SUCCESS, MPIR_ERR_FATAL, @@ -64,7 +64,7 @@ MPID_Request * MPID_Request_create(void) *really* want to set the kind to UNDEFINED? And should the RMA values be set only for RMA requests? */ MPIU_Object_set_ref(req, 1); - req->kind = MPID_REQUEST_UNDEFINED; + req->kind = MPIR_REQUEST_UNDEFINED; MPIR_cc_set(&req->cc, 1); req->cc_ptr = &req->cc; /* FIXME: status fields meaningful only for receive, and even then @@ -112,7 +112,7 @@ MPID_Request * MPID_Request_create(void) MPL_DBG_MSG(MPIDI_CH3_DBG_CHANNEL,TYPICAL,"unable to allocate a request"); } - MPIDI_FUNC_EXIT(MPID_STATE_MPID_REQUEST_CREATE); + MPIDI_FUNC_EXIT(MPID_STATE_MPIR_REQUEST_CREATE); return req; } @@ -652,8 +652,8 @@ void MPID_Request_release(MPID_Request *req) "freeing request, handle=0x%08x", req->handle); #ifdef MPICH_DBG_OUTPUT - /*MPIU_Assert(HANDLE_GET_MPI_KIND(req->handle) == MPID_REQUEST);*/ - if (HANDLE_GET_MPI_KIND(req->handle) != MPID_REQUEST) + /*MPIU_Assert(HANDLE_GET_MPI_KIND(req->handle) == MPIR_REQUEST);*/ + if (HANDLE_GET_MPI_KIND(req->handle) != MPIR_REQUEST) { int mpi_errno = MPIR_Err_create_code(MPI_SUCCESS, MPIR_ERR_FATAL, FCNAME, __LINE__, MPI_ERR_OTHER, diff --git a/src/mpid/ch3/src/ch3u_rma_pkthandler.c b/src/mpid/ch3/src/ch3u_rma_pkthandler.c index ac8367e..52bb9e0 100644 --- a/src/mpid/ch3/src/ch3u_rma_pkthandler.c +++ b/src/mpid/ch3/src/ch3u_rma_pkthandler.c @@ -491,7 +491,7 @@ int MPIDI_CH3_PktHandler_Get(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, MPIDI_Request_set_type(req, MPIDI_REQUEST_TYPE_GET_RESP); req->dev.OnDataAvail = MPIDI_CH3_ReqHandler_GetSendComplete; req->dev.OnFinal = MPIDI_CH3_ReqHandler_GetSendComplete; - req->kind = MPID_REQUEST_SEND; + req->kind = MPIR_REQUEST_SEND; if (get_pkt->flags & MPIDI_CH3_PKT_FLAG_RMA_IMMED_RESP) { MPIDI_Pkt_init(get_resp_pkt, MPIDI_CH3_PKT_GET_RESP_IMMED); @@ -912,7 +912,7 @@ int MPIDI_CH3_PktHandler_GetAccumulate(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, MPIDI_Request_set_type(resp_req, MPIDI_REQUEST_TYPE_GET_ACCUM_RESP); resp_req->dev.OnDataAvail = MPIDI_CH3_ReqHandler_GaccumSendComplete; resp_req->dev.OnFinal = MPIDI_CH3_ReqHandler_GaccumSendComplete; - resp_req->kind = MPID_REQUEST_SEND; + resp_req->kind = MPIR_REQUEST_SEND; /* here we increment the Active Target counter to guarantee the GET-like * operation are completed when counter reaches zero. */ diff --git a/src/mpid/ch3/src/ch3u_rma_sync.c b/src/mpid/ch3/src/ch3u_rma_sync.c index 38e4616..9695f3c 100644 --- a/src/mpid/ch3/src/ch3u_rma_sync.c +++ b/src/mpid/ch3/src/ch3u_rma_sync.c @@ -763,7 +763,7 @@ int MPID_Win_post(MPIR_Group * post_grp_ptr, int assert, MPIR_Win * win_ptr) if (dst != rank) { MPID_Request *req_ptr; mpi_errno = MPID_Isend(&i, 0, MPI_INT, dst, SYNC_POST_TAG, win_comm_ptr, - MPID_CONTEXT_INTRA_PT2PT, &req_ptr); + MPIR_CONTEXT_INTRA_PT2PT, &req_ptr); if (mpi_errno != MPI_SUCCESS) MPIR_ERR_POP(mpi_errno); req[i] = req_ptr->handle; @@ -895,7 +895,7 @@ int MPID_Win_start(MPIR_Group * group_ptr, int assert, MPIR_Win * win_ptr) MPIDI_Comm_get_vc(comm_ptr, src, &target_vc); mpi_errno = MPID_Irecv(NULL, 0, MPI_INT, src, SYNC_POST_TAG, - comm_ptr, MPID_CONTEXT_INTRA_PT2PT, &req_ptr); + comm_ptr, MPIR_CONTEXT_INTRA_PT2PT, &req_ptr); if (mpi_errno != MPI_SUCCESS) MPIR_ERR_POP(mpi_errno); diff --git a/src/mpid/ch3/src/mpid_cancel_recv.c b/src/mpid/ch3/src/mpid_cancel_recv.c index 35cf541..feb923b 100644 --- a/src/mpid/ch3/src/mpid_cancel_recv.c +++ b/src/mpid/ch3/src/mpid_cancel_recv.c @@ -19,7 +19,7 @@ int MPID_Cancel_recv(MPID_Request * rreq) MPIDI_FUNC_ENTER(MPID_STATE_MPID_CANCEL_RECV); - MPIU_Assert(rreq->kind == MPID_REQUEST_RECV); + MPIU_Assert(rreq->kind == MPIR_REQUEST_RECV); /* If the netmod has its own cancel_recv function, we need to call it here. ANYSOURCE cancels (netmod and otherwise) are handled by diff --git a/src/mpid/ch3/src/mpid_cancel_send.c b/src/mpid/ch3/src/mpid_cancel_send.c index dba1fc8..8a51df6 100644 --- a/src/mpid/ch3/src/mpid_cancel_send.c +++ b/src/mpid/ch3/src/mpid_cancel_send.c @@ -24,7 +24,7 @@ int MPID_Cancel_send(MPID_Request * sreq) MPIDI_FUNC_ENTER(MPID_STATE_MPID_CANCEL_SEND); - MPIU_Assert(sreq->kind == MPID_REQUEST_SEND); + MPIU_Assert(sreq->kind == MPIR_REQUEST_SEND); MPIDI_Request_cancel_pending(sreq, &flag); if (flag) diff --git a/src/mpid/ch3/src/mpid_comm_failure_ack.c b/src/mpid/ch3/src/mpid_comm_failure_ack.c index 33190d8..c219db3 100644 --- a/src/mpid/ch3/src/mpid_comm_failure_ack.c +++ b/src/mpid/ch3/src/mpid_comm_failure_ack.c @@ -89,7 +89,7 @@ int MPID_Comm_AS_enabled(MPIR_Comm *comm_ptr) { int MPID_Request_is_anysource(MPID_Request *request_ptr) { int ret = 0; - if (request_ptr->kind == MPID_REQUEST_RECV) + if (request_ptr->kind == MPIR_REQUEST_RECV) ret = request_ptr->dev.match.parts.rank == MPI_ANY_SOURCE; return ret; diff --git a/src/mpid/ch3/src/mpid_improbe.c b/src/mpid/ch3/src/mpid_improbe.c index 83b8e33..3430427 100644 --- a/src/mpid/ch3/src/mpid_improbe.c +++ b/src/mpid/ch3/src/mpid_improbe.c @@ -99,7 +99,7 @@ int MPID_Improbe(int source, int tag, MPIR_Comm *comm, int context_offset, } if (*flag && *message) { - (*message)->kind = MPID_REQUEST_MPROBE; + (*message)->kind = MPIR_REQUEST_MPROBE; MPIR_Request_extract_status((*message), status); } diff --git a/src/mpid/ch3/src/mpid_imrecv.c b/src/mpid/ch3/src/mpid_imrecv.c index 205ef1d..49b96d2 100644 --- a/src/mpid/ch3/src/mpid_imrecv.c +++ b/src/mpid/ch3/src/mpid_imrecv.c @@ -28,10 +28,10 @@ int MPID_Imrecv(void *buf, int count, MPI_Datatype datatype, } MPIU_Assert(message != NULL); - MPIU_Assert(message->kind == MPID_REQUEST_MPROBE); + MPIU_Assert(message->kind == MPIR_REQUEST_MPROBE); /* promote the request object to be a "real" recv request */ - message->kind = MPID_REQUEST_RECV; + message->kind = MPIR_REQUEST_RECV; *rreqp = rreq = message; diff --git a/src/mpid/ch3/src/mpid_irsend.c b/src/mpid/ch3/src/mpid_irsend.c index 9707dc0..052da4d 100644 --- a/src/mpid/ch3/src/mpid_irsend.c +++ b/src/mpid/ch3/src/mpid_irsend.c @@ -45,7 +45,7 @@ int MPID_Irsend(const void * buf, int count, MPI_Datatype datatype, int rank, in MPIR_ERR_SETANDJUMP(mpi_errno,MPIX_ERR_REVOKED,"**revoked"); } - if (rank == comm->rank && comm->comm_kind != MPID_INTERCOMM) + if (rank == comm->rank && comm->comm_kind != MPIR_INTERCOMM) { mpi_errno = MPIDI_Isend_self(buf, count, datatype, rank, tag, comm, context_offset, MPIDI_REQUEST_TYPE_RSEND, &sreq); goto fn_exit; diff --git a/src/mpid/ch3/src/mpid_isend.c b/src/mpid/ch3/src/mpid_isend.c index 420f7ad..0fb10af 100644 --- a/src/mpid/ch3/src/mpid_isend.c +++ b/src/mpid/ch3/src/mpid_isend.c @@ -58,7 +58,7 @@ int MPID_Isend(const void * buf, MPI_Aint count, MPI_Datatype datatype, int rank MPIR_ERR_SETANDJUMP(mpi_errno,MPIX_ERR_REVOKED,"**revoked"); } - if (rank == comm->rank && comm->comm_kind != MPID_INTERCOMM) + if (rank == comm->rank && comm->comm_kind != MPIR_INTERCOMM) { mpi_errno = MPIDI_Isend_self(buf, count, datatype, rank, tag, comm, context_offset, MPIDI_REQUEST_TYPE_SEND, &sreq); diff --git a/src/mpid/ch3/src/mpid_issend.c b/src/mpid/ch3/src/mpid_issend.c index 458f507..61ca463 100644 --- a/src/mpid/ch3/src/mpid_issend.c +++ b/src/mpid/ch3/src/mpid_issend.c @@ -44,7 +44,7 @@ int MPID_Issend(const void * buf, int count, MPI_Datatype datatype, int rank, in MPIR_ERR_SETANDJUMP(mpi_errno,MPIX_ERR_REVOKED,"**revoked"); } - if (rank == comm->rank && comm->comm_kind != MPID_INTERCOMM) + if (rank == comm->rank && comm->comm_kind != MPIR_INTERCOMM) { mpi_errno = MPIDI_Isend_self(buf, count, datatype, rank, tag, comm, context_offset, MPIDI_REQUEST_TYPE_SSEND, &sreq); goto fn_exit; diff --git a/src/mpid/ch3/src/mpid_mprobe.c b/src/mpid/ch3/src/mpid_mprobe.c index fa53dc2..12dc9fe 100644 --- a/src/mpid/ch3/src/mpid_mprobe.c +++ b/src/mpid/ch3/src/mpid_mprobe.c @@ -106,7 +106,7 @@ int MPID_Mprobe(int source, int tag, MPIR_Comm *comm, int context_offset, if (mpi_errno) MPIR_ERR_POP(mpi_errno); if (*message) { - (*message)->kind = MPID_REQUEST_MPROBE; + (*message)->kind = MPIR_REQUEST_MPROBE; MPIR_Request_extract_status((*message), status); } diff --git a/src/mpid/ch3/src/mpid_rsend.c b/src/mpid/ch3/src/mpid_rsend.c index e82eeba..2351a72 100644 --- a/src/mpid/ch3/src/mpid_rsend.c +++ b/src/mpid/ch3/src/mpid_rsend.c @@ -47,7 +47,7 @@ int MPID_Rsend(const void * buf, int count, MPI_Datatype datatype, int rank, int MPIR_ERR_SETANDJUMP(mpi_errno,MPIX_ERR_REVOKED,"**revoked"); } - if (rank == comm->rank && comm->comm_kind != MPID_INTERCOMM) + if (rank == comm->rank && comm->comm_kind != MPIR_INTERCOMM) { mpi_errno = MPIDI_Isend_self(buf, count, datatype, rank, tag, comm, context_offset, MPIDI_REQUEST_TYPE_RSEND, &sreq); goto fn_exit; diff --git a/src/mpid/ch3/src/mpid_send.c b/src/mpid/ch3/src/mpid_send.c index 8754b65..609dcca 100644 --- a/src/mpid/ch3/src/mpid_send.c +++ b/src/mpid/ch3/src/mpid_send.c @@ -45,7 +45,7 @@ int MPID_Send(const void * buf, MPI_Aint count, MPI_Datatype datatype, int rank, MPIR_ERR_SETANDJUMP(mpi_errno,MPIX_ERR_REVOKED,"**revoked"); } - if (rank == comm->rank && comm->comm_kind != MPID_INTERCOMM) + if (rank == comm->rank && comm->comm_kind != MPIR_INTERCOMM) { mpi_errno = MPIDI_Isend_self(buf, count, datatype, rank, tag, comm, context_offset, MPIDI_REQUEST_TYPE_SEND, diff --git a/src/mpid/ch3/src/mpid_ssend.c b/src/mpid/ch3/src/mpid_ssend.c index aa3e3b9..e7bf48b 100644 --- a/src/mpid/ch3/src/mpid_ssend.c +++ b/src/mpid/ch3/src/mpid_ssend.c @@ -44,7 +44,7 @@ int MPID_Ssend(const void * buf, MPI_Aint count, MPI_Datatype datatype, int rank MPIR_ERR_SETANDJUMP(mpi_errno,MPIX_ERR_REVOKED,"**revoked"); } - if (rank == comm->rank && comm->comm_kind != MPID_INTERCOMM) + if (rank == comm->rank && comm->comm_kind != MPIR_INTERCOMM) { mpi_errno = MPIDI_Isend_self(buf, count, datatype, rank, tag, comm, context_offset, MPIDI_REQUEST_TYPE_SSEND, diff --git a/src/mpid/ch3/src/mpid_vc.c b/src/mpid/ch3/src/mpid_vc.c index 1da27f1..d11305e 100644 --- a/src/mpid/ch3/src/mpid_vc.c +++ b/src/mpid/ch3/src/mpid_vc.c @@ -306,7 +306,7 @@ int MPID_Comm_get_lpid(MPIR_Comm *comm_ptr, int idx, int * lpid_ptr, MPIU_BOOL i MPIDI_FUNC_ENTER(MPID_STATE_MPID_VCR_GET_LPID); - if (comm_ptr->comm_kind == MPID_INTRACOMM) + if (comm_ptr->comm_kind == MPIR_INTRACOMM) *lpid_ptr = comm_ptr->dev.vcrt->vcr_table[idx]->lpid; else if (is_remote) *lpid_ptr = comm_ptr->dev.vcrt->vcr_table[idx]->lpid; diff --git a/src/mpid/common/datatype/mpidu_datatype.h b/src/mpid/common/datatype/mpidu_datatype.h index b530e1d..69f4e58 100644 --- a/src/mpid/common/datatype/mpidu_datatype.h +++ b/src/mpid/common/datatype/mpidu_datatype.h @@ -16,7 +16,7 @@ * - MPIU_Object_alloc_t is defined in src/include/mpihandle.h */ -#define MPIDU_Datatype_get_ptr(a,ptr) MPID_Getb_ptr(Datatype,a,0x000000ff,ptr) +#define MPIDU_Datatype_get_ptr(a,ptr) MPIR_Getb_ptr(Datatype,a,0x000000ff,ptr) /* MPIDU_Datatype_get_basic_id() is useful for creating and indexing into arrays that store data on a per-basic type basis */ #define MPIDU_Datatype_get_basic_id(a) ((a)&0x000000ff) @@ -275,7 +275,7 @@ } \ } while(0) -#define MPIDU_Datatype_valid_ptr(ptr,err) MPID_Valid_ptr_class(Datatype,ptr,MPI_ERR_TYPE,err) +#define MPIDU_Datatype_valid_ptr(ptr,err) MPIR_Valid_ptr_class(Datatype,ptr,MPI_ERR_TYPE,err) /* to be used only after MPIDU_Datatype_valid_ptr(); the check on * err == MPI_SUCCESS ensures that we won't try to dereference the diff --git a/src/mpid/common/hcoll/hcoll_init.c b/src/mpid/common/hcoll/hcoll_init.c index d47ec77..f426417 100644 --- a/src/mpid/common/hcoll/hcoll_init.c +++ b/src/mpid/common/hcoll/hcoll_init.c @@ -161,7 +161,7 @@ int hcoll_comm_create(MPIR_Comm * comm_ptr, void *param) goto fn_exit; } num_ranks = comm_ptr->local_size; - if ((MPID_INTRACOMM != comm_ptr->comm_kind) || (2 > num_ranks)) { + if ((MPIR_INTRACOMM != comm_ptr->comm_kind) || (2 > num_ranks)) { comm_ptr->hcoll_priv.is_hcoll_init = 0; goto fn_exit; } diff --git a/src/mpid/common/hcoll/hcoll_rte.c b/src/mpid/common/hcoll/hcoll_rte.c index 52939fa..dd99c23 100644 --- a/src/mpid/common/hcoll/hcoll_rte.c +++ b/src/mpid/common/hcoll/hcoll_rte.c @@ -131,7 +131,7 @@ static int recv_nb(struct dte_data_representation_t data, int context_offset; size_t size; mpi_errno = MPI_SUCCESS; - context_offset = MPID_CONTEXT_INTRA_COLL; + context_offset = MPIR_CONTEXT_INTRA_COLL; comm = (MPIR_Comm *) grp_h; if (!ec_h.handle) { MPIR_ERR_SETANDJUMP2(mpi_errno, MPI_ERR_OTHER, "**hcoll_wrong_arg", @@ -198,7 +198,7 @@ static int send_nb(dte_data_representation_t data, int context_offset; size_t size; mpi_errno = MPI_SUCCESS; - context_offset = MPID_CONTEXT_INTRA_COLL; + context_offset = MPIR_CONTEXT_INTRA_COLL; comm = (MPIR_Comm *) grp_h; if (!ec_h.handle) { MPIR_ERR_SETANDJUMP2(mpi_errno, MPI_ERR_OTHER, "**hcoll_wrong_arg", diff --git a/src/mpid/pamid/src/coll/red_scat/mpido_red_scat.c b/src/mpid/pamid/src/coll/red_scat/mpido_red_scat.c index 854a20c..dcfe437 100644 --- a/src/mpid/pamid/src/coll/red_scat/mpido_red_scat.c +++ b/src/mpid/pamid/src/coll/red_scat/mpido_red_scat.c @@ -159,7 +159,7 @@ int MPIDO_Reduce_scatter_block(const void *sendbuf, rcbuf = recvbuf; int cuda_res; - if(comm_ptr->comm_kind == MPID_INTRACOMM) + if(comm_ptr->comm_kind == MPIR_INTRACOMM) cuda_res = MPIR_Reduce_scatter_block_intra(scbuf, rcbuf, recvcount, datatype, op, comm_ptr, mpierrno); else cuda_res = MPIR_Reduce_scatter_block_inter(scbuf, rcbuf, recvcount, datatype, op, comm_ptr, mpierrno); @@ -175,7 +175,7 @@ int MPIDO_Reduce_scatter_block(const void *sendbuf, } else #endif - if(comm_ptr->comm_kind == MPID_INTRACOMM) + if(comm_ptr->comm_kind == MPIR_INTRACOMM) return MPIR_Reduce_scatter_block_intra(sendbuf, recvbuf, recvcount, datatype, op, comm_ptr, mpierrno); else return MPIR_Reduce_scatter_block_inter(sendbuf, recvbuf, recvcount, datatype, op, comm_ptr, mpierrno); diff --git a/src/mpid/pamid/src/comm/mpid_comm.c b/src/mpid/pamid/src/comm/mpid_comm.c index 2e61594..de5a7e8 100644 --- a/src/mpid/pamid/src/comm/mpid_comm.c +++ b/src/mpid/pamid/src/comm/mpid_comm.c @@ -227,7 +227,7 @@ void MPIDI_Coll_comm_create(MPIR_Comm *comm) if (!MPIDI_Process.optimized.collectives) return; - if(comm->comm_kind != MPID_INTRACOMM) return; + if(comm->comm_kind != MPIR_INTRACOMM) return; /* Create a geometry */ comm->coll_fns = MPL_calloc0(1, MPIR_Collops); @@ -372,7 +372,7 @@ void MPIDI_Coll_comm_destroy(MPIR_Comm *comm) if (!MPIDI_Process.optimized.collectives) return; - if(comm->comm_kind != MPID_INTRACOMM) + if(comm->comm_kind != MPIR_INTRACOMM) return; /* It's possible (MPIR_Setup_intercomm_localcomm) to have an intracomm diff --git a/src/mpid/pamid/src/dyntask/mpid_comm_disconnect.c b/src/mpid/pamid/src/dyntask/mpid_comm_disconnect.c index 7064efc..33ab772 100644 --- a/src/mpid/pamid/src/dyntask/mpid_comm_disconnect.c +++ b/src/mpid/pamid/src/dyntask/mpid_comm_disconnect.c @@ -216,9 +216,9 @@ int MPID_Comm_disconnect(MPIR_Comm *comm_ptr) char jobId[jobIdSize]; int MY_TASKID = PAMIX_Client_query(MPIDI_Client, PAMI_CLIENT_TASK_ID ).value.intval; - /*if( (comm_ptr->comm_kind == MPID_INTERCOMM) && (comm_ptr->mpid.world_ids != NULL)) { */ + /*if( (comm_ptr->comm_kind == MPIR_INTERCOMM) && (comm_ptr->mpid.world_ids != NULL)) { */ if(comm_ptr->mpid.world_ids != NULL) { - rc = MPID_Iprobe(comm_ptr->rank, MPI_ANY_TAG, comm_ptr, MPID_CONTEXT_INTER_PT2PT, &probe_flag, &status); + rc = MPID_Iprobe(comm_ptr->rank, MPI_ANY_TAG, comm_ptr, MPIR_CONTEXT_INTER_PT2PT, &probe_flag, &status); if(rc || probe_flag) { TRACE_ERR("PENDING_PTP"); exit(1); @@ -250,7 +250,7 @@ int MPID_Comm_disconnect(MPIR_Comm *comm_ptr) * the GROUPREMLIST, so these tasks will have to be use in addition * to the tasks in GROUPLIST to construct lcomm **/ - if(comm_ptr->comm_kind == MPID_INTERCOMM) { + if(comm_ptr->comm_kind == MPIR_INTERCOMM) { for(i=0;i<comm_ptr->remote_size;i++) { for(j=0;j<gsize;j++) { if(comm_ptr->vcr[i]->taskid == glist[j]->taskid) { @@ -271,7 +271,7 @@ int MPID_Comm_disconnect(MPIR_Comm *comm_ptr) ranks[k++] = j; } } - if((comm_ptr->comm_kind == MPID_INTERCOMM) && localtasks_in_remglist) { + if((comm_ptr->comm_kind == MPIR_INTERCOMM) && localtasks_in_remglist) { for(i=0;i<comm_ptr->remote_size;i++) { for(j=0;j<gsize;j++) { if(comm_ptr->vcr[i]->taskid == glist[j]->taskid) @@ -310,11 +310,11 @@ int MPID_Comm_disconnect(MPIR_Comm *comm_ptr) /* fill in all the fields of lcomm. */ if(localtasks_in_remglist==0) { - lcomm->context_id = MPID_CONTEXT_SET_FIELD(DYNAMIC_PROC, comm_ptr->recvcontext_id, 1); + lcomm->context_id = MPIR_CONTEXT_SET_FIELD(DYNAMIC_PROC, comm_ptr->recvcontext_id, 1); lcomm->recvcontext_id = lcomm->context_id; } else { - lcomm->context_id = MPID_CONTEXT_SET_FIELD(DYNAMIC_PROC, comm_ptr->recvcontext_id, 1); - lcomm->recvcontext_id = MPID_CONTEXT_SET_FIELD(DYNAMIC_PROC, comm_ptr->context_id, 1); + lcomm->context_id = MPIR_CONTEXT_SET_FIELD(DYNAMIC_PROC, comm_ptr->recvcontext_id, 1); + lcomm->recvcontext_id = MPIR_CONTEXT_SET_FIELD(DYNAMIC_PROC, comm_ptr->context_id, 1); } TRACE_ERR("lcomm->context_id =%d\n", lcomm->context_id); @@ -326,7 +326,7 @@ int MPID_Comm_disconnect(MPIR_Comm *comm_ptr) /* FIXME - we probably need a unique context_id. */ /* Fill in new intercomm */ - lcomm->comm_kind = MPID_INTRACOMM; + lcomm->comm_kind = MPIR_INTRACOMM; lcomm->remote_size = lcomm->local_size = local_tasks; /* Set up VC reference table */ @@ -477,7 +477,7 @@ void MPIDI_get_allremote_leaders(int *tid_arr, MPIR_Comm *comm_ptr) if(tmp_node==NULL) {TRACE_ERR("_conn_info_list is NULL\n");} while(tmp_node != NULL) { if(tmp_node->rem_world_id == comm_ptr->mpid.world_ids[i]) { - if(comm_ptr->comm_kind == MPID_INTRACOMM) { + if(comm_ptr->comm_kind == MPIR_INTRACOMM) { glist = comm_ptr->local_vcr; gsize = comm_ptr->local_size; } @@ -505,7 +505,7 @@ void MPIDI_get_allremote_leaders(int *tid_arr, MPIR_Comm *comm_ptr) * of world-x in my GROUPLIST and then see which of the two leaders is the * smallest one. The smallest one is the one in which I am interested. **/ - if(comm_ptr->comm_kind == MPID_INTERCOMM) { + if(comm_ptr->comm_kind == MPIR_INTERCOMM) { found=0; glist = comm_ptr->local_vcr; gsize = comm_ptr->local_size; diff --git a/src/mpid/pamid/src/dyntask/mpidi_port.c b/src/mpid/pamid/src/dyntask/mpidi_port.c index 147d48d..f0b5fe7 100644 --- a/src/mpid/pamid/src/dyntask/mpidi_port.c +++ b/src/mpid/pamid/src/dyntask/mpidi_port.c @@ -395,7 +395,7 @@ static int MPIDI_Initialize_tmp_comm(struct MPIR_Comm **comm_pptr, * If the same process opens connections to the multiple * processes, this context ID might get out of sync. */ - tmp_comm->context_id = MPID_CONTEXT_SET_FIELD(DYNAMIC_PROC, context_id_offset, 1); + tmp_comm->context_id = MPIR_CONTEXT_SET_FIELD(DYNAMIC_PROC, context_id_offset, 1); tmp_comm->recvcontext_id = tmp_comm->context_id; /* sanity: the INVALID context ID value could potentially conflict with the @@ -409,7 +409,7 @@ static int MPIDI_Initialize_tmp_comm(struct MPIR_Comm **comm_pptr, /* Fill in new intercomm */ tmp_comm->local_size = 1; tmp_comm->rank = 0; - tmp_comm->comm_kind = MPID_INTERCOMM; + tmp_comm->comm_kind = MPIR_INTERCOMM; tmp_comm->local_comm = NULL; tmp_comm->is_low_group = is_low_group; @@ -1409,7 +1409,7 @@ static int MPIDI_SetupNewIntercomm( struct MPIR_Comm *comm_ptr, int remote_comm_ intercomm->rank = comm_ptr->rank; intercomm->local_group = NULL; intercomm->remote_group = NULL; - intercomm->comm_kind = MPID_INTERCOMM; + intercomm->comm_kind = MPIR_INTERCOMM; intercomm->local_comm = NULL; intercomm->coll_fns = NULL; intercomm->mpid.world_ids = NULL; /*FIXME*/ diff --git a/src/mpid/pamid/src/mpid_improbe.c b/src/mpid/pamid/src/mpid_improbe.c index 34fb6db..b97f15c 100644 --- a/src/mpid/pamid/src/mpid_improbe.c +++ b/src/mpid/pamid/src/mpid_improbe.c @@ -38,7 +38,7 @@ int MPID_Improbe(int source, int tag, MPIR_Comm *comm, int context_offset, MPID_Progress_poke(); } else { - rreq->kind = MPID_REQUEST_MPROBE; + rreq->kind = MPIR_REQUEST_MPROBE; MPIR_Request_extract_status(rreq, status); } diff --git a/src/mpid/pamid/src/mpid_imrecv.c b/src/mpid/pamid/src/mpid_imrecv.c index 9fda5ad..d1d7c85 100644 --- a/src/mpid/pamid/src/mpid_imrecv.c +++ b/src/mpid/pamid/src/mpid_imrecv.c @@ -20,7 +20,7 @@ int MPID_Imrecv(void *buf, int count, MPI_Datatype datatype, { rreq = MPIDI_Request_create2(); MPIR_Status_set_procnull(&rreq->status); - rreq->kind = MPID_REQUEST_RECV; + rreq->kind = MPIR_REQUEST_RECV; MPIDI_Request_complete(rreq); *rreqp = rreq; return MPI_SUCCESS; @@ -28,10 +28,10 @@ int MPID_Imrecv(void *buf, int count, MPI_Datatype datatype, } MPIU_Assert(message != NULL); - MPIU_Assert(message->kind == MPID_REQUEST_MPROBE); + MPIU_Assert(message->kind == MPIR_REQUEST_MPROBE); /* promote the request object to be a "real" recv request */ - message->kind = MPID_REQUEST_RECV; + message->kind = MPIR_REQUEST_RECV; *rreqp = rreq = message; diff --git a/src/mpid/pamid/src/mpid_init.c b/src/mpid/pamid/src/mpid_init.c index 3d874cb..30685bd 100644 --- a/src/mpid/pamid/src/mpid_init.c +++ b/src/mpid/pamid/src/mpid_init.c @@ -1240,7 +1240,7 @@ int MPID_Init(int * argc, pami_result_t rc; /* Override split_type */ - MPID_Comm_fns = &comm_fns; + MPIR_Comm_fns = &comm_fns; /* ------------------------------------------------------------------------------- */ /* Initialize the pami client to get the process rank; needed for env var output. */ diff --git a/src/mpid/pamid/src/mpid_mprobe.c b/src/mpid/pamid/src/mpid_mprobe.c index 02ff710..995259b 100644 --- a/src/mpid/pamid/src/mpid_mprobe.c +++ b/src/mpid/pamid/src/mpid_mprobe.c @@ -32,7 +32,7 @@ int MPID_Mprobe(int source, int tag, MPIR_Comm *comm, int context_offset, #endif if (rreq) { - rreq->kind = MPID_REQUEST_MPROBE; + rreq->kind = MPIR_REQUEST_MPROBE; MPIR_Request_extract_status(rreq, status); } *message = rreq; diff --git a/src/mpid/pamid/src/mpid_recvq.c b/src/mpid/pamid/src/mpid_recvq.c index b62d8f0..ca88e4c 100644 --- a/src/mpid/pamid/src/mpid_recvq.c +++ b/src/mpid/pamid/src/mpid_recvq.c @@ -742,7 +742,7 @@ MPIDI_Recvq_AEU(MPID_Request *newreq, int source, pami_task_t pami_source, int t queue */ MPID_Request *rreq; rreq = newreq; - rreq->kind = MPID_REQUEST_RECV; + rreq->kind = MPIR_REQUEST_RECV; TRACE_MEMSET_R(pami_source,msg_seqno,recv_status); TRACE_SET_REQ_VAL(rreq->mpid.envelope.msginfo.MPIseqno,-1); TRACE_SET_REQ_VAL(rreq->mpid.envelope.length,-1); diff --git a/src/mpid/pamid/src/mpid_recvq.h b/src/mpid/pamid/src/mpid_recvq.h index 739bc7f..5e88363 100644 --- a/src/mpid/pamid/src/mpid_recvq.h +++ b/src/mpid/pamid/src/mpid_recvq.h @@ -209,7 +209,7 @@ MPIDI_Recvq_FDU_or_AEP(MPID_Request *newreq, int source, pami_task_t pami_source TRACE_SET_REQ_VAL(rreq->mpid.envelope.msginfo.MPIseqno,-1); TRACE_SET_REQ_VAL(rreq->mpid.envelope.length,-1); TRACE_SET_REQ_VAL(rreq->mpid.envelope.data,(void *) 0); - rreq->kind = MPID_REQUEST_RECV; + rreq->kind = MPIR_REQUEST_RECV; MPIDI_Request_setMatch(rreq, tag, source, context_id); #ifdef QUEUE_BINARY_SEARCH_SUPPORT if(MPIDI_Process.queue_binary_search_support_on) diff --git a/src/mpid/pamid/src/mpid_request.c b/src/mpid/pamid/src/mpid_request.c index df284ff..d456689 100644 --- a/src/mpid/pamid/src/mpid_request.c +++ b/src/mpid/pamid/src/mpid_request.c @@ -21,30 +21,30 @@ */ #include <mpidimpl.h> -#ifndef MPID_REQUEST_PREALLOC +#ifndef MPIR_REQUEST_PREALLOC #if (MPICH_THREAD_GRANULARITY == MPICH_THREAD_GRANULARITY_GLOBAL) -#define MPID_REQUEST_PREALLOC 16 +#define MPIR_REQUEST_PREALLOC 16 #elif (MPIU_HANDLE_ALLOCATION_METHOD == MPIU_HANDLE_ALLOCATION_THREAD_LOCAL) -#define MPID_REQUEST_PREALLOC 512 //Have direct more reqyests for all threads +#define MPIR_REQUEST_PREALLOC 512 //Have direct more reqyests for all threads #else -#define MPID_REQUEST_PREALLOC 8 +#define MPIR_REQUEST_PREALLOC 8 #endif #endif /** - * \defgroup MPID_REQUEST MPID Request object management + * \defgroup MPIR_REQUEST MPID Request object management * * Accessors and actors for MPID Requests */ /* these are referenced by src/mpi/pt2pt/wait.c in PMPI_Wait! */ -MPID_Request MPID_Request_direct[MPID_REQUEST_PREALLOC] __attribute__((__aligned__(64))); +MPID_Request MPID_Request_direct[MPIR_REQUEST_PREALLOC] __attribute__((__aligned__(64))); MPIU_Object_alloc_t MPID_Request_mem = { - 0, 0, 0, 0, MPID_REQUEST, sizeof(MPID_Request), + 0, 0, 0, 0, MPIR_REQUEST, sizeof(MPID_Request), MPID_Request_direct, - MPID_REQUEST_PREALLOC + MPIR_REQUEST_PREALLOC }; @@ -58,7 +58,7 @@ void MPIDI_Request_allocate_pool() prev = MPIU_Handle_obj_alloc_unsafe(&MPID_Request_mem); MPID_assert(prev != NULL); prev->mpid.next = NULL; - for (i = 1; i < MPID_REQUEST_TLS_MAX; ++i) { + for (i = 1; i < MPIR_REQUEST_TLS_MAX; ++i) { cur = MPIU_Handle_obj_alloc_unsafe(&MPID_Request_mem); MPID_assert(cur != NULL); cur->mpid.next = prev; @@ -66,7 +66,7 @@ void MPIDI_Request_allocate_pool() } MPIU_THREAD_CS_EXIT(HANDLEALLOC,); MPIDI_Process.request_handles[MPIDI_THREAD_ID()].head = cur; - MPIDI_Process.request_handles[MPIDI_THREAD_ID()].count += MPID_REQUEST_TLS_MAX; + MPIDI_Process.request_handles[MPIDI_THREAD_ID()].count += MPIR_REQUEST_TLS_MAX; } #endif diff --git a/src/mpid/pamid/src/mpid_request.h b/src/mpid/pamid/src/mpid_request.h index b907ef9..6a785d2 100644 --- a/src/mpid/pamid/src/mpid_request.h +++ b/src/mpid/pamid/src/mpid_request.h @@ -26,7 +26,7 @@ #include "mpidu_datatype.h" /** - * \addtogroup MPID_REQUEST + * \addtogroup MPIR_REQUEST * \{ */ @@ -90,7 +90,7 @@ void MPIDI_Request_allocate_pool(); #define MPIU_HANDLE_ALLOCATION_THREAD_LOCAL 1 /* XXX DJG for TLS hack */ -#define MPID_REQUEST_TLS_MAX 128 +#define MPIR_REQUEST_TLS_MAX 128 #if (MPIU_HANDLE_ALLOCATION_METHOD == MPIU_HANDLE_ALLOCATION_THREAD_LOCAL) && defined(__BGQ__) @@ -109,7 +109,7 @@ void MPIDI_Request_allocate_pool(); ({ \ size_t tid = MPIDI_THREAD_ID(); \ MPIDI_RequestHandle_t *rh = &MPIDI_Process.request_handles[tid]; \ - if (likely(rh->count < MPID_REQUEST_TLS_MAX)) \ + if (likely(rh->count < MPIR_REQUEST_TLS_MAX)) \ { \ /* push request onto the top of the stack */ \ req->mpid.next = rh->head; \ @@ -152,7 +152,7 @@ MPIDI_Request_create_basic() MPIDI_Request_tls_alloc(req); MPID_assert(req != NULL); - MPID_assert(HANDLE_GET_MPI_KIND(req->handle) == MPID_REQUEST); + MPID_assert(HANDLE_GET_MPI_KIND(req->handle) == MPIR_REQUEST); MPIR_cc_set(&req->cc, 1); req->cc_ptr = &req->cc; @@ -271,7 +271,7 @@ static inline void MPID_Request_release_inline(MPID_Request *req) { int count; - MPID_assert(HANDLE_GET_MPI_KIND(req->handle) == MPID_REQUEST); + MPID_assert(HANDLE_GET_MPI_KIND(req->handle) == MPIR_REQUEST); MPIU_Object_release_ref(req, &count); MPID_assert(count >= 0); @@ -316,7 +316,7 @@ MPID_Request_discard_inline(MPID_Request *req) MPIDI_Request_tls_free(req); } -#define MPID_REQUEST_SET_COMPLETED(req_) \ +#define MPIR_REQUEST_SET_COMPLETED(req_) \ MPIDI_Request_complete_norelease_inline(req_) static inline void diff --git a/src/mpid/pamid/src/pt2pt/mpid_cancel.c b/src/mpid/pamid/src/pt2pt/mpid_cancel.c index 4bcb99e..439d687 100644 --- a/src/mpid/pamid/src/pt2pt/mpid_cancel.c +++ b/src/mpid/pamid/src/pt2pt/mpid_cancel.c @@ -25,7 +25,7 @@ int MPID_Cancel_recv(MPID_Request * rreq) { - MPID_assert(rreq->kind == MPID_REQUEST_RECV); + MPID_assert(rreq->kind == MPIR_REQUEST_RECV); if (MPIDI_Recvq_FDPR(rreq)) { MPIR_STATUS_SET_CANCEL_BIT(rreq->status, TRUE); diff --git a/src/mpid/pamid/src/pt2pt/mpid_isend.h b/src/mpid/pamid/src/pt2pt/mpid_isend.h index e618747..fee78f3 100644 --- a/src/mpid/pamid/src/pt2pt/mpid_isend.h +++ b/src/mpid/pamid/src/pt2pt/mpid_isend.h @@ -113,7 +113,7 @@ MPID_Isend_inline(const void * buf, unsigned ncontexts = MPIDI_Process.avail_contexts; /* communicator & destination info */ sreq->comm = comm; - sreq->kind = MPID_REQUEST_SEND; + sreq->kind = MPIR_REQUEST_SEND; MPIR_Comm_add_ref(comm); pami_context_t context = MPIDI_Context[MPIDI_Context_hash(rank, context_id, 0, ncontexts)]; diff --git a/src/mpid/pamid/src/pt2pt/mpidi_recvmsg.c b/src/mpid/pamid/src/pt2pt/mpidi_recvmsg.c index aec6d3a..343b675 100644 --- a/src/mpid/pamid/src/pt2pt/mpidi_recvmsg.c +++ b/src/mpid/pamid/src/pt2pt/mpidi_recvmsg.c @@ -152,7 +152,7 @@ MPIDI_RecvMsg_procnull(MPIR_Comm * comm, MPID_Request * rreq; rreq = MPIDI_Request_create2(); MPIR_Status_set_procnull(&rreq->status); - rreq->kind = MPID_REQUEST_RECV; + rreq->kind = MPIR_REQUEST_RECV; rreq->comm = comm; MPIR_Comm_add_ref(comm); MPIDI_Request_complete(rreq); diff --git a/src/mpid/pamid/src/pt2pt/mpidi_send.h b/src/mpid/pamid/src/pt2pt/mpidi_send.h index 147bc2d..6df35a9 100644 --- a/src/mpid/pamid/src/pt2pt/mpidi_send.h +++ b/src/mpid/pamid/src/pt2pt/mpidi_send.h @@ -106,7 +106,7 @@ MPIDI_Send(const void * buf, MPIDI_Request_setPeerRank_comm(sreq, rank); /* message type info */ - sreq->kind = MPID_REQUEST_SEND; + sreq->kind = MPIR_REQUEST_SEND; /* ----------------------------------------- */ /* start the message */ /* ----------------------------------------- */ diff --git a/src/util/procmap/local_proc.c b/src/util/procmap/local_proc.c index 3b6b247..fee6a8a 100644 --- a/src/util/procmap/local_proc.c +++ b/src/util/procmap/local_proc.c @@ -235,7 +235,7 @@ int MPIU_Get_internode_rank(MPIR_Comm *comm_ptr, int r) MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); MPIU_Assert(mpi_errno == MPI_SUCCESS); MPIU_Assert(r < comm_ptr->remote_size); - MPIU_Assert(comm_ptr->comm_kind == MPID_INTRACOMM); + MPIU_Assert(comm_ptr->comm_kind == MPIR_INTRACOMM); MPIU_Assert(comm_ptr->internode_table != NULL); return comm_ptr->internode_table[r]; @@ -256,7 +256,7 @@ int MPIU_Get_intranode_rank(MPIR_Comm *comm_ptr, int r) MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); MPIU_Assert(mpi_errno == MPI_SUCCESS); MPIU_Assert(r < comm_ptr->remote_size); - MPIU_Assert(comm_ptr->comm_kind == MPID_INTRACOMM); + MPIU_Assert(comm_ptr->comm_kind == MPIR_INTRACOMM); MPIU_Assert(comm_ptr->intranode_table != NULL); /* FIXME this could/should be a list of ranks on the local node, which http://git.mpich.org/mpich.git/commitdiff/e1e8c2299ad759d2f451fdaa4e304cb47… commit e1e8c2299ad759d2f451fdaa4e304cb4736b12d8 Author: Wesley Bland <wesley.bland(a)intel.com> Date: Mon Apr 18 17:53:39 2016 -0500 Rename MPID_User_function to MPIR_User_function Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index 6891165..680046e 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -1800,7 +1800,7 @@ typedef enum MPIR_Op_kind { MPID_OP_NULL=0, MPID_OP_MAX=1, MPID_OP_MIN=2, MPIR_Op_kind; /*S - MPID_User_function - Definition of a user function for MPI_Op types. + MPIR_User_function - Definition of a user function for MPI_Op types. Notes: This includes a 'const' to make clear which is the 'in' argument and @@ -1834,12 +1834,12 @@ typedef enum MPIR_Op_kind { MPID_OP_NULL=0, MPID_OP_MAX=1, MPID_OP_MIN=2, Module: Collective-DS S*/ -typedef union MPID_User_function { +typedef union MPIR_User_function { void (*c_function) ( const void *, void *, const int *, const MPI_Datatype * ); void (*f77_function) ( const void *, void *, const MPI_Fint *, const MPI_Fint * ); -} MPID_User_function; +} MPIR_User_function; /* FIXME: Should there be "restrict" in the definitions above, e.g., (*c_function)( const void restrict * , void restrict *, ... )? */ @@ -1862,7 +1862,7 @@ typedef struct MPIR_Op { MPIU_OBJECT_HEADER; /* adds handle and ref_count fields */ MPIR_Op_kind kind; MPID_Lang_t language; - MPID_User_function function; + MPIR_User_function function; } MPIR_Op; #define MPID_OP_N_BUILTIN 15 extern MPIR_Op MPIR_Op_builtin[MPID_OP_N_BUILTIN]; http://git.mpich.org/mpich.git/commitdiff/0cd266b04a5f556cd011dad228a4f6d26… commit 0cd266b04a5f556cd011dad228a4f6d26baafa7e Author: Wesley Bland <wesley.bland(a)intel.com> Date: Mon Apr 18 17:52:25 2016 -0500 Rename MPID_Progress_state to MPIR_Progress_state Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index b4223af..6891165 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -1604,23 +1604,6 @@ int MPID_Get_max_node_id(MPIR_Comm *comm, MPID_Node_id_t *max_id_p); #endif /* ------------------------------------------------------------------------- */ -/*S - MPID_Progress_state - object to hold progress state when using the blocking - progress routines. - - Module: - Misc - - Notes: - The device must define MPID_PROGRESS_STATE_DECL. It should include any state - that needs to be maintained between calls to MPID_Progress_{start,wait,end}. - S*/ -typedef struct MPID_Progress_state -{ - MPID_PROGRESS_STATE_DECL -} -MPID_Progress_state; -/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */ /* end of mpirma.h (in src/mpi/rma?) */ diff --git a/src/mpid/ch3/channels/nemesis/include/mpidi_ch3_pre.h b/src/mpid/ch3/channels/nemesis/include/mpidi_ch3_pre.h index 14de935..3505ff3 100644 --- a/src/mpid/ch3/channels/nemesis/include/mpidi_ch3_pre.h +++ b/src/mpid/ch3/channels/nemesis/include/mpidi_ch3_pre.h @@ -215,7 +215,7 @@ struct MPIDI_CH3I_Request #define MPIDI_POSTED_RECV_DEQUEUE_HOOK(req) MPIDI_CH3I_Posted_recv_dequeued(req) /* - * MPID_Progress_state - device/channel dependent state to be passed between + * MPID_Progress_state - device/channel dependent state to be passed between * MPID_Progress_{start,wait,end} * */ diff --git a/src/mpid/ch3/channels/sock/include/mpidi_ch3_pre.h b/src/mpid/ch3/channels/sock/include/mpidi_ch3_pre.h index 8e444d8..df35084 100644 --- a/src/mpid/ch3/channels/sock/include/mpidi_ch3_pre.h +++ b/src/mpid/ch3/channels/sock/include/mpidi_ch3_pre.h @@ -62,7 +62,7 @@ MPIDI_CH3I_VC; */ /* - * MPID_Progress_state - device/channel dependent state to be passed between + * MPID_Progress_state - device/channel dependent state to be passed between * MPID_Progress_{start,wait,end} * */ diff --git a/src/mpid/ch3/include/mpidpost.h b/src/mpid/ch3/include/mpidpost.h index 1d60090..cc3ecbe 100644 --- a/src/mpid/ch3/include/mpidpost.h +++ b/src/mpid/ch3/include/mpidpost.h @@ -58,7 +58,7 @@ void MPIDI_CH3_Progress_start(MPID_Progress_state * state); make progress on outstanding communication requests. Input Parameters: -. state - pointer to the same MPID_Progress_state object passed to +. state - pointer to the same MPID_Progress_state object passed to MPIDI_CH3_Progress_start Return value: @@ -82,7 +82,7 @@ int MPIDI_CH3_Progress_wait(MPID_Progress_state * state); MPIDI_CH3_Progress_end - Mark the end of a progress epoch. Input Parameters: -. state - pointer to the same MPID_Progress_state object passed to +. state - pointer to the same MPID_Progress_state object passed to MPIDI_CH3_Progress_start Return value: diff --git a/src/mpid/ch3/include/mpidpre.h b/src/mpid/ch3/include/mpidpre.h index 8f86926..15bf662 100644 --- a/src/mpid/ch3/include/mpidpre.h +++ b/src/mpid/ch3/include/mpidpre.h @@ -489,13 +489,13 @@ MPID_REQUEST_DECL /* FIXME: The progress routines will be made into ch3-common definitions, not channel specific. Channels that need more will need to piggy back or otherwise override */ -#ifndef MPID_PROGRESS_STATE_DECL +typedef struct { #if defined(MPIDI_CH3_PROGRESS_STATE_DECL) -# define MPID_PROGRESS_STATE_DECL MPIDI_CH3_PROGRESS_STATE_DECL + MPIDI_CH3_PROGRESS_STATE_DECL #else -# define MPID_PROGRESS_STATE_DECL int foo; -#endif + int foo; #endif +} MPID_Progress_state; #define MPID_DEV_GPID_DECL int gpid[2]; http://git.mpich.org/mpich.git/commitdiff/0d8882e5623014f1c0fecc412c00eb403… commit 0d8882e5623014f1c0fecc412c00eb403f36455f Author: Wesley Bland <wesley.bland(a)intel.com> Date: Mon Apr 18 17:47:14 2016 -0500 Rename MPID_Op to MPIR_Op Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index d6532d7..b4223af 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -401,7 +401,7 @@ void MPIR_DatatypeAttrFinalize( void ); #define MPIR_Comm_get_ptr(a,ptr) MPID_Getb_ptr(Comm,a,0x03ffffff,ptr) #define MPIR_Group_get_ptr(a,ptr) MPID_Getb_ptr(Group,a,0x03ffffff,ptr) #define MPIR_Errhandler_get_ptr(a,ptr) MPID_Getb_ptr(Errhandler,a,0x3,ptr) -#define MPID_Op_get_ptr(a,ptr) MPID_Getb_ptr(Op,a,0x000000ff,ptr) +#define MPIR_Op_get_ptr(a,ptr) MPID_Getb_ptr(Op,a,0x000000ff,ptr) #define MPIR_Info_get_ptr(a,ptr) MPID_Getb_ptr(Info,a,0x03ffffff,ptr) #define MPIR_Win_get_ptr(a,ptr) MPID_Get_ptr(Win,a,ptr) #define MPID_Request_get_ptr(a,ptr) MPID_Get_ptr(Request,a,ptr) @@ -459,7 +459,7 @@ void MPIR_DatatypeAttrFinalize( void ); } #define MPIR_Group_valid_ptr(ptr,err) MPID_Valid_ptr_class(Group,ptr,MPI_ERR_GROUP,err) #define MPIR_Win_valid_ptr(ptr,err) MPID_Valid_ptr_class(Win,ptr,MPI_ERR_WIN,err) -#define MPID_Op_valid_ptr(ptr,err) MPID_Valid_ptr_class(Op,ptr,MPI_ERR_OP,err) +#define MPIR_Op_valid_ptr(ptr,err) MPID_Valid_ptr_class(Op,ptr,MPI_ERR_OP,err) #define MPIR_Errhandler_valid_ptr(ptr,err) MPID_Valid_ptr_class(Errhandler,ptr,MPI_ERR_ARG,err) #define MPID_Request_valid_ptr(ptr,err) MPID_Valid_ptr_class(Request,ptr,MPI_ERR_REQUEST,err) #define MPIR_Keyval_valid_ptr(ptr,err) MPID_Valid_ptr_class(Keyval,ptr,MPI_ERR_KEYVAL,err) @@ -1794,7 +1794,7 @@ int MPID_Mem_was_alloced( void *ptr ); /* brad : this isn't used or implemented /* ------------------------------------------------------------------------- */ /* Reduction and accumulate operations */ /*E - MPID_Op_kind - Enumerates types of MPI_Op types + MPIR_Op_kind - Enumerates types of MPI_Op types Notes: These are needed for implementing 'MPI_Accumulate', since only predefined @@ -1807,14 +1807,14 @@ int MPID_Mem_was_alloced( void *ptr ); /* brad : this isn't used or implemented Module: Collective-DS E*/ -typedef enum MPID_Op_kind { MPID_OP_NULL=0, MPID_OP_MAX=1, MPID_OP_MIN=2, +typedef enum MPIR_Op_kind { MPID_OP_NULL=0, MPID_OP_MAX=1, MPID_OP_MIN=2, MPID_OP_SUM=3, MPID_OP_PROD=4, MPID_OP_LAND=5, MPID_OP_BAND=6, MPID_OP_LOR=7, MPID_OP_BOR=8, MPID_OP_LXOR=9, MPID_OP_BXOR=10, MPID_OP_MAXLOC=11, MPID_OP_MINLOC=12, MPID_OP_REPLACE=13, MPID_OP_NO_OP=14, MPID_OP_USER_NONCOMMUTE=32, MPID_OP_USER=33 } - MPID_Op_kind; + MPIR_Op_kind; /*S MPID_User_function - Definition of a user function for MPI_Op types. @@ -1861,7 +1861,7 @@ typedef union MPID_User_function { (*c_function)( const void restrict * , void restrict *, ... )? */ /*S - MPID_Op - MPI_Op structure + MPIR_Op - MPI_Op structure Notes: All of the predefined functions are commutative. Only user functions may @@ -1875,16 +1875,16 @@ typedef union MPID_User_function { Module: Collective-DS S*/ -typedef struct MPID_Op { +typedef struct MPIR_Op { MPIU_OBJECT_HEADER; /* adds handle and ref_count fields */ - MPID_Op_kind kind; + MPIR_Op_kind kind; MPID_Lang_t language; MPID_User_function function; - } MPID_Op; + } MPIR_Op; #define MPID_OP_N_BUILTIN 15 -extern MPID_Op MPID_Op_builtin[MPID_OP_N_BUILTIN]; -extern MPID_Op MPID_Op_direct[]; -extern MPIU_Object_alloc_t MPID_Op_mem; +extern MPIR_Op MPIR_Op_builtin[MPID_OP_N_BUILTIN]; +extern MPIR_Op MPIR_Op_direct[]; +extern MPIU_Object_alloc_t MPIR_Op_mem; #define MPIR_Op_add_ref(_op) \ do { MPIU_Object_add_ref(_op); } while (0) @@ -1897,7 +1897,7 @@ extern MPIU_Object_alloc_t MPID_Op_mem; int in_use_; \ MPIR_Op_release_ref((op_p_), &in_use_); \ if (!in_use_) { \ - MPIU_Handle_obj_free(&MPID_Op_mem, (op_p_)); \ + MPIU_Handle_obj_free(&MPIR_Op_mem, (op_p_)); \ } \ } while (0) @@ -2637,7 +2637,7 @@ int MPID_Finalize(void); int MPID_Abort( MPIR_Comm *comm, int mpi_errno, int exit_code, const char *error_msg ); -int MPID_Open_port(MPIR_Info *, char *); +int MPIR_Open_port(MPIR_Info *, char *); int MPID_Close_port(const char *); /*@ diff --git a/src/mpi/coll/allreduce.c b/src/mpi/coll/allreduce.c index 60caed6..4b4cc71 100644 --- a/src/mpi/coll/allreduce.c +++ b/src/mpi/coll/allreduce.c @@ -844,7 +844,7 @@ int MPI_Allreduce(const void *sendbuf, void *recvbuf, int count, MPID_BEGIN_ERROR_CHECKS; { MPID_Datatype *datatype_ptr = NULL; - MPID_Op *op_ptr = NULL; + MPIR_Op *op_ptr = NULL; MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -874,8 +874,8 @@ int MPI_Allreduce(const void *sendbuf, void *recvbuf, int count, MPIR_ERRTEST_USERBUFFER(recvbuf,count,datatype,mpi_errno); if (HANDLE_GET_KIND(op) != HANDLE_KIND_BUILTIN) { - MPID_Op_get_ptr(op, op_ptr); - MPID_Op_valid_ptr( op_ptr, mpi_errno ); + MPIR_Op_get_ptr(op, op_ptr); + MPIR_Op_valid_ptr( op_ptr, mpi_errno ); } if (HANDLE_GET_KIND(op) == HANDLE_KIND_BUILTIN) { mpi_errno = diff --git a/src/mpi/coll/collutil.h b/src/mpi/coll/collutil.h index bbdcc39..a3a2f75 100644 --- a/src/mpi/coll/collutil.h +++ b/src/mpi/coll/collutil.h @@ -31,13 +31,13 @@ static inline int MPIU_is_pof2(int val, int *ceil_pof2) /* returns TRUE iff the given op is commutative */ static inline int MPIR_Op_is_commutative(MPI_Op op) { - MPID_Op *op_ptr; + MPIR_Op *op_ptr; if (HANDLE_GET_KIND(op) == HANDLE_KIND_BUILTIN) { return TRUE; } else { - MPID_Op_get_ptr(op, op_ptr); + MPIR_Op_get_ptr(op, op_ptr); if (op_ptr->kind == MPID_OP_USER_NONCOMMUTE) return FALSE; else diff --git a/src/mpi/coll/exscan.c b/src/mpi/coll/exscan.c index 5ffc5f2..2ff8684 100644 --- a/src/mpi/coll/exscan.c +++ b/src/mpi/coll/exscan.c @@ -100,7 +100,7 @@ int MPIR_Exscan ( int mask, dst, is_commutative, flag; MPI_Aint true_extent, true_lb, extent; void *partial_scan, *tmp_buf; - MPID_Op *op_ptr; + MPIR_Op *op_ptr; MPIU_CHKLMEM_DECL(2); if (count == 0) return MPI_SUCCESS; @@ -123,7 +123,7 @@ int MPIR_Exscan ( is_commutative = 1; } else { - MPID_Op_get_ptr(op, op_ptr); + MPIR_Op_get_ptr(op, op_ptr); if (op_ptr->kind == MPID_OP_USER_NONCOMMUTE) is_commutative = 0; else @@ -347,7 +347,7 @@ int MPI_Exscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datat MPID_BEGIN_ERROR_CHECKS; { MPID_Datatype *datatype_ptr = NULL; - MPID_Op *op_ptr = NULL; + MPIR_Op *op_ptr = NULL; int rank; MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); @@ -377,8 +377,8 @@ int MPI_Exscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datat if (mpi_errno != MPI_SUCCESS) goto fn_fail; if (HANDLE_GET_KIND(op) != HANDLE_KIND_BUILTIN) { - MPID_Op_get_ptr(op, op_ptr); - MPID_Op_valid_ptr( op_ptr, mpi_errno ); + MPIR_Op_get_ptr(op, op_ptr); + MPIR_Op_valid_ptr( op_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; } if (HANDLE_GET_KIND(op) == HANDLE_KIND_BUILTIN) { diff --git a/src/mpi/coll/iallreduce.c b/src/mpi/coll/iallreduce.c index 317f5ee..b7d36f1 100644 --- a/src/mpi/coll/iallreduce.c +++ b/src/mpi/coll/iallreduce.c @@ -749,9 +749,9 @@ int MPI_Iallreduce(const void *sendbuf, void *recvbuf, int count, } if (HANDLE_GET_KIND(op) != HANDLE_KIND_BUILTIN) { - MPID_Op *op_ptr = NULL; - MPID_Op_get_ptr(op, op_ptr); - MPID_Op_valid_ptr(op_ptr, mpi_errno); + MPIR_Op *op_ptr = NULL; + MPIR_Op_get_ptr(op, op_ptr); + MPIR_Op_valid_ptr(op_ptr, mpi_errno); } else if (HANDLE_GET_KIND(op) == HANDLE_KIND_BUILTIN) { mpi_errno = ( * MPIR_OP_HDL_TO_DTYPE_FN(op) )(datatype); diff --git a/src/mpi/coll/iexscan.c b/src/mpi/coll/iexscan.c index b8620b3..ffa798c 100644 --- a/src/mpi/coll/iexscan.c +++ b/src/mpi/coll/iexscan.c @@ -287,9 +287,9 @@ int MPI_Iexscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype data } if (HANDLE_GET_KIND(op) != HANDLE_KIND_BUILTIN) { - MPID_Op *op_ptr = NULL; - MPID_Op_get_ptr(op, op_ptr); - MPID_Op_valid_ptr(op_ptr, mpi_errno); + MPIR_Op *op_ptr = NULL; + MPIR_Op_get_ptr(op, op_ptr); + MPIR_Op_valid_ptr(op_ptr, mpi_errno); } else if (HANDLE_GET_KIND(op) == HANDLE_KIND_BUILTIN) { mpi_errno = ( * MPIR_OP_HDL_TO_DTYPE_FN(op) )(datatype); diff --git a/src/mpi/coll/ired_scat.c b/src/mpi/coll/ired_scat.c index 79d548f..b69ddfd 100644 --- a/src/mpi/coll/ired_scat.c +++ b/src/mpi/coll/ired_scat.c @@ -1115,9 +1115,9 @@ int MPI_Ireduce_scatter(const void *sendbuf, void *recvbuf, const int recvcounts } if (HANDLE_GET_KIND(op) != HANDLE_KIND_BUILTIN) { - MPID_Op *op_ptr = NULL; - MPID_Op_get_ptr(op, op_ptr); - MPID_Op_valid_ptr(op_ptr, mpi_errno); + MPIR_Op *op_ptr = NULL; + MPIR_Op_get_ptr(op, op_ptr); + MPIR_Op_valid_ptr(op_ptr, mpi_errno); } else if (HANDLE_GET_KIND(op) == HANDLE_KIND_BUILTIN) { mpi_errno = ( * MPIR_OP_HDL_TO_DTYPE_FN(op) )(datatype); diff --git a/src/mpi/coll/ired_scat_block.c b/src/mpi/coll/ired_scat_block.c index eb2e6b1..4c64c14 100644 --- a/src/mpi/coll/ired_scat_block.c +++ b/src/mpi/coll/ired_scat_block.c @@ -1014,9 +1014,9 @@ int MPI_Ireduce_scatter_block(const void *sendbuf, void *recvbuf, } if (HANDLE_GET_KIND(op) != HANDLE_KIND_BUILTIN) { - MPID_Op *op_ptr = NULL; - MPID_Op_get_ptr(op, op_ptr); - MPID_Op_valid_ptr(op_ptr, mpi_errno); + MPIR_Op *op_ptr = NULL; + MPIR_Op_get_ptr(op, op_ptr); + MPIR_Op_valid_ptr(op_ptr, mpi_errno); } else if (HANDLE_GET_KIND(op) == HANDLE_KIND_BUILTIN) { mpi_errno = ( * MPIR_OP_HDL_TO_DTYPE_FN(op) )(datatype); diff --git a/src/mpi/coll/ireduce.c b/src/mpi/coll/ireduce.c index 98d57c1..5d4066a 100644 --- a/src/mpi/coll/ireduce.c +++ b/src/mpi/coll/ireduce.c @@ -872,9 +872,9 @@ int MPI_Ireduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype data } if (HANDLE_GET_KIND(op) != HANDLE_KIND_BUILTIN) { - MPID_Op *op_ptr = NULL; - MPID_Op_get_ptr(op, op_ptr); - MPID_Op_valid_ptr(op_ptr, mpi_errno); + MPIR_Op *op_ptr = NULL; + MPIR_Op_get_ptr(op, op_ptr); + MPIR_Op_valid_ptr(op_ptr, mpi_errno); } else if (HANDLE_GET_KIND(op) == HANDLE_KIND_BUILTIN) { mpi_errno = ( * MPIR_OP_HDL_TO_DTYPE_FN(op) )(datatype); diff --git a/src/mpi/coll/iscan.c b/src/mpi/coll/iscan.c index 252064b..94fa5f8 100644 --- a/src/mpi/coll/iscan.c +++ b/src/mpi/coll/iscan.c @@ -422,9 +422,9 @@ int MPI_Iscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype dataty } if (HANDLE_GET_KIND(op) != HANDLE_KIND_BUILTIN) { - MPID_Op *op_ptr = NULL; - MPID_Op_get_ptr(op, op_ptr); - MPID_Op_valid_ptr(op_ptr, mpi_errno); + MPIR_Op *op_ptr = NULL; + MPIR_Op_get_ptr(op, op_ptr); + MPIR_Op_valid_ptr(op_ptr, mpi_errno); } else if (HANDLE_GET_KIND(op) == HANDLE_KIND_BUILTIN) { mpi_errno = ( * MPIR_OP_HDL_TO_DTYPE_FN(op) )(datatype); diff --git a/src/mpi/coll/op_commutative.c b/src/mpi/coll/op_commutative.c index 34d7a9e..05719d4 100644 --- a/src/mpi/coll/op_commutative.c +++ b/src/mpi/coll/op_commutative.c @@ -54,7 +54,7 @@ Output Parameters: @*/ int MPI_Op_commutative(MPI_Op op, int *commute) { - MPID_Op *op_ptr = NULL; + MPIR_Op *op_ptr = NULL; int mpi_errno = MPI_SUCCESS; MPID_MPI_STATE_DECL(MPID_STATE_MPI_OP_COMMUTATIVE); @@ -63,13 +63,13 @@ int MPI_Op_commutative(MPI_Op op, int *commute) MPID_THREAD_CS_ENTER(GLOBAL, MPIR_THREAD_GLOBAL_ALLFUNC_MUTEX); MPID_MPI_FUNC_ENTER(MPID_STATE_MPI_OP_COMMUTATIVE); - MPID_Op_get_ptr( op, op_ptr ); + MPIR_Op_get_ptr( op, op_ptr ); # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS; { - MPID_Op_valid_ptr( op_ptr, mpi_errno ); + MPIR_Op_valid_ptr( op_ptr, mpi_errno ); if (mpi_errno) MPIR_ERR_POP(mpi_errno); } MPID_END_ERROR_CHECKS; diff --git a/src/mpi/coll/op_create.c b/src/mpi/coll/op_create.c index 5b75650..8a8cd68 100644 --- a/src/mpi/coll/op_create.c +++ b/src/mpi/coll/op_create.c @@ -30,19 +30,19 @@ int MPI_Op_create(MPI_User_function *user_fn, int commute, MPI_Op *op) __attribu #endif /* Preallocated op objects */ -MPID_Op MPID_Op_builtin[MPID_OP_N_BUILTIN] = { {0} }; -MPID_Op MPID_Op_direct[MPID_OP_PREALLOC] = { {0} }; -MPIU_Object_alloc_t MPID_Op_mem = { 0, 0, 0, 0, MPID_OP, - sizeof(MPID_Op), - MPID_Op_direct, +MPIR_Op MPIR_Op_builtin[MPID_OP_N_BUILTIN] = { {0} }; +MPIR_Op MPIR_Op_direct[MPID_OP_PREALLOC] = { {0} }; +MPIU_Object_alloc_t MPIR_Op_mem = { 0, 0, 0, 0, MPID_OP, + sizeof(MPIR_Op), + MPIR_Op_direct, MPID_OP_PREALLOC, }; #ifdef HAVE_CXX_BINDING void MPIR_Op_set_cxx( MPI_Op op, void (*opcall)(void) ) { - MPID_Op *op_ptr; + MPIR_Op *op_ptr; - MPID_Op_get_ptr( op, op_ptr ); + MPIR_Op_get_ptr( op, op_ptr ); op_ptr->language = MPID_LANG_CXX; MPIR_Process.cxx_call_op_fn = (void (*)(const void *, void *, int, MPI_Datatype, MPI_User_function *))opcall; @@ -55,9 +55,9 @@ void MPIR_Op_set_cxx( MPI_Op op, void (*opcall)(void) ) versions must be distinquished. */ void MPIR_Op_set_fc( MPI_Op op ) { - MPID_Op *op_ptr; + MPIR_Op *op_ptr; - MPID_Op_get_ptr( op, op_ptr ); + MPIR_Op_get_ptr( op, op_ptr ); op_ptr->language = MPID_LANG_FORTRAN; } #endif @@ -102,7 +102,7 @@ Output Parameters: int MPI_Op_create(MPI_User_function *user_fn, int commute, MPI_Op *op) { static const char FCNAME[] = "MPI_Op_create"; - MPID_Op *op_ptr; + MPIR_Op *op_ptr; int mpi_errno = MPI_SUCCESS; MPID_MPI_STATE_DECL(MPID_STATE_MPI_OP_CREATE); @@ -113,7 +113,7 @@ int MPI_Op_create(MPI_User_function *user_fn, int commute, MPI_Op *op) /* ... body of routine ... */ - op_ptr = (MPID_Op *)MPIU_Handle_obj_alloc( &MPID_Op_mem ); + op_ptr = (MPIR_Op *)MPIU_Handle_obj_alloc( &MPIR_Op_mem ); /* --BEGIN ERROR HANDLING-- */ if (!op_ptr) { diff --git a/src/mpi/coll/op_free.c b/src/mpi/coll/op_free.c index ccff7cc..36e161e 100644 --- a/src/mpi/coll/op_free.c +++ b/src/mpi/coll/op_free.c @@ -57,7 +57,7 @@ int MPI_Op_free(MPI_Op *op) #ifdef HAVE_ERROR_CHECKING static const char FCNAME[] = "MPI_Op_free"; #endif - MPID_Op *op_ptr = NULL; + MPIR_Op *op_ptr = NULL; int in_use; int mpi_errno = MPI_SUCCESS; MPID_MPI_STATE_DECL(MPID_STATE_MPI_OP_FREE); @@ -67,12 +67,12 @@ int MPI_Op_free(MPI_Op *op) MPID_THREAD_CS_ENTER(GLOBAL, MPIR_THREAD_GLOBAL_ALLFUNC_MUTEX); MPID_MPI_FUNC_ENTER(MPID_STATE_MPI_OP_FREE); - MPID_Op_get_ptr( *op, op_ptr ); + MPIR_Op_get_ptr( *op, op_ptr ); # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS; { - MPID_Op_valid_ptr( op_ptr, mpi_errno ); + MPIR_Op_valid_ptr( op_ptr, mpi_errno ); if (!mpi_errno) { if (op_ptr->kind < MPID_OP_USER_NONCOMMUTE) { mpi_errno = MPIR_Err_create_code( MPI_SUCCESS, @@ -90,7 +90,7 @@ int MPI_Op_free(MPI_Op *op) MPIR_Op_release_ref( op_ptr, &in_use); if (!in_use) { - MPIU_Handle_obj_free( &MPID_Op_mem, op_ptr ); + MPIU_Handle_obj_free( &MPIR_Op_mem, op_ptr ); } *op = MPI_OP_NULL; diff --git a/src/mpi/coll/red_scat.c b/src/mpi/coll/red_scat.c index 61f70fa..1285048 100644 --- a/src/mpi/coll/red_scat.c +++ b/src/mpi/coll/red_scat.c @@ -255,7 +255,7 @@ int MPIR_Reduce_scatter_intra(const void *sendbuf, void *recvbuf, const int recv int pof2, old_i, newrank, received; MPI_Datatype sendtype, recvtype; int nprocs_completed, tmp_mask, tree_root, is_commutative; - MPID_Op *op_ptr; + MPIR_Op *op_ptr; MPIU_CHKLMEM_DECL(5); comm_size = comm_ptr->local_size; @@ -279,7 +279,7 @@ int MPIR_Reduce_scatter_intra(const void *sendbuf, void *recvbuf, const int recv is_commutative = 1; } else { - MPID_Op_get_ptr(op, op_ptr); + MPIR_Op_get_ptr(op, op_ptr); if (op_ptr->kind == MPID_OP_USER_NONCOMMUTE) is_commutative = 0; else @@ -1168,7 +1168,7 @@ int MPI_Reduce_scatter(const void *sendbuf, void *recvbuf, const int recvcounts[ MPID_BEGIN_ERROR_CHECKS; { MPID_Datatype *datatype_ptr = NULL; - MPID_Op *op_ptr = NULL; + MPIR_Op *op_ptr = NULL; int i, size, sum; MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); @@ -1203,8 +1203,8 @@ int MPI_Reduce_scatter(const void *sendbuf, void *recvbuf, const int recvcounts[ MPIR_ERRTEST_OP(op, mpi_errno); if (HANDLE_GET_KIND(op) != HANDLE_KIND_BUILTIN) { - MPID_Op_get_ptr(op, op_ptr); - MPID_Op_valid_ptr( op_ptr, mpi_errno ); + MPIR_Op_get_ptr(op, op_ptr); + MPIR_Op_valid_ptr( op_ptr, mpi_errno ); } if (HANDLE_GET_KIND(op) == HANDLE_KIND_BUILTIN) { mpi_errno = diff --git a/src/mpi/coll/red_scat_block.c b/src/mpi/coll/red_scat_block.c index e6328a8..7472e00 100644 --- a/src/mpi/coll/red_scat_block.c +++ b/src/mpi/coll/red_scat_block.c @@ -255,7 +255,7 @@ int MPIR_Reduce_scatter_block_intra ( int pof2, old_i, newrank, received; MPI_Datatype sendtype, recvtype; int nprocs_completed, tmp_mask, tree_root, is_commutative; - MPID_Op *op_ptr; + MPIR_Op *op_ptr; MPIU_CHKLMEM_DECL(5); comm_size = comm_ptr->local_size; @@ -283,7 +283,7 @@ int MPIR_Reduce_scatter_block_intra ( is_commutative = 1; } else { - MPID_Op_get_ptr(op, op_ptr); + MPIR_Op_get_ptr(op, op_ptr); if (op_ptr->kind == MPID_OP_USER_NONCOMMUTE) is_commutative = 0; else @@ -1141,7 +1141,7 @@ int MPI_Reduce_scatter_block(const void *sendbuf, void *recvbuf, MPID_BEGIN_ERROR_CHECKS; { MPID_Datatype *datatype_ptr = NULL; - MPID_Op *op_ptr = NULL; + MPIR_Op *op_ptr = NULL; MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -1170,8 +1170,8 @@ int MPI_Reduce_scatter_block(const void *sendbuf, void *recvbuf, if (mpi_errno != MPI_SUCCESS) goto fn_fail; if (HANDLE_GET_KIND(op) != HANDLE_KIND_BUILTIN) { - MPID_Op_get_ptr(op, op_ptr); - MPID_Op_valid_ptr( op_ptr, mpi_errno ); + MPIR_Op_get_ptr(op, op_ptr); + MPIR_Op_valid_ptr( op_ptr, mpi_errno ); } if (HANDLE_GET_KIND(op) == HANDLE_KIND_BUILTIN) { mpi_errno = diff --git a/src/mpi/coll/reduce.c b/src/mpi/coll/reduce.c index 57f5b32..9c53a12 100644 --- a/src/mpi/coll/reduce.c +++ b/src/mpi/coll/reduce.c @@ -740,7 +740,7 @@ int MPIR_Reduce_intra ( int mpi_errno_ret = MPI_SUCCESS; int comm_size, is_commutative, type_size, pof2; int nbytes = 0; - MPID_Op *op_ptr; + MPIR_Op *op_ptr; MPIU_CHKLMEM_DECL(1); if (count == 0) return MPI_SUCCESS; @@ -752,7 +752,7 @@ int MPIR_Reduce_intra ( if (HANDLE_GET_KIND(op) == HANDLE_KIND_BUILTIN) is_commutative = 1; else { - MPID_Op_get_ptr(op, op_ptr); + MPIR_Op_get_ptr(op, op_ptr); is_commutative = (op_ptr->kind == MPID_OP_USER_NONCOMMUTE) ? 0 : 1; } @@ -1169,7 +1169,7 @@ int MPI_Reduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datat MPID_BEGIN_ERROR_CHECKS; { MPID_Datatype *datatype_ptr = NULL; - MPID_Op *op_ptr = NULL; + MPIR_Op *op_ptr = NULL; int rank; MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); @@ -1239,8 +1239,8 @@ int MPI_Reduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datat if (mpi_errno != MPI_SUCCESS) goto fn_fail; if (HANDLE_GET_KIND(op) != HANDLE_KIND_BUILTIN) { - MPID_Op_get_ptr(op, op_ptr); - MPID_Op_valid_ptr( op_ptr, mpi_errno ); + MPIR_Op_get_ptr(op, op_ptr); + MPIR_Op_valid_ptr( op_ptr, mpi_errno ); } if (HANDLE_GET_KIND(op) == HANDLE_KIND_BUILTIN) { mpi_errno = diff --git a/src/mpi/coll/reduce_local.c b/src/mpi/coll/reduce_local.c index d91f975..e8fa5d4 100644 --- a/src/mpi/coll/reduce_local.c +++ b/src/mpi/coll/reduce_local.c @@ -36,7 +36,7 @@ int MPI_Reduce_local(const void *inbuf, void *inoutbuf, int count, MPI_Datatype int MPIR_Reduce_local_impl(const void *inbuf, void *inoutbuf, int count, MPI_Datatype datatype, MPI_Op op) { int mpi_errno = MPI_SUCCESS; - MPID_Op *op_ptr; + MPIR_Op *op_ptr; MPI_User_function *uop; #ifdef HAVE_CXX_BINDING int is_cxx_uop = 0; @@ -62,7 +62,7 @@ int MPIR_Reduce_local_impl(const void *inbuf, void *inoutbuf, int count, MPI_Dat uop = MPIR_OP_HDL_TO_FN(op); } else { - MPID_Op_get_ptr(op, op_ptr); + MPIR_Op_get_ptr(op, op_ptr); #ifdef HAVE_CXX_BINDING if (op_ptr->language == MPID_LANG_CXX) { @@ -176,9 +176,9 @@ int MPI_Reduce_local(const void *inbuf, void *inoutbuf, int count, MPI_Datatype MPIR_ERRTEST_OP(op, mpi_errno); if (HANDLE_GET_KIND(op) != HANDLE_KIND_BUILTIN) { - MPID_Op *op_ptr; - MPID_Op_get_ptr(op, op_ptr); - MPID_Op_valid_ptr( op_ptr, mpi_errno ); + MPIR_Op *op_ptr; + MPIR_Op_get_ptr(op, op_ptr); + MPIR_Op_valid_ptr( op_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; } if (HANDLE_GET_KIND(op) == HANDLE_KIND_BUILTIN) { diff --git a/src/mpi/coll/scan.c b/src/mpi/coll/scan.c index cf88ba9..bc4a554 100644 --- a/src/mpi/coll/scan.c +++ b/src/mpi/coll/scan.c @@ -85,7 +85,7 @@ static int MPIR_Scan_generic ( int mask, dst, is_commutative; MPI_Aint true_extent, true_lb, extent; void *partial_scan, *tmp_buf; - MPID_Op *op_ptr; + MPIR_Op *op_ptr; MPIU_CHKLMEM_DECL(2); if (count == 0) return MPI_SUCCESS; @@ -111,7 +111,7 @@ static int MPIR_Scan_generic ( is_commutative = 1; } else { - MPID_Op_get_ptr(op, op_ptr); + MPIR_Op_get_ptr(op, op_ptr); if (op_ptr->kind == MPID_OP_USER_NONCOMMUTE) is_commutative = 0; else @@ -529,7 +529,7 @@ int MPI_Scan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatyp MPID_BEGIN_ERROR_CHECKS; { MPID_Datatype *datatype_ptr = NULL; - MPID_Op *op_ptr = NULL; + MPIR_Op *op_ptr = NULL; MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; @@ -553,8 +553,8 @@ int MPI_Scan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatyp MPIR_ERRTEST_USERBUFFER(recvbuf,count,datatype,mpi_errno); if (HANDLE_GET_KIND(op) != HANDLE_KIND_BUILTIN) { - MPID_Op_get_ptr(op, op_ptr); - MPID_Op_valid_ptr( op_ptr, mpi_errno ); + MPIR_Op_get_ptr(op, op_ptr); + MPIR_Op_valid_ptr( op_ptr, mpi_errno ); } if (HANDLE_GET_KIND(op) == HANDLE_KIND_BUILTIN) { mpi_errno = diff --git a/src/mpi/spawn/open_port.c b/src/mpi/spawn/open_port.c index f7d212a..79aa456 100644 --- a/src/mpi/spawn/open_port.c +++ b/src/mpi/spawn/open_port.c @@ -26,7 +26,7 @@ int MPI_Open_port(MPI_Info info, char *port_name) __attribute__((weak,alias("PMP int MPIR_Open_port_impl(MPIR_Info *info_ptr, char *port_name) { - return MPID_Open_port(info_ptr, port_name); + return MPIR_Open_port(info_ptr, port_name); } #endif diff --git a/src/mpid/ch3/src/ch3u_comm_spawn_multiple.c b/src/mpid/ch3/src/ch3u_comm_spawn_multiple.c index b451ee6..8346c76 100644 --- a/src/mpid/ch3/src/ch3u_comm_spawn_multiple.c +++ b/src/mpid/ch3/src/ch3u_comm_spawn_multiple.c @@ -135,7 +135,7 @@ int MPIDI_Comm_spawn_multiple(int count, char **commands, /* Open a port for the spawned processes to connect to */ /* FIXME: info may be needed for port name */ - mpi_errno = MPID_Open_port(NULL, port_name); + mpi_errno = MPIR_Open_port(NULL, port_name); /* --BEGIN ERROR HANDLING-- */ if (mpi_errno) MPIR_ERR_POP(mpi_errno); /* --END ERROR HANDLING-- */ diff --git a/src/mpid/ch3/src/mpid_port.c b/src/mpid/ch3/src/mpid_port.c index d34071b..135f342 100644 --- a/src/mpid/ch3/src/mpid_port.c +++ b/src/mpid/ch3/src/mpid_port.c @@ -23,7 +23,7 @@ static MPIDI_PortFns portFns = { 0, 0, 0, 0 }; #endif /*@ - MPID_Open_port - Open an MPI Port + MPIR_Open_port - Open an MPI Port Input Arguments: . MPI_Info info - info @@ -38,10 +38,10 @@ static MPIDI_PortFns portFns = { 0, 0, 0, 0 }; .N MPI_ERR_OTHER @*/ #undef FUNCNAME -#define FUNCNAME MPID_Open_port +#define FUNCNAME MPIR_Open_port #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Open_port(MPIR_Info *info_ptr, char *port_name) +int MPIR_Open_port(MPIR_Info *info_ptr, char *port_name) { int mpi_errno=MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPID_OPEN_PORT); diff --git a/src/mpid/common/sched/mpidu_sched.c b/src/mpid/common/sched/mpidu_sched.c index ef6783d..be5f452 100644 --- a/src/mpid/common/sched/mpidu_sched.c +++ b/src/mpid/common/sched/mpidu_sched.c @@ -203,8 +203,8 @@ static int MPIDU_Sched_start_entry(struct MPIDU_Sched *s, size_t idx, struct MPI if (mpi_errno) MPIR_ERR_POP(mpi_errno); if (HANDLE_GET_KIND(e->u.reduce.op) != HANDLE_KIND_BUILTIN) { - MPID_Op *op_ptr = NULL; - MPID_Op_get_ptr(e->u.reduce.op, op_ptr); + MPIR_Op *op_ptr = NULL; + MPIR_Op_get_ptr(e->u.reduce.op, op_ptr); MPIR_Op_release(op_ptr); } dtype_release_if_not_builtin(e->u.reduce.datatype); @@ -711,8 +711,8 @@ int MPIDU_Sched_reduce(const void *inbuf, void *inoutbuf, MPI_Aint count, MPI_Da dtype_add_ref_if_not_builtin(datatype); if (HANDLE_GET_KIND(op) != HANDLE_KIND_BUILTIN) { - MPID_Op *op_ptr = NULL; - MPID_Op_get_ptr(op, op_ptr); + MPIR_Op *op_ptr = NULL; + MPIR_Op_get_ptr(op, op_ptr); MPIR_Op_add_ref(op_ptr); } diff --git a/src/mpid/pamid/src/dyntask/mpid_comm_spawn_multiple.c b/src/mpid/pamid/src/dyntask/mpid_comm_spawn_multiple.c index 9597267..46bc3f6 100644 --- a/src/mpid/pamid/src/dyntask/mpid_comm_spawn_multiple.c +++ b/src/mpid/pamid/src/dyntask/mpid_comm_spawn_multiple.c @@ -167,8 +167,8 @@ int MPIDI_Comm_spawn_multiple(int count, char **commands, /* Open a port for the spawned processes to connect to */ /* FIXME: info may be needed for port name */ - mpi_errno = MPID_Open_port(NULL, port_name); - TRACE_ERR("mpi_errno from MPID_Open_port=%d\n", mpi_errno); + mpi_errno = MPIR_Open_port(NULL, port_name); + TRACE_ERR("mpi_errno from MPIR_Open_port=%d\n", mpi_errno); /* Spawn the processes */ #ifdef USE_PMI2_API diff --git a/src/mpid/pamid/src/dyntask/mpid_port.c b/src/mpid/pamid/src/dyntask/mpid_port.c index 7f115d8..e35e0f3 100644 --- a/src/mpid/pamid/src/dyntask/mpid_port.c +++ b/src/mpid/pamid/src/dyntask/mpid_port.c @@ -30,7 +30,7 @@ static MPIDI_PortFns portFns = { MPIDI_Open_port, MPIDI_Comm_connect }; /*@ - MPID_Open_port - Open an MPI Port + MPIR_Open_port - Open an MPI Port Input Arguments: . MPI_Info info - info @@ -45,7 +45,7 @@ static MPIDI_PortFns portFns = { MPIDI_Open_port, .N MPI_SUCCESS .N MPI_ERR_OTHER @*/ -int MPID_Open_port(MPIR_Info *info_ptr, char *port_name) +int MPIR_Open_port(MPIR_Info *info_ptr, char *port_name) { int mpi_errno=MPI_SUCCESS; diff --git a/src/mpid/pamid/src/misc/mpid_unimpl.c b/src/mpid/pamid/src/misc/mpid_unimpl.c index beec015..82d09d8 100644 --- a/src/mpid/pamid/src/misc/mpid_unimpl.c +++ b/src/mpid/pamid/src/misc/mpid_unimpl.c @@ -27,7 +27,7 @@ int MPID_Close_port(const char *port_name) MPID_abort(); return 0; } -int MPID_Open_port(MPIR_Info *info_ptr, +int MPIR_Open_port(MPIR_Info *info_ptr, char *port_name) { MPID_abort(); http://git.mpich.org/mpich.git/commitdiff/3c8943305b900b51d8e2f6df95bf920b5… commit 3c8943305b900b51d8e2f6df95bf920b50ba9841 Author: Wesley Bland <wesley.bland(a)intel.com> Date: Mon Apr 18 17:40:11 2016 -0500 Rename MPID_Keyval to MPIR_Keyval Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index e4dff7a..d6532d7 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -412,18 +412,18 @@ void MPIR_DatatypeAttrFinalize( void ); For the indirect case, we mask off the part of the keyval that is in the bits normally used for the indirect block index. */ -#define MPID_Keyval_get_ptr(a,ptr) \ +#define MPIR_Keyval_get_ptr(a,ptr) \ { \ switch (HANDLE_GET_KIND(a)) { \ case HANDLE_KIND_BUILTIN: \ ptr=0; \ break; \ case HANDLE_KIND_DIRECT: \ - ptr=MPID_Keyval_direct+((a)&0x3fffff); \ + ptr=MPIR_Keyval_direct+((a)&0x3fffff); \ break; \ case HANDLE_KIND_INDIRECT: \ - ptr=((MPID_Keyval*) \ - MPIU_Handle_get_ptr_indirect((a)&0xfc3fffff,&MPID_Keyval_mem)); \ + ptr=((MPIR_Keyval*) \ + MPIU_Handle_get_ptr_indirect((a)&0xfc3fffff,&MPIR_Keyval_mem)); \ break; \ case HANDLE_KIND_INVALID: \ default: \ @@ -462,7 +462,7 @@ void MPIR_DatatypeAttrFinalize( void ); #define MPID_Op_valid_ptr(ptr,err) MPID_Valid_ptr_class(Op,ptr,MPI_ERR_OP,err) #define MPIR_Errhandler_valid_ptr(ptr,err) MPID_Valid_ptr_class(Errhandler,ptr,MPI_ERR_ARG,err) #define MPID_Request_valid_ptr(ptr,err) MPID_Valid_ptr_class(Request,ptr,MPI_ERR_REQUEST,err) -#define MPID_Keyval_valid_ptr(ptr,err) MPID_Valid_ptr_class(Keyval,ptr,MPI_ERR_KEYVAL,err) +#define MPIR_Keyval_valid_ptr(ptr,err) MPID_Valid_ptr_class(Keyval,ptr,MPI_ERR_KEYVAL,err) #define MPIR_DATATYPE_IS_PREDEFINED(type) \ ((HANDLE_GET_KIND(type) == HANDLE_KIND_BUILTIN) || \ @@ -893,13 +893,13 @@ typedef struct MPIR_Delete_function { } MPIR_Delete_function; /*S - MPID_Keyval - Structure of an MPID keyval + MPIR_Keyval - Structure of an MPID keyval Module: Attribute-DS S*/ -typedef struct MPID_Keyval { +typedef struct MPIR_Keyval { MPIU_OBJECT_HEADER; /* adds handle and ref_count fields */ MPID_Object_kind kind; int was_freed; @@ -910,7 +910,7 @@ typedef struct MPID_Keyval { #ifdef MPID_DEV_KEYVAL_DECL MPID_DEV_KEYVAL_DECL #endif -} MPID_Keyval; +} MPIR_Keyval; #define MPIR_Keyval_add_ref( _keyval ) \ do { \ @@ -977,7 +977,7 @@ typedef void * MPID_AttrVal_t; S*/ typedef struct MPIR_Attribute { MPIU_OBJECT_HEADER; /* adds handle and ref_count fields */ - MPID_Keyval *keyval; /* Keyval structure for this attribute */ + MPIR_Keyval *keyval; /* Keyval structure for this attribute */ struct MPIR_Attribute *next; /* Pointer to next in the list */ MPIR_AttrType attrType; /* Type of the attribute */ @@ -4266,7 +4266,7 @@ int MPIR_Info_get_nthkey_impl(MPIR_Info *info, int n, char *key); void MPIR_Info_get_valuelen_impl(MPIR_Info *info_ptr, const char *key, int *valuelen, int *flag); int MPIR_Info_set_impl(MPIR_Info *info_ptr, const char *key, const char *value); int MPIR_Info_dup_impl(MPIR_Info *info_ptr, MPIR_Info **new_info_ptr); -int MPIR_Comm_delete_attr_impl(MPIR_Comm *comm_ptr, MPID_Keyval *keyval_ptr); +int MPIR_Comm_delete_attr_impl(MPIR_Comm *comm_ptr, MPIR_Keyval *keyval_ptr); int MPIR_Comm_create_keyval_impl(MPI_Comm_copy_attr_function *comm_copy_attr_fn, MPI_Comm_delete_attr_function *comm_delete_attr_fn, int *comm_keyval, void *extra_state); diff --git a/src/mpi/attr/attr.h b/src/mpi/attr/attr.h index 3da6962..1189382 100644 --- a/src/mpi/attr/attr.h +++ b/src/mpi/attr/attr.h @@ -16,9 +16,9 @@ /* Keyval and attribute storage */ -extern MPIU_Object_alloc_t MPID_Keyval_mem; +extern MPIU_Object_alloc_t MPIR_Keyval_mem; extern MPIU_Object_alloc_t MPID_Attr_mem; -extern MPID_Keyval MPID_Keyval_direct[]; +extern MPIR_Keyval MPIR_Keyval_direct[]; extern int MPIR_Attr_dup_list( int, MPIR_Attribute *, MPIR_Attribute ** ); extern int MPIR_Attr_delete_list( int, MPIR_Attribute ** ); diff --git a/src/mpi/attr/attr_delete.c b/src/mpi/attr/attr_delete.c index 41afeee..662eb1c 100644 --- a/src/mpi/attr/attr_delete.c +++ b/src/mpi/attr/attr_delete.c @@ -57,7 +57,7 @@ int MPI_Attr_delete(MPI_Comm comm, int keyval) static const char FCNAME[] = "MPI_Attr_delete"; int mpi_errno = MPI_SUCCESS; MPIR_Comm *comm_ptr = NULL; - MPID_Keyval *keyval_ptr; + MPIR_Keyval *keyval_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPI_ATTR_DELETE); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -78,7 +78,7 @@ int MPI_Attr_delete(MPI_Comm comm, int keyval) /* Convert MPI object handles to object pointers */ MPIR_Comm_get_ptr( comm, comm_ptr ); - MPID_Keyval_get_ptr( keyval, keyval_ptr ); + MPIR_Keyval_get_ptr( keyval, keyval_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -89,7 +89,7 @@ int MPI_Attr_delete(MPI_Comm comm, int keyval) MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); /* If comm_ptr is not valid, it will be reset to null */ /* Validate keyval_ptr */ - MPID_Keyval_valid_ptr( keyval_ptr, mpi_errno ); + MPIR_Keyval_valid_ptr( keyval_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; } MPID_END_ERROR_CHECKS; diff --git a/src/mpi/attr/attrutil.c b/src/mpi/attr/attrutil.c index 2ff6d7d..bcef21a 100644 --- a/src/mpi/attr/attrutil.c +++ b/src/mpi/attr/attrutil.c @@ -27,10 +27,10 @@ #endif /* Preallocated keyval objects */ -MPID_Keyval MPID_Keyval_direct[MPID_KEYVAL_PREALLOC] = { {0} }; -MPIU_Object_alloc_t MPID_Keyval_mem = { 0, 0, 0, 0, MPID_KEYVAL, - sizeof(MPID_Keyval), - MPID_Keyval_direct, +MPIR_Keyval MPIR_Keyval_direct[MPID_KEYVAL_PREALLOC] = { {0} }; +MPIU_Object_alloc_t MPIR_Keyval_mem = { 0, 0, 0, 0, MPID_KEYVAL, + sizeof(MPIR_Keyval), + MPIR_Keyval_direct, MPID_KEYVAL_PREALLOC, }; #ifndef MPID_ATTR_PREALLOC @@ -81,7 +81,7 @@ int MPIR_Call_attr_delete( int handle, MPIR_Attribute *attr_p ) { int rc; int mpi_errno = MPI_SUCCESS; - MPID_Keyval* kv = attr_p->keyval; + MPIR_Keyval* kv = attr_p->keyval; if(kv->delfn.user_function == NULL) goto fn_exit; @@ -138,7 +138,7 @@ int MPIR_Call_attr_copy( int handle, MPIR_Attribute *attr_p, void** value_copy, { int mpi_errno = MPI_SUCCESS; int rc; - MPID_Keyval* kv = attr_p->keyval; + MPIR_Keyval* kv = attr_p->keyval; if(kv->copyfn.user_function == NULL) goto fn_exit; @@ -279,7 +279,7 @@ int MPIR_Attr_delete_list( int handle, MPIR_Attribute **attr ) /* Decrement the use of the keyval */ MPIR_Keyval_release_ref( p->keyval, &in_use); if (!in_use) { - MPIU_Handle_obj_free( &MPID_Keyval_mem, p->keyval ); + MPIU_Handle_obj_free( &MPIR_Keyval_mem, p->keyval ); } } @@ -372,8 +372,8 @@ MPIR_Keyval_set_proxy( MPID_Attr_delete_proxy delete_proxy ) { - MPID_Keyval* keyval_ptr; - MPID_Keyval_get_ptr( keyval, keyval_ptr ); + MPIR_Keyval* keyval_ptr; + MPIR_Keyval_get_ptr( keyval, keyval_ptr ); if(keyval_ptr == NULL) return; diff --git a/src/mpi/attr/comm_create_keyval.c b/src/mpi/attr/comm_create_keyval.c index 81a7e67..cb0cea9 100644 --- a/src/mpi/attr/comm_create_keyval.c +++ b/src/mpi/attr/comm_create_keyval.c @@ -46,9 +46,9 @@ int MPIR_Comm_create_keyval_impl(MPI_Comm_copy_attr_function *comm_copy_attr_fn, int *comm_keyval, void *extra_state) { int mpi_errno = MPI_SUCCESS; - MPID_Keyval *keyval_ptr; + MPIR_Keyval *keyval_ptr; - keyval_ptr = (MPID_Keyval *)MPIU_Handle_obj_alloc( &MPID_Keyval_mem ); + keyval_ptr = (MPIR_Keyval *)MPIU_Handle_obj_alloc( &MPIR_Keyval_mem ); MPIR_ERR_CHKANDJUMP(!keyval_ptr, mpi_errno, MPI_ERR_OTHER,"**nomem"); /* Initialize the attribute dup function */ diff --git a/src/mpi/attr/comm_delete_attr.c b/src/mpi/attr/comm_delete_attr.c index 0d38867..096178b 100644 --- a/src/mpi/attr/comm_delete_attr.c +++ b/src/mpi/attr/comm_delete_attr.c @@ -30,7 +30,7 @@ int MPI_Comm_delete_attr(MPI_Comm comm, int comm_keyval) __attribute__((weak,ali #define FUNCNAME MPIR_Comm_delete_attr_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Comm_delete_attr_impl(MPIR_Comm *comm_ptr, MPID_Keyval *keyval_ptr) +int MPIR_Comm_delete_attr_impl(MPIR_Comm *comm_ptr, MPIR_Keyval *keyval_ptr) { int mpi_errno = MPI_SUCCESS; MPIR_Attribute *p, **old_p; @@ -69,7 +69,7 @@ int MPIR_Comm_delete_attr_impl(MPIR_Comm *comm_ptr, MPID_Keyval *keyval_ptr) /* Decrement the use of the keyval */ MPIR_Keyval_release_ref( p->keyval, &in_use); if (!in_use) { - MPIU_Handle_obj_free( &MPID_Keyval_mem, p->keyval ); + MPIU_Handle_obj_free( &MPIR_Keyval_mem, p->keyval ); } MPID_Attr_free(p); } @@ -109,7 +109,7 @@ int MPI_Comm_delete_attr(MPI_Comm comm, int comm_keyval) { int mpi_errno = MPI_SUCCESS; MPIR_Comm *comm_ptr = NULL; - MPID_Keyval *keyval_ptr; + MPIR_Keyval *keyval_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_DELETE_ATTR); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -132,7 +132,7 @@ int MPI_Comm_delete_attr(MPI_Comm comm, int comm_keyval) /* Convert MPI object handles to object pointers */ MPIR_Comm_get_ptr( comm, comm_ptr ); - MPID_Keyval_get_ptr( comm_keyval, keyval_ptr ); + MPIR_Keyval_get_ptr( comm_keyval, keyval_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -143,7 +143,7 @@ int MPI_Comm_delete_attr(MPI_Comm comm, int comm_keyval) MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); /* If comm_ptr is not valid, it will be reset to null */ /* Validate keyval_ptr */ - MPID_Keyval_valid_ptr( keyval_ptr, mpi_errno ); + MPIR_Keyval_valid_ptr( keyval_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; } MPID_END_ERROR_CHECKS; diff --git a/src/mpi/attr/comm_free_keyval.c b/src/mpi/attr/comm_free_keyval.c index ef4f6b8..9b0eaa7 100644 --- a/src/mpi/attr/comm_free_keyval.c +++ b/src/mpi/attr/comm_free_keyval.c @@ -33,14 +33,14 @@ int MPI_Comm_free_keyval(int *comm_keyval) __attribute__((weak,alias("PMPI_Comm_ void MPIR_Comm_free_keyval_impl(int keyval) { int in_use; - MPID_Keyval *keyval_ptr; + MPIR_Keyval *keyval_ptr; - MPID_Keyval_get_ptr(keyval, keyval_ptr); + MPIR_Keyval_get_ptr(keyval, keyval_ptr); if (!keyval_ptr->was_freed) { keyval_ptr->was_freed = 1; MPIR_Keyval_release_ref( keyval_ptr, &in_use); if (!in_use) { - MPIU_Handle_obj_free( &MPID_Keyval_mem, keyval_ptr ); + MPIU_Handle_obj_free( &MPIR_Keyval_mem, keyval_ptr ); } } return; @@ -99,12 +99,12 @@ int MPI_Comm_free_keyval(int *comm_keyval) { MPID_BEGIN_ERROR_CHECKS; { - MPID_Keyval *keyval_ptr = NULL; + MPIR_Keyval *keyval_ptr = NULL; /* Convert MPI object handles to object pointers */ - MPID_Keyval_get_ptr( *comm_keyval, keyval_ptr ); + MPIR_Keyval_get_ptr( *comm_keyval, keyval_ptr ); - MPID_Keyval_valid_ptr( keyval_ptr, mpi_errno ); + MPIR_Keyval_valid_ptr( keyval_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; } MPID_END_ERROR_CHECKS; diff --git a/src/mpi/attr/comm_set_attr.c b/src/mpi/attr/comm_set_attr.c index 30da7bc..55daf8d 100644 --- a/src/mpi/attr/comm_set_attr.c +++ b/src/mpi/attr/comm_set_attr.c @@ -34,7 +34,7 @@ int MPIR_Comm_set_attr_impl(MPIR_Comm *comm_ptr, int comm_keyval, void *attribut MPIR_AttrType attrType) { int mpi_errno = MPI_SUCCESS; - MPID_Keyval *keyval_ptr = NULL; + MPIR_Keyval *keyval_ptr = NULL; MPIR_Attribute *p; MPIR_ERR_CHKANDJUMP(comm_keyval == MPI_KEYVAL_INVALID, mpi_errno, MPI_ERR_KEYVAL, "**keyvalinvalid"); @@ -44,7 +44,7 @@ int MPIR_Comm_set_attr_impl(MPIR_Comm *comm_ptr, int comm_keyval, void *attribut a simple linear list algorithm because few applications use more than a handful of attributes */ - MPID_Keyval_get_ptr( comm_keyval, keyval_ptr ); + MPIR_Keyval_get_ptr( comm_keyval, keyval_ptr ); MPIU_Assert(keyval_ptr != NULL); /* printf( "Setting attr val to %x\n", attribute_val ); */ @@ -139,14 +139,14 @@ int MPIR_CommSetAttr( MPI_Comm comm, int comm_keyval, void *attribute_val, { MPID_BEGIN_ERROR_CHECKS; { - MPID_Keyval *keyval_ptr = NULL; + MPIR_Keyval *keyval_ptr = NULL; /* Validate comm_ptr */ MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); /* If comm_ptr is not valid, it will be reset to null */ /* Validate keyval_ptr */ - MPID_Keyval_get_ptr( comm_keyval, keyval_ptr ); - MPID_Keyval_valid_ptr( keyval_ptr, mpi_errno ); + MPIR_Keyval_get_ptr( comm_keyval, keyval_ptr ); + MPIR_Keyval_valid_ptr( keyval_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; } MPID_END_ERROR_CHECKS; @@ -246,14 +246,14 @@ int MPI_Comm_set_attr(MPI_Comm comm, int comm_keyval, void *attribute_val) { MPID_BEGIN_ERROR_CHECKS; { - MPID_Keyval *keyval_ptr = NULL; + MPIR_Keyval *keyval_ptr = NULL; /* Validate comm_ptr */ MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); /* If comm_ptr is not valid, it will be reset to null */ /* Validate keyval_ptr */ - MPID_Keyval_get_ptr( comm_keyval, keyval_ptr ); - MPID_Keyval_valid_ptr( keyval_ptr, mpi_errno ); + MPIR_Keyval_get_ptr( comm_keyval, keyval_ptr ); + MPIR_Keyval_valid_ptr( keyval_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; } MPID_END_ERROR_CHECKS; diff --git a/src/mpi/attr/keyval_free.c b/src/mpi/attr/keyval_free.c index 2ec22d0..26ddf07 100644 --- a/src/mpi/attr/keyval_free.c +++ b/src/mpi/attr/keyval_free.c @@ -80,12 +80,12 @@ int MPI_Keyval_free(int *keyval) { MPID_BEGIN_ERROR_CHECKS; { - MPID_Keyval *keyval_ptr = NULL; + MPIR_Keyval *keyval_ptr = NULL; /* Convert MPI object handles to object pointers */ - MPID_Keyval_get_ptr( *keyval, keyval_ptr ); + MPIR_Keyval_get_ptr( *keyval, keyval_ptr ); - MPID_Keyval_valid_ptr( keyval_ptr, mpi_errno ); + MPIR_Keyval_valid_ptr( keyval_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; } MPID_END_ERROR_CHECKS; diff --git a/src/mpi/attr/type_create_keyval.c b/src/mpi/attr/type_create_keyval.c index a321a20..5de6c29 100644 --- a/src/mpi/attr/type_create_keyval.c +++ b/src/mpi/attr/type_create_keyval.c @@ -76,7 +76,7 @@ int MPI_Type_create_keyval(MPI_Type_copy_attr_function *type_copy_attr_fn, { static const char FCNAME[] = "MPI_Type_create_keyval"; int mpi_errno = MPI_SUCCESS; - MPID_Keyval *keyval_ptr; + MPIR_Keyval *keyval_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPI_TYPE_CREATE_KEYVAL); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -97,7 +97,7 @@ int MPI_Type_create_keyval(MPI_Type_copy_attr_function *type_copy_attr_fn, /* ... body of routine ... */ - keyval_ptr = (MPID_Keyval *)MPIU_Handle_obj_alloc( &MPID_Keyval_mem ); + keyval_ptr = (MPIR_Keyval *)MPIU_Handle_obj_alloc( &MPIR_Keyval_mem ); MPIR_ERR_CHKANDJUMP(!keyval_ptr,mpi_errno,MPI_ERR_OTHER,"**nomem"); /* Initialize the attribute dup function */ diff --git a/src/mpi/attr/type_delete_attr.c b/src/mpi/attr/type_delete_attr.c index d55a486..88d05c7 100644 --- a/src/mpi/attr/type_delete_attr.c +++ b/src/mpi/attr/type_delete_attr.c @@ -54,7 +54,7 @@ int MPI_Type_delete_attr(MPI_Datatype datatype, int type_keyval) int mpi_errno = MPI_SUCCESS; MPID_Datatype *type_ptr = NULL; MPIR_Attribute *p, **old_p; - MPID_Keyval *keyval_ptr = 0; + MPIR_Keyval *keyval_ptr = 0; MPID_MPI_STATE_DECL(MPID_STATE_MPI_TYPE_DELETE_ATTR); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -79,7 +79,7 @@ int MPI_Type_delete_attr(MPI_Datatype datatype, int type_keyval) /* Validate parameters and objects (post conversion) */ MPID_Datatype_get_ptr( datatype, type_ptr ); - MPID_Keyval_get_ptr( type_keyval, keyval_ptr ); + MPIR_Keyval_get_ptr( type_keyval, keyval_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -132,7 +132,7 @@ int MPI_Type_delete_attr(MPI_Datatype datatype, int type_keyval) MPIR_Keyval_release_ref( p->keyval, &in_use); if (!in_use) { - MPIU_Handle_obj_free( &MPID_Keyval_mem, p->keyval ); + MPIU_Handle_obj_free( &MPIR_Keyval_mem, p->keyval ); } MPID_Attr_free(p); } diff --git a/src/mpi/attr/type_free_keyval.c b/src/mpi/attr/type_free_keyval.c index af60949..8768fb8 100644 --- a/src/mpi/attr/type_free_keyval.c +++ b/src/mpi/attr/type_free_keyval.c @@ -51,7 +51,7 @@ int MPI_Type_free_keyval(int *type_keyval) #ifdef HAVE_ERROR_CHECKING static const char FCNAME[] = "MPI_Type_free_keyval"; #endif - MPID_Keyval *keyval_ptr = NULL; + MPIR_Keyval *keyval_ptr = NULL; int in_use; int mpi_errno = MPI_SUCCESS; MPID_MPI_STATE_DECL(MPID_STATE_MPI_TYPE_FREE_KEYVAL); @@ -75,14 +75,14 @@ int MPI_Type_free_keyval(int *type_keyval) # endif /* Convert MPI object handles to object pointers */ - MPID_Keyval_get_ptr( *type_keyval, keyval_ptr ); + MPIR_Keyval_get_ptr( *type_keyval, keyval_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS; { - MPID_Keyval_valid_ptr( keyval_ptr, mpi_errno ); + MPIR_Keyval_valid_ptr( keyval_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; } MPID_END_ERROR_CHECKS; @@ -95,7 +95,7 @@ int MPI_Type_free_keyval(int *type_keyval) keyval_ptr->was_freed = 1; MPIR_Keyval_release_ref( keyval_ptr, &in_use); if (!in_use) { - MPIU_Handle_obj_free( &MPID_Keyval_mem, keyval_ptr ); + MPIU_Handle_obj_free( &MPIR_Keyval_mem, keyval_ptr ); } } *type_keyval = MPI_KEYVAL_INVALID; diff --git a/src/mpi/attr/type_set_attr.c b/src/mpi/attr/type_set_attr.c index 0273f50..d5b1881 100644 --- a/src/mpi/attr/type_set_attr.c +++ b/src/mpi/attr/type_set_attr.c @@ -34,7 +34,7 @@ int MPIR_TypeSetAttr(MPI_Datatype datatype, int type_keyval, void *attribute_val static const char FCNAME[] = "MPIR_TypeSetAttr"; int mpi_errno = MPI_SUCCESS; MPID_Datatype *type_ptr = NULL; - MPID_Keyval *keyval_ptr = NULL; + MPIR_Keyval *keyval_ptr = NULL; MPIR_Attribute *p, **old_p; MPID_MPI_STATE_DECL(MPID_STATE_MPIR_TYPE_SET_ATTR); @@ -60,7 +60,7 @@ int MPIR_TypeSetAttr(MPI_Datatype datatype, int type_keyval, void *attribute_val /* Convert MPI object handles to object pointers */ MPID_Datatype_get_ptr( datatype, type_ptr ); - MPID_Keyval_get_ptr( type_keyval, keyval_ptr ); + MPIR_Keyval_get_ptr( type_keyval, keyval_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -71,7 +71,7 @@ int MPIR_TypeSetAttr(MPI_Datatype datatype, int type_keyval, void *attribute_val MPID_Datatype_valid_ptr( type_ptr, mpi_errno ); /* If type_ptr is not valid, it will be reset to null */ /* Validate keyval_ptr */ - MPID_Keyval_valid_ptr( keyval_ptr, mpi_errno ); + MPIR_Keyval_valid_ptr( keyval_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; } MPID_END_ERROR_CHECKS; diff --git a/src/mpi/attr/win_create_keyval.c b/src/mpi/attr/win_create_keyval.c index 4c3d6aa..cbb5c09 100644 --- a/src/mpi/attr/win_create_keyval.c +++ b/src/mpi/attr/win_create_keyval.c @@ -76,7 +76,7 @@ int MPI_Win_create_keyval(MPI_Win_copy_attr_function *win_copy_attr_fn, { static const char FCNAME[] = "MPI_Win_create_keyval"; int mpi_errno = MPI_SUCCESS; - MPID_Keyval *keyval_ptr; + MPIR_Keyval *keyval_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_CREATE_KEYVAL); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -97,9 +97,9 @@ int MPI_Win_create_keyval(MPI_Win_copy_attr_function *win_copy_attr_fn, /* ... body of routine ... */ - keyval_ptr = (MPID_Keyval *)MPIU_Handle_obj_alloc( &MPID_Keyval_mem ); + keyval_ptr = (MPIR_Keyval *)MPIU_Handle_obj_alloc( &MPIR_Keyval_mem ); MPIR_ERR_CHKANDJUMP1(!keyval_ptr,mpi_errno,MPI_ERR_OTHER,"**nomem", - "**nomem %s", "MPID_Keyval" ); + "**nomem %s", "MPIR_Keyval" ); /* Initialize the attribute dup function */ if (!MPIR_Process.attr_dup) { MPIR_Process.attr_dup = MPIR_Attr_dup_list; diff --git a/src/mpi/attr/win_delete_attr.c b/src/mpi/attr/win_delete_attr.c index cce18d2..caf1211 100644 --- a/src/mpi/attr/win_delete_attr.c +++ b/src/mpi/attr/win_delete_attr.c @@ -55,7 +55,7 @@ int MPI_Win_delete_attr(MPI_Win win, int win_keyval) int mpi_errno = MPI_SUCCESS; MPIR_Win *win_ptr = NULL; MPIR_Attribute *p, **old_p; - MPID_Keyval *keyval_ptr=0; + MPIR_Keyval *keyval_ptr=0; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_DELETE_ATTR); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -80,7 +80,7 @@ int MPI_Win_delete_attr(MPI_Win win, int win_keyval) /* Convert MPI object handles to object pointers */ MPIR_Win_get_ptr( win, win_ptr ); - MPID_Keyval_get_ptr( win_keyval, keyval_ptr ); + MPIR_Keyval_get_ptr( win_keyval, keyval_ptr ); # ifdef HAVE_ERROR_CHECKING { @@ -90,7 +90,7 @@ int MPI_Win_delete_attr(MPI_Win win, int win_keyval) MPIR_Win_valid_ptr( win_ptr, mpi_errno ); /* If win_ptr is not valid, it will be reset to null */ /* Validate keyval_ptr */ - MPID_Keyval_valid_ptr( keyval_ptr, mpi_errno ); + MPIR_Keyval_valid_ptr( keyval_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; } MPID_END_ERROR_CHECKS; @@ -131,7 +131,7 @@ int MPI_Win_delete_attr(MPI_Win win, int win_keyval) MPIR_Keyval_release_ref( p->keyval, &in_use); if (!in_use) { - MPIU_Handle_obj_free( &MPID_Keyval_mem, p->keyval ); + MPIU_Handle_obj_free( &MPIR_Keyval_mem, p->keyval ); } MPID_Attr_free(p); } diff --git a/src/mpi/attr/win_free_keyval.c b/src/mpi/attr/win_free_keyval.c index bacbb7d..18d8e18 100644 --- a/src/mpi/attr/win_free_keyval.c +++ b/src/mpi/attr/win_free_keyval.c @@ -53,7 +53,7 @@ int MPI_Win_free_keyval(int *win_keyval) static const char FCNAME[] = "MPI_Win_free_keyval"; #endif int mpi_errno = MPI_SUCCESS; - MPID_Keyval *keyval_ptr = NULL; + MPIR_Keyval *keyval_ptr = NULL; int in_use; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_FREE_KEYVAL); @@ -76,14 +76,14 @@ int MPI_Win_free_keyval(int *win_keyval) # endif /* Convert MPI object handles to object pointers */ - MPID_Keyval_get_ptr( *win_keyval, keyval_ptr ); + MPIR_Keyval_get_ptr( *win_keyval, keyval_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS; { - MPID_Keyval_valid_ptr( keyval_ptr, mpi_errno ); + MPIR_Keyval_valid_ptr( keyval_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; } MPID_END_ERROR_CHECKS; @@ -96,7 +96,7 @@ int MPI_Win_free_keyval(int *win_keyval) keyval_ptr->was_freed = 1; MPIR_Keyval_release_ref( keyval_ptr, &in_use); if (!in_use) { - MPIU_Handle_obj_free( &MPID_Keyval_mem, keyval_ptr ); + MPIU_Handle_obj_free( &MPIR_Keyval_mem, keyval_ptr ); } } *win_keyval = MPI_KEYVAL_INVALID; diff --git a/src/mpi/attr/win_set_attr.c b/src/mpi/attr/win_set_attr.c index e4dc183..bcfdbcb 100644 --- a/src/mpi/attr/win_set_attr.c +++ b/src/mpi/attr/win_set_attr.c @@ -34,7 +34,7 @@ int MPIR_WinSetAttr( MPI_Win win, int win_keyval, void *attribute_val, static const char FCNAME[] = "MPI_Win_set_attr"; int mpi_errno = MPI_SUCCESS; MPIR_Win *win_ptr = NULL; - MPID_Keyval *keyval_ptr = NULL; + MPIR_Keyval *keyval_ptr = NULL; MPIR_Attribute *p, **old_p; MPID_MPI_STATE_DECL(MPID_STATE_MPIR_WIN_SET_ATTR); @@ -60,7 +60,7 @@ int MPIR_WinSetAttr( MPI_Win win, int win_keyval, void *attribute_val, /* Convert MPI object handles to object pointers */ MPIR_Win_get_ptr( win, win_ptr ); - MPID_Keyval_get_ptr( win_keyval, keyval_ptr ); + MPIR_Keyval_get_ptr( win_keyval, keyval_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -71,7 +71,7 @@ int MPIR_WinSetAttr( MPI_Win win, int win_keyval, void *attribute_val, MPIR_Win_valid_ptr( win_ptr, mpi_errno ); /* If win_ptr is not valid, it will be reset to null */ /* Validate keyval */ - MPID_Keyval_valid_ptr( keyval_ptr, mpi_errno ); + MPIR_Keyval_valid_ptr( keyval_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; } MPID_END_ERROR_CHECKS; http://git.mpich.org/mpich.git/commitdiff/97591cb606b6baa764a2b461e68b72e8f… commit 97591cb606b6baa764a2b461e68b72e8f6c6ee28 Author: Wesley Bland <wesley.bland(a)intel.com> Date: Mon Apr 18 17:36:58 2016 -0500 Rename MPID_Grequest stuff to MPIR_Grequest stuff Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index 0212006..e4dff7a 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -405,7 +405,7 @@ void MPIR_DatatypeAttrFinalize( void ); #define MPIR_Info_get_ptr(a,ptr) MPID_Getb_ptr(Info,a,0x03ffffff,ptr) #define MPIR_Win_get_ptr(a,ptr) MPID_Get_ptr(Win,a,ptr) #define MPID_Request_get_ptr(a,ptr) MPID_Get_ptr(Request,a,ptr) -#define MPID_Grequest_class_get_ptr(a,ptr) MPID_Get_ptr(Grequest_class,a,ptr) +#define MPIR_Grequest_class_get_ptr(a,ptr) MPID_Get_ptr(Grequest_class,a,ptr) /* Keyvals have a special format. This is roughly MPID_Get_ptrb, but the handle index is in a smaller bit field. In addition, there is no storage for the builtin keyvals. @@ -1470,7 +1470,7 @@ typedef void (MPIR_Grequest_f77_query_function)(void *, MPI_Fint *, MPI_Fint *); /* vtable-ish structure holding generalized request function pointers and other * state. Saves ~48 bytes in pt2pt requests on many platforms. */ -struct MPID_Grequest_fns { +struct MPIR_Grequest_fns { MPI_Grequest_cancel_function *cancel_fn; MPI_Grequest_free_function *free_fn; MPI_Grequest_query_function *query_fn; @@ -1520,7 +1520,7 @@ typedef struct MPID_Request { /* User-defined request support via a "vtable". Saves space in the already * bloated request for regular pt2pt and NBC requests. */ - struct MPID_Grequest_fns *greq_fns; + struct MPIR_Grequest_fns *greq_fns; struct MPIR_Sendq *dbg_next; @@ -3538,15 +3538,15 @@ void MPID_Request_release(MPID_Request *); @*/ int MPID_Request_complete(MPID_Request *); -typedef struct MPID_Grequest_class { +typedef struct MPIR_Grequest_class { MPIU_OBJECT_HEADER; /* adds handle and ref_count fields */ MPI_Grequest_query_function *query_fn; MPI_Grequest_free_function *free_fn; MPI_Grequest_cancel_function *cancel_fn; MPIX_Grequest_poll_function *poll_fn; MPIX_Grequest_wait_function *wait_fn; - struct MPID_Grequest_class *next; -} MPID_Grequest_class; + struct MPIR_Grequest_class *next; +} MPIR_Grequest_class; /* Interfaces exposed by MPI_T */ diff --git a/src/mpi/pt2pt/greq_start.c b/src/mpi/pt2pt/greq_start.c index 8f42781..85696df 100644 --- a/src/mpi/pt2pt/greq_start.c +++ b/src/mpi/pt2pt/greq_start.c @@ -34,11 +34,11 @@ PMPI_LOCAL int MPIR_Grequest_free_classes_on_finalize(void *extra_data); #define MPID_GREQ_CLASS_PREALLOC 2 #endif -MPID_Grequest_class MPID_Grequest_class_direct[MPID_GREQ_CLASS_PREALLOC] = +MPIR_Grequest_class MPIR_Grequest_class_direct[MPID_GREQ_CLASS_PREALLOC] = { {0} }; -MPIU_Object_alloc_t MPID_Grequest_class_mem = {0, 0, 0, 0, MPID_GREQ_CLASS, - sizeof(MPID_Grequest_class), - MPID_Grequest_class_direct, +MPIU_Object_alloc_t MPIR_Grequest_class_mem = {0, 0, 0, 0, MPID_GREQ_CLASS, + sizeof(MPIR_Grequest_class), + MPIR_Grequest_class_direct, MPID_GREQ_CLASS_PREALLOC, }; /* We jump through some minor hoops to manage the list of classes ourselves and @@ -47,7 +47,7 @@ MPIU_Object_alloc_t MPID_Grequest_class_mem = {0, 0, 0, 0, MPID_GREQ_CLASS, * is a good candidate for registering one callback per greq class and trimming * some of this logic. */ int MPIR_Grequest_registered_finalizer = 0; -MPID_Grequest_class *MPIR_Grequest_class_list = NULL; +MPIR_Grequest_class *MPIR_Grequest_class_list = NULL; /* Any internal routines can go here. Make them static if possible. If they are used by both the MPI and PMPI versions, use PMPI_LOCAL instead of @@ -56,15 +56,15 @@ MPID_Grequest_class *MPIR_Grequest_class_list = NULL; PMPI_LOCAL int MPIR_Grequest_free_classes_on_finalize(void *extra_data ATTRIBUTE((unused))) { int mpi_errno = MPI_SUCCESS; - MPID_Grequest_class *last = NULL; - MPID_Grequest_class *cur = MPIR_Grequest_class_list; + MPIR_Grequest_class *last = NULL; + MPIR_Grequest_class *cur = MPIR_Grequest_class_list; /* FIXME MT this function is not thread safe when using fine-grained threading */ MPIR_Grequest_class_list = NULL; while (cur) { last = cur; cur = last->next; - MPIU_Handle_obj_free(&MPID_Grequest_class_mem, last); + MPIU_Handle_obj_free(&MPIR_Grequest_class_mem, last); } return mpi_errno; @@ -93,7 +93,7 @@ int MPIR_Grequest_start_impl(MPI_Grequest_query_function *query_fn, MPIR_cc_set((*request_ptr)->cc_ptr, 1); (*request_ptr)->comm = NULL; (*request_ptr)->greq_fns = NULL; - MPIU_CHKPMEM_MALLOC((*request_ptr)->greq_fns, struct MPID_Grequest_fns *, sizeof(struct MPID_Grequest_fns), mpi_errno, "greq_fns"); + MPIU_CHKPMEM_MALLOC((*request_ptr)->greq_fns, struct MPIR_Grequest_fns *, sizeof(struct MPIR_Grequest_fns), mpi_errno, "greq_fns"); (*request_ptr)->greq_fns->cancel_fn = cancel_fn; (*request_ptr)->greq_fns->free_fn = free_fn; (*request_ptr)->greq_fns->query_fn = query_fn; @@ -117,10 +117,10 @@ int MPIR_Grequest_start_impl(MPI_Grequest_query_function *query_fn, #else -extern MPID_Grequest_class MPID_Grequest_class_direct[]; -extern MPIU_Object_alloc_t MPID_Grequest_class_mem; +extern MPIR_Grequest_class MPIR_Grequest_class_direct[]; +extern MPIU_Object_alloc_t MPIR_Grequest_class_mem; extern int MPIR_Grequest_registered_finalizer; -extern MPID_Grequest_class *MPIR_Grequest_class_list; +extern MPIR_Grequest_class *MPIR_Grequest_class_list; #endif #undef FUNCNAME @@ -264,11 +264,11 @@ int MPIX_Grequest_class_create(MPI_Grequest_query_function *query_fn, MPIX_Grequest_wait_function *wait_fn, MPIX_Grequest_class *greq_class) { - MPID_Grequest_class *class_ptr; + MPIR_Grequest_class *class_ptr; int mpi_errno = MPI_SUCCESS; - class_ptr = (MPID_Grequest_class *) - MPIU_Handle_obj_alloc(&MPID_Grequest_class_mem); + class_ptr = (MPIR_Grequest_class *) + MPIU_Handle_obj_alloc(&MPIR_Grequest_class_mem); /* --BEGIN ERROR HANDLING-- */ if (!class_ptr) { @@ -353,10 +353,10 @@ int MPIX_Grequest_class_allocate(MPIX_Grequest_class greq_class, { int mpi_errno; MPID_Request *lrequest_ptr; - MPID_Grequest_class *class_ptr; + MPIR_Grequest_class *class_ptr; *request = MPI_REQUEST_NULL; - MPID_Grequest_class_get_ptr(greq_class, class_ptr); + MPIR_Grequest_class_get_ptr(greq_class, class_ptr); mpi_errno = MPIR_Grequest_start_impl(class_ptr->query_fn, class_ptr->free_fn, class_ptr->cancel_fn, extra_state, &lrequest_ptr); http://git.mpich.org/mpich.git/commitdiff/0da7aa4adc6af2771e03a1f9fa0cdf09c… commit 0da7aa4adc6af2771e03a1f9fa0cdf09c89990d5 Author: Wesley Bland <wesley.bland(a)intel.com> Date: Mon Apr 18 17:35:46 2016 -0500 Rename MPID_Delete_function to MPIR_Delete_function Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index 92c236b..0212006 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -708,7 +708,7 @@ extern MPIR_Errhandler MPIR_Errhandler_direct[]; Unfortunately, these have a slightly different calling sequence for each language, particularly when the size of a pointer is different from the size of a Fortran integer. The unions - 'MPIR_Copy_function' and 'MPID_Delete_function' capture the differences + 'MPIR_Copy_function' and 'MPIR_Delete_function' capture the differences in a single union type. The above comment is out of date but has never been updated as it should @@ -850,7 +850,7 @@ typedef struct MPIR_Copy_function { } MPIR_Copy_function; /*E - MPID_Delete_function - MPID Structure to hold an attribute delete function + MPIR_Delete_function - MPID Structure to hold an attribute delete function Notes: The appropriate element of this union is selected by using the language @@ -878,7 +878,7 @@ MPIR_Attr_delete_c_proxy( void* extra_state ); -typedef struct MPID_Delete_function { +typedef struct MPIR_Delete_function { int (*C_DeleteFunction) ( int, int, void *, void * ); void (*F77_DeleteFunction)( MPI_Fint *, MPI_Fint *, MPI_Fint *, MPI_Fint *, MPI_Fint * ); @@ -890,7 +890,7 @@ typedef struct MPID_Delete_function { */ MPI_Comm_delete_attr_function *user_function; MPID_Attr_delete_proxy *proxy; -} MPID_Delete_function; +} MPIR_Delete_function; /*S MPID_Keyval - Structure of an MPID keyval @@ -905,7 +905,7 @@ typedef struct MPID_Keyval { int was_freed; void *extra_state; MPIR_Copy_function copyfn; - MPID_Delete_function delfn; + MPIR_Delete_function delfn; /* other, device-specific information */ #ifdef MPID_DEV_KEYVAL_DECL MPID_DEV_KEYVAL_DECL http://git.mpich.org/mpich.git/commitdiff/6f61e8c0a7fb6eca45d09ec20775419b9… commit 6f61e8c0a7fb6eca45d09ec20775419b9577f1c6 Author: Wesley Bland <wesley.bland(a)intel.com> Date: Mon Apr 18 17:34:08 2016 -0500 Rename MPID_Copy_function to MPIR_Copy_function Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index 796bb80..92c236b 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -708,7 +708,7 @@ extern MPIR_Errhandler MPIR_Errhandler_direct[]; Unfortunately, these have a slightly different calling sequence for each language, particularly when the size of a pointer is different from the size of a Fortran integer. The unions - 'MPID_Copy_function' and 'MPID_Delete_function' capture the differences + 'MPIR_Copy_function' and 'MPID_Delete_function' capture the differences in a single union type. The above comment is out of date but has never been updated as it should @@ -804,7 +804,7 @@ extern MPIR_Errhandler MPIR_Errhandler_direct[]; only store generic copy and delete functions. This allows us to use common code for the attribute set, delete, and dup functions */ /*E - MPID_Copy_function - MPID Structure to hold an attribute copy function + MPIR_Copy_function - MPID Structure to hold an attribute copy function Notes: The appropriate element of this union is selected by using the language @@ -834,7 +834,7 @@ MPIR_Attr_copy_c_proxy( int* flag ); -typedef struct MPID_Copy_function { +typedef struct MPIR_Copy_function { int (*C_CopyFunction)( int, int, void *, void *, void *, int * ); void (*F77_CopyFunction) ( MPI_Fint *, MPI_Fint *, MPI_Fint *, MPI_Fint *, MPI_Fint *, MPI_Fint *, MPI_Fint * ); @@ -847,7 +847,7 @@ typedef struct MPID_Copy_function { MPI_Comm_copy_attr_function *user_function; MPID_Attr_copy_proxy *proxy; /* The C++ function is the same as the C function */ -} MPID_Copy_function; +} MPIR_Copy_function; /*E MPID_Delete_function - MPID Structure to hold an attribute delete function @@ -904,7 +904,7 @@ typedef struct MPID_Keyval { MPID_Object_kind kind; int was_freed; void *extra_state; - MPID_Copy_function copyfn; + MPIR_Copy_function copyfn; MPID_Delete_function delfn; /* other, device-specific information */ #ifdef MPID_DEV_KEYVAL_DECL http://git.mpich.org/mpich.git/commitdiff/85143b2644b68b5afabe15c7be6a71c2f… commit 85143b2644b68b5afabe15c7be6a71c2f4ce0d20 Author: Wesley Bland <wesley.bland(a)intel.com> Date: Mon Apr 18 17:31:57 2016 -0500 Rename MPID_CommOps to MPIR_Commops Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index 98eb174..796bb80 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -2059,10 +2059,10 @@ typedef struct MPIR_TopoOps { /* ------------------------------------------------------------------------- */ -typedef struct MPID_CommOps { +typedef struct MPIR_Commops { int (*split_type)(MPIR_Comm *, int, int, MPIR_Info *, MPIR_Comm **); -} MPID_CommOps; -extern struct MPID_CommOps *MPID_Comm_fns; /* Communicator creation functions */ +} MPIR_Commops; +extern struct MPIR_Commops *MPID_Comm_fns; /* Communicator creation functions */ /* Per process data */ diff --git a/src/mpi/comm/commutil.c b/src/mpi/comm/commutil.c index 89d4409..7e4b7cf 100644 --- a/src/mpi/comm/commutil.c +++ b/src/mpi/comm/commutil.c @@ -34,7 +34,7 @@ MPIU_Object_alloc_t MPIR_Comm_mem = { }; /* Communicator creation functions */ -struct MPID_CommOps *MPID_Comm_fns = NULL; +struct MPIR_Commops *MPID_Comm_fns = NULL; struct MPIR_Comm_hint_fn_elt { char name[MPI_MAX_INFO_KEY]; MPIR_Comm_hint_fn_t fn; diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_init.c b/src/mpid/ch3/channels/nemesis/src/ch3_init.c index 949c23d..ce58a44 100644 --- a/src/mpid/ch3/channels/nemesis/src/ch3_init.c +++ b/src/mpid/ch3/channels/nemesis/src/ch3_init.c @@ -65,7 +65,7 @@ int MPIDI_CH3I_Shm_supported(void) return !mutex_err; } -static MPID_CommOps comm_fns = { +static MPIR_Commops comm_fns = { split_type }; diff --git a/src/mpid/pamid/src/mpid_init.c b/src/mpid/pamid/src/mpid_init.c index edbcbad..3d874cb 100644 --- a/src/mpid/pamid/src/mpid_init.c +++ b/src/mpid/pamid/src/mpid_init.c @@ -358,7 +358,7 @@ static int split_type(MPIR_Comm * comm_ptr, int stype, int key, /* --END ERROR HANDLING-- */ } -static MPID_CommOps comm_fns = { +static MPIR_Commops comm_fns = { split_type }; http://git.mpich.org/mpich.git/commitdiff/51a88997b68e28f9ec3372fba57e3f424… commit 51a88997b68e28f9ec3372fba57e3f424ef71681 Author: Wesley Bland <wesley.bland(a)intel.com> Date: Mon Apr 18 17:30:00 2016 -0500 Remove unused code about MPID_File The struct MPID_File has not existed for some time. There is no need to have dead code around which references it and isn't even compiled. Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/src/include/mpierror.h b/src/include/mpierror.h index ab30bc5..4e1836a 100644 --- a/src/include/mpierror.h +++ b/src/include/mpierror.h @@ -13,12 +13,10 @@ struct MPIR_Comm; struct MPIR_Win; -/*struct MPID_File;*/ /* Bindings for internal routines */ int MPIR_Err_return_comm( struct MPIR_Comm *, const char [], int ); int MPIR_Err_return_win( struct MPIR_Win *, const char [], int ); -/*int MPIR_Err_return_file( struct MPID_File *, const char [], int );*/ #ifdef MPI__FILE_DEFINED /* Only define if we have MPI_File */ int MPIR_Err_return_file( MPI_File, const char [], int ); /* Romio version */ diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index 1f5a900..98eb174 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -400,7 +400,6 @@ void MPIR_DatatypeAttrFinalize( void ); of inserted here as literals */ #define MPIR_Comm_get_ptr(a,ptr) MPID_Getb_ptr(Comm,a,0x03ffffff,ptr) #define MPIR_Group_get_ptr(a,ptr) MPID_Getb_ptr(Group,a,0x03ffffff,ptr) -#define MPID_File_get_ptr(a,ptr) MPID_Get_ptr(File,a,ptr) #define MPIR_Errhandler_get_ptr(a,ptr) MPID_Getb_ptr(Errhandler,a,0x3,ptr) #define MPID_Op_get_ptr(a,ptr) MPID_Getb_ptr(Op,a,0x000000ff,ptr) #define MPIR_Info_get_ptr(a,ptr) MPID_Getb_ptr(Info,a,0x03ffffff,ptr) @@ -462,7 +461,6 @@ void MPIR_DatatypeAttrFinalize( void ); #define MPIR_Win_valid_ptr(ptr,err) MPID_Valid_ptr_class(Win,ptr,MPI_ERR_WIN,err) #define MPID_Op_valid_ptr(ptr,err) MPID_Valid_ptr_class(Op,ptr,MPI_ERR_OP,err) #define MPIR_Errhandler_valid_ptr(ptr,err) MPID_Valid_ptr_class(Errhandler,ptr,MPI_ERR_ARG,err) -#define MPID_File_valid_ptr(ptr,err) MPID_Valid_ptr_class(File,ptr,MPI_ERR_FILE,err) #define MPID_Request_valid_ptr(ptr,err) MPID_Valid_ptr_class(Request,ptr,MPI_ERR_REQUEST,err) #define MPID_Keyval_valid_ptr(ptr,err) MPID_Valid_ptr_class(Keyval,ptr,MPI_ERR_KEYVAL,err) diff --git a/src/mpi/io/Makefile.mk b/src/mpi/io/Makefile.mk deleted file mode 100644 index 9fa99b8..0000000 --- a/src/mpi/io/Makefile.mk +++ /dev/null @@ -1,10 +0,0 @@ -## -*- Mode: Makefile; -*- -## vim: set ft=automake : -## -## (C) 2011 by Argonne National Laboratory. -## See COPYRIGHT in top-level directory. -## - -mpi_core_sources += \ - src/mpi/io/fileutil.c - diff --git a/src/mpi/io/fileutil.c b/src/mpi/io/fileutil.c deleted file mode 100644 index 9467084..0000000 --- a/src/mpi/io/fileutil.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ -/* - * (C) 2001 by Argonne National Laboratory. - * See COPYRIGHT in top-level directory. - */ - -#include "mpiimpl.h" - -#ifndef MPID_FILE_PREALLOC -#define MPID_FILE_PREALLOC 8 -#endif - -/* Preallocated file objects */ -MPID_File MPID_File_direct[MPID_FILE_PREALLOC] = { {0} }; -MPIU_Object_alloc_t MPID_File_mem = { 0, 0, 0, 0, MPID_FILE, - sizeof(MPID_File), MPID_File_direct, - MPID_FILE_PREALLOC}; - http://git.mpich.org/mpich.git/commitdiff/300493e0da2c63073652aff0f776142ee… commit 300493e0da2c63073652aff0f776142eed807329 Author: Wesley Bland <wesley.bland(a)intel.com> Date: Mon Apr 18 17:26:08 2016 -0500 Rename MPID_Info to MPIR_Info Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/doc/namepub/namepub.tex b/doc/namepub/namepub.tex index f62f38a..648934f 100644 --- a/doc/namepub/namepub.tex +++ b/doc/namepub/namepub.tex @@ -88,17 +88,17 @@ error code mechanism or, for external packages, use the MPI routines for adding error codes and classes. \begin{verbatim} -int MPID_NS_Create( const MPID_Info *, MPID_NS_Handle * ) -int MPID_NS_Publish( MPID_NS_Handle, const MPID_Info *, +int MPID_NS_Create( const MPIR_Info *, MPID_NS_Handle * ) +int MPID_NS_Publish( MPID_NS_Handle, const MPIR_Info *, const char service_name[], const char port[] ) -int MPID_NS_Lookup( MPID_NS_Handle, const MPID_Info *, +int MPID_NS_Lookup( MPID_NS_Handle, const MPIR_Info *, const char service_name[], char port[] ) -int MPID_NS_Unpublish( MPID_NS_Handle, const MPID_Info *, +int MPID_NS_Unpublish( MPID_NS_Handle, const MPIR_Info *, const char service_name[] ) int MPID_NS_Free( MPID_NS_Handle * ) \end{verbatim} -These calls make use of the \code{MPID_Info} pointer (a pointer to the +These calls make use of the \code{MPIR_Info} pointer (a pointer to the info object passed into the MPI name publisher routines) to provide other information that the name service may require. Predefined \code{MPI_Info} keys and values for name service are: diff --git a/maint/decode_handle b/maint/decode_handle index 181ea2a..8887171 100755 --- a/maint/decode_handle +++ b/maint/decode_handle @@ -67,7 +67,7 @@ while (scalar @ARGV) { ## MPID_FILE = 0x4, /* This is not used */ ## MPID_ERRHANDLER = 0x5, ## MPID_OP = 0x6, -## MPID_INFO = 0x7, +## MPIR_INFO = 0x7, ## MPID_WIN = 0x8, ## MPID_KEYVAL = 0x9, ## MPID_ATTR = 0xa, diff --git a/src/include/mpierrs.h b/src/include/mpierrs.h index 70ba770..d567ffe 100644 --- a/src/include/mpierrs.h +++ b/src/include/mpierrs.h @@ -479,7 +479,7 @@ cvars: } \ else \ { \ - MPIR_ERRTEST_VALID_HANDLE((info_), MPID_INFO, (err_), MPI_ERR_ARG, "**info"); \ + MPIR_ERRTEST_VALID_HANDLE((info_), MPIR_INFO, (err_), MPI_ERR_ARG, "**info"); \ } \ } @@ -487,7 +487,7 @@ cvars: { \ if ((info_) != MPI_INFO_NULL) \ { \ - MPIR_ERRTEST_VALID_HANDLE((info_), MPID_INFO, (err_), MPI_ERR_ARG, "**info"); \ + MPIR_ERRTEST_VALID_HANDLE((info_), MPIR_INFO, (err_), MPI_ERR_ARG, "**info"); \ } \ } diff --git a/src/include/mpihandlemem.h b/src/include/mpihandlemem.h index e55352a..29abfa2 100644 --- a/src/include/mpihandlemem.h +++ b/src/include/mpihandlemem.h @@ -64,7 +64,7 @@ typedef enum MPID_Object_kind { MPID_FILE = 0x4, /* only used obliquely inside MPIR_Errhandler objs */ MPID_ERRHANDLER = 0x5, MPID_OP = 0x6, - MPID_INFO = 0x7, + MPIR_INFO = 0x7, MPID_WIN = 0x8, MPID_KEYVAL = 0x9, MPID_ATTR = 0xa, diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index 1cdfdb9..1f5a900 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -403,7 +403,7 @@ void MPIR_DatatypeAttrFinalize( void ); #define MPID_File_get_ptr(a,ptr) MPID_Get_ptr(File,a,ptr) #define MPIR_Errhandler_get_ptr(a,ptr) MPID_Getb_ptr(Errhandler,a,0x3,ptr) #define MPID_Op_get_ptr(a,ptr) MPID_Getb_ptr(Op,a,0x000000ff,ptr) -#define MPID_Info_get_ptr(a,ptr) MPID_Getb_ptr(Info,a,0x03ffffff,ptr) +#define MPIR_Info_get_ptr(a,ptr) MPID_Getb_ptr(Info,a,0x03ffffff,ptr) #define MPIR_Win_get_ptr(a,ptr) MPID_Get_ptr(Win,a,ptr) #define MPID_Request_get_ptr(a,ptr) MPID_Get_ptr(Request,a,ptr) #define MPID_Grequest_class_get_ptr(a,ptr) MPID_Get_ptr(Grequest_class,a,ptr) @@ -443,7 +443,7 @@ void MPIR_DatatypeAttrFinalize( void ); {if (!(ptr)) { err = MPIR_Err_create_code( MPI_SUCCESS, MPIR_ERR_RECOVERABLE, FCNAME, __LINE__, errclass, \ "**nullptrtype", "**nullptrtype %s", #kind ); } } -#define MPID_Info_valid_ptr(ptr,err) MPID_Valid_ptr_class(Info,ptr,MPI_ERR_INFO,err) +#define MPIR_Info_valid_ptr(ptr,err) MPID_Valid_ptr_class(Info,ptr,MPI_ERR_INFO,err) /* Check not only for a null pointer but for an invalid communicator, such as one that has been freed. Let's try the ref_count as the test for now */ @@ -513,7 +513,7 @@ void MPIR_DatatypeAttrFinalize( void ); routines that want to work with the linked list may do so directly. Because the 'MPI_Info' type is a handle and not a pointer, an MPIU (utility) routine is provided to handle the - deallocation of 'MPID_Info' elements. See the implementation of + deallocation of 'MPIR_Info' elements. See the implementation of 'MPI_Info_create' for how an Info type is allocated. Thread Safety: @@ -539,7 +539,7 @@ void MPIR_DatatypeAttrFinalize( void ); T*/ /*S - MPID_Info - Structure of an MPID info + MPIR_Info - Structure of an MPID info Notes: There is no reference count because 'MPI_Info' values, unlike other MPI @@ -561,7 +561,7 @@ void MPIR_DatatypeAttrFinalize( void ); the same routines to manage this list as are used to manage the list of free objects (in the file 'src/util/mem/handlemem.c'). In particular, if lock-free routines for updating a linked list are - provided, they can be used for managing the 'MPID_Info' structure as well. + provided, they can be used for managing the 'MPIR_Info' structure as well. The MPI standard requires that keys can be no less that 32 characters and no more than 255 characters. There is no mandated limit on the size @@ -570,17 +570,17 @@ void MPIR_DatatypeAttrFinalize( void ); Module: Info-DS S*/ -typedef struct MPID_Info { +typedef struct MPIR_Info { MPIU_OBJECT_HEADER; /* adds handle and ref_count fields */ - struct MPID_Info *next; + struct MPIR_Info *next; char *key; char *value; -} MPID_Info; -extern MPIU_Object_alloc_t MPID_Info_mem; +} MPIR_Info; +extern MPIU_Object_alloc_t MPIR_Info_mem; /* Preallocated info objects */ #define MPID_INFO_N_BUILTIN 2 -extern MPID_Info MPID_Info_builtin[MPID_INFO_N_BUILTIN]; -extern MPID_Info MPID_Info_direct[]; +extern MPIR_Info MPIR_Info_builtin[MPID_INFO_N_BUILTIN]; +extern MPIR_Info MPIR_Info_direct[]; /* ------------------------------------------------------------------------- */ #if defined(MPICH_IS_THREADED) @@ -1256,7 +1256,7 @@ typedef struct MPIR_Comm { int revoked; /* Flag to track whether the communicator * has been revoked */ - MPID_Info *info; /* Hints to the communicator */ + MPIR_Info *info; /* Hints to the communicator */ #ifdef MPID_HAS_HETERO int is_hetero; @@ -1332,7 +1332,7 @@ static inline int MPIR_Comm_release(MPIR_Comm * comm_ptr) int MPIR_Comm_release_always(MPIR_Comm *comm_ptr); /* applies the specified info chain to the specified communicator */ -int MPIR_Comm_apply_hints(MPIR_Comm *comm_ptr, MPID_Info *info_ptr); +int MPIR_Comm_apply_hints(MPIR_Comm *comm_ptr, MPIR_Info *info_ptr); /* Preallocated comm objects. There are 3: comm_world, comm_self, and a private (non-user accessible) dup of comm world that is provided @@ -1747,7 +1747,7 @@ extern MPIR_Win MPIR_Win_direct[]; Module: Win @*/ -void *MPID_Alloc_mem( size_t size, MPID_Info *info ); +void *MPID_Alloc_mem( size_t size, MPIR_Info *info ); /*@ MPID_Free_mem - Frees memory allocated with 'MPID_Alloc_mem' @@ -2062,7 +2062,7 @@ typedef struct MPIR_TopoOps { typedef struct MPID_CommOps { - int (*split_type)(MPIR_Comm *, int, int, MPID_Info *, MPIR_Comm **); + int (*split_type)(MPIR_Comm *, int, int, MPIR_Info *, MPIR_Comm **); } MPID_CommOps; extern struct MPID_CommOps *MPID_Comm_fns; /* Communicator creation functions */ @@ -2639,7 +2639,7 @@ int MPID_Finalize(void); int MPID_Abort( MPIR_Comm *comm, int mpi_errno, int exit_code, const char *error_msg ); -int MPID_Open_port(MPID_Info *, char *); +int MPID_Open_port(MPIR_Info *, char *); int MPID_Close_port(const char *); /*@ @@ -2657,7 +2657,7 @@ int MPID_Close_port(const char *); Return Value: 'MPI_SUCCESS' or a valid MPI error code. @*/ -int MPID_Comm_accept(const char *, MPID_Info *, int, MPIR_Comm *, MPIR_Comm **); +int MPID_Comm_accept(const char *, MPIR_Info *, int, MPIR_Comm *, MPIR_Comm **); /*@ MPID_Comm_connect - MPID entry point for MPI_Comm_connect @@ -2674,11 +2674,11 @@ int MPID_Comm_accept(const char *, MPID_Info *, int, MPIR_Comm *, MPIR_Comm **); Return Value: 'MPI_SUCCESS' or a valid MPI error code. @*/ -int MPID_Comm_connect(const char *, MPID_Info *, int, MPIR_Comm *, MPIR_Comm **); +int MPID_Comm_connect(const char *, MPIR_Info *, int, MPIR_Comm *, MPIR_Comm **); int MPID_Comm_disconnect(MPIR_Comm *); -int MPID_Comm_spawn_multiple(int, char *[], char **[], const int [], MPID_Info* [], +int MPID_Comm_spawn_multiple(int, char *[], char **[], const int [], MPIR_Info* [], int, MPIR_Comm *, MPIR_Comm **, int []); /*@ @@ -3321,7 +3321,7 @@ MPI_Aint MPID_Aint_diff(MPI_Aint addr1, MPI_Aint addr2); /* MPI-2 RMA Routines */ -int MPID_Win_create(void *, MPI_Aint, int, MPID_Info *, MPIR_Comm *, +int MPID_Win_create(void *, MPI_Aint, int, MPIR_Info *, MPIR_Comm *, MPIR_Win **); int MPID_Win_free(MPIR_Win **); @@ -3344,17 +3344,17 @@ int MPID_Win_unlock(int dest, MPIR_Win *win_ptr); /* MPI-3 RMA Routines */ -int MPID_Win_allocate(MPI_Aint size, int disp_unit, MPID_Info *info, +int MPID_Win_allocate(MPI_Aint size, int disp_unit, MPIR_Info *info, MPIR_Comm *comm, void *baseptr, MPIR_Win **win); -int MPID_Win_allocate_shared(MPI_Aint size, int disp_unit, MPID_Info *info_ptr, MPIR_Comm *comm_ptr, +int MPID_Win_allocate_shared(MPI_Aint size, int disp_unit, MPIR_Info *info_ptr, MPIR_Comm *comm_ptr, void *base_ptr, MPIR_Win **win_ptr); int MPID_Win_shared_query(MPIR_Win *win, int rank, MPI_Aint *size, int *disp_unit, void *baseptr); -int MPID_Win_create_dynamic(MPID_Info *info, MPIR_Comm *comm, MPIR_Win **win); +int MPID_Win_create_dynamic(MPIR_Info *info, MPIR_Comm *comm, MPIR_Win **win); int MPID_Win_attach(MPIR_Win *win, void *base, MPI_Aint size); int MPID_Win_detach(MPIR_Win *win, const void *base); -int MPID_Win_get_info(MPIR_Win *win, MPID_Info **info_used); -int MPID_Win_set_info(MPIR_Win *win, MPID_Info *info); +int MPID_Win_get_info(MPIR_Win *win, MPIR_Info **info_used); +int MPID_Win_set_info(MPIR_Win *win, MPIR_Info *info); int MPID_Get_accumulate(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, void *result_addr, int result_count, @@ -4229,7 +4229,7 @@ int MPIR_Comm_init(MPIR_Comm *); void MPIU_SetTimeout( int ); /* Communicator info hint functions */ -typedef int (*MPIR_Comm_hint_fn_t)(MPIR_Comm *, MPID_Info *, void *); +typedef int (*MPIR_Comm_hint_fn_t)(MPIR_Comm *, MPIR_Info *, void *); int MPIR_Comm_register_hint(const char *hint_key, MPIR_Comm_hint_fn_t fn, void *state); #if defined(HAVE_VSNPRINTF) && defined(NEEDS_VSNPRINTF_DECL) && !defined(vsnprintf) @@ -4261,27 +4261,27 @@ int MPIR_Cart_create_impl(MPIR_Comm *comm_ptr, int ndims, const int dims[], int MPIR_Cart_map_impl(const MPIR_Comm *comm_ptr, int ndims, const int dims[], const int periodic[], int *newrank); int MPIR_Close_port_impl(const char *port_name); -int MPIR_Open_port_impl(MPID_Info *info_ptr, char *port_name); -int MPIR_Info_get_impl(MPID_Info *info_ptr, const char *key, int valuelen, char *value, int *flag); -void MPIR_Info_get_nkeys_impl(MPID_Info *info_ptr, int *nkeys); -int MPIR_Info_get_nthkey_impl(MPID_Info *info, int n, char *key); -void MPIR_Info_get_valuelen_impl(MPID_Info *info_ptr, const char *key, int *valuelen, int *flag); -int MPIR_Info_set_impl(MPID_Info *info_ptr, const char *key, const char *value); -int MPIR_Info_dup_impl(MPID_Info *info_ptr, MPID_Info **new_info_ptr); +int MPIR_Open_port_impl(MPIR_Info *info_ptr, char *port_name); +int MPIR_Info_get_impl(MPIR_Info *info_ptr, const char *key, int valuelen, char *value, int *flag); +void MPIR_Info_get_nkeys_impl(MPIR_Info *info_ptr, int *nkeys); +int MPIR_Info_get_nthkey_impl(MPIR_Info *info, int n, char *key); +void MPIR_Info_get_valuelen_impl(MPIR_Info *info_ptr, const char *key, int *valuelen, int *flag); +int MPIR_Info_set_impl(MPIR_Info *info_ptr, const char *key, const char *value); +int MPIR_Info_dup_impl(MPIR_Info *info_ptr, MPIR_Info **new_info_ptr); int MPIR_Comm_delete_attr_impl(MPIR_Comm *comm_ptr, MPID_Keyval *keyval_ptr); int MPIR_Comm_create_keyval_impl(MPI_Comm_copy_attr_function *comm_copy_attr_fn, MPI_Comm_delete_attr_function *comm_delete_attr_fn, int *comm_keyval, void *extra_state); -int MPIR_Comm_accept_impl(const char * port_name, MPID_Info * info_ptr, int root, +int MPIR_Comm_accept_impl(const char * port_name, MPIR_Info * info_ptr, int root, MPIR_Comm * comm_ptr, MPIR_Comm ** newcomm_ptr); -int MPIR_Comm_connect_impl(const char * port_name, MPID_Info * info_ptr, int root, +int MPIR_Comm_connect_impl(const char * port_name, MPIR_Info * info_ptr, int root, MPIR_Comm * comm_ptr, MPIR_Comm ** newcomm_ptr); int MPIR_Comm_create_errhandler_impl(MPI_Comm_errhandler_function *function, MPI_Errhandler *errhandler); int MPIR_Comm_dup_impl(MPIR_Comm *comm_ptr, MPIR_Comm **newcomm_ptr); -int MPIR_Comm_dup_with_info_impl(MPIR_Comm *comm_ptr, MPID_Info *info_ptr, MPIR_Comm **newcomm_ptr); -int MPIR_Comm_get_info_impl(MPIR_Comm *comm_ptr, MPID_Info **info_ptr); -int MPIR_Comm_set_info_impl(MPIR_Comm *comm_ptr, MPID_Info *info_ptr); +int MPIR_Comm_dup_with_info_impl(MPIR_Comm *comm_ptr, MPIR_Info *info_ptr, MPIR_Comm **newcomm_ptr); +int MPIR_Comm_get_info_impl(MPIR_Comm *comm_ptr, MPIR_Info **info_ptr); +int MPIR_Comm_set_info_impl(MPIR_Comm *comm_ptr, MPIR_Info *info_ptr); int MPIR_Comm_free_impl(MPIR_Comm * comm_ptr); void MPIR_Comm_free_keyval_impl(int keyval); void MPIR_Comm_get_errhandler_impl(MPIR_Comm *comm_ptr, MPIR_Errhandler **errhandler_ptr); @@ -4296,7 +4296,7 @@ int MPIR_Comm_remote_group_impl(MPIR_Comm *comm_ptr, MPIR_Group **group_ptr); int MPIR_Comm_group_failed_impl(MPIR_Comm *comm, MPIR_Group **failed_group_ptr); int MPIR_Comm_remote_group_failed_impl(MPIR_Comm *comm, MPIR_Group **failed_group_ptr); int MPIR_Comm_split_impl(MPIR_Comm *comm_ptr, int color, int key, MPIR_Comm **newcomm_ptr); -int MPIR_Comm_split_type_impl(MPIR_Comm *comm_ptr, int split_type, int key, MPID_Info *info_ptr, +int MPIR_Comm_split_type_impl(MPIR_Comm *comm_ptr, int split_type, int key, MPIR_Info *info_ptr, MPIR_Comm **newcomm_ptr); int MPIR_Group_compare_impl(MPIR_Group *group_ptr1, MPIR_Group *group_ptr2, int *result); int MPIR_Group_difference_impl(MPIR_Group *group_ptr1, MPIR_Group *group_ptr2, MPIR_Group **new_group_ptr); diff --git a/src/include/mpiinfo.h b/src/include/mpiinfo.h index 7fb3259..ebdc6c4 100644 --- a/src/include/mpiinfo.h +++ b/src/include/mpiinfo.h @@ -3,5 +3,5 @@ * (C) 2001 by Argonne National Laboratory. * See COPYRIGHT in top-level directory. */ -extern void MPIU_Info_free( MPID_Info *info_ptr ); -extern int MPIU_Info_alloc(MPID_Info **info_p_p); +extern void MPIU_Info_free( MPIR_Info *info_ptr ); +extern int MPIU_Info_alloc(MPIR_Info **info_p_p); diff --git a/src/include/pmi2.h b/src/include/pmi2.h index 6e41663..9283ce0 100644 --- a/src/include/pmi2.h +++ b/src/include/pmi2.h @@ -102,7 +102,7 @@ typedef struct PMI2_Connect_comm { int isMaster; } PMI2_Connect_comm_t; -struct MPID_Info; +struct MPIR_Info; /*@ PMI2_Init - initialize the Process Manager Interface @@ -200,9 +200,9 @@ int PMI2_Job_Spawn(int count, const char * cmds[], int argcs[], const char ** argvs[], const int maxprocs[], const int info_keyval_sizes[], - const struct MPID_Info *info_keyval_vectors[], + const struct MPIR_Info *info_keyval_vectors[], int preput_keyval_size, - const struct MPID_Info *preput_keyval_vector[], + const struct MPIR_Info *preput_keyval_vector[], char jobId[], int jobIdSize, int errors[]); @@ -508,7 +508,7 @@ int PMI2_Info_GetJobAttrIntArray(const char name[], int array[], int arraylen, i Returns 'MPI_SUCCESS' on success and an MPI error code on failure. @*/ -int PMI2_Nameserv_publish(const char service_name[], const struct MPID_Info *info_ptr, const char port[]); +int PMI2_Nameserv_publish(const char service_name[], const struct MPIR_Info *info_ptr, const char port[]); /*@ PMI2_Nameserv_lookup - lookup a service by name @@ -525,7 +525,7 @@ int PMI2_Nameserv_publish(const char service_name[], const struct MPID_Info *inf Returns 'MPI_SUCCESS' on success and an MPI error code on failure. @*/ -int PMI2_Nameserv_lookup(const char service_name[], const struct MPID_Info *info_ptr, +int PMI2_Nameserv_lookup(const char service_name[], const struct MPIR_Info *info_ptr, char port[], int portLen); /*@ PMI2_Nameserv_unpublish - unpublish a name @@ -539,7 +539,7 @@ int PMI2_Nameserv_lookup(const char service_name[], const struct MPID_Info *info @*/ int PMI2_Nameserv_unpublish(const char service_name[], - const struct MPID_Info *info_ptr); + const struct MPIR_Info *info_ptr); diff --git a/src/mpi/comm/comm_dup_with_info.c b/src/mpi/comm/comm_dup_with_info.c index f5835d2..647c57a 100644 --- a/src/mpi/comm/comm_dup_with_info.c +++ b/src/mpi/comm/comm_dup_with_info.c @@ -30,7 +30,7 @@ int MPI_Comm_dup_with_info(MPI_Comm comm, MPI_Info info, MPI_Comm *newcomm) __at #define FUNCNAME MPIR_Comm_dup_with_info_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Comm_dup_with_info_impl(MPIR_Comm * comm_ptr, MPID_Info * info_ptr, +int MPIR_Comm_dup_with_info_impl(MPIR_Comm * comm_ptr, MPIR_Info * info_ptr, MPIR_Comm ** newcomm_p_p) { int mpi_errno = MPI_SUCCESS; @@ -89,7 +89,7 @@ int MPI_Comm_dup_with_info(MPI_Comm comm, MPI_Info info, MPI_Comm * newcomm) { int mpi_errno = MPI_SUCCESS; MPIR_Comm *comm_ptr = NULL, *newcomm_ptr; - MPID_Info *info_ptr = NULL; + MPIR_Info *info_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_DUP_WITH_INFO); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -110,7 +110,7 @@ int MPI_Comm_dup_with_info(MPI_Comm comm, MPI_Info info, MPI_Comm * newcomm) /* Convert MPI object handles to object pointers */ MPIR_Comm_get_ptr(comm, comm_ptr); - MPID_Info_get_ptr(info, info_ptr); + MPIR_Info_get_ptr(info, info_ptr); /* Validate parameters and objects (post conversion) */ #ifdef HAVE_ERROR_CHECKING diff --git a/src/mpi/comm/comm_get_info.c b/src/mpi/comm/comm_get_info.c index 9ed9297..aa0d017 100644 --- a/src/mpi/comm/comm_get_info.c +++ b/src/mpi/comm/comm_get_info.c @@ -30,7 +30,7 @@ int MPI_Comm_get_info(MPI_Comm comm, MPI_Info *info) __attribute__((weak,alias(" #define FUNCNAME MPIR_Comm_get_info_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Comm_get_info_impl(MPIR_Comm * comm_ptr, MPID_Info ** info_p_p) +int MPIR_Comm_get_info_impl(MPIR_Comm * comm_ptr, MPIR_Info ** info_p_p) { int mpi_errno = MPI_SUCCESS; @@ -79,7 +79,7 @@ int MPI_Comm_get_info(MPI_Comm comm, MPI_Info * info_used) { int mpi_errno = MPI_SUCCESS; MPIR_Comm *comm_ptr = NULL; - MPID_Info *info_used_ptr = NULL; + MPIR_Info *info_used_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_GET_INFO); MPIR_ERRTEST_INITIALIZED_ORDIE(); diff --git a/src/mpi/comm/comm_set_info.c b/src/mpi/comm/comm_set_info.c index 7a8f0d0..0d0250b 100644 --- a/src/mpi/comm/comm_set_info.c +++ b/src/mpi/comm/comm_set_info.c @@ -31,10 +31,10 @@ int MPI_Comm_set_info(MPI_Comm comm, MPI_Info info) __attribute__((weak,alias("P #define FUNCNAME MPIR_Comm_set_info_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Comm_set_info_impl(MPIR_Comm * comm_ptr, MPID_Info * info_ptr) +int MPIR_Comm_set_info_impl(MPIR_Comm * comm_ptr, MPIR_Info * info_ptr) { int mpi_errno = MPI_SUCCESS; - MPID_Info *curr_info = NULL; + MPIR_Info *curr_info = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPIR_COMM_SET_INFO_IMPL); MPID_MPI_FUNC_ENTER(MPID_STATE_MPIR_COMM_SET_INFO_IMPL); @@ -99,7 +99,7 @@ int MPI_Comm_set_info(MPI_Comm comm, MPI_Info info) { int mpi_errno = MPI_SUCCESS; MPIR_Comm *comm_ptr = NULL; - MPID_Info *info_ptr = NULL; + MPIR_Info *info_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_SET_INFO); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -120,7 +120,7 @@ int MPI_Comm_set_info(MPI_Comm comm, MPI_Info info) /* Convert MPI object handles to object pointers */ MPIR_Comm_get_ptr(comm, comm_ptr); - MPID_Info_get_ptr(info, info_ptr); + MPIR_Info_get_ptr(info, info_ptr); /* Validate parameters and objects (post conversion) */ #ifdef HAVE_ERROR_CHECKING diff --git a/src/mpi/comm/comm_split_type.c b/src/mpi/comm/comm_split_type.c index d5bab5b..db2aeb7 100644 --- a/src/mpi/comm/comm_split_type.c +++ b/src/mpi/comm/comm_split_type.c @@ -31,7 +31,7 @@ int MPI_Comm_split_type(MPI_Comm comm, int split_type, int key, MPI_Info info, M #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Comm_split_type_impl(MPIR_Comm * comm_ptr, int split_type, int key, - MPID_Info * info_ptr, MPIR_Comm ** newcomm_ptr) + MPIR_Info * info_ptr, MPIR_Comm ** newcomm_ptr) { int mpi_errno = MPI_SUCCESS; @@ -136,7 +136,7 @@ int MPI_Comm_split_type(MPI_Comm comm, int split_type, int key, MPI_Info info, { int mpi_errno = MPI_SUCCESS; MPIR_Comm *comm_ptr = NULL, *newcomm_ptr; - MPID_Info *info_ptr = NULL; + MPIR_Info *info_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_SPLIT_TYPE); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -158,7 +158,7 @@ int MPI_Comm_split_type(MPI_Comm comm, int split_type, int key, MPI_Info info, /* Get handles to MPI objects. */ MPIR_Comm_get_ptr(comm, comm_ptr); - MPID_Info_get_ptr(info, info_ptr); + MPIR_Info_get_ptr(info, info_ptr); /* Validate parameters and objects (post conversion) */ #ifdef HAVE_ERROR_CHECKING diff --git a/src/mpi/comm/commutil.c b/src/mpi/comm/commutil.c index 20b55a0..89d4409 100644 --- a/src/mpi/comm/commutil.c +++ b/src/mpi/comm/commutil.c @@ -1070,10 +1070,10 @@ int MPIR_Comm_release_always(MPIR_Comm * comm_ptr) #define FUNCNAME MPIR_Comm_apply_hints #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Comm_apply_hints(MPIR_Comm * comm_ptr, MPID_Info * info_ptr) +int MPIR_Comm_apply_hints(MPIR_Comm * comm_ptr, MPIR_Info * info_ptr) { int mpi_errno = MPI_SUCCESS; - MPID_Info *hint = NULL; + MPIR_Info *hint = NULL; char hint_name[MPI_MAX_INFO_KEY] = { 0 }; struct MPIR_Comm_hint_fn_elt *hint_fn = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPIR_COMM_APPLY_HINTS); diff --git a/src/mpi/info/info_create.c b/src/mpi/info/info_create.c index 8a9d9cd..a36da96 100644 --- a/src/mpi/info/info_create.c +++ b/src/mpi/info/info_create.c @@ -45,7 +45,7 @@ Output Parameters: @*/ int MPI_Info_create( MPI_Info *info ) { - MPID_Info *info_ptr; + MPIR_Info *info_ptr; static const char FCNAME[] = "MPI_Info_create"; int mpi_errno = MPI_SUCCESS; MPID_MPI_STATE_DECL(MPID_STATE_MPI_INFO_CREATE); diff --git a/src/mpi/info/info_delete.c b/src/mpi/info/info_delete.c index b2fde73..623a1f8 100644 --- a/src/mpi/info/info_delete.c +++ b/src/mpi/info/info_delete.c @@ -47,7 +47,7 @@ int MPI_Info_delete( MPI_Info info, const char *key ) { static const char FCNAME[] = "MPI_Info_delete"; int mpi_errno = MPI_SUCCESS; - MPID_Info *info_ptr=0, *prev_ptr, *curr_ptr; + MPIR_Info *info_ptr=0, *prev_ptr, *curr_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPI_INFO_DELETE); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -68,7 +68,7 @@ int MPI_Info_delete( MPI_Info info, const char *key ) # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Info_get_ptr( info, info_ptr ); + MPIR_Info_get_ptr( info, info_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -78,7 +78,7 @@ int MPI_Info_delete( MPI_Info info, const char *key ) int keylen; /* Validate info_ptr */ - MPID_Info_valid_ptr( info_ptr, mpi_errno ); + MPIR_Info_valid_ptr( info_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; /* Check key */ @@ -101,7 +101,7 @@ int MPI_Info_delete( MPI_Info info, const char *key ) MPL_free(curr_ptr->key); MPL_free(curr_ptr->value); prev_ptr->next = curr_ptr->next; - MPIU_Handle_obj_free( &MPID_Info_mem, curr_ptr ); + MPIU_Handle_obj_free( &MPIR_Info_mem, curr_ptr ); break; } prev_ptr = curr_ptr; diff --git a/src/mpi/info/info_dup.c b/src/mpi/info/info_dup.c index 3e92ef1..3cd4b54 100644 --- a/src/mpi/info/info_dup.c +++ b/src/mpi/info/info_dup.c @@ -31,10 +31,10 @@ int MPI_Info_dup(MPI_Info info, MPI_Info *newinfo) __attribute__((weak,alias("PM #define FUNCNAME MPIR_Info_dup_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Info_dup_impl(MPID_Info *info_ptr, MPID_Info **new_info_ptr) +int MPIR_Info_dup_impl(MPIR_Info *info_ptr, MPIR_Info **new_info_ptr) { int mpi_errno = MPI_SUCCESS; - MPID_Info *curr_old, *curr_new; + MPIR_Info *curr_old, *curr_new; *new_info_ptr = NULL; if (!info_ptr) goto fn_exit; @@ -93,7 +93,7 @@ Output Parameters: @*/ int MPI_Info_dup( MPI_Info info, MPI_Info *newinfo ) { - MPID_Info *info_ptr = 0, *new_info_ptr; + MPIR_Info *info_ptr = 0, *new_info_ptr; int mpi_errno = MPI_SUCCESS; MPID_MPI_STATE_DECL(MPID_STATE_MPI_INFO_DUP); @@ -114,7 +114,7 @@ int MPI_Info_dup( MPI_Info info, MPI_Info *newinfo ) # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Info_get_ptr( info, info_ptr ); + MPIR_Info_get_ptr( info, info_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -122,7 +122,7 @@ int MPI_Info_dup( MPI_Info info, MPI_Info *newinfo ) MPID_BEGIN_ERROR_CHECKS; { /* Validate info_ptr */ - MPID_Info_valid_ptr( info_ptr, mpi_errno ); + MPIR_Info_valid_ptr( info_ptr, mpi_errno ); MPIR_ERRTEST_ARGNULL(newinfo,"newinfo",mpi_errno); } MPID_END_ERROR_CHECKS; diff --git a/src/mpi/info/info_free.c b/src/mpi/info/info_free.c index fad762b..b4e60b4 100644 --- a/src/mpi/info/info_free.c +++ b/src/mpi/info/info_free.c @@ -50,7 +50,7 @@ int MPI_Info_free( MPI_Info *info ) static const char FCNAME[] = "MPI_Info_free"; #endif int mpi_errno = MPI_SUCCESS; - MPID_Info *info_ptr=0; + MPIR_Info *info_ptr=0; MPID_MPI_STATE_DECL(MPID_STATE_MPI_INFO_FREE); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -70,7 +70,7 @@ int MPI_Info_free( MPI_Info *info ) # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Info_get_ptr( *info, info_ptr ); + MPIR_Info_get_ptr( *info, info_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -78,7 +78,7 @@ int MPI_Info_free( MPI_Info *info ) MPID_BEGIN_ERROR_CHECKS; { /* Validate info_ptr */ - MPID_Info_valid_ptr( info_ptr, mpi_errno ); + MPIR_Info_valid_ptr( info_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; } MPID_END_ERROR_CHECKS; diff --git a/src/mpi/info/info_get.c b/src/mpi/info/info_get.c index 0198deb..ccc88f6 100644 --- a/src/mpi/info/info_get.c +++ b/src/mpi/info/info_get.c @@ -29,9 +29,9 @@ int MPI_Info_get(MPI_Info info, const char *key, int valuelen, char *value, int #define FUNCNAME MPIR_Info_get_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Info_get_impl(MPID_Info *info_ptr, const char *key, int valuelen, char *value, int *flag) +int MPIR_Info_get_impl(MPIR_Info *info_ptr, const char *key, int valuelen, char *value, int *flag) { - MPID_Info *curr_ptr; + MPIR_Info *curr_ptr; int err=0, mpi_errno=0; curr_ptr = info_ptr->next; @@ -93,7 +93,7 @@ Output Parameters: int MPI_Info_get(MPI_Info info, const char *key, int valuelen, char *value, int *flag) { - MPID_Info *info_ptr=0; + MPIR_Info *info_ptr=0; int mpi_errno = MPI_SUCCESS; MPID_MPI_STATE_DECL(MPID_STATE_MPI_INFO_GET); @@ -114,7 +114,7 @@ int MPI_Info_get(MPI_Info info, const char *key, int valuelen, char *value, # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Info_get_ptr( info, info_ptr ); + MPIR_Info_get_ptr( info, info_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -124,7 +124,7 @@ int MPI_Info_get(MPI_Info info, const char *key, int valuelen, char *value, int keylen; /* Validate info_ptr */ - MPID_Info_valid_ptr( info_ptr, mpi_errno ); + MPIR_Info_valid_ptr( info_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; /* Check key */ diff --git a/src/mpi/info/info_getn.c b/src/mpi/info/info_getn.c index ed07b6d..80093b7 100644 --- a/src/mpi/info/info_getn.c +++ b/src/mpi/info/info_getn.c @@ -29,7 +29,7 @@ int MPI_Info_get_nkeys(MPI_Info info, int *nkeys) __attribute__((weak,alias("PMP #define FUNCNAME MPIR_Info_get_nkeys_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -void MPIR_Info_get_nkeys_impl(MPID_Info *info_ptr, int *nkeys) +void MPIR_Info_get_nkeys_impl(MPIR_Info *info_ptr, int *nkeys) { int n; @@ -71,7 +71,7 @@ Output Parameters: #define FCNAME MPL_QUOTE(FUNCNAME) int MPI_Info_get_nkeys( MPI_Info info, int *nkeys ) { - MPID_Info *info_ptr=0; + MPIR_Info *info_ptr=0; int mpi_errno = MPI_SUCCESS; MPID_MPI_STATE_DECL(MPID_STATE_MPI_INFO_GET_NKEYS); @@ -92,7 +92,7 @@ int MPI_Info_get_nkeys( MPI_Info info, int *nkeys ) # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Info_get_ptr( info, info_ptr ); + MPIR_Info_get_ptr( info, info_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -100,7 +100,7 @@ int MPI_Info_get_nkeys( MPI_Info info, int *nkeys ) MPID_BEGIN_ERROR_CHECKS; { /* Validate info_ptr */ - MPID_Info_valid_ptr( info_ptr, mpi_errno ); + MPIR_Info_valid_ptr( info_ptr, mpi_errno ); MPIR_ERRTEST_ARGNULL(nkeys,"nkeys",mpi_errno); diff --git a/src/mpi/info/info_getnth.c b/src/mpi/info/info_getnth.c index d72d689..c5dd4f4 100644 --- a/src/mpi/info/info_getnth.c +++ b/src/mpi/info/info_getnth.c @@ -29,10 +29,10 @@ int MPI_Info_get_nthkey(MPI_Info info, int n, char *key) __attribute__((weak,ali #define FUNCNAME MPIR_Info_get_nthkey_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Info_get_nthkey_impl(MPID_Info *info_ptr, int n, char *key) +int MPIR_Info_get_nthkey_impl(MPIR_Info *info_ptr, int n, char *key) { int mpi_errno = MPI_SUCCESS; - MPID_Info *curr_ptr; + MPIR_Info *curr_ptr; int nkeys; curr_ptr = info_ptr->next; @@ -85,7 +85,7 @@ Output Parameters: int MPI_Info_get_nthkey( MPI_Info info, int n, char *key ) { int mpi_errno = MPI_SUCCESS; - MPID_Info *info_ptr=0; + MPIR_Info *info_ptr=0; MPID_MPI_STATE_DECL(MPID_STATE_MPI_INFO_GET_NTHKEY); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -105,7 +105,7 @@ int MPI_Info_get_nthkey( MPI_Info info, int n, char *key ) # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Info_get_ptr( info, info_ptr ); + MPIR_Info_get_ptr( info, info_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -113,7 +113,7 @@ int MPI_Info_get_nthkey( MPI_Info info, int n, char *key ) MPID_BEGIN_ERROR_CHECKS; { /* Validate info_ptr */ - MPID_Info_valid_ptr( info_ptr, mpi_errno ); + MPIR_Info_valid_ptr( info_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; MPIR_ERR_CHKANDJUMP((!key), mpi_errno, MPI_ERR_INFO_KEY, "**infokeynull"); diff --git a/src/mpi/info/info_getvallen.c b/src/mpi/info/info_getvallen.c index be42cbd..ca15eb5 100644 --- a/src/mpi/info/info_getvallen.c +++ b/src/mpi/info/info_getvallen.c @@ -29,9 +29,9 @@ int MPI_Info_get_valuelen(MPI_Info info, const char *key, int *valuelen, int *fl #define FUNCNAME MPIR_Info_get_valuelen_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -void MPIR_Info_get_valuelen_impl(MPID_Info *info_ptr, const char *key, int *valuelen, int *flag) +void MPIR_Info_get_valuelen_impl(MPIR_Info *info_ptr, const char *key, int *valuelen, int *flag) { - MPID_Info *curr_ptr; + MPIR_Info *curr_ptr; curr_ptr = info_ptr->next; *flag = 0; @@ -77,7 +77,7 @@ Output Parameters: #define FCNAME MPL_QUOTE(FUNCNAME) int MPI_Info_get_valuelen( MPI_Info info, const char *key, int *valuelen, int *flag ) { - MPID_Info *info_ptr=0; + MPIR_Info *info_ptr=0; int mpi_errno = MPI_SUCCESS; MPID_MPI_STATE_DECL(MPID_STATE_MPI_INFO_GET_VALUELEN); @@ -98,7 +98,7 @@ int MPI_Info_get_valuelen( MPI_Info info, const char *key, int *valuelen, int *f # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Info_get_ptr( info, info_ptr ); + MPIR_Info_get_ptr( info, info_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -108,7 +108,7 @@ int MPI_Info_get_valuelen( MPI_Info info, const char *key, int *valuelen, int *f int keylen; /* Validate info_ptr */ - MPID_Info_valid_ptr( info_ptr, mpi_errno ); + MPIR_Info_valid_ptr( info_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; /* Check key */ diff --git a/src/mpi/info/info_set.c b/src/mpi/info/info_set.c index 2b28d62..ce55262 100644 --- a/src/mpi/info/info_set.c +++ b/src/mpi/info/info_set.c @@ -53,7 +53,7 @@ int MPI_Info_set( MPI_Info info, const char *key, const char *value ) { static const char FCNAME[] = "MPI_Info_set"; int mpi_errno = MPI_SUCCESS; - MPID_Info *info_ptr = NULL; + MPIR_Info *info_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_INFO_SET); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -73,7 +73,7 @@ int MPI_Info_set( MPI_Info info, const char *key, const char *value ) # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Info_get_ptr( info, info_ptr ); + MPIR_Info_get_ptr( info, info_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -83,7 +83,7 @@ int MPI_Info_set( MPI_Info info, const char *key, const char *value ) int keylen; /* Validate info_ptr */ - MPID_Info_valid_ptr( info_ptr, mpi_errno ); + MPIR_Info_valid_ptr( info_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; /* Check key */ @@ -130,10 +130,10 @@ int MPI_Info_set( MPI_Info info, const char *key, const char *value ) #define FUNCNAME MPIR_Info_set_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Info_set_impl(MPID_Info *info_ptr, const char *key, const char *value) +int MPIR_Info_set_impl(MPIR_Info *info_ptr, const char *key, const char *value) { int mpi_errno = MPI_SUCCESS; - MPID_Info *curr_ptr, *prev_ptr; + MPIR_Info *curr_ptr, *prev_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPIR_INFO_SET_IMPL); MPID_MPI_FUNC_ENTER(MPID_STATE_MPIR_INFO_SET_IMPL); diff --git a/src/mpi/info/infoutil.c b/src/mpi/info/infoutil.c index 52d92b1..af76a9b 100644 --- a/src/mpi/info/infoutil.c +++ b/src/mpi/info/infoutil.c @@ -10,16 +10,16 @@ /* This is the utility file for info that contains the basic info items and storage management */ -#ifndef MPID_INFO_PREALLOC -#define MPID_INFO_PREALLOC 8 +#ifndef MPIR_INFO_PREALLOC +#define MPIR_INFO_PREALLOC 8 #endif /* Preallocated info objects */ -MPID_Info MPID_Info_builtin[MPID_INFO_N_BUILTIN] = { { 0 } }; -MPID_Info MPID_Info_direct[MPID_INFO_PREALLOC] = { { 0 } }; -MPIU_Object_alloc_t MPID_Info_mem = { 0, 0, 0, 0, MPID_INFO, - sizeof(MPID_Info), MPID_Info_direct, - MPID_INFO_PREALLOC, }; +MPIR_Info MPIR_Info_builtin[MPIR_INFO_N_BUILTIN] = { { 0 } }; +MPIR_Info MPIR_Info_direct[MPIR_INFO_PREALLOC] = { { 0 } }; +MPIU_Object_alloc_t MPIR_Info_mem = { 0, 0, 0, 0, MPIR_INFO, + sizeof(MPIR_Info), MPIR_Info_direct, + MPIR_INFO_PREALLOC, }; /* Free an info structure. In the multithreaded case, this routine relies on the SINGLE_CS in the info routines (particularly MPI_Info_free) */ @@ -27,14 +27,14 @@ MPIU_Object_alloc_t MPID_Info_mem = { 0, 0, 0, 0, MPID_INFO, #define FUNCNAME MPIU_Info_free #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -void MPIU_Info_free( MPID_Info *info_ptr ) +void MPIU_Info_free( MPIR_Info *info_ptr ) { - MPID_Info *curr_ptr, *last_ptr; + MPIR_Info *curr_ptr, *last_ptr; curr_ptr = info_ptr->next; last_ptr = NULL; - MPIU_Handle_obj_free(&MPID_Info_mem, info_ptr); + MPIU_Handle_obj_free(&MPIR_Info_mem, info_ptr); /* printf( "Returning info %x\n", info_ptr->id ); */ /* First, free the string storage */ @@ -43,21 +43,21 @@ void MPIU_Info_free( MPID_Info *info_ptr ) MPL_free(curr_ptr->value); last_ptr = curr_ptr; curr_ptr = curr_ptr->next; - MPIU_Handle_obj_free(&MPID_Info_mem, last_ptr); + MPIU_Handle_obj_free(&MPIR_Info_mem, last_ptr); } } -/* Allocate and initialize an MPID_Info object. +/* Allocate and initialize an MPIR_Info object. * * Returns MPICH error codes */ #undef FUNCNAME #define FUNCNAME MPIU_Info_alloc #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIU_Info_alloc(MPID_Info **info_p_p) +int MPIU_Info_alloc(MPIR_Info **info_p_p) { int mpi_errno = MPI_SUCCESS; - *info_p_p = (MPID_Info *)MPIU_Handle_obj_alloc(&MPID_Info_mem); + *info_p_p = (MPIR_Info *)MPIU_Handle_obj_alloc(&MPIR_Info_mem); MPIR_ERR_CHKANDJUMP1(!*info_p_p, mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", "MPI_Info"); MPIU_Object_set_ref(*info_p_p, 0); diff --git a/src/mpi/init/initthread.c b/src/mpi/init/initthread.c index f061094..d68ac5f 100644 --- a/src/mpi/init/initthread.c +++ b/src/mpi/init/initthread.c @@ -321,7 +321,7 @@ int MPIR_Init_thread(int * argc, char ***argv, int required, int * provided) int has_env; int thread_provided; int exit_init_cs_on_failure = 0; - MPID_Info *info_ptr; + MPIR_Info *info_ptr; /* For any code in the device that wants to check for runtime decisions on the value of isThreaded, set a provisional @@ -493,7 +493,7 @@ int MPIR_Init_thread(int * argc, char ***argv, int required, int * provided) /* create MPI_INFO_NULL object */ /* FIXME: Currently this info object is empty, we need to add data to this as defined by the standard. */ - info_ptr = MPID_Info_builtin + 1; + info_ptr = MPIR_Info_builtin + 1; info_ptr->handle = MPI_INFO_ENV; MPIU_Object_set_ref(info_ptr, 1); info_ptr->next = NULL; diff --git a/src/mpi/rma/alloc_mem.c b/src/mpi/rma/alloc_mem.c index 367f2f5..52f17b6 100644 --- a/src/mpi/rma/alloc_mem.c +++ b/src/mpi/rma/alloc_mem.c @@ -65,7 +65,7 @@ int MPI_Alloc_mem(MPI_Aint size, MPI_Info info, void *baseptr) static const char FCNAME[] = "MPI_Alloc_mem"; int mpi_errno = MPI_SUCCESS; void *ap; - MPID_Info *info_ptr = NULL; + MPIR_Info *info_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_ALLOC_MEM); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -85,7 +85,7 @@ int MPI_Alloc_mem(MPI_Aint size, MPI_Info info, void *baseptr) } # endif /* HAVE_ERROR_CHECKING */ - MPID_Info_get_ptr( info, info_ptr ); + MPIR_Info_get_ptr( info, info_ptr ); /* ... body of routine ... */ diff --git a/src/mpi/rma/win_allocate.c b/src/mpi/rma/win_allocate.c index 05f0fe2..39c0cee 100644 --- a/src/mpi/rma/win_allocate.c +++ b/src/mpi/rma/win_allocate.c @@ -75,7 +75,7 @@ int MPI_Win_allocate(MPI_Aint size, int disp_unit, MPI_Info info, int mpi_errno = MPI_SUCCESS; MPIR_Win *win_ptr = NULL; MPIR_Comm *comm_ptr = NULL; - MPID_Info *info_ptr = NULL; + MPIR_Info *info_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_ALLOCATE); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -98,7 +98,7 @@ int MPI_Win_allocate(MPI_Aint size, int disp_unit, MPI_Info info, /* Convert MPI object handles to object pointers */ MPIR_Comm_get_ptr( comm, comm_ptr ); - MPID_Info_get_ptr( info, info_ptr ); + MPIR_Info_get_ptr( info, info_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING diff --git a/src/mpi/rma/win_allocate_shared.c b/src/mpi/rma/win_allocate_shared.c index b7d1fec..44835a5 100644 --- a/src/mpi/rma/win_allocate_shared.c +++ b/src/mpi/rma/win_allocate_shared.c @@ -85,7 +85,7 @@ int MPI_Win_allocate_shared(MPI_Aint size, int disp_unit, MPI_Info info, MPI_Com int mpi_errno = MPI_SUCCESS; MPIR_Win *win_ptr = NULL; MPIR_Comm *comm_ptr = NULL; - MPID_Info *info_ptr = NULL; + MPIR_Info *info_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_ALLOCATE_SHARED); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -108,7 +108,7 @@ int MPI_Win_allocate_shared(MPI_Aint size, int disp_unit, MPI_Info info, MPI_Com /* Convert MPI object handles to object pointers */ MPIR_Comm_get_ptr( comm, comm_ptr ); - MPID_Info_get_ptr( info, info_ptr ); + MPIR_Info_get_ptr( info, info_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING diff --git a/src/mpi/rma/win_create.c b/src/mpi/rma/win_create.c index 6f8d30a..e226401 100644 --- a/src/mpi/rma/win_create.c +++ b/src/mpi/rma/win_create.c @@ -103,7 +103,7 @@ int MPI_Win_create(void *base, MPI_Aint size, int disp_unit, MPI_Info info, int mpi_errno = MPI_SUCCESS; MPIR_Win *win_ptr = NULL; MPIR_Comm *comm_ptr = NULL; - MPID_Info *info_ptr = NULL; + MPIR_Info *info_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_CREATE); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -126,7 +126,7 @@ int MPI_Win_create(void *base, MPI_Aint size, int disp_unit, MPI_Info info, /* Convert MPI object handles to object pointers */ MPIR_Comm_get_ptr( comm, comm_ptr ); - MPID_Info_get_ptr( info, info_ptr ); + MPIR_Info_get_ptr( info, info_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING diff --git a/src/mpi/rma/win_create_dynamic.c b/src/mpi/rma/win_create_dynamic.c index eebe3e8..8b4f6ca 100644 --- a/src/mpi/rma/win_create_dynamic.c +++ b/src/mpi/rma/win_create_dynamic.c @@ -91,7 +91,7 @@ int MPI_Win_create_dynamic(MPI_Info info, MPI_Comm comm, MPI_Win *win) int mpi_errno = MPI_SUCCESS; MPIR_Win *win_ptr = NULL; MPIR_Comm *comm_ptr = NULL; - MPID_Info *info_ptr = NULL; + MPIR_Info *info_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_CREATE_DYNAMIC); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -114,7 +114,7 @@ int MPI_Win_create_dynamic(MPI_Info info, MPI_Comm comm, MPI_Win *win) /* Convert MPI object handles to object pointers */ MPIR_Comm_get_ptr( comm, comm_ptr ); - MPID_Info_get_ptr( info, info_ptr ); + MPIR_Info_get_ptr( info, info_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING diff --git a/src/mpi/rma/win_get_info.c b/src/mpi/rma/win_get_info.c index c10d2b2..ad1c726 100644 --- a/src/mpi/rma/win_get_info.c +++ b/src/mpi/rma/win_get_info.c @@ -71,7 +71,7 @@ int MPI_Win_get_info(MPI_Win win, MPI_Info *info_used) static const char FCNAME[] = "MPI_Win_get_info"; int mpi_errno = MPI_SUCCESS; MPIR_Win *win_ptr = NULL; - MPID_Info *info_ptr = NULL; + MPIR_Info *info_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_GET_INFO); MPIR_ERRTEST_INITIALIZED_ORDIE(); diff --git a/src/mpi/rma/win_set_info.c b/src/mpi/rma/win_set_info.c index e336bb0..1d2d7cc 100644 --- a/src/mpi/rma/win_set_info.c +++ b/src/mpi/rma/win_set_info.c @@ -68,7 +68,7 @@ int MPI_Win_set_info(MPI_Win win, MPI_Info info) static const char FCNAME[] = "MPI_Win_set_info"; int mpi_errno = MPI_SUCCESS; MPIR_Win *win_ptr = NULL; - MPID_Info *info_ptr = NULL; + MPIR_Info *info_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_SET_INFO); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -89,7 +89,7 @@ int MPI_Win_set_info(MPI_Win win, MPI_Info info) /* Convert MPI object handles to object pointers */ MPIR_Win_get_ptr( win, win_ptr ); - MPID_Info_get_ptr( info, info_ptr ); + MPIR_Info_get_ptr( info, info_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -100,7 +100,7 @@ int MPI_Win_set_info(MPI_Win win, MPI_Info info) MPIR_Win_valid_ptr( win_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; - MPID_Info_valid_ptr( info_ptr, mpi_errno ); + MPIR_Info_valid_ptr( info_ptr, mpi_errno ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; } MPID_END_ERROR_CHECKS; diff --git a/src/mpi/spawn/comm_accept.c b/src/mpi/spawn/comm_accept.c index af5d679..be8aa1a 100644 --- a/src/mpi/spawn/comm_accept.c +++ b/src/mpi/spawn/comm_accept.c @@ -30,7 +30,7 @@ int MPI_Comm_accept(const char *port_name, MPI_Info info, int root, MPI_Comm com #define FUNCNAME MPIR_Comm_accept_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Comm_accept_impl(const char * port_name, MPID_Info * info_ptr, int root, +int MPIR_Comm_accept_impl(const char * port_name, MPIR_Info * info_ptr, int root, MPIR_Comm * comm_ptr, MPIR_Comm ** newcomm_ptr) { return MPID_Comm_accept(port_name, info_ptr, root, comm_ptr, newcomm_ptr); @@ -70,7 +70,7 @@ int MPI_Comm_accept(const char *port_name, MPI_Info info, int root, MPI_Comm com int mpi_errno = MPI_SUCCESS; MPIR_Comm *comm_ptr = NULL; MPIR_Comm *newcomm_ptr = NULL; - MPID_Info *info_ptr = NULL; + MPIR_Info *info_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_ACCEPT); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -92,7 +92,7 @@ int MPI_Comm_accept(const char *port_name, MPI_Info info, int root, MPI_Comm com /* Convert MPI object handles to object pointers */ MPIR_Comm_get_ptr( comm, comm_ptr ); - MPID_Info_get_ptr( info, info_ptr ); + MPIR_Info_get_ptr( info, info_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING diff --git a/src/mpi/spawn/comm_connect.c b/src/mpi/spawn/comm_connect.c index 7f47222..1a98038 100644 --- a/src/mpi/spawn/comm_connect.c +++ b/src/mpi/spawn/comm_connect.c @@ -29,7 +29,7 @@ int MPI_Comm_connect(const char *port_name, MPI_Info info, int root, MPI_Comm co #define FUNCNAME MPIR_Comm_connect_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Comm_connect_impl(const char * port_name, MPID_Info * info_ptr, int root, +int MPIR_Comm_connect_impl(const char * port_name, MPIR_Info * info_ptr, int root, MPIR_Comm * comm_ptr, MPIR_Comm ** newcomm_ptr) { return MPID_Comm_connect(port_name, info_ptr, root, comm_ptr, newcomm_ptr); @@ -69,7 +69,7 @@ int MPI_Comm_connect(const char *port_name, MPI_Info info, int root, MPI_Comm co int mpi_errno = MPI_SUCCESS; MPIR_Comm *comm_ptr = NULL; MPIR_Comm *newcomm_ptr = NULL; - MPID_Info *info_ptr = NULL; + MPIR_Info *info_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_CONNECT); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -91,7 +91,7 @@ int MPI_Comm_connect(const char *port_name, MPI_Info info, int root, MPI_Comm co /* Convert MPI object handles to object pointers */ MPIR_Comm_get_ptr( comm, comm_ptr ); - MPID_Info_get_ptr( info, info_ptr ); + MPIR_Info_get_ptr( info, info_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING diff --git a/src/mpi/spawn/comm_spawn.c b/src/mpi/spawn/comm_spawn.c index fdeee37..34b6663 100644 --- a/src/mpi/spawn/comm_spawn.c +++ b/src/mpi/spawn/comm_spawn.c @@ -67,7 +67,7 @@ int MPI_Comm_spawn(const char *command, char *argv[], int maxprocs, MPI_Info inf static const char FCNAME[] = "MPI_Comm_spawn"; int mpi_errno = MPI_SUCCESS; MPIR_Comm *comm_ptr = NULL, *intercomm_ptr; - MPID_Info *info_ptr=NULL; + MPIR_Info *info_ptr=NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_SPAWN); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -113,7 +113,7 @@ int MPI_Comm_spawn(const char *command, char *argv[], int maxprocs, MPI_Info inf # endif /* HAVE_ERROR_CHECKING */ if (comm_ptr->rank == root) { - MPID_Info_get_ptr( info, info_ptr ); + MPIR_Info_get_ptr( info, info_ptr ); } /* ... body of routine ... */ diff --git a/src/mpi/spawn/comm_spawn_multiple.c b/src/mpi/spawn/comm_spawn_multiple.c index feddb7f..074637d 100644 --- a/src/mpi/spawn/comm_spawn_multiple.c +++ b/src/mpi/spawn/comm_spawn_multiple.c @@ -72,7 +72,7 @@ int MPI_Comm_spawn_multiple(int count, char *array_of_commands[], int mpi_errno = MPI_SUCCESS, i; MPIR_Comm *comm_ptr = NULL; MPIR_Comm *intercomm_ptr = NULL; - MPID_Info **array_of_info_ptrs = NULL; + MPIR_Info **array_of_info_ptrs = NULL; MPIU_CHKLMEM_DECL(1); MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_SPAWN_MULTIPLE); @@ -127,10 +127,10 @@ int MPI_Comm_spawn_multiple(int count, char *array_of_commands[], /* ... body of routine ... */ if (comm_ptr->rank == root) { - MPIU_CHKLMEM_MALLOC(array_of_info_ptrs, MPID_Info **, count * sizeof(MPID_Info*), mpi_errno, "array of info pointers"); + MPIU_CHKLMEM_MALLOC(array_of_info_ptrs, MPIR_Info **, count * sizeof(MPIR_Info*), mpi_errno, "array of info pointers"); for (i=0; i<count; i++) { - MPID_Info_get_ptr(array_of_info[i], array_of_info_ptrs[i]); + MPIR_Info_get_ptr(array_of_info[i], array_of_info_ptrs[i]); } } diff --git a/src/mpi/spawn/lookup_name.c b/src/mpi/spawn/lookup_name.c index 24a449f..82e735c 100644 --- a/src/mpi/spawn/lookup_name.c +++ b/src/mpi/spawn/lookup_name.c @@ -67,7 +67,7 @@ int MPI_Lookup_name(const char *service_name, MPI_Info info, char *port_name) { static const char FCNAME[] = "MPI_Lookup_name"; int mpi_errno = MPI_SUCCESS; - MPID_Info *info_ptr = NULL; + MPIR_Info *info_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_LOOKUP_NAME); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -86,7 +86,7 @@ int MPI_Lookup_name(const char *service_name, MPI_Info info, char *port_name) # endif /* Convert MPI object handles to object pointers */ - MPID_Info_get_ptr( info, info_ptr ); + MPIR_Info_get_ptr( info, info_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -95,7 +95,7 @@ int MPI_Lookup_name(const char *service_name, MPI_Info info, char *port_name) { /* Validate info_ptr (only if not null) */ if (info_ptr) - MPID_Info_valid_ptr( info_ptr, mpi_errno ); + MPIR_Info_valid_ptr( info_ptr, mpi_errno ); /* Validate character pointers */ MPIR_ERRTEST_ARGNULL( service_name, "service_name", mpi_errno ); MPIR_ERRTEST_ARGNULL( port_name, "port_name", mpi_errno ); diff --git a/src/mpi/spawn/namepub.h b/src/mpi/spawn/namepub.h index 0afbbfe..b97f9e8 100644 --- a/src/mpi/spawn/namepub.h +++ b/src/mpi/spawn/namepub.h @@ -9,12 +9,12 @@ typedef struct MPID_NS_Handle *MPID_NS_Handle; -int MPID_NS_Create( const MPID_Info *, MPID_NS_Handle * ); -int MPID_NS_Publish( MPID_NS_Handle, const MPID_Info *, +int MPID_NS_Create( const MPIR_Info *, MPID_NS_Handle * ); +int MPID_NS_Publish( MPID_NS_Handle, const MPIR_Info *, const char service_name[], const char port[] ); -int MPID_NS_Lookup( MPID_NS_Handle, const MPID_Info *, +int MPID_NS_Lookup( MPID_NS_Handle, const MPIR_Info *, const char service_name[], char port[] ); -int MPID_NS_Unpublish( MPID_NS_Handle, const MPID_Info *, +int MPID_NS_Unpublish( MPID_NS_Handle, const MPIR_Info *, const char service_name[] ); int MPID_NS_Free( MPID_NS_Handle * ); diff --git a/src/mpi/spawn/open_port.c b/src/mpi/spawn/open_port.c index 3897624..f7d212a 100644 --- a/src/mpi/spawn/open_port.c +++ b/src/mpi/spawn/open_port.c @@ -24,7 +24,7 @@ int MPI_Open_port(MPI_Info info, char *port_name) __attribute__((weak,alias("PMP #undef MPI_Open_port #define MPI_Open_port PMPI_Open_port -int MPIR_Open_port_impl(MPID_Info *info_ptr, char *port_name) +int MPIR_Open_port_impl(MPIR_Info *info_ptr, char *port_name) { return MPID_Open_port(info_ptr, port_name); } @@ -68,7 +68,7 @@ The maximum size string that may be supplied by the system is int MPI_Open_port(MPI_Info info, char *port_name) { int mpi_errno = MPI_SUCCESS; - MPID_Info *info_ptr = NULL; + MPIR_Info *info_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_OPEN_PORT); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -89,7 +89,7 @@ int MPI_Open_port(MPI_Info info, char *port_name) # endif /* Convert MPI object handles to object pointers */ - MPID_Info_get_ptr( info, info_ptr ); + MPIR_Info_get_ptr( info, info_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING diff --git a/src/mpi/spawn/publish_name.c b/src/mpi/spawn/publish_name.c index 5009137..03105a0 100644 --- a/src/mpi/spawn/publish_name.c +++ b/src/mpi/spawn/publish_name.c @@ -57,7 +57,7 @@ int MPI_Publish_name(const char *service_name, MPI_Info info, const char *port_n { static const char FCNAME[] = "MPI_Publish_name"; int mpi_errno = MPI_SUCCESS; - MPID_Info *info_ptr = NULL; + MPIR_Info *info_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_PUBLISH_NAME); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -77,7 +77,7 @@ int MPI_Publish_name(const char *service_name, MPI_Info info, const char *port_n # endif /* Get handles to MPI objects. */ - MPID_Info_get_ptr( info, info_ptr ); + MPIR_Info_get_ptr( info, info_ptr ); # ifdef HAVE_ERROR_CHECKING { @@ -85,7 +85,7 @@ int MPI_Publish_name(const char *service_name, MPI_Info info, const char *port_n { /* Validate info_ptr (only if not null) */ if (info_ptr) - MPID_Info_valid_ptr( info_ptr, mpi_errno ); + MPIR_Info_valid_ptr( info_ptr, mpi_errno ); /* Validate character pointers */ MPIR_ERRTEST_ARGNULL( service_name, "service_name", mpi_errno ); MPIR_ERRTEST_ARGNULL( port_name, "port_name", mpi_errno ); diff --git a/src/mpi/spawn/unpublish_name.c b/src/mpi/spawn/unpublish_name.c index 9da24a1..14f4927 100644 --- a/src/mpi/spawn/unpublish_name.c +++ b/src/mpi/spawn/unpublish_name.c @@ -54,7 +54,7 @@ int MPI_Unpublish_name(const char *service_name, MPI_Info info, const char *port { static const char FCNAME[] = "MPI_Unpublish_name"; int mpi_errno = MPI_SUCCESS; - MPID_Info *info_ptr = NULL; + MPIR_Info *info_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_UNPUBLISH_NAME); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -74,7 +74,7 @@ int MPI_Unpublish_name(const char *service_name, MPI_Info info, const char *port # endif /* Convert MPI object handles to object pointers */ - MPID_Info_get_ptr( info, info_ptr ); + MPIR_Info_get_ptr( info, info_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -83,7 +83,7 @@ int MPI_Unpublish_name(const char *service_name, MPI_Info info, const char *port { /* Validate info_ptr (only if not null) */ if (info_ptr) - MPID_Info_valid_ptr( info_ptr, mpi_errno ); + MPIR_Info_valid_ptr( info_ptr, mpi_errno ); MPIR_ERRTEST_ARGNULL( service_name, "service_name", mpi_errno ); MPIR_ERRTEST_ARGNULL( port_name, "port_name", mpi_errno ); } diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_init.c b/src/mpid/ch3/channels/nemesis/src/ch3_init.c index c63cfd9..949c23d 100644 --- a/src/mpid/ch3/channels/nemesis/src/ch3_init.c +++ b/src/mpid/ch3/channels/nemesis/src/ch3_init.c @@ -24,7 +24,7 @@ static int nemesis_initialized = 0; #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) static int split_type(MPIR_Comm * comm_ptr, int stype, int key, - MPID_Info *info_ptr, MPIR_Comm ** newcomm_ptr) + MPIR_Info *info_ptr, MPIR_Comm ** newcomm_ptr) { MPID_Node_id_t id; MPIDI_Rank_t nid; diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c b/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c index b160d92..60cea66 100644 --- a/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c +++ b/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c @@ -19,14 +19,14 @@ extern MPIR_T_pvar_timer_t PVAR_TIMER_rma_wincreate_allgather ATTRIBUTE((unused) MPIDI_SHM_Wins_list_t shm_wins_list; static int MPIDI_CH3I_Win_init(MPI_Aint size, int disp_unit, int create_flavor, int model, - MPID_Info * info, MPIR_Comm * comm_ptr, MPIR_Win ** win_ptr); + MPIR_Info * info, MPIR_Comm * comm_ptr, MPIR_Win ** win_ptr); -static int MPIDI_CH3I_Win_allocate_shm(MPI_Aint size, int disp_unit, MPID_Info * info, +static int MPIDI_CH3I_Win_allocate_shm(MPI_Aint size, int disp_unit, MPIR_Info * info, MPIR_Comm * comm_ptr, void *base_ptr, MPIR_Win ** win_ptr); static int MPIDI_CH3I_Win_detect_shm(MPIR_Win ** win_ptr); -static int MPIDI_CH3I_Win_gather_info(void *base, MPI_Aint size, int disp_unit, MPID_Info * info, +static int MPIDI_CH3I_Win_gather_info(void *base, MPI_Aint size, int disp_unit, MPIR_Info * info, MPIR_Comm * comm_ptr, MPIR_Win ** win_ptr); #undef FUNCNAME @@ -114,7 +114,7 @@ int MPIDI_CH3_Win_pkt_orderings_init(MPIDI_CH3U_Win_pkt_ordering_t * win_pkt_ord #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) static int MPIDI_CH3I_Win_init(MPI_Aint size, int disp_unit, int create_flavor, int model, - MPID_Info * info, MPIR_Comm * comm_ptr, MPIR_Win ** win_ptr) + MPIR_Info * info, MPIR_Comm * comm_ptr, MPIR_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3I_WIN_INIT); @@ -347,7 +347,7 @@ static int MPIDI_CH3I_Win_detect_shm(MPIR_Win ** win_ptr) #define FUNCNAME MPIDI_CH3I_Win_gather_info #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int MPIDI_CH3I_Win_gather_info(void *base, MPI_Aint size, int disp_unit, MPID_Info * info, +static int MPIDI_CH3I_Win_gather_info(void *base, MPI_Aint size, int disp_unit, MPIR_Info * info, MPIR_Comm * comm_ptr, MPIR_Win ** win_ptr) { MPIR_Comm *node_comm_ptr = NULL; @@ -490,7 +490,7 @@ static int MPIDI_CH3I_Win_gather_info(void *base, MPI_Aint size, int disp_unit, #define FUNCNAME MPIDI_CH3I_Win_allocate_shm #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int MPIDI_CH3I_Win_allocate_shm(MPI_Aint size, int disp_unit, MPID_Info * info, +static int MPIDI_CH3I_Win_allocate_shm(MPI_Aint size, int disp_unit, MPIR_Info * info, MPIR_Comm * comm_ptr, void *base_ptr, MPIR_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; diff --git a/src/mpid/ch3/include/mpidimpl.h b/src/mpid/ch3/include/mpidimpl.h index 92e142a..148d6aa 100644 --- a/src/mpid/ch3/include/mpidimpl.h +++ b/src/mpid/ch3/include/mpidimpl.h @@ -997,24 +997,24 @@ int MPIDI_Isend_self(const void *, MPI_Aint, MPI_Datatype, int, int, MPIR_Comm * int, int, MPID_Request **); /*-------------------------- - BEGIN MPI PORT SECTION + BEGIN MPI PORT SECTION --------------------------*/ /* These are the default functions */ -int MPIDI_Comm_connect(const char *, MPID_Info *, int, MPIR_Comm *, MPIR_Comm **); -int MPIDI_Comm_accept(const char *, MPID_Info *, int, MPIR_Comm *, MPIR_Comm **); +int MPIDI_Comm_connect(const char *, MPIR_Info *, int, MPIR_Comm *, MPIR_Comm **); +int MPIDI_Comm_accept(const char *, MPIR_Info *, int, MPIR_Comm *, MPIR_Comm **); -int MPIDI_Comm_spawn_multiple(int, char **, char ***, const int *, MPID_Info **, +int MPIDI_Comm_spawn_multiple(int, char **, char ***, const int *, MPIR_Info **, int, MPIR_Comm *, MPIR_Comm **, int *); -/* This structure defines a module that handles the routines that +/* This structure defines a module that handles the routines that work with MPI port names */ typedef struct MPIDI_Port_Ops { - int (*OpenPort)( MPID_Info *, char * ); + int (*OpenPort)( MPIR_Info *, char * ); int (*ClosePort)( const char * ); - int (*CommAccept)( const char *, MPID_Info *, int, MPIR_Comm *, + int (*CommAccept)( const char *, MPIR_Info *, int, MPIR_Comm *, MPIR_Comm ** ); - int (*CommConnect)( const char *, MPID_Info *, int, MPIR_Comm *, + int (*CommConnect)( const char *, MPIR_Info *, int, MPIR_Comm *, MPIR_Comm ** ); } MPIDI_PortFns; #define MPIDI_PORTFNS_VERSION 1 @@ -1048,20 +1048,20 @@ void MPIDI_RMA_finalize(void); */ typedef struct { - int (*create)(void *, MPI_Aint, int, MPID_Info *, MPIR_Comm *, MPIR_Win **); - int (*allocate)(MPI_Aint, int, MPID_Info *, MPIR_Comm *, void *, MPIR_Win **); - int (*allocate_shared)(MPI_Aint, int, MPID_Info *, MPIR_Comm *, void *, MPIR_Win **); - int (*allocate_shm)(MPI_Aint, int, MPID_Info *, MPIR_Comm *, void *, MPIR_Win **); - int (*create_dynamic)(MPID_Info *, MPIR_Comm *, MPIR_Win **); + int (*create)(void *, MPI_Aint, int, MPIR_Info *, MPIR_Comm *, MPIR_Win **); + int (*allocate)(MPI_Aint, int, MPIR_Info *, MPIR_Comm *, void *, MPIR_Win **); + int (*allocate_shared)(MPI_Aint, int, MPIR_Info *, MPIR_Comm *, void *, MPIR_Win **); + int (*allocate_shm)(MPI_Aint, int, MPIR_Info *, MPIR_Comm *, void *, MPIR_Win **); + int (*create_dynamic)(MPIR_Info *, MPIR_Comm *, MPIR_Win **); int (*detect_shm)(MPIR_Win **); - int (*gather_info)(void *, MPI_Aint, int, MPID_Info *, MPIR_Comm *, MPIR_Win **); + int (*gather_info)(void *, MPI_Aint, int, MPIR_Info *, MPIR_Comm *, MPIR_Win **); int (*shared_query)(MPIR_Win *, int, MPI_Aint *, int *, void *); } MPIDI_CH3U_Win_fns_t; extern MPIDI_CH3U_Win_fns_t MPIDI_CH3U_Win_fns; typedef struct { - int (*win_init)(MPI_Aint, int, int, int, MPID_Info *, MPIR_Comm *, MPIR_Win **); + int (*win_init)(MPI_Aint, int, int, int, MPIR_Info *, MPIR_Comm *, MPIR_Win **); int (*win_free)(MPIR_Win **); } MPIDI_CH3U_Win_hooks_t; @@ -1089,24 +1089,24 @@ int MPIDI_CH3_Win_hooks_init(MPIDI_CH3U_Win_hooks_t *win_hooks); int MPIDI_CH3_Win_pkt_orderings_init(MPIDI_CH3U_Win_pkt_ordering_t * win_pkt_orderings); /* Default window creation functions provided by CH3 */ -int MPIDI_CH3U_Win_create(void *, MPI_Aint, int, MPID_Info *, MPIR_Comm *, +int MPIDI_CH3U_Win_create(void *, MPI_Aint, int, MPIR_Info *, MPIR_Comm *, MPIR_Win **); -int MPIDI_CH3U_Win_allocate(MPI_Aint size, int disp_unit, MPID_Info *info, +int MPIDI_CH3U_Win_allocate(MPI_Aint size, int disp_unit, MPIR_Info *info, MPIR_Comm *comm, void *baseptr, MPIR_Win **win); -int MPIDI_CH3U_Win_allocate_no_shm(MPI_Aint size, int disp_unit, MPID_Info *info, +int MPIDI_CH3U_Win_allocate_no_shm(MPI_Aint size, int disp_unit, MPIR_Info *info, MPIR_Comm *comm_ptr, void *baseptr, MPIR_Win **win_ptr); -int MPIDI_CH3U_Win_create_dynamic(MPID_Info *info, MPIR_Comm *comm, MPIR_Win **win); +int MPIDI_CH3U_Win_create_dynamic(MPIR_Info *info, MPIR_Comm *comm, MPIR_Win **win); int MPIDI_CH3U_Win_shared_query(MPIR_Win * win_ptr, int target_rank, MPI_Aint * size, int *disp_unit, void *baseptr); /* MPI RMA Utility functions */ -int MPIDI_CH3U_Win_gather_info(void *, MPI_Aint, int, MPID_Info *, MPIR_Comm *, +int MPIDI_CH3U_Win_gather_info(void *, MPI_Aint, int, MPIR_Info *, MPIR_Comm *, MPIR_Win **); #ifdef MPIDI_CH3I_HAS_ALLOC_MEM -void* MPIDI_CH3I_Alloc_mem(size_t size, MPID_Info *info_ptr); +void* MPIDI_CH3I_Alloc_mem(size_t size, MPIR_Info *info_ptr); /* fallback to MPL_malloc if channel does not have its own RMA memory allocator */ #else #define MPIDI_CH3I_Alloc_mem(size, info_ptr) MPL_malloc(size) diff --git a/src/mpid/ch3/include/mpidpost.h b/src/mpid/ch3/include/mpidpost.h index 2490343..1d60090 100644 --- a/src/mpid/ch3/include/mpidpost.h +++ b/src/mpid/ch3/include/mpidpost.h @@ -123,7 +123,7 @@ int MPIDI_CH3_Progress_poke(void); int MPIDI_CH3_Open_port(char *port_name); int MPIDI_CH3_Comm_spawn_multiple(int count, char ** commands, char *** argvs, - int * maxprocs, MPID_Info ** info_ptrs, + int * maxprocs, MPIR_Info ** info_ptrs, int root, MPIR_Comm * comm_ptr, MPIR_Comm ** intercomm, int * errcodes); diff --git a/src/mpid/ch3/src/ch3u_comm_spawn_multiple.c b/src/mpid/ch3/src/ch3u_comm_spawn_multiple.c index d14e9d6..b451ee6 100644 --- a/src/mpid/ch3/src/ch3u_comm_spawn_multiple.c +++ b/src/mpid/ch3/src/ch3u_comm_spawn_multiple.c @@ -34,7 +34,7 @@ #define FUNCNAME mpi_to_pmi_keyvals #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int mpi_to_pmi_keyvals( MPID_Info *info_ptr, PMI_keyval_t **kv_ptr, +static int mpi_to_pmi_keyvals( MPIR_Info *info_ptr, PMI_keyval_t **kv_ptr, int *nkeys_ptr ) { char key[MPI_MAX_INFO_KEY]; @@ -104,7 +104,7 @@ static void free_pmi_keyvals(PMI_keyval_t **kv, int size, int *counts) #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_Comm_spawn_multiple(int count, char **commands, char ***argvs, const int *maxprocs, - MPID_Info **info_ptrs, int root, + MPIR_Info **info_ptrs, int root, MPIR_Comm *comm_ptr, MPIR_Comm **intercomm, int *errcodes) { @@ -145,8 +145,8 @@ int MPIDI_Comm_spawn_multiple(int count, char **commands, MPIU_Assert(count > 0); { int *argcs = MPL_malloc(count*sizeof(int)); - struct MPID_Info preput; - struct MPID_Info *preput_p[1] = { &preput }; + struct MPIR_Info preput; + struct MPIR_Info *preput_p[1] = { &preput }; MPIU_Assert(argcs); /* @@ -179,8 +179,8 @@ int MPIDI_Comm_spawn_multiple(int count, char **commands, pmi_errno = PMI2_Job_Spawn(count, (const char **)commands, argcs, (const char ***)argvs, maxprocs, - info_keyval_sizes, (const MPID_Info **)info_ptrs, - 1, (const struct MPID_Info **)preput_p, + info_keyval_sizes, (const MPIR_Info **)info_ptrs, + 1, (const struct MPIR_Info **)preput_p, NULL, 0, /*jobId, jobIdSize,*/ /* XXX DJG job stuff? */ pmi_errcodes); diff --git a/src/mpid/ch3/src/ch3u_port.c b/src/mpid/ch3/src/ch3u_port.c index 9ca6b12..5a6f5be 100644 --- a/src/mpid/ch3/src/ch3u_port.c +++ b/src/mpid/ch3/src/ch3u_port.c @@ -330,7 +330,7 @@ fn_fail: #define FUNCNAME MPIDI_Comm_connect #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_Comm_connect(const char *port_name, MPID_Info *info, int root, +int MPIDI_Comm_connect(const char *port_name, MPIR_Info *info, int root, MPIR_Comm *comm_ptr, MPIR_Comm **newcomm) { int mpi_errno=MPI_SUCCESS; @@ -926,7 +926,7 @@ static int SendPGtoPeerAndFree( MPIR_Comm *tmp_comm, int *sendtag_p, #define FUNCNAME MPIDI_Comm_accept #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_Comm_accept(const char *port_name, MPID_Info *info, int root, +int MPIDI_Comm_accept(const char *port_name, MPIR_Info *info, int root, MPIR_Comm *comm_ptr, MPIR_Comm **newcomm) { int mpi_errno=MPI_SUCCESS; diff --git a/src/mpid/ch3/src/ch3u_win_fns.c b/src/mpid/ch3/src/ch3u_win_fns.c index 5b35ec3..ddfe6ee 100644 --- a/src/mpid/ch3/src/ch3u_win_fns.c +++ b/src/mpid/ch3/src/ch3u_win_fns.c @@ -39,7 +39,7 @@ int MPIDI_Win_fns_init(MPIDI_CH3U_Win_fns_t * win_fns) #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3U_Win_gather_info(void *base, MPI_Aint size, int disp_unit, - MPID_Info * info, MPIR_Comm * comm_ptr, MPIR_Win ** win_ptr) + MPIR_Info * info, MPIR_Comm * comm_ptr, MPIR_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS, i, k, comm_size, rank; MPI_Aint *tmp_buf; @@ -105,7 +105,7 @@ int MPIDI_CH3U_Win_gather_info(void *base, MPI_Aint size, int disp_unit, #define FUNCNAME MPIDI_CH3U_Win_create #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3U_Win_create(void *base, MPI_Aint size, int disp_unit, MPID_Info * info, +int MPIDI_CH3U_Win_create(void *base, MPI_Aint size, int disp_unit, MPIR_Info * info, MPIR_Comm * comm_ptr, MPIR_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; @@ -140,7 +140,7 @@ int MPIDI_CH3U_Win_create(void *base, MPI_Aint size, int disp_unit, MPID_Info * #define FUNCNAME MPIDI_CH3U_Win_create_dynamic #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3U_Win_create_dynamic(MPID_Info * info, MPIR_Comm * comm_ptr, MPIR_Win ** win_ptr) +int MPIDI_CH3U_Win_create_dynamic(MPIR_Info * info, MPIR_Comm * comm_ptr, MPIR_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3U_WIN_CREATE_DYNAMIC); @@ -210,7 +210,7 @@ int MPID_Win_detach(MPIR_Win * win, const void *base) #define FUNCNAME MPIDI_CH3U_Win_allocate #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3U_Win_allocate(MPI_Aint size, int disp_unit, MPID_Info * info, +int MPIDI_CH3U_Win_allocate(MPI_Aint size, int disp_unit, MPIR_Info * info, MPIR_Comm * comm_ptr, void *baseptr, MPIR_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; @@ -244,7 +244,7 @@ int MPIDI_CH3U_Win_allocate(MPI_Aint size, int disp_unit, MPID_Info * info, #define FUNCNAME MPIDI_CH3U_Win_allocate_no_shm #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3U_Win_allocate_no_shm(MPI_Aint size, int disp_unit, MPID_Info * info, +int MPIDI_CH3U_Win_allocate_no_shm(MPI_Aint size, int disp_unit, MPIR_Info * info, MPIR_Comm * comm_ptr, void *baseptr, MPIR_Win ** win_ptr) { void **base_pp = (void **) baseptr; @@ -313,7 +313,7 @@ int MPIDI_CH3U_Win_shared_query(MPIR_Win * win_ptr, int target_rank, MPI_Aint * #define FUNCNAME MPID_Win_set_info #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Win_set_info(MPIR_Win * win, MPID_Info * info) +int MPID_Win_set_info(MPIR_Win * win, MPIR_Info * info) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPID_WIN_SET_INFO); @@ -392,7 +392,7 @@ int MPID_Win_set_info(MPIR_Win * win, MPID_Info * info) #define FUNCNAME MPID_Win_get_info #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Win_get_info(MPIR_Win * win, MPID_Info ** info_used) +int MPID_Win_get_info(MPIR_Win * win, MPIR_Info ** info_used) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPID_WIN_GET_INFO); diff --git a/src/mpid/ch3/src/mpid_comm_spawn_multiple.c b/src/mpid/ch3/src/mpid_comm_spawn_multiple.c index 98f88b3..62b333a 100644 --- a/src/mpid/ch3/src/mpid_comm_spawn_multiple.c +++ b/src/mpid/ch3/src/mpid_comm_spawn_multiple.c @@ -34,7 +34,7 @@ #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_Comm_spawn_multiple(int count, char *array_of_commands[], char ** array_of_argv[], const int array_of_maxprocs[], - MPID_Info * array_of_info_ptrs[], int root, + MPIR_Info * array_of_info_ptrs[], int root, MPIR_Comm * comm_ptr, MPIR_Comm ** intercomm, int array_of_errcodes[]) { diff --git a/src/mpid/ch3/src/mpid_init.c b/src/mpid/ch3/src/mpid_init.c index 7e8da11..2fd4cca 100644 --- a/src/mpid/ch3/src/mpid_init.c +++ b/src/mpid/ch3/src/mpid_init.c @@ -35,7 +35,7 @@ static int init_pg( int *argc_p, char ***argv_p, int *pg_rank_p, MPIDI_PG_t **pg_p ); static int pg_compare_ids(void * id1, void * id2); static int pg_destroy(MPIDI_PG_t * pg ); -static int set_eager_threshold(MPIR_Comm *comm_ptr, MPID_Info *info, void *state); +static int set_eager_threshold(MPIR_Comm *comm_ptr, MPIR_Info *info, void *state); MPIDI_Process_t MPIDI_Process = { NULL }; MPIDI_CH3U_SRBuf_element_t * MPIDI_CH3U_SRBuf_pool = NULL; @@ -74,7 +74,7 @@ static int finalize_failed_procs_group(void *param) #define FUNCNAME set_eager_threshold #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int set_eager_threshold(MPIR_Comm *comm_ptr, MPID_Info *info, void *state) +static int set_eager_threshold(MPIR_Comm *comm_ptr, MPIR_Info *info, void *state) { int mpi_errno = MPI_SUCCESS; char *endptr; diff --git a/src/mpid/ch3/src/mpid_port.c b/src/mpid/ch3/src/mpid_port.c index 8b014f1..d34071b 100644 --- a/src/mpid/ch3/src/mpid_port.c +++ b/src/mpid/ch3/src/mpid_port.c @@ -9,7 +9,7 @@ static int setupPortFunctions = 1; #ifndef MPIDI_CH3_HAS_NO_DYNAMIC_PROCESS -static int MPIDI_Open_port(MPID_Info *, char *); +static int MPIDI_Open_port(MPIR_Info *, char *); static int MPIDI_Close_port(const char *); /* Define the functions that are used to implement the port @@ -41,7 +41,7 @@ static MPIDI_PortFns portFns = { 0, 0, 0, 0 }; #define FUNCNAME MPID_Open_port #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Open_port(MPID_Info *info_ptr, char *port_name) +int MPID_Open_port(MPIR_Info *info_ptr, char *port_name) { int mpi_errno=MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPID_OPEN_PORT); @@ -128,7 +128,7 @@ int MPID_Close_port(const char *port_name) #define FUNCNAME MPID_Comm_accept #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Comm_accept(const char * port_name, MPID_Info * info, int root, +int MPID_Comm_accept(const char * port_name, MPIR_Info * info, int root, MPIR_Comm * comm, MPIR_Comm ** newcomm_ptr) { int mpi_errno = MPI_SUCCESS; @@ -166,7 +166,7 @@ int MPID_Comm_accept(const char * port_name, MPID_Info * info, int root, #define FUNCNAME MPID_Comm_connect #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Comm_connect(const char * port_name, MPID_Info * info, int root, +int MPID_Comm_connect(const char * port_name, MPIR_Info * info, int root, MPIR_Comm * comm, MPIR_Comm ** newcomm_ptr) { int mpi_errno=MPI_SUCCESS; @@ -281,7 +281,7 @@ static void free_port_name_tag(int tag) #define FUNCNAME MPIDI_Open_port #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int MPIDI_Open_port(MPID_Info *info_ptr, char *port_name) +static int MPIDI_Open_port(MPIR_Info *info_ptr, char *port_name) { int mpi_errno = MPI_SUCCESS; int str_errno = MPL_STR_SUCCESS; diff --git a/src/mpid/ch3/src/mpid_rma.c b/src/mpid/ch3/src/mpid_rma.c index a79368c..79f115b 100644 --- a/src/mpid/ch3/src/mpid_rma.c +++ b/src/mpid/ch3/src/mpid_rma.c @@ -50,7 +50,7 @@ int MPIDI_CH3I_RMA_Active_req_cnt = 0; /* This variable stores the index of RMA progress hook in progress hook array */ int MPIDI_CH3I_RMA_Progress_hook_id = 0; -static int win_init(MPI_Aint size, int disp_unit, int create_flavor, int model, MPID_Info * info, +static int win_init(MPI_Aint size, int disp_unit, int create_flavor, int model, MPIR_Info * info, MPIR_Comm * comm_ptr, MPIR_Win ** win_ptr); @@ -58,7 +58,7 @@ static int win_init(MPI_Aint size, int disp_unit, int create_flavor, int model, #define FUNCNAME MPID_Win_create #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Win_create(void *base, MPI_Aint size, int disp_unit, MPID_Info * info, +int MPID_Win_create(void *base, MPI_Aint size, int disp_unit, MPIR_Info * info, MPIR_Comm * comm_ptr, MPIR_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; @@ -93,7 +93,7 @@ int MPID_Win_create(void *base, MPI_Aint size, int disp_unit, MPID_Info * info, #define FUNCNAME MPID_Win_allocate #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Win_allocate(MPI_Aint size, int disp_unit, MPID_Info * info, +int MPID_Win_allocate(MPI_Aint size, int disp_unit, MPIR_Info * info, MPIR_Comm * comm_ptr, void *baseptr, MPIR_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; @@ -123,7 +123,7 @@ int MPID_Win_allocate(MPI_Aint size, int disp_unit, MPID_Info * info, #define FUNCNAME MPID_Win_create_dynamic #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Win_create_dynamic(MPID_Info * info, MPIR_Comm * comm_ptr, MPIR_Win ** win_ptr) +int MPID_Win_create_dynamic(MPIR_Info * info, MPIR_Comm * comm_ptr, MPIR_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; @@ -156,7 +156,7 @@ int MPID_Win_create_dynamic(MPID_Info * info, MPIR_Comm * comm_ptr, MPIR_Win ** #define FUNCNAME MPID_Alloc_mem #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -void *MPID_Alloc_mem(size_t size, MPID_Info * info_ptr) +void *MPID_Alloc_mem(size_t size, MPIR_Info * info_ptr) { void *ap = NULL; MPIDI_STATE_DECL(MPID_STATE_MPID_ALLOC_MEM); @@ -193,7 +193,7 @@ int MPID_Free_mem(void *ptr) #define FUNCNAME MPID_Win_allocate_shared #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Win_allocate_shared(MPI_Aint size, int disp_unit, MPID_Info * info, MPIR_Comm * comm_ptr, +int MPID_Win_allocate_shared(MPI_Aint size, int disp_unit, MPIR_Info * info, MPIR_Comm * comm_ptr, void *base_ptr, MPIR_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; @@ -245,7 +245,7 @@ int MPID_Win_shared_query(MPIR_Win * win, int rank, MPI_Aint * size, int *disp_u #define FUNCNAME win_init #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int win_init(MPI_Aint size, int disp_unit, int create_flavor, int model, MPID_Info * info, +static int win_init(MPI_Aint size, int disp_unit, int create_flavor, int model, MPIR_Info * info, MPIR_Comm * comm_ptr, MPIR_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; diff --git a/src/mpid/pamid/include/mpidimpl.h b/src/mpid/pamid/include/mpidimpl.h index 13f804d..645b982 100644 --- a/src/mpid/pamid/include/mpidimpl.h +++ b/src/mpid/pamid/include/mpidimpl.h @@ -125,19 +125,19 @@ typedef struct transactionID_struct { BEGIN MPI PORT SECTION --------------------------*/ /* These are the default functions */ -int MPIDI_Comm_connect(const char *, struct MPID_Info *, int, struct MPIR_Comm *, struct MPIR_Comm **); -int MPIDI_Comm_accept(const char *, struct MPID_Info *, int, struct MPIR_Comm *, struct MPIR_Comm **); +int MPIDI_Comm_connect(const char *, struct MPIR_Info *, int, struct MPIR_Comm *, struct MPIR_Comm **); +int MPIDI_Comm_accept(const char *, struct MPIR_Info *, int, struct MPIR_Comm *, struct MPIR_Comm **); -int MPIDI_Comm_spawn_multiple(int, char **, char ***, int *, struct MPID_Info **, +int MPIDI_Comm_spawn_multiple(int, char **, char ***, int *, struct MPIR_Info **, int, struct MPIR_Comm *, struct MPIR_Comm **, int *); typedef struct MPIDI_Port_Ops { - int (*OpenPort)( struct MPID_Info *, char *); + int (*OpenPort)( struct MPIR_Info *, char *); int (*ClosePort)( const char * ); - int (*CommAccept)( const char *, struct MPID_Info *, int, struct MPIR_Comm *, + int (*CommAccept)( const char *, struct MPIR_Info *, int, struct MPIR_Comm *, struct MPIR_Comm ** ); - int (*CommConnect)( const char *, struct MPID_Info *, int, struct MPIR_Comm *, + int (*CommConnect)( const char *, struct MPIR_Info *, int, struct MPIR_Comm *, struct MPIR_Comm ** ); } MPIDI_PortFns; @@ -180,7 +180,7 @@ static inline pami_endpoint_t MPIDI_Task_to_endpoint(pami_task_t task, size_t of int MPIDI_Win_set_info(MPIR_Win *win, - MPID_Info *info); + MPIR_Info *info); MPI_Aint MPID_Aint_add(MPI_Aint base, MPI_Aint disp); MPI_Aint MPID_Aint_diff(MPI_Aint addr1, MPI_Aint addr2); diff --git a/src/mpid/pamid/src/dyntask/mpid_comm_spawn_multiple.c b/src/mpid/pamid/src/dyntask/mpid_comm_spawn_multiple.c index 7a25806..9597267 100644 --- a/src/mpid/pamid/src/dyntask/mpid_comm_spawn_multiple.c +++ b/src/mpid/pamid/src/dyntask/mpid_comm_spawn_multiple.c @@ -23,7 +23,7 @@ extern mpidi_dynamic_tasking; MPI info values */ /* Turn a SINGLE MPI_Info into an array of PMI_keyvals (return the pointer to the array of PMI keyvals) */ -static int MPIDI_mpi_to_pmi_keyvals( MPID_Info *info_ptr, PMI_keyval_t **kv_ptr, int *nkeys_ptr ) +static int MPIDI_mpi_to_pmi_keyvals( MPIR_Info *info_ptr, PMI_keyval_t **kv_ptr, int *nkeys_ptr ) { char key[MPI_MAX_INFO_KEY]; PMI_keyval_t *kv = 0; @@ -106,10 +106,10 @@ static void MPIDI_free_pmi_keyvals(PMI_keyval_t **kv, int size, int *counts) #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) int MPID_Comm_spawn_multiple(int count, char *array_of_commands[], - char ** array_of_argv[], const int array_of_maxprocs[], - MPID_Info * array_of_info_ptrs[], int root, + char ** array_of_argv[], const int array_of_maxprocs[], + MPIR_Info * array_of_info_ptrs[], int root, MPIR_Comm * comm_ptr, MPIR_Comm ** intercomm, - int array_of_errcodes[]) + int array_of_errcodes[]) { int mpi_errno = MPI_SUCCESS; @@ -136,7 +136,7 @@ int MPID_Comm_spawn_multiple(int count, char *array_of_commands[], */ int MPIDI_Comm_spawn_multiple(int count, char **commands, char ***argvs, int *maxprocs, - MPID_Info **info_ptrs, int root, + MPIR_Info **info_ptrs, int root, MPIR_Comm *comm_ptr, MPIR_Comm **intercomm, int *errcodes) { @@ -149,7 +149,7 @@ int MPIDI_Comm_spawn_multiple(int count, char **commands, PMI_keyval_t **info_keyval_vectors=0, preput_keyval_vector; int *pmi_errcodes = 0, pmi_errno=0; int total_num_processes, should_accept = 1; - MPID_Info tmp_info_ptr; + MPIR_Info tmp_info_ptr; char *tmp; int tmp_ret = 0; @@ -175,8 +175,8 @@ int MPIDI_Comm_spawn_multiple(int count, char **commands, MPIU_Assert(count > 0); { int *argcs = MPL_malloc(count*sizeof(int)); - struct MPID_Info preput; - struct MPID_Info *preput_p[2] = { &preput, &tmp_info_ptr }; + struct MPIR_Info preput; + struct MPIR_Info *preput_p[2] = { &preput, &tmp_info_ptr }; MPIU_Assert(argcs); @@ -210,8 +210,8 @@ int MPIDI_Comm_spawn_multiple(int count, char **commands, pmi_errno = PMI2_Job_Spawn(count, (const char **)commands, argcs, (const char ***)argvs, maxprocs, - info_keyval_sizes, (const MPID_Info **)info_ptrs, - 2, (const struct MPID_Info **)preput_p, + info_keyval_sizes, (const MPIR_Info **)info_ptrs, + 2, (const struct MPIR_Info **)preput_p, jobId, jobIdSize, pmi_errcodes); TRACE_ERR("after PMI2_Job_Spawn - pmi_errno=%d jobId=%s\n", pmi_errno, jobId); diff --git a/src/mpid/pamid/src/dyntask/mpid_port.c b/src/mpid/pamid/src/dyntask/mpid_port.c index 04ae11f..7f115d8 100644 --- a/src/mpid/pamid/src/dyntask/mpid_port.c +++ b/src/mpid/pamid/src/dyntask/mpid_port.c @@ -18,7 +18,7 @@ extern mpidi_dynamic_tasking; -static int MPIDI_Open_port(MPID_Info *, char *); +static int MPIDI_Open_port(MPIR_Info *, char *); static int MPIDI_Close_port(const char *); @@ -45,7 +45,7 @@ static MPIDI_PortFns portFns = { MPIDI_Open_port, .N MPI_SUCCESS .N MPI_ERR_OTHER @*/ -int MPID_Open_port(MPID_Info *info_ptr, char *port_name) +int MPID_Open_port(MPIR_Info *info_ptr, char *port_name) { int mpi_errno=MPI_SUCCESS; @@ -94,7 +94,7 @@ int MPID_Close_port(const char *port_name) #define FUNCNAME MPID_Comm_accept #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) -int MPID_Comm_accept(const char * port_name, MPID_Info * info, int root, +int MPID_Comm_accept(const char * port_name, MPIR_Info * info, int root, MPIR_Comm * comm, MPIR_Comm ** newcomm_ptr) { int mpi_errno = MPI_SUCCESS; @@ -122,7 +122,7 @@ int MPID_Comm_accept(const char * port_name, MPID_Info * info, int root, #define FUNCNAME MPID_Comm_connect #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) -int MPID_Comm_connect(const char * port_name, MPID_Info * info, int root, +int MPID_Comm_connect(const char * port_name, MPIR_Info * info, int root, MPIR_Comm * comm, MPIR_Comm ** newcomm_ptr) { int mpi_errno=MPI_SUCCESS; @@ -224,7 +224,7 @@ static void MPIDI_free_port_name_tag(int tag) /* * MPIDI_Open_port() */ -static int MPIDI_Open_port(MPID_Info *info_ptr, char *port_name) +static int MPIDI_Open_port(MPIR_Info *info_ptr, char *port_name) { int mpi_errno = MPI_SUCCESS; int str_errno = MPL_STR_SUCCESS; diff --git a/src/mpid/pamid/src/dyntask/mpidi_port.c b/src/mpid/pamid/src/dyntask/mpidi_port.c index 121eb07..147d48d 100644 --- a/src/mpid/pamid/src/dyntask/mpidi_port.c +++ b/src/mpid/pamid/src/dyntask/mpidi_port.c @@ -496,7 +496,7 @@ void MPIDI_add_new_tranid(long long tranid) intercommunicator between the roots. Most of the complexity is because there can be multiple process groups on each side. */ -int MPIDI_Comm_connect(const char *port_name, MPID_Info *info, int root, +int MPIDI_Comm_connect(const char *port_name, MPIR_Info *info, int root, struct MPIR_Comm *comm_ptr, struct MPIR_Comm **newcomm) { int mpi_errno=MPI_SUCCESS; @@ -1136,7 +1136,7 @@ static int MPIDI_SendPGtoPeerAndFree( struct MPIR_Comm *tmp_comm, int *sendtag_p process groups on each side. */ -int MPIDI_Comm_accept(const char *port_name, MPID_Info *info, int root, +int MPIDI_Comm_accept(const char *port_name, MPIR_Info *info, int root, struct MPIR_Comm *comm_ptr, struct MPIR_Comm **newcomm) { int mpi_errno=MPI_SUCCESS; diff --git a/src/mpid/pamid/src/misc/mpid_mem.c b/src/mpid/pamid/src/misc/mpid_mem.c index 18d7840..2cd3f55 100644 --- a/src/mpid/pamid/src/misc/mpid_mem.c +++ b/src/mpid/pamid/src/misc/mpid_mem.c @@ -27,7 +27,7 @@ #include <mpidimpl.h> -void *MPID_Alloc_mem( size_t size, MPID_Info *info_ptr ) +void *MPID_Alloc_mem( size_t size, MPIR_Info *info_ptr ) { void *ap; ap = MPL_malloc(size); diff --git a/src/mpid/pamid/src/misc/mpid_unimpl.c b/src/mpid/pamid/src/misc/mpid_unimpl.c index ddcd353..beec015 100644 --- a/src/mpid/pamid/src/misc/mpid_unimpl.c +++ b/src/mpid/pamid/src/misc/mpid_unimpl.c @@ -27,7 +27,7 @@ int MPID_Close_port(const char *port_name) MPID_abort(); return 0; } -int MPID_Open_port(MPID_Info *info_ptr, +int MPID_Open_port(MPIR_Info *info_ptr, char *port_name) { MPID_abort(); @@ -35,7 +35,7 @@ int MPID_Open_port(MPID_Info *info_ptr, } int MPID_Comm_accept(const char *port_name, - MPID_Info *info_ptr, + MPIR_Info *info_ptr, int root, MPIR_Comm *comm_ptr, MPIR_Comm **newcomm) @@ -44,7 +44,7 @@ int MPID_Comm_accept(const char *port_name, return 0; } int MPID_Comm_connect(const char *port_name, - MPID_Info *info_ptr, + MPIR_Info *info_ptr, int root, MPIR_Comm *comm_ptr, MPIR_Comm **newcomm) @@ -61,7 +61,7 @@ int MPID_Comm_spawn_multiple(int count, char *array_of_commands[], char* *array_of_argv[], const int array_of_maxprocs[], - MPID_Info *array_of_info[], + MPIR_Info *array_of_info[], int root, MPIR_Comm *comm_ptr, MPIR_Comm **intercomm, diff --git a/src/mpid/pamid/src/mpid_init.c b/src/mpid/pamid/src/mpid_init.c index f254b31..edbcbad 100644 --- a/src/mpid/pamid/src/mpid_init.c +++ b/src/mpid/pamid/src/mpid_init.c @@ -336,7 +336,7 @@ static struct #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) static int split_type(MPIR_Comm * comm_ptr, int stype, int key, - MPID_Info *info_ptr, MPIR_Comm ** newcomm_ptr) + MPIR_Info *info_ptr, MPIR_Comm ** newcomm_ptr) { MPID_Node_id_t id; int nid; diff --git a/src/mpid/pamid/src/onesided/mpid_win_allocate.c b/src/mpid/pamid/src/onesided/mpid_win_allocate.c index ac0a708..f42e3a3 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_allocate.c +++ b/src/mpid/pamid/src/onesided/mpid_win_allocate.c @@ -48,7 +48,7 @@ int MPID_Win_allocate(MPI_Aint size, int disp_unit, - MPID_Info * info, + MPIR_Info * info, MPIR_Comm * comm_ptr, void *base_ptr, MPIR_Win ** win_ptr) diff --git a/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c b/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c index d59af5f..dcafece 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c +++ b/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c @@ -63,7 +63,7 @@ int CheckRankOnNode(MPIR_Comm * comm_ptr,int *onNode ) { return mpi_errno; } -int CheckSpaceType(MPIR_Win **win_ptr, MPID_Info *info,int *noncontig) { +int CheckSpaceType(MPIR_Win **win_ptr, MPIR_Info *info,int *noncontig) { int mpi_errno=MPI_SUCCESS; /* Check if we are allowed to allocate space non-contiguously */ if (info != NULL) { @@ -478,7 +478,7 @@ fn_fail: int MPID_Win_allocate_shared(MPI_Aint size, int disp_unit, - MPID_Info * info, + MPIR_Info * info, MPIR_Comm * comm_ptr, void *base_ptr, MPIR_Win ** win_ptr) diff --git a/src/mpid/pamid/src/onesided/mpid_win_create.c b/src/mpid/pamid/src/onesided/mpid_win_create.c index b60ad4b..f218d10 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_create.c +++ b/src/mpid/pamid/src/onesided/mpid_win_create.c @@ -32,7 +32,7 @@ int MPIDI_Win_init( MPI_Aint length, int disp_unit, MPIR_Win **win_ptr, - MPID_Info *info, + MPIR_Info *info, MPIR_Comm *comm_ptr, int create_flavor, int model) @@ -182,7 +182,7 @@ int MPID_Win_create(void * base, MPI_Aint size, int disp_unit, - MPID_Info * info, + MPIR_Info * info, MPIR_Comm * comm_ptr, MPIR_Win ** win_ptr) { diff --git a/src/mpid/pamid/src/onesided/mpid_win_create_dynamic.c b/src/mpid/pamid/src/onesided/mpid_win_create_dynamic.c index 6ca66ed..6b989ac 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_create_dynamic.c +++ b/src/mpid/pamid/src/onesided/mpid_win_create_dynamic.c @@ -38,7 +38,7 @@ */ int -MPID_Win_create_dynamic( MPID_Info * info, +MPID_Win_create_dynamic( MPIR_Info * info, MPIR_Comm * comm_ptr, MPIR_Win ** win_ptr) { diff --git a/src/mpid/pamid/src/onesided/mpid_win_get_info.c b/src/mpid/pamid/src/onesided/mpid_win_get_info.c index 259d1cd..e74c379 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_get_info.c +++ b/src/mpid/pamid/src/onesided/mpid_win_get_info.c @@ -30,7 +30,7 @@ * \param[in] info_p_p Info hint * \return MPI_SUCCESS */ -int MPIDI_Win_get_info(MPIR_Win *win, MPID_Info **info_used) +int MPIDI_Win_get_info(MPIR_Win *win, MPIR_Info **info_used) { int mpi_errno = MPI_SUCCESS; @@ -91,7 +91,7 @@ int MPIDI_Win_get_info(MPIR_Win *win, MPID_Info **info_used) int MPID_Win_get_info(MPIR_Win *win, - MPID_Info **info_p) + MPIR_Info **info_p) { int mpi_errno = MPI_SUCCESS; diff --git a/src/mpid/pamid/src/onesided/mpid_win_set_info.c b/src/mpid/pamid/src/onesided/mpid_win_set_info.c index 6d6f09f..78ce569 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_set_info.c +++ b/src/mpid/pamid/src/onesided/mpid_win_set_info.c @@ -30,11 +30,11 @@ * \return MPI_SUCCESS */ -int MPIDI_Win_set_info(MPIR_Win *win, MPID_Info *info) +int MPIDI_Win_set_info(MPIR_Win *win, MPIR_Info *info) { int mpi_errno = MPI_SUCCESS; - MPID_Info *curr_ptr; + MPIR_Info *curr_ptr; char *value, *token; char *savePtr; curr_ptr = info->next; @@ -90,7 +90,7 @@ int MPIDI_Win_set_info(MPIR_Win *win, MPID_Info *info) } int -MPID_Win_set_info(MPIR_Win *win, MPID_Info *info) +MPID_Win_set_info(MPIR_Win *win, MPIR_Info *info) { int mpi_errno = MPI_SUCCESS; MPIR_Errflag_t errflag = MPIR_ERR_NONE; diff --git a/src/mpid/pamid/src/onesided/mpidi_onesided.h b/src/mpid/pamid/src/onesided/mpidi_onesided.h index bd93d24..f54b73d 100644 --- a/src/mpid/pamid/src/onesided/mpidi_onesided.h +++ b/src/mpid/pamid/src/onesided/mpidi_onesided.h @@ -350,7 +350,7 @@ int MPIDI_Win_init( MPI_Aint length, int disp_unit, MPIR_Win **win_ptr, - MPID_Info *info, + MPIR_Info *info, MPIR_Comm *comm_ptr, int create_flavor, int model); diff --git a/src/nameserv/file/file_nameserv.c b/src/nameserv/file/file_nameserv.c index 2c30622..3738a35 100644 --- a/src/nameserv/file/file_nameserv.c +++ b/src/nameserv/file/file_nameserv.c @@ -64,7 +64,7 @@ struct MPID_NS_Handle { publishing. */ #undef FUNCNAME #define FUNCNAME MPID_NS_Create -int MPID_NS_Create( const MPID_Info *info_ptr, MPID_NS_Handle *handle_ptr ) +int MPID_NS_Create( const MPIR_Info *info_ptr, MPID_NS_Handle *handle_ptr ) { static const char FCNAME[] = "MPID_NS_Create"; const char *dirname; @@ -112,7 +112,7 @@ int MPID_NS_Create( const MPID_Info *info_ptr, MPID_NS_Handle *handle_ptr ) #undef FUNCNAME #define FUNCNAME MPID_NS_Publish -int MPID_NS_Publish( MPID_NS_Handle handle, const MPID_Info *info_ptr, +int MPID_NS_Publish( MPID_NS_Handle handle, const MPIR_Info *info_ptr, const char service_name[], const char port[] ) { static const char FCNAME[] = "MPID_NS_Publish"; @@ -194,7 +194,7 @@ int MPID_NS_Publish( MPID_NS_Handle handle, const MPID_Info *info_ptr, #undef FUNCNAME #define FUNCNAME MPID_NS_Lookup -int MPID_NS_Lookup( MPID_NS_Handle handle, const MPID_Info *info_ptr, +int MPID_NS_Lookup( MPID_NS_Handle handle, const MPIR_Info *info_ptr, const char service_name[], char port[] ) { FILE *fp; @@ -243,7 +243,7 @@ int MPID_NS_Lookup( MPID_NS_Handle handle, const MPID_Info *info_ptr, #undef FUNCNAME #define FUNCNAME MPID_NS_Unpublish -int MPID_NS_Unpublish( MPID_NS_Handle handle, const MPID_Info *info_ptr, +int MPID_NS_Unpublish( MPID_NS_Handle handle, const MPIR_Info *info_ptr, const char service_name[] ) { static const char FCNAME[] = "MPID_NS_Unpublish"; diff --git a/src/nameserv/pmi/pmi_nameserv.c b/src/nameserv/pmi/pmi_nameserv.c index 5034c9f..7e45c81 100644 --- a/src/nameserv/pmi/pmi_nameserv.c +++ b/src/nameserv/pmi/pmi_nameserv.c @@ -26,7 +26,7 @@ struct MPID_NS_Handle { int dummy; }; /* unused for now */ #define FUNCNAME MPID_NS_Create #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_NS_Create( const MPID_Info *info_ptr, MPID_NS_Handle *handle_ptr ) +int MPID_NS_Create( const MPIR_Info *info_ptr, MPID_NS_Handle *handle_ptr ) { static struct MPID_NS_Handle nsHandleWithNoData; @@ -40,7 +40,7 @@ int MPID_NS_Create( const MPID_Info *info_ptr, MPID_NS_Handle *handle_ptr ) #define FUNCNAME MPID_NS_Publish #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_NS_Publish( MPID_NS_Handle handle, const MPID_Info *info_ptr, +int MPID_NS_Publish( MPID_NS_Handle handle, const MPIR_Info *info_ptr, const char service_name[], const char port[] ) { int mpi_errno = MPI_SUCCESS; @@ -66,7 +66,7 @@ fn_fail: #define FUNCNAME MPID_NS_Lookup #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_NS_Lookup( MPID_NS_Handle handle, const MPID_Info *info_ptr, +int MPID_NS_Lookup( MPID_NS_Handle handle, const MPIR_Info *info_ptr, const char service_name[], char port[] ) { int mpi_errno = MPI_SUCCESS; @@ -92,7 +92,7 @@ fn_fail: #define FUNCNAME MPID_NS_Unpublish #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_NS_Unpublish( MPID_NS_Handle handle, const MPID_Info *info_ptr, +int MPID_NS_Unpublish( MPID_NS_Handle handle, const MPIR_Info *info_ptr, const char service_name[] ) { int mpi_errno = MPI_SUCCESS; @@ -148,7 +148,7 @@ struct MPID_NS_Handle #undef FUNCNAME #define FUNCNAME MPID_NS_Create -int MPID_NS_Create( const MPID_Info *info_ptr, MPID_NS_Handle *handle_ptr ) +int MPID_NS_Create( const MPIR_Info *info_ptr, MPID_NS_Handle *handle_ptr ) { static const char FCNAME[] = "MPID_NS_Create"; int err; @@ -203,7 +203,7 @@ int MPID_NS_Create( const MPID_Info *info_ptr, MPID_NS_Handle *handle_ptr ) #undef FUNCNAME #define FUNCNAME MPID_NS_Publish -int MPID_NS_Publish( MPID_NS_Handle handle, const MPID_Info *info_ptr, +int MPID_NS_Publish( MPID_NS_Handle handle, const MPIR_Info *info_ptr, const char service_name[], const char port[] ) { static const char FCNAME[] = "MPID_NS_Publish"; @@ -232,7 +232,7 @@ int MPID_NS_Publish( MPID_NS_Handle handle, const MPID_Info *info_ptr, #undef FUNCNAME #define FUNCNAME MPID_NS_Lookup -int MPID_NS_Lookup( MPID_NS_Handle handle, const MPID_Info *info_ptr, +int MPID_NS_Lookup( MPID_NS_Handle handle, const MPIR_Info *info_ptr, const char service_name[], char port[] ) { static const char FCNAME[] = "MPID_NS_Lookup"; @@ -257,7 +257,7 @@ int MPID_NS_Lookup( MPID_NS_Handle handle, const MPID_Info *info_ptr, #undef FUNCNAME #define FUNCNAME MPID_NS_Unpublish -int MPID_NS_Unpublish( MPID_NS_Handle handle, const MPID_Info *info_ptr, +int MPID_NS_Unpublish( MPID_NS_Handle handle, const MPIR_Info *info_ptr, const char service_name[] ) { static const char FCNAME[] = "MPID_NS_Unpublish"; diff --git a/src/nameserv/test/testnd.c b/src/nameserv/test/testnd.c index ee53f51..5f910c7 100644 --- a/src/nameserv/test/testnd.c +++ b/src/nameserv/test/testnd.c @@ -12,8 +12,8 @@ #include <stdio.h> #include <stdarg.h> /* This is incomplete for the purposes of testing */ -typedef struct { int handle; } MPID_Info; -#define MPID_INFO_NULL ((MPID_Info *)0) +typedef struct { int handle; } MPIR_Info; +#define MPIR_INFO_NULL ((MPIR_Info *)0) #include "namepub.h" void Error( const char *fmat, ... ); @@ -27,26 +27,26 @@ int main( int argc, char *argv[] ) int rc; /* Create a name service */ - rc = MPID_NS_Create( MPID_INFO_NULL, &ns ); + rc = MPID_NS_Create( MPIR_INFO_NULL, &ns ); if (rc) { Error( "Could not create name service; rc = %d\n", rc ); } /* publish several names */ - rc = MPID_NS_Publish( ns, MPID_INFO_NULL, "name1", "foo$$12" ); + rc = MPID_NS_Publish( ns, MPIR_INFO_NULL, "name1", "foo$$12" ); if (rc) { Error( "Could not publish name1; rc = %d\n", rc ); } - rc = MPID_NS_Publish( ns, MPID_INFO_NULL, "namea", "bar--14" ); + rc = MPID_NS_Publish( ns, MPIR_INFO_NULL, "namea", "bar--14" ); if (rc) { Error( "Could not publish namea; rc = %d\n", rc ); } - rc = MPID_NS_Publish( ns, MPID_INFO_NULL, "1-2-3", "testname" ); + rc = MPID_NS_Publish( ns, MPIR_INFO_NULL, "1-2-3", "testname" ); if (rc) { Error( "Could not publish 1-2-3; rc = %d\n", rc ); } /* Try look ups */ - rc = MPID_NS_Lookup( ns, MPID_INFO_NULL, "name1", port ); + rc = MPID_NS_Lookup( ns, MPIR_INFO_NULL, "name1", port ); if (rc) { Error( "Could not lookup name1; rc = %d\n", rc ); } @@ -56,7 +56,7 @@ int main( int argc, char *argv[] ) } } - rc = MPID_NS_Lookup( ns, MPID_INFO_NULL, "namea", port ); + rc = MPID_NS_Lookup( ns, MPIR_INFO_NULL, "namea", port ); if (rc) { Error( "Could not lookup namea; rc = %d\n", rc ); } @@ -66,7 +66,7 @@ int main( int argc, char *argv[] ) } } - rc = MPID_NS_Lookup( ns, MPID_INFO_NULL, "1-2-3", port ); + rc = MPID_NS_Lookup( ns, MPIR_INFO_NULL, "1-2-3", port ); if (rc) { Error( "Could not lookup 1-2-3; rc = %d\n", rc ); } @@ -78,16 +78,16 @@ int main( int argc, char *argv[] ) /* Try a name that isn't published */ port[0] = 0; - rc = MPID_NS_Lookup( ns, MPID_INFO_NULL, "name", port ); + rc = MPID_NS_Lookup( ns, MPIR_INFO_NULL, "name", port ); if (!rc) { Error( "Found port (%s) for unpublished name\n", port ); } - rc = MPID_NS_Publish( ns, MPID_INFO_NULL, "name 1", "foo 12" ); + rc = MPID_NS_Publish( ns, MPIR_INFO_NULL, "name 1", "foo 12" ); if (rc) { Error( "Could not publish \"name 1\"; rc = %d\n", rc ); } - rc = MPID_NS_Lookup( ns, MPID_INFO_NULL, "name 1", port ); + rc = MPID_NS_Lookup( ns, MPIR_INFO_NULL, "name 1", port ); if (rc) { Error( "Could not lookup \"name 1\"; rc = %d\n", rc ); } @@ -98,13 +98,13 @@ int main( int argc, char *argv[] ) } /* Note that there are some restrictions in the file-based version */ - rc = MPID_NS_Publish( ns, MPID_INFO_NULL, "name/1", "foo/12a" ); + rc = MPID_NS_Publish( ns, MPIR_INFO_NULL, "name/1", "foo/12a" ); if (rc) { /* Allow publish to fail with some names */ ; } else { - rc = MPID_NS_Lookup( ns, MPID_INFO_NULL, "name/1", port ); + rc = MPID_NS_Lookup( ns, MPIR_INFO_NULL, "name/1", port ); if (rc) { Error( "Could not lookup name/1; rc = %d\n", rc ); } @@ -113,26 +113,26 @@ int main( int argc, char *argv[] ) Error( "Wrong value for port, got %s\n", port ); } } - rc = MPID_NS_Unpublish( ns, MPID_INFO_NULL, "name/1" ); + rc = MPID_NS_Unpublish( ns, MPIR_INFO_NULL, "name/1" ); if (rc) { Error( "Could not unpublish name/1; rc = %d\n", rc ); } } /* Try to unpublish the names */ - rc = MPID_NS_Unpublish( ns, MPID_INFO_NULL, "name1" ); + rc = MPID_NS_Unpublish( ns, MPIR_INFO_NULL, "name1" ); if (rc) { Error( "Could not unpublish name1; rc = %d\n", rc ); } - rc = MPID_NS_Unpublish( ns, MPID_INFO_NULL, "name 1" ); + rc = MPID_NS_Unpublish( ns, MPIR_INFO_NULL, "name 1" ); if (rc) { Error( "Could not unpublish \"name 1\"; rc = %d\n", rc ); } - rc = MPID_NS_Unpublish( ns, MPID_INFO_NULL, "namea" ); + rc = MPID_NS_Unpublish( ns, MPIR_INFO_NULL, "namea" ); if (rc) { Error( "Could not unpublish namea; rc = %d\n", rc ); } - rc = MPID_NS_Unpublish( ns, MPID_INFO_NULL, "1-2-3" ); + rc = MPID_NS_Unpublish( ns, MPIR_INFO_NULL, "1-2-3" ); if (rc) { Error( "Could not unpublish 1-2-3; rc = %d\n", rc ); } diff --git a/src/pmi/pmi2/poe/poe2pmi.c b/src/pmi/pmi2/poe/poe2pmi.c index f2824fe..28cc16f 100644 --- a/src/pmi/pmi2/poe/poe2pmi.c +++ b/src/pmi/pmi2/poe/poe2pmi.c @@ -153,9 +153,9 @@ int PMI2_Job_Spawn(int count, const char * cmds[], int argcs[], const char ** argvs[], const int maxprocs[], const int info_keyval_sizes[], - const struct MPID_Info *info_keyval_vectors[], + const struct MPIR_Info *info_keyval_vectors[], int preput_keyval_size, - const struct MPID_Info *preput_keyval_vector[], + const struct MPIR_Info *preput_keyval_vector[], char jobId[], int jobIdSize, int errors[]) { @@ -168,7 +168,7 @@ int PMI2_Job_Spawn(int count, const char * cmds[], const char *errmsg = NULL; int pmi2_errno = 0; - int (*pmi2_job_spawn)(int , const char * [], int [], const char ** [],const int [],const int [],const struct MPID_Info *[],int ,const struct MPID_Info *[],char jobId[],int ,int []); + int (*pmi2_job_spawn)(int , const char * [], int [], const char ** [],const int [],const int [],const struct MPIR_Info *[],int ,const struct MPIR_Info *[],char jobId[],int ,int []); pmi2_job_spawn = (int (*)())dlsym(poeptr, "PMI2_Job_Spawn"); if (pmi2_job_spawn == NULL) { diff --git a/src/pmi/pmi2/simple/pmi2compat.h b/src/pmi/pmi2/simple/pmi2compat.h index 28941a3..d897d75 100644 --- a/src/pmi/pmi2/simple/pmi2compat.h +++ b/src/pmi/pmi2/simple/pmi2compat.h @@ -12,6 +12,6 @@ #define PMI2U_Strnapp MPL_strnapp #define PMI2U_Assert MPIU_Assert #define PMI2U_Exit MPL_exit -#define PMI2U_Info MPID_Info +#define PMI2U_Info MPIR_Info #define PMI2U_Memcpy MPIU_Memcpy diff --git a/src/pmi/pmi2/simple/simple2pmi.c b/src/pmi/pmi2/simple/simple2pmi.c index fb18b24..129ce33 100644 --- a/src/pmi/pmi2/simple/simple2pmi.c +++ b/src/pmi/pmi2/simple/simple2pmi.c @@ -404,9 +404,9 @@ int PMI2_Job_Spawn(int count, const char * cmds[], int argcs[], const char ** argvs[], const int maxprocs[], const int info_keyval_sizes[], - const struct MPID_Info *info_keyval_vectors[], + const struct MPIR_Info *info_keyval_vectors[], int preput_keyval_size, - const struct MPID_Info *preput_keyval_vector[], + const struct MPIR_Info *preput_keyval_vector[], char jobId[], int jobIdSize, int errors[]) { diff --git a/src/util/mem/handlemem.c b/src/util/mem/handlemem.c index 4681c3d..6c0d591 100644 --- a/src/util/mem/handlemem.c +++ b/src/util/mem/handlemem.c @@ -473,7 +473,7 @@ void *MPIU_Handle_get_ptr_indirect( int handle, MPIU_Object_alloc_t *objmem ) index_num = HANDLE_BLOCK_INDEX(handle); /* If we could declare the blocks to a known size object, we could do something like - return &( (MPID_Info**)*MPIU_Info_mem.indirect)[block_num][index_num]; + return &( (MPIR_Info**)*MPIU_Info_mem.indirect)[block_num][index_num]; since we cannot, we do the calculation by hand. */ /* Get the pointer to the block of addresses. This is an array of http://git.mpich.org/mpich.git/commitdiff/c255813a99e9c68f94b0c5c9bc1b1399f… commit c255813a99e9c68f94b0c5c9bc1b1399fb6f173e Author: Wesley Bland <wesley.bland(a)intel.com> Date: Mon Apr 18 17:19:13 2016 -0500 Rename MPID_Win to MPIR_Win Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/doc/notes/rma/dm-mt.c b/doc/notes/rma/dm-mt.c index e0a70a3..6b10f31 100644 --- a/doc/notes/rma/dm-mt.c +++ b/doc/notes/rma/dm-mt.c @@ -11,7 +11,7 @@ MPID_Win_fence(). ******************************************************************************/ -struct MPID_Win +struct MPIR_Win { /*** insert struct MPIR_Win here ***/ diff --git a/doc/notes/rma/dm.c b/doc/notes/rma/dm.c index 8be68c4..334713f 100644 --- a/doc/notes/rma/dm.c +++ b/doc/notes/rma/dm.c @@ -2,7 +2,7 @@ Distributed Memory Implementation ******************************************************************************/ -struct MPID_Win +struct MPIR_Win { /*** insert struct MPIR_Win here ***/ diff --git a/doc/notes/rma/mpi.c b/doc/notes/rma/mpi.c index 5bab749..6a6da01 100644 --- a/doc/notes/rma/mpi.c +++ b/doc/notes/rma/mpi.c @@ -21,7 +21,7 @@ struct MPIR_Win MPI_Win_create(base, size, disp_unit, info, comm, win) { - dwin = malloc(sizeof(MPID_Win)); + dwin = malloc(sizeof(MPIR_Win)); dwin->rank = MPI_Comm_rank(comm); dwin->np = MPI_Comm_size(comm); MPI_Comm_dup(comm, dwin_p.comm); @@ -33,8 +33,8 @@ MPI_Win_create(base, size, disp_unit, info, comm, win) dwin->displ = disp_unit; dwin->bases = malloc(sizeof(void *) * dwin->np); - dwin->sizes = malloc(sizeof(MPID_Win * dwin->np); - dwin->displs = malloc(sizeof(MPID_Win) * dwin->np); + dwin->sizes = malloc(sizeof(MPIR_Win * dwin->np); + dwin->displs = malloc(sizeof(MPIR_Win) * dwin->np); rc = MPI_Allgather(dwin->base, dwin->bases, dwin->comm); rc = MPI_Allgather(dwin->size, dwin->sizes, dwin->comm); diff --git a/doc/notes/rma/mpi.txt b/doc/notes/rma/mpi.txt index 6b89ff3..1818e37 100644 --- a/doc/notes/rma/mpi.txt +++ b/doc/notes/rma/mpi.txt @@ -46,17 +46,17 @@ Data structures MPI_Win_create -* Allocate a MPID_Win structure and fill in the device independent portion +* Allocate a MPIR_Win structure and fill in the device independent portion (MPIR_Win). * Create a copy of the communcator provided by the user so the window has its own communcation context. Q: Which layer (MPI/ADI3) should manage (be responsible for - creating, destroying, etc.) the MPID_Win object? + creating, destroying, etc.) the MPIR_Win object? - Q: Assuming the MPI layer managed the MPID_Win object, should - MPID_Win be allocated using an MPID function? Would this buy us + Q: Assuming the MPI layer managed the MPIR_Win object, should + MPIR_Win be allocated using an MPID function? Would this buy us anything? * Acquire information about all of the processes involved in this window. diff --git a/src/include/mpierror.h b/src/include/mpierror.h index db5e20c..ab30bc5 100644 --- a/src/include/mpierror.h +++ b/src/include/mpierror.h @@ -12,12 +12,12 @@ #define MPIR_ERR_RECOVERABLE 0 struct MPIR_Comm; -struct MPID_Win; +struct MPIR_Win; /*struct MPID_File;*/ /* Bindings for internal routines */ int MPIR_Err_return_comm( struct MPIR_Comm *, const char [], int ); -int MPIR_Err_return_win( struct MPID_Win *, const char [], int ); +int MPIR_Err_return_win( struct MPIR_Win *, const char [], int ); /*int MPIR_Err_return_file( struct MPID_File *, const char [], int );*/ #ifdef MPI__FILE_DEFINED /* Only define if we have MPI_File */ diff --git a/src/include/mpierrs.h b/src/include/mpierrs.h index 795e36d..70ba770 100644 --- a/src/include/mpierrs.h +++ b/src/include/mpierrs.h @@ -421,7 +421,7 @@ cvars: } \ else \ { \ - MPIR_ERRTEST_VALID_HANDLE((win_), MPID_WIN, (err_), MPI_ERR_WIN, "**win"); \ + MPIR_ERRTEST_VALID_HANDLE((win_), MPIR_WIN, (err_), MPI_ERR_WIN, "**win"); \ } \ } diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index d5cad8c..1cdfdb9 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -404,7 +404,7 @@ void MPIR_DatatypeAttrFinalize( void ); #define MPIR_Errhandler_get_ptr(a,ptr) MPID_Getb_ptr(Errhandler,a,0x3,ptr) #define MPID_Op_get_ptr(a,ptr) MPID_Getb_ptr(Op,a,0x000000ff,ptr) #define MPID_Info_get_ptr(a,ptr) MPID_Getb_ptr(Info,a,0x03ffffff,ptr) -#define MPID_Win_get_ptr(a,ptr) MPID_Get_ptr(Win,a,ptr) +#define MPIR_Win_get_ptr(a,ptr) MPID_Get_ptr(Win,a,ptr) #define MPID_Request_get_ptr(a,ptr) MPID_Get_ptr(Request,a,ptr) #define MPID_Grequest_class_get_ptr(a,ptr) MPID_Get_ptr(Grequest_class,a,ptr) /* Keyvals have a special format. This is roughly MPID_Get_ptrb, but @@ -459,7 +459,7 @@ void MPIR_DatatypeAttrFinalize( void ); } \ } #define MPIR_Group_valid_ptr(ptr,err) MPID_Valid_ptr_class(Group,ptr,MPI_ERR_GROUP,err) -#define MPID_Win_valid_ptr(ptr,err) MPID_Valid_ptr_class(Win,ptr,MPI_ERR_WIN,err) +#define MPIR_Win_valid_ptr(ptr,err) MPID_Valid_ptr_class(Win,ptr,MPI_ERR_WIN,err) #define MPID_Op_valid_ptr(ptr,err) MPID_Valid_ptr_class(Op,ptr,MPI_ERR_OP,err) #define MPIR_Errhandler_valid_ptr(ptr,err) MPID_Valid_ptr_class(Errhandler,ptr,MPI_ERR_ARG,err) #define MPID_File_valid_ptr(ptr,err) MPID_Valid_ptr_class(File,ptr,MPI_ERR_FILE,err) @@ -1250,7 +1250,7 @@ typedef struct MPIR_Comm { struct MPIR_Collops *coll_fns; /* Pointer to a table of functions implementing the collective routines */ - struct MPID_TopoOps *topo_fns; /* Pointer to a table of functions + struct MPIR_TopoOps *topo_fns; /* Pointer to a table of functions implementting the topology routines */ int next_sched_tag; /* used by the NBC schedule code to allocate tags */ @@ -1629,7 +1629,7 @@ MPID_Progress_state; /* ------------------------------------------------------------------------- */ /*S - MPID_Win - Description of the Window Object data structure. + MPIR_Win - Description of the Window Object data structure. Module: Win-DS @@ -1660,7 +1660,7 @@ MPID_Progress_state; (or 'MPID_Request')s? S*/ -typedef struct MPID_Win { +typedef struct MPIR_Win { MPIU_OBJECT_HEADER; /* adds handle and ref_count fields */ MPID_Thread_mutex_t mutex; MPIR_Errhandler *errhandler; /* Pointer to the error handler structure */ @@ -1702,10 +1702,10 @@ typedef struct MPID_Win { #ifdef MPID_DEV_WIN_DECL MPID_DEV_WIN_DECL #endif -} MPID_Win; -extern MPIU_Object_alloc_t MPID_Win_mem; +} MPIR_Win; +extern MPIU_Object_alloc_t MPIR_Win_mem; /* Preallocated win objects */ -extern MPID_Win MPID_Win_direct[]; +extern MPIR_Win MPIR_Win_direct[]; /* ------------------------------------------------------------------------- */ /* also in mpirma.h ?*/ @@ -2046,7 +2046,7 @@ typedef struct MPIR_Collops { */ /* ------------------------------------------------------------------------- */ -typedef struct MPID_TopoOps { +typedef struct MPIR_TopoOps { int (*cartCreate)( const MPIR_Comm *, int, const int[], const int [], int, MPI_Comm * ); int (*cartMap) ( const MPIR_Comm *, int, const int[], const int [], @@ -2055,7 +2055,7 @@ typedef struct MPID_TopoOps { int, MPI_Comm * ); int (*graphMap) ( const MPIR_Comm *, int, const int[], const int[], int * ); -} MPID_TopoOps; +} MPIR_TopoOps; /* ------------------------------------------------------------------------- */ /* end of mpitopo.h (in src/mpi/topo? */ /* ------------------------------------------------------------------------- */ @@ -3322,75 +3322,75 @@ MPI_Aint MPID_Aint_diff(MPI_Aint addr1, MPI_Aint addr2); /* MPI-2 RMA Routines */ int MPID_Win_create(void *, MPI_Aint, int, MPID_Info *, MPIR_Comm *, - MPID_Win **); -int MPID_Win_free(MPID_Win **); + MPIR_Win **); +int MPID_Win_free(MPIR_Win **); int MPID_Put(const void *, int, MPI_Datatype, int, MPI_Aint, int, - MPI_Datatype, MPID_Win *); + MPI_Datatype, MPIR_Win *); int MPID_Get(void *, int, MPI_Datatype, int, MPI_Aint, int, - MPI_Datatype, MPID_Win *); + MPI_Datatype, MPIR_Win *); int MPID_Accumulate(const void *, int, MPI_Datatype, int, MPI_Aint, int, - MPI_Datatype, MPI_Op, MPID_Win *); + MPI_Datatype, MPI_Op, MPIR_Win *); -int MPID_Win_fence(int, MPID_Win *); -int MPID_Win_post(MPIR_Group *group_ptr, int assert, MPID_Win *win_ptr); -int MPID_Win_start(MPIR_Group *group_ptr, int assert, MPID_Win *win_ptr); -int MPID_Win_test(MPID_Win *win_ptr, int *flag); -int MPID_Win_wait(MPID_Win *win_ptr); -int MPID_Win_complete(MPID_Win *win_ptr); +int MPID_Win_fence(int, MPIR_Win *); +int MPID_Win_post(MPIR_Group *group_ptr, int assert, MPIR_Win *win_ptr); +int MPID_Win_start(MPIR_Group *group_ptr, int assert, MPIR_Win *win_ptr); +int MPID_Win_test(MPIR_Win *win_ptr, int *flag); +int MPID_Win_wait(MPIR_Win *win_ptr); +int MPID_Win_complete(MPIR_Win *win_ptr); -int MPID_Win_lock(int lock_type, int dest, int assert, MPID_Win *win_ptr); -int MPID_Win_unlock(int dest, MPID_Win *win_ptr); +int MPID_Win_lock(int lock_type, int dest, int assert, MPIR_Win *win_ptr); +int MPID_Win_unlock(int dest, MPIR_Win *win_ptr); /* MPI-3 RMA Routines */ int MPID_Win_allocate(MPI_Aint size, int disp_unit, MPID_Info *info, - MPIR_Comm *comm, void *baseptr, MPID_Win **win); + MPIR_Comm *comm, void *baseptr, MPIR_Win **win); int MPID_Win_allocate_shared(MPI_Aint size, int disp_unit, MPID_Info *info_ptr, MPIR_Comm *comm_ptr, - void *base_ptr, MPID_Win **win_ptr); -int MPID_Win_shared_query(MPID_Win *win, int rank, MPI_Aint *size, int *disp_unit, + void *base_ptr, MPIR_Win **win_ptr); +int MPID_Win_shared_query(MPIR_Win *win, int rank, MPI_Aint *size, int *disp_unit, void *baseptr); -int MPID_Win_create_dynamic(MPID_Info *info, MPIR_Comm *comm, MPID_Win **win); -int MPID_Win_attach(MPID_Win *win, void *base, MPI_Aint size); -int MPID_Win_detach(MPID_Win *win, const void *base); -int MPID_Win_get_info(MPID_Win *win, MPID_Info **info_used); -int MPID_Win_set_info(MPID_Win *win, MPID_Info *info); +int MPID_Win_create_dynamic(MPID_Info *info, MPIR_Comm *comm, MPIR_Win **win); +int MPID_Win_attach(MPIR_Win *win, void *base, MPI_Aint size); +int MPID_Win_detach(MPIR_Win *win, const void *base); +int MPID_Win_get_info(MPIR_Win *win, MPID_Info **info_used); +int MPID_Win_set_info(MPIR_Win *win, MPID_Info *info); int MPID_Get_accumulate(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, void *result_addr, int result_count, MPI_Datatype result_datatype, int target_rank, MPI_Aint target_disp, - int target_count, MPI_Datatype target_datatype, MPI_Op op, MPID_Win *win); + int target_count, MPI_Datatype target_datatype, MPI_Op op, MPIR_Win *win); int MPID_Fetch_and_op(const void *origin_addr, void *result_addr, MPI_Datatype datatype, int target_rank, MPI_Aint target_disp, - MPI_Op op, MPID_Win *win); + MPI_Op op, MPIR_Win *win); int MPID_Compare_and_swap(const void *origin_addr, const void *compare_addr, void *result_addr, MPI_Datatype datatype, int target_rank, - MPI_Aint target_disp, MPID_Win *win); + MPI_Aint target_disp, MPIR_Win *win); int MPID_Rput(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, MPI_Aint target_disp, - int target_count, MPI_Datatype target_datatype, MPID_Win *win, + int target_count, MPI_Datatype target_datatype, MPIR_Win *win, MPID_Request **request); int MPID_Rget(void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, MPI_Aint target_disp, - int target_count, MPI_Datatype target_datatype, MPID_Win *win, + int target_count, MPI_Datatype target_datatype, MPIR_Win *win, MPID_Request **request); int MPID_Raccumulate(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, MPI_Aint target_disp, - int target_count, MPI_Datatype target_datatype, MPI_Op op, MPID_Win *win, + int target_count, MPI_Datatype target_datatype, MPI_Op op, MPIR_Win *win, MPID_Request **request); int MPID_Rget_accumulate(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, void *result_addr, int result_count, MPI_Datatype result_datatype, int target_rank, MPI_Aint target_disp, - int target_count, MPI_Datatype target_datatype, MPI_Op op, MPID_Win *win, + int target_count, MPI_Datatype target_datatype, MPI_Op op, MPIR_Win *win, MPID_Request **request); -int MPID_Win_lock_all(int assert, MPID_Win *win); -int MPID_Win_unlock_all(MPID_Win *win); -int MPID_Win_flush(int rank, MPID_Win *win); -int MPID_Win_flush_all(MPID_Win *win); -int MPID_Win_flush_local(int rank, MPID_Win *win); -int MPID_Win_flush_local_all(MPID_Win *win); -int MPID_Win_sync(MPID_Win *win); +int MPID_Win_lock_all(int assert, MPIR_Win *win); +int MPID_Win_unlock_all(MPIR_Win *win); +int MPID_Win_flush(int rank, MPIR_Win *win); +int MPID_Win_flush_all(MPIR_Win *win); +int MPID_Win_flush_local(int rank, MPIR_Win *win); +int MPID_Win_flush_local_all(MPIR_Win *win); +int MPID_Win_sync(MPIR_Win *win); /*@ diff --git a/src/mpi/attr/win_delete_attr.c b/src/mpi/attr/win_delete_attr.c index c7611a5..cce18d2 100644 --- a/src/mpi/attr/win_delete_attr.c +++ b/src/mpi/attr/win_delete_attr.c @@ -53,7 +53,7 @@ int MPI_Win_delete_attr(MPI_Win win, int win_keyval) { static const char FCNAME[] = "MPI_Win_delete_attr"; int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPIR_Attribute *p, **old_p; MPID_Keyval *keyval_ptr=0; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_DELETE_ATTR); @@ -71,7 +71,7 @@ int MPI_Win_delete_attr(MPI_Win win, int win_keyval) MPID_BEGIN_ERROR_CHECKS; { MPIR_ERRTEST_WIN(win, mpi_errno); - MPIR_ERRTEST_KEYVAL(win_keyval, MPID_WIN, "window", mpi_errno); + MPIR_ERRTEST_KEYVAL(win_keyval, MPIR_WIN, "window", mpi_errno); MPIR_ERRTEST_KEYVAL_PERM(win_keyval, mpi_errno); } MPID_END_ERROR_CHECKS; @@ -79,7 +79,7 @@ int MPI_Win_delete_attr(MPI_Win win, int win_keyval) # endif /* Convert MPI object handles to object pointers */ - MPID_Win_get_ptr( win, win_ptr ); + MPIR_Win_get_ptr( win, win_ptr ); MPID_Keyval_get_ptr( win_keyval, keyval_ptr ); # ifdef HAVE_ERROR_CHECKING @@ -87,7 +87,7 @@ int MPI_Win_delete_attr(MPI_Win win, int win_keyval) MPID_BEGIN_ERROR_CHECKS; { /* Validate win_ptr */ - MPID_Win_valid_ptr( win_ptr, mpi_errno ); + MPIR_Win_valid_ptr( win_ptr, mpi_errno ); /* If win_ptr is not valid, it will be reset to null */ /* Validate keyval_ptr */ MPID_Keyval_valid_ptr( keyval_ptr, mpi_errno ); diff --git a/src/mpi/attr/win_free_keyval.c b/src/mpi/attr/win_free_keyval.c index 67d516c..bacbb7d 100644 --- a/src/mpi/attr/win_free_keyval.c +++ b/src/mpi/attr/win_free_keyval.c @@ -68,7 +68,7 @@ int MPI_Win_free_keyval(int *win_keyval) MPID_BEGIN_ERROR_CHECKS; { MPIR_ERRTEST_ARGNULL(*win_keyval, "win_keyval", mpi_errno); - MPIR_ERRTEST_KEYVAL(*win_keyval, MPID_WIN, "window", mpi_errno); + MPIR_ERRTEST_KEYVAL(*win_keyval, MPIR_WIN, "window", mpi_errno); MPIR_ERRTEST_KEYVAL_PERM(*win_keyval, mpi_errno); } MPID_END_ERROR_CHECKS; diff --git a/src/mpi/attr/win_get_attr.c b/src/mpi/attr/win_get_attr.c index 397fea0..44f8405 100644 --- a/src/mpi/attr/win_get_attr.c +++ b/src/mpi/attr/win_get_attr.c @@ -33,7 +33,7 @@ int MPIR_WinGetAttr( MPI_Win win, int win_keyval, void *attribute_val, int *flag, MPIR_AttrType outAttrType ) { int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPIR_WIN_GET_ATTR); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -47,7 +47,7 @@ int MPIR_WinGetAttr( MPI_Win win, int win_keyval, void *attribute_val, MPID_BEGIN_ERROR_CHECKS; { MPIR_ERRTEST_WIN(win, mpi_errno); - MPIR_ERRTEST_KEYVAL(win_keyval, MPID_WIN, "window", mpi_errno); + MPIR_ERRTEST_KEYVAL(win_keyval, MPIR_WIN, "window", mpi_errno); # ifdef NEEDS_POINTER_ALIGNMENT_ADJUST /* A common user error is to pass the address of a 4-byte int when the address of a pointer (or an address-sized int) @@ -64,7 +64,7 @@ int MPIR_WinGetAttr( MPI_Win win, int win_keyval, void *attribute_val, # endif /* Convert MPI object handles to object pointers */ - MPID_Win_get_ptr( win, win_ptr ); + MPIR_Win_get_ptr( win, win_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -72,7 +72,7 @@ int MPIR_WinGetAttr( MPI_Win win, int win_keyval, void *attribute_val, MPID_BEGIN_ERROR_CHECKS; { /* Validate win_ptr */ - MPID_Win_valid_ptr( win_ptr, mpi_errno ); + MPIR_Win_valid_ptr( win_ptr, mpi_errno ); /* If win_ptr is not valid, it will be reset to null */ MPIR_ERRTEST_ARGNULL(attribute_val, "attribute_val", mpi_errno); MPIR_ERRTEST_ARGNULL(flag, "flag", mpi_errno); @@ -255,7 +255,7 @@ int MPI_Win_get_attr(MPI_Win win, int win_keyval, void *attribute_val, { int mpi_errno = MPI_SUCCESS; #ifdef HAVE_ERROR_CHECKING - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; #endif MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_GET_ATTR); @@ -283,7 +283,7 @@ int MPI_Win_get_attr(MPI_Win win, int win_keyval, void *attribute_val, "**mpi_win_get_attr %W %d %p %p", win, win_keyval, attribute_val, flag); } - MPID_Win_get_ptr( win, win_ptr ); + MPIR_Win_get_ptr( win, win_ptr ); mpi_errno = MPIR_Err_return_win( win_ptr, FCNAME, mpi_errno ); #endif goto fn_exit; diff --git a/src/mpi/attr/win_set_attr.c b/src/mpi/attr/win_set_attr.c index df016eb..e4dc183 100644 --- a/src/mpi/attr/win_set_attr.c +++ b/src/mpi/attr/win_set_attr.c @@ -33,7 +33,7 @@ int MPIR_WinSetAttr( MPI_Win win, int win_keyval, void *attribute_val, { static const char FCNAME[] = "MPI_Win_set_attr"; int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPID_Keyval *keyval_ptr = NULL; MPIR_Attribute *p, **old_p; MPID_MPI_STATE_DECL(MPID_STATE_MPIR_WIN_SET_ATTR); @@ -51,7 +51,7 @@ int MPIR_WinSetAttr( MPI_Win win, int win_keyval, void *attribute_val, MPID_BEGIN_ERROR_CHECKS; { MPIR_ERRTEST_WIN(win, mpi_errno); - MPIR_ERRTEST_KEYVAL(win_keyval, MPID_WIN, "window", mpi_errno); + MPIR_ERRTEST_KEYVAL(win_keyval, MPIR_WIN, "window", mpi_errno); MPIR_ERRTEST_KEYVAL_PERM(win_keyval, mpi_errno); } MPID_END_ERROR_CHECKS; @@ -59,7 +59,7 @@ int MPIR_WinSetAttr( MPI_Win win, int win_keyval, void *attribute_val, # endif /* Convert MPI object handles to object pointers */ - MPID_Win_get_ptr( win, win_ptr ); + MPIR_Win_get_ptr( win, win_ptr ); MPID_Keyval_get_ptr( win_keyval, keyval_ptr ); /* Validate parameters and objects (post conversion) */ @@ -68,7 +68,7 @@ int MPIR_WinSetAttr( MPI_Win win, int win_keyval, void *attribute_val, MPID_BEGIN_ERROR_CHECKS; { /* Validate win_ptr */ - MPID_Win_valid_ptr( win_ptr, mpi_errno ); + MPIR_Win_valid_ptr( win_ptr, mpi_errno ); /* If win_ptr is not valid, it will be reset to null */ /* Validate keyval */ MPID_Keyval_valid_ptr( keyval_ptr, mpi_errno ); diff --git a/src/mpi/errhan/errutil.c b/src/mpi/errhan/errutil.c index ace5e24..67f4ae7 100644 --- a/src/mpi/errhan/errutil.c +++ b/src/mpi/errhan/errutil.c @@ -345,7 +345,7 @@ int MPIR_Err_return_comm( MPIR_Comm *comm_ptr, const char fcname[], /* * MPI routines that detect errors on window objects use this to report errors */ -int MPIR_Err_return_win( MPID_Win *win_ptr, const char fcname[], int errcode ) +int MPIR_Err_return_win( MPIR_Win *win_ptr, const char fcname[], int errcode ) { const int error_class = ERROR_GET_CLASS(errcode); diff --git a/src/mpi/errhan/win_call_errhandler.c b/src/mpi/errhan/win_call_errhandler.c index f92445f..df732b5 100644 --- a/src/mpi/errhan/win_call_errhandler.c +++ b/src/mpi/errhan/win_call_errhandler.c @@ -55,7 +55,7 @@ Input Parameters: int MPI_Win_call_errhandler(MPI_Win win, int errorcode) { int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; int in_cs = FALSE; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_CALL_ERRHANDLER); @@ -75,7 +75,7 @@ int MPI_Win_call_errhandler(MPI_Win win, int errorcode) # endif /* Convert MPI object handles to object pointers */ - MPID_Win_get_ptr( win, win_ptr ); + MPIR_Win_get_ptr( win, win_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -83,7 +83,7 @@ int MPI_Win_call_errhandler(MPI_Win win, int errorcode) MPID_BEGIN_ERROR_CHECKS; { /* Validate win_ptr */ - MPID_Win_valid_ptr( win_ptr, mpi_errno ); + MPIR_Win_valid_ptr( win_ptr, mpi_errno ); /* If win_ptr is not valid, it will be reset to null */ if (mpi_errno) goto fn_fail; } diff --git a/src/mpi/errhan/win_get_errhandler.c b/src/mpi/errhan/win_get_errhandler.c index 9b686fd..ba96dcd 100644 --- a/src/mpi/errhan/win_get_errhandler.c +++ b/src/mpi/errhan/win_get_errhandler.c @@ -54,7 +54,7 @@ int MPI_Win_get_errhandler(MPI_Win win, MPI_Errhandler *errhandler) static const char FCNAME[] = "MPI_Win_get_errhandler"; #endif int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_GET_ERRHANDLER); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -74,7 +74,7 @@ int MPI_Win_get_errhandler(MPI_Win win, MPI_Errhandler *errhandler) # endif /* Convert MPI object handles to object pointers */ - MPID_Win_get_ptr( win, win_ptr ); + MPIR_Win_get_ptr( win, win_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -83,7 +83,7 @@ int MPI_Win_get_errhandler(MPI_Win win, MPI_Errhandler *errhandler) { MPIR_ERRTEST_ARGNULL(errhandler,"errhandler",mpi_errno); /* Validate win_ptr */ - MPID_Win_valid_ptr( win_ptr, mpi_errno ); + MPIR_Win_valid_ptr( win_ptr, mpi_errno ); /* If win_ptr is not valid, it will be reset to null */ if (mpi_errno) goto fn_fail; } diff --git a/src/mpi/errhan/win_set_errhandler.c b/src/mpi/errhan/win_set_errhandler.c index 1c98cee..6caa1c5 100644 --- a/src/mpi/errhan/win_set_errhandler.c +++ b/src/mpi/errhan/win_set_errhandler.c @@ -51,7 +51,7 @@ int MPI_Win_set_errhandler(MPI_Win win, MPI_Errhandler errhandler) static const char FCNAME[] = "MPI_Win_set_errhandler"; #endif int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; int in_use; MPIR_Errhandler *errhan_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_SET_ERRHANDLER); @@ -73,7 +73,7 @@ int MPI_Win_set_errhandler(MPI_Win win, MPI_Errhandler errhandler) # endif /* Convert MPI object handles to object pointers */ - MPID_Win_get_ptr( win, win_ptr ); + MPIR_Win_get_ptr( win, win_ptr ); MPIR_Errhandler_get_ptr( errhandler, errhan_ptr ); /* Validate parameters and objects (post conversion) */ @@ -82,7 +82,7 @@ int MPI_Win_set_errhandler(MPI_Win win, MPI_Errhandler errhandler) MPID_BEGIN_ERROR_CHECKS; { /* Validate win_ptr */ - MPID_Win_valid_ptr( win_ptr, mpi_errno ); + MPIR_Win_valid_ptr( win_ptr, mpi_errno ); /* If win_ptr is not value, it will be reset to null */ if (HANDLE_GET_KIND(errhandler) != HANDLE_KIND_BUILTIN) { diff --git a/src/mpi/rma/accumulate.c b/src/mpi/rma/accumulate.c index 5d014c4..8e9235c 100644 --- a/src/mpi/rma/accumulate.c +++ b/src/mpi/rma/accumulate.c @@ -72,7 +72,7 @@ int MPI_Accumulate(const void *origin_addr, int origin_count, MPI_Datatype { static const char FCNAME[] = "MPI_Accumulate"; int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_ACCUMULATE); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -92,7 +92,7 @@ int MPI_Accumulate(const void *origin_addr, int origin_count, MPI_Datatype # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Win_get_ptr( win, win_ptr ); + MPIR_Win_get_ptr( win, win_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -102,7 +102,7 @@ int MPI_Accumulate(const void *origin_addr, int origin_count, MPI_Datatype MPIR_Comm * comm_ptr; /* Validate win_ptr */ - MPID_Win_valid_ptr( win_ptr, mpi_errno ); + MPIR_Win_valid_ptr( win_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; MPIR_ERRTEST_COUNT(origin_count, mpi_errno); diff --git a/src/mpi/rma/compare_and_swap.c b/src/mpi/rma/compare_and_swap.c index 7a19118..a259e76 100644 --- a/src/mpi/rma/compare_and_swap.c +++ b/src/mpi/rma/compare_and_swap.c @@ -78,7 +78,7 @@ int MPI_Compare_and_swap(const void *origin_addr, const void *compare_addr, { static const char FCNAME[] = "MPI_Compare_and_swap"; int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMPARE_AND_SWAP); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -98,7 +98,7 @@ int MPI_Compare_and_swap(const void *origin_addr, const void *compare_addr, # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Win_get_ptr( win, win_ptr ); + MPIR_Win_get_ptr( win, win_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -108,7 +108,7 @@ int MPI_Compare_and_swap(const void *origin_addr, const void *compare_addr, MPIR_Comm *comm_ptr; /* Validate win_ptr */ - MPID_Win_valid_ptr( win_ptr, mpi_errno ); + MPIR_Win_valid_ptr( win_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; MPIR_ERRTEST_ARGNULL(origin_addr, "origin_addr", mpi_errno); diff --git a/src/mpi/rma/fetch_and_op.c b/src/mpi/rma/fetch_and_op.c index f9ff961..29e6b63 100644 --- a/src/mpi/rma/fetch_and_op.c +++ b/src/mpi/rma/fetch_and_op.c @@ -83,7 +83,7 @@ int MPI_Fetch_and_op(const void *origin_addr, void *result_addr, { static const char FCNAME[] = "MPI_Fetch_and_op"; int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_FETCH_AND_OP); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -103,7 +103,7 @@ int MPI_Fetch_and_op(const void *origin_addr, void *result_addr, # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Win_get_ptr( win, win_ptr ); + MPIR_Win_get_ptr( win, win_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -113,7 +113,7 @@ int MPI_Fetch_and_op(const void *origin_addr, void *result_addr, MPIR_Comm *comm_ptr; /* Validate win_ptr */ - MPID_Win_valid_ptr( win_ptr, mpi_errno ); + MPIR_Win_valid_ptr( win_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; if (op != MPI_NO_OP) { diff --git a/src/mpi/rma/get.c b/src/mpi/rma/get.c index 9daa458..4ba86b5 100644 --- a/src/mpi/rma/get.c +++ b/src/mpi/rma/get.c @@ -67,7 +67,7 @@ int MPI_Get(void *origin_addr, int origin_count, MPI_Datatype { static const char FCNAME[] = "MPI_Get"; int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_GET); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -87,7 +87,7 @@ int MPI_Get(void *origin_addr, int origin_count, MPI_Datatype # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Win_get_ptr( win, win_ptr ); + MPIR_Win_get_ptr( win, win_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -97,7 +97,7 @@ int MPI_Get(void *origin_addr, int origin_count, MPI_Datatype MPIR_Comm * comm_ptr; /* Validate win_ptr */ - MPID_Win_valid_ptr( win_ptr, mpi_errno ); + MPIR_Win_valid_ptr( win_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; MPIR_ERRTEST_COUNT(origin_count, mpi_errno); diff --git a/src/mpi/rma/get_accumulate.c b/src/mpi/rma/get_accumulate.c index ab8cd64..259323a 100644 --- a/src/mpi/rma/get_accumulate.c +++ b/src/mpi/rma/get_accumulate.c @@ -103,7 +103,7 @@ int MPI_Get_accumulate(const void *origin_addr, int origin_count, { static const char FCNAME[] = "MPI_Get_accumulate"; int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_GET_ACCUMULATE); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -123,7 +123,7 @@ int MPI_Get_accumulate(const void *origin_addr, int origin_count, # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Win_get_ptr( win, win_ptr ); + MPIR_Win_get_ptr( win, win_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -133,7 +133,7 @@ int MPI_Get_accumulate(const void *origin_addr, int origin_count, MPIR_Comm * comm_ptr; /* Validate win_ptr */ - MPID_Win_valid_ptr( win_ptr, mpi_errno ); + MPIR_Win_valid_ptr( win_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; if (op != MPI_NO_OP) { diff --git a/src/mpi/rma/put.c b/src/mpi/rma/put.c index 39d0b3a..306adb3 100644 --- a/src/mpi/rma/put.c +++ b/src/mpi/rma/put.c @@ -67,7 +67,7 @@ int MPI_Put(const void *origin_addr, int origin_count, MPI_Datatype { static const char FCNAME[] = "MPI_Put"; int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_PUT); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -87,7 +87,7 @@ int MPI_Put(const void *origin_addr, int origin_count, MPI_Datatype # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Win_get_ptr( win, win_ptr ); + MPIR_Win_get_ptr( win, win_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -97,7 +97,7 @@ int MPI_Put(const void *origin_addr, int origin_count, MPI_Datatype MPIR_Comm * comm_ptr; /* Validate win_ptr */ - MPID_Win_valid_ptr( win_ptr, mpi_errno ); + MPIR_Win_valid_ptr( win_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; MPIR_ERRTEST_COUNT(origin_count, mpi_errno); diff --git a/src/mpi/rma/raccumulate.c b/src/mpi/rma/raccumulate.c index 6e78c11..2448242 100644 --- a/src/mpi/rma/raccumulate.c +++ b/src/mpi/rma/raccumulate.c @@ -85,7 +85,7 @@ int MPI_Raccumulate(const void *origin_addr, int origin_count, MPI_Datatype { static const char FCNAME[] = "MPI_Raccumulate"; int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPID_Request *request_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_RACCUMULATE); @@ -106,7 +106,7 @@ int MPI_Raccumulate(const void *origin_addr, int origin_count, MPI_Datatype # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Win_get_ptr( win, win_ptr ); + MPIR_Win_get_ptr( win, win_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -116,7 +116,7 @@ int MPI_Raccumulate(const void *origin_addr, int origin_count, MPI_Datatype MPIR_Comm * comm_ptr; /* Validate win_ptr */ - MPID_Win_valid_ptr( win_ptr, mpi_errno ); + MPIR_Win_valid_ptr( win_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; MPIR_ERRTEST_COUNT(origin_count, mpi_errno); diff --git a/src/mpi/rma/rget.c b/src/mpi/rma/rget.c index 18a614e..ef14445 100644 --- a/src/mpi/rma/rget.c +++ b/src/mpi/rma/rget.c @@ -80,7 +80,7 @@ int MPI_Rget(void *origin_addr, int origin_count, MPI_Datatype { static const char FCNAME[] = "MPI_Rget"; int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPID_Request *request_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_RGET); @@ -101,7 +101,7 @@ int MPI_Rget(void *origin_addr, int origin_count, MPI_Datatype # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Win_get_ptr( win, win_ptr ); + MPIR_Win_get_ptr( win, win_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -111,7 +111,7 @@ int MPI_Rget(void *origin_addr, int origin_count, MPI_Datatype MPIR_Comm * comm_ptr; /* Validate win_ptr */ - MPID_Win_valid_ptr( win_ptr, mpi_errno ); + MPIR_Win_valid_ptr( win_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; MPIR_ERRTEST_COUNT(origin_count, mpi_errno); diff --git a/src/mpi/rma/rget_accumulate.c b/src/mpi/rma/rget_accumulate.c index d653cb7..7300e49 100644 --- a/src/mpi/rma/rget_accumulate.c +++ b/src/mpi/rma/rget_accumulate.c @@ -95,7 +95,7 @@ int MPI_Rget_accumulate(const void *origin_addr, int origin_count, { static const char FCNAME[] = "MPI_Rget_accumulate"; int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPID_Request *request_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_RGET_ACCUMULATE); @@ -116,7 +116,7 @@ int MPI_Rget_accumulate(const void *origin_addr, int origin_count, # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Win_get_ptr( win, win_ptr ); + MPIR_Win_get_ptr( win, win_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -126,7 +126,7 @@ int MPI_Rget_accumulate(const void *origin_addr, int origin_count, MPIR_Comm * comm_ptr; /* Validate win_ptr */ - MPID_Win_valid_ptr( win_ptr, mpi_errno ); + MPIR_Win_valid_ptr( win_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; if (op != MPI_NO_OP) { diff --git a/src/mpi/rma/rput.c b/src/mpi/rma/rput.c index 8a92aa7..69b7f51 100644 --- a/src/mpi/rma/rput.c +++ b/src/mpi/rma/rput.c @@ -82,7 +82,7 @@ int MPI_Rput(const void *origin_addr, int origin_count, MPI_Datatype { static const char FCNAME[] = "MPI_Rput"; int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPID_Request *request_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_RPUT); @@ -103,7 +103,7 @@ int MPI_Rput(const void *origin_addr, int origin_count, MPI_Datatype # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Win_get_ptr( win, win_ptr ); + MPIR_Win_get_ptr( win, win_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -113,7 +113,7 @@ int MPI_Rput(const void *origin_addr, int origin_count, MPI_Datatype MPIR_Comm * comm_ptr; /* Validate win_ptr */ - MPID_Win_valid_ptr( win_ptr, mpi_errno ); + MPIR_Win_valid_ptr( win_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; MPIR_ERRTEST_COUNT(origin_count, mpi_errno); diff --git a/src/mpi/rma/win_allocate.c b/src/mpi/rma/win_allocate.c index 20b086b..05f0fe2 100644 --- a/src/mpi/rma/win_allocate.c +++ b/src/mpi/rma/win_allocate.c @@ -73,7 +73,7 @@ int MPI_Win_allocate(MPI_Aint size, int disp_unit, MPI_Info info, { static const char FCNAME[] = "MPI_Win_allocate"; int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPIR_Comm *comm_ptr = NULL; MPID_Info *info_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_ALLOCATE); diff --git a/src/mpi/rma/win_allocate_shared.c b/src/mpi/rma/win_allocate_shared.c index 8c1e51e..b7d1fec 100644 --- a/src/mpi/rma/win_allocate_shared.c +++ b/src/mpi/rma/win_allocate_shared.c @@ -83,7 +83,7 @@ int MPI_Win_allocate_shared(MPI_Aint size, int disp_unit, MPI_Info info, MPI_Com void *baseptr, MPI_Win *win) { int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPIR_Comm *comm_ptr = NULL; MPID_Info *info_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_ALLOCATE_SHARED); diff --git a/src/mpi/rma/win_attach.c b/src/mpi/rma/win_attach.c index 1335d4b..f7f200e 100644 --- a/src/mpi/rma/win_attach.c +++ b/src/mpi/rma/win_attach.c @@ -64,7 +64,7 @@ int MPI_Win_attach(MPI_Win win, void *base, MPI_Aint size) { static const char FCNAME[] = "MPI_Win_attach"; int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_ATTACH); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -84,7 +84,7 @@ int MPI_Win_attach(MPI_Win win, void *base, MPI_Aint size) # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Win_get_ptr( win, win_ptr ); + MPIR_Win_get_ptr( win, win_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -92,7 +92,7 @@ int MPI_Win_attach(MPI_Win win, void *base, MPI_Aint size) MPID_BEGIN_ERROR_CHECKS; { /* Validate win_ptr */ - MPID_Win_valid_ptr( win_ptr, mpi_errno ); + MPIR_Win_valid_ptr( win_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; if (size < 0) diff --git a/src/mpi/rma/win_complete.c b/src/mpi/rma/win_complete.c index 445de58..5f53db2 100644 --- a/src/mpi/rma/win_complete.c +++ b/src/mpi/rma/win_complete.c @@ -49,7 +49,7 @@ int MPI_Win_complete(MPI_Win win) { static const char FCNAME[] = "MPI_Win_complete"; int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_COMPLETE); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -69,7 +69,7 @@ int MPI_Win_complete(MPI_Win win) # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Win_get_ptr( win, win_ptr ); + MPIR_Win_get_ptr( win, win_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -77,7 +77,7 @@ int MPI_Win_complete(MPI_Win win) MPID_BEGIN_ERROR_CHECKS; { /* Validate win_ptr */ - MPID_Win_valid_ptr( win_ptr, mpi_errno ); + MPIR_Win_valid_ptr( win_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; } diff --git a/src/mpi/rma/win_create.c b/src/mpi/rma/win_create.c index b6901b1..6f8d30a 100644 --- a/src/mpi/rma/win_create.c +++ b/src/mpi/rma/win_create.c @@ -101,7 +101,7 @@ int MPI_Win_create(void *base, MPI_Aint size, int disp_unit, MPI_Info info, { static const char FCNAME[] = "MPI_Win_create"; int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPIR_Comm *comm_ptr = NULL; MPID_Info *info_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_CREATE); diff --git a/src/mpi/rma/win_create_dynamic.c b/src/mpi/rma/win_create_dynamic.c index 44af241..eebe3e8 100644 --- a/src/mpi/rma/win_create_dynamic.c +++ b/src/mpi/rma/win_create_dynamic.c @@ -89,7 +89,7 @@ int MPI_Win_create_dynamic(MPI_Info info, MPI_Comm comm, MPI_Win *win) { static const char FCNAME[] = "MPI_Win_create_dynamic"; int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPIR_Comm *comm_ptr = NULL; MPID_Info *info_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_CREATE_DYNAMIC); diff --git a/src/mpi/rma/win_detach.c b/src/mpi/rma/win_detach.c index ed9d22e..03e0b93 100644 --- a/src/mpi/rma/win_detach.c +++ b/src/mpi/rma/win_detach.c @@ -63,7 +63,7 @@ int MPI_Win_detach(MPI_Win win, const void *base) { static const char FCNAME[] = "MPI_Win_detach"; int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_DETACH); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -83,7 +83,7 @@ int MPI_Win_detach(MPI_Win win, const void *base) # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Win_get_ptr( win, win_ptr ); + MPIR_Win_get_ptr( win, win_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -91,7 +91,7 @@ int MPI_Win_detach(MPI_Win win, const void *base) MPID_BEGIN_ERROR_CHECKS; { /* Validate win_ptr */ - MPID_Win_valid_ptr( win_ptr, mpi_errno ); + MPIR_Win_valid_ptr( win_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; } MPID_END_ERROR_CHECKS; diff --git a/src/mpi/rma/win_fence.c b/src/mpi/rma/win_fence.c index 8b7dc96..e07631d 100644 --- a/src/mpi/rma/win_fence.c +++ b/src/mpi/rma/win_fence.c @@ -67,7 +67,7 @@ int MPI_Win_fence(int assert, MPI_Win win) { static const char FCNAME[] = "MPI_Win_fence"; int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_FENCE); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -87,7 +87,7 @@ int MPI_Win_fence(int assert, MPI_Win win) # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Win_get_ptr( win, win_ptr ); + MPIR_Win_get_ptr( win, win_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -95,7 +95,7 @@ int MPI_Win_fence(int assert, MPI_Win win) MPID_BEGIN_ERROR_CHECKS; { /* Validate win_ptr */ - MPID_Win_valid_ptr( win_ptr, mpi_errno ); + MPIR_Win_valid_ptr( win_ptr, mpi_errno ); /* TODO: validate window is not in passive mode */ /* TODO: validate assert argument */ diff --git a/src/mpi/rma/win_flush.c b/src/mpi/rma/win_flush.c index 4a8f5e6..5322127 100644 --- a/src/mpi/rma/win_flush.c +++ b/src/mpi/rma/win_flush.c @@ -58,7 +58,7 @@ int MPI_Win_flush(int rank, MPI_Win win) { static const char FCNAME[] = "MPI_Win_flush"; int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_FLUSH); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -78,7 +78,7 @@ int MPI_Win_flush(int rank, MPI_Win win) # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Win_get_ptr( win, win_ptr ); + MPIR_Win_get_ptr( win, win_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -88,7 +88,7 @@ int MPI_Win_flush(int rank, MPI_Win win) MPIR_Comm * comm_ptr; /* Validate win_ptr */ - MPID_Win_valid_ptr( win_ptr, mpi_errno ); + MPIR_Win_valid_ptr( win_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; comm_ptr = win_ptr->comm_ptr; diff --git a/src/mpi/rma/win_flush_all.c b/src/mpi/rma/win_flush_all.c index 7855e25..0869355 100644 --- a/src/mpi/rma/win_flush_all.c +++ b/src/mpi/rma/win_flush_all.c @@ -57,7 +57,7 @@ int MPI_Win_flush_all(MPI_Win win) { static const char FCNAME[] = "MPI_Win_flush_all"; int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_FLUSH_ALL); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -77,7 +77,7 @@ int MPI_Win_flush_all(MPI_Win win) # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Win_get_ptr( win, win_ptr ); + MPIR_Win_get_ptr( win, win_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -85,7 +85,7 @@ int MPI_Win_flush_all(MPI_Win win) MPID_BEGIN_ERROR_CHECKS; { /* Validate win_ptr */ - MPID_Win_valid_ptr( win_ptr, mpi_errno ); + MPIR_Win_valid_ptr( win_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; /* TODO: Validate that the given window is in passive mode */ diff --git a/src/mpi/rma/win_flush_local.c b/src/mpi/rma/win_flush_local.c index 9b10972..dc019a4 100644 --- a/src/mpi/rma/win_flush_local.c +++ b/src/mpi/rma/win_flush_local.c @@ -60,7 +60,7 @@ int MPI_Win_flush_local(int rank, MPI_Win win) { static const char FCNAME[] = "MPI_Win_flush_local"; int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_FLUSH_LOCAL); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -80,7 +80,7 @@ int MPI_Win_flush_local(int rank, MPI_Win win) # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Win_get_ptr( win, win_ptr ); + MPIR_Win_get_ptr( win, win_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -90,7 +90,7 @@ int MPI_Win_flush_local(int rank, MPI_Win win) MPIR_Comm * comm_ptr; /* Validate win_ptr */ - MPID_Win_valid_ptr( win_ptr, mpi_errno ); + MPIR_Win_valid_ptr( win_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; comm_ptr = win_ptr->comm_ptr; diff --git a/src/mpi/rma/win_flush_local_all.c b/src/mpi/rma/win_flush_local_all.c index c5c629e..db90884 100644 --- a/src/mpi/rma/win_flush_local_all.c +++ b/src/mpi/rma/win_flush_local_all.c @@ -56,7 +56,7 @@ int MPI_Win_flush_local_all(MPI_Win win) { static const char FCNAME[] = "MPI_Win_flush_local_all"; int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_FLUSH_LOCAL_ALL); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -76,7 +76,7 @@ int MPI_Win_flush_local_all(MPI_Win win) # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Win_get_ptr( win, win_ptr ); + MPIR_Win_get_ptr( win, win_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -84,7 +84,7 @@ int MPI_Win_flush_local_all(MPI_Win win) MPID_BEGIN_ERROR_CHECKS; { /* Validate win_ptr */ - MPID_Win_valid_ptr( win_ptr, mpi_errno ); + MPIR_Win_valid_ptr( win_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; /* TODO: Validate that the given window is in passive mode */ diff --git a/src/mpi/rma/win_free.c b/src/mpi/rma/win_free.c index 7308127..317d314 100644 --- a/src/mpi/rma/win_free.c +++ b/src/mpi/rma/win_free.c @@ -52,7 +52,7 @@ int MPI_Win_free(MPI_Win *win) { static const char FCNAME[] = "MPI_Win_free"; int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_FREE); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -72,7 +72,7 @@ int MPI_Win_free(MPI_Win *win) # endif /* Convert MPI object handles to object pointers */ - MPID_Win_get_ptr( *win, win_ptr ); + MPIR_Win_get_ptr( *win, win_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -80,7 +80,7 @@ int MPI_Win_free(MPI_Win *win) MPID_BEGIN_ERROR_CHECKS; { /* Validate win_ptr */ - MPID_Win_valid_ptr( win_ptr, mpi_errno ); + MPIR_Win_valid_ptr( win_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; /* TODO: Check for unterminated passive target epoch */ diff --git a/src/mpi/rma/win_get_group.c b/src/mpi/rma/win_get_group.c index 45ab8c6..c832278 100644 --- a/src/mpi/rma/win_get_group.c +++ b/src/mpi/rma/win_get_group.c @@ -59,7 +59,7 @@ int MPI_Win_get_group(MPI_Win win, MPI_Group *group) { static const char FCNAME[] = "MPI_Win_get_group"; int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPIR_Comm *win_comm_ptr; MPIR_Group *group_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_GET_GROUP); @@ -82,7 +82,7 @@ int MPI_Win_get_group(MPI_Win win, MPI_Group *group) # endif /* Convert MPI object handles to object pointers */ - MPID_Win_get_ptr( win, win_ptr ); + MPIR_Win_get_ptr( win, win_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -90,7 +90,7 @@ int MPI_Win_get_group(MPI_Win win, MPI_Group *group) MPID_BEGIN_ERROR_CHECKS; { /* Validate win_ptr */ - MPID_Win_valid_ptr( win_ptr, mpi_errno ); + MPIR_Win_valid_ptr( win_ptr, mpi_errno ); /* If win_ptr is not valid, it will be reset to null */ if (mpi_errno) goto fn_fail; diff --git a/src/mpi/rma/win_get_info.c b/src/mpi/rma/win_get_info.c index 4f13dc0..c10d2b2 100644 --- a/src/mpi/rma/win_get_info.c +++ b/src/mpi/rma/win_get_info.c @@ -70,7 +70,7 @@ int MPI_Win_get_info(MPI_Win win, MPI_Info *info_used) { static const char FCNAME[] = "MPI_Win_get_info"; int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPID_Info *info_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_GET_INFO); @@ -91,7 +91,7 @@ int MPI_Win_get_info(MPI_Win win, MPI_Info *info_used) # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Win_get_ptr( win, win_ptr ); + MPIR_Win_get_ptr( win, win_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -99,7 +99,7 @@ int MPI_Win_get_info(MPI_Win win, MPI_Info *info_used) MPID_BEGIN_ERROR_CHECKS; { /* Validate pointers */ - MPID_Win_valid_ptr( win_ptr, mpi_errno ); + MPIR_Win_valid_ptr( win_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; } MPID_END_ERROR_CHECKS; diff --git a/src/mpi/rma/win_get_name.c b/src/mpi/rma/win_get_name.c index 6bafc5d..63d23b4 100644 --- a/src/mpi/rma/win_get_name.c +++ b/src/mpi/rma/win_get_name.c @@ -56,7 +56,7 @@ Output Parameters: int MPI_Win_get_name(MPI_Win win, char *win_name, int *resultlen) { int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_GET_NAME); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -75,7 +75,7 @@ int MPI_Win_get_name(MPI_Win win, char *win_name, int *resultlen) # endif /* Convert MPI object handles to object pointers */ - MPID_Win_get_ptr( win, win_ptr ); + MPIR_Win_get_ptr( win, win_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -83,7 +83,7 @@ int MPI_Win_get_name(MPI_Win win, char *win_name, int *resultlen) MPID_BEGIN_ERROR_CHECKS; { /* Validate win_ptr */ - MPID_Win_valid_ptr( win_ptr, mpi_errno ); + MPIR_Win_valid_ptr( win_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; /* If win_ptr is not valid, it will be reset to null */ diff --git a/src/mpi/rma/win_lock.c b/src/mpi/rma/win_lock.c index f49fce6..64fbd85 100644 --- a/src/mpi/rma/win_lock.c +++ b/src/mpi/rma/win_lock.c @@ -77,7 +77,7 @@ int MPI_Win_lock(int lock_type, int rank, int assert, MPI_Win win) { static const char FCNAME[] = "MPI_Win_lock"; int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_LOCK); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -97,7 +97,7 @@ int MPI_Win_lock(int lock_type, int rank, int assert, MPI_Win win) # endif /* Convert MPI object handles to object pointers */ - MPID_Win_get_ptr( win, win_ptr ); + MPIR_Win_get_ptr( win, win_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -107,7 +107,7 @@ int MPI_Win_lock(int lock_type, int rank, int assert, MPI_Win win) MPIR_Comm *comm_ptr; /* Validate win_ptr */ - MPID_Win_valid_ptr( win_ptr, mpi_errno ); + MPIR_Win_valid_ptr( win_ptr, mpi_errno ); /* If win_ptr is not valid, it will be reset to null */ if (mpi_errno) goto fn_fail; diff --git a/src/mpi/rma/win_lock_all.c b/src/mpi/rma/win_lock_all.c index ebf8cdd..488e950 100644 --- a/src/mpi/rma/win_lock_all.c +++ b/src/mpi/rma/win_lock_all.c @@ -81,7 +81,7 @@ int MPI_Win_lock_all(int assert, MPI_Win win) { static const char FCNAME[] = "MPI_Win_lock_all"; int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_LOCK_ALL); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -101,7 +101,7 @@ int MPI_Win_lock_all(int assert, MPI_Win win) # endif /* Convert MPI object handles to object pointers */ - MPID_Win_get_ptr( win, win_ptr ); + MPIR_Win_get_ptr( win, win_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -109,7 +109,7 @@ int MPI_Win_lock_all(int assert, MPI_Win win) MPID_BEGIN_ERROR_CHECKS; { /* Validate win_ptr */ - MPID_Win_valid_ptr( win_ptr, mpi_errno ); + MPIR_Win_valid_ptr( win_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; if (assert != 0 && assert != MPI_MODE_NOCHECK) { diff --git a/src/mpi/rma/win_post.c b/src/mpi/rma/win_post.c index a0accc7..9a847fa 100644 --- a/src/mpi/rma/win_post.c +++ b/src/mpi/rma/win_post.c @@ -65,7 +65,7 @@ int MPI_Win_post(MPI_Group group, int assert, MPI_Win win) { static const char FCNAME[] = "MPI_Win_post"; int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPIR_Group *group_ptr=NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_POST); @@ -87,7 +87,7 @@ int MPI_Win_post(MPI_Group group, int assert, MPI_Win win) # endif /* Convert MPI object handles to object pointers */ - MPID_Win_get_ptr( win, win_ptr ); + MPIR_Win_get_ptr( win, win_ptr ); MPIR_Group_get_ptr(group, group_ptr); /* Validate parameters and objects (post conversion) */ @@ -96,7 +96,7 @@ int MPI_Win_post(MPI_Group group, int assert, MPI_Win win) MPID_BEGIN_ERROR_CHECKS; { /* Validate win_ptr */ - MPID_Win_valid_ptr( win_ptr, mpi_errno ); + MPIR_Win_valid_ptr( win_ptr, mpi_errno ); MPIR_Group_valid_ptr(group_ptr, mpi_errno); diff --git a/src/mpi/rma/win_set_info.c b/src/mpi/rma/win_set_info.c index 34f535e..e336bb0 100644 --- a/src/mpi/rma/win_set_info.c +++ b/src/mpi/rma/win_set_info.c @@ -67,7 +67,7 @@ int MPI_Win_set_info(MPI_Win win, MPI_Info info) { static const char FCNAME[] = "MPI_Win_set_info"; int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPID_Info *info_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_SET_INFO); @@ -88,7 +88,7 @@ int MPI_Win_set_info(MPI_Win win, MPI_Info info) # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Win_get_ptr( win, win_ptr ); + MPIR_Win_get_ptr( win, win_ptr ); MPID_Info_get_ptr( info, info_ptr ); /* Validate parameters and objects (post conversion) */ @@ -97,7 +97,7 @@ int MPI_Win_set_info(MPI_Win win, MPI_Info info) MPID_BEGIN_ERROR_CHECKS; { /* Validate pointers */ - MPID_Win_valid_ptr( win_ptr, mpi_errno ); + MPIR_Win_valid_ptr( win_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; MPID_Info_valid_ptr( info_ptr, mpi_errno ); diff --git a/src/mpi/rma/win_set_name.c b/src/mpi/rma/win_set_name.c index ac8f138..54ac8eb 100644 --- a/src/mpi/rma/win_set_name.c +++ b/src/mpi/rma/win_set_name.c @@ -51,7 +51,7 @@ int MPI_Win_set_name(MPI_Win win, const char *win_name) { static const char FCNAME[] = "MPI_Win_set_name"; int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_SET_NAME); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -70,7 +70,7 @@ int MPI_Win_set_name(MPI_Win win, const char *win_name) # endif /* Convert MPI object handles to object pointers */ - MPID_Win_get_ptr( win, win_ptr ); + MPIR_Win_get_ptr( win, win_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -78,7 +78,7 @@ int MPI_Win_set_name(MPI_Win win, const char *win_name) MPID_BEGIN_ERROR_CHECKS; { /* Validate win_ptr */ - MPID_Win_valid_ptr( win_ptr, mpi_errno ); + MPIR_Win_valid_ptr( win_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; /* If win_ptr is not valid, it will be reset to null */ diff --git a/src/mpi/rma/win_shared_query.c b/src/mpi/rma/win_shared_query.c index ccd012b..860c60f 100644 --- a/src/mpi/rma/win_shared_query.c +++ b/src/mpi/rma/win_shared_query.c @@ -75,7 +75,7 @@ int MPI_Win_shared_query(MPI_Win win, int rank, MPI_Aint *size, int *disp_unit, { static const char FCNAME[] = "MPI_Win_shared_query"; int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_SHARED_QUERY); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -95,7 +95,7 @@ int MPI_Win_shared_query(MPI_Win win, int rank, MPI_Aint *size, int *disp_unit, # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Win_get_ptr( win, win_ptr ); + MPIR_Win_get_ptr( win, win_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -105,7 +105,7 @@ int MPI_Win_shared_query(MPI_Win win, int rank, MPI_Aint *size, int *disp_unit, MPIR_Comm * comm_ptr; /* Validate win_ptr */ - MPID_Win_valid_ptr( win_ptr, mpi_errno ); + MPIR_Win_valid_ptr( win_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; MPIR_ERRTEST_ARGNULL(size, "size", mpi_errno); diff --git a/src/mpi/rma/win_start.c b/src/mpi/rma/win_start.c index 78c1520..ae1258e 100644 --- a/src/mpi/rma/win_start.c +++ b/src/mpi/rma/win_start.c @@ -66,7 +66,7 @@ int MPI_Win_start(MPI_Group group, int assert, MPI_Win win) { static const char FCNAME[] = "MPI_Win_start"; int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPIR_Group *group_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_START); @@ -88,7 +88,7 @@ int MPI_Win_start(MPI_Group group, int assert, MPI_Win win) # endif /* HAVE_ERROR_CHECKING */ /* Get handles to MPI objects. */ - MPID_Win_get_ptr( win, win_ptr ); + MPIR_Win_get_ptr( win, win_ptr ); MPIR_Group_get_ptr(group, group_ptr); # ifdef HAVE_ERROR_CHECKING @@ -96,7 +96,7 @@ int MPI_Win_start(MPI_Group group, int assert, MPI_Win win) MPID_BEGIN_ERROR_CHECKS; { /* Validate win_ptr */ - MPID_Win_valid_ptr( win_ptr, mpi_errno ); + MPIR_Win_valid_ptr( win_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; MPIR_Group_valid_ptr(group_ptr, mpi_errno); diff --git a/src/mpi/rma/win_sync.c b/src/mpi/rma/win_sync.c index 28156b7..1a7cac7 100644 --- a/src/mpi/rma/win_sync.c +++ b/src/mpi/rma/win_sync.c @@ -59,7 +59,7 @@ int MPI_Win_sync(MPI_Win win) { static const char FCNAME[] = "MPI_Win_sync"; int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_SYNC); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -79,14 +79,14 @@ int MPI_Win_sync(MPI_Win win) # endif /* Convert MPI object handles to object pointers */ - MPID_Win_get_ptr( win, win_ptr ); + MPIR_Win_get_ptr( win, win_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS; { - MPID_Win_valid_ptr( win_ptr, mpi_errno ); + MPIR_Win_valid_ptr( win_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; /* TODO: Ensure that window is in a passive mode epoch */ diff --git a/src/mpi/rma/win_test.c b/src/mpi/rma/win_test.c index d422a8a..5ee2b3a 100644 --- a/src/mpi/rma/win_test.c +++ b/src/mpi/rma/win_test.c @@ -58,7 +58,7 @@ int MPI_Win_test(MPI_Win win, int *flag) { static const char FCNAME[] = "MPI_Win_test"; int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_TEST); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -78,13 +78,13 @@ int MPI_Win_test(MPI_Win win, int *flag) # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Win_get_ptr( win, win_ptr ); + MPIR_Win_get_ptr( win, win_ptr ); # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS; { /* Validate win_ptr */ - MPID_Win_valid_ptr( win_ptr, mpi_errno ); + MPIR_Win_valid_ptr( win_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; /* If win_ptr is not valid, it will be reset to null */ diff --git a/src/mpi/rma/win_unlock.c b/src/mpi/rma/win_unlock.c index b511446..bd761a4 100644 --- a/src/mpi/rma/win_unlock.c +++ b/src/mpi/rma/win_unlock.c @@ -53,7 +53,7 @@ int MPI_Win_unlock(int rank, MPI_Win win) { static const char FCNAME[] = "MPI_Win_unlock"; int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_UNLOCK); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -73,7 +73,7 @@ int MPI_Win_unlock(int rank, MPI_Win win) # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Win_get_ptr( win, win_ptr ); + MPIR_Win_get_ptr( win, win_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -83,7 +83,7 @@ int MPI_Win_unlock(int rank, MPI_Win win) MPIR_Comm * comm_ptr; /* Validate win_ptr */ - MPID_Win_valid_ptr( win_ptr, mpi_errno ); + MPIR_Win_valid_ptr( win_ptr, mpi_errno ); /* If win_ptr is not valid, it will be reset to null */ if (mpi_errno) goto fn_fail; diff --git a/src/mpi/rma/win_unlock_all.c b/src/mpi/rma/win_unlock_all.c index e3ac876..730e488 100644 --- a/src/mpi/rma/win_unlock_all.c +++ b/src/mpi/rma/win_unlock_all.c @@ -60,7 +60,7 @@ int MPI_Win_unlock_all(MPI_Win win) { static const char FCNAME[] = "MPI_Win_unlock_all"; int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_UNLOCK_ALL); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -80,7 +80,7 @@ int MPI_Win_unlock_all(MPI_Win win) # endif /* Convert MPI object handles to object pointers */ - MPID_Win_get_ptr( win, win_ptr ); + MPIR_Win_get_ptr( win, win_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -88,7 +88,7 @@ int MPI_Win_unlock_all(MPI_Win win) MPID_BEGIN_ERROR_CHECKS; { /* Validate win_ptr */ - MPID_Win_valid_ptr( win_ptr, mpi_errno ); + MPIR_Win_valid_ptr( win_ptr, mpi_errno ); /* If win_ptr is not valid, it will be reset to null */ if (mpi_errno) goto fn_fail; diff --git a/src/mpi/rma/win_wait.c b/src/mpi/rma/win_wait.c index c9b004a..e0c0054 100644 --- a/src/mpi/rma/win_wait.c +++ b/src/mpi/rma/win_wait.c @@ -49,7 +49,7 @@ int MPI_Win_wait(MPI_Win win) { static const char FCNAME[] = "MPI_Win_wait"; int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_WAIT); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -69,7 +69,7 @@ int MPI_Win_wait(MPI_Win win) # endif /* Convert MPI object handles to object pointers */ - MPID_Win_get_ptr( win, win_ptr ); + MPIR_Win_get_ptr( win, win_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -77,7 +77,7 @@ int MPI_Win_wait(MPI_Win win) MPID_BEGIN_ERROR_CHECKS; { /* Validate win_ptr */ - MPID_Win_valid_ptr( win_ptr, mpi_errno ); + MPIR_Win_valid_ptr( win_ptr, mpi_errno ); /* TODO: Ensure window is in a PSCW active mode epoch */ if (mpi_errno) goto fn_fail; diff --git a/src/mpi/rma/winutil.c b/src/mpi/rma/winutil.c index 1f4bcd3..0882139 100644 --- a/src/mpi/rma/winutil.c +++ b/src/mpi/rma/winutil.c @@ -13,7 +13,7 @@ #endif /* Preallocated window objects */ -MPID_Win MPID_Win_direct[MPID_WIN_PREALLOC] = { {0} }; -MPIU_Object_alloc_t MPID_Win_mem = { 0, 0, 0, 0, MPID_WIN, - sizeof(MPID_Win), MPID_Win_direct, +MPIR_Win MPIR_Win_direct[MPID_WIN_PREALLOC] = { {0} }; +MPIU_Object_alloc_t MPIR_Win_mem = { 0, 0, 0, 0, MPID_WIN, + sizeof(MPIR_Win), MPIR_Win_direct, MPID_WIN_PREALLOC}; diff --git a/src/mpid/ch3/channels/nemesis/include/mpidi_ch3_impl.h b/src/mpid/ch3/channels/nemesis/include/mpidi_ch3_impl.h index f65a192..3188530 100644 --- a/src/mpid/ch3/channels/nemesis/include/mpidi_ch3_impl.h +++ b/src/mpid/ch3/channels/nemesis/include/mpidi_ch3_impl.h @@ -86,8 +86,8 @@ int MPID_nem_lmt_vmsplice_vc_terminated(MPIDI_VC_t *vc); int MPID_nem_handle_pkt(MPIDI_VC_t *vc, char *buf, intptr_t buflen); /* Nemesis-provided RMA implementation */ -int MPIDI_CH3_SHM_Win_shared_query(MPID_Win *win_ptr, int target_rank, MPI_Aint *size, int *disp_unit, void *baseptr); -int MPIDI_CH3_SHM_Win_free(MPID_Win **win_ptr); +int MPIDI_CH3_SHM_Win_shared_query(MPIR_Win *win_ptr, int target_rank, MPI_Aint *size, int *disp_unit, void *baseptr); +int MPIDI_CH3_SHM_Win_free(MPIR_Win **win_ptr); /* Shared memory window atomic/accumulate mutex implementation */ @@ -196,7 +196,7 @@ int MPIDI_CH3_SHM_Win_free(MPID_Win **win_ptr); typedef struct MPIDI_SHM_Win { struct MPIDI_SHM_Win *prev; struct MPIDI_SHM_Win *next; - MPID_Win *win; + MPIR_Win *win; } MPIDI_SHM_Win_t; typedef MPIDI_SHM_Win_t *MPIDI_SHM_Wins_list_t; @@ -209,7 +209,7 @@ extern MPIDI_SHM_Wins_list_t shm_wins_list; #define FUNCNAME MPIDI_CH3I_SHM_Wins_append #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_CH3I_SHM_Wins_append(MPIDI_SHM_Wins_list_t * list, MPID_Win * win) +static inline int MPIDI_CH3I_SHM_Wins_append(MPIDI_SHM_Wins_list_t * list, MPIR_Win * win) { int mpi_errno = MPI_SUCCESS; MPIDI_SHM_Win_t *tmp_ptr; @@ -241,7 +241,7 @@ static inline int MPIDI_CH3I_SHM_Wins_append(MPIDI_SHM_Wins_list_t * list, MPID_ #define FUNCNAME MPIDI_CH3I_SHM_Wins_unlink #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline void MPIDI_CH3I_SHM_Wins_unlink(MPIDI_SHM_Wins_list_t * list, MPID_Win * shm_win) +static inline void MPIDI_CH3I_SHM_Wins_unlink(MPIDI_SHM_Wins_list_t * list, MPIR_Win * shm_win) { MPIDI_SHM_Win_t *elem = NULL; MPIDI_SHM_Win_t *tmp_elem = NULL; diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_rma_shm.c b/src/mpid/ch3/channels/nemesis/src/ch3_rma_shm.c index 9f083b5..95a2ee3 100644 --- a/src/mpid/ch3/channels/nemesis/src/ch3_rma_shm.c +++ b/src/mpid/ch3/channels/nemesis/src/ch3_rma_shm.c @@ -12,7 +12,7 @@ #define FUNCNAME MPIDI_CH3_Win_shared_query #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3_SHM_Win_shared_query(MPID_Win * win_ptr, int target_rank, MPI_Aint * size, +int MPIDI_CH3_SHM_Win_shared_query(MPIR_Win * win_ptr, int target_rank, MPI_Aint * size, int *disp_unit, void *baseptr) { int comm_size; @@ -75,7 +75,7 @@ int MPIDI_CH3_SHM_Win_shared_query(MPID_Win * win_ptr, int target_rank, MPI_Aint #define FUNCNAME MPIDI_CH3_SHM_Win_free #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3_SHM_Win_free(MPID_Win ** win_ptr) +int MPIDI_CH3_SHM_Win_free(MPIR_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3_SHM_WIN_FREE); diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c b/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c index 07fa169..b160d92 100644 --- a/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c +++ b/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c @@ -19,15 +19,15 @@ extern MPIR_T_pvar_timer_t PVAR_TIMER_rma_wincreate_allgather ATTRIBUTE((unused) MPIDI_SHM_Wins_list_t shm_wins_list; static int MPIDI_CH3I_Win_init(MPI_Aint size, int disp_unit, int create_flavor, int model, - MPID_Info * info, MPIR_Comm * comm_ptr, MPID_Win ** win_ptr); + MPID_Info * info, MPIR_Comm * comm_ptr, MPIR_Win ** win_ptr); static int MPIDI_CH3I_Win_allocate_shm(MPI_Aint size, int disp_unit, MPID_Info * info, - MPIR_Comm * comm_ptr, void *base_ptr, MPID_Win ** win_ptr); + MPIR_Comm * comm_ptr, void *base_ptr, MPIR_Win ** win_ptr); -static int MPIDI_CH3I_Win_detect_shm(MPID_Win ** win_ptr); +static int MPIDI_CH3I_Win_detect_shm(MPIR_Win ** win_ptr); static int MPIDI_CH3I_Win_gather_info(void *base, MPI_Aint size, int disp_unit, MPID_Info * info, - MPIR_Comm * comm_ptr, MPID_Win ** win_ptr); + MPIR_Comm * comm_ptr, MPIR_Win ** win_ptr); #undef FUNCNAME #define FUNCNAME MPIDI_CH3_Win_fns_init @@ -114,7 +114,7 @@ int MPIDI_CH3_Win_pkt_orderings_init(MPIDI_CH3U_Win_pkt_ordering_t * win_pkt_ord #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) static int MPIDI_CH3I_Win_init(MPI_Aint size, int disp_unit, int create_flavor, int model, - MPID_Info * info, MPIR_Comm * comm_ptr, MPID_Win ** win_ptr) + MPID_Info * info, MPIR_Comm * comm_ptr, MPIR_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3I_WIN_INIT); @@ -144,7 +144,7 @@ static int MPIDI_CH3I_Win_init(MPI_Aint size, int disp_unit, int create_flavor, #define FUNCNAME MPIDI_CH3I_SHM_Wins_match #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int MPIDI_CH3I_SHM_Wins_match(MPID_Win ** win_ptr, MPID_Win ** matched_win, +static int MPIDI_CH3I_SHM_Wins_match(MPIR_Win ** win_ptr, MPIR_Win ** matched_win, MPI_Aint ** base_shm_offs_ptr) { int mpi_errno = MPI_SUCCESS; @@ -187,7 +187,7 @@ static int MPIDI_CH3I_SHM_Wins_match(MPID_Win ** win_ptr, MPID_Win ** matched_wi MPIR_ERR_POP(mpi_errno); while (elem != NULL) { - MPID_Win *shm_win = elem->win; + MPIR_Win *shm_win = elem->win; if (!shm_win) MPIDI_SHM_Wins_next_and_continue(elem); @@ -286,10 +286,10 @@ static int MPIDI_CH3I_SHM_Wins_match(MPID_Win ** win_ptr, MPID_Win ** matched_wi #define FUNCNAME MPIDI_CH3I_Win_detect_shm #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int MPIDI_CH3I_Win_detect_shm(MPID_Win ** win_ptr) +static int MPIDI_CH3I_Win_detect_shm(MPIR_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; - MPID_Win *shm_win_ptr = NULL; + MPIR_Win *shm_win_ptr = NULL; int i, node_size; MPI_Aint *base_shm_offs; @@ -348,7 +348,7 @@ static int MPIDI_CH3I_Win_detect_shm(MPID_Win ** win_ptr) #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) static int MPIDI_CH3I_Win_gather_info(void *base, MPI_Aint size, int disp_unit, MPID_Info * info, - MPIR_Comm * comm_ptr, MPID_Win ** win_ptr) + MPIR_Comm * comm_ptr, MPIR_Win ** win_ptr) { MPIR_Comm *node_comm_ptr = NULL; int node_rank; @@ -491,7 +491,7 @@ static int MPIDI_CH3I_Win_gather_info(void *base, MPI_Aint size, int disp_unit, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) static int MPIDI_CH3I_Win_allocate_shm(MPI_Aint size, int disp_unit, MPID_Info * info, - MPIR_Comm * comm_ptr, void *base_ptr, MPID_Win ** win_ptr) + MPIR_Comm * comm_ptr, void *base_ptr, MPIR_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; void **base_pp = (void **) base_ptr; diff --git a/src/mpid/ch3/include/mpid_rma_issue.h b/src/mpid/ch3/include/mpid_rma_issue.h index e6e7baa..fad831e 100644 --- a/src/mpid/ch3/include/mpid_rma_issue.h +++ b/src/mpid/ch3/include/mpid_rma_issue.h @@ -394,7 +394,7 @@ static int issue_from_origin_buffer(MPIDI_RMA_Op_t * rma_op, MPIDI_VC_t * vc, #define FUNCNAME issue_put_op #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int issue_put_op(MPIDI_RMA_Op_t * rma_op, MPID_Win * win_ptr, +static int issue_put_op(MPIDI_RMA_Op_t * rma_op, MPIR_Win * win_ptr, MPIDI_RMA_Target_t * target_ptr, MPIDI_CH3_Pkt_flags_t flags) { MPIDI_VC_t *vc = NULL; @@ -477,7 +477,7 @@ static int issue_put_op(MPIDI_RMA_Op_t * rma_op, MPID_Win * win_ptr, #define FUNCNAME issue_acc_op #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int issue_acc_op(MPIDI_RMA_Op_t * rma_op, MPID_Win * win_ptr, +static int issue_acc_op(MPIDI_RMA_Op_t * rma_op, MPIR_Win * win_ptr, MPIDI_RMA_Target_t * target_ptr, MPIDI_CH3_Pkt_flags_t flags) { MPIDI_VC_t *vc = NULL; @@ -644,7 +644,7 @@ static int issue_acc_op(MPIDI_RMA_Op_t * rma_op, MPID_Win * win_ptr, #define FUNCNAME issue_get_acc_op #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int issue_get_acc_op(MPIDI_RMA_Op_t * rma_op, MPID_Win * win_ptr, +static int issue_get_acc_op(MPIDI_RMA_Op_t * rma_op, MPIR_Win * win_ptr, MPIDI_RMA_Target_t * target_ptr, MPIDI_CH3_Pkt_flags_t flags) { MPIDI_VC_t *vc = NULL; @@ -875,7 +875,7 @@ static int issue_get_acc_op(MPIDI_RMA_Op_t * rma_op, MPID_Win * win_ptr, #define FUNCNAME issue_get_op #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int issue_get_op(MPIDI_RMA_Op_t * rma_op, MPID_Win * win_ptr, +static int issue_get_op(MPIDI_RMA_Op_t * rma_op, MPIR_Win * win_ptr, MPIDI_RMA_Target_t * target_ptr, MPIDI_CH3_Pkt_flags_t flags) { MPIDI_CH3_Pkt_get_t *get_pkt = &rma_op->pkt.get; @@ -1004,7 +1004,7 @@ static int issue_get_op(MPIDI_RMA_Op_t * rma_op, MPID_Win * win_ptr, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) static int issue_cas_op(MPIDI_RMA_Op_t * rma_op, - MPID_Win * win_ptr, MPIDI_RMA_Target_t * target_ptr, + MPIR_Win * win_ptr, MPIDI_RMA_Target_t * target_ptr, MPIDI_CH3_Pkt_flags_t flags) { MPIDI_VC_t *vc = NULL; @@ -1067,7 +1067,7 @@ static int issue_cas_op(MPIDI_RMA_Op_t * rma_op, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) static int issue_fop_op(MPIDI_RMA_Op_t * rma_op, - MPID_Win * win_ptr, MPIDI_RMA_Target_t * target_ptr, + MPIR_Win * win_ptr, MPIDI_RMA_Target_t * target_ptr, MPIDI_CH3_Pkt_flags_t flags) { MPIDI_VC_t *vc = NULL; @@ -1141,7 +1141,7 @@ static int issue_fop_op(MPIDI_RMA_Op_t * rma_op, #define FUNCNAME issue_rma_op #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int issue_rma_op(MPIDI_RMA_Op_t * op_ptr, MPID_Win * win_ptr, +static inline int issue_rma_op(MPIDI_RMA_Op_t * op_ptr, MPIR_Win * win_ptr, MPIDI_RMA_Target_t * target_ptr, MPIDI_CH3_Pkt_flags_t flags) { int mpi_errno = MPI_SUCCESS; diff --git a/src/mpid/ch3/include/mpid_rma_lockqueue.h b/src/mpid/ch3/include/mpid_rma_lockqueue.h index 3a18053..cd3bb22 100644 --- a/src/mpid/ch3/include/mpid_rma_lockqueue.h +++ b/src/mpid/ch3/include/mpid_rma_lockqueue.h @@ -19,7 +19,7 @@ extern MPIR_T_pvar_timer_t PVAR_TIMER_rma_winlock_getlocallock ATTRIBUTE((unused #define FUNCNAME MPIDI_CH3I_Win_target_lock_entry_alloc #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline MPIDI_RMA_Target_lock_entry_t *MPIDI_CH3I_Win_target_lock_entry_alloc(MPID_Win * +static inline MPIDI_RMA_Target_lock_entry_t *MPIDI_CH3I_Win_target_lock_entry_alloc(MPIR_Win * win_ptr, MPIDI_CH3_Pkt_t * pkt) @@ -49,7 +49,7 @@ static inline MPIDI_RMA_Target_lock_entry_t *MPIDI_CH3I_Win_target_lock_entry_al #define FUNCNAME MPIDI_CH3I_Win_target_lock_entry_free #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_CH3I_Win_target_lock_entry_free(MPID_Win * win_ptr, +static inline int MPIDI_CH3I_Win_target_lock_entry_free(MPIR_Win * win_ptr, MPIDI_RMA_Target_lock_entry_t * target_lock_entry) { diff --git a/src/mpid/ch3/include/mpid_rma_oplist.h b/src/mpid/ch3/include/mpid_rma_oplist.h index 712bff1..8b7ac02 100644 --- a/src/mpid/ch3/include/mpid_rma_oplist.h +++ b/src/mpid/ch3/include/mpid_rma_oplist.h @@ -10,10 +10,10 @@ #include "mpl_utlist.h" #include "mpid_rma_types.h" -int MPIDI_CH3I_RMA_Cleanup_ops_aggressive(MPID_Win * win_ptr); -int MPIDI_CH3I_RMA_Cleanup_target_aggressive(MPID_Win * win_ptr, MPIDI_RMA_Target_t ** target); -int MPIDI_CH3I_RMA_Make_progress_target(MPID_Win * win_ptr, int target_rank, int *made_progress); -int MPIDI_CH3I_RMA_Make_progress_win(MPID_Win * win_ptr, int *made_progress); +int MPIDI_CH3I_RMA_Cleanup_ops_aggressive(MPIR_Win * win_ptr); +int MPIDI_CH3I_RMA_Cleanup_target_aggressive(MPIR_Win * win_ptr, MPIDI_RMA_Target_t ** target); +int MPIDI_CH3I_RMA_Make_progress_target(MPIR_Win * win_ptr, int target_rank, int *made_progress); +int MPIDI_CH3I_RMA_Make_progress_win(MPIR_Win * win_ptr, int *made_progress); extern MPIDI_RMA_Op_t *global_rma_op_pool_head, *global_rma_op_pool_start; extern MPIDI_RMA_Target_t *global_rma_target_pool_head, *global_rma_target_pool_start; @@ -113,7 +113,7 @@ extern MPIR_T_pvar_timer_t PVAR_TIMER_rma_rmaqueue_alloc ATTRIBUTE((unused)); #define FUNCNAME MPIDI_CH3I_Win_set_active #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_CH3I_Win_set_active(MPID_Win * win_ptr) +static inline int MPIDI_CH3I_Win_set_active(MPIR_Win * win_ptr) { int mpi_errno = MPI_SUCCESS; @@ -140,7 +140,7 @@ static inline int MPIDI_CH3I_Win_set_active(MPID_Win * win_ptr) #define FUNCNAME MPIDI_CH3I_Win_set_inactive #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_CH3I_Win_set_inactive(MPID_Win * win_ptr) +static inline int MPIDI_CH3I_Win_set_inactive(MPIR_Win * win_ptr) { int mpi_errno = MPI_SUCCESS; @@ -168,7 +168,7 @@ static inline int MPIDI_CH3I_Win_set_inactive(MPID_Win * win_ptr) #define FUNCNAME MPIDI_CH3I_Win_op_alloc #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline MPIDI_RMA_Op_t *MPIDI_CH3I_Win_op_alloc(MPID_Win * win_ptr) +static inline MPIDI_RMA_Op_t *MPIDI_CH3I_Win_op_alloc(MPIR_Win * win_ptr) { MPIDI_RMA_Op_t *e; @@ -205,7 +205,7 @@ static inline MPIDI_RMA_Op_t *MPIDI_CH3I_Win_op_alloc(MPID_Win * win_ptr) #define FUNCNAME MPIDI_CH3I_Win_op_free #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_CH3I_Win_op_free(MPID_Win * win_ptr, MPIDI_RMA_Op_t * e) +static inline int MPIDI_CH3I_Win_op_free(MPIR_Win * win_ptr, MPIDI_RMA_Op_t * e) { int mpi_errno = MPI_SUCCESS; @@ -232,7 +232,7 @@ static inline int MPIDI_CH3I_Win_op_free(MPID_Win * win_ptr, MPIDI_RMA_Op_t * e) #define FUNCNAME MPIDI_CH3I_Win_target_alloc #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline MPIDI_RMA_Target_t *MPIDI_CH3I_Win_target_alloc(MPID_Win * win_ptr) +static inline MPIDI_RMA_Target_t *MPIDI_CH3I_Win_target_alloc(MPIR_Win * win_ptr) { MPIDI_RMA_Target_t *e; @@ -275,7 +275,7 @@ static inline MPIDI_RMA_Target_t *MPIDI_CH3I_Win_target_alloc(MPID_Win * win_ptr #define FUNCNAME MPIDI_CH3I_Win_target_free #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_CH3I_Win_target_free(MPID_Win * win_ptr, MPIDI_RMA_Target_t * e) +static inline int MPIDI_CH3I_Win_target_free(MPIR_Win * win_ptr, MPIDI_RMA_Target_t * e) { int mpi_errno = MPI_SUCCESS; @@ -301,7 +301,7 @@ static inline int MPIDI_CH3I_Win_target_free(MPID_Win * win_ptr, MPIDI_RMA_Targe #define FUNCNAME MPIDI_CH3I_Win_create_target #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_CH3I_Win_create_target(MPID_Win * win_ptr, int target_rank, +static inline int MPIDI_CH3I_Win_create_target(MPIR_Win * win_ptr, int target_rank, MPIDI_RMA_Target_t ** e) { int mpi_errno = MPI_SUCCESS; @@ -337,7 +337,7 @@ static inline int MPIDI_CH3I_Win_create_target(MPID_Win * win_ptr, int target_ra #define FUNCNAME MPIDI_CH3I_Win_find_target #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_CH3I_Win_find_target(MPID_Win * win_ptr, int target_rank, +static inline int MPIDI_CH3I_Win_find_target(MPIR_Win * win_ptr, int target_rank, MPIDI_RMA_Target_t ** e) { int mpi_errno = MPI_SUCCESS; @@ -368,7 +368,7 @@ static inline int MPIDI_CH3I_Win_find_target(MPID_Win * win_ptr, int target_rank #define FUNCNAME MPIDI_CH3I_Win_enqueue_op #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_CH3I_Win_enqueue_op(MPID_Win * win_ptr, MPIDI_RMA_Op_t * op) +static inline int MPIDI_CH3I_Win_enqueue_op(MPIR_Win * win_ptr, MPIDI_RMA_Op_t * op) { int mpi_errno = MPI_SUCCESS; MPIDI_RMA_Target_t *target = NULL; @@ -450,7 +450,7 @@ static inline int MPIDI_CH3I_Win_enqueue_op(MPID_Win * win_ptr, MPIDI_RMA_Op_t * #define FUNCNAME MPIDI_CH3I_Win_target_dequeue_and_free #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_CH3I_Win_target_dequeue_and_free(MPID_Win * win_ptr, MPIDI_RMA_Target_t * e) +static inline int MPIDI_CH3I_Win_target_dequeue_and_free(MPIR_Win * win_ptr, MPIDI_RMA_Target_t * e) { int mpi_errno = MPI_SUCCESS; int target_rank = e->target_rank; @@ -474,7 +474,7 @@ static inline int MPIDI_CH3I_Win_target_dequeue_and_free(MPID_Win * win_ptr, MPI #define FUNCNAME MPIDI_CH3I_RMA_Cleanup_targets_win #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_CH3I_RMA_Cleanup_targets_win(MPID_Win * win_ptr) +static inline int MPIDI_CH3I_RMA_Cleanup_targets_win(MPIR_Win * win_ptr) { MPIDI_RMA_Target_t *target = NULL, *next_target = NULL; int i, mpi_errno = MPI_SUCCESS; @@ -499,7 +499,7 @@ static inline int MPIDI_CH3I_RMA_Cleanup_targets_win(MPID_Win * win_ptr) #define FUNCNAME MPIDI_CH3I_Win_get_op #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_CH3I_Win_get_op(MPID_Win * win_ptr, MPIDI_RMA_Op_t ** e) +static inline int MPIDI_CH3I_Win_get_op(MPIR_Win * win_ptr, MPIDI_RMA_Op_t ** e) { MPIDI_RMA_Op_t *new_ptr = NULL; int mpi_errno = MPI_SUCCESS; @@ -534,7 +534,7 @@ static inline int MPIDI_CH3I_Win_get_op(MPID_Win * win_ptr, MPIDI_RMA_Op_t ** e) #define FUNCNAME MPIDI_CH3I_RMA_Ops_free_elem #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline void MPIDI_CH3I_RMA_Ops_free_elem(MPID_Win * win_ptr, MPIDI_RMA_Ops_list_t * list, +static inline void MPIDI_CH3I_RMA_Ops_free_elem(MPIR_Win * win_ptr, MPIDI_RMA_Ops_list_t * list, MPIDI_RMA_Op_t * curr_ptr) { MPIDI_RMA_Op_t *tmp_ptr = curr_ptr; diff --git a/src/mpid/ch3/include/mpid_rma_shm.h b/src/mpid/ch3/include/mpid_rma_shm.h index eea930b..6679636 100644 --- a/src/mpid/ch3/include/mpid_rma_shm.h +++ b/src/mpid/ch3/include/mpid_rma_shm.h @@ -254,7 +254,7 @@ static inline int shm_copy(const void *src, int scount, MPI_Datatype stype, static inline int MPIDI_CH3I_Shm_put_op(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, - MPID_Win * win_ptr) + MPIR_Win * win_ptr) { int mpi_errno = MPI_SUCCESS; void *base = NULL; @@ -297,7 +297,7 @@ static inline int MPIDI_CH3I_Shm_put_op(const void *origin_addr, int origin_coun static inline int MPIDI_CH3I_Shm_acc_op(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Op op, - MPID_Win * win_ptr) + MPIR_Win * win_ptr) { void *base = NULL; int disp_unit, shm_op = 0; @@ -433,7 +433,7 @@ static inline int MPIDI_CH3I_Shm_get_acc_op(const void *origin_addr, int origin_ MPI_Datatype result_datatype, int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Op op, - MPID_Win * win_ptr) + MPIR_Win * win_ptr) { int disp_unit, shm_locked = 0; void *base = NULL; @@ -578,7 +578,7 @@ static inline int MPIDI_CH3I_Shm_get_acc_op(const void *origin_addr, int origin_ static inline int MPIDI_CH3I_Shm_get_op(void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, MPI_Aint target_disp, int target_count, - MPI_Datatype target_datatype, MPID_Win * win_ptr) + MPI_Datatype target_datatype, MPIR_Win * win_ptr) { void *base = NULL; int disp_unit; @@ -620,7 +620,7 @@ static inline int MPIDI_CH3I_Shm_get_op(void *origin_addr, int origin_count, #define FCNAME MPL_QUOTE(FUNCNAME) static inline int MPIDI_CH3I_Shm_cas_op(const void *origin_addr, const void *compare_addr, void *result_addr, MPI_Datatype datatype, int target_rank, - MPI_Aint target_disp, MPID_Win * win_ptr) + MPI_Aint target_disp, MPIR_Win * win_ptr) { void *base = NULL, *dest_addr = NULL; int disp_unit; @@ -678,7 +678,7 @@ static inline int MPIDI_CH3I_Shm_cas_op(const void *origin_addr, const void *com #define FCNAME MPL_QUOTE(FUNCNAME) static inline int MPIDI_CH3I_Shm_fop_op(const void *origin_addr, void *result_addr, MPI_Datatype datatype, int target_rank, - MPI_Aint target_disp, MPI_Op op, MPID_Win * win_ptr) + MPI_Aint target_disp, MPI_Op op, MPIR_Win * win_ptr) { void *base = NULL, *dest_addr = NULL; MPI_User_function *uop = NULL; diff --git a/src/mpid/ch3/include/mpidimpl.h b/src/mpid/ch3/include/mpidimpl.h index 7a74ad3..92e142a 100644 --- a/src/mpid/ch3/include/mpidimpl.h +++ b/src/mpid/ch3/include/mpidimpl.h @@ -1048,21 +1048,21 @@ void MPIDI_RMA_finalize(void); */ typedef struct { - int (*create)(void *, MPI_Aint, int, MPID_Info *, MPIR_Comm *, MPID_Win **); - int (*allocate)(MPI_Aint, int, MPID_Info *, MPIR_Comm *, void *, MPID_Win **); - int (*allocate_shared)(MPI_Aint, int, MPID_Info *, MPIR_Comm *, void *, MPID_Win **); - int (*allocate_shm)(MPI_Aint, int, MPID_Info *, MPIR_Comm *, void *, MPID_Win **); - int (*create_dynamic)(MPID_Info *, MPIR_Comm *, MPID_Win **); - int (*detect_shm)(MPID_Win **); - int (*gather_info)(void *, MPI_Aint, int, MPID_Info *, MPIR_Comm *, MPID_Win **); - int (*shared_query)(MPID_Win *, int, MPI_Aint *, int *, void *); + int (*create)(void *, MPI_Aint, int, MPID_Info *, MPIR_Comm *, MPIR_Win **); + int (*allocate)(MPI_Aint, int, MPID_Info *, MPIR_Comm *, void *, MPIR_Win **); + int (*allocate_shared)(MPI_Aint, int, MPID_Info *, MPIR_Comm *, void *, MPIR_Win **); + int (*allocate_shm)(MPI_Aint, int, MPID_Info *, MPIR_Comm *, void *, MPIR_Win **); + int (*create_dynamic)(MPID_Info *, MPIR_Comm *, MPIR_Win **); + int (*detect_shm)(MPIR_Win **); + int (*gather_info)(void *, MPI_Aint, int, MPID_Info *, MPIR_Comm *, MPIR_Win **); + int (*shared_query)(MPIR_Win *, int, MPI_Aint *, int *, void *); } MPIDI_CH3U_Win_fns_t; extern MPIDI_CH3U_Win_fns_t MPIDI_CH3U_Win_fns; typedef struct { - int (*win_init)(MPI_Aint, int, int, int, MPID_Info *, MPIR_Comm *, MPID_Win **); - int (*win_free)(MPID_Win **); + int (*win_init)(MPI_Aint, int, int, int, MPID_Info *, MPIR_Comm *, MPIR_Win **); + int (*win_free)(MPIR_Win **); } MPIDI_CH3U_Win_hooks_t; extern MPIDI_CH3U_Win_hooks_t MPIDI_CH3U_Win_hooks; @@ -1090,19 +1090,19 @@ int MPIDI_CH3_Win_pkt_orderings_init(MPIDI_CH3U_Win_pkt_ordering_t * win_pkt_ord /* Default window creation functions provided by CH3 */ int MPIDI_CH3U_Win_create(void *, MPI_Aint, int, MPID_Info *, MPIR_Comm *, - MPID_Win **); + MPIR_Win **); int MPIDI_CH3U_Win_allocate(MPI_Aint size, int disp_unit, MPID_Info *info, - MPIR_Comm *comm, void *baseptr, MPID_Win **win); + MPIR_Comm *comm, void *baseptr, MPIR_Win **win); int MPIDI_CH3U_Win_allocate_no_shm(MPI_Aint size, int disp_unit, MPID_Info *info, - MPIR_Comm *comm_ptr, void *baseptr, MPID_Win **win_ptr); -int MPIDI_CH3U_Win_create_dynamic(MPID_Info *info, MPIR_Comm *comm, MPID_Win **win); -int MPIDI_CH3U_Win_shared_query(MPID_Win * win_ptr, int target_rank, MPI_Aint * size, + MPIR_Comm *comm_ptr, void *baseptr, MPIR_Win **win_ptr); +int MPIDI_CH3U_Win_create_dynamic(MPID_Info *info, MPIR_Comm *comm, MPIR_Win **win); +int MPIDI_CH3U_Win_shared_query(MPIR_Win * win_ptr, int target_rank, MPI_Aint * size, int *disp_unit, void *baseptr); /* MPI RMA Utility functions */ int MPIDI_CH3U_Win_gather_info(void *, MPI_Aint, int, MPID_Info *, MPIR_Comm *, - MPID_Win **); + MPIR_Win **); #ifdef MPIDI_CH3I_HAS_ALLOC_MEM @@ -1123,8 +1123,8 @@ void MPIDI_CH3_RMA_Init_sync_pvars(void); void MPIDI_CH3_RMA_Init_pkthandler_pvars(void); /* internal */ -int MPIDI_CH3I_Release_lock(MPID_Win * win_ptr); -int MPIDI_CH3I_Try_acquire_win_lock(MPID_Win * win_ptr, int requested_lock); +int MPIDI_CH3I_Release_lock(MPIR_Win * win_ptr); +int MPIDI_CH3I_Try_acquire_win_lock(MPIR_Win * win_ptr, int requested_lock); int MPIDI_CH3I_Progress_finalize(void); @@ -1133,21 +1133,21 @@ int MPIDI_CH3I_Progress_finalize(void); * Called by normal RMA operations and request-based RMA operations . */ int MPIDI_CH3I_Put(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, MPI_Aint target_disp, - int target_count, MPI_Datatype target_datatype, MPID_Win * win_ptr, + int target_count, MPI_Datatype target_datatype, MPIR_Win * win_ptr, MPID_Request * ureq); int MPIDI_CH3I_Get(void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, MPI_Aint target_disp, - int target_count, MPI_Datatype target_datatype, MPID_Win * win_ptr, + int target_count, MPI_Datatype target_datatype, MPIR_Win * win_ptr, MPID_Request * ureq); int MPIDI_CH3I_Accumulate(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Op op, - MPID_Win * win_ptr, MPID_Request * ureq); + MPIR_Win * win_ptr, MPID_Request * ureq); int MPIDI_CH3I_Get_accumulate(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, void *result_addr, int result_count, MPI_Datatype result_datatype, int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Op op, - MPID_Win * win_ptr, MPID_Request * ureq); + MPIR_Win * win_ptr, MPID_Request * ureq); /*@ MPIDI_CH3_Progress_signal_completion - Inform the progress engine that a diff --git a/src/mpid/ch3/include/mpidpre.h b/src/mpid/ch3/include/mpidpre.h index d02dd68..8f86926 100644 --- a/src/mpid/ch3/include/mpidpre.h +++ b/src/mpid/ch3/include/mpidpre.h @@ -347,12 +347,12 @@ typedef struct MPIDI_Win_basic_info { incomplete sync requests (used in \ Win_fence and PSCW). */ \ int active; /* specify if this window is active or not */ \ - struct MPID_Win *prev; \ - struct MPID_Win *next; \ + struct MPIR_Win *prev; \ + struct MPIR_Win *next; \ int outstanding_acks; /* keep track of # of outstanding ACKs window \ wide. */ \ -extern struct MPID_Win *MPIDI_RMA_Win_active_list_head, *MPIDI_RMA_Win_inactive_list_head; +extern struct MPIR_Win *MPIDI_RMA_Win_active_list_head, *MPIDI_RMA_Win_inactive_list_head; extern int MPIDI_CH3I_RMA_Active_req_cnt; extern int MPIDI_CH3I_RMA_Progress_hook_id; diff --git a/src/mpid/ch3/include/mpidrma.h b/src/mpid/ch3/include/mpidrma.h index 1626b45..bb030fe 100644 --- a/src/mpid/ch3/include/mpidrma.h +++ b/src/mpid/ch3/include/mpidrma.h @@ -17,7 +17,7 @@ #define FUNCNAME send_lock_msg #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int send_lock_msg(int dest, int lock_type, MPID_Win * win_ptr) +static inline int send_lock_msg(int dest, int lock_type, MPIR_Win * win_ptr) { int mpi_errno = MPI_SUCCESS; MPIDI_CH3_Pkt_t upkt; @@ -64,7 +64,7 @@ static inline int send_lock_msg(int dest, int lock_type, MPID_Win * win_ptr) #define FUNCNAME send_unlock_msg #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int send_unlock_msg(int dest, MPID_Win * win_ptr, MPIDI_CH3_Pkt_flags_t flags) +static inline int send_unlock_msg(int dest, MPIR_Win * win_ptr, MPIDI_CH3_Pkt_flags_t flags) { int mpi_errno = MPI_SUCCESS; MPIDI_CH3_Pkt_t upkt; @@ -108,7 +108,7 @@ static inline int send_unlock_msg(int dest, MPID_Win * win_ptr, MPIDI_CH3_Pkt_fl #define FUNCNAME MPIDI_CH3I_Send_lock_ack_pkt #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_CH3I_Send_lock_ack_pkt(MPIDI_VC_t * vc, MPID_Win * win_ptr, +static inline int MPIDI_CH3I_Send_lock_ack_pkt(MPIDI_VC_t * vc, MPIR_Win * win_ptr, MPIDI_CH3_Pkt_flags_t flags, MPI_Win source_win_handle, MPI_Request request_handle) @@ -155,7 +155,7 @@ static inline int MPIDI_CH3I_Send_lock_ack_pkt(MPIDI_VC_t * vc, MPID_Win * win_p #define FUNCNAME MPIDI_CH3I_Send_lock_op_ack_pkt #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_CH3I_Send_lock_op_ack_pkt(MPIDI_VC_t * vc, MPID_Win * win_ptr, +static inline int MPIDI_CH3I_Send_lock_op_ack_pkt(MPIDI_VC_t * vc, MPIR_Win * win_ptr, MPIDI_CH3_Pkt_flags_t flags, MPI_Win source_win_handle, MPI_Request request_handle) @@ -202,7 +202,7 @@ static inline int MPIDI_CH3I_Send_lock_op_ack_pkt(MPIDI_VC_t * vc, MPID_Win * wi #define FUNCNAME MPIDI_CH3I_Send_ack_pkt #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_CH3I_Send_ack_pkt(MPIDI_VC_t * vc, MPID_Win * win_ptr, +static inline int MPIDI_CH3I_Send_ack_pkt(MPIDI_VC_t * vc, MPIR_Win * win_ptr, MPI_Win source_win_handle) { MPIDI_CH3_Pkt_t upkt; @@ -239,7 +239,7 @@ static inline int MPIDI_CH3I_Send_ack_pkt(MPIDI_VC_t * vc, MPID_Win * win_ptr, #define FUNCNAME send_decr_at_cnt_msg #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int send_decr_at_cnt_msg(int dst, MPID_Win * win_ptr, MPIDI_CH3_Pkt_flags_t flags) +static inline int send_decr_at_cnt_msg(int dst, MPIR_Win * win_ptr, MPIDI_CH3_Pkt_flags_t flags) { MPIDI_CH3_Pkt_t upkt; MPIDI_CH3_Pkt_decr_at_counter_t *decr_at_cnt_pkt = &upkt.decr_at_cnt; @@ -281,7 +281,7 @@ static inline int send_decr_at_cnt_msg(int dst, MPID_Win * win_ptr, MPIDI_CH3_Pk #define FUNCNAME send_flush_msg #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int send_flush_msg(int dest, MPID_Win * win_ptr) +static inline int send_flush_msg(int dest, MPIR_Win * win_ptr) { int mpi_errno = MPI_SUCCESS; MPIDI_CH3_Pkt_t upkt; @@ -318,7 +318,7 @@ static inline int send_flush_msg(int dest, MPID_Win * win_ptr) /* enqueue an unsatisfied origin in passive target at target side. */ -static inline int enqueue_lock_origin(MPID_Win * win_ptr, MPIDI_VC_t * vc, +static inline int enqueue_lock_origin(MPIR_Win * win_ptr, MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, intptr_t * buflen, MPID_Request ** reqp) { @@ -551,7 +551,7 @@ static inline int enqueue_lock_origin(MPID_Win * win_ptr, MPIDI_VC_t * vc, } -static inline int handle_lock_ack(MPID_Win * win_ptr, int target_rank, MPIDI_CH3_Pkt_flags_t flags) +static inline int handle_lock_ack(MPIR_Win * win_ptr, int target_rank, MPIDI_CH3_Pkt_flags_t flags) { MPIDI_RMA_Target_t *t = NULL; int mpi_errno = MPI_SUCCESS; @@ -640,7 +640,7 @@ static inline int handle_lock_ack(MPID_Win * win_ptr, int target_rank, MPIDI_CH3 #define FUNCNAME check_and_set_req_completion #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int check_and_set_req_completion(MPID_Win * win_ptr, MPIDI_RMA_Target_t * target, +static inline int check_and_set_req_completion(MPIR_Win * win_ptr, MPIDI_RMA_Target_t * target, MPIDI_RMA_Op_t * rma_op, int *op_completed) { int i, mpi_errno = MPI_SUCCESS; @@ -713,7 +713,7 @@ static inline int check_and_set_req_completion(MPID_Win * win_ptr, MPIDI_RMA_Tar } -static inline int handle_lock_ack_with_op(MPID_Win * win_ptr, +static inline int handle_lock_ack_with_op(MPIR_Win * win_ptr, int target_rank, MPIDI_CH3_Pkt_flags_t flags) { MPIDI_RMA_Target_t *target = NULL; @@ -797,7 +797,7 @@ static inline int handle_lock_ack_with_op(MPID_Win * win_ptr, #define FUNCNAME acquire_local_lock #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int acquire_local_lock(MPID_Win * win_ptr, int lock_type) +static inline int acquire_local_lock(MPIR_Win * win_ptr, int lock_type) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_ACQUIRE_LOCAL_LOCK); @@ -859,7 +859,7 @@ static inline int acquire_local_lock(MPID_Win * win_ptr, int lock_type) #define FUNCNAME MPIDI_CH3I_RMA_Handle_ack #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_CH3I_RMA_Handle_ack(MPID_Win * win_ptr, int target_rank) +static inline int MPIDI_CH3I_RMA_Handle_ack(MPIR_Win * win_ptr, int target_rank) { int mpi_errno = MPI_SUCCESS; MPIDI_RMA_Target_t *t; @@ -1033,7 +1033,7 @@ static inline int do_accumulate_op(void *source_buf, int source_count, MPI_Datat } -static inline int check_piggyback_lock(MPID_Win * win_ptr, MPIDI_VC_t * vc, +static inline int check_piggyback_lock(MPIR_Win * win_ptr, MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, intptr_t * buflen, int *acquire_lock_fail, MPID_Request ** reqp) @@ -1070,7 +1070,7 @@ static inline int check_piggyback_lock(MPID_Win * win_ptr, MPIDI_VC_t * vc, goto fn_exit; } -static inline int finish_op_on_target(MPID_Win * win_ptr, MPIDI_VC_t * vc, +static inline int finish_op_on_target(MPIR_Win * win_ptr, MPIDI_VC_t * vc, int has_response_data, MPIDI_CH3_Pkt_flags_t flags, MPI_Win source_win_handle) { @@ -1150,7 +1150,7 @@ static inline int finish_op_on_target(MPID_Win * win_ptr, MPIDI_VC_t * vc, } -static inline int fill_ranks_in_win_grp(MPID_Win * win_ptr, MPIR_Group * group_ptr, +static inline int fill_ranks_in_win_grp(MPIR_Win * win_ptr, MPIR_Group * group_ptr, int *ranks_in_win_grp) { int mpi_errno = MPI_SUCCESS; diff --git a/src/mpid/ch3/src/ch3u_handle_op_req.c b/src/mpid/ch3/src/ch3u_handle_op_req.c index 906d10f..bbfb294 100644 --- a/src/mpid/ch3/src/ch3u_handle_op_req.c +++ b/src/mpid/ch3/src/ch3u_handle_op_req.c @@ -16,7 +16,7 @@ int MPIDI_CH3_Req_handler_rma_op_complete(MPID_Request * sreq) { int mpi_errno = MPI_SUCCESS; MPID_Request *ureq = NULL; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3_REQ_HANDLER_RMA_OP_COMPLETE); MPIDI_FUNC_ENTER(MPID_STATE_MPIDI_CH3_REQ_HANDLER_RMA_OP_COMPLETE); @@ -26,7 +26,7 @@ int MPIDI_CH3_Req_handler_rma_op_complete(MPID_Request * sreq) } /* get window, decrement active request cnt on window */ - MPID_Win_get_ptr(sreq->dev.source_win_handle, win_ptr); + MPIR_Win_get_ptr(sreq->dev.source_win_handle, win_ptr); MPIU_Assert(win_ptr != NULL); MPIDI_CH3I_RMA_Active_req_cnt--; MPIU_Assert(MPIDI_CH3I_RMA_Active_req_cnt >= 0); diff --git a/src/mpid/ch3/src/ch3u_handle_recv_pkt.c b/src/mpid/ch3/src/ch3u_handle_recv_pkt.c index d27c067..d6bf34a 100644 --- a/src/mpid/ch3/src/ch3u_handle_recv_pkt.c +++ b/src/mpid/ch3/src/ch3u_handle_recv_pkt.c @@ -413,7 +413,7 @@ int MPIDI_CH3U_Post_data_receive_unexpected(MPID_Request * rreq) #define FUNCNAME MPIDI_CH3I_Try_acquire_win_lock #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3I_Try_acquire_win_lock(MPID_Win *win_ptr, int requested_lock) +int MPIDI_CH3I_Try_acquire_win_lock(MPIR_Win *win_ptr, int requested_lock) { int existing_lock; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3I_TRY_ACQUIRE_WIN_LOCK); diff --git a/src/mpid/ch3/src/ch3u_handle_recv_req.c b/src/mpid/ch3/src/ch3u_handle_recv_req.c index e67bcdd..e978945 100644 --- a/src/mpid/ch3/src/ch3u_handle_recv_req.c +++ b/src/mpid/ch3/src/ch3u_handle_recv_req.c @@ -93,7 +93,7 @@ int MPIDI_CH3_ReqHandler_RecvComplete(MPIDI_VC_t * vc ATTRIBUTE((unused)), int MPIDI_CH3_ReqHandler_PutRecvComplete(MPIDI_VC_t * vc, MPID_Request * rreq, int *complete) { int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr; + MPIR_Win *win_ptr; MPI_Win source_win_handle = rreq->dev.source_win_handle; MPIDI_CH3_Pkt_flags_t flags = rreq->dev.flags; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3_REQHANDLER_PUTRECVCOMPLETE); @@ -118,7 +118,7 @@ int MPIDI_CH3_ReqHandler_PutRecvComplete(MPIDI_VC_t * vc, MPID_Request * rreq, i goto fn_exit; } - MPID_Win_get_ptr(rreq->dev.target_win_handle, win_ptr); + MPIR_Win_get_ptr(rreq->dev.target_win_handle, win_ptr); /* mark data transfer as complete and decrement CC */ mpi_errno = MPID_Request_complete(rreq); @@ -155,7 +155,7 @@ int MPIDI_CH3_ReqHandler_PutRecvComplete(MPIDI_VC_t * vc, MPID_Request * rreq, i int MPIDI_CH3_ReqHandler_AccumRecvComplete(MPIDI_VC_t * vc, MPID_Request * rreq, int *complete) { int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr; + MPIR_Win *win_ptr; MPI_Win source_win_handle = rreq->dev.source_win_handle; MPIDI_CH3_Pkt_flags_t flags = rreq->dev.flags; MPI_Datatype basic_type; @@ -183,7 +183,7 @@ int MPIDI_CH3_ReqHandler_AccumRecvComplete(MPIDI_VC_t * vc, MPID_Request * rreq, goto fn_exit; } - MPID_Win_get_ptr(rreq->dev.target_win_handle, win_ptr); + MPIR_Win_get_ptr(rreq->dev.target_win_handle, win_ptr); MPIU_Assert(MPIDI_Request_get_type(rreq) == MPIDI_REQUEST_TYPE_ACCUM_RECV); @@ -254,7 +254,7 @@ int MPIDI_CH3_ReqHandler_AccumRecvComplete(MPIDI_VC_t * vc, MPID_Request * rreq, int MPIDI_CH3_ReqHandler_GaccumRecvComplete(MPIDI_VC_t * vc, MPID_Request * rreq, int *complete) { int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr; + MPIR_Win *win_ptr; MPIDI_CH3_Pkt_t upkt; MPIDI_CH3_Pkt_get_accum_resp_t *get_accum_resp_pkt = &upkt.get_accum_resp; MPID_Request *resp_req; @@ -278,7 +278,7 @@ int MPIDI_CH3_ReqHandler_GaccumRecvComplete(MPIDI_VC_t * vc, MPID_Request * rreq is_empty_origin = TRUE; } - MPID_Win_get_ptr(rreq->dev.target_win_handle, win_ptr); + MPIR_Win_get_ptr(rreq->dev.target_win_handle, win_ptr); if (MPIR_DATATYPE_IS_PREDEFINED(rreq->dev.datatype)) basic_type = rreq->dev.datatype; @@ -427,7 +427,7 @@ int MPIDI_CH3_ReqHandler_GaccumRecvComplete(MPIDI_VC_t * vc, MPID_Request * rreq int MPIDI_CH3_ReqHandler_FOPRecvComplete(MPIDI_VC_t * vc, MPID_Request * rreq, int *complete) { int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPI_Aint type_size; MPID_Request *resp_req = NULL; MPL_IOV iov[MPL_IOV_LIMIT]; @@ -448,7 +448,7 @@ int MPIDI_CH3_ReqHandler_FOPRecvComplete(MPIDI_VC_t * vc, MPID_Request * rreq, i MPIU_Assert(MPIDI_Request_get_type(rreq) == MPIDI_REQUEST_TYPE_FOP_RECV); - MPID_Win_get_ptr(rreq->dev.target_win_handle, win_ptr); + MPIR_Win_get_ptr(rreq->dev.target_win_handle, win_ptr); MPIDU_Datatype_get_size_macro(rreq->dev.datatype, type_size); @@ -864,12 +864,12 @@ int MPIDI_CH3_ReqHandler_GetDerivedDTRecvComplete(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t upkt; MPIDI_CH3_Pkt_get_resp_t *get_resp_pkt = &upkt.get_resp; MPID_Request *sreq; - MPID_Win *win_ptr; + MPIR_Win *win_ptr; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3_REQHANDLER_GETDERIVEDDTRECVCOMPLETE); MPIDI_FUNC_ENTER(MPID_STATE_MPIDI_CH3_REQHANDLER_GETDERIVEDDTRECVCOMPLETE); - MPID_Win_get_ptr(rreq->dev.target_win_handle, win_ptr); + MPIR_Win_get_ptr(rreq->dev.target_win_handle, win_ptr); MPIU_Assert(!(rreq->dev.flags & MPIDI_CH3_PKT_FLAG_RMA_IMMED_RESP)); @@ -1137,7 +1137,7 @@ static int create_derived_datatype(MPID_Request * req, MPIDI_RMA_dtype_info * dt } -static inline int perform_put_in_lock_queue(MPID_Win * win_ptr, +static inline int perform_put_in_lock_queue(MPIR_Win * win_ptr, MPIDI_RMA_Target_lock_entry_t * target_lock_entry) { MPIDI_CH3_Pkt_put_t *put_pkt = &((target_lock_entry->pkt).put); @@ -1178,7 +1178,7 @@ static inline int perform_put_in_lock_queue(MPID_Win * win_ptr, goto fn_exit; } -static inline int perform_get_in_lock_queue(MPID_Win * win_ptr, +static inline int perform_get_in_lock_queue(MPIR_Win * win_ptr, MPIDI_RMA_Target_lock_entry_t * target_lock_entry) { MPIDI_CH3_Pkt_t upkt; @@ -1293,7 +1293,7 @@ static inline int perform_get_in_lock_queue(MPID_Win * win_ptr, } -static inline int perform_acc_in_lock_queue(MPID_Win * win_ptr, +static inline int perform_acc_in_lock_queue(MPIR_Win * win_ptr, MPIDI_RMA_Target_lock_entry_t * target_lock_entry) { MPIDI_CH3_Pkt_accum_t *acc_pkt = &((target_lock_entry->pkt).accum); @@ -1352,7 +1352,7 @@ static inline int perform_acc_in_lock_queue(MPID_Win * win_ptr, } -static inline int perform_get_acc_in_lock_queue(MPID_Win * win_ptr, +static inline int perform_get_acc_in_lock_queue(MPIR_Win * win_ptr, MPIDI_RMA_Target_lock_entry_t * target_lock_entry) { MPIDI_CH3_Pkt_t upkt; @@ -1544,7 +1544,7 @@ static inline int perform_get_acc_in_lock_queue(MPID_Win * win_ptr, } -static inline int perform_fop_in_lock_queue(MPID_Win * win_ptr, +static inline int perform_fop_in_lock_queue(MPIR_Win * win_ptr, MPIDI_RMA_Target_lock_entry_t * target_lock_entry) { MPIDI_CH3_Pkt_t upkt; @@ -1715,7 +1715,7 @@ static inline int perform_fop_in_lock_queue(MPID_Win * win_ptr, } -static inline int perform_cas_in_lock_queue(MPID_Win * win_ptr, +static inline int perform_cas_in_lock_queue(MPIR_Win * win_ptr, MPIDI_RMA_Target_lock_entry_t * target_lock_entry) { MPIDI_CH3_Pkt_t upkt; @@ -1799,7 +1799,7 @@ static inline int perform_cas_in_lock_queue(MPID_Win * win_ptr, } -static inline int perform_op_in_lock_queue(MPID_Win * win_ptr, +static inline int perform_op_in_lock_queue(MPIR_Win * win_ptr, MPIDI_RMA_Target_lock_entry_t * target_lock_entry) { int mpi_errno = MPI_SUCCESS; @@ -1887,7 +1887,7 @@ static int entered_count = 0; #define FUNCNAME MPIDI_CH3I_Release_lock #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3I_Release_lock(MPID_Win * win_ptr) +int MPIDI_CH3I_Release_lock(MPIR_Win * win_ptr) { MPIDI_RMA_Target_lock_entry_t *target_lock_entry, *target_lock_entry_next; int requested_lock, mpi_errno = MPI_SUCCESS, temp_entered_count; @@ -1993,7 +1993,7 @@ int MPIDI_CH3_ReqHandler_PiggybackLockOpRecvComplete(MPIDI_VC_t * vc, { int requested_lock; MPI_Win target_win_handle; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPIDI_CH3_Pkt_flags_t flags; MPIDI_RMA_Target_lock_entry_t *target_lock_queue_entry = rreq->dev.target_lock_queue_entry; int mpi_errno = MPI_SUCCESS; @@ -2015,7 +2015,7 @@ int MPIDI_CH3_ReqHandler_PiggybackLockOpRecvComplete(MPIDI_VC_t * vc, MPIDI_CH3_PKT_RMA_GET_FLAGS(target_lock_queue_entry->pkt, flags, mpi_errno); MPIDI_CH3_PKT_RMA_GET_TARGET_WIN_HANDLE(target_lock_queue_entry->pkt, target_win_handle, mpi_errno); - MPID_Win_get_ptr(target_win_handle, win_ptr); + MPIR_Win_get_ptr(target_win_handle, win_ptr); if (flags & MPIDI_CH3_PKT_FLAG_RMA_STREAM && (rreq->dev.target_lock_queue_entry)->data != NULL) { diff --git a/src/mpid/ch3/src/ch3u_handle_send_req.c b/src/mpid/ch3/src/ch3u_handle_send_req.c index c0b1919..4b81289 100644 --- a/src/mpid/ch3/src/ch3u_handle_send_req.c +++ b/src/mpid/ch3/src/ch3u_handle_send_req.c @@ -52,7 +52,7 @@ int MPIDI_CH3_ReqHandler_GetSendComplete(MPIDI_VC_t * vc ATTRIBUTE((unused)), MPID_Request * sreq, int *complete) { int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr; + MPIR_Win *win_ptr; MPIDI_CH3_Pkt_flags_t flags = sreq->dev.flags; /* NOTE: It is possible that this request is already completed before @@ -73,7 +73,7 @@ int MPIDI_CH3_ReqHandler_GetSendComplete(MPIDI_VC_t * vc ATTRIBUTE((unused)), goto fn_exit; } - MPID_Win_get_ptr(sreq->dev.target_win_handle, win_ptr); + MPIR_Win_get_ptr(sreq->dev.target_win_handle, win_ptr); /* here we decrement the Active Target counter to guarantee the GET-like * operation are completed when counter reaches zero. */ @@ -110,7 +110,7 @@ int MPIDI_CH3_ReqHandler_GetSendComplete(MPIDI_VC_t * vc ATTRIBUTE((unused)), int MPIDI_CH3_ReqHandler_GaccumSendComplete(MPIDI_VC_t * vc, MPID_Request * rreq, int *complete) { int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr; + MPIR_Win *win_ptr; MPIDI_CH3_Pkt_flags_t flags = rreq->dev.flags; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3_REQHANDLER_GACCUMSENDCOMPLETE); @@ -140,7 +140,7 @@ int MPIDI_CH3_ReqHandler_GaccumSendComplete(MPIDI_VC_t * vc, MPID_Request * rreq if (rreq->dev.user_buf != NULL) MPL_free(rreq->dev.user_buf); - MPID_Win_get_ptr(rreq->dev.target_win_handle, win_ptr); + MPIR_Win_get_ptr(rreq->dev.target_win_handle, win_ptr); /* here we decrement the Active Target counter to guarantee the GET-like * operation are completed when counter reaches zero. */ @@ -179,7 +179,7 @@ int MPIDI_CH3_ReqHandler_GaccumSendComplete(MPIDI_VC_t * vc, MPID_Request * rreq int MPIDI_CH3_ReqHandler_CASSendComplete(MPIDI_VC_t * vc, MPID_Request * rreq, int *complete) { int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr; + MPIR_Win *win_ptr; MPIDI_CH3_Pkt_flags_t flags = rreq->dev.flags; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3_REQHANDLER_CASSENDCOMPLETE); @@ -209,7 +209,7 @@ int MPIDI_CH3_ReqHandler_CASSendComplete(MPIDI_VC_t * vc, MPID_Request * rreq, i if (rreq->dev.user_buf != NULL) MPL_free(rreq->dev.user_buf); - MPID_Win_get_ptr(rreq->dev.target_win_handle, win_ptr); + MPIR_Win_get_ptr(rreq->dev.target_win_handle, win_ptr); /* here we decrement the Active Target counter to guarantee the GET-like * operation are completed when counter reaches zero. */ @@ -247,7 +247,7 @@ int MPIDI_CH3_ReqHandler_CASSendComplete(MPIDI_VC_t * vc, MPID_Request * rreq, i int MPIDI_CH3_ReqHandler_FOPSendComplete(MPIDI_VC_t * vc, MPID_Request * rreq, int *complete) { int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr; + MPIR_Win *win_ptr; MPIDI_CH3_Pkt_flags_t flags = rreq->dev.flags; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3_REQHANDLER_FOPSENDCOMPLETE); @@ -277,7 +277,7 @@ int MPIDI_CH3_ReqHandler_FOPSendComplete(MPIDI_VC_t * vc, MPID_Request * rreq, i if (rreq->dev.user_buf != NULL) MPL_free(rreq->dev.user_buf); - MPID_Win_get_ptr(rreq->dev.target_win_handle, win_ptr); + MPIR_Win_get_ptr(rreq->dev.target_win_handle, win_ptr); /* here we decrement the Active Target counter to guarantee the GET-like * operation are completed when counter reaches zero. */ diff --git a/src/mpid/ch3/src/ch3u_rma_ops.c b/src/mpid/ch3/src/ch3u_rma_ops.c index 2d80b11..3fb570a 100644 --- a/src/mpid/ch3/src/ch3u_rma_ops.c +++ b/src/mpid/ch3/src/ch3u_rma_ops.c @@ -40,7 +40,7 @@ cvars: #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3I_Put(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, MPI_Aint target_disp, - int target_count, MPI_Datatype target_datatype, MPID_Win * win_ptr, + int target_count, MPI_Datatype target_datatype, MPIR_Win * win_ptr, MPID_Request * ureq) { int mpi_errno = MPI_SUCCESS; @@ -217,7 +217,7 @@ int MPIDI_CH3I_Put(const void *origin_addr, int origin_count, MPI_Datatype #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3I_Get(void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, MPI_Aint target_disp, - int target_count, MPI_Datatype target_datatype, MPID_Win * win_ptr, + int target_count, MPI_Datatype target_datatype, MPIR_Win * win_ptr, MPID_Request * ureq) { int mpi_errno = MPI_SUCCESS; @@ -388,7 +388,7 @@ int MPIDI_CH3I_Get(void *origin_addr, int origin_count, MPI_Datatype int MPIDI_CH3I_Accumulate(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Op op, - MPID_Win * win_ptr, MPID_Request * ureq) + MPIR_Win * win_ptr, MPID_Request * ureq) { int mpi_errno = MPI_SUCCESS; intptr_t data_sz; @@ -600,7 +600,7 @@ int MPIDI_CH3I_Get_accumulate(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, void *result_addr, int result_count, MPI_Datatype result_datatype, int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Op op, - MPID_Win * win_ptr, MPID_Request * ureq) + MPIR_Win * win_ptr, MPID_Request * ureq) { int mpi_errno = MPI_SUCCESS; intptr_t orig_data_sz, target_data_sz; @@ -850,7 +850,7 @@ int MPIDI_CH3I_Get_accumulate(const void *origin_addr, int origin_count, #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_Put(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, MPI_Aint target_disp, - int target_count, MPI_Datatype target_datatype, MPID_Win * win_ptr) + int target_count, MPI_Datatype target_datatype, MPIR_Win * win_ptr) { int mpi_errno = MPI_SUCCESS; @@ -877,7 +877,7 @@ int MPID_Put(const void *origin_addr, int origin_count, MPI_Datatype #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_Get(void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, MPI_Aint target_disp, - int target_count, MPI_Datatype target_datatype, MPID_Win * win_ptr) + int target_count, MPI_Datatype target_datatype, MPIR_Win * win_ptr) { int mpi_errno = MPI_SUCCESS; @@ -904,7 +904,7 @@ int MPID_Get(void *origin_addr, int origin_count, MPI_Datatype #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_Accumulate(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, MPI_Aint target_disp, - int target_count, MPI_Datatype target_datatype, MPI_Op op, MPID_Win * win_ptr) + int target_count, MPI_Datatype target_datatype, MPI_Op op, MPIR_Win * win_ptr) { int mpi_errno = MPI_SUCCESS; @@ -933,7 +933,7 @@ int MPID_Get_accumulate(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, void *result_addr, int result_count, MPI_Datatype result_datatype, int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Op op, - MPID_Win * win_ptr) + MPIR_Win * win_ptr) { int mpi_errno = MPI_SUCCESS; @@ -962,7 +962,7 @@ int MPID_Get_accumulate(const void *origin_addr, int origin_count, #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_Compare_and_swap(const void *origin_addr, const void *compare_addr, void *result_addr, MPI_Datatype datatype, int target_rank, - MPI_Aint target_disp, MPID_Win * win_ptr) + MPI_Aint target_disp, MPIR_Win * win_ptr) { int mpi_errno = MPI_SUCCESS; int rank; @@ -1096,7 +1096,7 @@ int MPID_Compare_and_swap(const void *origin_addr, const void *compare_addr, #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_Fetch_and_op(const void *origin_addr, void *result_addr, MPI_Datatype datatype, int target_rank, - MPI_Aint target_disp, MPI_Op op, MPID_Win * win_ptr) + MPI_Aint target_disp, MPI_Op op, MPIR_Win * win_ptr) { int mpi_errno = MPI_SUCCESS; int rank; diff --git a/src/mpid/ch3/src/ch3u_rma_pkthandler.c b/src/mpid/ch3/src/ch3u_rma_pkthandler.c index d9da632..ac8367e 100644 --- a/src/mpid/ch3/src/ch3u_rma_pkthandler.c +++ b/src/mpid/ch3/src/ch3u_rma_pkthandler.c @@ -265,7 +265,7 @@ int MPIDI_CH3_PktHandler_Put(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, int complete = 0; char *data_buf = NULL; intptr_t data_len; - MPID_Win *win_ptr; + MPIR_Win *win_ptr; int acquire_lock_fail = 0; int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3_PKTHANDLER_PUT); @@ -277,7 +277,7 @@ int MPIDI_CH3_PktHandler_Put(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, MPIR_T_PVAR_TIMER_START(RMA, rma_rmapkt_put); MPIU_Assert(put_pkt->target_win_handle != MPI_WIN_NULL); - MPID_Win_get_ptr(put_pkt->target_win_handle, win_ptr); + MPIR_Win_get_ptr(put_pkt->target_win_handle, win_ptr); mpi_errno = check_piggyback_lock(win_ptr, vc, pkt, buflen, &acquire_lock_fail, &req); if (mpi_errno != MPI_SUCCESS) @@ -440,7 +440,7 @@ int MPIDI_CH3_PktHandler_Get(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, int complete = 0; char *data_buf = NULL; intptr_t data_len; - MPID_Win *win_ptr; + MPIR_Win *win_ptr; int mpi_errno = MPI_SUCCESS; MPI_Aint type_size; int acquire_lock_fail = 0; @@ -453,7 +453,7 @@ int MPIDI_CH3_PktHandler_Get(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, MPIR_T_PVAR_TIMER_START(RMA, rma_rmapkt_get); MPIU_Assert(get_pkt->target_win_handle != MPI_WIN_NULL); - MPID_Win_get_ptr(get_pkt->target_win_handle, win_ptr); + MPIR_Win_get_ptr(get_pkt->target_win_handle, win_ptr); mpi_errno = check_piggyback_lock(win_ptr, vc, pkt, buflen, &acquire_lock_fail, &req); if (mpi_errno != MPI_SUCCESS) @@ -653,7 +653,7 @@ int MPIDI_CH3_PktHandler_Accumulate(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, int complete = 0; char *data_buf = NULL; intptr_t data_len; - MPID_Win *win_ptr; + MPIR_Win *win_ptr; int acquire_lock_fail = 0; int mpi_errno = MPI_SUCCESS; MPI_Aint type_size; @@ -667,7 +667,7 @@ int MPIDI_CH3_PktHandler_Accumulate(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, MPIR_T_PVAR_TIMER_START(RMA, rma_rmapkt_acc); MPIU_Assert(accum_pkt->target_win_handle != MPI_WIN_NULL); - MPID_Win_get_ptr(accum_pkt->target_win_handle, win_ptr); + MPIR_Win_get_ptr(accum_pkt->target_win_handle, win_ptr); mpi_errno = check_piggyback_lock(win_ptr, vc, pkt, buflen, &acquire_lock_fail, &req); if (mpi_errno != MPI_SUCCESS) @@ -865,7 +865,7 @@ int MPIDI_CH3_PktHandler_GetAccumulate(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, int complete = 0; char *data_buf = NULL; intptr_t data_len; - MPID_Win *win_ptr; + MPIR_Win *win_ptr; int acquire_lock_fail = 0; int mpi_errno = MPI_SUCCESS; MPI_Aint stream_elem_count, total_len; @@ -878,7 +878,7 @@ int MPIDI_CH3_PktHandler_GetAccumulate(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, MPIR_T_PVAR_TIMER_START(RMA, rma_rmapkt_get_accum); MPIU_Assert(get_accum_pkt->target_win_handle != MPI_WIN_NULL); - MPID_Win_get_ptr(get_accum_pkt->target_win_handle, win_ptr); + MPIR_Win_get_ptr(get_accum_pkt->target_win_handle, win_ptr); mpi_errno = check_piggyback_lock(win_ptr, vc, pkt, buflen, &acquire_lock_fail, &req); if (mpi_errno != MPI_SUCCESS) @@ -1151,7 +1151,7 @@ int MPIDI_CH3_PktHandler_CAS(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, MPIDI_CH3_Pkt_t upkt; MPIDI_CH3_Pkt_cas_resp_t *cas_resp_pkt = &upkt.cas_resp; MPIDI_CH3_Pkt_cas_t *cas_pkt = &pkt->cas; - MPID_Win *win_ptr; + MPIR_Win *win_ptr; MPID_Request *req; MPID_Request *rreq = NULL; MPI_Aint len; @@ -1165,7 +1165,7 @@ int MPIDI_CH3_PktHandler_CAS(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, MPIR_T_PVAR_TIMER_START(RMA, rma_rmapkt_cas); MPIU_Assert(cas_pkt->target_win_handle != MPI_WIN_NULL); - MPID_Win_get_ptr(cas_pkt->target_win_handle, win_ptr); + MPIR_Win_get_ptr(cas_pkt->target_win_handle, win_ptr); mpi_errno = check_piggyback_lock(win_ptr, vc, pkt, buflen, &acquire_lock_fail, &rreq); if (mpi_errno != MPI_SUCCESS) @@ -1264,7 +1264,7 @@ int MPIDI_CH3_PktHandler_CASResp(MPIDI_VC_t * vc ATTRIBUTE((unused)), MPIDI_CH3_Pkt_cas_resp_t *cas_resp_pkt = &pkt->cas_resp; MPID_Request *req; MPI_Aint len; - MPID_Win *win_ptr; + MPIR_Win *win_ptr; int target_rank = cas_resp_pkt->target_rank; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3_PKTHANDLER_CASRESP); @@ -1275,7 +1275,7 @@ int MPIDI_CH3_PktHandler_CASResp(MPIDI_VC_t * vc ATTRIBUTE((unused)), MPIR_T_PVAR_TIMER_START(RMA, rma_rmapkt_cas_resp); MPID_Request_get_ptr(cas_resp_pkt->request_handle, req); - MPID_Win_get_ptr(req->dev.source_win_handle, win_ptr); + MPIR_Win_get_ptr(req->dev.source_win_handle, win_ptr); /* decrement ack_counter on this target */ if (cas_resp_pkt->flags & MPIDI_CH3_PKT_FLAG_RMA_LOCK_GRANTED) { @@ -1328,7 +1328,7 @@ int MPIDI_CH3_PktHandler_FOP(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, MPID_Request *resp_req = NULL; MPID_Request *rreq = NULL; int acquire_lock_fail = 0; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPI_Aint type_size; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3_PKTHANDLER_FOP); @@ -1338,7 +1338,7 @@ int MPIDI_CH3_PktHandler_FOP(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, MPIR_T_PVAR_TIMER_START(RMA, rma_rmapkt_fop); - MPID_Win_get_ptr(fop_pkt->target_win_handle, win_ptr); + MPIR_Win_get_ptr(fop_pkt->target_win_handle, win_ptr); mpi_errno = check_piggyback_lock(win_ptr, vc, pkt, buflen, &acquire_lock_fail, &rreq); if (mpi_errno != MPI_SUCCESS) @@ -1513,7 +1513,7 @@ int MPIDI_CH3_PktHandler_FOPResp(MPIDI_VC_t * vc ATTRIBUTE((unused)), int mpi_errno = MPI_SUCCESS; MPIDI_CH3_Pkt_fop_resp_t *fop_resp_pkt = &pkt->fop_resp; MPID_Request *req = NULL; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPI_Aint type_size; intptr_t data_len; char *data_buf = NULL; @@ -1528,7 +1528,7 @@ int MPIDI_CH3_PktHandler_FOPResp(MPIDI_VC_t * vc ATTRIBUTE((unused)), MPIR_T_PVAR_TIMER_START(RMA, rma_rmapkt_fop_resp); MPID_Request_get_ptr(fop_resp_pkt->request_handle, req); - MPID_Win_get_ptr(req->dev.source_win_handle, win_ptr); + MPIR_Win_get_ptr(req->dev.source_win_handle, win_ptr); /* decrement ack_counter */ if (fop_resp_pkt->flags & MPIDI_CH3_PKT_FLAG_RMA_LOCK_GRANTED) { @@ -1606,7 +1606,7 @@ int MPIDI_CH3_PktHandler_Get_AccumResp(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, intptr_t data_len; int mpi_errno = MPI_SUCCESS; MPI_Aint type_size; - MPID_Win *win_ptr; + MPIR_Win *win_ptr; int target_rank = get_accum_resp_pkt->target_rank; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3_PKTHANDLER_GET_ACCUM_RESP); @@ -1617,7 +1617,7 @@ int MPIDI_CH3_PktHandler_Get_AccumResp(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, MPIR_T_PVAR_TIMER_START(RMA, rma_rmapkt_get_accum_resp); MPID_Request_get_ptr(get_accum_resp_pkt->request_handle, req); - MPID_Win_get_ptr(req->dev.source_win_handle, win_ptr); + MPIR_Win_get_ptr(req->dev.source_win_handle, win_ptr); /* decrement ack_counter on target */ if (get_accum_resp_pkt->flags & MPIDI_CH3_PKT_FLAG_RMA_LOCK_GRANTED) { @@ -1738,7 +1738,7 @@ int MPIDI_CH3_PktHandler_Lock(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, intptr_t * buflen, MPID_Request ** rreqp) { MPIDI_CH3_Pkt_lock_t *lock_pkt = &pkt->lock; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; int lock_type; int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3_PKTHANDLER_LOCK); @@ -1751,7 +1751,7 @@ int MPIDI_CH3_PktHandler_Lock(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, *buflen = sizeof(MPIDI_CH3_Pkt_t); - MPID_Win_get_ptr(lock_pkt->target_win_handle, win_ptr); + MPIR_Win_get_ptr(lock_pkt->target_win_handle, win_ptr); if (lock_pkt->flags & MPIDI_CH3_PKT_FLAG_RMA_LOCK_SHARED) lock_type = MPI_LOCK_SHARED; @@ -1800,7 +1800,7 @@ int MPIDI_CH3_PktHandler_GetResp(MPIDI_VC_t * vc ATTRIBUTE((unused)), intptr_t data_len; int mpi_errno = MPI_SUCCESS; MPI_Aint type_size; - MPID_Win *win_ptr; + MPIR_Win *win_ptr; int target_rank = get_resp_pkt->target_rank; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3_PKTHANDLER_GETRESP); @@ -1811,7 +1811,7 @@ int MPIDI_CH3_PktHandler_GetResp(MPIDI_VC_t * vc ATTRIBUTE((unused)), MPIR_T_PVAR_TIMER_START(RMA, rma_rmapkt_get_resp); MPID_Request_get_ptr(get_resp_pkt->request_handle, req); - MPID_Win_get_ptr(req->dev.source_win_handle, win_ptr); + MPIR_Win_get_ptr(req->dev.source_win_handle, win_ptr); /* decrement ack_counter on target */ if (get_resp_pkt->flags & MPIDI_CH3_PKT_FLAG_RMA_LOCK_GRANTED) { @@ -1880,7 +1880,7 @@ int MPIDI_CH3_PktHandler_LockAck(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, intptr_t * buflen, MPID_Request ** rreqp) { MPIDI_CH3_Pkt_lock_ack_t *lock_ack_pkt = &pkt->lock_ack; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; int target_rank = lock_ack_pkt->target_rank; int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3_PKTHANDLER_LOCKACK); @@ -1894,7 +1894,7 @@ int MPIDI_CH3_PktHandler_LockAck(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, *buflen = sizeof(MPIDI_CH3_Pkt_t); if (lock_ack_pkt->source_win_handle != MPI_WIN_NULL) { - MPID_Win_get_ptr(lock_ack_pkt->source_win_handle, win_ptr); + MPIR_Win_get_ptr(lock_ack_pkt->source_win_handle, win_ptr); } else { MPIU_Assert(lock_ack_pkt->request_handle != MPI_REQUEST_NULL); @@ -1902,7 +1902,7 @@ int MPIDI_CH3_PktHandler_LockAck(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, MPID_Request *req_ptr = NULL; MPID_Request_get_ptr(lock_ack_pkt->request_handle, req_ptr); MPIU_Assert(req_ptr->dev.source_win_handle != MPI_REQUEST_NULL); - MPID_Win_get_ptr(req_ptr->dev.source_win_handle, win_ptr); + MPIR_Win_get_ptr(req_ptr->dev.source_win_handle, win_ptr); } mpi_errno = handle_lock_ack(win_ptr, target_rank, lock_ack_pkt->flags); @@ -1928,7 +1928,7 @@ int MPIDI_CH3_PktHandler_LockOpAck(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, intptr_t * buflen, MPID_Request ** rreqp) { MPIDI_CH3_Pkt_lock_op_ack_t *lock_op_ack_pkt = &pkt->lock_op_ack; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; int target_rank = lock_op_ack_pkt->target_rank; MPIDI_CH3_Pkt_flags_t flags = lock_op_ack_pkt->flags; int mpi_errno = MPI_SUCCESS; @@ -1939,7 +1939,7 @@ int MPIDI_CH3_PktHandler_LockOpAck(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, *buflen = sizeof(MPIDI_CH3_Pkt_t); if (lock_op_ack_pkt->source_win_handle != MPI_WIN_NULL) { - MPID_Win_get_ptr(lock_op_ack_pkt->source_win_handle, win_ptr); + MPIR_Win_get_ptr(lock_op_ack_pkt->source_win_handle, win_ptr); } else { MPIU_Assert(lock_op_ack_pkt->request_handle != MPI_REQUEST_NULL); @@ -1947,7 +1947,7 @@ int MPIDI_CH3_PktHandler_LockOpAck(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, MPID_Request *req_ptr = NULL; MPID_Request_get_ptr(lock_op_ack_pkt->request_handle, req_ptr); MPIU_Assert(req_ptr->dev.source_win_handle != MPI_REQUEST_NULL); - MPID_Win_get_ptr(req_ptr->dev.source_win_handle, win_ptr); + MPIR_Win_get_ptr(req_ptr->dev.source_win_handle, win_ptr); } mpi_errno = handle_lock_ack_with_op(win_ptr, target_rank, lock_op_ack_pkt->flags); @@ -1983,7 +1983,7 @@ int MPIDI_CH3_PktHandler_Ack(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, intptr_t * buflen, MPID_Request ** rreqp) { MPIDI_CH3_Pkt_ack_t *ack_pkt = &pkt->ack; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; int mpi_errno = MPI_SUCCESS; int target_rank = ack_pkt->target_rank; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3_PKTHANDLER_ACK); @@ -1996,7 +1996,7 @@ int MPIDI_CH3_PktHandler_Ack(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, *buflen = sizeof(MPIDI_CH3_Pkt_t); - MPID_Win_get_ptr(ack_pkt->source_win_handle, win_ptr); + MPIR_Win_get_ptr(ack_pkt->source_win_handle, win_ptr); /* decrement ack_counter on target */ mpi_errno = MPIDI_CH3I_RMA_Handle_ack(win_ptr, target_rank); @@ -2024,7 +2024,7 @@ int MPIDI_CH3_PktHandler_DecrAtCnt(MPIDI_VC_t * vc ATTRIBUTE((unused)), intptr_t * buflen, MPID_Request ** rreqp) { MPIDI_CH3_Pkt_decr_at_counter_t *decr_at_cnt_pkt = &pkt->decr_at_cnt; - MPID_Win *win_ptr; + MPIR_Win *win_ptr; int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3_PKTHANDLER_DECRATCNT); @@ -2032,7 +2032,7 @@ int MPIDI_CH3_PktHandler_DecrAtCnt(MPIDI_VC_t * vc ATTRIBUTE((unused)), MPIR_T_PVAR_TIMER_START(RMA, rma_rmapkt_decr_at_cnt); - MPID_Win_get_ptr(decr_at_cnt_pkt->target_win_handle, win_ptr); + MPIR_Win_get_ptr(decr_at_cnt_pkt->target_win_handle, win_ptr); win_ptr->at_completion_counter--; MPIU_Assert(win_ptr->at_completion_counter >= 0); @@ -2067,7 +2067,7 @@ int MPIDI_CH3_PktHandler_Unlock(MPIDI_VC_t * vc ATTRIBUTE((unused)), { int mpi_errno = MPI_SUCCESS; MPIDI_CH3_Pkt_unlock_t *unlock_pkt = &pkt->unlock; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3_PKTHANDLER_UNLOCK); MPIDI_FUNC_ENTER(MPID_STATE_MPIDI_CH3_PKTHANDLER_UNLOCK); @@ -2078,7 +2078,7 @@ int MPIDI_CH3_PktHandler_Unlock(MPIDI_VC_t * vc ATTRIBUTE((unused)), *buflen = sizeof(MPIDI_CH3_Pkt_t); *rreqp = NULL; - MPID_Win_get_ptr(unlock_pkt->target_win_handle, win_ptr); + MPIR_Win_get_ptr(unlock_pkt->target_win_handle, win_ptr); mpi_errno = MPIDI_CH3I_Release_lock(win_ptr); MPIR_ERR_CHKANDJUMP(mpi_errno != MPI_SUCCESS, mpi_errno, MPI_ERR_OTHER, "**ch3|rma_msg"); @@ -2110,7 +2110,7 @@ int MPIDI_CH3_PktHandler_Flush(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, { int mpi_errno = MPI_SUCCESS; MPIDI_CH3_Pkt_flush_t *flush_pkt = &pkt->flush; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3_PKTHANDLER_FLUSH); MPIDI_FUNC_ENTER(MPID_STATE_MPIDI_CH3_PKTHANDLER_FLUSH); @@ -2121,7 +2121,7 @@ int MPIDI_CH3_PktHandler_Flush(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, *buflen = sizeof(MPIDI_CH3_Pkt_t); *rreqp = NULL; - MPID_Win_get_ptr(flush_pkt->target_win_handle, win_ptr); + MPIR_Win_get_ptr(flush_pkt->target_win_handle, win_ptr); mpi_errno = MPIDI_CH3I_Send_ack_pkt(vc, win_ptr, flush_pkt->source_win_handle); if (mpi_errno != MPI_SUCCESS) diff --git a/src/mpid/ch3/src/ch3u_rma_progress.c b/src/mpid/ch3/src/ch3u_rma_progress.c index e781e64..3b6b2bc 100644 --- a/src/mpid/ch3/src/ch3u_rma_progress.c +++ b/src/mpid/ch3/src/ch3u_rma_progress.c @@ -45,11 +45,11 @@ cvars: === END_MPI_T_CVAR_INFO_BLOCK === */ -static inline int check_and_switch_target_state(MPID_Win * win_ptr, MPIDI_RMA_Target_t * target, +static inline int check_and_switch_target_state(MPIR_Win * win_ptr, MPIDI_RMA_Target_t * target, int *is_able_to_issue, int *made_progress); -static inline int issue_ops_target(MPID_Win * win_ptr, MPIDI_RMA_Target_t * target, +static inline int issue_ops_target(MPIR_Win * win_ptr, MPIDI_RMA_Target_t * target, int *made_progress); -static inline int issue_ops_win(MPID_Win * win_ptr, int *made_progress); +static inline int issue_ops_win(MPIR_Win * win_ptr, int *made_progress); /* This macro checks if window state is ready for issuing RMA operations. */ @@ -65,7 +65,7 @@ static inline int issue_ops_win(MPID_Win * win_ptr, int *made_progress); #define FUNCNAME check_and_switch_target_state #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int check_and_switch_target_state(MPID_Win * win_ptr, MPIDI_RMA_Target_t * target, +static inline int check_and_switch_target_state(MPIR_Win * win_ptr, MPIDI_RMA_Target_t * target, int *is_able_to_issue, int *made_progress) { int rank = win_ptr->comm_ptr->rank; @@ -239,7 +239,7 @@ static inline int check_and_switch_target_state(MPID_Win * win_ptr, MPIDI_RMA_Ta #define FUNCNAME issue_ops_target #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int issue_ops_target(MPID_Win * win_ptr, MPIDI_RMA_Target_t * target, +static inline int issue_ops_target(MPIR_Win * win_ptr, MPIDI_RMA_Target_t * target, int *made_progress) { MPIDI_RMA_Op_t *curr_op = NULL; @@ -381,7 +381,7 @@ static inline int issue_ops_target(MPID_Win * win_ptr, MPIDI_RMA_Target_t * targ #define FUNCNAME issue_ops_win #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int issue_ops_win(MPID_Win * win_ptr, int *made_progress) +static inline int issue_ops_win(MPIR_Win * win_ptr, int *made_progress) { int mpi_errno = MPI_SUCCESS; int start_slot, end_slot, i, idx; @@ -433,7 +433,7 @@ static inline int issue_ops_win(MPID_Win * win_ptr, int *made_progress) #define FUNCNAME MPIDI_CH3I_RMA_Cleanup_ops_aggressive #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3I_RMA_Cleanup_ops_aggressive(MPID_Win * win_ptr) +int MPIDI_CH3I_RMA_Cleanup_ops_aggressive(MPIR_Win * win_ptr) { int i, local_completed = 0, remote_completed ATTRIBUTE((unused)) = 0; int mpi_errno = MPI_SUCCESS; @@ -486,7 +486,7 @@ int MPIDI_CH3I_RMA_Cleanup_ops_aggressive(MPID_Win * win_ptr) #define FUNCNAME MPIDI_CH3I_RMA_Cleanup_target_aggressive #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3I_RMA_Cleanup_target_aggressive(MPID_Win * win_ptr, MPIDI_RMA_Target_t ** target) +int MPIDI_CH3I_RMA_Cleanup_target_aggressive(MPIR_Win * win_ptr, MPIDI_RMA_Target_t ** target) { int i, local_completed ATTRIBUTE((unused)) = 0, remote_completed = 0; int made_progress = 0; @@ -568,7 +568,7 @@ int MPIDI_CH3I_RMA_Cleanup_target_aggressive(MPID_Win * win_ptr, MPIDI_RMA_Targe #define FUNCNAME MPIDI_CH3I_RMA_Make_progress_target #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3I_RMA_Make_progress_target(MPID_Win * win_ptr, int target_rank, int *made_progress) +int MPIDI_CH3I_RMA_Make_progress_target(MPIR_Win * win_ptr, int target_rank, int *made_progress) { int temp_progress = 0; int is_able_to_issue = 0; @@ -628,7 +628,7 @@ int MPIDI_CH3I_RMA_Make_progress_target(MPID_Win * win_ptr, int target_rank, int #define FUNCNAME MPIDI_CH3I_RMA_Make_progress_win #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3I_RMA_Make_progress_win(MPID_Win * win_ptr, int *made_progress) +int MPIDI_CH3I_RMA_Make_progress_win(MPIR_Win * win_ptr, int *made_progress) { int mpi_errno = MPI_SUCCESS; int temp_progress = 0; @@ -670,7 +670,7 @@ int MPIDI_CH3I_RMA_Make_progress_win(MPID_Win * win_ptr, int *made_progress) #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3I_RMA_Make_progress_global(int *made_progress) { - MPID_Win *win_ptr; + MPIR_Win *win_ptr; int mpi_errno = MPI_SUCCESS; (*made_progress) = 0; diff --git a/src/mpid/ch3/src/ch3u_rma_reqops.c b/src/mpid/ch3/src/ch3u_rma_reqops.c index ec871fd..9534a85 100644 --- a/src/mpid/ch3/src/ch3u_rma_reqops.c +++ b/src/mpid/ch3/src/ch3u_rma_reqops.c @@ -14,7 +14,7 @@ #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_Rput(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, MPI_Aint target_disp, - int target_count, MPI_Datatype target_datatype, MPID_Win * win_ptr, + int target_count, MPI_Datatype target_datatype, MPIR_Win * win_ptr, MPID_Request ** request) { int mpi_errno = MPI_SUCCESS; @@ -77,7 +77,7 @@ int MPID_Rput(const void *origin_addr, int origin_count, #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_Rget(void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, MPI_Aint target_disp, - int target_count, MPI_Datatype target_datatype, MPID_Win * win_ptr, + int target_count, MPI_Datatype target_datatype, MPIR_Win * win_ptr, MPID_Request ** request) { int mpi_errno = MPI_SUCCESS; @@ -140,7 +140,7 @@ int MPID_Rget(void *origin_addr, int origin_count, #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_Raccumulate(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, MPI_Aint target_disp, - int target_count, MPI_Datatype target_datatype, MPI_Op op, MPID_Win * win_ptr, + int target_count, MPI_Datatype target_datatype, MPI_Op op, MPIR_Win * win_ptr, MPID_Request ** request) { int mpi_errno = MPI_SUCCESS; @@ -205,7 +205,7 @@ int MPID_Rget_accumulate(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, void *result_addr, int result_count, MPI_Datatype result_datatype, int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Op op, - MPID_Win * win_ptr, MPID_Request ** request) + MPIR_Win * win_ptr, MPID_Request ** request) { int mpi_errno = MPI_SUCCESS; int dt_contig ATTRIBUTE((unused)); diff --git a/src/mpid/ch3/src/ch3u_rma_sync.c b/src/mpid/ch3/src/ch3u_rma_sync.c index bca4c72..38e4616 100644 --- a/src/mpid/ch3/src/ch3u_rma_sync.c +++ b/src/mpid/ch3/src/ch3u_rma_sync.c @@ -329,7 +329,7 @@ void MPIDI_CH3_RMA_Init_sync_pvars(void) #define FUNCNAME flush_local_all #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int flush_local_all(MPID_Win * win_ptr) +static inline int flush_local_all(MPIR_Win * win_ptr) { int i, made_progress = 0; int local_completed = 0; @@ -380,7 +380,7 @@ static inline int flush_local_all(MPID_Win * win_ptr) #define FUNCNAME flush_all #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int flush_all(MPID_Win * win_ptr) +static inline int flush_all(MPIR_Win * win_ptr) { int i, made_progress = 0; int remote_completed = 0; @@ -434,12 +434,12 @@ static inline int flush_all(MPID_Win * win_ptr) static int fence_barrier_complete(MPID_Request * sreq) { int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPIDI_STATE_DECL(MPID_STATE_FENCE_BARRIER_COMPLETE); MPIDI_FUNC_ENTER(MPID_STATE_FENCE_BARRIER_COMPLETE); - MPID_Win_get_ptr(sreq->dev.source_win_handle, win_ptr); + MPIR_Win_get_ptr(sreq->dev.source_win_handle, win_ptr); MPIU_Assert(win_ptr != NULL); /* decrement incomplete ibarrier request counter */ @@ -477,7 +477,7 @@ static int fence_barrier_complete(MPID_Request * sreq) #define FUNCNAME MPID_Win_fence #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Win_fence(int assert, MPID_Win * win_ptr) +int MPID_Win_fence(int assert, MPIR_Win * win_ptr) { int i; MPIDI_RMA_Target_t *curr_target = NULL; @@ -706,7 +706,7 @@ int MPID_Win_fence(int assert, MPID_Win * win_ptr) #define FUNCNAME MPID_Win_post #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Win_post(MPIR_Group * post_grp_ptr, int assert, MPID_Win * win_ptr) +int MPID_Win_post(MPIR_Group * post_grp_ptr, int assert, MPIR_Win * win_ptr) { int *post_ranks_in_win_grp; int mpi_errno = MPI_SUCCESS; @@ -806,12 +806,12 @@ int MPID_Win_post(MPIR_Group * post_grp_ptr, int assert, MPID_Win * win_ptr) static int start_req_complete(MPID_Request * req) { int mpi_errno = MPI_SUCCESS; - MPID_Win *win_ptr = NULL; + MPIR_Win *win_ptr = NULL; MPIDI_STATE_DECL(MPID_STATE_START_REQ_COMPLETE); MPIDI_FUNC_ENTER(MPID_STATE_START_REQ_COMPLETE); - MPID_Win_get_ptr(req->dev.source_win_handle, win_ptr); + MPIR_Win_get_ptr(req->dev.source_win_handle, win_ptr); MPIU_Assert(win_ptr != NULL); win_ptr->sync_request_cnt--; @@ -836,7 +836,7 @@ static int start_req_complete(MPID_Request * req) #define FUNCNAME MPID_Win_start #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Win_start(MPIR_Group * group_ptr, int assert, MPID_Win * win_ptr) +int MPID_Win_start(MPIR_Group * group_ptr, int assert, MPIR_Win * win_ptr) { int mpi_errno = MPI_SUCCESS; MPIU_CHKLMEM_DECL(2); @@ -959,7 +959,7 @@ int MPID_Win_start(MPIR_Group * group_ptr, int assert, MPID_Win * win_ptr) #define FUNCNAME MPID_Win_complete #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Win_complete(MPID_Win * win_ptr) +int MPID_Win_complete(MPIR_Win * win_ptr) { int mpi_errno = MPI_SUCCESS; int i, dst, rank = win_ptr->comm_ptr->rank; @@ -1047,7 +1047,7 @@ int MPID_Win_complete(MPID_Win * win_ptr) #define FUNCNAME MPID_Win_wait #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Win_wait(MPID_Win * win_ptr) +int MPID_Win_wait(MPIR_Win * win_ptr) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPID_WIN_WAIT); @@ -1086,7 +1086,7 @@ int MPID_Win_wait(MPID_Win * win_ptr) #define FUNCNAME MPID_Win_test #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Win_test(MPID_Win * win_ptr, int *flag) +int MPID_Win_test(MPIR_Win * win_ptr, int *flag) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPID_WIN_TEST); @@ -1132,7 +1132,7 @@ int MPID_Win_test(MPID_Win * win_ptr, int *flag) #define FUNCNAME MPID_Win_lock #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Win_lock(int lock_type, int dest, int assert, MPID_Win * win_ptr) +int MPID_Win_lock(int lock_type, int dest, int assert, MPIR_Win * win_ptr) { int made_progress = 0; int shm_target = FALSE; @@ -1242,7 +1242,7 @@ int MPID_Win_lock(int lock_type, int dest, int assert, MPID_Win * win_ptr) #define FUNCNAME MPID_Win_unlock #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Win_unlock(int dest, MPID_Win * win_ptr) +int MPID_Win_unlock(int dest, MPIR_Win * win_ptr) { int made_progress = 0; int local_completed ATTRIBUTE((unused)) = 0, remote_completed = 0; @@ -1341,7 +1341,7 @@ int MPID_Win_unlock(int dest, MPID_Win * win_ptr) #define FUNCNAME MPID_Win_flush #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Win_flush(int dest, MPID_Win * win_ptr) +int MPID_Win_flush(int dest, MPIR_Win * win_ptr) { int made_progress = 0; int local_completed ATTRIBUTE((unused)) = 0, remote_completed = 0; @@ -1432,7 +1432,7 @@ int MPID_Win_flush(int dest, MPID_Win * win_ptr) #define FUNCNAME MPID_Win_flush_local #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Win_flush_local(int dest, MPID_Win * win_ptr) +int MPID_Win_flush_local(int dest, MPIR_Win * win_ptr) { int made_progress = 0; int local_completed = 0, remote_completed ATTRIBUTE((unused)) = 0; @@ -1508,7 +1508,7 @@ int MPID_Win_flush_local(int dest, MPID_Win * win_ptr) #define FUNCNAME MPID_Win_lock_all #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Win_lock_all(int assert, MPID_Win * win_ptr) +int MPID_Win_lock_all(int assert, MPIR_Win * win_ptr) { int i, rank = win_ptr->comm_ptr->rank; int mpi_errno = MPI_SUCCESS; @@ -1587,7 +1587,7 @@ int MPID_Win_lock_all(int assert, MPID_Win * win_ptr) #define FUNCNAME MPID_Win_unlock_all #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Win_unlock_all(MPID_Win * win_ptr) +int MPID_Win_unlock_all(MPIR_Win * win_ptr) { int i, made_progress = 0; int remote_completed = 0; @@ -1719,7 +1719,7 @@ int MPID_Win_unlock_all(MPID_Win * win_ptr) #define FUNCNAME MPID_Win_flush_all #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Win_flush_all(MPID_Win * win_ptr) +int MPID_Win_flush_all(MPIR_Win * win_ptr) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPIDI_STATE_MPID_WIN_FLUSH_ALL); @@ -1755,7 +1755,7 @@ int MPID_Win_flush_all(MPID_Win * win_ptr) #define FUNCNAME MPID_Win_flush_local_all #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Win_flush_local_all(MPID_Win * win_ptr) +int MPID_Win_flush_local_all(MPIR_Win * win_ptr) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPID_WIN_FLUSH_LOCAL_ALL); @@ -1791,7 +1791,7 @@ int MPID_Win_flush_local_all(MPID_Win * win_ptr) #define FUNCNAME MPID_Win_sync #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Win_sync(MPID_Win * win_ptr) +int MPID_Win_sync(MPIR_Win * win_ptr) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPID_WIN_SYNC); diff --git a/src/mpid/ch3/src/ch3u_win_fns.c b/src/mpid/ch3/src/ch3u_win_fns.c index 9cbbdc2..5b35ec3 100644 --- a/src/mpid/ch3/src/ch3u_win_fns.c +++ b/src/mpid/ch3/src/ch3u_win_fns.c @@ -39,7 +39,7 @@ int MPIDI_Win_fns_init(MPIDI_CH3U_Win_fns_t * win_fns) #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3U_Win_gather_info(void *base, MPI_Aint size, int disp_unit, - MPID_Info * info, MPIR_Comm * comm_ptr, MPID_Win ** win_ptr) + MPID_Info * info, MPIR_Comm * comm_ptr, MPIR_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS, i, k, comm_size, rank; MPI_Aint *tmp_buf; @@ -106,7 +106,7 @@ int MPIDI_CH3U_Win_gather_info(void *base, MPI_Aint size, int disp_unit, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3U_Win_create(void *base, MPI_Aint size, int disp_unit, MPID_Info * info, - MPIR_Comm * comm_ptr, MPID_Win ** win_ptr) + MPIR_Comm * comm_ptr, MPIR_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3U_WIN_CREATE); @@ -140,7 +140,7 @@ int MPIDI_CH3U_Win_create(void *base, MPI_Aint size, int disp_unit, MPID_Info * #define FUNCNAME MPIDI_CH3U_Win_create_dynamic #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3U_Win_create_dynamic(MPID_Info * info, MPIR_Comm * comm_ptr, MPID_Win ** win_ptr) +int MPIDI_CH3U_Win_create_dynamic(MPID_Info * info, MPIR_Comm * comm_ptr, MPIR_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3U_WIN_CREATE_DYNAMIC); @@ -164,7 +164,7 @@ int MPIDI_CH3U_Win_create_dynamic(MPID_Info * info, MPIR_Comm * comm_ptr, MPID_W #define FUNCNAME MPID_Win_attach #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Win_attach(MPID_Win * win, void *base, MPI_Aint size) +int MPID_Win_attach(MPIR_Win * win, void *base, MPI_Aint size) { int mpi_errno = MPI_SUCCESS; @@ -187,7 +187,7 @@ int MPID_Win_attach(MPID_Win * win, void *base, MPI_Aint size) #define FUNCNAME MPID_Win_detach #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Win_detach(MPID_Win * win, const void *base) +int MPID_Win_detach(MPIR_Win * win, const void *base) { int mpi_errno = MPI_SUCCESS; @@ -211,7 +211,7 @@ int MPID_Win_detach(MPID_Win * win, const void *base) #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3U_Win_allocate(MPI_Aint size, int disp_unit, MPID_Info * info, - MPIR_Comm * comm_ptr, void *baseptr, MPID_Win ** win_ptr) + MPIR_Comm * comm_ptr, void *baseptr, MPIR_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3U_WIN_ALLOCATE); @@ -245,7 +245,7 @@ int MPIDI_CH3U_Win_allocate(MPI_Aint size, int disp_unit, MPID_Info * info, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3U_Win_allocate_no_shm(MPI_Aint size, int disp_unit, MPID_Info * info, - MPIR_Comm * comm_ptr, void *baseptr, MPID_Win ** win_ptr) + MPIR_Comm * comm_ptr, void *baseptr, MPIR_Win ** win_ptr) { void **base_pp = (void **) baseptr; int mpi_errno = MPI_SUCCESS; @@ -287,7 +287,7 @@ int MPIDI_CH3U_Win_allocate_no_shm(MPI_Aint size, int disp_unit, MPID_Info * inf #define FUNCNAME MPIDI_CH3U_Win_shared_query #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3U_Win_shared_query(MPID_Win * win_ptr, int target_rank, MPI_Aint * size, +int MPIDI_CH3U_Win_shared_query(MPIR_Win * win_ptr, int target_rank, MPI_Aint * size, int *disp_unit, void *baseptr) { int mpi_errno = MPI_SUCCESS; @@ -313,7 +313,7 @@ int MPIDI_CH3U_Win_shared_query(MPID_Win * win_ptr, int target_rank, MPI_Aint * #define FUNCNAME MPID_Win_set_info #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Win_set_info(MPID_Win * win, MPID_Info * info) +int MPID_Win_set_info(MPIR_Win * win, MPID_Info * info) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPID_WIN_SET_INFO); @@ -392,7 +392,7 @@ int MPID_Win_set_info(MPID_Win * win, MPID_Info * info) #define FUNCNAME MPID_Win_get_info #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Win_get_info(MPID_Win * win, MPID_Info ** info_used) +int MPID_Win_get_info(MPIR_Win * win, MPID_Info ** info_used) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPID_WIN_GET_INFO); diff --git a/src/mpid/ch3/src/mpid_rma.c b/src/mpid/ch3/src/mpid_rma.c index e32c838..a79368c 100644 --- a/src/mpid/ch3/src/mpid_rma.c +++ b/src/mpid/ch3/src/mpid_rma.c @@ -40,7 +40,7 @@ cvars: static volatile int initRMAoptions = 1; -MPID_Win *MPIDI_RMA_Win_active_list_head = NULL, *MPIDI_RMA_Win_inactive_list_head = NULL; +MPIR_Win *MPIDI_RMA_Win_active_list_head = NULL, *MPIDI_RMA_Win_inactive_list_head = NULL; /* This variable keeps track of number of active RMA requests, i.e., total number of issued * but incomplete RMA operations. We use this variable to control the resources used up by @@ -51,7 +51,7 @@ int MPIDI_CH3I_RMA_Active_req_cnt = 0; int MPIDI_CH3I_RMA_Progress_hook_id = 0; static int win_init(MPI_Aint size, int disp_unit, int create_flavor, int model, MPID_Info * info, - MPIR_Comm * comm_ptr, MPID_Win ** win_ptr); + MPIR_Comm * comm_ptr, MPIR_Win ** win_ptr); #undef FUNCNAME @@ -59,7 +59,7 @@ static int win_init(MPI_Aint size, int disp_unit, int create_flavor, int model, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_Win_create(void *base, MPI_Aint size, int disp_unit, MPID_Info * info, - MPIR_Comm * comm_ptr, MPID_Win ** win_ptr) + MPIR_Comm * comm_ptr, MPIR_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; @@ -94,7 +94,7 @@ int MPID_Win_create(void *base, MPI_Aint size, int disp_unit, MPID_Info * info, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_Win_allocate(MPI_Aint size, int disp_unit, MPID_Info * info, - MPIR_Comm * comm_ptr, void *baseptr, MPID_Win ** win_ptr) + MPIR_Comm * comm_ptr, void *baseptr, MPIR_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPID_WIN_ALLOCATE); @@ -123,7 +123,7 @@ int MPID_Win_allocate(MPI_Aint size, int disp_unit, MPID_Info * info, #define FUNCNAME MPID_Win_create_dynamic #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Win_create_dynamic(MPID_Info * info, MPIR_Comm * comm_ptr, MPID_Win ** win_ptr) +int MPID_Win_create_dynamic(MPID_Info * info, MPIR_Comm * comm_ptr, MPIR_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; @@ -194,7 +194,7 @@ int MPID_Free_mem(void *ptr) #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_Win_allocate_shared(MPI_Aint size, int disp_unit, MPID_Info * info, MPIR_Comm * comm_ptr, - void *base_ptr, MPID_Win ** win_ptr) + void *base_ptr, MPIR_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; @@ -221,7 +221,7 @@ int MPID_Win_allocate_shared(MPI_Aint size, int disp_unit, MPID_Info * info, MPI #define FUNCNAME MPID_Win_shared_query #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Win_shared_query(MPID_Win * win, int rank, MPI_Aint * size, int *disp_unit, void *baseptr) +int MPID_Win_shared_query(MPIR_Win * win, int rank, MPI_Aint * size, int *disp_unit, void *baseptr) { int mpi_errno = MPI_SUCCESS; @@ -246,7 +246,7 @@ int MPID_Win_shared_query(MPID_Win * win, int rank, MPI_Aint * size, int *disp_u #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) static int win_init(MPI_Aint size, int disp_unit, int create_flavor, int model, MPID_Info * info, - MPIR_Comm * comm_ptr, MPID_Win ** win_ptr) + MPIR_Comm * comm_ptr, MPIR_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; int i; @@ -267,9 +267,9 @@ static int win_init(MPI_Aint size, int disp_unit, int create_flavor, int model, } MPID_THREAD_CS_EXIT(POBJ, MPIR_THREAD_GLOBAL_ALLFUNC_MUTEX); - *win_ptr = (MPID_Win *) MPIU_Handle_obj_alloc(&MPID_Win_mem); + *win_ptr = (MPIR_Win *) MPIU_Handle_obj_alloc(&MPIR_Win_mem); MPIR_ERR_CHKANDJUMP1(!(*win_ptr), mpi_errno, MPI_ERR_OTHER, "**nomem", - "**nomem %s", "MPID_Win_mem"); + "**nomem %s", "MPIR_Win_mem"); mpi_errno = MPIR_Comm_dup_impl(comm_ptr, &win_comm_ptr); if (mpi_errno) diff --git a/src/mpid/ch3/src/mpidi_rma.c b/src/mpid/ch3/src/mpidi_rma.c index 311493f..3682605 100644 --- a/src/mpid/ch3/src/mpidi_rma.c +++ b/src/mpid/ch3/src/mpidi_rma.c @@ -143,7 +143,7 @@ void MPIDI_RMA_finalize(void) #define FUNCNAME MPID_Win_free #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Win_free(MPID_Win ** win_ptr) +int MPID_Win_free(MPIR_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; int in_use; @@ -226,7 +226,7 @@ int MPID_Win_free(MPID_Win ** win_ptr) MPIU_Object_release_ref(*win_ptr, &in_use); /* MPI windows don't have reference count semantics, so this should always be true */ MPIU_Assert(!in_use); - MPIU_Handle_obj_free(&MPID_Win_mem, *win_ptr); + MPIU_Handle_obj_free(&MPIR_Win_mem, *win_ptr); fn_exit: MPIDI_RMA_FUNC_EXIT(MPID_STATE_MPID_WIN_FREE); diff --git a/src/mpid/pamid/include/mpidi_datatypes.h b/src/mpid/pamid/include/mpidi_datatypes.h index 601bdf2..941ad71 100644 --- a/src/mpid/pamid/include/mpidi_datatypes.h +++ b/src/mpid/pamid/include/mpidi_datatypes.h @@ -381,8 +381,8 @@ typedef struct /** \brief Forward declaration of the MPIR_Comm structure */ struct MPIR_Comm; -/** \brief Forward declaration of the MPID_Win structure */ -struct MPID_Win; +/** \brief Forward declaration of the MPIR_Win structure */ +struct MPIR_Win; /** \brief Forward declaration of the MPIR_Group structure */ struct MPIR_Group; @@ -445,7 +445,7 @@ typedef struct workQ_t { typedef struct MPIDI_Win_info { void * base_addr; /**< Node's exposure window base address */ - struct MPID_Win * win; + struct MPIR_Win * win; uint32_t disp_unit; /**< Node's exposure window displacement units */ pami_memregion_t memregion; /**< Memory region descriptor for each node */ uint32_t memregion_used; @@ -477,7 +477,7 @@ typedef struct MPIDI_Win_shm_t } MPIDI_Win_shm_t; /** - * \brief Structure of PAMI extensions to MPID_Win structure + * \brief Structure of PAMI extensions to MPIR_Win structure */ struct MPIDI_Win { diff --git a/src/mpid/pamid/include/mpidi_hooks.h b/src/mpid/pamid/include/mpidi_hooks.h index 56b81c0..1e8985c 100644 --- a/src/mpid/pamid/include/mpidi_hooks.h +++ b/src/mpid/pamid/include/mpidi_hooks.h @@ -56,7 +56,7 @@ typedef size_t intptr_t; /** \brief This defines the portion of MPIR_Comm that is specific to the Device */ #define MPID_DEV_COMM_DECL struct MPIDI_Comm mpid; -/** \brief This defines the portion of MPID_Win that is specific to the Device */ +/** \brief This defines the portion of MPIR_Win that is specific to the Device */ #define MPID_DEV_WIN_DECL struct MPIDI_Win mpid; #define HAVE_DEV_COMM_HOOK diff --git a/src/mpid/pamid/include/mpidimpl.h b/src/mpid/pamid/include/mpidimpl.h index 52623ff..13f804d 100644 --- a/src/mpid/pamid/include/mpidimpl.h +++ b/src/mpid/pamid/include/mpidimpl.h @@ -179,7 +179,7 @@ static inline pami_endpoint_t MPIDI_Task_to_endpoint(pami_task_t task, size_t of } int -MPIDI_Win_set_info(MPID_Win *win, +MPIDI_Win_set_info(MPIR_Win *win, MPID_Info *info); MPI_Aint MPID_Aint_add(MPI_Aint base, MPI_Aint disp); diff --git a/src/mpid/pamid/src/onesided/mpid_win_accumulate.c b/src/mpid/pamid/src/onesided/mpid_win_accumulate.c index 30170ca..c833e60 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_accumulate.c +++ b/src/mpid/pamid/src/onesided/mpid_win_accumulate.c @@ -158,7 +158,7 @@ MPID_Accumulate(const void *origin_addr, int target_count, MPI_Datatype target_datatype, MPI_Op op, - MPID_Win *win) + MPIR_Win *win) { int mpi_errno = MPI_SUCCESS; int shm_locked = 0; diff --git a/src/mpid/pamid/src/onesided/mpid_win_allocate.c b/src/mpid/pamid/src/onesided/mpid_win_allocate.c index d3e584b..ac0a708 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_allocate.c +++ b/src/mpid/pamid/src/onesided/mpid_win_allocate.c @@ -24,7 +24,7 @@ /** * \brief MPI-PAMI glue for MPI_Win_allocate function * - * Create a window object. Allocates a MPID_Win object and initializes it, + * Create a window object. Allocates a MPIR_Win object and initializes it, * then allocates the collective info array, initalizes our entry, and * performs an Allgather to distribute/collect the rest of the array entries. * On each process, it allocates memory of at least size bytes, returns a @@ -51,7 +51,7 @@ MPID_Win_allocate(MPI_Aint size, MPID_Info * info, MPIR_Comm * comm_ptr, void *base_ptr, - MPID_Win ** win_ptr) + MPIR_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; int rc = MPI_SUCCESS; @@ -59,7 +59,7 @@ MPID_Win_allocate(MPI_Aint size, void *baseP; static char FCNAME[] = "MPID_Win_allocate"; MPIDI_Win_info *winfo; - MPID_Win *win; + MPIR_Win *win; int rank; rc=MPIDI_Win_init(size,disp_unit,win_ptr, info, comm_ptr, MPI_WIN_FLAVOR_ALLOCATE, MPI_WIN_UNIFIED); diff --git a/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c b/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c index 6d007bf..d59af5f 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c +++ b/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c @@ -63,7 +63,7 @@ int CheckRankOnNode(MPIR_Comm * comm_ptr,int *onNode ) { return mpi_errno; } -int CheckSpaceType(MPID_Win **win_ptr, MPID_Info *info,int *noncontig) { +int CheckSpaceType(MPIR_Win **win_ptr, MPID_Info *info,int *noncontig) { int mpi_errno=MPI_SUCCESS; /* Check if we are allowed to allocate space non-contiguously */ if (info != NULL) { @@ -155,7 +155,7 @@ int GetPageSize(void *addr, ulong *pageSize) } int -MPID_getSharedSegment_mmap(MPID_Win * win) +MPID_getSharedSegment_mmap(MPIR_Win * win) { int rank, rc, fd; int mpi_errno = MPI_SUCCESS; @@ -202,7 +202,7 @@ fn_fail: } int -MPID_getSharedSegment_sysv(MPID_Win * win) +MPID_getSharedSegment_sysv(MPIR_Win * win) { int mpi_errno = MPI_SUCCESS; MPIR_Errflag_t errflag = MPIR_ERR_NONE; @@ -302,7 +302,7 @@ int MPID_getSharedSegment(MPI_Aint size, int disp_unit, MPIR_Comm * comm_ptr, - MPID_Win **win_ptr, + MPIR_Win **win_ptr, MPI_Aint * pSize, int * noncontig) { @@ -310,7 +310,7 @@ MPID_getSharedSegment(MPI_Aint size, int i, comm_size, rank; MPIR_Errflag_t errflag = MPIR_ERR_NONE; MPI_Aint pageSize,pageSize2, len,new_size; - MPID_Win *win; + MPIR_Win *win; int padSize; void *base_pp; @@ -439,7 +439,7 @@ fn_fail: /** * \brief MPI-PAMI glue for MPI_Win_allocate_shared function * - * Create a window object. Allocates a MPID_Win object and initializes it, + * Create a window object. Allocates a MPIR_Win object and initializes it, * then allocates the collective info array, initalizes our entry, and * performs an Allgather to distribute/collect the rest of the array entries. * On each process, it allocates memory of at least size bytes that is shared @@ -481,12 +481,12 @@ MPID_Win_allocate_shared(MPI_Aint size, MPID_Info * info, MPIR_Comm * comm_ptr, void *base_ptr, - MPID_Win ** win_ptr) + MPIR_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; MPIR_Errflag_t errflag = MPIR_ERR_NONE; int onNode = 0; - MPID_Win *win = NULL; + MPIR_Win *win = NULL; int rank, prev_size; MPIDI_Win_info *winfo; diff --git a/src/mpid/pamid/src/onesided/mpid_win_attach.c b/src/mpid/pamid/src/onesided/mpid_win_attach.c index 233c12b..aae21a4 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_attach.c +++ b/src/mpid/pamid/src/onesided/mpid_win_attach.c @@ -36,7 +36,7 @@ */ int -MPID_Win_attach(MPID_Win *win, void *base, MPI_Aint size) +MPID_Win_attach(MPIR_Win *win, void *base, MPI_Aint size) { int mpi_errno = MPI_SUCCESS; static char FCNAME[] = "MPID_Win_attach"; diff --git a/src/mpid/pamid/src/onesided/mpid_win_compare_and_swap.c b/src/mpid/pamid/src/onesided/mpid_win_compare_and_swap.c index 3e06145..bfb48a0 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_compare_and_swap.c +++ b/src/mpid/pamid/src/onesided/mpid_win_compare_and_swap.c @@ -61,7 +61,7 @@ MPIDI_Compare_and_swap_using_pami_rmw(pami_context_t context, #define FCNAME MPIU_QUOTE(FUNCNAME) int MPID_Compare_and_swap(const void *origin_addr, const void *compare_addr, void *result_addr, MPI_Datatype datatype, int target_rank, - MPI_Aint target_disp, MPID_Win *win) + MPI_Aint target_disp, MPIR_Win *win) { int mpi_errno = MPI_SUCCESS; MPIDI_Win_request *req; diff --git a/src/mpid/pamid/src/onesided/mpid_win_create.c b/src/mpid/pamid/src/onesided/mpid_win_create.c index 99f8a3c..b60ad4b 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_create.c +++ b/src/mpid/pamid/src/onesided/mpid_win_create.c @@ -31,7 +31,7 @@ int MPIDI_Win_init( MPI_Aint length, int disp_unit, - MPID_Win **win_ptr, + MPIR_Win **win_ptr, MPID_Info *info, MPIR_Comm *comm_ptr, int create_flavor, @@ -45,7 +45,7 @@ MPIDI_Win_init( MPI_Aint length, /* ----------------------------------------- */ /* Setup the common sections of the window */ /* ----------------------------------------- */ - MPID_Win *win = (MPID_Win*)MPIU_Handle_obj_alloc(&MPID_Win_mem); + MPIR_Win *win = (MPIR_Win*)MPIU_Handle_obj_alloc(&MPIR_Win_mem); MPIU_ERR_CHKANDSTMT(win == NULL, mpi_errno, MPI_ERR_NO_MEM, return mpi_errno, "**nomem"); @@ -102,11 +102,11 @@ MPIDI_Win_init( MPI_Aint length, /* */ /***************************************************************************/ int -MPIDI_Win_allgather( MPI_Aint size, MPID_Win **win_ptr ) +MPIDI_Win_allgather( MPI_Aint size, MPIR_Win **win_ptr ) { int mpi_errno = MPI_SUCCESS; MPIR_Errflag_t errflag=MPIR_ERR_NONE; - MPID_Win *win; + MPIR_Win *win; int rank; MPIR_Comm *comm_ptr; size_t length_out = 0; @@ -160,7 +160,7 @@ fn_fail: /** * \brief MPI-PAMI glue for MPI_Win_create function * - * Create a window object. Allocates a MPID_Win object and initializes it, + * Create a window object. Allocates a MPIR_Win object and initializes it, * then allocates the collective info array, initalizes our entry, and * performs an Allgather to distribute/collect the rest of the array entries. * @@ -184,12 +184,12 @@ MPID_Win_create(void * base, int disp_unit, MPID_Info * info, MPIR_Comm * comm_ptr, - MPID_Win ** win_ptr) + MPIR_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; MPIR_Errflag_t errflag = MPIR_ERR_NONE; int rc = MPI_SUCCESS; - MPID_Win *win; + MPIR_Win *win; size_t rank; MPIDI_Win_info *winfo; diff --git a/src/mpid/pamid/src/onesided/mpid_win_create_dynamic.c b/src/mpid/pamid/src/onesided/mpid_win_create_dynamic.c index c7293d4..6ca66ed 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_create_dynamic.c +++ b/src/mpid/pamid/src/onesided/mpid_win_create_dynamic.c @@ -24,7 +24,7 @@ /** * \brief MPI-PAMI glue for MPI_Win_create_dynamic function * - * Create a window object. Allocates a MPID_Win object and initializes it, + * Create a window object. Allocates a MPIR_Win object and initializes it, * then allocates the collective info array, initalizes our entry, and * performs an Allgather to distribute/collect the rest of the array entries. * The function returns a window win without memory attached. @@ -40,13 +40,13 @@ int MPID_Win_create_dynamic( MPID_Info * info, MPIR_Comm * comm_ptr, - MPID_Win ** win_ptr) + MPIR_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; MPIR_Errflag_t errflag = MPIR_ERR_NONE; int rc = MPI_SUCCESS; MPIDI_Win_info *winfo; - MPID_Win *win; + MPIR_Win *win; int rank; rc=MPIDI_Win_init(0,1,win_ptr, info, comm_ptr, MPI_WIN_FLAVOR_DYNAMIC, MPI_WIN_UNIFIED); diff --git a/src/mpid/pamid/src/onesided/mpid_win_detach.c b/src/mpid/pamid/src/onesided/mpid_win_detach.c index c4fc618..4a84052 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_detach.c +++ b/src/mpid/pamid/src/onesided/mpid_win_detach.c @@ -35,7 +35,7 @@ */ int -MPID_Win_detach(MPID_Win *win, const void *base) +MPID_Win_detach(MPIR_Win *win, const void *base) { int mpi_errno = MPI_SUCCESS; static char FCNAME[] = "MPID_Win_detach"; diff --git a/src/mpid/pamid/src/onesided/mpid_win_fence.c b/src/mpid/pamid/src/onesided/mpid_win_fence.c index dcb1139..8ca4732 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_fence.c +++ b/src/mpid/pamid/src/onesided/mpid_win_fence.c @@ -24,7 +24,7 @@ int MPID_Win_fence(int assert, - MPID_Win *win) + MPIR_Win *win) { int mpi_errno = MPI_SUCCESS; MPIR_Errflag_t errflag = MPIR_ERR_NONE; diff --git a/src/mpid/pamid/src/onesided/mpid_win_fetch_and_op.c b/src/mpid/pamid/src/onesided/mpid_win_fetch_and_op.c index 07a5dfb..816e2fb 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_fetch_and_op.c +++ b/src/mpid/pamid/src/onesided/mpid_win_fetch_and_op.c @@ -185,7 +185,7 @@ MPIDI_Atomic (pami_context_t context, #define FCNAME MPIU_QUOTE(FUNCNAME) int MPID_Fetch_and_op(const void *origin_addr, void *result_addr, MPI_Datatype datatype, int target_rank, - MPI_Aint target_disp, MPI_Op op, MPID_Win *win) + MPI_Aint target_disp, MPI_Op op, MPIR_Win *win) { int mpi_errno = MPI_SUCCESS; MPIDI_Win_request *req; diff --git a/src/mpid/pamid/src/onesided/mpid_win_flush.c b/src/mpid/pamid/src/onesided/mpid_win_flush.c index 310d059..370bbd5 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_flush.c +++ b/src/mpid/pamid/src/onesided/mpid_win_flush.c @@ -40,7 +40,7 @@ int MPID_Win_flush(int rank, - MPID_Win *win) + MPIR_Win *win) { int mpi_errno = MPI_SUCCESS; struct MPIDI_Win_sync* sync; @@ -76,7 +76,7 @@ MPID_Win_flush(int rank, int -MPID_Win_flush_all(MPID_Win *win) +MPID_Win_flush_all(MPIR_Win *win) { int mpi_errno = MPI_SUCCESS; struct MPIDI_Win_sync* sync; @@ -118,7 +118,7 @@ MPID_Win_flush_all(MPID_Win *win) */ int -MPID_Win_flush_local(int rank, MPID_Win *win) +MPID_Win_flush_local(int rank, MPIR_Win *win) { int mpi_errno = MPI_SUCCESS; struct MPIDI_Win_sync* sync; @@ -153,7 +153,7 @@ MPID_Win_flush_local(int rank, MPID_Win *win) */ int -MPID_Win_flush_local_all(MPID_Win *win) +MPID_Win_flush_local_all(MPIR_Win *win) { int mpi_errno = MPI_SUCCESS; struct MPIDI_Win_sync* sync; diff --git a/src/mpid/pamid/src/onesided/mpid_win_free.c b/src/mpid/pamid/src/onesided/mpid_win_free.c index a4ec6d5..740834f 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_free.c +++ b/src/mpid/pamid/src/onesided/mpid_win_free.c @@ -28,7 +28,7 @@ #endif -int MPIDI_SHM_Win_free(MPID_Win **win_ptr) +int MPIDI_SHM_Win_free(MPIR_Win **win_ptr) { static char FCNAME[] = "MPID_SHM_Win_free"; int rc; @@ -77,11 +77,11 @@ int MPIDI_SHM_Win_free(MPID_Win **win_ptr) #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) int -MPID_Win_free(MPID_Win **win_ptr) +MPID_Win_free(MPIR_Win **win_ptr) { int mpi_errno = MPI_SUCCESS; - MPID_Win *win = *win_ptr; + MPIR_Win *win = *win_ptr; size_t rank = win->comm_ptr->rank; MPIR_Errflag_t errflag = MPIR_ERR_NONE; @@ -125,7 +125,7 @@ MPID_Win_free(MPID_Win **win_ptr) MPIR_Comm_release(win->comm_ptr, 0); - MPIU_Handle_obj_free(&MPID_Win_mem, win); + MPIU_Handle_obj_free(&MPIR_Win_mem, win); fn_fail: return mpi_errno; diff --git a/src/mpid/pamid/src/onesided/mpid_win_get.c b/src/mpid/pamid/src/onesided/mpid_win_get.c index 04ffbd3..0845b36 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_get.c +++ b/src/mpid/pamid/src/onesided/mpid_win_get.c @@ -234,7 +234,7 @@ MPID_Get(void *origin_addr, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, - MPID_Win *win) + MPIR_Win *win) { int mpi_errno = MPI_SUCCESS; diff --git a/src/mpid/pamid/src/onesided/mpid_win_get_accumulate.c b/src/mpid/pamid/src/onesided/mpid_win_get_accumulate.c index 415567a..6e14005 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_get_accumulate.c +++ b/src/mpid/pamid/src/onesided/mpid_win_get_accumulate.c @@ -31,7 +31,7 @@ MPIDI_Fetch_data_op(const void * origin_addr, int target_count, MPI_Datatype target_datatype, MPI_Op op, - MPID_Win *win) + MPIR_Win *win) { static char FCNAME[] = "MPIDI_Fetch_data_op"; int shm_locked=0; @@ -351,7 +351,7 @@ MPID_Get_accumulate(const void * origin_addr, int target_count, MPI_Datatype target_datatype, MPI_Op op, - MPID_Win *win) + MPIR_Win *win) { int mpi_errno = MPI_SUCCESS; diff --git a/src/mpid/pamid/src/onesided/mpid_win_get_info.c b/src/mpid/pamid/src/onesided/mpid_win_get_info.c index 08c4d03..259d1cd 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_get_info.c +++ b/src/mpid/pamid/src/onesided/mpid_win_get_info.c @@ -30,7 +30,7 @@ * \param[in] info_p_p Info hint * \return MPI_SUCCESS */ -int MPIDI_Win_get_info(MPID_Win *win, MPID_Info **info_used) +int MPIDI_Win_get_info(MPIR_Win *win, MPID_Info **info_used) { int mpi_errno = MPI_SUCCESS; @@ -90,7 +90,7 @@ int MPIDI_Win_get_info(MPID_Win *win, MPID_Info **info_used) int -MPID_Win_get_info(MPID_Win *win, +MPID_Win_get_info(MPIR_Win *win, MPID_Info **info_p) { int mpi_errno = MPI_SUCCESS; diff --git a/src/mpid/pamid/src/onesided/mpid_win_lock.c b/src/mpid/pamid/src/onesided/mpid_win_lock.c index 4066db5..6d7897c 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_lock.c +++ b/src/mpid/pamid/src/onesided/mpid_win_lock.c @@ -24,12 +24,12 @@ void MPIDI_WinLockAck_post(pami_context_t context, unsigned peer, - MPID_Win * win); + MPIR_Win * win); void MPIDI_WinLockAdvance(pami_context_t context, - MPID_Win * win) + MPIR_Win * win) { struct MPIDI_Win_sync_lock* slock = &win->mpid.sync.lock; struct MPIDI_Win_queue* q = &slock->local.requested; @@ -87,7 +87,7 @@ MPIDI_WinLockReq_proc(pami_context_t context, const MPIDI_Win_control_t * info, unsigned peer) { - MPID_Win * win = info->win; + MPIR_Win * win = info->win; struct MPIDI_Win_lock* lock = MPL_calloc0(1, struct MPIDI_Win_lock); if (info->type == MPIDI_WIN_MSGTYPE_LOCKREQ) lock->mtype = MPIDI_REQUEST_LOCK; @@ -113,7 +113,7 @@ MPIDI_WinLockReq_proc(pami_context_t context, void MPIDI_WinLockAck_post(pami_context_t context, unsigned peer, - MPID_Win * win) + MPIR_Win * win) { MPIDI_Win_control_t info = { .type = MPIDI_WIN_MSGTYPE_LOCKACK, @@ -154,7 +154,7 @@ MPIDI_WinUnlock_proc(pami_context_t context, const MPIDI_Win_control_t * info, unsigned peer) { - MPID_Win *win = info->win; + MPIR_Win *win = info->win; --win->mpid.sync.lock.local.count; MPID_assert((int)win->mpid.sync.lock.local.count >= 0); MPIDI_WinLockAdvance(context, win); @@ -165,7 +165,7 @@ int MPID_Win_lock(int lock_type, int rank, int assert, - MPID_Win *win) + MPIR_Win *win) { int mpi_errno = MPI_SUCCESS; struct MPIDI_Win_sync_lock* slock = &win->mpid.sync.lock; @@ -196,7 +196,7 @@ fn_exit: int MPID_Win_unlock(int rank, - MPID_Win *win) + MPIR_Win *win) { int mpi_errno = MPI_SUCCESS; static char FCNAME[] = "MPID_Win_unlock"; diff --git a/src/mpid/pamid/src/onesided/mpid_win_lock_all.c b/src/mpid/pamid/src/onesided/mpid_win_lock_all.c index 1a888fa..5dfcd98 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_lock_all.c +++ b/src/mpid/pamid/src/onesided/mpid_win_lock_all.c @@ -60,7 +60,7 @@ MPIDI_WinUnlockAll_proc(pami_context_t context, const MPIDI_Win_control_t * info, unsigned peer) { - MPID_Win *win = info->win; + MPIR_Win *win = info->win; --win->mpid.sync.lock.local.count; MPID_assert((int)win->mpid.sync.lock.local.count >= 0); MPIDI_WinLockAdvance(context, win); @@ -69,7 +69,7 @@ MPIDI_WinUnlockAll_proc(pami_context_t context, void MPIDI_WinLockAllAck_post(pami_context_t context, unsigned peer, - MPID_Win * win) + MPIR_Win * win) { MPIDI_Win_control_t info = { .type = MPIDI_WIN_MSGTYPE_LOCKALLACK, @@ -80,7 +80,7 @@ MPIDI_WinLockAllAck_post(pami_context_t context, int MPID_Win_lock_all(int assert, - MPID_Win *win) + MPIR_Win *win) { int mpi_errno = MPI_SUCCESS; int i,size; @@ -147,7 +147,7 @@ MPID_Win_lock_all(int assert, int -MPID_Win_unlock_all(MPID_Win *win) +MPID_Win_unlock_all(MPIR_Win *win) { int mpi_errno = MPI_SUCCESS; int i,size; diff --git a/src/mpid/pamid/src/onesided/mpid_win_pscw.c b/src/mpid/pamid/src/onesided/mpid_win_pscw.c index 4601895..98d20d5 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_pscw.c +++ b/src/mpid/pamid/src/onesided/mpid_win_pscw.c @@ -24,7 +24,7 @@ typedef struct { - MPID_Win * win; + MPIR_Win * win; volatile unsigned done; pami_work_t work; @@ -108,7 +108,7 @@ MPIDI_WinComplete_proc(pami_context_t context, int MPID_Win_start(MPIR_Group *group, int assert, - MPID_Win *win) + MPIR_Win *win) { int mpi_errno = MPI_SUCCESS; static char FCNAME[] = "MPID_Win_start"; @@ -138,7 +138,7 @@ fn_fail: int -MPID_Win_complete(MPID_Win *win) +MPID_Win_complete(MPIR_Win *win) { int mpi_errno = MPI_SUCCESS; static char FCNAME[] = "MPID_Win_complete"; @@ -176,7 +176,7 @@ MPID_Win_complete(MPID_Win *win) int MPID_Win_post(MPIR_Group *group, int assert, - MPID_Win *win) + MPIR_Win *win) { int mpi_errno = MPI_SUCCESS; static char FCNAME[] = "MPID_Win_post"; @@ -207,7 +207,7 @@ fn_fail: int -MPID_Win_wait(MPID_Win *win) +MPID_Win_wait(MPIR_Win *win) { int mpi_errno = MPI_SUCCESS; static char FCNAME[] = "MPID_Win_wait"; @@ -235,7 +235,7 @@ MPID_Win_wait(MPID_Win *win) int -MPID_Win_test(MPID_Win *win, +MPID_Win_test(MPIR_Win *win, int *flag) { int mpi_errno = MPI_SUCCESS; diff --git a/src/mpid/pamid/src/onesided/mpid_win_put.c b/src/mpid/pamid/src/onesided/mpid_win_put.c index c049b28..1964fd9 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_put.c +++ b/src/mpid/pamid/src/onesided/mpid_win_put.c @@ -237,7 +237,7 @@ MPID_Put(const void *origin_addr, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, - MPID_Win *win) + MPIR_Win *win) { int mpi_errno = MPI_SUCCESS; int shm_locked=0; diff --git a/src/mpid/pamid/src/onesided/mpid_win_reqops.c b/src/mpid/pamid/src/onesided/mpid_win_reqops.c index 6e597c5..859c1a6 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_reqops.c +++ b/src/mpid/pamid/src/onesided/mpid_win_reqops.c @@ -47,7 +47,7 @@ MPID_Rput(const void *origin_addr, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, - MPID_Win *win, + MPIR_Win *win, MPID_Request **request) { int mpi_errno = MPI_SUCCESS; @@ -99,7 +99,7 @@ MPID_Rget(void *origin_addr, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, - MPID_Win *win, + MPIR_Win *win, MPID_Request **request) { int mpi_errno = MPI_SUCCESS; @@ -158,7 +158,7 @@ MPID_Raccumulate(const void *origin_addr, int target_count, MPI_Datatype target_datatype, MPI_Op op, - MPID_Win *win, + MPIR_Win *win, MPID_Request **request) { int mpi_errno = MPI_SUCCESS; @@ -222,7 +222,7 @@ MPID_Rget_accumulate(const void *origin_addr, int target_count, MPI_Datatype target_datatype, MPI_Op op, - MPID_Win *win, + MPIR_Win *win, MPID_Request **request) { diff --git a/src/mpid/pamid/src/onesided/mpid_win_set_info.c b/src/mpid/pamid/src/onesided/mpid_win_set_info.c index 6857668..6d6f09f 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_set_info.c +++ b/src/mpid/pamid/src/onesided/mpid_win_set_info.c @@ -30,7 +30,7 @@ * \return MPI_SUCCESS */ -int MPIDI_Win_set_info(MPID_Win *win, MPID_Info *info) +int MPIDI_Win_set_info(MPIR_Win *win, MPID_Info *info) { int mpi_errno = MPI_SUCCESS; @@ -90,7 +90,7 @@ int MPIDI_Win_set_info(MPID_Win *win, MPID_Info *info) } int -MPID_Win_set_info(MPID_Win *win, MPID_Info *info) +MPID_Win_set_info(MPIR_Win *win, MPID_Info *info) { int mpi_errno = MPI_SUCCESS; MPIR_Errflag_t errflag = MPIR_ERR_NONE; diff --git a/src/mpid/pamid/src/onesided/mpid_win_shared_query.c b/src/mpid/pamid/src/onesided/mpid_win_shared_query.c index bfcea9f..30c5cd9 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_shared_query.c +++ b/src/mpid/pamid/src/onesided/mpid_win_shared_query.c @@ -36,7 +36,7 @@ */ int -MPID_Win_shared_query(MPID_Win *win, int rank, MPI_Aint *size, +MPID_Win_shared_query(MPIR_Win *win, int rank, MPI_Aint *size, int *disp_unit, void *base_ptr) { int i, mpi_errno = MPI_SUCCESS; diff --git a/src/mpid/pamid/src/onesided/mpid_win_sync.c b/src/mpid/pamid/src/onesided/mpid_win_sync.c index 9c1b877..d014602 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_sync.c +++ b/src/mpid/pamid/src/onesided/mpid_win_sync.c @@ -37,7 +37,7 @@ int -MPID_Win_sync(MPID_Win *win) +MPID_Win_sync(MPIR_Win *win) { int mpi_errno = MPI_SUCCESS; static char FCNAME[] = "MPID_Win_flush"; diff --git a/src/mpid/pamid/src/onesided/mpidi_onesided.h b/src/mpid/pamid/src/onesided/mpidi_onesided.h index a8810bc..bd93d24 100644 --- a/src/mpid/pamid/src/onesided/mpidi_onesided.h +++ b/src/mpid/pamid/src/onesided/mpidi_onesided.h @@ -142,7 +142,7 @@ typedef enum typedef struct { MPIDI_Win_msgtype_t type; - MPID_Win *win; + MPIR_Win *win; int rank; /* MPI rank */ void *flagAddr; union @@ -173,7 +173,7 @@ typedef struct MPIDI_WinLock_info { unsigned peer; int lock_type; - struct MPID_Win * win; + struct MPIR_Win * win; void *flagAddr; volatile unsigned done; pami_work_t work; @@ -201,7 +201,7 @@ typedef struct void * addr; void * result_addr; /* anchor the result buffer address*/ void * req; - MPID_Win * win; + MPIR_Win * win; MPI_Datatype type; MPI_Op op; pami_endpoint_t origin_endpoint; /* needed for returning the result */ @@ -213,7 +213,7 @@ typedef struct { void * addr; void * req; - MPID_Win * win; + MPIR_Win * win; MPI_Datatype type; MPI_Op op; int count; @@ -229,7 +229,7 @@ typedef struct /** \todo make sure that the extra fields are removed */ typedef struct MPIDI_Win_request { - MPID_Win *win; + MPIR_Win *win; MPIDI_Win_requesttype_t type; pami_endpoint_t dest; size_t offset; @@ -304,7 +304,7 @@ void MPIDI_WinCtrlSend(pami_context_t context, MPIDI_Win_control_t *control, int rank, - MPID_Win *win); + MPIR_Win *win); void MPIDI_WinLockReq_proc(pami_context_t context, @@ -349,22 +349,22 @@ MPIDI_WinAccumCB(pami_context_t context, int MPIDI_Win_init( MPI_Aint length, int disp_unit, - MPID_Win **win_ptr, + MPIR_Win **win_ptr, MPID_Info *info, MPIR_Comm *comm_ptr, int create_flavor, int model); int MPIDI_Win_allgather(MPI_Aint size, - MPID_Win **win_ptr); + MPIR_Win **win_ptr); void MPIDI_WinLockAdvance(pami_context_t context, - MPID_Win * win); + MPIR_Win * win); void MPIDI_WinLockAck_post(pami_context_t context, unsigned peer, - MPID_Win *win); + MPIR_Win *win); void MPIDI_WinLockReq_proc(pami_context_t context, @@ -383,7 +383,7 @@ MPIDI_valid_group_rank(int lpid, void MPIDI_WinLockAllAck_post(pami_context_t context, unsigned peer, - MPID_Win * win); + MPIR_Win * win); #endif diff --git a/src/mpid/pamid/src/onesided/mpidi_win_control.c b/src/mpid/pamid/src/onesided/mpidi_win_control.c index 56016be..f10d45d 100644 --- a/src/mpid/pamid/src/onesided/mpidi_win_control.c +++ b/src/mpid/pamid/src/onesided/mpidi_win_control.c @@ -26,7 +26,7 @@ void MPIDI_WinCtrlSend(pami_context_t context, MPIDI_Win_control_t *control, int rank, - MPID_Win *win) + MPIR_Win *win) { pami_task_t taskid; MPIDI_WinLock_info *winLock; @@ -86,7 +86,7 @@ MPIDI_WinUnlockDoneCB(pami_context_t context, void * cookie, pami_result_t result) { - MPID_Win *win = (MPID_Win *)cookie; + MPIR_Win *win = (MPIR_Win *)cookie; if (win->mpid.sync.origin_epoch_type == MPID_EPOTYPE_LOCK) { win->mpid.sync.lock.remote.locked = 0; } http://git.mpich.org/mpich.git/commitdiff/fb7b7c65bc70561de65883911e9ed1366… commit fb7b7c65bc70561de65883911e9ed1366507aa2d Author: Wesley Bland <wesley.bland(a)intel.com> Date: Mon Apr 18 17:13:09 2016 -0500 Rename MPID_Collops to MPIR_Collops Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index c01ed4f..d5cad8c 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -1178,7 +1178,7 @@ int MPIR_Comm_map_free(struct MPIR_Comm *comm); corresponding to the 'local_group' (we may want this anyway to simplify the implementation of the intercommunicator collective routines). - The pointer to the structure 'MPID_Collops' containing pointers to the + The pointer to the structure 'MPIR_Collops' containing pointers to the collective routines allows an implementation to replace each routine on a routine-by-routine basis. By default, this pointer is null, as are the @@ -1247,8 +1247,8 @@ typedef struct MPIR_Comm { to implement a full-duplex operation */ struct MPIR_Comm *comm_next;/* Provides a chain through all active communicators */ - struct MPID_Collops *coll_fns; /* Pointer to a table of functions - implementing the collective + struct MPIR_Collops *coll_fns; /* Pointer to a table of functions + implementing the collective routines */ struct MPID_TopoOps *topo_fns; /* Pointer to a table of functions implementting the topology routines */ @@ -1910,7 +1910,7 @@ extern MPIU_Object_alloc_t MPID_Op_mem; /* ------------------------------------------------------------------------- */ /* Collective operations */ -typedef struct MPID_Collops { +typedef struct MPIR_Collops { int ref_count; /* Supports lazy copies */ /* Contains pointers to the functions for the MPI collectives */ int (*Barrier) (MPIR_Comm *, MPIR_Errflag_t *); @@ -1992,7 +1992,7 @@ typedef struct MPID_Collops { int (*Iexscan_sched)(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Sched_t s); - struct MPID_Collops *prev_coll_fns; /* when overriding this table, set this to point to the old table */ + struct MPIR_Collops *prev_coll_fns; /* when overriding this table, set this to point to the old table */ /* MPI-3 neighborhood collectives (blocking & nonblocking) */ int (*Neighbor_allgather)(const void *sendbuf, int sendcount, MPI_Datatype sendtype, @@ -2028,7 +2028,7 @@ typedef struct MPID_Collops { const MPI_Datatype sendtypes[], void *recvbuf, const int recvcounts[], const MPI_Aint rdispls[], const MPI_Datatype recvtypes[], MPIR_Comm *comm_ptr, MPID_Sched_t s); -} MPID_Collops; +} MPIR_Collops; #define MPIR_BARRIER_TAG 1 /* ------------------------------------------------------------------------- */ @@ -2042,7 +2042,7 @@ typedef struct MPID_Collops { * functions that are used to implement the topology routines. If either * the pointer to this structure is null or any individual entry is null, * the default function is used (this follows exactly the same rules as the - * collective operations, provided in the MPID_Collops structure). + * collective operations, provided in the MPIR_Collops structure). */ /* ------------------------------------------------------------------------- */ diff --git a/src/mpi/comm/commutil.c b/src/mpi/comm/commutil.c index d6a9510..20b55a0 100644 --- a/src/mpi/comm/commutil.c +++ b/src/mpi/comm/commutil.c @@ -213,10 +213,10 @@ int MPIR_Setup_intercomm_localcomm(MPIR_Comm * intercomm_ptr) /* holds default collop "vtables" for _intracomms_, where * default[hierarchy_kind] is the pointer to the collop struct for that * hierarchy kind */ -static struct MPID_Collops *default_collops[MPID_HIERARCHY_SIZE] = { NULL }; +static struct MPIR_Collops *default_collops[MPID_HIERARCHY_SIZE] = { NULL }; /* default for intercomms */ -static struct MPID_Collops *ic_default_collops = NULL; +static struct MPIR_Collops *ic_default_collops = NULL; #undef FUNCNAME #define FUNCNAME cleanup_default_collops @@ -249,12 +249,12 @@ static int init_default_collops(void) { int mpi_errno = MPI_SUCCESS; int i; - struct MPID_Collops *ops = NULL; + struct MPIR_Collops *ops = NULL; MPIU_CHKPMEM_DECL(MPID_HIERARCHY_SIZE + 1); /* first initialize the intracomms */ for (i = 0; i < MPID_HIERARCHY_SIZE; ++i) { - MPIU_CHKPMEM_CALLOC(ops, struct MPID_Collops *, sizeof(struct MPID_Collops), mpi_errno, + MPIU_CHKPMEM_CALLOC(ops, struct MPIR_Collops *, sizeof(struct MPIR_Collops), mpi_errno, "default intracomm collops"); ops->ref_count = 1; /* force existence until finalize time */ @@ -317,7 +317,7 @@ static int init_default_collops(void) /* now the intercomm table */ { - MPIU_CHKPMEM_CALLOC(ops, struct MPID_Collops *, sizeof(struct MPID_Collops), mpi_errno, + MPIU_CHKPMEM_CALLOC(ops, struct MPIR_Collops *, sizeof(struct MPIR_Collops), mpi_errno, "default intercomm collops"); ops->ref_count = 1; /* force existence until finalize time */ diff --git a/src/mpid/ch3/channels/nemesis/src/ch3i_comm.c b/src/mpid/ch3/channels/nemesis/src/ch3i_comm.c index 620e8c6..d340adc 100644 --- a/src/mpid/ch3/channels/nemesis/src/ch3i_comm.c +++ b/src/mpid/ch3/channels/nemesis/src/ch3i_comm.c @@ -34,7 +34,7 @@ int MPIDI_CH3I_comm_create(MPIR_Comm *comm, void *param) /* set up intranode barrier iff this is an intranode communicator */ if (comm->hierarchy_kind == MPID_HIERARCHY_NODE) { - MPID_Collops *cf, **cf_p; + MPIR_Collops *cf, **cf_p; comm->dev.ch.barrier_vars = NULL; /* We can't use a static coll_fns override table for our collectives @@ -49,7 +49,7 @@ int MPIDI_CH3I_comm_create(MPIR_Comm *comm, void *param) currently have a use case for it. */ cf_p = NULL; - while ( (cf_p = (MPID_Collops **)utarray_next(coll_fns_array, cf_p)) ) { + while ( (cf_p = (MPIR_Collops **)utarray_next(coll_fns_array, cf_p)) ) { /* we can reuse a coll_fns table if the prev_coll_fns pointer is the same as the coll_fns of this communicator */ if ((*cf_p)->prev_coll_fns == comm->coll_fns) { @@ -60,7 +60,7 @@ int MPIDI_CH3I_comm_create(MPIR_Comm *comm, void *param) } /* allocate and init new coll_fns table */ - MPIU_CHKPMEM_MALLOC(cf, MPID_Collops *, sizeof(*cf), mpi_errno, "cf"); + MPIU_CHKPMEM_MALLOC(cf, MPIR_Collops *, sizeof(*cf), mpi_errno, "cf"); *cf = *comm->coll_fns; cf->ref_count = 1; cf->Barrier = barrier; @@ -97,7 +97,7 @@ int MPIDI_CH3I_comm_destroy(MPIR_Comm *comm, void *param) #endif if (comm->hierarchy_kind == MPID_HIERARCHY_NODE) { - MPID_Collops *cf = comm->coll_fns; + MPIR_Collops *cf = comm->coll_fns; /* replace previous coll_fns table */ comm->coll_fns = cf->prev_coll_fns; diff --git a/src/mpid/common/hcoll/hcoll_init.c b/src/mpid/common/hcoll/hcoll_init.c index c09457b..d47ec77 100644 --- a/src/mpid/common/hcoll/hcoll_init.c +++ b/src/mpid/common/hcoll/hcoll_init.c @@ -181,11 +181,11 @@ int hcoll_comm_create(MPIR_Comm * comm_ptr, void *param) MPIR_ERR_POP(mpi_errno); } comm_ptr->hcoll_priv.hcoll_origin_coll_fns = comm_ptr->coll_fns; - comm_ptr->coll_fns = (MPID_Collops *) MPL_malloc(sizeof(MPID_Collops)); - memset(comm_ptr->coll_fns, 0, sizeof(MPID_Collops)); + comm_ptr->coll_fns = (MPIR_Collops *) MPL_malloc(sizeof(MPIR_Collops)); + memset(comm_ptr->coll_fns, 0, sizeof(MPIR_Collops)); if (comm_ptr->hcoll_priv.hcoll_origin_coll_fns != 0) { memcpy(comm_ptr->coll_fns, comm_ptr->hcoll_priv.hcoll_origin_coll_fns, - sizeof(MPID_Collops)); + sizeof(MPIR_Collops)); } INSTALL_COLL_WRAPPER(barrier, Barrier); INSTALL_COLL_WRAPPER(bcast, Bcast); diff --git a/src/mpid/common/hcoll/hcollpre.h b/src/mpid/common/hcoll/hcollpre.h index 29f2247..04c5e6b 100644 --- a/src/mpid/common/hcoll/hcollpre.h +++ b/src/mpid/common/hcoll/hcollpre.h @@ -9,7 +9,7 @@ typedef struct { int is_hcoll_init; - struct MPID_Collops *hcoll_origin_coll_fns; + struct MPIR_Collops *hcoll_origin_coll_fns; void *hcoll_context; } hcoll_comm_priv_t; diff --git a/src/mpid/pamid/src/comm/mpid_comm.c b/src/mpid/pamid/src/comm/mpid_comm.c index 7734eb7..2e61594 100644 --- a/src/mpid/pamid/src/comm/mpid_comm.c +++ b/src/mpid/pamid/src/comm/mpid_comm.c @@ -230,7 +230,7 @@ void MPIDI_Coll_comm_create(MPIR_Comm *comm) if(comm->comm_kind != MPID_INTRACOMM) return; /* Create a geometry */ - comm->coll_fns = MPL_calloc0(1, MPID_Collops); + comm->coll_fns = MPL_calloc0(1, MPIR_Collops); MPID_assert(comm->coll_fns != NULL); if(comm->mpid.geometry != MPIDI_Process.world_geometry) http://git.mpich.org/mpich.git/commitdiff/906f12ad953876376fcbbbe373b558dae… commit 906f12ad953876376fcbbbe373b558dae3741c63 Author: Wesley Bland <wesley.bland(a)intel.com> Date: Mon Apr 18 17:09:24 2016 -0500 Rename MPID_Comm_hierarchy_kind_t to MPIR_Comm_hierarchy_kind_t Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index 6703fed..c01ed4f 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -1099,13 +1099,13 @@ typedef enum MPIR_Comm_kind_t { /* ideally we could add these to MPIR_Comm_kind_t, but there's too much existing * code that assumes that the only valid values are INTRACOMM or INTERCOMM */ -typedef enum MPID_Comm_hierarchy_kind_t { +typedef enum MPIR_Comm_hierarchy_kind_t { MPID_HIERARCHY_FLAT = 0, /* no hierarchy */ MPID_HIERARCHY_PARENT = 1, /* has subcommunicators */ MPID_HIERARCHY_NODE_ROOTS = 2, /* is the subcomm for node roots */ MPID_HIERARCHY_NODE = 3, /* is the subcomm for a node */ MPID_HIERARCHY_SIZE /* cardinality of this enum */ -} MPID_Comm_hierarchy_kind_t; +} MPIR_Comm_hierarchy_kind_t; /* Communicators */ typedef enum { @@ -1226,7 +1226,7 @@ typedef struct MPIR_Comm { struct MPIR_Comm *local_comm; /* Defined only for intercomms, holds an intracomm for the local group */ - MPID_Comm_hierarchy_kind_t hierarchy_kind; /* flat, parent, node, or node_roots */ + MPIR_Comm_hierarchy_kind_t hierarchy_kind; /* flat, parent, node, or node_roots */ struct MPIR_Comm *node_comm; /* Comm of processes in this comm that are on the same node as this process. */ struct MPIR_Comm *node_roots_comm; /* Comm of root processes for other nodes. */ http://git.mpich.org/mpich.git/commitdiff/f322bec7a3e54802f55f0840728403651… commit f322bec7a3e54802f55f0840728403651baf9ce2 Author: Wesley Bland <wesley.bland(a)intel.com> Date: Mon Apr 18 17:07:11 2016 -0500 Rename MPID_Errhandler to MPIR_Errhandler Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/src/include/mpihandlemem.h b/src/include/mpihandlemem.h index a5bf419..e55352a 100644 --- a/src/include/mpihandlemem.h +++ b/src/include/mpihandlemem.h @@ -61,7 +61,7 @@ typedef enum MPID_Object_kind { MPID_COMM = 0x1, MPID_GROUP = 0x2, MPID_DATATYPE = 0x3, - MPID_FILE = 0x4, /* only used obliquely inside MPID_Errhandler objs */ + MPID_FILE = 0x4, /* only used obliquely inside MPIR_Errhandler objs */ MPID_ERRHANDLER = 0x5, MPID_OP = 0x6, MPID_INFO = 0x7, diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index 9519654..6703fed 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -401,7 +401,7 @@ void MPIR_DatatypeAttrFinalize( void ); #define MPIR_Comm_get_ptr(a,ptr) MPID_Getb_ptr(Comm,a,0x03ffffff,ptr) #define MPIR_Group_get_ptr(a,ptr) MPID_Getb_ptr(Group,a,0x03ffffff,ptr) #define MPID_File_get_ptr(a,ptr) MPID_Get_ptr(File,a,ptr) -#define MPID_Errhandler_get_ptr(a,ptr) MPID_Getb_ptr(Errhandler,a,0x3,ptr) +#define MPIR_Errhandler_get_ptr(a,ptr) MPID_Getb_ptr(Errhandler,a,0x3,ptr) #define MPID_Op_get_ptr(a,ptr) MPID_Getb_ptr(Op,a,0x000000ff,ptr) #define MPID_Info_get_ptr(a,ptr) MPID_Getb_ptr(Info,a,0x03ffffff,ptr) #define MPID_Win_get_ptr(a,ptr) MPID_Get_ptr(Win,a,ptr) @@ -461,7 +461,7 @@ void MPIR_DatatypeAttrFinalize( void ); #define MPIR_Group_valid_ptr(ptr,err) MPID_Valid_ptr_class(Group,ptr,MPI_ERR_GROUP,err) #define MPID_Win_valid_ptr(ptr,err) MPID_Valid_ptr_class(Win,ptr,MPI_ERR_WIN,err) #define MPID_Op_valid_ptr(ptr,err) MPID_Valid_ptr_class(Op,ptr,MPI_ERR_OP,err) -#define MPID_Errhandler_valid_ptr(ptr,err) MPID_Valid_ptr_class(Errhandler,ptr,MPI_ERR_ARG,err) +#define MPIR_Errhandler_valid_ptr(ptr,err) MPID_Valid_ptr_class(Errhandler,ptr,MPI_ERR_ARG,err) #define MPID_File_valid_ptr(ptr,err) MPID_Valid_ptr_class(File,ptr,MPI_ERR_FILE,err) #define MPID_Request_valid_ptr(ptr,err) MPID_Valid_ptr_class(Request,ptr,MPI_ERR_REQUEST,err) #define MPID_Keyval_valid_ptr(ptr,err) MPID_Valid_ptr_class(Keyval,ptr,MPI_ERR_KEYVAL,err) @@ -611,7 +611,7 @@ extern MPID_Thread_mutex_t MPIR_THREAD_POBJ_PMI_MUTEX; /* ------------------------------------------------------------------------- */ /* Error Handlers */ /*E - MPID_Errhandler_fn - MPID Structure to hold an error handler function + MPIR_Errhandler_fn - MPID Structure to hold an error handler function Notes: The MPI-1 Standard declared only the C version of this, implicitly @@ -632,15 +632,15 @@ extern MPID_Thread_mutex_t MPIR_THREAD_POBJ_PMI_MUTEX; of the union)? E*/ -typedef union MPID_Errhandler_fn { +typedef union MPIR_Errhandler_fn { void (*C_Comm_Handler_function) ( MPI_Comm *, int *, ... ); void (*F77_Handler_function) ( MPI_Fint *, MPI_Fint * ); void (*C_Win_Handler_function) ( MPI_Win *, int *, ... ); void (*C_File_Handler_function) ( MPI_File *, int *, ... ); -} MPID_Errhandler_fn; +} MPIR_Errhandler_fn; /*S - MPID_Errhandler - Description of the error handler structure + MPIR_Errhandler - Description of the error handler structure Notes: Device-specific information may indicate whether the error handler is active; @@ -657,20 +657,20 @@ typedef union MPID_Errhandler_fn { Module: ErrHand-DS S*/ -typedef struct MPID_Errhandler { +typedef struct MPIR_Errhandler { MPIU_OBJECT_HEADER; /* adds handle and ref_count fields */ MPID_Lang_t language; MPID_Object_kind kind; - MPID_Errhandler_fn errfn; + MPIR_Errhandler_fn errfn; /* Other, device-specific information */ #ifdef MPID_DEV_ERRHANDLER_DECL MPID_DEV_ERRHANDLER_DECL #endif -} MPID_Errhandler; -extern MPIU_Object_alloc_t MPID_Errhandler_mem; +} MPIR_Errhandler; +extern MPIU_Object_alloc_t MPIR_Errhandler_mem; /* Preallocated errhandler objects */ -extern MPID_Errhandler MPID_Errhandler_builtin[]; -extern MPID_Errhandler MPID_Errhandler_direct[]; +extern MPIR_Errhandler MPIR_Errhandler_builtin[]; +extern MPIR_Errhandler MPIR_Errhandler_direct[]; /* We never reference count the builtin error handler objects, regardless of how * we decide to reference count the other predefined objects. If we get to the @@ -1222,7 +1222,7 @@ typedef struct MPIR_Comm { same for intra communicators */ MPIR_Comm_kind_t comm_kind; /* MPID_INTRACOMM or MPID_INTERCOMM */ char name[MPI_MAX_OBJECT_NAME]; /* Required for MPI-2 */ - MPID_Errhandler *errhandler; /* Pointer to the error handler structure */ + MPIR_Errhandler *errhandler; /* Pointer to the error handler structure */ struct MPIR_Comm *local_comm; /* Defined only for intercomms, holds an intracomm for the local group */ @@ -1663,7 +1663,7 @@ MPID_Progress_state; typedef struct MPID_Win { MPIU_OBJECT_HEADER; /* adds handle and ref_count fields */ MPID_Thread_mutex_t mutex; - MPID_Errhandler *errhandler; /* Pointer to the error handler structure */ + MPIR_Errhandler *errhandler; /* Pointer to the error handler structure */ void *base; MPI_Aint size; int disp_unit; /* Displacement unit of *local* window */ @@ -3675,7 +3675,7 @@ int MPID_Topo_cluster_info( MPIR_Comm *comm, @*/ int MPID_Get_processor_name( char *name, int namelen, int *resultlen); -void MPID_Errhandler_free(MPID_Errhandler *errhan_ptr); +void MPIR_Errhandler_free(MPIR_Errhandler *errhan_ptr); /*@ MPID_Get_universe_size - Return the number of processes that the current @@ -4284,8 +4284,8 @@ int MPIR_Comm_get_info_impl(MPIR_Comm *comm_ptr, MPID_Info **info_ptr); int MPIR_Comm_set_info_impl(MPIR_Comm *comm_ptr, MPID_Info *info_ptr); int MPIR_Comm_free_impl(MPIR_Comm * comm_ptr); void MPIR_Comm_free_keyval_impl(int keyval); -void MPIR_Comm_get_errhandler_impl(MPIR_Comm *comm_ptr, MPID_Errhandler **errhandler_ptr); -void MPIR_Comm_set_errhandler_impl(MPIR_Comm *comm_ptr, MPID_Errhandler *errhandler_ptr); +void MPIR_Comm_get_errhandler_impl(MPIR_Comm *comm_ptr, MPIR_Errhandler **errhandler_ptr); +void MPIR_Comm_set_errhandler_impl(MPIR_Comm *comm_ptr, MPIR_Errhandler *errhandler_ptr); void MPIR_Comm_get_name_impl(MPIR_Comm *comm, char *comm_name, int *resultlen); int MPIR_Intercomm_merge_impl(MPIR_Comm *comm_ptr, int high, MPIR_Comm **new_intracomm_ptr); int MPIR_Intercomm_create_impl(MPIR_Comm *local_comm_ptr, int local_leader, diff --git a/src/mpi/comm/commutil.c b/src/mpi/comm/commutil.c index 92e376d..d6a9510 100644 --- a/src/mpi/comm/commutil.c +++ b/src/mpi/comm/commutil.c @@ -1004,7 +1004,7 @@ int MPIR_Comm_delete_internal(MPIR_Comm * comm_ptr) int errhInuse; MPIR_Errhandler_release_ref(comm_ptr->errhandler, &errhInuse); if (!errhInuse) { - MPIU_Handle_obj_free(&MPID_Errhandler_mem, comm_ptr->errhandler); + MPIU_Handle_obj_free(&MPIR_Errhandler_mem, comm_ptr->errhandler); } } diff --git a/src/mpi/errhan/comm_create_errhandler.c b/src/mpi/errhan/comm_create_errhandler.c index 8bb32b2..a42c819 100644 --- a/src/mpi/errhan/comm_create_errhandler.c +++ b/src/mpi/errhan/comm_create_errhandler.c @@ -34,9 +34,9 @@ int MPIR_Comm_create_errhandler_impl(MPI_Comm_errhandler_function *comm_errhandl MPI_Errhandler *errhandler) { int mpi_errno = MPI_SUCCESS; - MPID_Errhandler *errhan_ptr; + MPIR_Errhandler *errhan_ptr; - errhan_ptr = (MPID_Errhandler *)MPIU_Handle_obj_alloc( &MPID_Errhandler_mem ); + errhan_ptr = (MPIR_Errhandler *)MPIU_Handle_obj_alloc( &MPIR_Errhandler_mem ); MPIR_ERR_CHKANDJUMP(!errhan_ptr, mpi_errno, MPI_ERR_OTHER, "**nomem"); errhan_ptr->language = MPID_LANG_C; diff --git a/src/mpi/errhan/comm_get_errhandler.c b/src/mpi/errhan/comm_get_errhandler.c index 3acd00f..3955c31 100644 --- a/src/mpi/errhan/comm_get_errhandler.c +++ b/src/mpi/errhan/comm_get_errhandler.c @@ -31,7 +31,7 @@ int MPI_Comm_get_errhandler(MPI_Comm comm, MPI_Errhandler *errhandler) __attribu #define FUNCNAME MPIR_Comm_get_errhandler_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -void MPIR_Comm_get_errhandler_impl(MPIR_Comm *comm_ptr, MPID_Errhandler **errhandler_ptr) +void MPIR_Comm_get_errhandler_impl(MPIR_Comm *comm_ptr, MPIR_Errhandler **errhandler_ptr) { MPID_THREAD_CS_ENTER(POBJ, MPIR_THREAD_POBJ_COMM_MUTEX(comm_ptr)); *errhandler_ptr = comm_ptr->errhandler; @@ -69,7 +69,7 @@ int MPI_Comm_get_errhandler(MPI_Comm comm, MPI_Errhandler *errhandler) { int mpi_errno = MPI_SUCCESS; MPIR_Comm *comm_ptr = NULL; - MPID_Errhandler *errhandler_ptr; + MPIR_Errhandler *errhandler_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_GET_ERRHANDLER); MPIR_ERRTEST_INITIALIZED_ORDIE(); diff --git a/src/mpi/errhan/comm_set_errhandler.c b/src/mpi/errhan/comm_set_errhandler.c index d4730b9..b487309 100644 --- a/src/mpi/errhan/comm_set_errhandler.c +++ b/src/mpi/errhan/comm_set_errhandler.c @@ -29,7 +29,7 @@ int MPI_Comm_set_errhandler(MPI_Comm comm, MPI_Errhandler errhandler) __attribut #define FUNCNAME MPIR_Comm_set_errhandler_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -void MPIR_Comm_set_errhandler_impl(MPIR_Comm *comm_ptr, MPID_Errhandler *errhandler_ptr) +void MPIR_Comm_set_errhandler_impl(MPIR_Comm *comm_ptr, MPIR_Errhandler *errhandler_ptr) { int in_use; @@ -41,7 +41,7 @@ void MPIR_Comm_set_errhandler_impl(MPIR_Comm *comm_ptr, MPID_Errhandler *errhand if (comm_ptr->errhandler != NULL) { MPIR_Errhandler_release_ref(comm_ptr->errhandler, &in_use); if (!in_use) { - MPID_Errhandler_free( comm_ptr->errhandler ); + MPIR_Errhandler_free( comm_ptr->errhandler ); } } @@ -81,7 +81,7 @@ int MPI_Comm_set_errhandler(MPI_Comm comm, MPI_Errhandler errhandler) { int mpi_errno = MPI_SUCCESS; MPIR_Comm *comm_ptr = NULL; - MPID_Errhandler *errhan_ptr = NULL; + MPIR_Errhandler *errhan_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_SET_ERRHANDLER); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -102,7 +102,7 @@ int MPI_Comm_set_errhandler(MPI_Comm comm, MPI_Errhandler errhandler) /* Convert MPI object handles to object pointers */ MPIR_Comm_get_ptr( comm, comm_ptr ); - MPID_Errhandler_get_ptr( errhandler, errhan_ptr ); + MPIR_Errhandler_get_ptr( errhandler, errhan_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -113,7 +113,7 @@ int MPI_Comm_set_errhandler(MPI_Comm comm, MPI_Errhandler errhandler) MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); if (HANDLE_GET_KIND(errhandler) != HANDLE_KIND_BUILTIN) { - MPID_Errhandler_valid_ptr( errhan_ptr, mpi_errno ); + MPIR_Errhandler_valid_ptr( errhan_ptr, mpi_errno ); } MPIR_ERRTEST_ERRHANDLER(errhandler, mpi_errno); } diff --git a/src/mpi/errhan/errhandler_free.c b/src/mpi/errhan/errhandler_free.c index 78af5a2..91b45da 100644 --- a/src/mpi/errhan/errhandler_free.c +++ b/src/mpi/errhan/errhandler_free.c @@ -51,7 +51,7 @@ int MPI_Errhandler_free(MPI_Errhandler *errhandler) static const char FCNAME[] = "MPI_Errhandler_free"; #endif int mpi_errno = MPI_SUCCESS; - MPID_Errhandler *errhan_ptr = NULL; + MPIR_Errhandler *errhan_ptr = NULL; int in_use; MPID_MPI_STATE_DECL(MPID_STATE_MPI_ERRHANDLER_FREE); @@ -73,14 +73,14 @@ int MPI_Errhandler_free(MPI_Errhandler *errhandler) # endif /* Convert MPI object handles to object pointers */ - MPID_Errhandler_get_ptr( *errhandler, errhan_ptr ); + MPIR_Errhandler_get_ptr( *errhandler, errhan_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS; { - MPID_Errhandler_valid_ptr( errhan_ptr, mpi_errno ); + MPIR_Errhandler_valid_ptr( errhan_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; } MPID_END_ERROR_CHECKS; @@ -91,7 +91,7 @@ int MPI_Errhandler_free(MPI_Errhandler *errhandler) MPIR_Errhandler_release_ref( errhan_ptr,&in_use); if (!in_use) { - MPIU_Handle_obj_free( &MPID_Errhandler_mem, errhan_ptr ); + MPIU_Handle_obj_free( &MPIR_Errhandler_mem, errhan_ptr ); } *errhandler = MPI_ERRHANDLER_NULL; diff --git a/src/mpi/errhan/errhandler_get.c b/src/mpi/errhan/errhandler_get.c index 71c310c..bacd7f2 100644 --- a/src/mpi/errhan/errhandler_get.c +++ b/src/mpi/errhan/errhandler_get.c @@ -65,7 +65,7 @@ int MPI_Errhandler_get(MPI_Comm comm, MPI_Errhandler *errhandler) { int mpi_errno = MPI_SUCCESS; MPIR_Comm *comm_ptr = NULL; - MPID_Errhandler *errhandler_ptr; + MPIR_Errhandler *errhandler_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPI_ERRHANDLER_GET); MPIR_ERRTEST_INITIALIZED_ORDIE(); diff --git a/src/mpi/errhan/errhandler_set.c b/src/mpi/errhan/errhandler_set.c index 9c8d282..722a40d 100644 --- a/src/mpi/errhan/errhandler_set.c +++ b/src/mpi/errhan/errhandler_set.c @@ -56,7 +56,7 @@ int MPI_Errhandler_set(MPI_Comm comm, MPI_Errhandler errhandler) { int mpi_errno = MPI_SUCCESS; MPIR_Comm *comm_ptr = NULL; - MPID_Errhandler *errhan_ptr; + MPIR_Errhandler *errhan_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPI_ERRHANDLER_SET); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -77,7 +77,7 @@ int MPI_Errhandler_set(MPI_Comm comm, MPI_Errhandler errhandler) /* Convert MPI object handles to object pointers */ MPIR_Comm_get_ptr( comm, comm_ptr ); - MPID_Errhandler_get_ptr( errhandler, errhan_ptr ); + MPIR_Errhandler_get_ptr( errhandler, errhan_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -90,7 +90,7 @@ int MPI_Errhandler_set(MPI_Comm comm, MPI_Errhandler errhandler) MPIR_ERRTEST_ERRHANDLER(errhandler, mpi_errno); if (HANDLE_GET_KIND(errhandler) != HANDLE_KIND_BUILTIN) { - MPID_Errhandler_valid_ptr( errhan_ptr, mpi_errno ); + MPIR_Errhandler_valid_ptr( errhan_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; } } diff --git a/src/mpi/errhan/errutil.c b/src/mpi/errhan/errutil.c index 0068003..ace5e24 100644 --- a/src/mpi/errhan/errutil.c +++ b/src/mpi/errhan/errutil.c @@ -70,7 +70,7 @@ cvars: * This file contains several groups of routines user for error handling * and reporting. * - * The first group provides memory for the MPID_Errhandler objects + * The first group provides memory for the MPIR_Errhandler objects * and the routines to free and manipulate them * * The second group provides routines to call the appropriate error handler, @@ -130,7 +130,7 @@ static int checkForUserErrcode( int ); /* ------------------------------------------------------------------------- */ -/* Provide the MPID_Errhandler space and the routines to free and set them +/* Provide the MPIR_Errhandler space and the routines to free and set them from C++ and Fortran */ /* ------------------------------------------------------------------------- */ /* @@ -143,26 +143,26 @@ static int checkForUserErrcode( int ); #endif /* Preallocated errorhandler objects */ -MPID_Errhandler MPID_Errhandler_builtin[3] = { {0} }; -MPID_Errhandler MPID_Errhandler_direct[MPID_ERRHANDLER_PREALLOC] = +MPIR_Errhandler MPIR_Errhandler_builtin[3] = { {0} }; +MPIR_Errhandler MPIR_Errhandler_direct[MPID_ERRHANDLER_PREALLOC] = { {0} }; -MPIU_Object_alloc_t MPID_Errhandler_mem = { 0, 0, 0, 0, MPID_ERRHANDLER, - sizeof(MPID_Errhandler), - MPID_Errhandler_direct, +MPIU_Object_alloc_t MPIR_Errhandler_mem = { 0, 0, 0, 0, MPID_ERRHANDLER, + sizeof(MPIR_Errhandler), + MPIR_Errhandler_direct, MPID_ERRHANDLER_PREALLOC, }; -void MPID_Errhandler_free(MPID_Errhandler *errhan_ptr) +void MPIR_Errhandler_free(MPIR_Errhandler *errhan_ptr) { - MPIU_Handle_obj_free(&MPID_Errhandler_mem, errhan_ptr); + MPIU_Handle_obj_free(&MPIR_Errhandler_mem, errhan_ptr); } void MPIR_Err_init( void ) { /* these are "stub" objects, so the other fields (which are statically * initialized to zero) don't really matter */ - MPID_Errhandler_builtin[0].handle = MPI_ERRORS_ARE_FATAL; - MPID_Errhandler_builtin[1].handle = MPI_ERRORS_RETURN; - MPID_Errhandler_builtin[2].handle = MPIR_ERRORS_THROW_EXCEPTIONS; + MPIR_Errhandler_builtin[0].handle = MPI_ERRORS_ARE_FATAL; + MPIR_Errhandler_builtin[1].handle = MPI_ERRORS_RETURN; + MPIR_Errhandler_builtin[2].handle = MPIR_ERRORS_THROW_EXCEPTIONS; # if MPICH_ERROR_MSG_LEVEL >= MPICH_ERROR_MSG_ALL MPIR_Err_stack_init(); @@ -178,9 +178,9 @@ void MPIR_Err_init( void ) defined in the C++ binding. */ void MPIR_Errhandler_set_cxx( MPI_Errhandler errhand, void (*errcall)(void) ) { - MPID_Errhandler *errhand_ptr; + MPIR_Errhandler *errhand_ptr; - MPID_Errhandler_get_ptr( errhand, errhand_ptr ); + MPIR_Errhandler_get_ptr( errhand, errhand_ptr ); errhand_ptr->language = MPID_LANG_CXX; MPIR_Process.cxx_call_errfn = (void (*)( int, int *, int *, void (*)(void) ))errcall; @@ -190,9 +190,9 @@ void MPIR_Errhandler_set_cxx( MPI_Errhandler errhand, void (*errcall)(void) ) #if defined(HAVE_FORTRAN_BINDING) && !defined(HAVE_FINT_IS_INT) void MPIR_Errhandler_set_fc( MPI_Errhandler errhand ) { - MPID_Errhandler *errhand_ptr; + MPIR_Errhandler *errhand_ptr; - MPID_Errhandler_get_ptr( errhand, errhand_ptr ); + MPIR_Errhandler_get_ptr( errhand, errhand_ptr ); errhand_ptr->language = MPID_LANG_FORTRAN; } @@ -238,7 +238,7 @@ int MPIR_Err_return_comm( MPIR_Comm *comm_ptr, const char fcname[], int errcode ) { const int error_class = ERROR_GET_CLASS(errcode); - MPID_Errhandler *errhandler = NULL; + MPIR_Errhandler *errhandler = NULL; checkValidErrcode( error_class, fcname, &errcode ); diff --git a/src/mpi/errhan/file_call_errhandler.c b/src/mpi/errhan/file_call_errhandler.c index 79c21de..f83ac89 100644 --- a/src/mpi/errhan/file_call_errhandler.c +++ b/src/mpi/errhan/file_call_errhandler.c @@ -54,7 +54,7 @@ int MPI_File_call_errhandler(MPI_File fh, int errorcode) { int mpi_errno = MPI_SUCCESS; #ifdef MPI_MODE_RDONLY - MPID_Errhandler *e; + MPIR_Errhandler *e; MPI_Errhandler eh; #endif MPID_MPI_STATE_DECL(MPID_STATE_MPI_FILE_CALL_ERRHANDLER); @@ -82,10 +82,10 @@ int MPI_File_call_errhandler(MPI_File fh, int errorcode) } #endif if (!eh) { - MPID_Errhandler_get_ptr( MPI_ERRORS_RETURN, e ); + MPIR_Errhandler_get_ptr( MPI_ERRORS_RETURN, e ); } else { - MPID_Errhandler_get_ptr( eh, e ); + MPIR_Errhandler_get_ptr( eh, e ); } /* Note that, unlike the rest of MPICH, MPI_File objects are pointers, diff --git a/src/mpi/errhan/file_create_errhandler.c b/src/mpi/errhan/file_create_errhandler.c index f6c8868..ba80287 100644 --- a/src/mpi/errhan/file_create_errhandler.c +++ b/src/mpi/errhan/file_create_errhandler.c @@ -52,7 +52,7 @@ int MPI_File_create_errhandler(MPI_File_errhandler_function *file_errhandler_fn, { static const char FCNAME[] = "MPI_File_create_errhandler"; int mpi_errno = MPI_SUCCESS; - MPID_Errhandler *errhan_ptr; + MPIR_Errhandler *errhan_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPI_FILE_CREATE_ERRHANDLER); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -74,7 +74,7 @@ int MPI_File_create_errhandler(MPI_File_errhandler_function *file_errhandler_fn, /* ... body of routine ... */ - errhan_ptr = (MPID_Errhandler *)MPIU_Handle_obj_alloc( &MPID_Errhandler_mem ); + errhan_ptr = (MPIR_Errhandler *)MPIU_Handle_obj_alloc( &MPIR_Errhandler_mem ); MPIR_ERR_CHKANDJUMP(!errhan_ptr,mpi_errno,MPI_ERR_OTHER,"**nomem"); errhan_ptr->language = MPID_LANG_C; errhan_ptr->kind = MPID_FILE; diff --git a/src/mpi/errhan/file_get_errhandler.c b/src/mpi/errhan/file_get_errhandler.c index 22ac73c..a69f7ec 100644 --- a/src/mpi/errhan/file_get_errhandler.c +++ b/src/mpi/errhan/file_get_errhandler.c @@ -58,7 +58,7 @@ int MPI_File_get_errhandler(MPI_File file, MPI_Errhandler *errhandler) int mpi_errno = MPI_SUCCESS; #ifdef MPI_MODE_RDONLY MPI_Errhandler eh; - MPID_Errhandler *e; + MPIR_Errhandler *e; #endif MPID_MPI_STATE_DECL(MPID_STATE_MPI_FILE_GET_ERRHANDLER); @@ -86,10 +86,10 @@ int MPI_File_get_errhandler(MPI_File file, MPI_Errhandler *errhandler) MPIR_ROMIO_Get_file_errhand( file, &eh ); if (!eh) { - MPID_Errhandler_get_ptr( MPI_ERRORS_RETURN, e ); + MPIR_Errhandler_get_ptr( MPI_ERRORS_RETURN, e ); } else { - MPID_Errhandler_get_ptr( eh, e ); + MPIR_Errhandler_get_ptr( eh, e ); } MPIR_Errhandler_add_ref( e ); *errhandler = e->handle; diff --git a/src/mpi/errhan/file_set_errhandler.c b/src/mpi/errhan/file_set_errhandler.c index 1f841d1..19c16d1 100644 --- a/src/mpi/errhan/file_set_errhandler.c +++ b/src/mpi/errhan/file_set_errhandler.c @@ -56,7 +56,7 @@ int MPI_File_set_errhandler(MPI_File file, MPI_Errhandler errhandler) int mpi_errno = MPI_SUCCESS; #ifdef MPI_MODE_RDONLY int in_use; - MPID_Errhandler *errhan_ptr = NULL, *old_errhandler_ptr; + MPIR_Errhandler *errhan_ptr = NULL, *old_errhandler_ptr; MPI_Errhandler old_errhandler; #endif MPID_MPI_STATE_DECL(MPID_STATE_MPI_FILE_SET_ERRHANDLER); @@ -80,7 +80,7 @@ int MPI_File_set_errhandler(MPI_File file, MPI_Errhandler errhandler) } # endif /* HAVE_ERROR_CHECKING */ - MPID_Errhandler_get_ptr( errhandler, errhan_ptr ); + MPIR_Errhandler_get_ptr( errhandler, errhan_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -88,7 +88,7 @@ int MPI_File_set_errhandler(MPI_File file, MPI_Errhandler errhandler) MPID_BEGIN_ERROR_CHECKS; { if (HANDLE_GET_KIND(errhandler) != HANDLE_KIND_BUILTIN) { - MPID_Errhandler_valid_ptr( errhan_ptr,mpi_errno ); + MPIR_Errhandler_valid_ptr( errhan_ptr,mpi_errno ); /* Also check for a valid errhandler kind */ if (!mpi_errno) { if (errhan_ptr->kind != MPID_FILE) { @@ -109,16 +109,16 @@ int MPI_File_set_errhandler(MPI_File file, MPI_Errhandler errhandler) /* MPI_File objects default to the errhandler set on MPI_FILE_NULL * at file open time, or MPI_ERRORS_RETURN if no errhandler is set * on MPI_FILE_NULL. (MPI-2.2, sec 13.7) */ - MPID_Errhandler_get_ptr( MPI_ERRORS_RETURN, old_errhandler_ptr ); + MPIR_Errhandler_get_ptr( MPI_ERRORS_RETURN, old_errhandler_ptr ); } else { - MPID_Errhandler_get_ptr( old_errhandler, old_errhandler_ptr ); + MPIR_Errhandler_get_ptr( old_errhandler, old_errhandler_ptr ); } if (old_errhandler_ptr) { MPIR_Errhandler_release_ref(old_errhandler_ptr,&in_use); if (!in_use) { - MPID_Errhandler_free( old_errhandler_ptr ); + MPIR_Errhandler_free( old_errhandler_ptr ); } } @@ -168,10 +168,10 @@ void MPIR_Get_file_error_routine( MPI_Errhandler e, void (**c)(MPI_File *, int *, ...), int *kind ) { - MPID_Errhandler *e_ptr = 0; + MPIR_Errhandler *e_ptr = 0; int mpi_errno = MPI_SUCCESS; - /* Convert the MPI_Errhandler into an MPID_Errhandler */ + /* Convert the MPI_Errhandler into an MPIR_Errhandler */ if (!e) { *c = 0; @@ -185,7 +185,7 @@ void MPIR_Get_file_error_routine( MPI_Errhandler e, *kind = 1; return; } - MPID_Errhandler_get_ptr(e,e_ptr); + MPIR_Errhandler_get_ptr(e,e_ptr); if (!e_ptr) { /* FIXME: We need an error return */ *c = 0; diff --git a/src/mpi/errhan/win_create_errhandler.c b/src/mpi/errhan/win_create_errhandler.c index cb4e31c..40aef0e 100644 --- a/src/mpi/errhan/win_create_errhandler.c +++ b/src/mpi/errhan/win_create_errhandler.c @@ -54,7 +54,7 @@ int MPI_Win_create_errhandler(MPI_Win_errhandler_function *win_errhandler_fn, { static const char FCNAME[] = "MPI_Win_create_errhandler"; int mpi_errno = MPI_SUCCESS; - MPID_Errhandler *errhan_ptr; + MPIR_Errhandler *errhan_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_CREATE_ERRHANDLER); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -76,7 +76,7 @@ int MPI_Win_create_errhandler(MPI_Win_errhandler_function *win_errhandler_fn, /* ... body of routine ... */ - errhan_ptr = (MPID_Errhandler *)MPIU_Handle_obj_alloc( &MPID_Errhandler_mem ); + errhan_ptr = (MPIR_Errhandler *)MPIU_Handle_obj_alloc( &MPIR_Errhandler_mem ); MPIR_ERR_CHKANDJUMP1(!errhan_ptr,mpi_errno,MPI_ERR_OTHER,"**nomem", "**nomem %s", "MPI_Errhandler"); errhan_ptr->language = MPID_LANG_C; diff --git a/src/mpi/errhan/win_set_errhandler.c b/src/mpi/errhan/win_set_errhandler.c index 44548b4..1c98cee 100644 --- a/src/mpi/errhan/win_set_errhandler.c +++ b/src/mpi/errhan/win_set_errhandler.c @@ -53,7 +53,7 @@ int MPI_Win_set_errhandler(MPI_Win win, MPI_Errhandler errhandler) int mpi_errno = MPI_SUCCESS; MPID_Win *win_ptr = NULL; int in_use; - MPID_Errhandler *errhan_ptr = NULL; + MPIR_Errhandler *errhan_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_SET_ERRHANDLER); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -74,7 +74,7 @@ int MPI_Win_set_errhandler(MPI_Win win, MPI_Errhandler errhandler) /* Convert MPI object handles to object pointers */ MPID_Win_get_ptr( win, win_ptr ); - MPID_Errhandler_get_ptr( errhandler, errhan_ptr ); + MPIR_Errhandler_get_ptr( errhandler, errhan_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -86,7 +86,7 @@ int MPI_Win_set_errhandler(MPI_Win win, MPI_Errhandler errhandler) /* If win_ptr is not value, it will be reset to null */ if (HANDLE_GET_KIND(errhandler) != HANDLE_KIND_BUILTIN) { - MPID_Errhandler_valid_ptr( errhan_ptr,mpi_errno ); + MPIR_Errhandler_valid_ptr( errhan_ptr,mpi_errno ); /* Also check for a valid errhandler kind */ if (!mpi_errno) { if (errhan_ptr->kind != MPID_WIN) { @@ -109,7 +109,7 @@ int MPI_Win_set_errhandler(MPI_Win win, MPI_Errhandler errhandler) if (win_ptr->errhandler != NULL) { MPIR_Errhandler_release_ref(win_ptr->errhandler,&in_use); if (!in_use) { - MPID_Errhandler_free( win_ptr->errhandler ); + MPIR_Errhandler_free( win_ptr->errhandler ); } } diff --git a/src/mpi/init/finalize.c b/src/mpi/init/finalize.c index 40db211..846d074 100644 --- a/src/mpi/init/finalize.c +++ b/src/mpi/init/finalize.c @@ -200,7 +200,7 @@ int MPI_Finalize( void ) MPIR_Errhandler_release_ref( MPIR_Process.comm_world->errhandler, &in_use); if (!in_use) { - MPIU_Handle_obj_free( &MPID_Errhandler_mem, + MPIU_Handle_obj_free( &MPIR_Errhandler_mem, MPIR_Process.comm_world->errhandler ); } /* always set to NULL to avoid a double-release later in finalize */ @@ -213,7 +213,7 @@ int MPI_Finalize( void ) MPIR_Errhandler_release_ref( MPIR_Process.comm_self->errhandler, &in_use); if (!in_use) { - MPIU_Handle_obj_free( &MPID_Errhandler_mem, + MPIU_Handle_obj_free( &MPIR_Errhandler_mem, MPIR_Process.comm_self->errhandler ); } /* always set to NULL to avoid a double-release later in finalize */ diff --git a/src/mpi/rma/win_free.c b/src/mpi/rma/win_free.c index 5c7788f..7308127 100644 --- a/src/mpi/rma/win_free.c +++ b/src/mpi/rma/win_free.c @@ -112,7 +112,7 @@ int MPI_Win_free(MPI_Win *win) int in_use; MPIR_Errhandler_release_ref( win_ptr->errhandler,&in_use); if (!in_use) { - MPIU_Handle_obj_free( &MPID_Errhandler_mem, win_ptr->errhandler ); + MPIU_Handle_obj_free( &MPIR_Errhandler_mem, win_ptr->errhandler ); } } http://git.mpich.org/mpich.git/commitdiff/a2091e6d99da355ef5d2134ec9456ee60… commit a2091e6d99da355ef5d2134ec9456ee60f00f8be Author: Wesley Bland <wesley.bland(a)intel.com> Date: Mon Apr 18 17:04:28 2016 -0500 Rename MPID_Group to MPIR_Group Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index 6198422..9519654 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -399,7 +399,7 @@ void MPIR_DatatypeAttrFinalize( void ); /* FIXME: the masks should be defined with the handle definitions instead of inserted here as literals */ #define MPIR_Comm_get_ptr(a,ptr) MPID_Getb_ptr(Comm,a,0x03ffffff,ptr) -#define MPID_Group_get_ptr(a,ptr) MPID_Getb_ptr(Group,a,0x03ffffff,ptr) +#define MPIR_Group_get_ptr(a,ptr) MPID_Getb_ptr(Group,a,0x03ffffff,ptr) #define MPID_File_get_ptr(a,ptr) MPID_Get_ptr(File,a,ptr) #define MPID_Errhandler_get_ptr(a,ptr) MPID_Getb_ptr(Errhandler,a,0x3,ptr) #define MPID_Op_get_ptr(a,ptr) MPID_Getb_ptr(Op,a,0x000000ff,ptr) @@ -458,7 +458,7 @@ void MPIR_DatatypeAttrFinalize( void ); MPIR_ERR_SET(err,MPIX_ERR_REVOKED,"**comm"); \ } \ } -#define MPID_Group_valid_ptr(ptr,err) MPID_Valid_ptr_class(Group,ptr,MPI_ERR_GROUP,err) +#define MPIR_Group_valid_ptr(ptr,err) MPID_Valid_ptr_class(Group,ptr,MPI_ERR_GROUP,err) #define MPID_Win_valid_ptr(ptr,err) MPID_Valid_ptr_class(Win,ptr,MPI_ERR_WIN,err) #define MPID_Op_valid_ptr(ptr,err) MPID_Valid_ptr_class(Op,ptr,MPI_ERR_OP,err) #define MPID_Errhandler_valid_ptr(ptr,err) MPID_Valid_ptr_class(Errhandler,ptr,MPI_ERR_ARG,err) @@ -1003,17 +1003,17 @@ typedef struct MPIR_Attribute { *---------------------------------------------------------------------------*/ /* This structure is used to implement the group operations such as MPI_Group_translate_ranks */ -typedef struct MPID_Group_pmap_t { +typedef struct MPIR_Group_pmap_t { int lpid; /* local process id, from VCONN */ int next_lpid; /* Index of next lpid (in lpid order) */ int flag; /* marker, used to implement group operations */ -} MPID_Group_pmap_t; +} MPIR_Group_pmap_t; -/* Any changes in the MPID_Group structure must be made to the - predefined value in MPID_Group_builtin for MPI_GROUP_EMPTY in +/* Any changes in the MPIR_Group structure must be made to the + predefined value in MPIR_Group_builtin for MPI_GROUP_EMPTY in src/mpi/group/grouputil.c */ /*S - MPID_Group - Description of the Group data structure + MPIR_Group - Description of the Group data structure The processes in the group of 'MPI_COMM_WORLD' have lpid values 0 to 'size'-1, where 'size' is the size of 'MPI_COMM_WORLD'. Processes created by @@ -1042,13 +1042,13 @@ typedef struct MPID_Group_pmap_t { Group-DS S*/ -typedef struct MPID_Group { +typedef struct MPIR_Group { MPIU_OBJECT_HEADER; /* adds handle and ref_count fields */ int size; /* Size of a group */ int rank; /* rank of this process relative to this group */ int idx_of_first_lpid; - MPID_Group_pmap_t *lrank_to_lpid; /* Array mapping a local rank to local + MPIR_Group_pmap_t *lrank_to_lpid; /* Array mapping a local rank to local process number */ int is_local_dense_monotonic; /* see NOTE-G1 */ @@ -1057,7 +1057,7 @@ typedef struct MPID_Group { #ifdef MPID_DEV_GROUP_DECL MPID_DEV_GROUP_DECL #endif -} MPID_Group; +} MPIR_Group; /* NOTE-G1: is_local_dense_monotonic will be true iff the group meets the * following criteria: @@ -1071,14 +1071,14 @@ typedef struct MPID_Group { * case for many MPI tool libraries, such as Scalasca. */ -extern MPIU_Object_alloc_t MPID_Group_mem; +extern MPIU_Object_alloc_t MPIR_Group_mem; /* Preallocated group objects */ #define MPID_GROUP_N_BUILTIN 1 -extern MPID_Group MPID_Group_builtin[MPID_GROUP_N_BUILTIN]; -extern MPID_Group MPID_Group_direct[]; +extern MPIR_Group MPIR_Group_builtin[MPID_GROUP_N_BUILTIN]; +extern MPIR_Group MPIR_Group_direct[]; /* Object for empty group */ -extern MPID_Group * const MPID_Group_empty; +extern MPIR_Group * const MPIR_Group_empty; #define MPIR_Group_add_ref( _group ) \ do { MPIU_Object_add_ref( _group ); } while (0) @@ -1086,7 +1086,7 @@ extern MPID_Group * const MPID_Group_empty; #define MPIR_Group_release_ref( _group, _inuse ) \ do { MPIU_Object_release_ref( _group, _inuse ); } while (0) -void MPIR_Group_setup_lpid_list( MPID_Group * ); +void MPIR_Group_setup_lpid_list( MPIR_Group * ); /* ------------------------------------------------------------------------- */ @@ -1217,7 +1217,7 @@ typedef struct MPIR_Comm { int rank; /* Value of MPI_Comm_rank */ MPIR_Attribute *attributes; /* List of attributes */ int local_size; /* Value of MPI_Comm_size for local group */ - MPID_Group *local_group, /* Groups in communicator. */ + MPIR_Group *local_group, /* Groups in communicator. */ *remote_group; /* The local and remote groups are the same for intra communicators */ MPIR_Comm_kind_t comm_kind; /* MPID_INTRACOMM or MPID_INTERCOMM */ @@ -1428,7 +1428,7 @@ extern MPIR_Comm MPIR_Comm_direct[]; to create a new communicator after a spawn or connect-accept operation, the device may need to create a new contextid */ int MPIR_Get_contextid_sparse(MPIR_Comm *comm_ptr, MPIU_Context_id_t *context_id, int ignore_id); -int MPIR_Get_contextid_sparse_group(MPIR_Comm *comm_ptr, MPID_Group *group_ptr, int tag, MPIU_Context_id_t *context_id, int ignore_id); +int MPIR_Get_contextid_sparse_group(MPIR_Comm *comm_ptr, MPIR_Group *group_ptr, int tag, MPIU_Context_id_t *context_id, int ignore_id); void MPIR_Free_contextid( MPIU_Context_id_t ); /* ------------------------------------------------------------------------- */ @@ -2345,8 +2345,8 @@ extern void MPIR_Op_set_cxx( MPI_Op, void (*)(void) ); extern void MPIR_Errhandler_set_cxx( MPI_Errhandler, void (*)(void) ); #endif -int MPIR_Group_create( int, MPID_Group ** ); -int MPIR_Group_release(MPID_Group *group_ptr); +int MPIR_Group_create( int, MPIR_Group ** ); +int MPIR_Group_release(MPIR_Group *group_ptr); int MPIR_dup_fn ( MPI_Comm, int, void *, void *, void *, int * ); /* marks a request as complete, extracting the status */ @@ -2598,7 +2598,7 @@ int MPID_Finalize(void); be invoked with 'MPI_COMM_SELF' on each process in the group. Question: - An alternative design is to provide an 'MPID_Group' instead of a + An alternative design is to provide an 'MPIR_Group' instead of a communicator. This would allow a process manager to ask the ADI to kill an entire group of processes without needing a communicator. However, the implementation of 'MPID_Abort' will either do this by @@ -2704,7 +2704,7 @@ int MPID_Comm_failure_ack(MPIR_Comm *comm); Return Value: 'MPI_SUCCESS' or a valid MPI error code. @*/ -int MPID_Comm_failure_get_acked(MPIR_Comm *comm, MPID_Group **failed_group_ptr); +int MPID_Comm_failure_get_acked(MPIR_Comm *comm, MPIR_Group **failed_group_ptr); /*@ MPID_Comm_get_all_failed_procs - Constructs a group of failed processes that it uniform over a communicator @@ -2719,7 +2719,7 @@ int MPID_Comm_failure_get_acked(MPIR_Comm *comm, MPID_Group **failed_group_ptr); Return Value: 'MPI_SUCCESS' or a valid MPI error code. @*/ -int MPID_Comm_get_all_failed_procs(MPIR_Comm *comm_ptr, MPID_Group **failed_group, int tag); +int MPID_Comm_get_all_failed_procs(MPIR_Comm *comm_ptr, MPIR_Group **failed_group, int tag); /*@ MPID_Comm_revoke - MPID entry point for MPI_Comm_revoke @@ -3333,8 +3333,8 @@ int MPID_Accumulate(const void *, int, MPI_Datatype, int, MPI_Aint, int, MPI_Datatype, MPI_Op, MPID_Win *); int MPID_Win_fence(int, MPID_Win *); -int MPID_Win_post(MPID_Group *group_ptr, int assert, MPID_Win *win_ptr); -int MPID_Win_start(MPID_Group *group_ptr, int assert, MPID_Win *win_ptr); +int MPID_Win_post(MPIR_Group *group_ptr, int assert, MPID_Win *win_ptr); +int MPID_Win_start(MPIR_Group *group_ptr, int assert, MPID_Win *win_ptr); int MPID_Win_test(MPID_Win *win_ptr, int *flag); int MPID_Win_wait(MPID_Win *win_ptr); int MPID_Win_complete(MPID_Win *win_ptr); @@ -4023,11 +4023,11 @@ int MPIR_Reduce_local_impl(const void *inbuf, void *inoutbuf, int count, MPI_Dat int MPIR_Setup_intercomm_localcomm( MPIR_Comm * ); int MPIR_Comm_create( MPIR_Comm ** ); -int MPIR_Comm_create_group(MPIR_Comm * comm_ptr, MPID_Group * group_ptr, int tag, +int MPIR_Comm_create_group(MPIR_Comm * comm_ptr, MPIR_Group * group_ptr, int tag, MPIR_Comm ** newcomm); /* comm_create helper functions, used by both comm_create and comm_create_group */ -int MPIR_Comm_create_calculate_mapping(MPID_Group *group_ptr, +int MPIR_Comm_create_calculate_mapping(MPIR_Group *group_ptr, MPIR_Comm *comm_ptr, int **mapping_out, MPIR_Comm **mapping_comm); @@ -4040,7 +4040,7 @@ int MPIR_Comm_create_map(int local_n, MPIR_Comm *newcomm); /* implements the logic for MPI_Comm_create for intracommunicators only */ -int MPIR_Comm_create_intra(MPIR_Comm *comm_ptr, MPID_Group *group_ptr, +int MPIR_Comm_create_intra(MPIR_Comm *comm_ptr, MPIR_Group *group_ptr, MPIR_Comm **newcomm_ptr); @@ -4059,13 +4059,13 @@ int MPIR_Comm_agree(MPIR_Comm *comm_ptr, int *flag); int MPIR_Allreduce_group(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, - MPID_Group *group_ptr, int tag, MPIR_Errflag_t *errflag); + MPIR_Group *group_ptr, int tag, MPIR_Errflag_t *errflag); int MPIR_Allreduce_group_intra(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, - MPID_Group *group_ptr, int tag, MPIR_Errflag_t *errflag); + MPIR_Group *group_ptr, int tag, MPIR_Errflag_t *errflag); -int MPIR_Barrier_group(MPIR_Comm *comm_ptr, MPID_Group *group_ptr, int tag, MPIR_Errflag_t *errflag); +int MPIR_Barrier_group(MPIR_Comm *comm_ptr, MPIR_Group *group_ptr, int tag, MPIR_Errflag_t *errflag); /* topology impl functions */ @@ -4186,7 +4186,7 @@ int MPIR_Ialltoallw_intra(const void *sendbuf, const int *sendcounts, const int int MPIR_Ialltoallw_inter(const void *sendbuf, const int *sendcounts, const int *sdispls, const MPI_Datatype *sendtypes, void *recvbuf, const int *recvcounts, const int *rdispls, const MPI_Datatype *recvtypes, MPIR_Comm *comm_ptr, MPID_Sched_t s); /* group functionality */ -int MPIR_Group_check_subset(MPID_Group * group_ptr, MPIR_Comm * comm_ptr); +int MPIR_Group_check_subset(MPIR_Group * group_ptr, MPIR_Comm * comm_ptr); /* begin impl functions for MPI_T (MPI_T_ right now) */ int MPIR_T_cvar_handle_alloc_impl(int cvar_index, void *obj_handle, MPI_T_cvar_handle *handle, int *count); @@ -4291,24 +4291,24 @@ int MPIR_Intercomm_merge_impl(MPIR_Comm *comm_ptr, int high, MPIR_Comm **new_int int MPIR_Intercomm_create_impl(MPIR_Comm *local_comm_ptr, int local_leader, MPIR_Comm *peer_comm_ptr, int remote_leader, int tag, MPIR_Comm **new_intercomm_ptr); -int MPIR_Comm_group_impl(MPIR_Comm *comm_ptr, MPID_Group **group_ptr); -int MPIR_Comm_remote_group_impl(MPIR_Comm *comm_ptr, MPID_Group **group_ptr); -int MPIR_Comm_group_failed_impl(MPIR_Comm *comm, MPID_Group **failed_group_ptr); -int MPIR_Comm_remote_group_failed_impl(MPIR_Comm *comm, MPID_Group **failed_group_ptr); +int MPIR_Comm_group_impl(MPIR_Comm *comm_ptr, MPIR_Group **group_ptr); +int MPIR_Comm_remote_group_impl(MPIR_Comm *comm_ptr, MPIR_Group **group_ptr); +int MPIR_Comm_group_failed_impl(MPIR_Comm *comm, MPIR_Group **failed_group_ptr); +int MPIR_Comm_remote_group_failed_impl(MPIR_Comm *comm, MPIR_Group **failed_group_ptr); int MPIR_Comm_split_impl(MPIR_Comm *comm_ptr, int color, int key, MPIR_Comm **newcomm_ptr); int MPIR_Comm_split_type_impl(MPIR_Comm *comm_ptr, int split_type, int key, MPID_Info *info_ptr, MPIR_Comm **newcomm_ptr); -int MPIR_Group_compare_impl(MPID_Group *group_ptr1, MPID_Group *group_ptr2, int *result); -int MPIR_Group_difference_impl(MPID_Group *group_ptr1, MPID_Group *group_ptr2, MPID_Group **new_group_ptr); -int MPIR_Group_excl_impl(MPID_Group *group_ptr, int n, const int *ranks, MPID_Group **new_group_ptr); -int MPIR_Group_free_impl(MPID_Group *group_ptr); -int MPIR_Group_incl_impl(MPID_Group *group_ptr, int n, const int *ranks, MPID_Group **new_group_ptr); -int MPIR_Group_intersection_impl(MPID_Group *group_ptr1, MPID_Group *group_ptr2, MPID_Group **new_group_ptr); -int MPIR_Group_range_excl_impl(MPID_Group *group_ptr, int n, int ranges[][3], MPID_Group **new_group_ptr); -int MPIR_Group_range_incl_impl(MPID_Group *group_ptr, int n, int ranges[][3], MPID_Group **new_group_ptr); -int MPIR_Group_translate_ranks_impl(MPID_Group *group_ptr1, int n, const int *ranks1, - MPID_Group *group_ptr2, int *ranks2); -int MPIR_Group_union_impl(MPID_Group *group_ptr1, MPID_Group *group_ptr2, MPID_Group **new_group_ptr); +int MPIR_Group_compare_impl(MPIR_Group *group_ptr1, MPIR_Group *group_ptr2, int *result); +int MPIR_Group_difference_impl(MPIR_Group *group_ptr1, MPIR_Group *group_ptr2, MPIR_Group **new_group_ptr); +int MPIR_Group_excl_impl(MPIR_Group *group_ptr, int n, const int *ranks, MPIR_Group **new_group_ptr); +int MPIR_Group_free_impl(MPIR_Group *group_ptr); +int MPIR_Group_incl_impl(MPIR_Group *group_ptr, int n, const int *ranks, MPIR_Group **new_group_ptr); +int MPIR_Group_intersection_impl(MPIR_Group *group_ptr1, MPIR_Group *group_ptr2, MPIR_Group **new_group_ptr); +int MPIR_Group_range_excl_impl(MPIR_Group *group_ptr, int n, int ranges[][3], MPIR_Group **new_group_ptr); +int MPIR_Group_range_incl_impl(MPIR_Group *group_ptr, int n, int ranges[][3], MPIR_Group **new_group_ptr); +int MPIR_Group_translate_ranks_impl(MPIR_Group *group_ptr1, int n, const int *ranks1, + MPIR_Group *group_ptr2, int *ranks2); +int MPIR_Group_union_impl(MPIR_Group *group_ptr1, MPIR_Group *group_ptr2, MPIR_Group **new_group_ptr); void MPIR_Get_count_impl(const MPI_Status *status, MPI_Datatype datatype, int *count); void MPIR_Grequest_complete_impl(MPID_Request *request_ptr); int MPIR_Grequest_start_impl(MPI_Grequest_query_function *query_fn, diff --git a/src/mpi/coll/allred_group.c b/src/mpi/coll/allred_group.c index 09d46ec..360e69f 100644 --- a/src/mpi/coll/allred_group.c +++ b/src/mpi/coll/allred_group.c @@ -9,7 +9,7 @@ int MPIR_Allreduce_group_intra(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, - MPID_Group *group_ptr, int tag, MPIR_Errflag_t *errflag); + MPIR_Group *group_ptr, int tag, MPIR_Errflag_t *errflag); /* Local utility macro: takes an two args and sets lvalue cr_ equal to the rank * in comm_ptr corresponding to rvalue gr_ */ @@ -27,7 +27,7 @@ int MPIR_Allreduce_group_intra(void *sendbuf, void *recvbuf, int count, #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Allreduce_group_intra(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, - MPID_Group *group_ptr, int tag, MPIR_Errflag_t *errflag) + MPIR_Group *group_ptr, int tag, MPIR_Errflag_t *errflag) { MPI_Aint type_size; int mpi_errno = MPI_SUCCESS; @@ -366,7 +366,7 @@ int MPIR_Allreduce_group_intra(void *sendbuf, void *recvbuf, int count, #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Allreduce_group(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, - MPID_Group *group_ptr, int tag, MPIR_Errflag_t *errflag) + MPIR_Group *group_ptr, int tag, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; diff --git a/src/mpi/coll/barrier_group.c b/src/mpi/coll/barrier_group.c index 09ce774..cd629bf 100644 --- a/src/mpi/coll/barrier_group.c +++ b/src/mpi/coll/barrier_group.c @@ -13,7 +13,7 @@ This is an intracommunicator barrier only! */ -int MPIR_Barrier_group( MPIR_Comm *comm_ptr, MPID_Group *group_ptr, int tag, MPIR_Errflag_t *errflag ) +int MPIR_Barrier_group( MPIR_Comm *comm_ptr, MPIR_Group *group_ptr, int tag, MPIR_Errflag_t *errflag ) { int src = 0; int dst, mpi_errno = MPI_SUCCESS; diff --git a/src/mpi/comm/comm_agree.c b/src/mpi/comm/comm_agree.c index 404f68a..6f1521b 100644 --- a/src/mpi/comm/comm_agree.c +++ b/src/mpi/comm/comm_agree.c @@ -34,7 +34,7 @@ int MPIX_Comm_agree(MPI_Comm comm, int *flag) __attribute__((weak,alias("PMPIX_C int MPIR_Comm_agree(MPIR_Comm *comm_ptr, int *flag) { int mpi_errno = MPI_SUCCESS, mpi_errno_tmp = MPI_SUCCESS; - MPID_Group *comm_grp, *failed_grp, *new_group_ptr, *global_failed; + MPIR_Group *comm_grp, *failed_grp, *new_group_ptr, *global_failed; int result, success = 1; MPIR_Errflag_t errflag = MPIR_ERR_NONE; int values[2]; @@ -84,11 +84,11 @@ int MPIR_Comm_agree(MPIR_Comm *comm_ptr, int *flag) * failure in between the first allreduce and the second one, it's ignored * here. */ - if (failed_grp != MPID_Group_empty) + if (failed_grp != MPIR_Group_empty) MPIR_Group_release(failed_grp); MPIR_Group_release(new_group_ptr); MPIR_Group_release(comm_grp); - if (global_failed != MPID_Group_empty) + if (global_failed != MPIR_Group_empty) MPIR_Group_release(global_failed); success = values[0]; diff --git a/src/mpi/comm/comm_compare.c b/src/mpi/comm/comm_compare.c index d77782a..05ac7a0 100644 --- a/src/mpi/comm/comm_compare.c +++ b/src/mpi/comm/comm_compare.c @@ -119,7 +119,7 @@ int MPI_Comm_compare(MPI_Comm comm1, MPI_Comm comm2, int *result) *result = MPI_IDENT; } else if (comm_ptr1->comm_kind == MPID_INTRACOMM) { - MPID_Group *group_ptr1, *group_ptr2; + MPIR_Group *group_ptr1, *group_ptr2; mpi_errno = MPIR_Comm_group_impl(comm_ptr1, &group_ptr1); if (mpi_errno) MPIR_ERR_POP(mpi_errno); @@ -139,8 +139,8 @@ int MPI_Comm_compare(MPI_Comm comm1, MPI_Comm comm2, int *result) else { /* INTER_COMM */ int lresult, rresult; - MPID_Group *group_ptr1, *group_ptr2; - MPID_Group *rgroup_ptr1, *rgroup_ptr2; + MPIR_Group *group_ptr1, *group_ptr2; + MPIR_Group *rgroup_ptr1, *rgroup_ptr2; /* Get the groups and see what their relationship is */ mpi_errno = MPIR_Comm_group_impl(comm_ptr1, &group_ptr1); diff --git a/src/mpi/comm/comm_create.c b/src/mpi/comm/comm_create.c index 18d7d96..fae94f9 100644 --- a/src/mpi/comm/comm_create.c +++ b/src/mpi/comm/comm_create.c @@ -22,7 +22,7 @@ int MPI_Comm_create(MPI_Comm comm, MPI_Group group, MPI_Comm *newcomm) __attribu /* prototypes to make the compiler happy in the case that PMPI_LOCAL expands to * nothing instead of "static" */ -PMPI_LOCAL int MPIR_Comm_create_inter(MPIR_Comm *comm_ptr, MPID_Group *group_ptr, +PMPI_LOCAL int MPIR_Comm_create_inter(MPIR_Comm *comm_ptr, MPIR_Group *group_ptr, MPIR_Comm **newcomm_ptr); /* Define MPICH_MPI_FROM_PMPI if weak symbols are not supported to build @@ -41,7 +41,7 @@ PMPI_LOCAL int MPIR_Comm_create_inter(MPIR_Comm *comm_ptr, MPID_Group *group_ptr #define FUNCNAME MPIR_Comm_create_calculate_mapping #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Comm_create_calculate_mapping(MPID_Group *group_ptr, +int MPIR_Comm_create_calculate_mapping(MPIR_Group *group_ptr, MPIR_Comm *comm_ptr, int **mapping_out, MPIR_Comm **mapping_comm) @@ -187,7 +187,7 @@ fn_fail: #define FCNAME MPL_QUOTE(FUNCNAME) /* comm create impl for intracommunicators, assumes that the standard error * checking has already taken place in the calling function */ -int MPIR_Comm_create_intra(MPIR_Comm *comm_ptr, MPID_Group *group_ptr, +int MPIR_Comm_create_intra(MPIR_Comm *comm_ptr, MPIR_Group *group_ptr, MPIR_Comm **newcomm_ptr) { int mpi_errno = MPI_SUCCESS; @@ -283,7 +283,7 @@ fn_fail: #define FCNAME MPL_QUOTE(FUNCNAME) /* comm create impl for intercommunicators, assumes that the standard error * checking has already taken place in the calling function */ -PMPI_LOCAL int MPIR_Comm_create_inter(MPIR_Comm *comm_ptr, MPID_Group *group_ptr, +PMPI_LOCAL int MPIR_Comm_create_inter(MPIR_Comm *comm_ptr, MPIR_Group *group_ptr, MPIR_Comm **newcomm_ptr) { int mpi_errno = MPI_SUCCESS; @@ -486,7 +486,7 @@ int MPI_Comm_create(MPI_Comm comm, MPI_Group group, MPI_Comm *newcomm) { int mpi_errno = MPI_SUCCESS; MPIR_Comm *comm_ptr = NULL, *newcomm_ptr; - MPID_Group *group_ptr; + MPIR_Group *group_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_CREATE); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -517,12 +517,12 @@ int MPI_Comm_create(MPI_Comm comm, MPI_Group group, MPI_Comm *newcomm) } MPID_END_ERROR_CHECKS; - MPID_Group_get_ptr( group, group_ptr ); + MPIR_Group_get_ptr( group, group_ptr ); MPID_BEGIN_ERROR_CHECKS; { /* Check the group ptr */ - MPID_Group_valid_ptr( group_ptr, mpi_errno ); + MPIR_Group_valid_ptr( group_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; } MPID_END_ERROR_CHECKS; @@ -530,7 +530,7 @@ int MPI_Comm_create(MPI_Comm comm, MPI_Group group, MPI_Comm *newcomm) # else { MPIR_Comm_get_ptr( comm, comm_ptr ); - MPID_Group_get_ptr( group, group_ptr ); + MPIR_Group_get_ptr( group, group_ptr ); } # endif diff --git a/src/mpi/comm/comm_create_group.c b/src/mpi/comm/comm_create_group.c index dc25d2d..c092d98 100644 --- a/src/mpi/comm/comm_create_group.c +++ b/src/mpi/comm/comm_create_group.c @@ -33,7 +33,7 @@ int MPI_Comm_create_group(MPI_Comm comm, MPI_Group group, int tag, MPI_Comm *new #define FCNAME MPL_QUOTE(FUNCNAME) /* comm create group impl; assumes that the standard error checking * has already taken place in the calling function */ -int MPIR_Comm_create_group(MPIR_Comm * comm_ptr, MPID_Group * group_ptr, int tag, +int MPIR_Comm_create_group(MPIR_Comm * comm_ptr, MPIR_Group * group_ptr, int tag, MPIR_Comm ** newcomm_ptr) { int mpi_errno = MPI_SUCCESS; @@ -153,7 +153,7 @@ int MPI_Comm_create_group(MPI_Comm comm, MPI_Group group, int tag, MPI_Comm * ne { int mpi_errno = MPI_SUCCESS; MPIR_Comm *comm_ptr = NULL, *newcomm_ptr; - MPID_Group *group_ptr; + MPIR_Group *group_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_CREATE_GROUP); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -187,12 +187,12 @@ int MPI_Comm_create_group(MPI_Comm comm, MPI_Group group, int tag, MPI_Comm * ne } MPID_END_ERROR_CHECKS; - MPID_Group_get_ptr( group, group_ptr ); + MPIR_Group_get_ptr( group, group_ptr ); MPID_BEGIN_ERROR_CHECKS; { /* Check the group ptr */ - MPID_Group_valid_ptr( group_ptr, mpi_errno ); + MPIR_Group_valid_ptr( group_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; } MPID_END_ERROR_CHECKS; @@ -200,7 +200,7 @@ int MPI_Comm_create_group(MPI_Comm comm, MPI_Group group, int tag, MPI_Comm * ne # else { MPIR_Comm_get_ptr( comm, comm_ptr ); - MPID_Group_get_ptr( group, group_ptr ); + MPIR_Group_get_ptr( group, group_ptr ); } # endif diff --git a/src/mpi/comm/comm_failure_get_acked.c b/src/mpi/comm/comm_failure_get_acked.c index dc4956b..0277768 100644 --- a/src/mpi/comm/comm_failure_get_acked.c +++ b/src/mpi/comm/comm_failure_get_acked.c @@ -57,7 +57,7 @@ int MPIX_Comm_failure_get_acked( MPI_Comm comm, MPI_Group *failedgrp ) { int mpi_errno = MPI_SUCCESS; MPIR_Comm *comm_ptr = NULL; - MPID_Group *group_ptr; + MPIR_Group *group_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPIX_COMM_FAILURE_GET_ACKED); MPIR_ERRTEST_INITIALIZED_ORDIE(); diff --git a/src/mpi/comm/comm_group.c b/src/mpi/comm/comm_group.c index 2357458..4af1e6d 100644 --- a/src/mpi/comm/comm_group.c +++ b/src/mpi/comm/comm_group.c @@ -30,7 +30,7 @@ int MPI_Comm_group(MPI_Comm comm, MPI_Group *group) __attribute__((weak,alias("P #define FUNCNAME MPIR_Comm_group_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Comm_group_impl(MPIR_Comm *comm_ptr, MPID_Group **group_ptr) +int MPIR_Comm_group_impl(MPIR_Comm *comm_ptr, MPIR_Group **group_ptr) { int mpi_errno = MPI_SUCCESS; int i, lpid, n; @@ -110,7 +110,7 @@ int MPI_Comm_group(MPI_Comm comm, MPI_Group *group) { int mpi_errno = MPI_SUCCESS; MPIR_Comm *comm_ptr = NULL; - MPID_Group *group_ptr; + MPIR_Group *group_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_GROUP); MPIR_ERRTEST_INITIALIZED_ORDIE(); diff --git a/src/mpi/comm/comm_remote_group.c b/src/mpi/comm/comm_remote_group.c index 63c36d7..ba69093 100644 --- a/src/mpi/comm/comm_remote_group.c +++ b/src/mpi/comm/comm_remote_group.c @@ -30,7 +30,7 @@ int MPI_Comm_remote_group(MPI_Comm comm, MPI_Group *group) __attribute__((weak,a #define FUNCNAME MPIR_Comm_remote_group_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Comm_remote_group_impl(MPIR_Comm *comm_ptr, MPID_Group **group_ptr) +int MPIR_Comm_remote_group_impl(MPIR_Comm *comm_ptr, MPIR_Group **group_ptr) { int mpi_errno = MPI_SUCCESS; int i, lpid, n; @@ -100,7 +100,7 @@ int MPI_Comm_remote_group(MPI_Comm comm, MPI_Group *group) { int mpi_errno = MPI_SUCCESS; MPIR_Comm *comm_ptr = NULL; - MPID_Group *group_ptr; + MPIR_Group *group_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_REMOTE_GROUP); MPIR_ERRTEST_INITIALIZED_ORDIE(); diff --git a/src/mpi/comm/comm_shrink.c b/src/mpi/comm/comm_shrink.c index 2d8fb52..f327937 100644 --- a/src/mpi/comm/comm_shrink.c +++ b/src/mpi/comm/comm_shrink.c @@ -50,7 +50,7 @@ int MPIX_Comm_shrink(MPI_Comm comm, MPI_Comm *newcomm) __attribute__((weak,alias int MPIR_Comm_shrink(MPIR_Comm *comm_ptr, MPIR_Comm **newcomm_ptr) { int mpi_errno = MPI_SUCCESS; - MPID_Group *global_failed, *comm_grp, *new_group_ptr; + MPIR_Group *global_failed, *comm_grp, *new_group_ptr; int attempts = 0; MPIR_Errflag_t errflag = MPIR_ERR_NONE; @@ -69,7 +69,7 @@ int MPIR_Comm_shrink(MPIR_Comm *comm_ptr, MPIR_Comm **newcomm_ptr) mpi_errno = MPIR_Group_difference_impl(comm_grp, global_failed, &new_group_ptr); if (mpi_errno) MPIR_ERR_POP(mpi_errno); - if (MPID_Group_empty != global_failed) MPIR_Group_release(global_failed); + if (MPIR_Group_empty != global_failed) MPIR_Group_release(global_failed); mpi_errno = MPIR_Comm_create_group(comm_ptr, new_group_ptr, MPIR_SHRINK_TAG, newcomm_ptr); if (*newcomm_ptr == NULL) { diff --git a/src/mpi/comm/contextid.c b/src/mpi/comm/contextid.c index b87ef92..2a53918 100644 --- a/src/mpi/comm/contextid.c +++ b/src/mpi/comm/contextid.c @@ -372,7 +372,7 @@ static int add_gcn_to_list(struct gcn_state *new_state) #define FUNCNAME MPIR_Get_contextid_sparse_group #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Get_contextid_sparse_group(MPIR_Comm * comm_ptr, MPID_Group * group_ptr, int tag, +int MPIR_Get_contextid_sparse_group(MPIR_Comm * comm_ptr, MPIR_Group * group_ptr, int tag, MPIU_Context_id_t * context_id, int ignore_id) { int mpi_errno = MPI_SUCCESS; diff --git a/src/mpi/group/group.h b/src/mpi/group/group.h index 713d512..f0ede34 100644 --- a/src/mpi/group/group.h +++ b/src/mpi/group/group.h @@ -6,8 +6,8 @@ /* MPIR_Group_create is needed by some of the routines that return groups from communicators, so it is in mpidimpl.h */ -void MPIR_Group_setup_lpid_list( MPID_Group * ); -int MPIR_Group_check_valid_ranks( MPID_Group *, const int [], int ); -int MPIR_Group_check_valid_ranges( MPID_Group *, int [][3], int ); -void MPIR_Group_setup_lpid_pairs( MPID_Group *, MPID_Group * ); +void MPIR_Group_setup_lpid_list( MPIR_Group * ); +int MPIR_Group_check_valid_ranks( MPIR_Group *, const int [], int ); +int MPIR_Group_check_valid_ranges( MPIR_Group *, int [][3], int ); +void MPIR_Group_setup_lpid_pairs( MPIR_Group *, MPIR_Group * ); diff --git a/src/mpi/group/group_compare.c b/src/mpi/group/group_compare.c index 832c5ea..3a7a718 100644 --- a/src/mpi/group/group_compare.c +++ b/src/mpi/group/group_compare.c @@ -26,7 +26,7 @@ int MPI_Group_compare(MPI_Group group1, MPI_Group group2, int *result) __attribu #undef MPI_Group_compare #define MPI_Group_compare PMPI_Group_compare -int MPIR_Group_compare_impl(MPID_Group *group_ptr1, MPID_Group *group_ptr2, int *result) +int MPIR_Group_compare_impl(MPIR_Group *group_ptr1, MPIR_Group *group_ptr2, int *result) { int mpi_errno = MPI_SUCCESS; int g1_idx, g2_idx, size, i; @@ -110,8 +110,8 @@ and 'MPI_UNEQUAL' otherwise int MPI_Group_compare(MPI_Group group1, MPI_Group group2, int *result) { int mpi_errno = MPI_SUCCESS; - MPID_Group *group_ptr1 = NULL; - MPID_Group *group_ptr2 = NULL; + MPIR_Group *group_ptr1 = NULL; + MPIR_Group *group_ptr2 = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_GROUP_COMPARE); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -136,8 +136,8 @@ int MPI_Group_compare(MPI_Group group1, MPI_Group group2, int *result) # endif /* Convert MPI object handles to object pointers */ - MPID_Group_get_ptr( group1, group_ptr1 ); - MPID_Group_get_ptr( group2, group_ptr2 ); + MPIR_Group_get_ptr( group1, group_ptr1 ); + MPIR_Group_get_ptr( group2, group_ptr2 ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -145,8 +145,8 @@ int MPI_Group_compare(MPI_Group group1, MPI_Group group2, int *result) MPID_BEGIN_ERROR_CHECKS; { /* Validate group_ptr */ - MPID_Group_valid_ptr( group_ptr1, mpi_errno ); - MPID_Group_valid_ptr( group_ptr2, mpi_errno ); + MPIR_Group_valid_ptr( group_ptr1, mpi_errno ); + MPIR_Group_valid_ptr( group_ptr2, mpi_errno ); /* If group_ptr is not valid, it will be reset to null */ if (mpi_errno) goto fn_fail; } diff --git a/src/mpi/group/group_difference.c b/src/mpi/group/group_difference.c index c733a97..446e93e 100644 --- a/src/mpi/group/group_difference.c +++ b/src/mpi/group/group_difference.c @@ -30,7 +30,7 @@ int MPI_Group_difference(MPI_Group group1, MPI_Group group2, MPI_Group *newgroup #define FUNCNAME MPIR_Group_difference_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Group_difference_impl(MPID_Group *group_ptr1, MPID_Group *group_ptr2, MPID_Group **new_group_ptr) +int MPIR_Group_difference_impl(MPIR_Group *group_ptr1, MPIR_Group *group_ptr2, MPIR_Group **new_group_ptr) { int mpi_errno = MPI_SUCCESS; int size1, i, k, g1_idx, g2_idx, l1_pid, l2_pid, nnew; @@ -72,7 +72,7 @@ int MPIR_Group_difference_impl(MPID_Group *group_ptr1, MPID_Group *group_ptr2, M /* See 5.3.2, Group Constructors. For many group routines, the standard explicitly says to return MPI_GROUP_EMPTY; for others it is implied */ - *new_group_ptr = MPID_Group_empty; + *new_group_ptr = MPIR_Group_empty; goto fn_exit; } else { @@ -139,9 +139,9 @@ The generated group containc the members of 'group1' that are not in 'group2'. int MPI_Group_difference(MPI_Group group1, MPI_Group group2, MPI_Group *newgroup) { int mpi_errno = MPI_SUCCESS; - MPID_Group *group_ptr1 = NULL; - MPID_Group *group_ptr2 = NULL; - MPID_Group *new_group_ptr; + MPIR_Group *group_ptr1 = NULL; + MPIR_Group *group_ptr2 = NULL; + MPIR_Group *new_group_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPI_GROUP_DIFFERENCE); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -162,8 +162,8 @@ int MPI_Group_difference(MPI_Group group1, MPI_Group group2, MPI_Group *newgroup # endif /* Convert MPI object handles to object pointers */ - MPID_Group_get_ptr( group1, group_ptr1 ); - MPID_Group_get_ptr( group2, group_ptr2 ); + MPIR_Group_get_ptr( group1, group_ptr1 ); + MPIR_Group_get_ptr( group2, group_ptr2 ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -171,8 +171,8 @@ int MPI_Group_difference(MPI_Group group1, MPI_Group group2, MPI_Group *newgroup MPID_BEGIN_ERROR_CHECKS; { /* Validate group_ptr */ - MPID_Group_valid_ptr( group_ptr1, mpi_errno ); - MPID_Group_valid_ptr( group_ptr2, mpi_errno ); + MPIR_Group_valid_ptr( group_ptr1, mpi_errno ); + MPIR_Group_valid_ptr( group_ptr2, mpi_errno ); /* If either group_ptr is not valid, it will be reset to null */ if (mpi_errno) goto fn_fail; } diff --git a/src/mpi/group/group_excl.c b/src/mpi/group/group_excl.c index 138c3bf..321d773 100644 --- a/src/mpi/group/group_excl.c +++ b/src/mpi/group/group_excl.c @@ -30,7 +30,7 @@ int MPI_Group_excl(MPI_Group group, int n, const int ranks[], MPI_Group *newgrou #define FUNCNAME MPIR_Group_excl_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Group_excl_impl(MPID_Group *group_ptr, int n, const int ranks[], MPID_Group **new_group_ptr) +int MPIR_Group_excl_impl(MPIR_Group *group_ptr, int n, const int ranks[], MPIR_Group **new_group_ptr) { int mpi_errno = MPI_SUCCESS; int size, i, newi; @@ -118,7 +118,7 @@ function is erroneous. int MPI_Group_excl(MPI_Group group, int n, const int ranks[], MPI_Group *newgroup) { int mpi_errno = MPI_SUCCESS; - MPID_Group *group_ptr = NULL, *new_group_ptr; + MPIR_Group *group_ptr = NULL, *new_group_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPI_GROUP_EXCL); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -138,14 +138,14 @@ int MPI_Group_excl(MPI_Group group, int n, const int ranks[], MPI_Group *newgrou # endif /* Convert MPI object handles to object pointers */ - MPID_Group_get_ptr( group, group_ptr ); + MPIR_Group_get_ptr( group, group_ptr ); # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS; { /* Validate group_ptr */ - MPID_Group_valid_ptr( group_ptr, mpi_errno ); + MPIR_Group_valid_ptr( group_ptr, mpi_errno ); /* If group_ptr is not valid, it will be reset to null */ if (group_ptr) { mpi_errno = MPIR_Group_check_valid_ranks( group_ptr, diff --git a/src/mpi/group/group_free.c b/src/mpi/group/group_free.c index a036cae..102f6ef 100644 --- a/src/mpi/group/group_free.c +++ b/src/mpi/group/group_free.c @@ -29,7 +29,7 @@ int MPI_Group_free(MPI_Group *group) __attribute__((weak,alias("PMPI_Group_free" #define FUNCNAME MPIR_Group_free_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Group_free_impl(MPID_Group *group_ptr) +int MPIR_Group_free_impl(MPIR_Group *group_ptr) { int mpi_errno = MPI_SUCCESS; @@ -73,7 +73,7 @@ On output, group is set to 'MPI_GROUP_NULL'. int MPI_Group_free(MPI_Group *group) { int mpi_errno = MPI_SUCCESS; - MPID_Group *group_ptr = NULL; + MPIR_Group *group_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_GROUP_FREE); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -93,7 +93,7 @@ int MPI_Group_free(MPI_Group *group) # endif /* Convert MPI object handles to object pointers */ - MPID_Group_get_ptr( *group, group_ptr ); + MPIR_Group_get_ptr( *group, group_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -101,7 +101,7 @@ int MPI_Group_free(MPI_Group *group) MPID_BEGIN_ERROR_CHECKS; { /* Validate group_ptr */ - MPID_Group_valid_ptr( group_ptr, mpi_errno ); + MPIR_Group_valid_ptr( group_ptr, mpi_errno ); /* If group_ptr is not valid, it will be reset to null */ /* Cannot free the predefined groups, but allow GROUP_EMPTY diff --git a/src/mpi/group/group_incl.c b/src/mpi/group/group_incl.c index 2a66e9e..5194dae 100644 --- a/src/mpi/group/group_incl.c +++ b/src/mpi/group/group_incl.c @@ -30,7 +30,7 @@ int MPI_Group_incl(MPI_Group group, int n, const int ranks[], MPI_Group *newgrou #define FUNCNAME MPIR_Group_incl_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Group_incl_impl(MPID_Group *group_ptr, int n, const int ranks[], MPID_Group **new_group_ptr) +int MPIR_Group_incl_impl(MPIR_Group *group_ptr, int n, const int ranks[], MPIR_Group **new_group_ptr) { int mpi_errno = MPI_SUCCESS; int i; @@ -39,7 +39,7 @@ int MPIR_Group_incl_impl(MPID_Group *group_ptr, int n, const int ranks[], MPID_G MPID_MPI_FUNC_ENTER(MPID_STATE_MPIR_GROUP_INCL_IMPL); if (n == 0) { - *new_group_ptr = MPID_Group_empty; + *new_group_ptr = MPIR_Group_empty; goto fn_exit; } @@ -104,7 +104,7 @@ Output Parameters: int MPI_Group_incl(MPI_Group group, int n, const int ranks[], MPI_Group *newgroup) { int mpi_errno = MPI_SUCCESS; - MPID_Group *group_ptr = NULL, *new_group_ptr = NULL; + MPIR_Group *group_ptr = NULL, *new_group_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_GROUP_INCL); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -125,7 +125,7 @@ int MPI_Group_incl(MPI_Group group, int n, const int ranks[], MPI_Group *newgrou # endif /* Convert MPI object handles to object pointers */ - MPID_Group_get_ptr( group, group_ptr ); + MPIR_Group_get_ptr( group, group_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -133,7 +133,7 @@ int MPI_Group_incl(MPI_Group group, int n, const int ranks[], MPI_Group *newgrou MPID_BEGIN_ERROR_CHECKS; { /* Validate group_ptr */ - MPID_Group_valid_ptr( group_ptr, mpi_errno ); + MPIR_Group_valid_ptr( group_ptr, mpi_errno ); /* If group_ptr is not valid, it will be reset to null */ if (group_ptr) { mpi_errno = MPIR_Group_check_valid_ranks( group_ptr, diff --git a/src/mpi/group/group_intersection.c b/src/mpi/group/group_intersection.c index 9e7c83a..4a938a7 100644 --- a/src/mpi/group/group_intersection.c +++ b/src/mpi/group/group_intersection.c @@ -30,7 +30,7 @@ int MPI_Group_intersection(MPI_Group group1, MPI_Group group2, MPI_Group *newgro #define FUNCNAME MPIR_Group_intersection_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Group_intersection_impl(MPID_Group *group_ptr1, MPID_Group *group_ptr2, MPID_Group **new_group_ptr) +int MPIR_Group_intersection_impl(MPIR_Group *group_ptr1, MPIR_Group *group_ptr2, MPIR_Group **new_group_ptr) { int mpi_errno = MPI_SUCCESS; int size1, i, k, g1_idx, g2_idx, l1_pid, l2_pid, nnew; @@ -69,7 +69,7 @@ int MPIR_Group_intersection_impl(MPID_Group *group_ptr1, MPID_Group *group_ptr2, } /* Create the group. Handle the trivial case first */ if (nnew == 0) { - *new_group_ptr = MPID_Group_empty; + *new_group_ptr = MPIR_Group_empty; goto fn_exit; } @@ -139,9 +139,9 @@ The output group contains those processes that are in both 'group1' and int MPI_Group_intersection(MPI_Group group1, MPI_Group group2, MPI_Group *newgroup) { int mpi_errno = MPI_SUCCESS; - MPID_Group *group_ptr1 = NULL; - MPID_Group *group_ptr2 = NULL; - MPID_Group *new_group_ptr; + MPIR_Group *group_ptr1 = NULL; + MPIR_Group *group_ptr2 = NULL; + MPIR_Group *new_group_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPI_GROUP_INTERSECTION); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -162,8 +162,8 @@ int MPI_Group_intersection(MPI_Group group1, MPI_Group group2, MPI_Group *newgro # endif /* Convert MPI object handles to object pointers */ - MPID_Group_get_ptr( group1, group_ptr1 ); - MPID_Group_get_ptr( group2, group_ptr2 ); + MPIR_Group_get_ptr( group1, group_ptr1 ); + MPIR_Group_get_ptr( group2, group_ptr2 ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -171,8 +171,8 @@ int MPI_Group_intersection(MPI_Group group1, MPI_Group group2, MPI_Group *newgro MPID_BEGIN_ERROR_CHECKS; { /* Validate group_ptr */ - MPID_Group_valid_ptr( group_ptr1, mpi_errno ); - MPID_Group_valid_ptr( group_ptr2, mpi_errno ); + MPIR_Group_valid_ptr( group_ptr1, mpi_errno ); + MPIR_Group_valid_ptr( group_ptr2, mpi_errno ); /* If either group_ptr is not valid, it will be reset to null */ if (mpi_errno) goto fn_fail; } diff --git a/src/mpi/group/group_range_excl.c b/src/mpi/group/group_range_excl.c index 3da0828..8337836 100644 --- a/src/mpi/group/group_range_excl.c +++ b/src/mpi/group/group_range_excl.c @@ -29,7 +29,7 @@ int MPI_Group_range_excl(MPI_Group group, int n, int ranges[][3], MPI_Group *new #define FUNCNAME MPIR_Group_range_excl_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Group_range_excl_impl(MPID_Group *group_ptr, int n, int ranges[][3], MPID_Group **new_group_ptr) +int MPIR_Group_range_excl_impl(MPIR_Group *group_ptr, int n, int ranges[][3], MPIR_Group **new_group_ptr) { int mpi_errno = MPI_SUCCESS; int size, i, j, k, nnew, first, last, stride; @@ -48,7 +48,7 @@ int MPIR_Group_range_excl_impl(MPID_Group *group_ptr, int n, int ranges[][3], MP nnew = size - nnew; if (nnew == 0) { - *new_group_ptr = MPID_Group_empty; + *new_group_ptr = MPIR_Group_empty; goto fn_exit; } @@ -154,7 +154,7 @@ int MPI_Group_range_excl(MPI_Group group, int n, int ranges[][3], MPI_Group *newgroup) { int mpi_errno = MPI_SUCCESS; - MPID_Group *group_ptr = NULL, *new_group_ptr; + MPIR_Group *group_ptr = NULL, *new_group_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPI_GROUP_RANGE_EXCL); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -174,7 +174,7 @@ int MPI_Group_range_excl(MPI_Group group, int n, int ranges[][3], # endif /* Convert MPI object handles to object pointers */ - MPID_Group_get_ptr( group, group_ptr ); + MPIR_Group_get_ptr( group, group_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -182,7 +182,7 @@ int MPI_Group_range_excl(MPI_Group group, int n, int ranges[][3], MPID_BEGIN_ERROR_CHECKS; { /* Validate group_ptr */ - MPID_Group_valid_ptr( group_ptr, mpi_errno ); + MPIR_Group_valid_ptr( group_ptr, mpi_errno ); /* If group_ptr is not valid, it will be reset to null */ /* Check the exclusion array. Ensure that all ranges are diff --git a/src/mpi/group/group_range_incl.c b/src/mpi/group/group_range_incl.c index 9182aaf..99b2d9d 100644 --- a/src/mpi/group/group_range_incl.c +++ b/src/mpi/group/group_range_incl.c @@ -30,7 +30,7 @@ int MPI_Group_range_incl(MPI_Group group, int n, int ranges[][3], MPI_Group *new #define FUNCNAME MPIR_Group_range_incl_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Group_range_incl_impl(MPID_Group *group_ptr, int n, int ranges[][3], MPID_Group **new_group_ptr) +int MPIR_Group_range_incl_impl(MPIR_Group *group_ptr, int n, int ranges[][3], MPIR_Group **new_group_ptr) { int mpi_errno = MPI_SUCCESS; int first, last, stride, nnew, i, j, k; @@ -48,7 +48,7 @@ int MPIR_Group_range_incl_impl(MPID_Group *group_ptr, int n, int ranges[][3], MP } if (nnew == 0) { - *new_group_ptr = MPID_Group_empty; + *new_group_ptr = MPIR_Group_empty; goto fn_exit; } @@ -133,7 +133,7 @@ int MPI_Group_range_incl(MPI_Group group, int n, int ranges[][3], MPI_Group *newgroup) { int mpi_errno = MPI_SUCCESS; - MPID_Group *group_ptr = NULL, *new_group_ptr; + MPIR_Group *group_ptr = NULL, *new_group_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPI_GROUP_RANGE_INCL); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -153,7 +153,7 @@ int MPI_Group_range_incl(MPI_Group group, int n, int ranges[][3], # endif /* Convert MPI object handles to object pointers */ - MPID_Group_get_ptr( group, group_ptr ); + MPIR_Group_get_ptr( group, group_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -161,7 +161,7 @@ int MPI_Group_range_incl(MPI_Group group, int n, int ranges[][3], MPID_BEGIN_ERROR_CHECKS; { /* Validate group_ptr */ - MPID_Group_valid_ptr( group_ptr, mpi_errno ); + MPIR_Group_valid_ptr( group_ptr, mpi_errno ); /* If group_ptr is not value, it will be reset to null */ if (group_ptr) { mpi_errno = MPIR_Group_check_valid_ranges( group_ptr, diff --git a/src/mpi/group/group_rank.c b/src/mpi/group/group_rank.c index 6d6c2ef..2f4371f 100644 --- a/src/mpi/group/group_rank.c +++ b/src/mpi/group/group_rank.c @@ -55,7 +55,7 @@ process is not a member (integer) int MPI_Group_rank(MPI_Group group, int *rank) { int mpi_errno = MPI_SUCCESS; - MPID_Group *group_ptr = NULL; + MPIR_Group *group_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_GROUP_RANK); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -74,7 +74,7 @@ int MPI_Group_rank(MPI_Group group, int *rank) # endif /* Convert MPI object handles to object pointers */ - MPID_Group_get_ptr( group, group_ptr ); + MPIR_Group_get_ptr( group, group_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -82,7 +82,7 @@ int MPI_Group_rank(MPI_Group group, int *rank) MPID_BEGIN_ERROR_CHECKS; { /* Validate group_ptr */ - MPID_Group_valid_ptr( group_ptr, mpi_errno ); + MPIR_Group_valid_ptr( group_ptr, mpi_errno ); /* If group_ptr is not value, it will be reset to null */ if (mpi_errno) goto fn_fail; } diff --git a/src/mpi/group/group_size.c b/src/mpi/group/group_size.c index eddb427..ea55b9c 100644 --- a/src/mpi/group/group_size.c +++ b/src/mpi/group/group_size.c @@ -54,7 +54,7 @@ Output Parameters: int MPI_Group_size(MPI_Group group, int *size) { int mpi_errno = MPI_SUCCESS; - MPID_Group *group_ptr = NULL; + MPIR_Group *group_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_GROUP_SIZE); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -73,7 +73,7 @@ int MPI_Group_size(MPI_Group group, int *size) # endif /* Convert MPI object handles to object pointers */ - MPID_Group_get_ptr( group, group_ptr ); + MPIR_Group_get_ptr( group, group_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -81,7 +81,7 @@ int MPI_Group_size(MPI_Group group, int *size) MPID_BEGIN_ERROR_CHECKS; { /* Validate group_ptr */ - MPID_Group_valid_ptr( group_ptr, mpi_errno ); + MPIR_Group_valid_ptr( group_ptr, mpi_errno ); /* If group_ptr is not value, it will be reset to null */ if (mpi_errno) goto fn_fail; } diff --git a/src/mpi/group/group_translate_ranks.c b/src/mpi/group/group_translate_ranks.c index a0ac503..8ff8ea6 100644 --- a/src/mpi/group/group_translate_ranks.c +++ b/src/mpi/group/group_translate_ranks.c @@ -31,8 +31,8 @@ int MPI_Group_translate_ranks(MPI_Group group1, int n, const int ranks1[], MPI_G #define FUNCNAME MPIR_Group_translate_ranks_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Group_translate_ranks_impl(MPID_Group *gp1, int n, const int ranks1[], - MPID_Group *gp2, int ranks2[]) +int MPIR_Group_translate_ranks_impl(MPIR_Group *gp1, int n, const int ranks1[], + MPIR_Group *gp2, int ranks2[]) { int mpi_errno = MPI_SUCCESS; int i, g2_idx, l1_pid, l2_pid; @@ -141,8 +141,8 @@ int MPI_Group_translate_ranks(MPI_Group group1, int n, const int ranks1[], MPI_Group group2, int ranks2[]) { int mpi_errno = MPI_SUCCESS; - MPID_Group *group_ptr1 = NULL; - MPID_Group *group_ptr2 = NULL; + MPIR_Group *group_ptr1 = NULL; + MPIR_Group *group_ptr2 = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_GROUP_TRANSLATE_RANKS); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -166,8 +166,8 @@ int MPI_Group_translate_ranks(MPI_Group group1, int n, const int ranks1[], # endif /* Convert MPI object handles to object pointers */ - MPID_Group_get_ptr( group1, group_ptr1 ); - MPID_Group_get_ptr( group2, group_ptr2 ); + MPIR_Group_get_ptr( group1, group_ptr1 ); + MPIR_Group_get_ptr( group2, group_ptr2 ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -175,8 +175,8 @@ int MPI_Group_translate_ranks(MPI_Group group1, int n, const int ranks1[], MPID_BEGIN_ERROR_CHECKS; { /* Validate group_ptr */ - MPID_Group_valid_ptr( group_ptr1, mpi_errno ); - MPID_Group_valid_ptr( group_ptr2, mpi_errno ); + MPIR_Group_valid_ptr( group_ptr1, mpi_errno ); + MPIR_Group_valid_ptr( group_ptr2, mpi_errno ); /* If either group_ptr is not valid, it will be reset to null */ MPIR_ERRTEST_ARGNEG(n,"n",mpi_errno); diff --git a/src/mpi/group/group_union.c b/src/mpi/group/group_union.c index cf548c2..49f7da0 100644 --- a/src/mpi/group/group_union.c +++ b/src/mpi/group/group_union.c @@ -30,7 +30,7 @@ int MPI_Group_union(MPI_Group group1, MPI_Group group2, MPI_Group *newgroup) __a #define FUNCNAME MPIR_Group_union_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Group_union_impl(MPID_Group *group_ptr1, MPID_Group *group_ptr2, MPID_Group **new_group_ptr) +int MPIR_Group_union_impl(MPIR_Group *group_ptr1, MPIR_Group *group_ptr2, MPIR_Group **new_group_ptr) { int mpi_errno = MPI_SUCCESS; int g1_idx, g2_idx, nnew, i, k, size1, size2, mylpid; @@ -90,7 +90,7 @@ int MPIR_Group_union_impl(MPID_Group *group_ptr1, MPID_Group *group_ptr2, MPID_G } if (nnew == 0) { - *new_group_ptr = MPID_Group_empty; + *new_group_ptr = MPIR_Group_empty; goto fn_exit; } @@ -172,9 +172,9 @@ Output Parameters: int MPI_Group_union(MPI_Group group1, MPI_Group group2, MPI_Group *newgroup) { int mpi_errno = MPI_SUCCESS; - MPID_Group *group_ptr1 = NULL; - MPID_Group *group_ptr2 = NULL; - MPID_Group *new_group_ptr; + MPIR_Group *group_ptr1 = NULL; + MPIR_Group *group_ptr2 = NULL; + MPIR_Group *new_group_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPI_GROUP_UNION); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -195,8 +195,8 @@ int MPI_Group_union(MPI_Group group1, MPI_Group group2, MPI_Group *newgroup) # endif /* Convert MPI object handles to object pointers */ - MPID_Group_get_ptr( group1, group_ptr1 ); - MPID_Group_get_ptr( group2, group_ptr2 ); + MPIR_Group_get_ptr( group1, group_ptr1 ); + MPIR_Group_get_ptr( group2, group_ptr2 ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -204,8 +204,8 @@ int MPI_Group_union(MPI_Group group1, MPI_Group group2, MPI_Group *newgroup) MPID_BEGIN_ERROR_CHECKS; { /* Validate group_ptr */ - MPID_Group_valid_ptr( group_ptr1, mpi_errno ); - MPID_Group_valid_ptr( group_ptr2, mpi_errno ); + MPIR_Group_valid_ptr( group_ptr1, mpi_errno ); + MPIR_Group_valid_ptr( group_ptr2, mpi_errno ); /* If group_ptr is not valid, it will be reset to null */ if (mpi_errno) goto fn_fail; } diff --git a/src/mpi/group/groupdebug.c b/src/mpi/group/groupdebug.c index 3284e57..61ee628 100644 --- a/src/mpi/group/groupdebug.c +++ b/src/mpi/group/groupdebug.c @@ -20,16 +20,16 @@ void MPITEST_Group_print( MPI_Group ); /* --BEGIN DEBUG-- */ void MPITEST_Group_create( int nproc, int myrank, MPI_Group *new_group ) { - MPID_Group *new_group_ptr; + MPIR_Group *new_group_ptr; int i; - new_group_ptr = (MPID_Group *)MPIU_Handle_obj_alloc( &MPID_Group_mem ); + new_group_ptr = (MPIR_Group *)MPIU_Handle_obj_alloc( &MPIR_Group_mem ); if (!new_group_ptr) { fprintf( stderr, "Could not create a new group\n" ); PMPI_Abort( MPI_COMM_WORLD, 1 ); } MPIU_Object_set_ref( new_group_ptr, 1 ); - new_group_ptr->lrank_to_lpid = (MPID_Group_pmap_t *)MPL_malloc( nproc * sizeof(MPID_Group_pmap_t) ); + new_group_ptr->lrank_to_lpid = (MPIR_Group_pmap_t *)MPL_malloc( nproc * sizeof(MPIR_Group_pmap_t) ); if (!new_group_ptr->lrank_to_lpid) { fprintf( stderr, "Could not create lrank map for new group\n" ); PMPI_Abort( MPI_COMM_WORLD, 1 ); @@ -49,10 +49,10 @@ void MPITEST_Group_create( int nproc, int myrank, MPI_Group *new_group ) void MPITEST_Group_print( MPI_Group g ) { - MPID_Group *g_ptr; + MPIR_Group *g_ptr; int g_idx, size, i; - MPID_Group_get_ptr( g, g_ptr ); + MPIR_Group_get_ptr( g, g_ptr ); g_idx = g_ptr->idx_of_first_lpid; if (g_idx < 0) { diff --git a/src/mpi/group/grouputil.c b/src/mpi/group/grouputil.c index 4a7e3b6..591756e 100644 --- a/src/mpi/group/grouputil.c +++ b/src/mpi/group/grouputil.c @@ -12,13 +12,13 @@ #endif /* Preallocated group objects */ -MPID_Group MPID_Group_builtin[MPID_GROUP_N_BUILTIN] = { {0} }; -MPID_Group MPID_Group_direct[MPID_GROUP_PREALLOC] = { {0} }; -MPIU_Object_alloc_t MPID_Group_mem = { 0, 0, 0, 0, MPID_GROUP, - sizeof(MPID_Group), MPID_Group_direct, +MPIR_Group MPIR_Group_builtin[MPID_GROUP_N_BUILTIN] = { {0} }; +MPIR_Group MPIR_Group_direct[MPID_GROUP_PREALLOC] = { {0} }; +MPIU_Object_alloc_t MPIR_Group_mem = { 0, 0, 0, 0, MPID_GROUP, + sizeof(MPIR_Group), MPIR_Group_direct, MPID_GROUP_PREALLOC}; -MPID_Group * const MPID_Group_empty = &MPID_Group_builtin[0]; +MPIR_Group * const MPIR_Group_empty = &MPIR_Group_builtin[0]; int MPIR_Group_init(void) { @@ -26,19 +26,19 @@ int MPIR_Group_init(void) MPIU_Assert(MPID_GROUP_N_BUILTIN == 1); /* update this func if this ever triggers */ - MPID_Group_builtin[0].handle = MPI_GROUP_EMPTY; - MPIU_Object_set_ref(&MPID_Group_builtin[0], 1); - MPID_Group_builtin[0].size = 0; - MPID_Group_builtin[0].rank = MPI_UNDEFINED; - MPID_Group_builtin[0].idx_of_first_lpid = -1; - MPID_Group_builtin[0].lrank_to_lpid = NULL; + MPIR_Group_builtin[0].handle = MPI_GROUP_EMPTY; + MPIU_Object_set_ref(&MPIR_Group_builtin[0], 1); + MPIR_Group_builtin[0].size = 0; + MPIR_Group_builtin[0].rank = MPI_UNDEFINED; + MPIR_Group_builtin[0].idx_of_first_lpid = -1; + MPIR_Group_builtin[0].lrank_to_lpid = NULL; /* TODO hook for device here? */ return mpi_errno; } -int MPIR_Group_release(MPID_Group *group_ptr) +int MPIR_Group_release(MPIR_Group *group_ptr) { int mpi_errno = MPI_SUCCESS; int inuse; @@ -47,7 +47,7 @@ int MPIR_Group_release(MPID_Group *group_ptr) if (!inuse) { /* Only if refcount is 0 do we actually free. */ MPL_free(group_ptr->lrank_to_lpid); - MPIU_Handle_obj_free( &MPID_Group_mem, group_ptr ); + MPIU_Handle_obj_free( &MPIR_Group_mem, group_ptr ); } return mpi_errno; } @@ -58,11 +58,11 @@ int MPIR_Group_release(MPID_Group *group_ptr) * initialize any arrays, but does set the reference count. */ #define FCNAME "MPIR_Group_create" -int MPIR_Group_create( int nproc, MPID_Group **new_group_ptr ) +int MPIR_Group_create( int nproc, MPIR_Group **new_group_ptr ) { int mpi_errno = MPI_SUCCESS; - *new_group_ptr = (MPID_Group *)MPIU_Handle_obj_alloc( &MPID_Group_mem ); + *new_group_ptr = (MPIR_Group *)MPIU_Handle_obj_alloc( &MPIR_Group_mem ); /* --BEGIN ERROR HANDLING-- */ if (!*new_group_ptr) { mpi_errno = MPIR_Err_create_code( MPI_SUCCESS, MPIR_ERR_RECOVERABLE, "MPIR_Group_create", __LINE__, MPI_ERR_OTHER, "**nomem", 0 ); @@ -71,12 +71,12 @@ int MPIR_Group_create( int nproc, MPID_Group **new_group_ptr ) /* --END ERROR HANDLING-- */ MPIU_Object_set_ref( *new_group_ptr, 1 ); (*new_group_ptr)->lrank_to_lpid = - (MPID_Group_pmap_t *)MPL_malloc( nproc * sizeof(MPID_Group_pmap_t) ); + (MPIR_Group_pmap_t *)MPL_malloc( nproc * sizeof(MPIR_Group_pmap_t) ); /* --BEGIN ERROR HANDLING-- */ if (!(*new_group_ptr)->lrank_to_lpid) { - MPIU_Handle_obj_free( &MPID_Group_mem, *new_group_ptr ); + MPIU_Handle_obj_free( &MPIR_Group_mem, *new_group_ptr ); *new_group_ptr = NULL; - MPIU_CHKMEM_SETERR(mpi_errno,nproc*sizeof(MPID_Group_pmap_t), + MPIU_CHKMEM_SETERR(mpi_errno,nproc*sizeof(MPIR_Group_pmap_t), "newgroup->lrank_to_lpid"); return mpi_errno; } @@ -99,7 +99,7 @@ int MPIR_Group_create( int nproc, MPID_Group **new_group_ptr ) * in group rank order). Instead it builds the traversal order (in increasing * lpid order) through the maparray given by the "next_lpid" fields. */ -static int mergesort_lpidarray( MPID_Group_pmap_t maparray[], int n ) +static int mergesort_lpidarray( MPIR_Group_pmap_t maparray[], int n ) { int idx1, idx2, first_idx, cur_idx, next_lpid, idx2_offset; @@ -199,7 +199,7 @@ static int mergesort_lpidarray( MPID_Group_pmap_t maparray[], int n ) * be held on entry to this routine. This forces some of the routines * noted above to hold the SINGLE_CS; which would otherwise not be required. */ -void MPIR_Group_setup_lpid_list( MPID_Group *group_ptr ) +void MPIR_Group_setup_lpid_list( MPIR_Group *group_ptr ) { if (group_ptr->idx_of_first_lpid == -1) { group_ptr->idx_of_first_lpid = @@ -208,8 +208,8 @@ void MPIR_Group_setup_lpid_list( MPID_Group *group_ptr ) } } -void MPIR_Group_setup_lpid_pairs( MPID_Group *group_ptr1, - MPID_Group *group_ptr2 ) +void MPIR_Group_setup_lpid_pairs( MPIR_Group *group_ptr1, + MPIR_Group *group_ptr2 ) { /* If the lpid list hasn't been created, do it now */ if (group_ptr1->idx_of_first_lpid < 0) { @@ -237,7 +237,7 @@ void MPIR_Group_setup_lpid_pairs( MPID_Group *group_ptr1, * must be used by only on thread at a time (per group). For the SINGLE_CS * case, that means that the SINGLE_CS must be held on entry to this routine. */ -int MPIR_Group_check_valid_ranks( MPID_Group *group_ptr, const int ranks[], int n ) +int MPIR_Group_check_valid_ranks( MPIR_Group *group_ptr, const int ranks[], int n ) { int mpi_errno = MPI_SUCCESS, i; @@ -276,7 +276,7 @@ int MPIR_Group_check_valid_ranks( MPID_Group *group_ptr, const int ranks[], int #define FUNCNAME MPIR_Group_check_valid_ranges #undef FCNAME #define FCNAME "MPIR_Group_check_valid_ranges" -int MPIR_Group_check_valid_ranges( MPID_Group *group_ptr, +int MPIR_Group_check_valid_ranges( MPIR_Group *group_ptr, int ranges[][3], int n ) { int i, j, size, first, last, stride, mpi_errno = MPI_SUCCESS; @@ -373,19 +373,19 @@ int MPIR_Group_check_valid_ranges( MPID_Group *group_ptr, We sort the lpids for the group and the comm. If the group has an lpid that is not in the comm, then report an error. */ -int MPIR_Group_check_subset( MPID_Group *group_ptr, MPIR_Comm *comm_ptr ) +int MPIR_Group_check_subset( MPIR_Group *group_ptr, MPIR_Comm *comm_ptr ) { int mpi_errno = MPI_SUCCESS; int g1_idx, g2_idx, l1_pid, l2_pid, i; - MPID_Group_pmap_t *vmap=0; + MPIR_Group_pmap_t *vmap=0; int vsize = comm_ptr->comm_kind == MPID_INTERCOMM ? comm_ptr->local_size : comm_ptr->remote_size; MPIU_CHKLMEM_DECL(1); MPIU_Assert(group_ptr != NULL); - MPIU_CHKLMEM_MALLOC(vmap,MPID_Group_pmap_t*, - vsize*sizeof(MPID_Group_pmap_t),mpi_errno, "" ); + MPIU_CHKLMEM_MALLOC(vmap,MPIR_Group_pmap_t*, + vsize*sizeof(MPIR_Group_pmap_t),mpi_errno, "" ); /* Initialize the vmap */ for (i=0; i<vsize; i++) { MPID_Comm_get_lpid(comm_ptr, i, &vmap[i].lpid, FALSE); diff --git a/src/mpi/rma/win_get_group.c b/src/mpi/rma/win_get_group.c index fb32aae..45ab8c6 100644 --- a/src/mpi/rma/win_get_group.c +++ b/src/mpi/rma/win_get_group.c @@ -61,7 +61,7 @@ int MPI_Win_get_group(MPI_Win win, MPI_Group *group) int mpi_errno = MPI_SUCCESS; MPID_Win *win_ptr = NULL; MPIR_Comm *win_comm_ptr; - MPID_Group *group_ptr; + MPIR_Group *group_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_GET_GROUP); MPIR_ERRTEST_INITIALIZED_ORDIE(); diff --git a/src/mpi/rma/win_post.c b/src/mpi/rma/win_post.c index 53d606d..a0accc7 100644 --- a/src/mpi/rma/win_post.c +++ b/src/mpi/rma/win_post.c @@ -66,7 +66,7 @@ int MPI_Win_post(MPI_Group group, int assert, MPI_Win win) static const char FCNAME[] = "MPI_Win_post"; int mpi_errno = MPI_SUCCESS; MPID_Win *win_ptr = NULL; - MPID_Group *group_ptr=NULL; + MPIR_Group *group_ptr=NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_POST); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -88,7 +88,7 @@ int MPI_Win_post(MPI_Group group, int assert, MPI_Win win) /* Convert MPI object handles to object pointers */ MPID_Win_get_ptr( win, win_ptr ); - MPID_Group_get_ptr(group, group_ptr); + MPIR_Group_get_ptr(group, group_ptr); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -98,7 +98,7 @@ int MPI_Win_post(MPI_Group group, int assert, MPI_Win win) /* Validate win_ptr */ MPID_Win_valid_ptr( win_ptr, mpi_errno ); - MPID_Group_valid_ptr(group_ptr, mpi_errno); + MPIR_Group_valid_ptr(group_ptr, mpi_errno); /* TODO: Validate assert argument */ /* TODO: Validate that window is not in passive mode */ diff --git a/src/mpi/rma/win_start.c b/src/mpi/rma/win_start.c index 2bc8e6b..78c1520 100644 --- a/src/mpi/rma/win_start.c +++ b/src/mpi/rma/win_start.c @@ -67,7 +67,7 @@ int MPI_Win_start(MPI_Group group, int assert, MPI_Win win) static const char FCNAME[] = "MPI_Win_start"; int mpi_errno = MPI_SUCCESS; MPID_Win *win_ptr = NULL; - MPID_Group *group_ptr = NULL; + MPIR_Group *group_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_START); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -89,7 +89,7 @@ int MPI_Win_start(MPI_Group group, int assert, MPI_Win win) /* Get handles to MPI objects. */ MPID_Win_get_ptr( win, win_ptr ); - MPID_Group_get_ptr(group, group_ptr); + MPIR_Group_get_ptr(group, group_ptr); # ifdef HAVE_ERROR_CHECKING { @@ -99,7 +99,7 @@ int MPI_Win_start(MPI_Group group, int assert, MPI_Win win) MPID_Win_valid_ptr( win_ptr, mpi_errno ); if (mpi_errno) goto fn_fail; - MPID_Group_valid_ptr(group_ptr, mpi_errno); + MPIR_Group_valid_ptr(group_ptr, mpi_errno); /* TODO: Validate assert argument */ /* TODO: Validate window state */ diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c b/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c index dbf3165..07fa169 100644 --- a/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c +++ b/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c @@ -155,7 +155,7 @@ static int MPIDI_CH3I_SHM_Wins_match(MPID_Win ** win_ptr, MPID_Win ** matched_wi MPIR_Comm *node_comm_ptr = NULL, *shm_node_comm_ptr = NULL; int *node_ranks = NULL, *node_ranks_in_shm_node = NULL; - MPID_Group *node_group_ptr = NULL, *shm_node_group_ptr = NULL; + MPIR_Group *node_group_ptr = NULL, *shm_node_group_ptr = NULL; MPIR_Errflag_t errflag = MPIR_ERR_NONE; MPI_Aint *base_shm_offs; diff --git a/src/mpid/ch3/include/mpidimpl.h b/src/mpid/ch3/include/mpidimpl.h index 92bc3e3..7a74ad3 100644 --- a/src/mpid/ch3/include/mpidimpl.h +++ b/src/mpid/ch3/include/mpidimpl.h @@ -41,7 +41,7 @@ int gethostname(char *name, size_t len); /* group of processes detected to have failed. This is a subset of comm_world group. */ -extern MPID_Group *MPIDI_Failed_procs_group; +extern MPIR_Group *MPIDI_Failed_procs_group; extern int MPIDI_last_known_failed; extern char *MPIDI_failed_procs_string; @@ -1439,7 +1439,7 @@ int MPIDI_CH3U_Receive_data_unexpected(MPID_Request * rreq, char *buf, intptr_t /* Initialization routine for ch3u_comm.c */ int MPIDI_CH3I_Comm_init(void); -int MPIDI_CH3I_Comm_handle_failed_procs(MPID_Group *new_failed_procs); +int MPIDI_CH3I_Comm_handle_failed_procs(MPIR_Group *new_failed_procs); void MPIDI_CH3I_Comm_find(MPIU_Context_id_t context_id, MPIR_Comm **comm); /* The functions below allow channels to register functions to be @@ -1577,7 +1577,7 @@ int MPIDI_CH3_Channel_close( void ); /* MPIDI_CH3U_Get_failed_group() generates a group of failed processes based * on the last list generated during MPIDI_CH3U_Check_for_failed_procs */ -int MPIDI_CH3U_Get_failed_group(int last_rank, MPID_Group **failed_group); +int MPIDI_CH3U_Get_failed_group(int last_rank, MPIR_Group **failed_group); /* MPIDI_CH3U_Check_for_failed_procs() reads PMI_dead_processes key and marks VCs to those processes as failed */ int MPIDI_CH3U_Check_for_failed_procs(void); diff --git a/src/mpid/ch3/include/mpidrma.h b/src/mpid/ch3/include/mpidrma.h index c8ed544..1626b45 100644 --- a/src/mpid/ch3/include/mpidrma.h +++ b/src/mpid/ch3/include/mpidrma.h @@ -1150,12 +1150,12 @@ static inline int finish_op_on_target(MPID_Win * win_ptr, MPIDI_VC_t * vc, } -static inline int fill_ranks_in_win_grp(MPID_Win * win_ptr, MPID_Group * group_ptr, +static inline int fill_ranks_in_win_grp(MPID_Win * win_ptr, MPIR_Group * group_ptr, int *ranks_in_win_grp) { int mpi_errno = MPI_SUCCESS; int i, *ranks_in_grp; - MPID_Group *win_grp_ptr; + MPIR_Group *win_grp_ptr; MPIU_CHKLMEM_DECL(1); MPIDI_STATE_DECL(MPID_STATE_FILL_RANKS_IN_WIN_GRP); diff --git a/src/mpid/ch3/src/ch3u_comm.c b/src/mpid/ch3/src/ch3u_comm.c index 9c87cce..f3db897 100644 --- a/src/mpid/ch3/src/ch3u_comm.c +++ b/src/mpid/ch3/src/ch3u_comm.c @@ -488,7 +488,7 @@ int comm_destroyed(MPIR_Comm *comm, void *param) #define FUNCNAME nonempty_intersection #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int nonempty_intersection(MPIR_Comm *comm, MPID_Group *group, int *flag) +static int nonempty_intersection(MPIR_Comm *comm, MPIR_Group *group, int *flag) { int mpi_errno = MPI_SUCCESS; int i_g, i_c; @@ -533,7 +533,7 @@ static int nonempty_intersection(MPIR_Comm *comm, MPID_Group *group, int *flag) #define FUNCNAME MPIDI_CH3I_Comm_handle_failed_procs #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3I_Comm_handle_failed_procs(MPID_Group *new_failed_procs) +int MPIDI_CH3I_Comm_handle_failed_procs(MPIR_Group *new_failed_procs) { int mpi_errno = MPI_SUCCESS; MPIR_Comm *comm; diff --git a/src/mpid/ch3/src/ch3u_handle_connection.c b/src/mpid/ch3/src/ch3u_handle_connection.c index 37f2381..a4b680f 100644 --- a/src/mpid/ch3/src/ch3u_handle_connection.c +++ b/src/mpid/ch3/src/ch3u_handle_connection.c @@ -18,7 +18,7 @@ static volatile int MPIDI_Outstanding_close_ops = 0; int MPIDI_Failed_vc_count = 0; -MPID_Group *MPIDI_Failed_procs_group = NULL; +MPIR_Group *MPIDI_Failed_procs_group = NULL; int MPIDI_last_known_failed = MPI_PROC_NULL; char *MPIDI_failed_procs_string = NULL; @@ -398,7 +398,7 @@ int MPIDI_CH3U_VC_WaitForClose( void ) #define FUNCNAME terminate_failed_VCs #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int terminate_failed_VCs(MPID_Group *new_failed_group) +static int terminate_failed_VCs(MPIR_Group *new_failed_group) { int mpi_errno = MPI_SUCCESS; int i; @@ -435,7 +435,7 @@ static int terminate_failed_VCs(MPID_Group *new_failed_group) /* There are three possible input values for `last_rank: * * < -1 = All failures regardless of acknowledgement - * -1 (MPI_PROC_NULL) = No failures have been acknowledged yet (return MPID_Group_empty) + * -1 (MPI_PROC_NULL) = No failures have been acknowledged yet (return MPIR_Group_empty) * >= 0 = The last failure acknowledged. All failures returned will have * been acknowledged previously. */ @@ -443,12 +443,12 @@ static int terminate_failed_VCs(MPID_Group *new_failed_group) #define FUNCNAME MPIDI_CH3U_Get_failed_group #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3U_Get_failed_group(int last_rank, MPID_Group **failed_group) +int MPIDI_CH3U_Get_failed_group(int last_rank, MPIR_Group **failed_group) { char *c; int i, mpi_errno = MPI_SUCCESS, rank; UT_array *failed_procs = NULL; - MPID_Group *world_group; + MPIR_Group *world_group; MPIDI_STATE_DECL(MPID_STATE_GET_FAILED_GROUP); MPIDI_FUNC_ENTER(MPID_STATE_GET_FAILED_GROUP); @@ -457,13 +457,13 @@ int MPIDI_CH3U_Get_failed_group(int last_rank, MPID_Group **failed_group) if (-1 == last_rank) { MPL_DBG_MSG(MPIDI_CH3_DBG_OTHER, VERBOSE, "No failure acknowledged"); - *failed_group = MPID_Group_empty; + *failed_group = MPIR_Group_empty; goto fn_exit; } if (*MPIDI_failed_procs_string == '\0') { MPL_DBG_MSG(MPIDI_CH3_DBG_OTHER, VERBOSE, "Found no failed ranks"); - *failed_group = MPID_Group_empty; + *failed_group = MPIR_Group_empty; goto fn_exit; } @@ -517,7 +517,7 @@ int MPIDI_CH3U_Check_for_failed_procs(void) int pmi_errno; int len; char *kvsname; - MPID_Group *prev_failed_group, *new_failed_group; + MPIR_Group *prev_failed_group, *new_failed_group; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3U_CHECK_FOR_FAILED_PROCS); MPIDI_FUNC_ENTER(MPID_STATE_MPIDI_CH3U_CHECK_FOR_FAILED_PROCS); @@ -543,7 +543,7 @@ int MPIDI_CH3U_Check_for_failed_procs(void) if (*MPIDI_failed_procs_string == '\0') { /* there are no failed processes */ - MPIDI_Failed_procs_group = MPID_Group_empty; + MPIDI_Failed_procs_group = MPIR_Group_empty; goto fn_exit; } @@ -559,7 +559,7 @@ int MPIDI_CH3U_Check_for_failed_procs(void) mpi_errno = MPIR_Group_difference_impl(MPIDI_Failed_procs_group, prev_failed_group, &new_failed_group); if (mpi_errno) MPIR_ERR_POP(mpi_errno); - if (new_failed_group != MPID_Group_empty) { + if (new_failed_group != MPIR_Group_empty) { mpi_errno = MPIDI_CH3I_Comm_handle_failed_procs(new_failed_group); if (mpi_errno) MPIR_ERR_POP(mpi_errno); @@ -571,7 +571,7 @@ int MPIDI_CH3U_Check_for_failed_procs(void) } /* free prev group */ - if (prev_failed_group != MPID_Group_empty) { + if (prev_failed_group != MPIR_Group_empty) { mpi_errno = MPIR_Group_release(prev_failed_group); if (mpi_errno) MPIR_ERR_POP(mpi_errno); } diff --git a/src/mpid/ch3/src/ch3u_rma_sync.c b/src/mpid/ch3/src/ch3u_rma_sync.c index 6dcccc6..bca4c72 100644 --- a/src/mpid/ch3/src/ch3u_rma_sync.c +++ b/src/mpid/ch3/src/ch3u_rma_sync.c @@ -706,7 +706,7 @@ int MPID_Win_fence(int assert, MPID_Win * win_ptr) #define FUNCNAME MPID_Win_post #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Win_post(MPID_Group * post_grp_ptr, int assert, MPID_Win * win_ptr) +int MPID_Win_post(MPIR_Group * post_grp_ptr, int assert, MPID_Win * win_ptr) { int *post_ranks_in_win_grp; int mpi_errno = MPI_SUCCESS; @@ -836,7 +836,7 @@ static int start_req_complete(MPID_Request * req) #define FUNCNAME MPID_Win_start #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Win_start(MPID_Group * group_ptr, int assert, MPID_Win * win_ptr) +int MPID_Win_start(MPIR_Group * group_ptr, int assert, MPID_Win * win_ptr) { int mpi_errno = MPI_SUCCESS; MPIU_CHKLMEM_DECL(2); diff --git a/src/mpid/ch3/src/mpid_comm_failure_ack.c b/src/mpid/ch3/src/mpid_comm_failure_ack.c index 32bc61f..33190d8 100644 --- a/src/mpid/ch3/src/mpid_comm_failure_ack.c +++ b/src/mpid/ch3/src/mpid_comm_failure_ack.c @@ -42,10 +42,10 @@ fn_fail: #define FUNCNAME MPID_Comm_failure_get_acked #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Comm_failure_get_acked(MPIR_Comm *comm_ptr, MPID_Group **group_ptr) +int MPID_Comm_failure_get_acked(MPIR_Comm *comm_ptr, MPIR_Group **group_ptr) { int mpi_errno = MPI_SUCCESS; - MPID_Group *failed_group, *comm_group; + MPIR_Group *failed_group, *comm_group; MPIDI_STATE_DECL(MPID_STATE_MPID_COMM_FAILURE_GET_ACKED); MPIDI_FUNC_ENTER(MPID_STATE_MPID_COMM_FAILURE_GET_ACKED); @@ -53,8 +53,8 @@ int MPID_Comm_failure_get_acked(MPIR_Comm *comm_ptr, MPID_Group **group_ptr) /* Get the group of all failed processes */ MPIDI_CH3U_Check_for_failed_procs(); MPIDI_CH3U_Get_failed_group(comm_ptr->dev.last_ack_rank, &failed_group); - if (failed_group == MPID_Group_empty) { - *group_ptr = MPID_Group_empty; + if (failed_group == MPIR_Group_empty) { + *group_ptr = MPIR_Group_empty; goto fn_exit; } diff --git a/src/mpid/ch3/src/mpid_comm_get_all_failed_procs.c b/src/mpid/ch3/src/mpid_comm_get_all_failed_procs.c index 706e27d..bae3891 100644 --- a/src/mpid/ch3/src/mpid_comm_get_all_failed_procs.c +++ b/src/mpid/ch3/src/mpid_comm_get_all_failed_procs.c @@ -12,7 +12,7 @@ #endif /* Generates a bitarray based on orig_comm where all procs in group are marked with 1 */ -static void group_to_bitarray(MPID_Group *group, MPIR_Comm *orig_comm, int **bitarray, int *bitarray_size) { +static void group_to_bitarray(MPIR_Group *group, MPIR_Comm *orig_comm, int **bitarray, int *bitarray_size) { int mask; int *group_ranks, *comm_ranks, i, index; @@ -21,7 +21,7 @@ static void group_to_bitarray(MPID_Group *group, MPIR_Comm *orig_comm, int **bit *bitarray = (int *) MPL_malloc(sizeof(int) * *bitarray_size); /* If the group is empty, return an empty bitarray. */ - if (group == MPID_Group_empty) { + if (group == MPIR_Group_empty) { for (i = 0; i < *bitarray_size; i++) *bitarray[i] = 0; return; } @@ -49,11 +49,11 @@ static void group_to_bitarray(MPID_Group *group, MPIR_Comm *orig_comm, int **bit MPL_free(comm_ranks); } -/* Generates an MPID_Group from a bitarray */ -static MPID_Group *bitarray_to_group(MPIR_Comm *comm_ptr, int *bitarray) +/* Generates an MPIR_Group from a bitarray */ +static MPIR_Group *bitarray_to_group(MPIR_Comm *comm_ptr, int *bitarray) { - MPID_Group *ret_group; - MPID_Group *comm_group; + MPIR_Group *ret_group; + MPIR_Group *comm_group; UT_array *ranks_array; int i, found = 0; @@ -74,7 +74,7 @@ static MPID_Group *bitarray_to_group(MPIR_Comm *comm_ptr, int *bitarray) /* Converts the utarray into a group */ MPIR_Group_incl_impl(comm_group, found, ut_int_array(ranks_array), &ret_group); else - ret_group = MPID_Group_empty; + ret_group = MPIR_Group_empty; utarray_free(ranks_array); MPIR_Group_release(comm_group); @@ -86,13 +86,13 @@ static MPID_Group *bitarray_to_group(MPIR_Comm *comm_ptr, int *bitarray) #define FUNCNAME MPID_Comm_get_all_failed_procs #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Comm_get_all_failed_procs(MPIR_Comm *comm_ptr, MPID_Group **failed_group, int tag) +int MPID_Comm_get_all_failed_procs(MPIR_Comm *comm_ptr, MPIR_Group **failed_group, int tag) { int mpi_errno = MPI_SUCCESS, ret_errno; MPIR_Errflag_t errflag = MPIR_ERR_NONE; int i, j, bitarray_size; int *bitarray, *remote_bitarray; - MPID_Group *local_fail; + MPIR_Group *local_fail; MPIDI_STATE_DECL(MPID_STATE_MPID_COMM_GET_ALL_FAILED_PROCS); MPIDI_FUNC_ENTER(MPID_STATE_MPID_COMM_GET_ALL_FAILED_PROCS); @@ -110,7 +110,7 @@ int MPID_Comm_get_all_failed_procs(MPIR_Comm *comm_ptr, MPID_Group **failed_grou /* Generate a bitarray based on the list of failed procs */ group_to_bitarray(local_fail, comm_ptr, &bitarray, &bitarray_size); remote_bitarray = MPL_malloc(sizeof(int) * bitarray_size); - if (local_fail != MPID_Group_empty) + if (local_fail != MPIR_Group_empty) MPIR_Group_release(local_fail); /* For now, this will be implemented as a star with rank 0 serving as diff --git a/src/mpid/ch3/src/mpid_init.c b/src/mpid/ch3/src/mpid_init.c index e2cfffe..7e8da11 100644 --- a/src/mpid/ch3/src/mpid_init.c +++ b/src/mpid/ch3/src/mpid_init.c @@ -61,7 +61,7 @@ MPL_dbg_class MPIDI_CH3_DBG_REFCOUNT; static int finalize_failed_procs_group(void *param) { int mpi_errno = MPI_SUCCESS; - if (MPIDI_Failed_procs_group != MPID_Group_empty) { + if (MPIDI_Failed_procs_group != MPIR_Group_empty) { mpi_errno = MPIR_Group_free_impl(MPIDI_Failed_procs_group); if (mpi_errno) MPIR_ERR_POP(mpi_errno); } @@ -120,7 +120,7 @@ int MPID_Init(int *argc, char ***argv, int requested, int *provided, if (mpi_errno) MPIR_ERR_POP(mpi_errno); /* init group of failed processes, and set finalize callback */ - MPIDI_Failed_procs_group = MPID_Group_empty; + MPIDI_Failed_procs_group = MPIR_Group_empty; MPIR_Add_finalize(finalize_failed_procs_group, NULL, MPIR_FINALIZE_CALLBACK_PRIO-1); /* FIXME: This is a good place to check for environment variables diff --git a/src/mpid/pamid/include/mpidi_datatypes.h b/src/mpid/pamid/include/mpidi_datatypes.h index f2d24e7..601bdf2 100644 --- a/src/mpid/pamid/include/mpidi_datatypes.h +++ b/src/mpid/pamid/include/mpidi_datatypes.h @@ -383,8 +383,8 @@ typedef struct struct MPIR_Comm; /** \brief Forward declaration of the MPID_Win structure */ struct MPID_Win; -/** \brief Forward declaration of the MPID_Group structure */ -struct MPID_Group; +/** \brief Forward declaration of the MPIR_Group structure */ +struct MPIR_Group; typedef enum { @@ -504,7 +504,7 @@ struct MPIDI_Win struct MPIDI_Win_sync_pscw { - struct MPID_Group * group; + struct MPIR_Group * group; volatile unsigned count; } sc, pw; struct MPIDI_Win_sync_lock diff --git a/src/mpid/pamid/src/comm/mpid_comm.c b/src/mpid/pamid/src/comm/mpid_comm.c index 1c61fbc..7734eb7 100644 --- a/src/mpid/pamid/src/comm/mpid_comm.c +++ b/src/mpid/pamid/src/comm/mpid_comm.c @@ -59,7 +59,7 @@ pami_result_t MPIDI_Comm_create_from_pami_geom(pami_geometry_range_t *task_slic int num_tasks = 0; int *ranks = NULL; MPIR_Comm *comm_ptr = NULL, *new_comm_ptr = NULL; - MPID_Group *group_ptr = NULL, *new_group_ptr = NULL; + MPIR_Group *group_ptr = NULL, *new_group_ptr = NULL; int i = 0, j = 0; /* Get comm_ptr for MPI_COMM_WORLD and get the group_ptr for it */ diff --git a/src/mpid/pamid/src/dyntask/mpid_comm_disconnect.c b/src/mpid/pamid/src/dyntask/mpid_comm_disconnect.c index 0b27700..7064efc 100644 --- a/src/mpid/pamid/src/dyntask/mpid_comm_disconnect.c +++ b/src/mpid/pamid/src/dyntask/mpid_comm_disconnect.c @@ -207,7 +207,7 @@ int MPID_Comm_disconnect(MPIR_Comm *comm_ptr) pami_task_t *leader_tids; int expected_firstAM=0, expected_secondAM=0, expected_lastAM=0; MPIR_Comm *commworld_ptr; - MPID_Group *group_ptr = NULL, *new_group_ptr = NULL; + MPIR_Group *group_ptr = NULL, *new_group_ptr = NULL; MPID_VCR *glist; MPIR_Comm *lcomm; int *ranks; diff --git a/src/mpid/pamid/src/misc/mpid_unimpl.c b/src/mpid/pamid/src/misc/mpid_unimpl.c index f52bd98..ddcd353 100644 --- a/src/mpid/pamid/src/misc/mpid_unimpl.c +++ b/src/mpid/pamid/src/misc/mpid_unimpl.c @@ -78,13 +78,13 @@ int MPID_Comm_failure_ack(MPIR_Comm *comm_ptr) return 0; } -int MPID_Comm_failure_get_acked(MPIR_Comm *comm_ptr, MPID_Group **failed_group_ptr) +int MPID_Comm_failure_get_acked(MPIR_Comm *comm_ptr, MPIR_Group **failed_group_ptr) { MPID_abort(); return 0; } -int MPID_Comm_get_all_failed_procs(MPIR_Comm *comm_ptr, MPID_Group **failed_group, int tag) +int MPID_Comm_get_all_failed_procs(MPIR_Comm *comm_ptr, MPIR_Group **failed_group, int tag) { MPID_abort(); return 0; diff --git a/src/mpid/pamid/src/mpidi_util.c b/src/mpid/pamid/src/mpidi_util.c index 4e16ec2..ec88346 100644 --- a/src/mpid/pamid/src/mpidi_util.c +++ b/src/mpid/pamid/src/mpidi_util.c @@ -816,7 +816,7 @@ void MPIDI_print_statistics() { * \return TRUE is lpid is in group */ -int MPIDI_valid_group_rank(int lpid, MPID_Group *grp) { +int MPIDI_valid_group_rank(int lpid, MPIR_Group *grp) { int size = grp->size; int z; diff --git a/src/mpid/pamid/src/onesided/mpid_win_pscw.c b/src/mpid/pamid/src/onesided/mpid_win_pscw.c index b2cc6a4..4601895 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_pscw.c +++ b/src/mpid/pamid/src/onesided/mpid_win_pscw.c @@ -37,7 +37,7 @@ MPIDI_WinPost_post(pami_context_t context, { MPIDI_WinPSCW_info * info = (MPIDI_WinPSCW_info*)_info; unsigned peer, index, pid,i; - MPID_Group *group = info->win->mpid.sync.pw.group; + MPIR_Group *group = info->win->mpid.sync.pw.group; MPID_assert(group != NULL); MPIDI_Win_control_t msg = { .type = MPIDI_WIN_MSGTYPE_POST, @@ -74,7 +74,7 @@ MPIDI_WinComplete_post(pami_context_t context, { MPIDI_WinPSCW_info * info = (MPIDI_WinPSCW_info*)_info; unsigned peer, index,pid,i; - MPID_Group *group = info->win->mpid.sync.sc.group; + MPIR_Group *group = info->win->mpid.sync.sc.group; MPID_assert(group != NULL); MPIDI_Win_control_t msg = { .type = MPIDI_WIN_MSGTYPE_COMPLETE, @@ -106,7 +106,7 @@ MPIDI_WinComplete_proc(pami_context_t context, int -MPID_Win_start(MPID_Group *group, +MPID_Win_start(MPIR_Group *group, int assert, MPID_Win *win) { @@ -174,7 +174,7 @@ MPID_Win_complete(MPID_Win *win) int -MPID_Win_post(MPID_Group *group, +MPID_Win_post(MPIR_Group *group, int assert, MPID_Win *win) { @@ -218,7 +218,7 @@ MPID_Win_wait(MPID_Win *win) return mpi_errno, "**rmasync"); } - MPID_Group *group = sync->pw.group; + MPIR_Group *group = sync->pw.group; MPID_PROGRESS_WAIT_WHILE(group->size != sync->sc.count); sync->sc.count = 0; sync->pw.group = NULL; @@ -247,7 +247,7 @@ MPID_Win_test(MPID_Win *win, return mpi_errno, "**rmasync"); } - MPID_Group *group = sync->pw.group; + MPIR_Group *group = sync->pw.group; if (group->size == sync->sc.count) { sync->sc.count = 0; diff --git a/src/mpid/pamid/src/onesided/mpidi_onesided.h b/src/mpid/pamid/src/onesided/mpidi_onesided.h index d159148..a8810bc 100644 --- a/src/mpid/pamid/src/onesided/mpidi_onesided.h +++ b/src/mpid/pamid/src/onesided/mpidi_onesided.h @@ -379,7 +379,7 @@ MPIDI_Datatype_is_pami_rmw_supported(MPI_Datatype datatype, int MPIDI_valid_group_rank(int lpid, - MPID_Group *grp); + MPIR_Group *grp); void MPIDI_WinLockAllAck_post(pami_context_t context, unsigned peer, diff --git a/test/mpi/group/glpid.c b/test/mpi/group/glpid.c index 5685a67..4454e37 100644 --- a/test/mpi/group/glpid.c +++ b/test/mpi/group/glpid.c @@ -10,7 +10,7 @@ int main(int argc, char *argv[]) { - MPID_Group group, *group_ptr = &group; + MPIR_Group group, *group_ptr = &group; int i; MPI_Init(&argc, &argv); @@ -21,8 +21,8 @@ int main(int argc, char *argv[]) group.size = 4; group.rank = 0; group.idx_of_first_lpid = -1; - group.lrank_to_lpid = (MPID_Group_pmap_t *) - MPL_malloc(group.size * sizeof(MPID_Group_pmap_t)); + group.lrank_to_lpid = (MPIR_Group_pmap_t *) + MPL_malloc(group.size * sizeof(MPIR_Group_pmap_t)); for (i = 0; i < group.size; i++) { group.lrank_to_lpid[i].lrank = i; group.lrank_to_lpid[i].lpid = group.size - i - 1; http://git.mpich.org/mpich.git/commitdiff/5a002ef7a80ddac35c3f7ee1eb0d804a1… commit 5a002ef7a80ddac35c3f7ee1eb0d804a1f9158e3 Author: Wesley Bland <wesley.bland(a)intel.com> Date: Mon Apr 18 16:54:41 2016 -0500 Rename MPID_Comm_kind_t to MPIR_Comm_kind_t Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index bd619d7..6198422 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -1091,13 +1091,13 @@ void MPIR_Group_setup_lpid_list( MPID_Group * ); /* ------------------------------------------------------------------------- */ /*E - MPID_Comm_kind_t - Name the two types of communicators + MPIR_Comm_kind_t - Name the two types of communicators E*/ -typedef enum MPID_Comm_kind_t { +typedef enum MPIR_Comm_kind_t { MPID_INTRACOMM = 0, - MPID_INTERCOMM = 1 } MPID_Comm_kind_t; + MPID_INTERCOMM = 1 } MPIR_Comm_kind_t; -/* ideally we could add these to MPID_Comm_kind_t, but there's too much existing +/* ideally we could add these to MPIR_Comm_kind_t, but there's too much existing * code that assumes that the only valid values are INTRACOMM or INTERCOMM */ typedef enum MPID_Comm_hierarchy_kind_t { MPID_HIERARCHY_FLAT = 0, /* no hierarchy */ @@ -1220,7 +1220,7 @@ typedef struct MPIR_Comm { MPID_Group *local_group, /* Groups in communicator. */ *remote_group; /* The local and remote groups are the same for intra communicators */ - MPID_Comm_kind_t comm_kind; /* MPID_INTRACOMM or MPID_INTERCOMM */ + MPIR_Comm_kind_t comm_kind; /* MPID_INTRACOMM or MPID_INTERCOMM */ char name[MPI_MAX_OBJECT_NAME]; /* Required for MPI-2 */ MPID_Errhandler *errhandler; /* Pointer to the error handler structure */ struct MPIR_Comm *local_comm; /* Defined only for intercomms, holds diff --git a/src/mpi/comm/contextid.c b/src/mpi/comm/contextid.c index 1f87111..b87ef92 100644 --- a/src/mpi/comm/contextid.c +++ b/src/mpi/comm/contextid.c @@ -311,7 +311,7 @@ struct gcn_state { MPIR_Comm *comm_ptr_inter; MPID_Sched_t s; MPIR_Comm *new_comm; - MPID_Comm_kind_t gcn_cid_kind; + MPIR_Comm_kind_t gcn_cid_kind; uint32_t local_mask[MPIR_MAX_CONTEXT_MASK + 1]; struct gcn_state *next; }; @@ -953,7 +953,7 @@ static int sched_cb_gcn_copy_mask(MPIR_Comm * comm, int tag, void *state) #define FCNAME MPL_QUOTE(FUNCNAME) static int sched_get_cid_nonblock(MPIR_Comm * comm_ptr, MPIR_Comm * newcomm, MPIU_Context_id_t * ctx0, MPIU_Context_id_t * ctx1, - MPID_Sched_t s, MPID_Comm_kind_t gcn_cid_kind) + MPID_Sched_t s, MPIR_Comm_kind_t gcn_cid_kind) { int mpi_errno = MPI_SUCCESS; struct gcn_state *st = NULL; http://git.mpich.org/mpich.git/commitdiff/e347dd59ec4b0d3ac630f961a0eecfdd2… commit e347dd59ec4b0d3ac630f961a0eecfdd24fce5a8 Author: Wesley Bland <wesley.bland(a)intel.com> Date: Mon Apr 18 16:38:59 2016 -0500 Rename MPID_Attribute to MPIR_Attribute Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index 94a50fe..bd619d7 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -940,7 +940,7 @@ typedef void * MPID_AttrVal_t; common block allocator for them, we must provide those elements */ /*S - MPID_Attribute - Structure of an MPID attribute + MPIR_Attribute - Structure of an MPID attribute Notes: Attributes don''t have 'ref_count's because they don''t have reference @@ -977,11 +977,11 @@ typedef void * MPID_AttrVal_t; Attribute-DS S*/ -typedef struct MPID_Attribute { +typedef struct MPIR_Attribute { MPIU_OBJECT_HEADER; /* adds handle and ref_count fields */ MPID_Keyval *keyval; /* Keyval structure for this attribute */ - struct MPID_Attribute *next; /* Pointer to next in the list */ + struct MPIR_Attribute *next; /* Pointer to next in the list */ MPIR_AttrType attrType; /* Type of the attribute */ long pre_sentinal; /* Used to detect user errors in accessing the value */ @@ -993,7 +993,7 @@ typedef struct MPID_Attribute { #ifdef MPID_DEV_ATTR_DECL MPID_DEV_ATTR_DECL #endif -} MPID_Attribute; +} MPIR_Attribute; /* ------------------------------------------------------------------------- */ /*--------------------------------------------------------------------------- @@ -1215,7 +1215,7 @@ typedef struct MPIR_Comm { MPIU_Context_id_t recvcontext_id; /* Send context id. See notes */ int remote_size; /* Value of MPI_Comm_(remote)_size */ int rank; /* Value of MPI_Comm_rank */ - MPID_Attribute *attributes; /* List of attributes */ + MPIR_Attribute *attributes; /* List of attributes */ int local_size; /* Value of MPI_Comm_size for local group */ MPID_Group *local_group, /* Groups in communicator. */ *remote_group; /* The local and remote groups are the @@ -1667,7 +1667,7 @@ typedef struct MPID_Win { void *base; MPI_Aint size; int disp_unit; /* Displacement unit of *local* window */ - MPID_Attribute *attributes; + MPIR_Attribute *attributes; MPIR_Comm *comm_ptr; /* Pointer to comm of window (dup) */ #ifdef USE_THREADED_WINDOW_CODE /* These were causing compilation errors. We need to figure out how to @@ -2106,8 +2106,8 @@ typedef struct MPICH_PerProcess_t { int (*dimsCreate)( int, int, int *); /* Attribute dup functions. Here for lazy initialization */ - int (*attr_dup)( int, MPID_Attribute *, MPID_Attribute ** ); - int (*attr_free)( int, MPID_Attribute ** ); + int (*attr_dup)( int, MPIR_Attribute *, MPIR_Attribute ** ); + int (*attr_free)( int, MPIR_Attribute ** ); /* There is no win_attr_dup function because there can be no MPI_Win_dup function */ /* Routine to get the messages corresponding to dynamically created @@ -2333,8 +2333,8 @@ void MPIR_Add_finalize( int (*routine)( void * ), void *extra, int priority ); #define MPIR_FINALIZE_CALLBACK_DEFAULT_PRIO 0 #define MPIR_FINALIZE_CALLBACK_MAX_PRIO 10 -/*int MPIR_Comm_attr_dup(MPIR_Comm *, MPID_Attribute **); - int MPIR_Comm_attr_delete(MPIR_Comm *, MPID_Attribute *);*/ +/*int MPIR_Comm_attr_dup(MPIR_Comm *, MPIR_Attribute **); + int MPIR_Comm_attr_delete(MPIR_Comm *, MPIR_Attribute *);*/ int MPIR_Comm_copy( MPIR_Comm *, int, MPIR_Comm ** ); int MPIR_Comm_copy_data(MPIR_Comm *comm_ptr, MPIR_Comm **outcomm_ptr); diff --git a/src/mpi/attr/attr.h b/src/mpi/attr/attr.h index d25b0cb..3da6962 100644 --- a/src/mpi/attr/attr.h +++ b/src/mpi/attr/attr.h @@ -20,10 +20,10 @@ extern MPIU_Object_alloc_t MPID_Keyval_mem; extern MPIU_Object_alloc_t MPID_Attr_mem; extern MPID_Keyval MPID_Keyval_direct[]; -extern int MPIR_Attr_dup_list( int, MPID_Attribute *, MPID_Attribute ** ); -extern int MPIR_Attr_delete_list( int, MPID_Attribute ** ); -extern MPID_Attribute *MPID_Attr_alloc(void); -extern void MPID_Attr_free(MPID_Attribute *attr_ptr); -extern int MPIR_Call_attr_delete( int, MPID_Attribute * ); -extern int MPIR_Call_attr_copy( int, MPID_Attribute *, void**, int* ); +extern int MPIR_Attr_dup_list( int, MPIR_Attribute *, MPIR_Attribute ** ); +extern int MPIR_Attr_delete_list( int, MPIR_Attribute ** ); +extern MPIR_Attribute *MPID_Attr_alloc(void); +extern void MPID_Attr_free(MPIR_Attribute *attr_ptr); +extern int MPIR_Call_attr_delete( int, MPIR_Attribute * ); +extern int MPIR_Call_attr_copy( int, MPIR_Attribute *, void**, int* ); diff --git a/src/mpi/attr/attrutil.c b/src/mpi/attr/attrutil.c index 4f15057..2ff6d7d 100644 --- a/src/mpi/attr/attrutil.c +++ b/src/mpi/attr/attrutil.c @@ -38,16 +38,16 @@ MPIU_Object_alloc_t MPID_Keyval_mem = { 0, 0, 0, 0, MPID_KEYVAL, #endif /* Preallocated keyval objects */ -MPID_Attribute MPID_Attr_direct[MPID_ATTR_PREALLOC] = { {0} }; +MPIR_Attribute MPID_Attr_direct[MPID_ATTR_PREALLOC] = { {0} }; MPIU_Object_alloc_t MPID_Attr_mem = { 0, 0, 0, 0, MPID_ATTR, - sizeof(MPID_Attribute), + sizeof(MPIR_Attribute), MPID_Attr_direct, MPID_ATTR_PREALLOC, }; /* Provides a way to trap all attribute allocations when debugging leaks. */ -MPID_Attribute *MPID_Attr_alloc(void) +MPIR_Attribute *MPID_Attr_alloc(void) { - MPID_Attribute *attr = (MPID_Attribute *)MPIU_Handle_obj_alloc(&MPID_Attr_mem); + MPIR_Attribute *attr = (MPIR_Attribute *)MPIU_Handle_obj_alloc(&MPID_Attr_mem); /* attributes don't have refcount semantics, but let's keep valgrind and * the debug logging pacified */ MPIU_Assert(attr != NULL); @@ -55,7 +55,7 @@ MPID_Attribute *MPID_Attr_alloc(void) return attr; } -void MPID_Attr_free(MPID_Attribute *attr_ptr) +void MPID_Attr_free(MPIR_Attribute *attr_ptr) { MPIU_Handle_obj_free(&MPID_Attr_mem, attr_ptr); } @@ -77,7 +77,7 @@ void MPID_Attr_free(MPID_Attribute *attr_ptr) Note that this simply invokes the attribute delete function. It does not remove the attribute from the list of attributes. */ -int MPIR_Call_attr_delete( int handle, MPID_Attribute *attr_p ) +int MPIR_Call_attr_delete( int handle, MPIR_Attribute *attr_p ) { int rc; int mpi_errno = MPI_SUCCESS; @@ -134,7 +134,7 @@ int MPIR_Call_attr_delete( int handle, MPID_Attribute *attr_p ) #define FUNCNAME MPIR_Call_attr_copy #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Call_attr_copy( int handle, MPID_Attribute *attr_p, void** value_copy, int* flag) +int MPIR_Call_attr_copy( int handle, MPIR_Attribute *attr_p, void** value_copy, int* flag) { int mpi_errno = MPI_SUCCESS; int rc; @@ -175,10 +175,10 @@ fn_fail: #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) /* Routine to duplicate an attribute list */ -int MPIR_Attr_dup_list( int handle, MPID_Attribute *old_attrs, - MPID_Attribute **new_attr ) +int MPIR_Attr_dup_list( int handle, MPIR_Attribute *old_attrs, + MPIR_Attribute **new_attr ) { - MPID_Attribute *p, *new_p, **next_new_attr_ptr=new_attr; + MPIR_Attribute *p, *new_p, **next_new_attr_ptr=new_attr; void* new_value = NULL; int mpi_errno = MPI_SUCCESS; @@ -241,9 +241,9 @@ int MPIR_Attr_dup_list( int handle, MPID_Attribute *old_attrs, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) /* Routine to delete an attribute list */ -int MPIR_Attr_delete_list( int handle, MPID_Attribute **attr ) +int MPIR_Attr_delete_list( int handle, MPIR_Attribute **attr ) { - MPID_Attribute *p, *new_p; + MPIR_Attribute *p, *new_p; int mpi_errno = MPI_SUCCESS; p = *attr; diff --git a/src/mpi/attr/comm_delete_attr.c b/src/mpi/attr/comm_delete_attr.c index 6428ed6..0d38867 100644 --- a/src/mpi/attr/comm_delete_attr.c +++ b/src/mpi/attr/comm_delete_attr.c @@ -33,7 +33,7 @@ int MPI_Comm_delete_attr(MPI_Comm comm, int comm_keyval) __attribute__((weak,ali int MPIR_Comm_delete_attr_impl(MPIR_Comm *comm_ptr, MPID_Keyval *keyval_ptr) { int mpi_errno = MPI_SUCCESS; - MPID_Attribute *p, **old_p; + MPIR_Attribute *p, **old_p; /* Look for attribute. They are ordered by keyval handle */ diff --git a/src/mpi/attr/comm_get_attr.c b/src/mpi/attr/comm_get_attr.c index ff9f1b2..8809278 100644 --- a/src/mpi/attr/comm_get_attr.c +++ b/src/mpi/attr/comm_get_attr.c @@ -231,7 +231,7 @@ int MPIR_CommGetAttr( MPI_Comm comm, int comm_keyval, void *attribute_val, } } else { - MPID_Attribute *p = comm_ptr->attributes; + MPIR_Attribute *p = comm_ptr->attributes; /* */ *flag = 0; diff --git a/src/mpi/attr/comm_set_attr.c b/src/mpi/attr/comm_set_attr.c index ab41527..30da7bc 100644 --- a/src/mpi/attr/comm_set_attr.c +++ b/src/mpi/attr/comm_set_attr.c @@ -35,7 +35,7 @@ int MPIR_Comm_set_attr_impl(MPIR_Comm *comm_ptr, int comm_keyval, void *attribut { int mpi_errno = MPI_SUCCESS; MPID_Keyval *keyval_ptr = NULL; - MPID_Attribute *p; + MPIR_Attribute *p; MPIR_ERR_CHKANDJUMP(comm_keyval == MPI_KEYVAL_INVALID, mpi_errno, MPI_ERR_KEYVAL, "**keyvalinvalid"); @@ -74,7 +74,7 @@ int MPIR_Comm_set_attr_impl(MPIR_Comm *comm_ptr, int comm_keyval, void *attribut } /* CHANGE FOR MPI 2.2: If not found, add at the beginning */ if (!p) { - MPID_Attribute *new_p = MPID_Attr_alloc(); + MPIR_Attribute *new_p = MPID_Attr_alloc(); MPIR_ERR_CHKANDJUMP(!new_p,mpi_errno,MPI_ERR_OTHER,"**nomem"); /* Did not find in list. Add at end */ new_p->keyval = keyval_ptr; diff --git a/src/mpi/attr/type_delete_attr.c b/src/mpi/attr/type_delete_attr.c index 42ba73c..d55a486 100644 --- a/src/mpi/attr/type_delete_attr.c +++ b/src/mpi/attr/type_delete_attr.c @@ -53,7 +53,7 @@ int MPI_Type_delete_attr(MPI_Datatype datatype, int type_keyval) static const char FCNAME[] = "MPI_Type_delete_attr"; int mpi_errno = MPI_SUCCESS; MPID_Datatype *type_ptr = NULL; - MPID_Attribute *p, **old_p; + MPIR_Attribute *p, **old_p; MPID_Keyval *keyval_ptr = 0; MPID_MPI_STATE_DECL(MPID_STATE_MPI_TYPE_DELETE_ATTR); diff --git a/src/mpi/attr/type_get_attr.c b/src/mpi/attr/type_get_attr.c index 8fe8060..c439c9d 100644 --- a/src/mpi/attr/type_get_attr.c +++ b/src/mpi/attr/type_get_attr.c @@ -37,7 +37,7 @@ int MPIR_TypeGetAttr( MPI_Datatype datatype, int type_keyval, void *attribute_va #endif int mpi_errno = MPI_SUCCESS; MPID_Datatype *type_ptr = NULL; - MPID_Attribute *p; + MPIR_Attribute *p; MPID_MPI_STATE_DECL(MPID_STATE_MPIR_TYPE_GET_ATTR); MPIR_ERRTEST_INITIALIZED_ORDIE(); diff --git a/src/mpi/attr/type_set_attr.c b/src/mpi/attr/type_set_attr.c index 6f94dae..0273f50 100644 --- a/src/mpi/attr/type_set_attr.c +++ b/src/mpi/attr/type_set_attr.c @@ -35,7 +35,7 @@ int MPIR_TypeSetAttr(MPI_Datatype datatype, int type_keyval, void *attribute_val int mpi_errno = MPI_SUCCESS; MPID_Datatype *type_ptr = NULL; MPID_Keyval *keyval_ptr = NULL; - MPID_Attribute *p, **old_p; + MPIR_Attribute *p, **old_p; MPID_MPI_STATE_DECL(MPID_STATE_MPIR_TYPE_SET_ATTR); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -100,9 +100,9 @@ int MPIR_TypeSetAttr(MPI_Datatype datatype, int type_keyval, void *attribute_val break; } else if (p->keyval->handle > keyval_ptr->handle) { - MPID_Attribute *new_p = MPID_Attr_alloc(); + MPIR_Attribute *new_p = MPID_Attr_alloc(); MPIR_ERR_CHKANDJUMP1(!new_p,mpi_errno,MPI_ERR_OTHER, - "**nomem","**nomem %s", "MPID_Attribute" ); + "**nomem","**nomem %s", "MPIR_Attribute" ); new_p->keyval = keyval_ptr; new_p->attrType = attrType; new_p->pre_sentinal = 0; @@ -118,9 +118,9 @@ int MPIR_TypeSetAttr(MPI_Datatype datatype, int type_keyval, void *attribute_val } if (!p) { - MPID_Attribute *new_p = MPID_Attr_alloc(); + MPIR_Attribute *new_p = MPID_Attr_alloc(); MPIR_ERR_CHKANDJUMP1(!new_p,mpi_errno,MPI_ERR_OTHER, - "**nomem","**nomem %s", "MPID_Attribute" ); + "**nomem","**nomem %s", "MPIR_Attribute" ); /* Did not find in list. Add at end */ new_p->keyval = keyval_ptr; new_p->attrType = attrType; diff --git a/src/mpi/attr/win_delete_attr.c b/src/mpi/attr/win_delete_attr.c index bfea642..c7611a5 100644 --- a/src/mpi/attr/win_delete_attr.c +++ b/src/mpi/attr/win_delete_attr.c @@ -54,7 +54,7 @@ int MPI_Win_delete_attr(MPI_Win win, int win_keyval) static const char FCNAME[] = "MPI_Win_delete_attr"; int mpi_errno = MPI_SUCCESS; MPID_Win *win_ptr = NULL; - MPID_Attribute *p, **old_p; + MPIR_Attribute *p, **old_p; MPID_Keyval *keyval_ptr=0; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_DELETE_ATTR); diff --git a/src/mpi/attr/win_get_attr.c b/src/mpi/attr/win_get_attr.c index dbf4021..397fea0 100644 --- a/src/mpi/attr/win_get_attr.c +++ b/src/mpi/attr/win_get_attr.c @@ -152,7 +152,7 @@ int MPIR_WinGetAttr( MPI_Win win, int win_keyval, void *attribute_val, } } else { - MPID_Attribute *p = win_ptr->attributes; + MPIR_Attribute *p = win_ptr->attributes; *flag = 0; while (p) { diff --git a/src/mpi/attr/win_set_attr.c b/src/mpi/attr/win_set_attr.c index 66a425c..df016eb 100644 --- a/src/mpi/attr/win_set_attr.c +++ b/src/mpi/attr/win_set_attr.c @@ -35,7 +35,7 @@ int MPIR_WinSetAttr( MPI_Win win, int win_keyval, void *attribute_val, int mpi_errno = MPI_SUCCESS; MPID_Win *win_ptr = NULL; MPID_Keyval *keyval_ptr = NULL; - MPID_Attribute *p, **old_p; + MPIR_Attribute *p, **old_p; MPID_MPI_STATE_DECL(MPID_STATE_MPIR_WIN_SET_ATTR); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -106,9 +106,9 @@ int MPIR_WinSetAttr( MPI_Win win, int win_keyval, void *attribute_val, break; } else if (p->keyval->handle > keyval_ptr->handle) { - MPID_Attribute *new_p = MPID_Attr_alloc(); + MPIR_Attribute *new_p = MPID_Attr_alloc(); MPIR_ERR_CHKANDJUMP1(!new_p,mpi_errno,MPI_ERR_OTHER, - "**nomem", "**nomem %s", "MPID_Attribute" ); + "**nomem", "**nomem %s", "MPIR_Attribute" ); new_p->keyval = keyval_ptr; new_p->attrType = attrType; new_p->pre_sentinal = 0; @@ -124,9 +124,9 @@ int MPIR_WinSetAttr( MPI_Win win, int win_keyval, void *attribute_val, } if (!p) { - MPID_Attribute *new_p = MPID_Attr_alloc(); + MPIR_Attribute *new_p = MPID_Attr_alloc(); MPIR_ERR_CHKANDJUMP1(!new_p,mpi_errno,MPI_ERR_OTHER, - "**nomem", "**nomem %s", "MPID_Attribute" ); + "**nomem", "**nomem %s", "MPIR_Attribute" ); /* Did not find in list. Add at end */ new_p->attrType = attrType; new_p->keyval = keyval_ptr; diff --git a/src/mpi/comm/comm_dup.c b/src/mpi/comm/comm_dup.c index 962d10d..4b08f0c 100644 --- a/src/mpi/comm/comm_dup.c +++ b/src/mpi/comm/comm_dup.c @@ -33,7 +33,7 @@ int MPI_Comm_dup(MPI_Comm comm, MPI_Comm *newcomm) __attribute__((weak,alias("PM int MPIR_Comm_dup_impl(MPIR_Comm *comm_ptr, MPIR_Comm **newcomm_ptr) { int mpi_errno = MPI_SUCCESS; - MPID_Attribute *new_attributes = 0; + MPIR_Attribute *new_attributes = 0; /* Copy attributes, executing the attribute copy functions */ /* This accesses the attribute dup function through the perprocess diff --git a/src/mpi/comm/comm_idup.c b/src/mpi/comm/comm_idup.c index 3a4497d..4b4aff9 100644 --- a/src/mpi/comm/comm_idup.c +++ b/src/mpi/comm/comm_idup.c @@ -33,7 +33,7 @@ int MPI_Comm_idup(MPI_Comm comm, MPI_Comm *newcomm, MPI_Request *request) __attr int MPIR_Comm_idup_impl(MPIR_Comm *comm_ptr, MPIR_Comm **newcommp, MPID_Request **reqp) { int mpi_errno = MPI_SUCCESS; - MPID_Attribute *new_attributes = 0; + MPIR_Attribute *new_attributes = 0; /* Copy attributes, executing the attribute copy functions */ /* This accesses the attribute dup function through the perprocess diff --git a/src/mpid/common/datatype/mpidu_datatype.h b/src/mpid/common/datatype/mpidu_datatype.h index 1b65896..b530e1d 100644 --- a/src/mpid/common/datatype/mpidu_datatype.h +++ b/src/mpid/common/datatype/mpidu_datatype.h @@ -414,7 +414,7 @@ typedef struct MPIDU_Datatype { int hetero_dloop_depth; #endif /* MPID_HAS_HETERO */ /* MPI-2 attributes and name */ - struct MPID_Attribute *attributes; + struct MPIR_Attribute *attributes; char name[MPI_MAX_OBJECT_NAME]; /* not yet used; will be used to track what processes have cached http://git.mpich.org/mpich.git/commitdiff/415e17b1c909c0c37178d94349a47cede… commit 415e17b1c909c0c37178d94349a47cedecc54832 Author: Wesley Bland <wesley.bland(a)intel.com> Date: Mon Apr 18 16:27:31 2016 -0500 Rename MPID_Comm to MPIR_Comm Change the namespacing of MPID_Comm to MPIR since it's owned by the upper layer. This commit won't build without the rest of the MPI object namespacing commits since they are not separable. Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/src/glue/romio/glue_romio.c b/src/glue/romio/glue_romio.c index c44928d..4f421c7 100644 --- a/src/glue/romio/glue_romio.c +++ b/src/glue/romio/glue_romio.c @@ -101,10 +101,10 @@ fn_fail: * node ids */ int MPIR_Get_node_id(MPI_Comm comm, int rank, int *id) { - MPID_Comm *comm_ptr; + MPIR_Comm *comm_ptr; MPID_Node_id_t node_id; - MPID_Comm_get_ptr(comm, comm_ptr); + MPIR_Comm_get_ptr(comm, comm_ptr); MPID_Get_node_id(comm_ptr, rank, &node_id); *id = node_id; diff --git a/src/include/mpibsend.h b/src/include/mpibsend.h index 91996d7..539ef20 100644 --- a/src/include/mpibsend.h +++ b/src/include/mpibsend.h @@ -47,7 +47,7 @@ typedef enum { } MPIR_Bsend_kind_t; struct MPID_Request; -struct MPID_Comm; +struct MPIR_Comm; /* BsendMsg is used to hold all of the message particulars in case a request is not currently available */ @@ -56,7 +56,7 @@ typedef struct MPIR_Bsend_msg { MPI_Aint count; MPI_Datatype dtype; int tag; - struct MPID_Comm *comm_ptr; + struct MPIR_Comm *comm_ptr; int dest; } MPIR_Bsend_msg_t; diff --git a/src/include/mpierror.h b/src/include/mpierror.h index 5a68de7..db5e20c 100644 --- a/src/include/mpierror.h +++ b/src/include/mpierror.h @@ -11,12 +11,12 @@ #define MPIR_ERR_FATAL 1 #define MPIR_ERR_RECOVERABLE 0 -struct MPID_Comm; +struct MPIR_Comm; struct MPID_Win; /*struct MPID_File;*/ /* Bindings for internal routines */ -int MPIR_Err_return_comm( struct MPID_Comm *, const char [], int ); +int MPIR_Err_return_comm( struct MPIR_Comm *, const char [], int ); int MPIR_Err_return_win( struct MPID_Win *, const char [], int ); /*int MPIR_Err_return_file( struct MPID_File *, const char [], int );*/ #ifdef MPI__FILE_DEFINED @@ -181,7 +181,7 @@ int MPIR_Err_set_msg( int code, const char *msg_string ); /* This routine is called when there is a fatal error. Now public because file * error handling is defined in a separate file from comm and win, but all * three need to call it */ -void MPIR_Handle_fatal_error(struct MPID_Comm *comm_ptr, +void MPIR_Handle_fatal_error(struct MPIR_Comm *comm_ptr, const char fcname[], int errcode); #define MPIR_ERR_CLASS_MASK 0x0000007f diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index b33d07f..94a50fe 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -398,7 +398,7 @@ void MPIR_DatatypeAttrFinalize( void ); /* FIXME: the masks should be defined with the handle definitions instead of inserted here as literals */ -#define MPID_Comm_get_ptr(a,ptr) MPID_Getb_ptr(Comm,a,0x03ffffff,ptr) +#define MPIR_Comm_get_ptr(a,ptr) MPID_Getb_ptr(Comm,a,0x03ffffff,ptr) #define MPID_Group_get_ptr(a,ptr) MPID_Getb_ptr(Group,a,0x03ffffff,ptr) #define MPID_File_get_ptr(a,ptr) MPID_Get_ptr(File,a,ptr) #define MPID_Errhandler_get_ptr(a,ptr) MPID_Getb_ptr(Errhandler,a,0x3,ptr) @@ -449,7 +449,7 @@ void MPIR_DatatypeAttrFinalize( void ); for now */ /* ticket #1441: check (refcount<=0) to cover the case of 0, an "over-free" of * -1 or similar, and the 0xecec... case when --enable-g=mem is used */ -#define MPID_Comm_valid_ptr(ptr,err,ignore_rev) { \ +#define MPIR_Comm_valid_ptr(ptr,err,ignore_rev) { \ MPID_Valid_ptr_class(Comm,ptr,MPI_ERR_COMM,err); \ if ((ptr) && MPIU_Object_get_ref(ptr) <= 0) { \ MPIR_ERR_SET(err,MPI_ERR_COMM,"**comm"); \ @@ -1125,7 +1125,7 @@ typedef enum { typedef struct MPIR_Comm_map { MPIR_Comm_map_type_t type; - struct MPID_Comm *src_comm; + struct MPIR_Comm *src_comm; /* mapping direction for intercomms, which contain local and * remote groups */ @@ -1139,16 +1139,16 @@ typedef struct MPIR_Comm_map { struct MPIR_Comm_map *next; } MPIR_Comm_map_t; -int MPIR_Comm_map_irregular(struct MPID_Comm *newcomm, struct MPID_Comm *src_comm, +int MPIR_Comm_map_irregular(struct MPIR_Comm *newcomm, struct MPIR_Comm *src_comm, int *src_mapping, int src_mapping_size, MPIR_Comm_map_dir_t dir, MPIR_Comm_map_t **map); -int MPIR_Comm_map_dup(struct MPID_Comm *newcomm, struct MPID_Comm *src_comm, +int MPIR_Comm_map_dup(struct MPIR_Comm *newcomm, struct MPIR_Comm *src_comm, MPIR_Comm_map_dir_t dir); -int MPIR_Comm_map_free(struct MPID_Comm *comm); +int MPIR_Comm_map_free(struct MPIR_Comm *comm); /*S - MPID_Comm - Description of the Communicator data structure + MPIR_Comm - Description of the Communicator data structure Notes: Note that the size and rank duplicate data in the groups that @@ -1208,7 +1208,7 @@ int MPIR_Comm_map_free(struct MPID_Comm *comm); health? For example, ok, failure detected, all (live) members of failed communicator have acked. S*/ -typedef struct MPID_Comm { +typedef struct MPIR_Comm { MPIU_OBJECT_HEADER; /* adds handle and ref_count fields */ MPID_Thread_mutex_t mutex; MPIU_Context_id_t context_id; /* Send context id. See notes */ @@ -1223,13 +1223,13 @@ typedef struct MPID_Comm { MPID_Comm_kind_t comm_kind; /* MPID_INTRACOMM or MPID_INTERCOMM */ char name[MPI_MAX_OBJECT_NAME]; /* Required for MPI-2 */ MPID_Errhandler *errhandler; /* Pointer to the error handler structure */ - struct MPID_Comm *local_comm; /* Defined only for intercomms, holds + struct MPIR_Comm *local_comm; /* Defined only for intercomms, holds an intracomm for the local group */ MPID_Comm_hierarchy_kind_t hierarchy_kind; /* flat, parent, node, or node_roots */ - struct MPID_Comm *node_comm; /* Comm of processes in this comm that are on + struct MPIR_Comm *node_comm; /* Comm of processes in this comm that are on the same node as this process. */ - struct MPID_Comm *node_roots_comm; /* Comm of root processes for other nodes. */ + struct MPIR_Comm *node_roots_comm; /* Comm of root processes for other nodes. */ int *intranode_table; /* intranode_table[i] gives the rank in node_comm of rank i in this comm or -1 if i is not in this process' node_comm. @@ -1245,7 +1245,7 @@ typedef struct MPID_Comm { intercommunicator collective operations that wish to use half-duplex operations to implement a full-duplex operation */ - struct MPID_Comm *comm_next;/* Provides a chain through all active + struct MPIR_Comm *comm_next;/* Provides a chain through all active communicators */ struct MPID_Collops *coll_fns; /* Pointer to a table of functions implementing the collective @@ -1276,8 +1276,8 @@ typedef struct MPID_Comm { #ifdef MPID_DEV_COMM_DECL MPID_DEV_COMM_DECL #endif -} MPID_Comm; -extern MPIU_Object_alloc_t MPID_Comm_mem; +} MPIR_Comm; +extern MPIU_Object_alloc_t MPIR_Comm_mem; typedef struct MPIR_Gpid { #ifdef MPID_DEV_GPID_DECL @@ -1288,7 +1288,7 @@ typedef struct MPIR_Gpid { }MPIR_Gpid; /* this function should not be called by normal code! */ -int MPIR_Comm_delete_internal(MPID_Comm * comm_ptr); +int MPIR_Comm_delete_internal(MPIR_Comm * comm_ptr); #define MPIR_Comm_add_ref(_comm) \ do { MPIU_Object_add_ref((_comm)); } while (0) @@ -1307,7 +1307,7 @@ int MPIR_Comm_delete_internal(MPID_Comm * comm_ptr); #define FUNCNAME MPIR_Comm_release #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIR_Comm_release(MPID_Comm * comm_ptr) +static inline int MPIR_Comm_release(MPIR_Comm * comm_ptr) { int mpi_errno = MPI_SUCCESS; int in_use; @@ -1329,18 +1329,18 @@ static inline int MPIR_Comm_release(MPID_Comm * comm_ptr) /* MPIR_Comm_release_always is the same as MPIR_Comm_release except it uses MPIR_Comm_release_ref_always instead. */ -int MPIR_Comm_release_always(MPID_Comm *comm_ptr); +int MPIR_Comm_release_always(MPIR_Comm *comm_ptr); /* applies the specified info chain to the specified communicator */ -int MPIR_Comm_apply_hints(MPID_Comm *comm_ptr, MPID_Info *info_ptr); +int MPIR_Comm_apply_hints(MPIR_Comm *comm_ptr, MPID_Info *info_ptr); /* Preallocated comm objects. There are 3: comm_world, comm_self, and a private (non-user accessible) dup of comm world that is provided if needed in MPI_Finalize. Having a separate version of comm_world avoids possible interference with User code */ #define MPID_COMM_N_BUILTIN 3 -extern MPID_Comm MPID_Comm_builtin[MPID_COMM_N_BUILTIN]; -extern MPID_Comm MPID_Comm_direct[]; +extern MPIR_Comm MPID_Comm_builtin[MPID_COMM_N_BUILTIN]; +extern MPIR_Comm MPIR_Comm_direct[]; /* This is the handle for the internal MPI_COMM_WORLD . The "2" at the end of the handle is 3-1 (e.g., the index in the builtin array) */ #define MPIR_ICOMM_WORLD ((MPI_Comm)0x44000002) @@ -1427,8 +1427,8 @@ extern MPID_Comm MPID_Comm_direct[]; with the other comm routines (src/mpi/comm, in mpicomm.h). However, to create a new communicator after a spawn or connect-accept operation, the device may need to create a new contextid */ -int MPIR_Get_contextid_sparse(MPID_Comm *comm_ptr, MPIU_Context_id_t *context_id, int ignore_id); -int MPIR_Get_contextid_sparse_group(MPID_Comm *comm_ptr, MPID_Group *group_ptr, int tag, MPIU_Context_id_t *context_id, int ignore_id); +int MPIR_Get_contextid_sparse(MPIR_Comm *comm_ptr, MPIU_Context_id_t *context_id, int ignore_id); +int MPIR_Get_contextid_sparse_group(MPIR_Comm *comm_ptr, MPID_Group *group_ptr, int tag, MPIU_Context_id_t *context_id, int ignore_id); void MPIR_Free_contextid( MPIU_Context_id_t ); /* ------------------------------------------------------------------------- */ @@ -1509,7 +1509,7 @@ typedef struct MPID_Request { list of requests */ MPIR_cc_t *cc_ptr; /* A comm is needed to find the proper error handler */ - MPID_Comm *comm; + MPIR_Comm *comm; /* completion counter. Ensure cc and status are in the same cache line, assuming the cache line size is a multiple of 32 bytes and 32-bit integers */ @@ -1578,8 +1578,8 @@ void MPIR_WaitForDebugger( void ); void MPIR_DebuggerSetAborting( const char * ); void MPIR_Sendq_remember(MPID_Request *, int, int, int ); void MPIR_Sendq_forget(MPID_Request *); -void MPIR_CommL_remember( MPID_Comm * ); -void MPIR_CommL_forget( MPID_Comm * ); +void MPIR_CommL_remember( MPIR_Comm * ); +void MPIR_CommL_forget( MPIR_Comm * ); #define MPIR_SENDQ_REMEMBER(_a,_b,_c,_d) MPIR_Sendq_remember(_a,_b,_c,_d) #define MPIR_SENDQ_FORGET(_a) MPIR_Sendq_forget(_a) @@ -1592,17 +1592,17 @@ void MPIR_CommL_forget( MPID_Comm * ); #define MPIR_COMML_FORGET(_a) #endif -/* must come after MPID_Comm is declared/defined */ -int MPIR_Get_contextid_nonblock(MPID_Comm *comm_ptr, MPID_Comm *newcommp, MPID_Request **req); -int MPIR_Get_intercomm_contextid_nonblock(MPID_Comm *comm_ptr, MPID_Comm *newcommp, MPID_Request **req); +/* must come after MPIR_Comm is declared/defined */ +int MPIR_Get_contextid_nonblock(MPIR_Comm *comm_ptr, MPIR_Comm *newcommp, MPID_Request **req); +int MPIR_Get_intercomm_contextid_nonblock(MPIR_Comm *comm_ptr, MPIR_Comm *newcommp, MPID_Request **req); /* ------------------------------------------------------------------------- */ /* Prototypes and definitions for the node ID code. This is used to support hierarchical collectives in a (mostly) device-independent way. */ #if defined(MPID_USE_NODE_IDS) /* MPID_Node_id_t is a signed integer type defined by the device in mpidpre.h. */ -int MPID_Get_node_id(MPID_Comm *comm, int rank, MPID_Node_id_t *id_p); -int MPID_Get_max_node_id(MPID_Comm *comm, MPID_Node_id_t *max_id_p); +int MPID_Get_node_id(MPIR_Comm *comm, int rank, MPID_Node_id_t *id_p); +int MPID_Get_max_node_id(MPIR_Comm *comm, MPID_Node_id_t *max_id_p); #endif /* ------------------------------------------------------------------------- */ @@ -1668,7 +1668,7 @@ typedef struct MPID_Win { MPI_Aint size; int disp_unit; /* Displacement unit of *local* window */ MPID_Attribute *attributes; - MPID_Comm *comm_ptr; /* Pointer to comm of window (dup) */ + MPIR_Comm *comm_ptr; /* Pointer to comm of window (dup) */ #ifdef USE_THREADED_WINDOW_CODE /* These were causing compilation errors. We need to figure out how to integrate threads into MPICH before including these fields. */ @@ -1913,121 +1913,121 @@ extern MPIU_Object_alloc_t MPID_Op_mem; typedef struct MPID_Collops { int ref_count; /* Supports lazy copies */ /* Contains pointers to the functions for the MPI collectives */ - int (*Barrier) (MPID_Comm *, MPIR_Errflag_t *); - int (*Bcast) (void*, int, MPI_Datatype, int, MPID_Comm *, MPIR_Errflag_t *); + int (*Barrier) (MPIR_Comm *, MPIR_Errflag_t *); + int (*Bcast) (void*, int, MPI_Datatype, int, MPIR_Comm *, MPIR_Errflag_t *); int (*Gather) (const void*, int, MPI_Datatype, void*, int, MPI_Datatype, - int, MPID_Comm *, MPIR_Errflag_t *); + int, MPIR_Comm *, MPIR_Errflag_t *); int (*Gatherv) (const void*, int, MPI_Datatype, void*, const int *, const int *, - MPI_Datatype, int, MPID_Comm *, MPIR_Errflag_t *); + MPI_Datatype, int, MPIR_Comm *, MPIR_Errflag_t *); int (*Scatter) (const void*, int, MPI_Datatype, void*, int, MPI_Datatype, - int, MPID_Comm *, MPIR_Errflag_t *); + int, MPIR_Comm *, MPIR_Errflag_t *); int (*Scatterv) (const void*, const int *, const int *, MPI_Datatype, - void*, int, MPI_Datatype, int, MPID_Comm *, MPIR_Errflag_t *); + void*, int, MPI_Datatype, int, MPIR_Comm *, MPIR_Errflag_t *); int (*Allgather) (const void*, int, MPI_Datatype, void*, int, - MPI_Datatype, MPID_Comm *, MPIR_Errflag_t *); + MPI_Datatype, MPIR_Comm *, MPIR_Errflag_t *); int (*Allgatherv) (const void*, int, MPI_Datatype, void*, const int *, - const int *, MPI_Datatype, MPID_Comm *, MPIR_Errflag_t *); + const int *, MPI_Datatype, MPIR_Comm *, MPIR_Errflag_t *); int (*Alltoall) (const void*, int, MPI_Datatype, void*, int, MPI_Datatype, - MPID_Comm *, MPIR_Errflag_t *); + MPIR_Comm *, MPIR_Errflag_t *); int (*Alltoallv) (const void*, const int *, const int *, MPI_Datatype, - void*, const int *, const int *, MPI_Datatype, MPID_Comm *, + void*, const int *, const int *, MPI_Datatype, MPIR_Comm *, MPIR_Errflag_t *); int (*Alltoallw) (const void*, const int *, const int *, const MPI_Datatype *, void*, - const int *, const int *, const MPI_Datatype *, MPID_Comm *, MPIR_Errflag_t *); + const int *, const int *, const MPI_Datatype *, MPIR_Comm *, MPIR_Errflag_t *); int (*Reduce) (const void*, void*, int, MPI_Datatype, MPI_Op, int, - MPID_Comm *, MPIR_Errflag_t *); + MPIR_Comm *, MPIR_Errflag_t *); int (*Allreduce) (const void*, void*, int, MPI_Datatype, MPI_Op, - MPID_Comm *, MPIR_Errflag_t *); + MPIR_Comm *, MPIR_Errflag_t *); int (*Reduce_scatter) (const void*, void*, const int *, MPI_Datatype, MPI_Op, - MPID_Comm *, MPIR_Errflag_t *); - int (*Scan) (const void*, void*, int, MPI_Datatype, MPI_Op, MPID_Comm *, MPIR_Errflag_t * ); - int (*Exscan) (const void*, void*, int, MPI_Datatype, MPI_Op, MPID_Comm *, MPIR_Errflag_t * ); + MPIR_Comm *, MPIR_Errflag_t *); + int (*Scan) (const void*, void*, int, MPI_Datatype, MPI_Op, MPIR_Comm *, MPIR_Errflag_t * ); + int (*Exscan) (const void*, void*, int, MPI_Datatype, MPI_Op, MPIR_Comm *, MPIR_Errflag_t * ); int (*Reduce_scatter_block) (const void*, void*, int, MPI_Datatype, MPI_Op, - MPID_Comm *, MPIR_Errflag_t *); + MPIR_Comm *, MPIR_Errflag_t *); /* MPI-3 nonblocking collectives */ - int (*Ibarrier_sched)(MPID_Comm *comm_ptr, MPID_Sched_t s); + int (*Ibarrier_sched)(MPIR_Comm *comm_ptr, MPID_Sched_t s); int (*Ibcast_sched)(void *buffer, int count, MPI_Datatype datatype, int root, - MPID_Comm *comm_ptr, MPID_Sched_t s); + MPIR_Comm *comm_ptr, MPID_Sched_t s); int (*Igather_sched)(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, int root, MPID_Comm *comm_ptr, + int recvcount, MPI_Datatype recvtype, int root, MPIR_Comm *comm_ptr, MPID_Sched_t s); int (*Igatherv_sched)(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, int root, - MPID_Comm *comm_ptr, MPID_Sched_t s); + MPIR_Comm *comm_ptr, MPID_Sched_t s); int (*Iscatter_sched)(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, int root, MPID_Comm *comm_ptr, + int recvcount, MPI_Datatype recvtype, int root, MPIR_Comm *comm_ptr, MPID_Sched_t s); int (*Iscatterv_sched)(const void *sendbuf, const int *sendcounts, const int *displs, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPID_Comm *comm_ptr, MPID_Sched_t s); + int root, MPIR_Comm *comm_ptr, MPID_Sched_t s); int (*Iallgather_sched)(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr, + int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s); int (*Iallgatherv_sched)(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, - MPID_Comm *comm_ptr, MPID_Sched_t s); + MPIR_Comm *comm_ptr, MPID_Sched_t s); int (*Ialltoall_sched)(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr, + int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s); int (*Ialltoallv_sched)(const void *sendbuf, const int *sendcounts, const int *sdispls, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, - const int *rdispls, MPI_Datatype recvtype, MPID_Comm *comm_ptr, + const int *rdispls, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s); int (*Ialltoallw_sched)(const void *sendbuf, const int *sendcounts, const int *sdispls, const MPI_Datatype *sendtypes, void *recvbuf, const int *recvcounts, const int *rdispls, const MPI_Datatype *recvtypes, - MPID_Comm *comm_ptr, MPID_Sched_t s); + MPIR_Comm *comm_ptr, MPID_Sched_t s); int (*Ireduce_sched)(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, - int root, MPID_Comm *comm_ptr, MPID_Sched_t s); + int root, MPIR_Comm *comm_ptr, MPID_Sched_t s); int (*Iallreduce_sched)(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, MPID_Comm *comm_ptr, MPID_Sched_t s); + MPI_Op op, MPIR_Comm *comm_ptr, MPID_Sched_t s); int (*Ireduce_scatter_sched)(const void *sendbuf, void *recvbuf, const int *recvcounts, - MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPID_Sched_t s); + MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Sched_t s); int (*Ireduce_scatter_block_sched)(const void *sendbuf, void *recvbuf, int recvcount, - MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Sched_t s); int (*Iscan_sched)(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, - MPID_Comm *comm_ptr, MPID_Sched_t s); + MPIR_Comm *comm_ptr, MPID_Sched_t s); int (*Iexscan_sched)(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, - MPID_Comm *comm_ptr, MPID_Sched_t s); + MPIR_Comm *comm_ptr, MPID_Sched_t s); struct MPID_Collops *prev_coll_fns; /* when overriding this table, set this to point to the old table */ /* MPI-3 neighborhood collectives (blocking & nonblocking) */ int (*Neighbor_allgather)(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPID_Comm *comm_ptr); + MPIR_Comm *comm_ptr); int (*Neighbor_allgatherv)(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int displs[], - MPI_Datatype recvtype, MPID_Comm *comm_ptr); + MPI_Datatype recvtype, MPIR_Comm *comm_ptr); int (*Neighbor_alltoall)(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPID_Comm *comm_ptr); + MPIR_Comm *comm_ptr); int (*Neighbor_alltoallv)(const void *sendbuf, const int sendcounts[], const int sdispls[], MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], - const int rdispls[], MPI_Datatype recvtype, MPID_Comm *comm_ptr); + const int rdispls[], MPI_Datatype recvtype, MPIR_Comm *comm_ptr); int (*Neighbor_alltoallw)(const void *sendbuf, const int sendcounts[], const MPI_Aint sdispls[], const MPI_Datatype sendtypes[], void *recvbuf, const int recvcounts[], const MPI_Aint rdispls[], const MPI_Datatype recvtypes[], - MPID_Comm *comm_ptr); + MPIR_Comm *comm_ptr); int (*Ineighbor_allgather)(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPID_Comm *comm_ptr, MPID_Sched_t s); + MPIR_Comm *comm_ptr, MPID_Sched_t s); int (*Ineighbor_allgatherv)(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int displs[], - MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPID_Sched_t s); + MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s); int (*Ineighbor_alltoall)(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPID_Comm *comm_ptr, MPID_Sched_t s); + MPIR_Comm *comm_ptr, MPID_Sched_t s); int (*Ineighbor_alltoallv)(const void *sendbuf, const int sendcounts[], const int sdispls[], MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], - const int rdispls[], MPI_Datatype recvtype, MPID_Comm *comm_ptr, + const int rdispls[], MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s); int (*Ineighbor_alltoallw)(const void *sendbuf, const int sendcounts[], const MPI_Aint sdispls[], const MPI_Datatype sendtypes[], void *recvbuf, const int recvcounts[], const MPI_Aint rdispls[], const MPI_Datatype recvtypes[], - MPID_Comm *comm_ptr, MPID_Sched_t s); + MPIR_Comm *comm_ptr, MPID_Sched_t s); } MPID_Collops; #define MPIR_BARRIER_TAG 1 @@ -2047,13 +2047,13 @@ typedef struct MPID_Collops { /* ------------------------------------------------------------------------- */ typedef struct MPID_TopoOps { - int (*cartCreate)( const MPID_Comm *, int, const int[], const int [], + int (*cartCreate)( const MPIR_Comm *, int, const int[], const int [], int, MPI_Comm * ); - int (*cartMap) ( const MPID_Comm *, int, const int[], const int [], + int (*cartMap) ( const MPIR_Comm *, int, const int[], const int [], int * ); - int (*graphCreate)( const MPID_Comm *, int, const int[], const int [], + int (*graphCreate)( const MPIR_Comm *, int, const int[], const int [], int, MPI_Comm * ); - int (*graphMap) ( const MPID_Comm *, int, const int[], const int[], + int (*graphMap) ( const MPIR_Comm *, int, const int[], const int[], int * ); } MPID_TopoOps; /* ------------------------------------------------------------------------- */ @@ -2062,7 +2062,7 @@ typedef struct MPID_TopoOps { typedef struct MPID_CommOps { - int (*split_type)(MPID_Comm *, int, int, MPID_Info *, MPID_Comm **); + int (*split_type)(MPIR_Comm *, int, int, MPID_Info *, MPIR_Comm **); } MPID_CommOps; extern struct MPID_CommOps *MPID_Comm_fns; /* Communicator creation functions */ @@ -2091,11 +2091,11 @@ typedef struct MPICH_PerProcess_t { OPA_int_t mpich_state; /* State of MPICH. Use OPA_int_t to make MPI_Initialized() etc. thread-safe per MPI-3.1. See MPI-Forum ticket 357 */ int do_error_checks; /* runtime error check control */ - struct MPID_Comm *comm_world; /* Easy access to comm_world for + struct MPIR_Comm *comm_world; /* Easy access to comm_world for error handler */ - struct MPID_Comm *comm_self; /* Easy access to comm_self */ - struct MPID_Comm *comm_parent; /* Easy access to comm_parent */ - struct MPID_Comm *icomm_world; /* An internal version of comm_world + struct MPIR_Comm *comm_self; /* Easy access to comm_self */ + struct MPIR_Comm *comm_parent; /* Easy access to comm_parent */ + struct MPIR_Comm *icomm_world; /* An internal version of comm_world that is separate from user's versions */ PreDefined_attrs attrs; /* Predefined attribute values */ @@ -2333,10 +2333,10 @@ void MPIR_Add_finalize( int (*routine)( void * ), void *extra, int priority ); #define MPIR_FINALIZE_CALLBACK_DEFAULT_PRIO 0 #define MPIR_FINALIZE_CALLBACK_MAX_PRIO 10 -/*int MPIR_Comm_attr_dup(MPID_Comm *, MPID_Attribute **); - int MPIR_Comm_attr_delete(MPID_Comm *, MPID_Attribute *);*/ -int MPIR_Comm_copy( MPID_Comm *, int, MPID_Comm ** ); -int MPIR_Comm_copy_data(MPID_Comm *comm_ptr, MPID_Comm **outcomm_ptr); +/*int MPIR_Comm_attr_dup(MPIR_Comm *, MPID_Attribute **); + int MPIR_Comm_attr_delete(MPIR_Comm *, MPID_Attribute *);*/ +int MPIR_Comm_copy( MPIR_Comm *, int, MPIR_Comm ** ); +int MPIR_Comm_copy_data(MPIR_Comm *comm_ptr, MPIR_Comm **outcomm_ptr); /* Fortran keyvals are set with functions in mpi_f77interface.h */ #ifdef HAVE_CXX_BINDING @@ -2523,7 +2523,7 @@ int MPID_Init( int *argc_p, char ***argv_p, int requested, /* was: int MPID_Init( int *argc_p, char ***argv_p, int requested, int *provided, - MPID_Comm **parent_comm, int *has_args, int *has_env ); */ + MPIR_Comm **parent_comm, int *has_args, int *has_env ); */ /*@ MPID_InitCompleted - Notify the device that the MPI_Init or MPI_Initthread @@ -2637,7 +2637,7 @@ int MPID_Finalize(void); MPID_CORE @*/ -int MPID_Abort( MPID_Comm *comm, int mpi_errno, int exit_code, const char *error_msg ); +int MPID_Abort( MPIR_Comm *comm, int mpi_errno, int exit_code, const char *error_msg ); int MPID_Open_port(MPID_Info *, char *); int MPID_Close_port(const char *); @@ -2657,7 +2657,7 @@ int MPID_Close_port(const char *); Return Value: 'MPI_SUCCESS' or a valid MPI error code. @*/ -int MPID_Comm_accept(const char *, MPID_Info *, int, MPID_Comm *, MPID_Comm **); +int MPID_Comm_accept(const char *, MPID_Info *, int, MPIR_Comm *, MPIR_Comm **); /*@ MPID_Comm_connect - MPID entry point for MPI_Comm_connect @@ -2674,12 +2674,12 @@ int MPID_Comm_accept(const char *, MPID_Info *, int, MPID_Comm *, MPID_Comm **); Return Value: 'MPI_SUCCESS' or a valid MPI error code. @*/ -int MPID_Comm_connect(const char *, MPID_Info *, int, MPID_Comm *, MPID_Comm **); +int MPID_Comm_connect(const char *, MPID_Info *, int, MPIR_Comm *, MPIR_Comm **); -int MPID_Comm_disconnect(MPID_Comm *); +int MPID_Comm_disconnect(MPIR_Comm *); int MPID_Comm_spawn_multiple(int, char *[], char **[], const int [], MPID_Info* [], - int, MPID_Comm *, MPID_Comm **, int []); + int, MPIR_Comm *, MPIR_Comm **, int []); /*@ MPID_Comm_failure_ack - MPID entry point for MPI_Comm_failure_ack @@ -2690,7 +2690,7 @@ int MPID_Comm_spawn_multiple(int, char *[], char **[], const int [], MPID_Info* Return Value: 'MPI_SUCCESS' or a valid MPI error code. @*/ -int MPID_Comm_failure_ack(MPID_Comm *comm); +int MPID_Comm_failure_ack(MPIR_Comm *comm); /*@ MPID_Comm_failure_get_acked - MPID entry point for MPI_Comm_failure_get_acked @@ -2704,7 +2704,7 @@ int MPID_Comm_failure_ack(MPID_Comm *comm); Return Value: 'MPI_SUCCESS' or a valid MPI error code. @*/ -int MPID_Comm_failure_get_acked(MPID_Comm *comm, MPID_Group **failed_group_ptr); +int MPID_Comm_failure_get_acked(MPIR_Comm *comm, MPID_Group **failed_group_ptr); /*@ MPID_Comm_get_all_failed_procs - Constructs a group of failed processes that it uniform over a communicator @@ -2719,7 +2719,7 @@ int MPID_Comm_failure_get_acked(MPID_Comm *comm, MPID_Group **failed_group_ptr); Return Value: 'MPI_SUCCESS' or a valid MPI error code. @*/ -int MPID_Comm_get_all_failed_procs(MPID_Comm *comm_ptr, MPID_Group **failed_group, int tag); +int MPID_Comm_get_all_failed_procs(MPIR_Comm *comm_ptr, MPID_Group **failed_group, int tag); /*@ MPID_Comm_revoke - MPID entry point for MPI_Comm_revoke @@ -2731,7 +2731,7 @@ int MPID_Comm_get_all_failed_procs(MPID_Comm *comm_ptr, MPID_Group **failed_grou Return Value: 'MPI_SUCCESS' or a valid MPI error code. @*/ -int MPID_Comm_revoke(MPID_Comm *comm, int is_remote); +int MPID_Comm_revoke(MPIR_Comm *comm, int is_remote); /*@ MPID_Send - MPID entry point for MPI_Send @@ -2755,7 +2755,7 @@ int MPID_Comm_revoke(MPID_Comm *comm, int is_remote); @*/ int MPID_Send( const void *buf, MPI_Aint count, MPI_Datatype datatype, - int dest, int tag, MPID_Comm *comm, int context_offset, + int dest, int tag, MPIR_Comm *comm, int context_offset, MPID_Request **request ); /*@ @@ -2780,7 +2780,7 @@ int MPID_Send( const void *buf, MPI_Aint count, MPI_Datatype datatype, @*/ int MPID_Rsend( const void *buf, int count, MPI_Datatype datatype, - int dest, int tag, MPID_Comm *comm, int context_offset, + int dest, int tag, MPIR_Comm *comm, int context_offset, MPID_Request **request ); /*@ @@ -2805,7 +2805,7 @@ int MPID_Rsend( const void *buf, int count, MPI_Datatype datatype, @*/ int MPID_Ssend( const void *buf, MPI_Aint count, MPI_Datatype datatype, - int dest, int tag, MPID_Comm *comm, int context_offset, + int dest, int tag, MPIR_Comm *comm, int context_offset, MPID_Request **request ); /*@ @@ -2842,7 +2842,7 @@ int MPID_Ssend( const void *buf, MPI_Aint count, MPI_Datatype datatype, Communication @*/ int MPID_tBsend( const void *buf, int count, MPI_Datatype datatype, - int dest, int tag, MPID_Comm *comm, int context_offset ); + int dest, int tag, MPIR_Comm *comm, int context_offset ); /*@ MPID_Isend - MPID entry point for MPI_Isend @@ -2860,7 +2860,7 @@ int MPID_tBsend( const void *buf, int count, MPI_Datatype datatype, @*/ int MPID_Isend( const void *buf, MPI_Aint count, MPI_Datatype datatype, - int dest, int tag, MPID_Comm *comm, int context_offset, + int dest, int tag, MPIR_Comm *comm, int context_offset, MPID_Request **request ); /*@ @@ -2879,7 +2879,7 @@ int MPID_Isend( const void *buf, MPI_Aint count, MPI_Datatype datatype, @*/ int MPID_Irsend( const void *buf, int count, MPI_Datatype datatype, - int dest, int tag, MPID_Comm *comm, int context_offset, + int dest, int tag, MPIR_Comm *comm, int context_offset, MPID_Request **request ); /*@ @@ -2898,7 +2898,7 @@ int MPID_Irsend( const void *buf, int count, MPI_Datatype datatype, @*/ int MPID_Issend( const void *buf, int count, MPI_Datatype datatype, - int dest, int tag, MPID_Comm *comm, int context_offset, + int dest, int tag, MPIR_Comm *comm, int context_offset, MPID_Request **request ); /*@ @@ -2920,7 +2920,7 @@ int MPID_Issend( const void *buf, int count, MPI_Datatype datatype, @*/ int MPID_Recv( void *buf, MPI_Aint count, MPI_Datatype datatype, - int source, int tag, MPID_Comm *comm, int context_offset, + int source, int tag, MPIR_Comm *comm, int context_offset, MPI_Status *status, MPID_Request **request ); @@ -2940,7 +2940,7 @@ int MPID_Recv( void *buf, MPI_Aint count, MPI_Datatype datatype, @*/ int MPID_Irecv( void *buf, MPI_Aint count, MPI_Datatype datatype, - int source, int tag, MPID_Comm *comm, int context_offset, + int source, int tag, MPIR_Comm *comm, int context_offset, MPID_Request **request ); /*@ @@ -2959,10 +2959,10 @@ int MPID_Irecv( void *buf, MPI_Aint count, MPI_Datatype datatype, @*/ int MPID_Send_init( const void *buf, int count, MPI_Datatype datatype, - int dest, int tag, MPID_Comm *comm, int context_offset, + int dest, int tag, MPIR_Comm *comm, int context_offset, MPID_Request **request ); -int MPID_Bsend_init(const void *, int, MPI_Datatype, int, int, MPID_Comm *, +int MPID_Bsend_init(const void *, int, MPI_Datatype, int, int, MPIR_Comm *, int, MPID_Request **); /*@ MPID_Rsend_init - MPID entry point for MPI_Rsend_init @@ -2980,7 +2980,7 @@ int MPID_Bsend_init(const void *, int, MPI_Datatype, int, int, MPID_Comm *, @*/ int MPID_Rsend_init( const void *buf, int count, MPI_Datatype datatype, - int dest, int tag, MPID_Comm *comm, int context_offset, + int dest, int tag, MPIR_Comm *comm, int context_offset, MPID_Request **request ); /*@ MPID_Ssend_init - MPID entry point for MPI_Ssend_init @@ -2998,7 +2998,7 @@ int MPID_Rsend_init( const void *buf, int count, MPI_Datatype datatype, @*/ int MPID_Ssend_init( const void *buf, int count, MPI_Datatype datatype, - int dest, int tag, MPID_Comm *comm, int context_offset, + int dest, int tag, MPIR_Comm *comm, int context_offset, MPID_Request **request ); /*@ @@ -3017,7 +3017,7 @@ int MPID_Ssend_init( const void *buf, int count, MPI_Datatype datatype, @*/ int MPID_Recv_init( void *buf, int count, MPI_Datatype datatype, - int source, int tag, MPID_Comm *comm, int context_offset, + int source, int tag, MPIR_Comm *comm, int context_offset, MPID_Request **request ); /*@ @@ -3069,7 +3069,7 @@ int MPID_Startall(int count, MPID_Request *requests[]); Request @*/ -int MPID_Probe(int, int, MPID_Comm *, int, MPI_Status *); +int MPID_Probe(int, int, MPIR_Comm *, int, MPI_Status *); /*@ MPID_Iprobe - Look for a matching request in the receive queue but do not remove or return it @@ -3111,7 +3111,7 @@ int MPID_Probe(int, int, MPID_Comm *, int, MPI_Status *); Request @*/ -int MPID_Iprobe(int, int, MPID_Comm *, int, int *, MPI_Status *); +int MPID_Iprobe(int, int, MPIR_Comm *, int, int *, MPI_Status *); /*@ MPID_Mprobe - Block until a matching request is found and return information @@ -3140,7 +3140,7 @@ int MPID_Iprobe(int, int, MPID_Comm *, int, int *, MPI_Status *); Request @*/ -int MPID_Mprobe(int source, int tag, MPID_Comm *comm, int context_offset, +int MPID_Mprobe(int source, int tag, MPIR_Comm *comm, int context_offset, MPID_Request **message, MPI_Status *status); /*@ @@ -3171,7 +3171,7 @@ int MPID_Mprobe(int source, int tag, MPID_Comm *comm, int context_offset, Request @*/ -int MPID_Improbe(int source, int tag, MPID_Comm *comm, int context_offset, +int MPID_Improbe(int source, int tag, MPIR_Comm *comm, int context_offset, int *flag, MPID_Request **message, MPI_Status *status); /*@ @@ -3280,7 +3280,7 @@ int MPID_Cancel_recv(MPID_Request *); 0 - The communicator will not currently permit anysource operations 1 - The communicator will currently permit anysource operations @*/ -int MPID_Comm_AS_enabled(MPID_Comm *); +int MPID_Comm_AS_enabled(MPIR_Comm *); /*@ MPID_Request_is_anysource - Query whether the request is an anysource receive @@ -3321,7 +3321,7 @@ MPI_Aint MPID_Aint_diff(MPI_Aint addr1, MPI_Aint addr2); /* MPI-2 RMA Routines */ -int MPID_Win_create(void *, MPI_Aint, int, MPID_Info *, MPID_Comm *, +int MPID_Win_create(void *, MPI_Aint, int, MPID_Info *, MPIR_Comm *, MPID_Win **); int MPID_Win_free(MPID_Win **); @@ -3345,12 +3345,12 @@ int MPID_Win_unlock(int dest, MPID_Win *win_ptr); /* MPI-3 RMA Routines */ int MPID_Win_allocate(MPI_Aint size, int disp_unit, MPID_Info *info, - MPID_Comm *comm, void *baseptr, MPID_Win **win); -int MPID_Win_allocate_shared(MPI_Aint size, int disp_unit, MPID_Info *info_ptr, MPID_Comm *comm_ptr, + MPIR_Comm *comm, void *baseptr, MPID_Win **win); +int MPID_Win_allocate_shared(MPI_Aint size, int disp_unit, MPID_Info *info_ptr, MPIR_Comm *comm_ptr, void *base_ptr, MPID_Win **win_ptr); int MPID_Win_shared_query(MPID_Win *win, int rank, MPI_Aint *size, int *disp_unit, void *baseptr); -int MPID_Win_create_dynamic(MPID_Info *info, MPID_Comm *comm, MPID_Win **win); +int MPID_Win_create_dynamic(MPID_Info *info, MPIR_Comm *comm, MPID_Win **win); int MPID_Win_attach(MPID_Win *win, void *base, MPI_Aint size); int MPID_Win_detach(MPID_Win *win, const void *base); int MPID_Win_get_info(MPID_Win *win, MPID_Info **info_used); @@ -3646,7 +3646,7 @@ typedef struct MPID_Grequest_class { Module: Topology @*/ -int MPID_Topo_cluster_info( MPID_Comm *comm, +int MPID_Topo_cluster_info( MPIR_Comm *comm, int *levels, int my_cluster[], int my_rank[] ); /*@ @@ -3703,7 +3703,7 @@ int MPID_Get_universe_size(int * universe_size); to which it is connected. These are local process ids because different processes may use different ids to identify the same target process @*/ -int MPID_Comm_get_lpid(MPID_Comm *comm_ptr, int idx, int * lpid_ptr, MPIU_BOOL is_remote); +int MPID_Comm_get_lpid(MPIR_Comm *comm_ptr, int idx, int * lpid_ptr, MPIU_BOOL is_remote); /* prototypes and declarations for the MPID_Sched interface for nonblocking * collectives */ @@ -3791,25 +3791,25 @@ int MPIC_Probe(int source, int tag, MPI_Comm comm, MPI_Status *status); /* FT versions of te MPIC_ functions */ int MPIC_Send(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, - MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag); + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag); int MPIC_Recv(void *buf, MPI_Aint count, MPI_Datatype datatype, int source, int tag, - MPID_Comm *comm_ptr, MPI_Status *status, MPIR_Errflag_t *errflag); + MPIR_Comm *comm_ptr, MPI_Status *status, MPIR_Errflag_t *errflag); int MPIC_Ssend(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, - MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag); + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag); int MPIC_Sendrecv(const void *sendbuf, MPI_Aint sendcount, MPI_Datatype sendtype, int dest, int sendtag, void *recvbuf, MPI_Aint recvcount, MPI_Datatype recvtype, int source, int recvtag, - MPID_Comm *comm_ptr, MPI_Status *status, MPIR_Errflag_t *errflag); + MPIR_Comm *comm_ptr, MPI_Status *status, MPIR_Errflag_t *errflag); int MPIC_Sendrecv_replace(void *buf, int count, MPI_Datatype datatype, int dest, int sendtag, int source, int recvtag, - MPID_Comm *comm_ptr, MPI_Status *status, MPIR_Errflag_t *errflag); + MPIR_Comm *comm_ptr, MPI_Status *status, MPIR_Errflag_t *errflag); int MPIC_Isend(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, - MPID_Comm *comm_ptr, MPID_Request **request, MPIR_Errflag_t *errflag); + MPIR_Comm *comm_ptr, MPID_Request **request, MPIR_Errflag_t *errflag); int MPIC_Issend(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, - MPID_Comm *comm_ptr, MPID_Request **request, MPIR_Errflag_t *errflag); + MPIR_Comm *comm_ptr, MPID_Request **request, MPIR_Errflag_t *errflag); int MPIC_Irecv(void *buf, MPI_Aint count, MPI_Datatype datatype, int source, - int tag, MPID_Comm *comm_ptr, MPID_Request **request); + int tag, MPIR_Comm *comm_ptr, MPID_Request **request); int MPIC_Waitall(int numreq, MPID_Request *requests[], MPI_Status statuses[], MPIR_Errflag_t *errflag); @@ -3857,336 +3857,336 @@ int MPIR_Compare_equal(const void *a, const void *b, MPI_Datatype type); int MPIR_Allgather_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag ); + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag ); int MPIR_Allgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag ); + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag ); int MPIR_Allgather_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag ); + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag ); int MPIR_Allgather_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag ); + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag ); int MPIR_Allgatherv_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, - MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag ); + MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag ); int MPIR_Allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, - MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag ); + MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag ); int MPIR_Allgatherv_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, - MPI_Datatype recvtype, MPID_Comm *comm_pt, MPIR_Errflag_t *errflag ); + MPI_Datatype recvtype, MPIR_Comm *comm_pt, MPIR_Errflag_t *errflag ); int MPIR_Allgatherv_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, - MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag ); + MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag ); int MPIR_Allreduce_impl(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag); + MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag); int MPIR_Allreduce(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag); + MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag); int MPIR_Allreduce_intra(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag); + MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag); int MPIR_Allreduce_inter(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag); + MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag); int MPIR_Alltoall_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag); + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag); int MPIR_Alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag); + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag); int MPIR_Alltoall_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag); + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag); int MPIR_Alltoall_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag); + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag); int MPIR_Alltoallv_impl(const void *sendbuf, const int *sendcnts, const int *sdispls, MPI_Datatype sendtype, void *recvbuf, const int *recvcnts, - const int *rdispls, MPI_Datatype recvtype, MPID_Comm *comm_ptr, + const int *rdispls, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag); int MPIR_Alltoallv(const void *sendbuf, const int *sendcnts, const int *sdispls, MPI_Datatype sendtype, void *recvbuf, const int *recvcnts, - const int *rdispls, MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag); + const int *rdispls, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag); int MPIR_Alltoallv_intra(const void *sendbuf, const int *sendcnts, const int *sdispls, MPI_Datatype sendtype, void *recvbuf, const int *recvcnts, - const int *rdispls, MPI_Datatype recvtype, MPID_Comm *comm_ptr, + const int *rdispls, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag); int MPIR_Alltoallv_inter(const void *sendbuf, const int *sendcnts, const int *sdispls, MPI_Datatype sendtype, void *recvbuf, const int *recvcnts, const int *rdispls, MPI_Datatype recvtype, - MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag); + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag); int MPIR_Alltoallw_impl(const void *sendbuf, const int *sendcnts, const int *sdispls, const MPI_Datatype *sendtypes, void *recvbuf, const int *recvcnts, - const int *rdispls, const MPI_Datatype *recvtypes, MPID_Comm *comm_ptr, + const int *rdispls, const MPI_Datatype *recvtypes, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag); int MPIR_Alltoallw(const void *sendbuf, const int *sendcnts, const int *sdispls, const MPI_Datatype *sendtypes, void *recvbuf, const int *recvcnts, - const int *rdispls, const MPI_Datatype *recvtypes, MPID_Comm *comm_ptr, + const int *rdispls, const MPI_Datatype *recvtypes, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag); int MPIR_Alltoallw_intra(const void *sendbuf, const int *sendcnts, const int *sdispls, const MPI_Datatype *sendtypes, void *recvbuf, const int *recvcnts, - const int *rdispls, const MPI_Datatype *recvtypes, MPID_Comm *comm_ptr, + const int *rdispls, const MPI_Datatype *recvtypes, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag); int MPIR_Alltoallw_inter(const void *sendbuf, const int *sendcnts, const int *sdispls, const MPI_Datatype *sendtypes, void *recvbuf, const int *recvcnts, const int *rdispls, const MPI_Datatype *recvtypes, - MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag); + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag); int MPIR_Bcast_inter(void *buffer, int count, MPI_Datatype datatype, - int root, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag); + int root, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag); int MPIR_Bcast_intra (void *buffer, int count, MPI_Datatype datatype, int - root, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag); + root, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag); int MPIR_Bcast (void *buffer, int count, MPI_Datatype datatype, int - root, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag); + root, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag); int MPIR_Bcast_impl (void *buffer, int count, MPI_Datatype datatype, int - root, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag); + root, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag); int MPIR_Exscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag ); + MPI_Op op, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag ); int MPIR_Exscan_impl(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag ); + MPI_Op op, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag ); int MPIR_Gather_impl (const void *sendbuf, int sendcnt, MPI_Datatype sendtype, void *recvbuf, int recvcnt, MPI_Datatype recvtype, - int root, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag); + int root, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag); int MPIR_Gather (const void *sendbuf, int sendcnt, MPI_Datatype sendtype, void *recvbuf, int recvcnt, MPI_Datatype recvtype, - int root, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag); + int root, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag); int MPIR_Gather_intra (const void *sendbuf, int sendcnt, MPI_Datatype sendtype, void *recvbuf, int recvcnt, MPI_Datatype recvtype, - int root, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag); + int root, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag); int MPIR_Gather_inter (const void *sendbuf, int sendcnt, MPI_Datatype sendtype, void *recvbuf, int recvcnt, MPI_Datatype recvtype, - int root, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag ); + int root, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag ); int MPIR_Gatherv (const void *sendbuf, int sendcnt, MPI_Datatype sendtype, void *recvbuf, const int *recvcnts, const int *displs, - MPI_Datatype recvtype, int root, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag); + MPI_Datatype recvtype, int root, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag); int MPIR_Gatherv_impl (const void *sendbuf, int sendcnt, MPI_Datatype sendtype, void *recvbuf, const int *recvcnts, const int *displs, - MPI_Datatype recvtype, int root, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag); + MPI_Datatype recvtype, int root, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag); int MPIR_Reduce_scatter_impl(const void *sendbuf, void *recvbuf, const int *recvcnts, - MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag); + MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag); int MPIR_Reduce_scatter(const void *sendbuf, void *recvbuf, const int *recvcnts, - MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag); + MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag); int MPIR_Reduce_scatter_intra(const void *sendbuf, void *recvbuf, const int *recvcnts, - MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag); + MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag); int MPIR_Reduce_scatter_inter(const void *sendbuf, void *recvbuf, const int *recvcnts, MPI_Datatype datatype, MPI_Op op, - MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag); + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag); int MPIR_Reduce_scatter_block_impl(const void *sendbuf, void *recvbuf, int recvcount, - MPI_Datatype datatype, MPI_Op op, MPID_Comm + MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag ); int MPIR_Reduce_scatter_block(const void *sendbuf, void *recvbuf, int recvcount, - MPI_Datatype datatype, MPI_Op op, MPID_Comm + MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag ); int MPIR_Reduce_scatter_block_intra(const void *sendbuf, void *recvbuf, int recvcount, - MPI_Datatype datatype, MPI_Op op, MPID_Comm + MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag ); int MPIR_Reduce_scatter_block_inter(const void *sendbuf, void *recvbuf, int recvcount, - MPI_Datatype datatype, MPI_Op op, MPID_Comm + MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag); int MPIR_Reduce_impl(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, int root, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag ); + MPI_Op op, int root, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag ); int MPIR_Reduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, int root, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag ); + MPI_Op op, int root, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag ); int MPIR_Reduce_intra(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, int root, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag ); + MPI_Op op, int root, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag ); int MPIR_Reduce_inter (const void *sendbuf, void *recvbuf, int count, MPI_Datatype - datatype, MPI_Op op, int root, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag); + datatype, MPI_Op op, int root, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag); int MPIR_Scan_impl(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag); + MPI_Op op, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag); int MPIR_Scan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag); + MPI_Op op, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag); int MPIR_Scatter_impl(const void *sendbuf, int sendcnt, MPI_Datatype sendtype, void *recvbuf, int recvcnt, MPI_Datatype recvtype, - int root, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag ); + int root, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag ); int MPIR_Scatter(const void *sendbuf, int sendcnt, MPI_Datatype sendtype, void *recvbuf, int recvcnt, MPI_Datatype recvtype, - int root, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag ); + int root, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag ); int MPIR_Scatter_intra(const void *sendbuf, int sendcnt, MPI_Datatype sendtype, void *recvbuf, int recvcnt, MPI_Datatype recvtype, - int root, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag ); + int root, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag ); int MPIR_Scatter_inter(const void *sendbuf, int sendcnt, MPI_Datatype sendtype, void *recvbuf, int recvcnt, MPI_Datatype recvtype, - int root, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag ); + int root, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag ); int MPIR_Scatterv_impl (const void *sendbuf, const int *sendcnts, const int *displs, MPI_Datatype sendtype, void *recvbuf, int recvcnt, - MPI_Datatype recvtype, int root, MPID_Comm + MPI_Datatype recvtype, int root, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag); int MPIR_Scatterv (const void *sendbuf, const int *sendcnts, const int *displs, MPI_Datatype sendtype, void *recvbuf, int recvcnt, - MPI_Datatype recvtype, int root, MPID_Comm + MPI_Datatype recvtype, int root, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag); -int MPIR_Barrier_impl( MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag); -int MPIR_Barrier( MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag); -int MPIR_Barrier_intra( MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag); -int MPIR_Barrier_inter( MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag); +int MPIR_Barrier_impl( MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag); +int MPIR_Barrier( MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag); +int MPIR_Barrier_intra( MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag); +int MPIR_Barrier_inter( MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag); int MPIR_Reduce_local_impl(const void *inbuf, void *inoutbuf, int count, MPI_Datatype datatype, MPI_Op op); -int MPIR_Setup_intercomm_localcomm( MPID_Comm * ); +int MPIR_Setup_intercomm_localcomm( MPIR_Comm * ); -int MPIR_Comm_create( MPID_Comm ** ); -int MPIR_Comm_create_group(MPID_Comm * comm_ptr, MPID_Group * group_ptr, int tag, - MPID_Comm ** newcomm); +int MPIR_Comm_create( MPIR_Comm ** ); +int MPIR_Comm_create_group(MPIR_Comm * comm_ptr, MPID_Group * group_ptr, int tag, + MPIR_Comm ** newcomm); /* comm_create helper functions, used by both comm_create and comm_create_group */ int MPIR_Comm_create_calculate_mapping(MPID_Group *group_ptr, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, int **mapping_out, - MPID_Comm **mapping_comm); + MPIR_Comm **mapping_comm); int MPIR_Comm_create_map(int local_n, int remote_n, int *local_mapping, int *remote_mapping, - MPID_Comm *mapping_comm, - MPID_Comm *newcomm); + MPIR_Comm *mapping_comm, + MPIR_Comm *newcomm); /* implements the logic for MPI_Comm_create for intracommunicators only */ -int MPIR_Comm_create_intra(MPID_Comm *comm_ptr, MPID_Group *group_ptr, - MPID_Comm **newcomm_ptr); +int MPIR_Comm_create_intra(MPIR_Comm *comm_ptr, MPID_Group *group_ptr, + MPIR_Comm **newcomm_ptr); -int MPIR_Comm_commit( MPID_Comm * ); +int MPIR_Comm_commit( MPIR_Comm * ); -int MPIR_Comm_is_node_aware( MPID_Comm * ); +int MPIR_Comm_is_node_aware( MPIR_Comm * ); -int MPIR_Comm_is_node_consecutive( MPID_Comm *); +int MPIR_Comm_is_node_consecutive( MPIR_Comm *); void MPIR_Free_err_dyncodes( void ); -int MPIR_Comm_idup_impl(MPID_Comm *comm_ptr, MPID_Comm **newcomm, MPID_Request **reqp); +int MPIR_Comm_idup_impl(MPIR_Comm *comm_ptr, MPIR_Comm **newcomm, MPID_Request **reqp); -int MPIR_Comm_shrink(MPID_Comm *comm_ptr, MPID_Comm **newcomm_ptr); -int MPIR_Comm_agree(MPID_Comm *comm_ptr, int *flag); +int MPIR_Comm_shrink(MPIR_Comm *comm_ptr, MPIR_Comm **newcomm_ptr); +int MPIR_Comm_agree(MPIR_Comm *comm_ptr, int *flag); int MPIR_Allreduce_group(void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Group *group_ptr, int tag, MPIR_Errflag_t *errflag); int MPIR_Allreduce_group_intra(void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Group *group_ptr, int tag, MPIR_Errflag_t *errflag); -int MPIR_Barrier_group(MPID_Comm *comm_ptr, MPID_Group *group_ptr, int tag, MPIR_Errflag_t *errflag); +int MPIR_Barrier_group(MPIR_Comm *comm_ptr, MPID_Group *group_ptr, int tag, MPIR_Errflag_t *errflag); /* topology impl functions */ -int MPIR_Dist_graph_neighbors_count_impl(MPID_Comm *comm_ptr, int *indegree, int *outdegree, int *weighted); -int MPIR_Dist_graph_neighbors_impl(MPID_Comm *comm_ptr, +int MPIR_Dist_graph_neighbors_count_impl(MPIR_Comm *comm_ptr, int *indegree, int *outdegree, int *weighted); +int MPIR_Dist_graph_neighbors_impl(MPIR_Comm *comm_ptr, int maxindegree, int sources[], int sourceweights[], int maxoutdegree, int destinations[], int destweights[]); -int MPIR_Graph_neighbors_count_impl(MPID_Comm *comm_ptr, int rank, int *nneighbors); -int MPIR_Graph_neighbors_impl(MPID_Comm *comm_ptr, int rank, int maxneighbors, int *neighbors); -int MPIR_Cart_shift_impl(MPID_Comm *comm_ptr, int direction, int displ, int *source, int *dest); +int MPIR_Graph_neighbors_count_impl(MPIR_Comm *comm_ptr, int rank, int *nneighbors); +int MPIR_Graph_neighbors_impl(MPIR_Comm *comm_ptr, int rank, int maxneighbors, int *neighbors); +int MPIR_Cart_shift_impl(MPIR_Comm *comm_ptr, int direction, int displ, int *source, int *dest); /* begin impl functions for NBC */ -int MPIR_Ibarrier_impl(MPID_Comm *comm_ptr, MPI_Request *request); -int MPIR_Ibcast_impl(void *buffer, int count, MPI_Datatype datatype, int root, MPID_Comm *comm_ptr, MPI_Request *request); -int MPIR_Igather_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPID_Comm *comm_ptr, MPI_Request *request); -int MPIR_Igatherv_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, int root, MPID_Comm *comm_ptr, MPI_Request *request); -int MPIR_Iscatter_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPID_Comm *comm_ptr, MPI_Request *request); -int MPIR_Iscatterv_impl(const void *sendbuf, const int *sendcounts, const int *displs, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPID_Comm *comm_ptr, MPI_Request *request); -int MPIR_Iallgather_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPI_Request *request); -int MPIR_Iallgatherv_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPI_Request *request); -int MPIR_Ialltoall_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPI_Request *request); -int MPIR_Ialltoallv_impl(const void *sendbuf, const int *sendcounts, const int *sdispls, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *rdispls, MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPI_Request *request); -int MPIR_Ialltoallw_impl(const void *sendbuf, const int *sendcounts, const int *sdispls, const MPI_Datatype *sendtypes, void *recvbuf, const int *recvcounts, const int *rdispls, const MPI_Datatype *recvtypes, MPID_Comm *comm_ptr, MPI_Request *request); -int MPIR_Ireduce_impl(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPID_Comm *comm_ptr, MPI_Request *request); -int MPIR_Iallreduce_impl(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPI_Request *request); -int MPIR_Ireduce_scatter_impl(const void *sendbuf, void *recvbuf, const int *recvcounts, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPI_Request *request); -int MPIR_Ireduce_scatter_block_impl(const void *sendbuf, void *recvbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPI_Request *request); -int MPIR_Iscan_impl(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPI_Request *request); -int MPIR_Iexscan_impl(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPI_Request *request); +int MPIR_Ibarrier_impl(MPIR_Comm *comm_ptr, MPI_Request *request); +int MPIR_Ibcast_impl(void *buffer, int count, MPI_Datatype datatype, int root, MPIR_Comm *comm_ptr, MPI_Request *request); +int MPIR_Igather_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPIR_Comm *comm_ptr, MPI_Request *request); +int MPIR_Igatherv_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, int root, MPIR_Comm *comm_ptr, MPI_Request *request); +int MPIR_Iscatter_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPIR_Comm *comm_ptr, MPI_Request *request); +int MPIR_Iscatterv_impl(const void *sendbuf, const int *sendcounts, const int *displs, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPIR_Comm *comm_ptr, MPI_Request *request); +int MPIR_Iallgather_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPI_Request *request); +int MPIR_Iallgatherv_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPI_Request *request); +int MPIR_Ialltoall_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPI_Request *request); +int MPIR_Ialltoallv_impl(const void *sendbuf, const int *sendcounts, const int *sdispls, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *rdispls, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPI_Request *request); +int MPIR_Ialltoallw_impl(const void *sendbuf, const int *sendcounts, const int *sdispls, const MPI_Datatype *sendtypes, void *recvbuf, const int *recvcounts, const int *rdispls, const MPI_Datatype *recvtypes, MPIR_Comm *comm_ptr, MPI_Request *request); +int MPIR_Ireduce_impl(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPIR_Comm *comm_ptr, MPI_Request *request); +int MPIR_Iallreduce_impl(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPI_Request *request); +int MPIR_Ireduce_scatter_impl(const void *sendbuf, void *recvbuf, const int *recvcounts, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPI_Request *request); +int MPIR_Ireduce_scatter_block_impl(const void *sendbuf, void *recvbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPI_Request *request); +int MPIR_Iscan_impl(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPI_Request *request); +int MPIR_Iexscan_impl(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPI_Request *request); /* end impl functions for NBC */ /* begin impl functions for neighborhood collectives */ -int MPIR_Ineighbor_allgather_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPI_Request *request); -int MPIR_Ineighbor_allgatherv_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int displs[], MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPI_Request *request); -int MPIR_Ineighbor_alltoall_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPI_Request *request); -int MPIR_Ineighbor_alltoallv_impl(const void *sendbuf, const int sendcounts[], const int sdispls[], MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int rdispls[], MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPI_Request *request); -int MPIR_Ineighbor_alltoallw_impl(const void *sendbuf, const int sendcounts[], const MPI_Aint sdispls[], const MPI_Datatype sendtypes[], void *recvbuf, const int recvcounts[], const MPI_Aint rdispls[], const MPI_Datatype recvtypes[], MPID_Comm *comm_ptr, MPI_Request *request); -int MPIR_Neighbor_allgather_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr); -int MPIR_Neighbor_allgatherv_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int displs[], MPI_Datatype recvtype, MPID_Comm *comm_ptr); -int MPIR_Neighbor_alltoall_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr); -int MPIR_Neighbor_alltoallv_impl(const void *sendbuf, const int sendcounts[], const int sdispls[], MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int rdispls[], MPI_Datatype recvtype, MPID_Comm *comm_ptr); -int MPIR_Neighbor_alltoallw_impl(const void *sendbuf, const int sendcounts[], const MPI_Aint sdispls[], const MPI_Datatype sendtypes[], void *recvbuf, const int recvcounts[], const MPI_Aint rdispls[], const MPI_Datatype recvtypes[], MPID_Comm *comm_ptr); +int MPIR_Ineighbor_allgather_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPI_Request *request); +int MPIR_Ineighbor_allgatherv_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int displs[], MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPI_Request *request); +int MPIR_Ineighbor_alltoall_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPI_Request *request); +int MPIR_Ineighbor_alltoallv_impl(const void *sendbuf, const int sendcounts[], const int sdispls[], MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int rdispls[], MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPI_Request *request); +int MPIR_Ineighbor_alltoallw_impl(const void *sendbuf, const int sendcounts[], const MPI_Aint sdispls[], const MPI_Datatype sendtypes[], void *recvbuf, const int recvcounts[], const MPI_Aint rdispls[], const MPI_Datatype recvtypes[], MPIR_Comm *comm_ptr, MPI_Request *request); +int MPIR_Neighbor_allgather_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr); +int MPIR_Neighbor_allgatherv_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int displs[], MPI_Datatype recvtype, MPIR_Comm *comm_ptr); +int MPIR_Neighbor_alltoall_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr); +int MPIR_Neighbor_alltoallv_impl(const void *sendbuf, const int sendcounts[], const int sdispls[], MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int rdispls[], MPI_Datatype recvtype, MPIR_Comm *comm_ptr); +int MPIR_Neighbor_alltoallw_impl(const void *sendbuf, const int sendcounts[], const MPI_Aint sdispls[], const MPI_Datatype sendtypes[], void *recvbuf, const int recvcounts[], const MPI_Aint rdispls[], const MPI_Datatype recvtypes[], MPIR_Comm *comm_ptr); /* end impl functions for neighborhood collectives */ /* neighborhood collective default algorithms */ -int MPIR_Neighbor_allgather_default(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr); -int MPIR_Neighbor_allgatherv_default(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int displs[], MPI_Datatype recvtype, MPID_Comm *comm_ptr); -int MPIR_Neighbor_alltoall_default(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr); -int MPIR_Neighbor_alltoallv_default(const void *sendbuf, const int sendcounts[], const int sdispls[], MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int rdispls[], MPI_Datatype recvtype, MPID_Comm *comm_ptr); -int MPIR_Neighbor_alltoallw_default(const void *sendbuf, const int sendcounts[], const MPI_Aint sdispls[], const MPI_Datatype sendtypes[], void *recvbuf, const int recvcounts[], const MPI_Aint rdispls[], const MPI_Datatype recvtypes[], MPID_Comm *comm_ptr); -int MPIR_Ineighbor_allgather_default(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Ineighbor_allgatherv_default(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int displs[], MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Ineighbor_alltoall_default(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Ineighbor_alltoallv_default(const void *sendbuf, const int sendcounts[], const int sdispls[], MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int rdispls[], MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Ineighbor_alltoallw_default(const void *sendbuf, const int sendcounts[], const MPI_Aint sdispls[], const MPI_Datatype sendtypes[], void *recvbuf, const int recvcounts[], const MPI_Aint rdispls[], const MPI_Datatype recvtypes[], MPID_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Neighbor_allgather_default(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr); +int MPIR_Neighbor_allgatherv_default(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int displs[], MPI_Datatype recvtype, MPIR_Comm *comm_ptr); +int MPIR_Neighbor_alltoall_default(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr); +int MPIR_Neighbor_alltoallv_default(const void *sendbuf, const int sendcounts[], const int sdispls[], MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int rdispls[], MPI_Datatype recvtype, MPIR_Comm *comm_ptr); +int MPIR_Neighbor_alltoallw_default(const void *sendbuf, const int sendcounts[], const MPI_Aint sdispls[], const MPI_Datatype sendtypes[], void *recvbuf, const int recvcounts[], const MPI_Aint rdispls[], const MPI_Datatype recvtypes[], MPIR_Comm *comm_ptr); +int MPIR_Ineighbor_allgather_default(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Ineighbor_allgatherv_default(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int displs[], MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Ineighbor_alltoall_default(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Ineighbor_alltoallv_default(const void *sendbuf, const int sendcounts[], const int sdispls[], MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int rdispls[], MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Ineighbor_alltoallw_default(const void *sendbuf, const int sendcounts[], const MPI_Aint sdispls[], const MPI_Datatype sendtypes[], void *recvbuf, const int recvcounts[], const MPI_Aint rdispls[], const MPI_Datatype recvtypes[], MPIR_Comm *comm_ptr, MPID_Sched_t s); /* nonblocking collective default algorithms */ -int MPIR_Ibcast_intra(void *buffer, int count, MPI_Datatype datatype, int root, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Ibcast_inter(void *buffer, int count, MPI_Datatype datatype, int root, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Ibcast_binomial(void *buffer, int count, MPI_Datatype datatype, int root, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Ibcast_SMP(void *buffer, int count, MPI_Datatype datatype, int root, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Iscatter_for_bcast(void *tmp_buf, int root, MPID_Comm *comm_ptr, int nbytes, MPID_Sched_t s); -int MPIR_Ibcast_scatter_rec_dbl_allgather(void *buffer, int count, MPI_Datatype datatype, int root, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Ibcast_scatter_ring_allgather(void *buffer, int count, MPI_Datatype datatype, int root, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Ibarrier_intra(MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Ibarrier_inter(MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Ireduce_intra(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Ireduce_inter(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Ireduce_binomial(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Ireduce_redscat_gather(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Ireduce_SMP(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Ialltoallv_intra(const void *sendbuf, const int *sendcounts, const int *sdispls, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *rdispls, MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Ialltoallv_inter(const void *sendbuf, const int *sendcounts, const int *sdispls, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *rdispls, MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Iallreduce_intra(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Iallreduce_inter(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Iallreduce_naive(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Iallreduce_SMP(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Iallreduce_redscat_allgather(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Iallreduce_rec_dbl(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Igather_binomial(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Igather_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Igather_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Iscatter_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Iscatter_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Iscatterv(const void *sendbuf, const int *sendcounts, const int *displs, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Ireduce_scatter_intra(const void *sendbuf, void *recvbuf, const int *recvcnts, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Ireduce_scatter_inter(const void *sendbuf, void *recvbuf, const int *recvcnts, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Ireduce_scatter_rec_dbl(const void *sendbuf, void *recvbuf, const int *recvcnts, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Ireduce_scatter_rec_hlv(const void *sendbuf, void *recvbuf, const int *recvcnts, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Ireduce_scatter_pairwise(const void *sendbuf, void *recvbuf, const int *recvcnts, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Igatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, int root, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Ireduce_scatter_block_intra(const void *sendbuf, void *recvbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Ireduce_scatter_block_inter(const void *sendbuf, void *recvbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Ireduce_scatter_block_rec_hlv(const void *sendbuf, void *recvbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Ireduce_scatter_block_pairwise(const void *sendbuf, void *recvbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Ireduce_scatter_block_rec_dbl(const void *sendbuf, void *recvbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Ireduce_scatter_block_noncomm(const void *sendbuf, void *recvbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Ialltoall_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Ialltoall_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Ialltoall_inplace(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Ialltoall_bruck(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Ialltoall_perm_sr(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Ialltoall_pairwise(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Iallgather_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Iallgather_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Iallgather_rec_dbl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Iallgather_bruck(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Iallgather_ring(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Iallgatherv_rec_dbl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Iallgatherv_bruck(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Iallgatherv_ring(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Iallgatherv_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Iallgatherv_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Iscan_rec_dbl(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Iscan_SMP(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Iexscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Ialltoallw_intra(const void *sendbuf, const int *sendcounts, const int *sdispls, const MPI_Datatype *sendtypes, void *recvbuf, const int *recvcounts, const int *rdispls, const MPI_Datatype *recvtypes, MPID_Comm *comm_ptr, MPID_Sched_t s); -int MPIR_Ialltoallw_inter(const void *sendbuf, const int *sendcounts, const int *sdispls, const MPI_Datatype *sendtypes, void *recvbuf, const int *recvcounts, const int *rdispls, const MPI_Datatype *recvtypes, MPID_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Ibcast_intra(void *buffer, int count, MPI_Datatype datatype, int root, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Ibcast_inter(void *buffer, int count, MPI_Datatype datatype, int root, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Ibcast_binomial(void *buffer, int count, MPI_Datatype datatype, int root, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Ibcast_SMP(void *buffer, int count, MPI_Datatype datatype, int root, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Iscatter_for_bcast(void *tmp_buf, int root, MPIR_Comm *comm_ptr, int nbytes, MPID_Sched_t s); +int MPIR_Ibcast_scatter_rec_dbl_allgather(void *buffer, int count, MPI_Datatype datatype, int root, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Ibcast_scatter_ring_allgather(void *buffer, int count, MPI_Datatype datatype, int root, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Ibarrier_intra(MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Ibarrier_inter(MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Ireduce_intra(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Ireduce_inter(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Ireduce_binomial(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Ireduce_redscat_gather(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Ireduce_SMP(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Ialltoallv_intra(const void *sendbuf, const int *sendcounts, const int *sdispls, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *rdispls, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Ialltoallv_inter(const void *sendbuf, const int *sendcounts, const int *sdispls, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *rdispls, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Iallreduce_intra(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Iallreduce_inter(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Iallreduce_naive(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Iallreduce_SMP(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Iallreduce_redscat_allgather(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Iallreduce_rec_dbl(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Igather_binomial(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Igather_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Igather_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Iscatter_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Iscatter_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Iscatterv(const void *sendbuf, const int *sendcounts, const int *displs, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Ireduce_scatter_intra(const void *sendbuf, void *recvbuf, const int *recvcnts, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Ireduce_scatter_inter(const void *sendbuf, void *recvbuf, const int *recvcnts, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Ireduce_scatter_rec_dbl(const void *sendbuf, void *recvbuf, const int *recvcnts, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Ireduce_scatter_rec_hlv(const void *sendbuf, void *recvbuf, const int *recvcnts, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Ireduce_scatter_pairwise(const void *sendbuf, void *recvbuf, const int *recvcnts, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Igatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, int root, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Ireduce_scatter_block_intra(const void *sendbuf, void *recvbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Ireduce_scatter_block_inter(const void *sendbuf, void *recvbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Ireduce_scatter_block_rec_hlv(const void *sendbuf, void *recvbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Ireduce_scatter_block_pairwise(const void *sendbuf, void *recvbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Ireduce_scatter_block_rec_dbl(const void *sendbuf, void *recvbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Ireduce_scatter_block_noncomm(const void *sendbuf, void *recvbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Ialltoall_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Ialltoall_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Ialltoall_inplace(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Ialltoall_bruck(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Ialltoall_perm_sr(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Ialltoall_pairwise(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Iallgather_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Iallgather_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Iallgather_rec_dbl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Iallgather_bruck(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Iallgather_ring(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Iallgatherv_rec_dbl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Iallgatherv_bruck(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Iallgatherv_ring(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Iallgatherv_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Iallgatherv_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Iscan_rec_dbl(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Iscan_SMP(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Iexscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Ialltoallw_intra(const void *sendbuf, const int *sendcounts, const int *sdispls, const MPI_Datatype *sendtypes, void *recvbuf, const int *recvcounts, const int *rdispls, const MPI_Datatype *recvtypes, MPIR_Comm *comm_ptr, MPID_Sched_t s); +int MPIR_Ialltoallw_inter(const void *sendbuf, const int *sendcounts, const int *sdispls, const MPI_Datatype *sendtypes, void *recvbuf, const int *recvcounts, const int *rdispls, const MPI_Datatype *recvtypes, MPIR_Comm *comm_ptr, MPID_Sched_t s); /* group functionality */ -int MPIR_Group_check_subset(MPID_Group * group_ptr, MPID_Comm * comm_ptr); +int MPIR_Group_check_subset(MPID_Group * group_ptr, MPIR_Comm * comm_ptr); /* begin impl functions for MPI_T (MPI_T_ right now) */ int MPIR_T_cvar_handle_alloc_impl(int cvar_index, void *obj_handle, MPI_T_cvar_handle *handle, int *count); @@ -4216,7 +4216,7 @@ int MPIR_Type_size_x_impl(MPI_Datatype datatype, MPI_Count *size); /* random initializers */ int MPIR_Group_init(void); -int MPIR_Comm_init(MPID_Comm *); +int MPIR_Comm_init(MPIR_Comm *); /* Collective functions cannot be called from multiple threads. These @@ -4229,7 +4229,7 @@ int MPIR_Comm_init(MPID_Comm *); void MPIU_SetTimeout( int ); /* Communicator info hint functions */ -typedef int (*MPIR_Comm_hint_fn_t)(MPID_Comm *, MPID_Info *, void *); +typedef int (*MPIR_Comm_hint_fn_t)(MPIR_Comm *, MPID_Info *, void *); int MPIR_Comm_register_hint(const char *hint_key, MPIR_Comm_hint_fn_t fn, void *state); #if defined(HAVE_VSNPRINTF) && defined(NEEDS_VSNPRINTF_DECL) && !defined(vsnprintf) @@ -4238,11 +4238,11 @@ int vsnprintf(char *str, size_t size, const char *format, va_list ap); /* Routines for determining local and remote processes */ -int MPIU_Find_local_and_external(struct MPID_Comm *comm, int *local_size_p, int *local_rank_p, int **local_ranks_p, +int MPIU_Find_local_and_external(struct MPIR_Comm *comm, int *local_size_p, int *local_rank_p, int **local_ranks_p, int *external_size_p, int *external_rank_p, int **external_ranks_p, int **intranode_table, int **internode_table_p); -int MPIU_Get_internode_rank(MPID_Comm *comm_ptr, int r); -int MPIU_Get_intranode_rank(MPID_Comm *comm_ptr, int r); +int MPIU_Get_internode_rank(MPIR_Comm *comm_ptr, int r); +int MPIU_Get_intranode_rank(MPIR_Comm *comm_ptr, int r); /* Trivial accessor macros */ @@ -4256,9 +4256,9 @@ int MPIU_Get_intranode_rank(MPID_Comm *comm_ptr, int r); int MPIR_Cancel_impl(MPID_Request *request_ptr); struct MPIR_Topology; void MPIR_Cart_rank_impl(struct MPIR_Topology *cart_ptr, const int *coords, int *rank); -int MPIR_Cart_create_impl(MPID_Comm *comm_ptr, int ndims, const int dims[], +int MPIR_Cart_create_impl(MPIR_Comm *comm_ptr, int ndims, const int dims[], const int periods[], int reorder, MPI_Comm *comm_cart); -int MPIR_Cart_map_impl(const MPID_Comm *comm_ptr, int ndims, const int dims[], +int MPIR_Cart_map_impl(const MPIR_Comm *comm_ptr, int ndims, const int dims[], const int periodic[], int *newrank); int MPIR_Close_port_impl(const char *port_name); int MPIR_Open_port_impl(MPID_Info *info_ptr, char *port_name); @@ -4268,36 +4268,36 @@ int MPIR_Info_get_nthkey_impl(MPID_Info *info, int n, char *key); void MPIR_Info_get_valuelen_impl(MPID_Info *info_ptr, const char *key, int *valuelen, int *flag); int MPIR_Info_set_impl(MPID_Info *info_ptr, const char *key, const char *value); int MPIR_Info_dup_impl(MPID_Info *info_ptr, MPID_Info **new_info_ptr); -int MPIR_Comm_delete_attr_impl(MPID_Comm *comm_ptr, MPID_Keyval *keyval_ptr); +int MPIR_Comm_delete_attr_impl(MPIR_Comm *comm_ptr, MPID_Keyval *keyval_ptr); int MPIR_Comm_create_keyval_impl(MPI_Comm_copy_attr_function *comm_copy_attr_fn, MPI_Comm_delete_attr_function *comm_delete_attr_fn, int *comm_keyval, void *extra_state); int MPIR_Comm_accept_impl(const char * port_name, MPID_Info * info_ptr, int root, - MPID_Comm * comm_ptr, MPID_Comm ** newcomm_ptr); + MPIR_Comm * comm_ptr, MPIR_Comm ** newcomm_ptr); int MPIR_Comm_connect_impl(const char * port_name, MPID_Info * info_ptr, int root, - MPID_Comm * comm_ptr, MPID_Comm ** newcomm_ptr); + MPIR_Comm * comm_ptr, MPIR_Comm ** newcomm_ptr); int MPIR_Comm_create_errhandler_impl(MPI_Comm_errhandler_function *function, MPI_Errhandler *errhandler); -int MPIR_Comm_dup_impl(MPID_Comm *comm_ptr, MPID_Comm **newcomm_ptr); -int MPIR_Comm_dup_with_info_impl(MPID_Comm *comm_ptr, MPID_Info *info_ptr, MPID_Comm **newcomm_ptr); -int MPIR_Comm_get_info_impl(MPID_Comm *comm_ptr, MPID_Info **info_ptr); -int MPIR_Comm_set_info_impl(MPID_Comm *comm_ptr, MPID_Info *info_ptr); -int MPIR_Comm_free_impl(MPID_Comm * comm_ptr); +int MPIR_Comm_dup_impl(MPIR_Comm *comm_ptr, MPIR_Comm **newcomm_ptr); +int MPIR_Comm_dup_with_info_impl(MPIR_Comm *comm_ptr, MPID_Info *info_ptr, MPIR_Comm **newcomm_ptr); +int MPIR_Comm_get_info_impl(MPIR_Comm *comm_ptr, MPID_Info **info_ptr); +int MPIR_Comm_set_info_impl(MPIR_Comm *comm_ptr, MPID_Info *info_ptr); +int MPIR_Comm_free_impl(MPIR_Comm * comm_ptr); void MPIR_Comm_free_keyval_impl(int keyval); -void MPIR_Comm_get_errhandler_impl(MPID_Comm *comm_ptr, MPID_Errhandler **errhandler_ptr); -void MPIR_Comm_set_errhandler_impl(MPID_Comm *comm_ptr, MPID_Errhandler *errhandler_ptr); -void MPIR_Comm_get_name_impl(MPID_Comm *comm, char *comm_name, int *resultlen); -int MPIR_Intercomm_merge_impl(MPID_Comm *comm_ptr, int high, MPID_Comm **new_intracomm_ptr); -int MPIR_Intercomm_create_impl(MPID_Comm *local_comm_ptr, int local_leader, - MPID_Comm *peer_comm_ptr, int remote_leader, int tag, - MPID_Comm **new_intercomm_ptr); -int MPIR_Comm_group_impl(MPID_Comm *comm_ptr, MPID_Group **group_ptr); -int MPIR_Comm_remote_group_impl(MPID_Comm *comm_ptr, MPID_Group **group_ptr); -int MPIR_Comm_group_failed_impl(MPID_Comm *comm, MPID_Group **failed_group_ptr); -int MPIR_Comm_remote_group_failed_impl(MPID_Comm *comm, MPID_Group **failed_group_ptr); -int MPIR_Comm_split_impl(MPID_Comm *comm_ptr, int color, int key, MPID_Comm **newcomm_ptr); -int MPIR_Comm_split_type_impl(MPID_Comm *comm_ptr, int split_type, int key, MPID_Info *info_ptr, - MPID_Comm **newcomm_ptr); +void MPIR_Comm_get_errhandler_impl(MPIR_Comm *comm_ptr, MPID_Errhandler **errhandler_ptr); +void MPIR_Comm_set_errhandler_impl(MPIR_Comm *comm_ptr, MPID_Errhandler *errhandler_ptr); +void MPIR_Comm_get_name_impl(MPIR_Comm *comm, char *comm_name, int *resultlen); +int MPIR_Intercomm_merge_impl(MPIR_Comm *comm_ptr, int high, MPIR_Comm **new_intracomm_ptr); +int MPIR_Intercomm_create_impl(MPIR_Comm *local_comm_ptr, int local_leader, + MPIR_Comm *peer_comm_ptr, int remote_leader, int tag, + MPIR_Comm **new_intercomm_ptr); +int MPIR_Comm_group_impl(MPIR_Comm *comm_ptr, MPID_Group **group_ptr); +int MPIR_Comm_remote_group_impl(MPIR_Comm *comm_ptr, MPID_Group **group_ptr); +int MPIR_Comm_group_failed_impl(MPIR_Comm *comm, MPID_Group **failed_group_ptr); +int MPIR_Comm_remote_group_failed_impl(MPIR_Comm *comm, MPID_Group **failed_group_ptr); +int MPIR_Comm_split_impl(MPIR_Comm *comm_ptr, int color, int key, MPIR_Comm **newcomm_ptr); +int MPIR_Comm_split_type_impl(MPIR_Comm *comm_ptr, int split_type, int key, MPID_Info *info_ptr, + MPIR_Comm **newcomm_ptr); int MPIR_Group_compare_impl(MPID_Group *group_ptr1, MPID_Group *group_ptr2, int *result); int MPIR_Group_difference_impl(MPID_Group *group_ptr1, MPID_Group *group_ptr2, MPID_Group **new_group_ptr); int MPIR_Group_excl_impl(MPID_Group *group_ptr, int n, const int *ranks, MPID_Group **new_group_ptr); @@ -4321,7 +4321,7 @@ int MPIX_Grequest_start_impl(MPI_Grequest_query_function *, MPIX_Grequest_poll_function *, MPIX_Grequest_wait_function *, void *, MPID_Request **); -int MPIR_Graph_map_impl(const MPID_Comm *comm_ptr, int nnodes, +int MPIR_Graph_map_impl(const MPIR_Comm *comm_ptr, int nnodes, const int indx[], const int edges[], int *newrank); int MPIR_Type_commit_impl(MPI_Datatype *datatype); int MPIR_Type_create_struct_impl(int count, @@ -4359,14 +4359,14 @@ int MPIR_Unpack_impl(const void *inbuf, MPI_Aint insize, MPI_Aint *position, void *outbuf, int outcount, MPI_Datatype datatype); void MPIR_Type_lb_impl(MPI_Datatype datatype, MPI_Aint *displacement); int MPIR_Ibsend_impl(const void *buf, int count, MPI_Datatype datatype, int dest, int tag, - MPID_Comm *comm_ptr, MPI_Request *request); + MPIR_Comm *comm_ptr, MPI_Request *request); int MPIR_Test_impl(MPI_Request *request, int *flag, MPI_Status *status); int MPIR_Testall_impl(int count, MPI_Request array_of_requests[], int *flag, MPI_Status array_of_statuses[]); int MPIR_Wait_impl(MPI_Request *request, MPI_Status *status); int MPIR_Waitall_impl(int count, MPI_Request array_of_requests[], MPI_Status array_of_statuses[]); -int MPIR_Comm_set_attr_impl(MPID_Comm *comm_ptr, int comm_keyval, void *attribute_val, +int MPIR_Comm_set_attr_impl(MPIR_Comm *comm_ptr, int comm_keyval, void *attribute_val, MPIR_AttrType attrType); /* Pull the error status out of the tag space and put it into an errflag. */ diff --git a/src/include/mpir_nbc.h b/src/include/mpir_nbc.h index 1f76adf..c0bad0c 100644 --- a/src/include/mpir_nbc.h +++ b/src/include/mpir_nbc.h @@ -46,7 +46,7 @@ /* Open question: should tag allocation be rolled into Sched_start? Keeping it * separate potentially allows more parallelism in the future, but it also * pushes more work onto the clients of this interface. */ -int MPID_Sched_next_tag(MPID_Comm *comm_ptr, int *tag); +int MPID_Sched_next_tag(MPIR_Comm *comm_ptr, int *tag); /* the device must provide a typedef for MPID_Sched_t in mpidpre.h */ @@ -60,14 +60,14 @@ int MPID_Sched_clone(MPID_Sched_t orig, MPID_Sched_t *cloned); * comm should be the primary (user) communicator with which this collective is * associated, even if other hidden communicators are used for a subset of the * operations. It will be used for error handling and similar operations. */ -int MPID_Sched_start(MPID_Sched_t *sp, MPID_Comm *comm, int tag, MPID_Request **req); +int MPID_Sched_start(MPID_Sched_t *sp, MPIR_Comm *comm, int tag, MPID_Request **req); /* send and recv take a comm ptr to enable hierarchical collectives */ -int MPID_Sched_send(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, MPID_Comm *comm, MPID_Sched_t s); -int MPID_Sched_recv(void *buf, MPI_Aint count, MPI_Datatype datatype, int src, MPID_Comm *comm, MPID_Sched_t s); +int MPID_Sched_send(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, MPIR_Comm *comm, MPID_Sched_t s); +int MPID_Sched_recv(void *buf, MPI_Aint count, MPI_Datatype datatype, int src, MPIR_Comm *comm, MPID_Sched_t s); /* just like MPI_Issend, can't complete until the matching recv is posted */ -int MPID_Sched_ssend(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, MPID_Comm *comm, MPID_Sched_t s); +int MPID_Sched_ssend(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, MPIR_Comm *comm, MPID_Sched_t s); int MPID_Sched_reduce(const void *inbuf, void *inoutbuf, MPI_Aint count, MPI_Datatype datatype, MPI_Op op, MPID_Sched_t s); /* packing/unpacking can be accomplished by passing MPI_PACKED as either intype @@ -94,11 +94,11 @@ int MPID_Sched_barrier(MPID_Sched_t s); * A corresponding _recv_defer function is not currently provided because there * is no known use case. The recv count is just an upper bound, not an exact * amount to be received, so an oversized recv is used instead of deferral. */ -int MPID_Sched_send_defer(const void *buf, const MPI_Aint *count, MPI_Datatype datatype, int dest, MPID_Comm *comm, MPID_Sched_t s); +int MPID_Sched_send_defer(const void *buf, const MPI_Aint *count, MPI_Datatype datatype, int dest, MPIR_Comm *comm, MPID_Sched_t s); /* Just like MPID_Sched_recv except it populates the given status object with * the received count and error information, much like a normal recv. Often * useful in conjunction with MPID_Sched_send_defer. */ -int MPID_Sched_recv_status(void *buf, MPI_Aint count, MPI_Datatype datatype, int src, MPID_Comm *comm, MPI_Status *status, MPID_Sched_t s); +int MPID_Sched_recv_status(void *buf, MPI_Aint count, MPI_Datatype datatype, int src, MPIR_Comm *comm, MPI_Status *status, MPID_Sched_t s); /* buffer management, fancy reductions, etc */ int MPID_Sched_cb(MPID_Sched_cb_t *cb_p, void *cb_state, MPID_Sched_t s); @@ -108,7 +108,7 @@ int MPID_Sched_cb2(MPID_Sched_cb2_t *cb_p, void *cb_state, void *cb_state2, MPID * hopefully s.t. uthash can be used somehow */ /* common callback utility functions */ -int MPIR_Sched_cb_free_buf(MPID_Comm *comm, int tag, void *state); +int MPIR_Sched_cb_free_buf(MPIR_Comm *comm, int tag, void *state); /* an upgraded version of MPIU_CHKPMEM_MALLOC/_DECL/_REAP/_COMMIT that adds * corresponding cleanup callbacks to the given schedule at _COMMIT time */ diff --git a/src/mpi/attr/attr_delete.c b/src/mpi/attr/attr_delete.c index 07d6777..41afeee 100644 --- a/src/mpi/attr/attr_delete.c +++ b/src/mpi/attr/attr_delete.c @@ -56,7 +56,7 @@ int MPI_Attr_delete(MPI_Comm comm, int keyval) { static const char FCNAME[] = "MPI_Attr_delete"; int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_Keyval *keyval_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPI_ATTR_DELETE); @@ -77,7 +77,7 @@ int MPI_Attr_delete(MPI_Comm comm, int keyval) # endif /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); MPID_Keyval_get_ptr( keyval, keyval_ptr ); /* Validate parameters and objects (post conversion) */ @@ -86,7 +86,7 @@ int MPI_Attr_delete(MPI_Comm comm, int keyval) MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); /* If comm_ptr is not valid, it will be reset to null */ /* Validate keyval_ptr */ MPID_Keyval_valid_ptr( keyval_ptr, mpi_errno ); diff --git a/src/mpi/attr/attr_get.c b/src/mpi/attr/attr_get.c index 019dddf..bea3e0e 100644 --- a/src/mpi/attr/attr_get.c +++ b/src/mpi/attr/attr_get.c @@ -75,7 +75,7 @@ int MPI_Attr_get(MPI_Comm comm, int keyval, void *attribute_val, int *flag) { static const char FCNAME[] = "MPI_Attr_get"; int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_ATTR_GET); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -104,7 +104,7 @@ int MPI_Attr_get(MPI_Comm comm, int keyval, void *attribute_val, int *flag) # endif /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -112,7 +112,7 @@ int MPI_Attr_get(MPI_Comm comm, int keyval, void *attribute_val, int *flag) MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); /* If comm_ptr is not valid, it will be reset to null */ MPIR_ERRTEST_ARGNULL(attribute_val, "attribute_val", mpi_errno); MPIR_ERRTEST_ARGNULL(flag, "flag", mpi_errno); diff --git a/src/mpi/attr/attr_put.c b/src/mpi/attr/attr_put.c index 4a1c53a..e9541d7 100644 --- a/src/mpi/attr/attr_put.c +++ b/src/mpi/attr/attr_put.c @@ -74,7 +74,7 @@ int MPI_Attr_put(MPI_Comm comm, int keyval, void *attribute_val) { static const char FCNAME[] = "MPI_Attr_put"; int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_ATTR_PUT); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -96,7 +96,7 @@ int MPI_Attr_put(MPI_Comm comm, int keyval, void *attribute_val) # endif /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -104,7 +104,7 @@ int MPI_Attr_put(MPI_Comm comm, int keyval, void *attribute_val) MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); /* If comm_ptr is not valid, it will be reset to null */ if (mpi_errno) goto fn_fail; } diff --git a/src/mpi/attr/comm_delete_attr.c b/src/mpi/attr/comm_delete_attr.c index 575fe14..6428ed6 100644 --- a/src/mpi/attr/comm_delete_attr.c +++ b/src/mpi/attr/comm_delete_attr.c @@ -30,7 +30,7 @@ int MPI_Comm_delete_attr(MPI_Comm comm, int comm_keyval) __attribute__((weak,ali #define FUNCNAME MPIR_Comm_delete_attr_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Comm_delete_attr_impl(MPID_Comm *comm_ptr, MPID_Keyval *keyval_ptr) +int MPIR_Comm_delete_attr_impl(MPIR_Comm *comm_ptr, MPID_Keyval *keyval_ptr) { int mpi_errno = MPI_SUCCESS; MPID_Attribute *p, **old_p; @@ -108,7 +108,7 @@ Input Parameters: int MPI_Comm_delete_attr(MPI_Comm comm, int comm_keyval) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_Keyval *keyval_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_DELETE_ATTR); @@ -131,7 +131,7 @@ int MPI_Comm_delete_attr(MPI_Comm comm, int comm_keyval) # endif /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); MPID_Keyval_get_ptr( comm_keyval, keyval_ptr ); /* Validate parameters and objects (post conversion) */ @@ -140,7 +140,7 @@ int MPI_Comm_delete_attr(MPI_Comm comm, int comm_keyval) MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); /* If comm_ptr is not valid, it will be reset to null */ /* Validate keyval_ptr */ MPID_Keyval_valid_ptr( keyval_ptr, mpi_errno ); diff --git a/src/mpi/attr/comm_get_attr.c b/src/mpi/attr/comm_get_attr.c index 400b4bf..ff9f1b2 100644 --- a/src/mpi/attr/comm_get_attr.c +++ b/src/mpi/attr/comm_get_attr.c @@ -41,7 +41,7 @@ int MPIR_CommGetAttr( MPI_Comm comm, int comm_keyval, void *attribute_val, { static const char FCNAME[] = "MPIR_CommGetAttr"; int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; static PreDefined_attrs attr_copy; /* Used to provide a copy of the predefined attributes */ MPID_MPI_STATE_DECL(MPID_STATE_MPIR_COMM_GET_ATTR); @@ -73,7 +73,7 @@ int MPIR_CommGetAttr( MPI_Comm comm, int comm_keyval, void *attribute_val, # endif /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -81,7 +81,7 @@ int MPIR_CommGetAttr( MPI_Comm comm, int comm_keyval, void *attribute_val, MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); /* If comm_ptr is not valid, it will be reset to null */ MPIR_ERRTEST_ARGNULL(attribute_val, "attr_val", mpi_errno); MPIR_ERRTEST_ARGNULL(flag, "flag", mpi_errno); diff --git a/src/mpi/attr/comm_set_attr.c b/src/mpi/attr/comm_set_attr.c index 3065901..ab41527 100644 --- a/src/mpi/attr/comm_set_attr.c +++ b/src/mpi/attr/comm_set_attr.c @@ -30,7 +30,7 @@ int MPI_Comm_set_attr(MPI_Comm comm, int comm_keyval, void *attribute_val) __att #define FUNCNAME MPIR_Comm_set_attr_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Comm_set_attr_impl(MPID_Comm *comm_ptr, int comm_keyval, void *attribute_val, +int MPIR_Comm_set_attr_impl(MPIR_Comm *comm_ptr, int comm_keyval, void *attribute_val, MPIR_AttrType attrType) { int mpi_errno = MPI_SUCCESS; @@ -110,7 +110,7 @@ int MPIR_CommSetAttr( MPI_Comm comm, int comm_keyval, void *attribute_val, MPIR_AttrType attrType ) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPIR_COMM_SET_ATTR); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -132,7 +132,7 @@ int MPIR_CommSetAttr( MPI_Comm comm, int comm_keyval, void *attribute_val, # endif /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -142,7 +142,7 @@ int MPIR_CommSetAttr( MPI_Comm comm, int comm_keyval, void *attribute_val, MPID_Keyval *keyval_ptr = NULL; /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); /* If comm_ptr is not valid, it will be reset to null */ /* Validate keyval_ptr */ MPID_Keyval_get_ptr( comm_keyval, keyval_ptr ); @@ -219,7 +219,7 @@ corresponding keyval was created) will be called. int MPI_Comm_set_attr(MPI_Comm comm, int comm_keyval, void *attribute_val) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_SET_ATTR); MPID_THREAD_CS_ENTER(GLOBAL, MPIR_THREAD_GLOBAL_ALLFUNC_MUTEX); @@ -239,7 +239,7 @@ int MPI_Comm_set_attr(MPI_Comm comm, int comm_keyval, void *attribute_val) # endif /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -249,7 +249,7 @@ int MPI_Comm_set_attr(MPI_Comm comm, int comm_keyval, void *attribute_val) MPID_Keyval *keyval_ptr = NULL; /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); /* If comm_ptr is not valid, it will be reset to null */ /* Validate keyval_ptr */ MPID_Keyval_get_ptr( comm_keyval, keyval_ptr ); diff --git a/src/mpi/coll/allgather.c b/src/mpi/coll/allgather.c index db1c37e..6ea261e 100644 --- a/src/mpi/coll/allgather.c +++ b/src/mpi/coll/allgather.c @@ -116,7 +116,7 @@ int MPIR_Allgather_intra ( void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag ) { int comm_size, rank; @@ -654,7 +654,7 @@ int MPIR_Allgather_inter ( void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { /* Intercommunicator Allgather. @@ -666,7 +666,7 @@ int MPIR_Allgather_inter ( int mpi_errno_ret = MPI_SUCCESS; MPI_Aint true_extent, true_lb = 0, extent, send_extent; void *tmp_buf=NULL; - MPID_Comm *newcomm_ptr = NULL; + MPIR_Comm *newcomm_ptr = NULL; MPIU_CHKLMEM_DECL(1); @@ -787,7 +787,7 @@ int MPIR_Allgather_inter ( #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Allgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag) + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; @@ -821,7 +821,7 @@ fn_fail: #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Allgather_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag) + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; @@ -901,7 +901,7 @@ int MPI_Allgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPI_Comm comm) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPIR_Errflag_t errflag = MPIR_ERR_NONE; MPID_MPI_STATE_DECL(MPID_STATE_MPI_ALLGATHER); @@ -922,7 +922,7 @@ int MPI_Allgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -931,7 +931,7 @@ int MPI_Allgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, { MPID_Datatype *recvtype_ptr=NULL, *sendtype_ptr=NULL; - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; if (comm_ptr->comm_kind == MPID_INTERCOMM) { diff --git a/src/mpi/coll/allgatherv.c b/src/mpi/coll/allgatherv.c index 621e08b..0b3d969 100644 --- a/src/mpi/coll/allgatherv.c +++ b/src/mpi/coll/allgatherv.c @@ -97,7 +97,7 @@ int MPIR_Allgatherv_intra ( const int *recvcounts, const int *displs, MPI_Datatype recvtype, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag ) { int comm_size, rank, j, i, left, right; @@ -768,7 +768,7 @@ int MPIR_Allgatherv_inter ( const int *recvcounts, const int *displs, MPI_Datatype recvtype, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag ) { /* Intercommunicator Allgatherv. @@ -781,7 +781,7 @@ int MPIR_Allgatherv_inter ( */ int remote_size, mpi_errno, root, rank; int mpi_errno_ret = MPI_SUCCESS; - MPID_Comm *newcomm_ptr = NULL; + MPIR_Comm *newcomm_ptr = NULL; MPI_Datatype newtype = MPI_DATATYPE_NULL; remote_size = comm_ptr->remote_size; @@ -892,7 +892,7 @@ int MPIR_Allgatherv_inter ( #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, - MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag) + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; @@ -928,7 +928,7 @@ int MPIR_Allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Allgatherv_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, - MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag) + MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; @@ -1012,7 +1012,7 @@ int MPI_Allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPI_Datatype recvtype, MPI_Comm comm) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPIR_Errflag_t errflag = MPIR_ERR_NONE; MPID_MPI_STATE_DECL(MPID_STATE_MPI_ALLGATHERV); @@ -1033,7 +1033,7 @@ int MPI_Allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -1043,7 +1043,7 @@ int MPI_Allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPID_Datatype *recvtype_ptr=NULL, *sendtype_ptr=NULL; int i, comm_size; - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; if (comm_ptr->comm_kind == MPID_INTERCOMM) diff --git a/src/mpi/coll/allred_group.c b/src/mpi/coll/allred_group.c index b8ffee1..09d46ec 100644 --- a/src/mpi/coll/allred_group.c +++ b/src/mpi/coll/allred_group.c @@ -8,7 +8,7 @@ #include "collutil.h" int MPIR_Allreduce_group_intra(void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Group *group_ptr, int tag, MPIR_Errflag_t *errflag); /* Local utility macro: takes an two args and sets lvalue cr_ equal to the rank @@ -26,7 +26,7 @@ int MPIR_Allreduce_group_intra(void *sendbuf, void *recvbuf, int count, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Allreduce_group_intra(void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Group *group_ptr, int tag, MPIR_Errflag_t *errflag) { MPI_Aint type_size; @@ -365,7 +365,7 @@ int MPIR_Allreduce_group_intra(void *sendbuf, void *recvbuf, int count, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Allreduce_group(void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Group *group_ptr, int tag, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; diff --git a/src/mpi/coll/allreduce.c b/src/mpi/coll/allreduce.c index 83b206c..60caed6 100644 --- a/src/mpi/coll/allreduce.c +++ b/src/mpi/coll/allreduce.c @@ -149,7 +149,7 @@ MPIR_Op_check_dtype_fn *MPIR_Op_check_dtype_table[] = { #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) static inline int allreduce_intra_or_coll_fn(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, - MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag) + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; @@ -182,7 +182,7 @@ int MPIR_Allreduce_intra ( int count, MPI_Datatype datatype, MPI_Op op, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag ) { #ifdef MPID_HAS_HETERO @@ -623,7 +623,7 @@ int MPIR_Allreduce_inter ( int count, MPI_Datatype datatype, MPI_Op op, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag ) { /* Intercommunicator Allreduce. @@ -635,7 +635,7 @@ int MPIR_Allreduce_inter ( int mpi_errno_ret = MPI_SUCCESS; MPI_Aint true_extent, true_lb, extent; void *tmp_buf=NULL; - MPID_Comm *newcomm_ptr = NULL; + MPIR_Comm *newcomm_ptr = NULL; MPIU_CHKLMEM_DECL(1); MPIDU_ERR_CHECK_MULTIPLE_THREADS_ENTER( comm_ptr ); @@ -714,7 +714,7 @@ int MPIR_Allreduce_inter ( #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Allreduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag) + MPI_Op op, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; @@ -744,7 +744,7 @@ fn_fail: #define FUNCNAME MPIR_Allreduce_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Allreduce_impl(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, +int MPIR_Allreduce_impl(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; @@ -815,7 +815,7 @@ int MPI_Allreduce(const void *sendbuf, void *recvbuf, int count, { static const char FCNAME[] = "MPI_Allreduce"; int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPIR_Errflag_t errflag = MPIR_ERR_NONE; MPID_MPI_STATE_DECL(MPID_STATE_MPI_ALLREDUCE); @@ -836,7 +836,7 @@ int MPI_Allreduce(const void *sendbuf, void *recvbuf, int count, # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -846,7 +846,7 @@ int MPI_Allreduce(const void *sendbuf, void *recvbuf, int count, MPID_Datatype *datatype_ptr = NULL; MPID_Op *op_ptr = NULL; - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPIR_ERRTEST_COUNT(count, mpi_errno); MPIR_ERRTEST_DATATYPE(datatype, "datatype", mpi_errno); diff --git a/src/mpi/coll/alltoall.c b/src/mpi/coll/alltoall.c index 60a0fae..0c2eb86 100644 --- a/src/mpi/coll/alltoall.c +++ b/src/mpi/coll/alltoall.c @@ -134,7 +134,7 @@ int MPIR_Alltoall_intra( void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag ) { int comm_size, i, j, pof2; @@ -468,7 +468,7 @@ int MPIR_Alltoall_inter( void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag ) { /* Intercommunicator alltoall. We use a pairwise exchange algorithm @@ -555,7 +555,7 @@ int MPIR_Alltoall_inter( #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag) + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; @@ -585,7 +585,7 @@ int MPIR_Alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Alltoall_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag) + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; if (comm_ptr->coll_fns != NULL && comm_ptr->coll_fns->Alltoall != NULL) { @@ -644,7 +644,7 @@ int MPI_Alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPI_Comm comm) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPIR_Errflag_t errflag = MPIR_ERR_NONE; MPID_MPI_STATE_DECL(MPID_STATE_MPI_ALLTOALL); @@ -665,7 +665,7 @@ int MPI_Alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -674,7 +674,7 @@ int MPI_Alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, { MPID_Datatype *sendtype_ptr=NULL, *recvtype_ptr=NULL; - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; if (sendbuf != MPI_IN_PLACE) { diff --git a/src/mpi/coll/alltoallv.c b/src/mpi/coll/alltoallv.c index e931899..f9ca9ee 100644 --- a/src/mpi/coll/alltoallv.c +++ b/src/mpi/coll/alltoallv.c @@ -62,7 +62,7 @@ int MPI_Alltoallv(const void *sendbuf, const int *sendcounts, const int *sdispls #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Alltoallv_intra(const void *sendbuf, const int *sendcounts, const int *sdispls, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, - const int *rdispls, MPI_Datatype recvtype, MPID_Comm *comm_ptr, + const int *rdispls, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { int comm_size, i, j; @@ -237,7 +237,7 @@ fn_fail: #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Alltoallv_inter(const void *sendbuf, const int *sendcounts, const int *sdispls, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, - const int *rdispls, MPI_Datatype recvtype, MPID_Comm *comm_ptr, + const int *rdispls, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { /* Intercommunicator alltoallv. We use a pairwise exchange algorithm @@ -330,7 +330,7 @@ int MPIR_Alltoallv_inter(const void *sendbuf, const int *sendcounts, const int * #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Alltoallv(const void *sendbuf, const int *sendcounts, const int *sdispls, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *rdispls, - MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag) + MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; @@ -361,7 +361,7 @@ int MPIR_Alltoallv(const void *sendbuf, const int *sendcounts, const int *sdispl int MPIR_Alltoallv_impl(const void *sendbuf, const int *sendcounts, const int *sdispls, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *rdispls, MPI_Datatype recvtype, - MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag) + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; @@ -435,7 +435,7 @@ int MPI_Alltoallv(const void *sendbuf, const int *sendcounts, MPI_Comm comm) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPIR_Errflag_t errflag = MPIR_ERR_NONE; MPID_MPI_STATE_DECL(MPID_STATE_MPI_ALLTOALLV); @@ -456,7 +456,7 @@ int MPI_Alltoallv(const void *sendbuf, const int *sendcounts, # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -467,7 +467,7 @@ int MPI_Alltoallv(const void *sendbuf, const int *sendcounts, int i, comm_size; int check_send = (comm_ptr->comm_kind == MPID_INTRACOMM && sendbuf != MPI_IN_PLACE); - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; if (comm_ptr->comm_kind == MPID_INTRACOMM) { diff --git a/src/mpi/coll/alltoallw.c b/src/mpi/coll/alltoallw.c index b7fdc7e..6382621 100644 --- a/src/mpi/coll/alltoallw.c +++ b/src/mpi/coll/alltoallw.c @@ -56,7 +56,7 @@ int MPI_Alltoallw(const void *sendbuf, const int sendcounts[], const int sdispls #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Alltoallw_intra(const void *sendbuf, const int sendcounts[], const int sdispls[], const MPI_Datatype sendtypes[], void *recvbuf, const int recvcounts[], - const int rdispls[], const MPI_Datatype recvtypes[], MPID_Comm *comm_ptr, + const int rdispls[], const MPI_Datatype recvtypes[], MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { int comm_size, i, j; @@ -237,7 +237,7 @@ int MPIR_Alltoallw_intra(const void *sendbuf, const int sendcounts[], const int #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Alltoallw_inter(const void *sendbuf, const int sendcounts[], const int sdispls[], const MPI_Datatype sendtypes[], void *recvbuf, const int recvcounts[], - const int rdispls[], const MPI_Datatype recvtypes[], MPID_Comm *comm_ptr, + const int rdispls[], const MPI_Datatype recvtypes[], MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { /* Intercommunicator alltoallw. We use a pairwise exchange algorithm @@ -325,7 +325,7 @@ int MPIR_Alltoallw_inter(const void *sendbuf, const int sendcounts[], const int int MPIR_Alltoallw(const void *sendbuf, const int sendcounts[], const int sdispls[], const MPI_Datatype sendtypes[], void *recvbuf, const int recvcounts[], const int rdispls[], const MPI_Datatype recvtypes[], - MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag) + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; @@ -356,7 +356,7 @@ int MPIR_Alltoallw(const void *sendbuf, const int sendcounts[], const int sdispl int MPIR_Alltoallw_impl(const void *sendbuf, const int sendcounts[], const int sdispls[], const MPI_Datatype sendtypes[], void *recvbuf, const int recvcounts[], const int rdispls[], const MPI_Datatype recvtypes[], - MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag) + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; @@ -430,7 +430,7 @@ int MPI_Alltoallw(const void *sendbuf, const int sendcounts[], const MPI_Datatype recvtypes[], MPI_Comm comm) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPIR_Errflag_t errflag = MPIR_ERR_NONE; MPID_MPI_STATE_DECL(MPID_STATE_MPI_ALLTOALLW); @@ -451,7 +451,7 @@ int MPI_Alltoallw(const void *sendbuf, const int sendcounts[], # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -462,7 +462,7 @@ int MPI_Alltoallw(const void *sendbuf, const int sendcounts[], int i, comm_size; int check_send; - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; check_send = (comm_ptr->comm_kind == MPID_INTRACOMM && sendbuf != MPI_IN_PLACE); diff --git a/src/mpi/coll/barrier.c b/src/mpi/coll/barrier.c index 158ab46..389cb8c 100644 --- a/src/mpi/coll/barrier.c +++ b/src/mpi/coll/barrier.c @@ -67,7 +67,7 @@ int MPI_Barrier(MPI_Comm comm) __attribute__((weak,alias("PMPI_Barrier"))); #define FUNCNAME barrier_smp_intra #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int barrier_smp_intra(MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag) +static int barrier_smp_intra(MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { int mpi_errno=MPI_SUCCESS; int mpi_errno_ret = MPI_SUCCESS; @@ -128,7 +128,7 @@ static int barrier_smp_intra(MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag) #define FUNCNAME MPIR_Barrier_intra #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Barrier_intra( MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag ) +int MPIR_Barrier_intra( MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag ) { int size, rank, src, dst, mask, mpi_errno=MPI_SUCCESS; int mpi_errno_ret = MPI_SUCCESS; @@ -189,12 +189,12 @@ int MPIR_Barrier_intra( MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag ) #define FUNCNAME MPIR_Barrier_inter #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Barrier_inter( MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag ) +int MPIR_Barrier_inter( MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag ) { int rank, mpi_errno = MPI_SUCCESS, root; int mpi_errno_ret = MPI_SUCCESS; int i = 0; - MPID_Comm *newcomm_ptr = NULL; + MPIR_Comm *newcomm_ptr = NULL; rank = comm_ptr->rank; @@ -281,7 +281,7 @@ int MPIR_Barrier_inter( MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag ) #define FUNCNAME MPIR_Barrier #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Barrier(MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag) +int MPIR_Barrier(MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; @@ -310,7 +310,7 @@ int MPIR_Barrier(MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag) #define FUNCNAME MPIR_Barrier_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Barrier_impl(MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag) +int MPIR_Barrier_impl(MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; if (comm_ptr->coll_fns != NULL && comm_ptr->coll_fns->Barrier != NULL) @@ -368,7 +368,7 @@ communicator have entered the call. int MPI_Barrier( MPI_Comm comm ) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPIR_Errflag_t errflag = MPIR_ERR_NONE; MPID_MPI_STATE_DECL(MPID_STATE_MPI_BARRIER); @@ -389,7 +389,7 @@ int MPI_Barrier( MPI_Comm comm ) # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -397,7 +397,7 @@ int MPI_Barrier( MPI_Comm comm ) MPID_BEGIN_ERROR_CHECKS; { /* Validate communicator */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno) goto fn_fail; } MPID_END_ERROR_CHECKS; diff --git a/src/mpi/coll/barrier_group.c b/src/mpi/coll/barrier_group.c index e7e5840..09ce774 100644 --- a/src/mpi/coll/barrier_group.c +++ b/src/mpi/coll/barrier_group.c @@ -13,7 +13,7 @@ This is an intracommunicator barrier only! */ -int MPIR_Barrier_group( MPID_Comm *comm_ptr, MPID_Group *group_ptr, int tag, MPIR_Errflag_t *errflag ) +int MPIR_Barrier_group( MPIR_Comm *comm_ptr, MPID_Group *group_ptr, int tag, MPIR_Errflag_t *errflag ) { int src = 0; int dst, mpi_errno = MPI_SUCCESS; diff --git a/src/mpi/coll/bcast.c b/src/mpi/coll/bcast.c index 19dcfbd..34b64be 100644 --- a/src/mpi/coll/bcast.c +++ b/src/mpi/coll/bcast.c @@ -126,7 +126,7 @@ static int MPIR_Bcast_binomial( int count, MPI_Datatype datatype, int root, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { int rank, comm_size, src, dst; @@ -333,7 +333,7 @@ static int scatter_for_bcast( int count ATTRIBUTE((unused)), MPI_Datatype datatype ATTRIBUTE((unused)), int root, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, int nbytes, void *tmp_buf, int is_contig, @@ -479,7 +479,7 @@ static int MPIR_Bcast_scatter_doubling_allgather( int count, MPI_Datatype datatype, int root, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { MPI_Status status; @@ -787,7 +787,7 @@ static int MPIR_Bcast_scatter_ring_allgather( int count, MPI_Datatype datatype, int root, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { int rank, comm_size; @@ -993,7 +993,7 @@ static int MPIR_SMP_Bcast( int count, MPI_Datatype datatype, int root, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; @@ -1220,7 +1220,7 @@ int MPIR_Bcast_intra ( int count, MPI_Datatype datatype, int root, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag ) { int mpi_errno = MPI_SUCCESS; @@ -1344,7 +1344,7 @@ int MPIR_Bcast_inter ( int count, MPI_Datatype datatype, int root, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { /* Intercommunicator broadcast. @@ -1354,7 +1354,7 @@ int MPIR_Bcast_inter ( int rank, mpi_errno; int mpi_errno_ret = MPI_SUCCESS; MPI_Status status; - MPID_Comm *newcomm_ptr = NULL; + MPIR_Comm *newcomm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPIR_BCAST_INTER); MPID_MPI_FUNC_ENTER(MPID_STATE_MPIR_BCAST_INTER); @@ -1434,7 +1434,7 @@ fn_fail: #define FUNCNAME MPIR_Bcast_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Bcast_impl(void *buffer, int count, MPI_Datatype datatype, int root, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag) +int MPIR_Bcast_impl(void *buffer, int count, MPI_Datatype datatype, int root, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; @@ -1466,7 +1466,7 @@ int MPIR_Bcast_impl(void *buffer, int count, MPI_Datatype datatype, int root, MP #define FUNCNAME MPIR_Bcast #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -inline int MPIR_Bcast(void *buffer, int count, MPI_Datatype datatype, int root, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag) +inline int MPIR_Bcast(void *buffer, int count, MPI_Datatype datatype, int root, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; @@ -1524,7 +1524,7 @@ int MPI_Bcast( void *buffer, int count, MPI_Datatype datatype, int root, MPI_Comm comm ) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPIR_Errflag_t errflag = MPIR_ERR_NONE; MPID_MPI_STATE_DECL(MPID_STATE_MPI_BCAST); @@ -1545,7 +1545,7 @@ int MPI_Bcast( void *buffer, int count, MPI_Datatype datatype, int root, # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -1554,7 +1554,7 @@ int MPI_Bcast( void *buffer, int count, MPI_Datatype datatype, int root, { MPID_Datatype *datatype_ptr = NULL; - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPIR_ERRTEST_COUNT(count, mpi_errno); MPIR_ERRTEST_DATATYPE(datatype, "datatype", mpi_errno); diff --git a/src/mpi/coll/exscan.c b/src/mpi/coll/exscan.c index 24209c9..5ffc5f2 100644 --- a/src/mpi/coll/exscan.c +++ b/src/mpi/coll/exscan.c @@ -90,7 +90,7 @@ int MPIR_Exscan ( int count, MPI_Datatype datatype, MPI_Op op, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag ) { MPI_Status status; @@ -252,7 +252,7 @@ fn_fail: #define FUNCNAME MPIR_Exscan_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Exscan_impl(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag) +int MPIR_Exscan_impl(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; @@ -318,7 +318,7 @@ int MPI_Exscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datat MPI_Op op, MPI_Comm comm) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPIR_Errflag_t errflag = MPIR_ERR_NONE; MPID_MPI_STATE_DECL(MPID_STATE_MPI_EXSCAN); @@ -339,7 +339,7 @@ int MPI_Exscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datat # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -350,7 +350,7 @@ int MPI_Exscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datat MPID_Op *op_ptr = NULL; int rank; - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPIR_ERRTEST_COMM_INTRA(comm_ptr, mpi_errno); diff --git a/src/mpi/coll/gather.c b/src/mpi/coll/gather.c index afe60f4..7548e46 100644 --- a/src/mpi/coll/gather.c +++ b/src/mpi/coll/gather.c @@ -86,7 +86,7 @@ int MPI_Gather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void * #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Gather_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, int root, MPID_Comm *comm_ptr, + int recvcount, MPI_Datatype recvtype, int root, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { int comm_size, rank; @@ -502,7 +502,7 @@ int MPIR_Gather_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Gather_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, int root, MPID_Comm *comm_ptr, + int recvcount, MPI_Datatype recvtype, int root, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { /* Intercommunicator gather. @@ -523,7 +523,7 @@ int MPIR_Gather_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPI_Status status; MPI_Aint extent, true_extent, true_lb = 0; void *tmp_buf=NULL; - MPID_Comm *newcomm_ptr = NULL; + MPIR_Comm *newcomm_ptr = NULL; MPIU_CHKLMEM_DECL(1); if (root == MPI_PROC_NULL) @@ -674,7 +674,7 @@ int MPIR_Gather_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Gather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag) + int root, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; @@ -708,7 +708,7 @@ int MPIR_Gather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Gather_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag) + int root, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; @@ -773,7 +773,7 @@ int MPI_Gather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, int root, MPI_Comm comm) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPIR_Errflag_t errflag = MPIR_ERR_NONE; MPID_MPI_STATE_DECL(MPID_STATE_MPI_GATHER); @@ -794,7 +794,7 @@ int MPI_Gather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -804,7 +804,7 @@ int MPI_Gather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPID_Datatype *sendtype_ptr=NULL, *recvtype_ptr=NULL; int rank; - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; if (comm_ptr->comm_kind == MPID_INTRACOMM) { diff --git a/src/mpi/coll/gatherv.c b/src/mpi/coll/gatherv.c index 5648845..84a0a3d 100644 --- a/src/mpi/coll/gatherv.c +++ b/src/mpi/coll/gatherv.c @@ -82,7 +82,7 @@ int MPIR_Gatherv ( const int *displs, MPI_Datatype recvtype, int root, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag ) { int comm_size, rank; @@ -217,7 +217,7 @@ fn_fail: #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Gatherv_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, - int root, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag) + int root, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; @@ -286,7 +286,7 @@ int MPI_Gatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPI_Datatype recvtype, int root, MPI_Comm comm) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPIR_Errflag_t errflag = MPIR_ERR_NONE; MPID_MPI_STATE_DECL(MPID_STATE_MPI_GATHERV); @@ -307,7 +307,7 @@ int MPI_Gatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -317,7 +317,7 @@ int MPI_Gatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPID_Datatype *sendtype_ptr=NULL, *recvtype_ptr=NULL; int i, rank, comm_size; - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; if (comm_ptr->comm_kind == MPID_INTRACOMM) { diff --git a/src/mpi/coll/helper_fns.c b/src/mpi/coll/helper_fns.c index 7fc4444..ed06cd2 100644 --- a/src/mpi/coll/helper_fns.c +++ b/src/mpi/coll/helper_fns.c @@ -26,9 +26,9 @@ int MPIC_Probe(int source, int tag, MPI_Comm comm, MPI_Status *status) { int mpi_errno = MPI_SUCCESS; int context_id; - MPID_Comm *comm_ptr; + MPIR_Comm *comm_ptr; - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); context_id = (comm_ptr->comm_kind == MPID_INTRACOMM) ? MPID_CONTEXT_INTRA_COLL : MPID_CONTEXT_INTER_COLL; @@ -269,7 +269,7 @@ int MPIC_Wait(MPID_Request * request_ptr, MPIR_Errflag_t *errflag) #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIC_Send(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, - MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag) + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; int context_id; @@ -327,7 +327,7 @@ int MPIC_Send(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIC_Recv(void *buf, MPI_Aint count, MPI_Datatype datatype, int source, int tag, - MPID_Comm *comm_ptr, MPI_Status *status, MPIR_Errflag_t *errflag) + MPIR_Comm *comm_ptr, MPI_Status *status, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; int context_id; @@ -385,7 +385,7 @@ int MPIC_Recv(void *buf, MPI_Aint count, MPI_Datatype datatype, int source, int #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIC_Ssend(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, - MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag) + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; int context_id; @@ -445,7 +445,7 @@ int MPIC_Ssend(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int MPIC_Sendrecv(const void *sendbuf, MPI_Aint sendcount, MPI_Datatype sendtype, int dest, int sendtag, void *recvbuf, MPI_Aint recvcount, MPI_Datatype recvtype, int source, int recvtag, - MPID_Comm *comm_ptr, MPI_Status *status, MPIR_Errflag_t *errflag) + MPIR_Comm *comm_ptr, MPI_Status *status, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; int context_id; @@ -523,7 +523,7 @@ int MPIC_Sendrecv(const void *sendbuf, MPI_Aint sendcount, MPI_Datatype sendtype int MPIC_Sendrecv_replace(void *buf, int count, MPI_Datatype datatype, int dest, int sendtag, int source, int recvtag, - MPID_Comm *comm_ptr, MPI_Status *status, MPIR_Errflag_t *errflag) + MPIR_Comm *comm_ptr, MPI_Status *status, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; MPI_Status mystatus; @@ -619,7 +619,7 @@ int MPIC_Sendrecv_replace(void *buf, int count, MPI_Datatype datatype, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIC_Isend(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, - MPID_Comm *comm_ptr, MPID_Request **request_ptr, MPIR_Errflag_t *errflag) + MPIR_Comm *comm_ptr, MPID_Request **request_ptr, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; int context_id; @@ -660,7 +660,7 @@ int MPIC_Isend(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIC_Issend(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, - MPID_Comm *comm_ptr, MPID_Request **request_ptr, MPIR_Errflag_t *errflag) + MPIR_Comm *comm_ptr, MPID_Request **request_ptr, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; int context_id; @@ -701,7 +701,7 @@ int MPIC_Issend(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIC_Irecv(void *buf, MPI_Aint count, MPI_Datatype datatype, int source, - int tag, MPID_Comm *comm_ptr, MPID_Request **request_ptr) + int tag, MPIR_Comm *comm_ptr, MPID_Request **request_ptr) { int mpi_errno = MPI_SUCCESS; int context_id; diff --git a/src/mpi/coll/iallgather.c b/src/mpi/coll/iallgather.c index 202128c..d1e2578 100644 --- a/src/mpi/coll/iallgather.c +++ b/src/mpi/coll/iallgather.c @@ -35,7 +35,7 @@ struct shared_state { MPI_Aint last_recv_count; MPI_Status status; }; -static int get_count(MPID_Comm *comm, int tag, void *state) +static int get_count(MPIR_Comm *comm, int tag, void *state) { struct shared_state *ss = state; int recv_count; @@ -44,7 +44,7 @@ static int get_count(MPID_Comm *comm, int tag, void *state) ss->curr_count += ss->last_recv_count; return MPI_SUCCESS; } -static int dtp_release_ref(MPID_Comm *comm, int tag, void *state) +static int dtp_release_ref(MPIR_Comm *comm, int tag, void *state) { MPID_Datatype *recv_dtp = state; MPID_Datatype_release(recv_dtp); @@ -57,7 +57,7 @@ static int dtp_release_ref(MPID_Comm *comm, int tag, void *state) #define FUNCNAME MPIR_Iallgather_rec_dbl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Iallgather_rec_dbl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPID_Sched_t s) +int MPIR_Iallgather_rec_dbl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; struct shared_state *ss = NULL; @@ -236,7 +236,7 @@ fn_fail: #define FUNCNAME MPIR_Iallgather_bruck #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Iallgather_bruck(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPID_Sched_t s) +int MPIR_Iallgather_bruck(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; int pof2, curr_cnt, rem, src, dst; @@ -344,7 +344,7 @@ fn_fail: #define FUNCNAME MPIR_Iallgather_ring #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Iallgather_ring(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPID_Sched_t s) +int MPIR_Iallgather_ring(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; int rank, comm_size; @@ -445,7 +445,7 @@ fn_fail: #define FUNCNAME MPIR_Iallgather_intra #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Iallgather_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPID_Sched_t s) +int MPIR_Iallgather_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; int comm_size, recvtype_size; @@ -488,7 +488,7 @@ fn_fail: #define FUNCNAME MPIR_Iallgather_inter #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Iallgather_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPID_Sched_t s) +int MPIR_Iallgather_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s) { /* Intercommunicator Allgather. Each group does a gather to local root with the local @@ -498,7 +498,7 @@ int MPIR_Iallgather_inter(const void *sendbuf, int sendcount, MPI_Datatype sendt int rank, local_size, remote_size, root; MPI_Aint true_extent, true_lb = 0, extent, send_extent; void *tmp_buf = NULL; - MPID_Comm *newcomm_ptr = NULL; + MPIR_Comm *newcomm_ptr = NULL; MPIR_SCHED_CHKPMEM_DECL(1); local_size = comm_ptr->local_size; @@ -591,7 +591,7 @@ fn_fail: #define FUNCNAME MPIR_Iallgather_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Iallgather_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPI_Request *request) +int MPIR_Iallgather_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; MPID_Request *reqp = NULL; @@ -654,7 +654,7 @@ int MPI_Iallgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPI_Comm comm, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_IALLGATHER); MPID_THREAD_CS_ENTER(GLOBAL, MPIR_THREAD_GLOBAL_ALLFUNC_MUTEX); @@ -679,14 +679,14 @@ int MPI_Iallgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr(comm, comm_ptr); + MPIR_Comm_get_ptr(comm, comm_ptr); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS { - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (sendbuf != MPI_IN_PLACE && HANDLE_GET_KIND(sendtype) != HANDLE_KIND_BUILTIN) { MPID_Datatype *sendtype_ptr = NULL; MPID_Datatype_get_ptr(sendtype, sendtype_ptr); diff --git a/src/mpi/coll/iallgatherv.c b/src/mpi/coll/iallgatherv.c index 73050fe..13dbfbd 100644 --- a/src/mpi/coll/iallgatherv.c +++ b/src/mpi/coll/iallgatherv.c @@ -33,7 +33,7 @@ int MPI_Iallgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, v #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Iallgatherv_rec_dbl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int displs[], - MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPID_Sched_t s) + MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; int comm_size, rank, i, j, k; @@ -275,7 +275,7 @@ fn_fail: #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Iallgatherv_bruck(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int displs[], - MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPID_Sched_t s) + MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; int comm_size, rank, j, i; @@ -414,7 +414,7 @@ fn_fail: #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Iallgatherv_ring(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int displs[], - MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPID_Sched_t s) + MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; int i, total_count; @@ -556,7 +556,7 @@ fn_fail: #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Iallgatherv_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int displs[], - MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPID_Sched_t s) + MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; int i, comm_size, total_count, recvtype_size; @@ -604,7 +604,7 @@ fn_fail: #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Iallgatherv_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int displs[], - MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPID_Sched_t s) + MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s) { /* Intercommunicator Allgatherv. This is done differently from the intercommunicator allgather @@ -616,7 +616,7 @@ int MPIR_Iallgatherv_inter(const void *sendbuf, int sendcount, MPI_Datatype send */ int mpi_errno = MPI_SUCCESS; int remote_size, root, rank; - MPID_Comm *newcomm_ptr = NULL; + MPIR_Comm *newcomm_ptr = NULL; MPI_Datatype newtype = MPI_DATATYPE_NULL; remote_size = comm_ptr->remote_size; @@ -692,7 +692,7 @@ fn_fail: #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Iallgatherv_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int displs[], - MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPI_Request *request) + MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; MPID_Request *reqp = NULL; @@ -756,7 +756,7 @@ int MPI_Iallgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, v MPI_Comm comm, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_IALLGATHERV); MPID_THREAD_CS_ENTER(GLOBAL, MPIR_THREAD_GLOBAL_ALLFUNC_MUTEX); @@ -781,14 +781,14 @@ int MPI_Iallgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, v # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr(comm, comm_ptr); + MPIR_Comm_get_ptr(comm, comm_ptr); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS { - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; if (sendbuf != MPI_IN_PLACE) { diff --git a/src/mpi/coll/iallreduce.c b/src/mpi/coll/iallreduce.c index 6481934..317f5ee 100644 --- a/src/mpi/coll/iallreduce.c +++ b/src/mpi/coll/iallreduce.c @@ -34,7 +34,7 @@ int MPI_Iallreduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype d #define FUNCNAME MPIR_Iallreduce_naive #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Iallreduce_naive(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPID_Sched_t s) +int MPIR_Iallreduce_naive(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; int rank; @@ -66,7 +66,7 @@ fn_fail: #define FUNCNAME MPIR_Iallreduce_redscat_allgather #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Iallreduce_redscat_allgather(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPID_Sched_t s) +int MPIR_Iallreduce_redscat_allgather(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; int comm_size, rank, newrank, pof2, rem; @@ -291,7 +291,7 @@ fn_fail: #define FUNCNAME MPIR_Iallreduce_rec_dbl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Iallreduce_rec_dbl(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPID_Sched_t s) +int MPIR_Iallreduce_rec_dbl(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; int pof2, rem, comm_size, is_commutative, rank; @@ -434,7 +434,7 @@ fn_fail: #define FUNCNAME MPIR_Iallreduce_intra #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Iallreduce_intra(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPID_Sched_t s) +int MPIR_Iallreduce_intra(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; int comm_size, is_homogeneous, pof2, type_size; @@ -495,7 +495,7 @@ fn_fail: #define FUNCNAME MPIR_Iallreduce_inter #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Iallreduce_inter(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPID_Sched_t s) +int MPIR_Iallreduce_inter(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Sched_t s) { /* Intercommunicator Allreduce. We first do an intercommunicator reduce to rank 0 on left group, @@ -507,7 +507,7 @@ int MPIR_Iallreduce_inter(const void *sendbuf, void *recvbuf, int count, MPI_Dat */ int mpi_errno = MPI_SUCCESS; int rank, root; - MPID_Comm *lcomm_ptr = NULL; + MPIR_Comm *lcomm_ptr = NULL; MPIU_Assert(comm_ptr->comm_kind == MPID_INTERCOMM); @@ -568,12 +568,12 @@ fn_fail: #define FUNCNAME MPIR_Iallreduce_SMP #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Iallreduce_SMP(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPID_Sched_t s) +int MPIR_Iallreduce_SMP(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; int is_commutative; - MPID_Comm *nc; - MPID_Comm *nrc; + MPIR_Comm *nc; + MPIR_Comm *nrc; if (!MPIR_CVAR_ENABLE_SMP_COLLECTIVES || !MPIR_CVAR_ENABLE_SMP_ALLREDUCE) MPID_Abort(comm_ptr, MPI_ERR_OTHER, 1, "SMP collectives are disabled!"); @@ -646,7 +646,7 @@ fn_fail: #define FUNCNAME MPIR_Iallreduce_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Iallreduce_impl(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPI_Request *request) +int MPIR_Iallreduce_impl(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; MPID_Request *reqp = NULL; @@ -708,7 +708,7 @@ int MPI_Iallreduce(const void *sendbuf, void *recvbuf, int count, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_IALLREDUCE); MPID_THREAD_CS_ENTER(GLOBAL, MPIR_THREAD_GLOBAL_ALLFUNC_MUTEX); @@ -731,14 +731,14 @@ int MPI_Iallreduce(const void *sendbuf, void *recvbuf, int count, # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr(comm, comm_ptr); + MPIR_Comm_get_ptr(comm, comm_ptr); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS { - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { MPID_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(datatype, datatype_ptr); diff --git a/src/mpi/coll/ialltoall.c b/src/mpi/coll/ialltoall.c index 4c23960..b532ccf 100644 --- a/src/mpi/coll/ialltoall.c +++ b/src/mpi/coll/ialltoall.c @@ -44,7 +44,7 @@ int MPI_Ialltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, voi #define FUNCNAME MPIR_Ialltoall_inplace #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Ialltoall_inplace(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPID_Sched_t s) +int MPIR_Ialltoall_inplace(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; void *tmp_buf = NULL; @@ -110,7 +110,7 @@ fn_fail: #define FUNCNAME MPIR_Ialltoall_bruck #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Ialltoall_bruck(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPID_Sched_t s) +int MPIR_Ialltoall_bruck(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; int i; @@ -254,7 +254,7 @@ fn_fail: #define FUNCNAME MPIR_Ialltoall_perm_sr #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Ialltoall_perm_sr(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPID_Sched_t s) +int MPIR_Ialltoall_perm_sr(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; int i; @@ -307,7 +307,7 @@ fn_fail: #define FUNCNAME MPIR_Ialltoall_pairwise #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Ialltoall_pairwise(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPID_Sched_t s) +int MPIR_Ialltoall_pairwise(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; int i; @@ -407,7 +407,7 @@ fn_fail: #define FUNCNAME MPIR_Ialltoall_intra #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Ialltoall_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPID_Sched_t s) +int MPIR_Ialltoall_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; int nbytes, comm_size, sendtype_size; @@ -453,7 +453,7 @@ fn_fail: #define FUNCNAME MPIR_Ialltoall_inter #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Ialltoall_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPID_Sched_t s) +int MPIR_Ialltoall_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s) { /* Intercommunicator alltoall. We use a pairwise exchange algorithm similar to the one used in intracommunicator alltoall for long @@ -519,7 +519,7 @@ fn_fail: #define FUNCNAME MPIR_Ialltoall_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Ialltoall_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPI_Request *request) +int MPIR_Ialltoall_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; MPID_Request *reqp = NULL; @@ -581,7 +581,7 @@ int MPI_Ialltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPI_Comm comm, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_IALLTOALL); MPID_THREAD_CS_ENTER(GLOBAL, MPIR_THREAD_GLOBAL_ALLFUNC_MUTEX); @@ -607,14 +607,14 @@ int MPI_Ialltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr(comm, comm_ptr); + MPIR_Comm_get_ptr(comm, comm_ptr); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS { - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; if (sendbuf != MPI_IN_PLACE && HANDLE_GET_KIND(sendtype) != HANDLE_KIND_BUILTIN) { diff --git a/src/mpi/coll/ialltoallv.c b/src/mpi/coll/ialltoallv.c index a0c95c0..84bd456 100644 --- a/src/mpi/coll/ialltoallv.c +++ b/src/mpi/coll/ialltoallv.c @@ -36,7 +36,7 @@ int MPI_Ialltoallv(const void *sendbuf, const int sendcounts[], const int sdispl #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Ialltoallv_intra(const void *sendbuf, const int sendcounts[], const int sdispls[], MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], - const int rdispls[], MPI_Datatype recvtype, MPID_Comm *comm_ptr, + const int rdispls[], MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; @@ -164,7 +164,7 @@ fn_fail: #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Ialltoallv_inter(const void *sendbuf, const int sendcounts[], const int sdispls[], MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], - const int rdispls[], MPI_Datatype recvtype, MPID_Comm *comm_ptr, + const int rdispls[], MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s) { /* Intercommunicator alltoallv. We use a pairwise exchange algorithm @@ -247,7 +247,7 @@ fn_fail: #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Ialltoallv_impl(const void *sendbuf, const int sendcounts[], const int sdispls[], MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], - const int rdispls[], MPI_Datatype recvtype, MPID_Comm *comm_ptr, + const int rdispls[], MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; @@ -314,7 +314,7 @@ int MPI_Ialltoallv(const void *sendbuf, const int sendcounts[], const int sdispl const int rdispls[], MPI_Datatype recvtype, MPI_Comm comm, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_IALLTOALLV); MPID_THREAD_CS_ENTER(GLOBAL, MPIR_THREAD_GLOBAL_ALLFUNC_MUTEX); @@ -337,14 +337,14 @@ int MPI_Ialltoallv(const void *sendbuf, const int sendcounts[], const int sdispl # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr(comm, comm_ptr); + MPIR_Comm_get_ptr(comm, comm_ptr); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS { - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; if (sendbuf != MPI_IN_PLACE) { diff --git a/src/mpi/coll/ialltoallw.c b/src/mpi/coll/ialltoallw.c index 555fd62..27428b8 100644 --- a/src/mpi/coll/ialltoallw.c +++ b/src/mpi/coll/ialltoallw.c @@ -58,7 +58,7 @@ int MPI_Ialltoallw(const void *sendbuf, const int sendcounts[], const int sdispl int MPIR_Ialltoallw_intra(const void *sendbuf, const int sendcounts[], const int sdispls[], const MPI_Datatype sendtypes[], void *recvbuf, const int recvcounts[], const int rdispls[], const MPI_Datatype recvtypes[], - MPID_Comm *comm_ptr, MPID_Sched_t s) + MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; int comm_size, i, j; @@ -183,7 +183,7 @@ fn_fail: int MPIR_Ialltoallw_inter(const void *sendbuf, const int sendcounts[], const int sdispls[], const MPI_Datatype sendtypes[], void *recvbuf, const int recvcounts[], const int rdispls[], const MPI_Datatype recvtypes[], - MPID_Comm *comm_ptr, MPID_Sched_t s) + MPIR_Comm *comm_ptr, MPID_Sched_t s) { /* Intercommunicator alltoallw. We use a pairwise exchange algorithm similar to the one used in intracommunicator alltoallw. Since the local and @@ -252,7 +252,7 @@ fn_fail: #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Ialltoallw_impl(const void *sendbuf, const int sendcounts[], const int sdispls[], const MPI_Datatype sendtypes[], void *recvbuf, const int recvcounts[], - const int rdispls[], const MPI_Datatype recvtypes[], MPID_Comm *comm_ptr, + const int rdispls[], const MPI_Datatype recvtypes[], MPIR_Comm *comm_ptr, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; @@ -319,7 +319,7 @@ int MPI_Ialltoallw(const void *sendbuf, const int sendcounts[], const int sdispl MPI_Request *request) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_IALLTOALLW); MPID_THREAD_CS_ENTER(GLOBAL, MPIR_THREAD_GLOBAL_ALLFUNC_MUTEX); @@ -339,14 +339,14 @@ int MPI_Ialltoallw(const void *sendbuf, const int sendcounts[], const int sdispl # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr(comm, comm_ptr); + MPIR_Comm_get_ptr(comm, comm_ptr); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS { - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; if (sendbuf != MPI_IN_PLACE) { diff --git a/src/mpi/coll/ibarrier.c b/src/mpi/coll/ibarrier.c index 7e72dcf..f8acb46 100644 --- a/src/mpi/coll/ibarrier.c +++ b/src/mpi/coll/ibarrier.c @@ -53,7 +53,7 @@ int MPI_Ibarrier(MPI_Comm comm, MPI_Request *request) __attribute__((weak,alias( #define FUNCNAME MPIR_Ibarrier_intra #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Ibarrier_intra(MPID_Comm *comm_ptr, MPID_Sched_t s) +int MPIR_Ibarrier_intra(MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; int size, rank, src, dst, mask; @@ -96,7 +96,7 @@ fn_fail: #define FUNCNAME MPIR_Ibarrier_inter #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Ibarrier_inter(MPID_Comm *comm_ptr, MPID_Sched_t s) +int MPIR_Ibarrier_inter(MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; int rank, root; @@ -169,7 +169,7 @@ fn_fail: #define FUNCNAME MPIR_Ibarrier_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Ibarrier_impl(MPID_Comm *comm_ptr, MPI_Request *request) +int MPIR_Ibarrier_impl(MPIR_Comm *comm_ptr, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; MPID_Request *reqp = NULL; @@ -235,7 +235,7 @@ group have called MPI_Ibarrier. int MPI_Ibarrier(MPI_Comm comm, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_IBARRIER); MPID_THREAD_CS_ENTER(GLOBAL, MPIR_THREAD_GLOBAL_ALLFUNC_MUTEX); @@ -255,14 +255,14 @@ int MPI_Ibarrier(MPI_Comm comm, MPI_Request *request) # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr(comm, comm_ptr); + MPIR_Comm_get_ptr(comm, comm_ptr); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS { - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPIR_ERRTEST_ARGNULL(request,"request", mpi_errno); /* TODO more checks may be appropriate (counts, in_place, buffer aliasing, etc) */ diff --git a/src/mpi/coll/ibcast.c b/src/mpi/coll/ibcast.c index 52dad61..9682ba8 100644 --- a/src/mpi/coll/ibcast.c +++ b/src/mpi/coll/ibcast.c @@ -38,7 +38,7 @@ struct MPIR_Ibcast_status{ #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int sched_test_length(MPID_Comm * comm, int tag, void *state) +static int sched_test_length(MPIR_Comm * comm, int tag, void *state) { int mpi_errno = MPI_SUCCESS; int recv_size; @@ -58,7 +58,7 @@ static int sched_test_length(MPID_Comm * comm, int tag, void *state) #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int sched_test_curr_length(MPID_Comm * comm, int tag, void *state) +static int sched_test_curr_length(MPIR_Comm * comm, int tag, void *state) { int mpi_errno = MPI_SUCCESS; struct MPIR_Ibcast_status *status = (struct MPIR_Ibcast_status*) state; @@ -76,7 +76,7 @@ static int sched_test_curr_length(MPID_Comm * comm, int tag, void *state) #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int sched_add_length(MPID_Comm * comm, int tag, void *state) +static int sched_add_length(MPIR_Comm * comm, int tag, void *state) { int mpi_errno = MPI_SUCCESS; int recv_size; @@ -98,7 +98,7 @@ static int sched_add_length(MPID_Comm * comm, int tag, void *state) #define FUNCNAME MPIR_Ibcast_binomial #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Ibcast_binomial(void *buffer, int count, MPI_Datatype datatype, int root, MPID_Comm *comm_ptr, MPID_Sched_t s) +int MPIR_Ibcast_binomial(void *buffer, int count, MPI_Datatype datatype, int root, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; int mask; @@ -264,7 +264,7 @@ fn_fail: #define FUNCNAME MPIR_Iscatter_for_bcast #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Iscatter_for_bcast(void *tmp_buf, int root, MPID_Comm *comm_ptr, int nbytes, MPID_Sched_t s) +int MPIR_Iscatter_for_bcast(void *tmp_buf, int root, MPIR_Comm *comm_ptr, int nbytes, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; int rank, comm_size, src, dst; @@ -386,7 +386,7 @@ fn_fail: #define FUNCNAME MPIR_Ibcast_scatter_rec_dbl_allgather #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Ibcast_scatter_rec_dbl_allgather(void *buffer, int count, MPI_Datatype datatype, int root, MPID_Comm *comm_ptr, MPID_Sched_t s) +int MPIR_Ibcast_scatter_rec_dbl_allgather(void *buffer, int count, MPI_Datatype datatype, int root, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; int rank, comm_size, dst; @@ -641,7 +641,7 @@ fn_fail: #define FUNCNAME MPIR_Ibcast_scatter_ring_allgather #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Ibcast_scatter_ring_allgather(void *buffer, int count, MPI_Datatype datatype, int root, MPID_Comm *comm_ptr, MPID_Sched_t s) +int MPIR_Ibcast_scatter_ring_allgather(void *buffer, int count, MPI_Datatype datatype, int root, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; int comm_size, rank; @@ -764,7 +764,7 @@ fn_fail: #define FUNCNAME MPIR_Ibcast_SMP #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Ibcast_SMP(void *buffer, int count, MPI_Datatype datatype, int root, MPID_Comm *comm_ptr, MPID_Sched_t s) +int MPIR_Ibcast_SMP(void *buffer, int count, MPI_Datatype datatype, int root, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; int is_homogeneous; @@ -861,7 +861,7 @@ fn_fail: #define FUNCNAME MPIR_Ibcast_intra #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Ibcast_intra(void *buffer, int count, MPI_Datatype datatype, int root, MPID_Comm *comm_ptr, MPID_Sched_t s) +int MPIR_Ibcast_intra(void *buffer, int count, MPI_Datatype datatype, int root, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; int comm_size, is_homogeneous ATTRIBUTE((unused)); @@ -912,7 +912,7 @@ fn_fail: #define FUNCNAME MPIR_Ibcast_inter #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Ibcast_inter(void *buffer, int count, MPI_Datatype datatype, int root, MPID_Comm *comm_ptr, MPID_Sched_t s) +int MPIR_Ibcast_inter(void *buffer, int count, MPI_Datatype datatype, int root, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; @@ -963,7 +963,7 @@ fn_fail: #define FUNCNAME MPIR_Ibcast_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Ibcast_impl(void *buffer, int count, MPI_Datatype datatype, int root, MPID_Comm *comm_ptr, MPI_Request *request) +int MPIR_Ibcast_impl(void *buffer, int count, MPI_Datatype datatype, int root, MPIR_Comm *comm_ptr, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; MPID_Request *reqp = NULL; @@ -1023,7 +1023,7 @@ Output Parameters: int MPI_Ibcast(void *buffer, int count, MPI_Datatype datatype, int root, MPI_Comm comm, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_IBCAST); MPID_THREAD_CS_ENTER(GLOBAL, MPIR_THREAD_GLOBAL_ALLFUNC_MUTEX); @@ -1045,14 +1045,14 @@ int MPI_Ibcast(void *buffer, int count, MPI_Datatype datatype, int root, MPI_Com # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr(comm, comm_ptr); + MPIR_Comm_get_ptr(comm, comm_ptr); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS { - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { diff --git a/src/mpi/coll/iexscan.c b/src/mpi/coll/iexscan.c index b2d0b58..b8620b3 100644 --- a/src/mpi/coll/iexscan.c +++ b/src/mpi/coll/iexscan.c @@ -76,7 +76,7 @@ int MPI_Iexscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype data #define FUNCNAME MPIR_Iexscan #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Iexscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPID_Sched_t s) +int MPIR_Iexscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; int rank, comm_size; @@ -184,7 +184,7 @@ fn_fail: #define FUNCNAME MPIR_Iexscan_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Iexscan_impl(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPI_Request *request) +int MPIR_Iexscan_impl(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; MPID_Request *reqp = NULL; @@ -246,7 +246,7 @@ int MPI_Iexscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype data MPI_Op op, MPI_Comm comm, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_IEXSCAN); MPID_THREAD_CS_ENTER(GLOBAL, MPIR_THREAD_GLOBAL_ALLFUNC_MUTEX); @@ -268,14 +268,14 @@ int MPI_Iexscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype data # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr(comm, comm_ptr); + MPIR_Comm_get_ptr(comm, comm_ptr); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS { - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); MPIR_ERRTEST_COMM_INTRA(comm_ptr, mpi_errno); if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { MPID_Datatype *datatype_ptr = NULL; diff --git a/src/mpi/coll/igather.c b/src/mpi/coll/igather.c index f45f890..350a4c2 100644 --- a/src/mpi/coll/igather.c +++ b/src/mpi/coll/igather.c @@ -54,7 +54,7 @@ int MPI_Igather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void #define FUNCNAME MPIR_Igather_binomial #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Igather_binomial(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPID_Comm *comm_ptr, MPID_Sched_t s) +int MPIR_Igather_binomial(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; int comm_size, rank; @@ -388,7 +388,7 @@ fn_fail: #define FUNCNAME MPIR_Igather_intra #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Igather_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPID_Comm *comm_ptr, MPID_Sched_t s) +int MPIR_Igather_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; @@ -405,7 +405,7 @@ fn_fail: #define FUNCNAME MPIR_Igather_inter #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Igather_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPID_Comm *comm_ptr, MPID_Sched_t s) +int MPIR_Igather_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; int rank; @@ -414,7 +414,7 @@ int MPIR_Igather_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype MPI_Aint recvtype_size, sendtype_size, nbytes; MPI_Aint extent, true_extent, true_lb = 0; void *tmp_buf = NULL; - MPID_Comm *newcomm_ptr = NULL; + MPIR_Comm *newcomm_ptr = NULL; MPIR_SCHED_CHKPMEM_DECL(1); /* Intercommunicator gather. @@ -522,7 +522,7 @@ fn_fail: #define FUNCNAME MPIR_Igather_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Igather_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPID_Comm *comm_ptr, MPI_Request *request) +int MPIR_Igather_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPIR_Comm *comm_ptr, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; MPID_Request *reqp = NULL; @@ -586,7 +586,7 @@ int MPI_Igather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, int root, MPI_Comm comm, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_IGATHER); MPID_THREAD_CS_ENTER(GLOBAL, MPIR_THREAD_GLOBAL_ALLFUNC_MUTEX); @@ -612,7 +612,7 @@ int MPI_Igather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr(comm, comm_ptr); + MPIR_Comm_get_ptr(comm, comm_ptr); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -622,7 +622,7 @@ int MPI_Igather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPID_Datatype *sendtype_ptr=NULL, *recvtype_ptr=NULL; int rank; - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; if (comm_ptr->comm_kind == MPID_INTRACOMM) { diff --git a/src/mpi/coll/igatherv.c b/src/mpi/coll/igatherv.c index efdcdbb..3e5cdfa 100644 --- a/src/mpi/coll/igatherv.c +++ b/src/mpi/coll/igatherv.c @@ -35,7 +35,7 @@ int MPI_Igatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Igatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int displs[], MPI_Datatype recvtype, int root, - MPID_Comm *comm_ptr, MPID_Sched_t s) + MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; int i; @@ -111,7 +111,7 @@ fn_fail: #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Igatherv_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int displs[], MPI_Datatype recvtype, - int root, MPID_Comm *comm_ptr, MPI_Request *request) + int root, MPIR_Comm *comm_ptr, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; MPID_Request *reqp = NULL; @@ -176,7 +176,7 @@ int MPI_Igatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void MPI_Comm comm, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_IGATHERV); MPID_THREAD_CS_ENTER(GLOBAL, MPIR_THREAD_GLOBAL_ALLFUNC_MUTEX); @@ -196,7 +196,7 @@ int MPI_Igatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr(comm, comm_ptr); + MPIR_Comm_get_ptr(comm, comm_ptr); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -206,7 +206,7 @@ int MPI_Igatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void MPID_Datatype *sendtype_ptr=NULL, *recvtype_ptr=NULL; int i, rank, comm_size; - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; if (comm_ptr->comm_kind == MPID_INTRACOMM) { diff --git a/src/mpi/coll/ired_scat.c b/src/mpi/coll/ired_scat.c index d4767ea..79d548f 100644 --- a/src/mpi/coll/ired_scat.c +++ b/src/mpi/coll/ired_scat.c @@ -37,7 +37,7 @@ int MPI_Ireduce_scatter(const void *sendbuf, void *recvbuf, const int recvcounts #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Ireduce_scatter_rec_hlv(const void *sendbuf, void *recvbuf, const int recvcounts[], MPI_Datatype datatype, MPI_Op op, - MPID_Comm *comm_ptr, MPID_Sched_t s) + MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; int rank, comm_size, i; @@ -263,7 +263,7 @@ fn_fail: #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Ireduce_scatter_pairwise(const void *sendbuf, void *recvbuf, const int recvcounts[], - MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; @@ -402,7 +402,7 @@ fn_fail: #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Ireduce_scatter_rec_dbl(const void *sendbuf, void *recvbuf, const int recvcounts[], - MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; @@ -664,7 +664,7 @@ fn_fail: #define FCNAME MPL_QUOTE(FUNCNAME) static int MPIR_Ireduce_scatter_noncomm(const void *sendbuf, void *recvbuf, const int recvcounts[], MPI_Datatype datatype, MPI_Op op, - MPID_Comm *comm_ptr, MPID_Sched_t s) + MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; int comm_size = comm_ptr->local_size; @@ -837,7 +837,7 @@ fn_fail: #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Ireduce_scatter_intra(const void *sendbuf, void *recvbuf, const int recvcounts[], - MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; @@ -900,7 +900,7 @@ fn_fail: #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Ireduce_scatter_inter(const void *sendbuf, void *recvbuf, const int recvcounts[], - MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Sched_t s) { /* Intercommunicator Reduce_scatter. @@ -913,7 +913,7 @@ int MPIR_Ireduce_scatter_inter(const void *sendbuf, void *recvbuf, const int rec MPI_Aint true_extent, true_lb = 0, extent; void *tmp_buf = NULL; int *disps = NULL; - MPID_Comm *newcomm_ptr = NULL; + MPIR_Comm *newcomm_ptr = NULL; MPIR_SCHED_CHKPMEM_DECL(2); rank = comm_ptr->rank; @@ -1008,7 +1008,7 @@ fn_fail: #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Ireduce_scatter_impl(const void *sendbuf, void *recvbuf, const int recvcounts[], - MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; @@ -1071,7 +1071,7 @@ int MPI_Ireduce_scatter(const void *sendbuf, void *recvbuf, const int recvcounts { int mpi_errno = MPI_SUCCESS; int i; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_IREDUCE_SCATTER); i = 0; @@ -1094,14 +1094,14 @@ int MPI_Ireduce_scatter(const void *sendbuf, void *recvbuf, const int recvcounts # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr(comm, comm_ptr); + MPIR_Comm_get_ptr(comm, comm_ptr); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS { - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPIR_ERRTEST_ARGNULL(recvcounts,"recvcounts", mpi_errno); diff --git a/src/mpi/coll/ired_scat_block.c b/src/mpi/coll/ired_scat_block.c index 50daeb0..eb2e6b1 100644 --- a/src/mpi/coll/ired_scat_block.c +++ b/src/mpi/coll/ired_scat_block.c @@ -36,7 +36,7 @@ int MPI_Ireduce_scatter_block(const void *sendbuf, void *recvbuf, int recvcount, #define FUNCNAME MPIR_Ireduce_scatter_block_rec_hlv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Ireduce_scatter_block_rec_hlv(const void *sendbuf, void *recvbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPID_Sched_t s) +int MPIR_Ireduce_scatter_block_rec_hlv(const void *sendbuf, void *recvbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; int rank, comm_size, i; @@ -256,7 +256,7 @@ fn_fail: #define FUNCNAME MPIR_Ireduce_scatter_block_rec_pairwise #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Ireduce_scatter_block_pairwise(const void *sendbuf, void *recvbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPID_Sched_t s) +int MPIR_Ireduce_scatter_block_pairwise(const void *sendbuf, void *recvbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; int rank, comm_size, i; @@ -393,7 +393,7 @@ fn_fail: #define FUNCNAME MPIR_Ireduce_scatter_block_rec_dbl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Ireduce_scatter_block_rec_dbl(const void *sendbuf, void *recvbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPID_Sched_t s) +int MPIR_Ireduce_scatter_block_rec_dbl(const void *sendbuf, void *recvbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; int rank, comm_size, i; @@ -644,7 +644,7 @@ fn_fail: #define FUNCNAME MPIR_Reduce_scatter_block_noncomm #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Ireduce_scatter_block_noncomm(const void *sendbuf, void *recvbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPID_Sched_t s) +int MPIR_Ireduce_scatter_block_noncomm(const void *sendbuf, void *recvbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; int comm_size = comm_ptr->local_size; @@ -767,7 +767,7 @@ fn_fail: #define FUNCNAME MPIR_Ireduce_scatter_block_intra #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Ireduce_scatter_block_intra(const void *sendbuf, void *recvbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPID_Sched_t s) +int MPIR_Ireduce_scatter_block_intra(const void *sendbuf, void *recvbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; int is_commutative; @@ -817,7 +817,7 @@ fn_fail: #define FUNCNAME MPIR_Ireduce_scatter_block_inter #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Ireduce_scatter_block_inter(const void *sendbuf, void *recvbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPID_Sched_t s) +int MPIR_Ireduce_scatter_block_inter(const void *sendbuf, void *recvbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Sched_t s) { /* Intercommunicator Ireduce_scatter_block. We first do an intercommunicator reduce to rank 0 on left group, @@ -828,7 +828,7 @@ int MPIR_Ireduce_scatter_block_inter(const void *sendbuf, void *recvbuf, int rec int rank, root, local_size, total_count; MPI_Aint true_extent, true_lb = 0, extent; void *tmp_buf = NULL; - MPID_Comm *newcomm_ptr = NULL; + MPIR_Comm *newcomm_ptr = NULL; MPIR_SCHED_CHKPMEM_DECL(1); rank = comm_ptr->rank; @@ -911,7 +911,7 @@ fn_fail: #define FUNCNAME MPIR_Ireduce_scatter_block_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Ireduce_scatter_block_impl(const void *sendbuf, void *recvbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPI_Request *request) +int MPIR_Ireduce_scatter_block_impl(const void *sendbuf, void *recvbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; MPID_Request *reqp = NULL; @@ -974,7 +974,7 @@ int MPI_Ireduce_scatter_block(const void *sendbuf, void *recvbuf, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_IREDUCE_SCATTER_BLOCK); MPID_THREAD_CS_ENTER(GLOBAL, MPIR_THREAD_GLOBAL_ALLFUNC_MUTEX); @@ -996,14 +996,14 @@ int MPI_Ireduce_scatter_block(const void *sendbuf, void *recvbuf, # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr(comm, comm_ptr); + MPIR_Comm_get_ptr(comm, comm_ptr); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS { - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { MPID_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(datatype, datatype_ptr); diff --git a/src/mpi/coll/ireduce.c b/src/mpi/coll/ireduce.c index 4df5d54..98d57c1 100644 --- a/src/mpi/coll/ireduce.c +++ b/src/mpi/coll/ireduce.c @@ -33,7 +33,7 @@ int MPI_Ireduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype data #define FUNCNAME MPIR_Ireduce_binomial #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Ireduce_binomial(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPID_Comm *comm_ptr, MPID_Sched_t s) +int MPIR_Ireduce_binomial(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; int comm_size, rank, is_commutative; @@ -233,7 +233,7 @@ fn_fail: #define FUNCNAME MPIR_Ireduce_redscat_gather #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Ireduce_redscat_gather(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPID_Comm *comm_ptr, MPID_Sched_t s) +int MPIR_Ireduce_redscat_gather(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; int i, j, comm_size, rank, pof2, is_commutative ATTRIBUTE((unused)); @@ -539,7 +539,7 @@ fn_fail: #define FUNCNAME MPIR_Ireduce_intra #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Ireduce_intra(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPID_Comm *comm_ptr, MPID_Sched_t s) +int MPIR_Ireduce_intra(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; int pof2, type_size, comm_size; @@ -579,14 +579,14 @@ fn_fail: #define FUNCNAME MPIR_Ireduce_SMP #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Ireduce_SMP(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPID_Comm *comm_ptr, MPID_Sched_t s) +int MPIR_Ireduce_SMP(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; int is_commutative; MPI_Aint true_lb, true_extent, extent; void *tmp_buf = NULL; - MPID_Comm *nc; - MPID_Comm *nrc; + MPIR_Comm *nc; + MPIR_Comm *nrc; MPIR_SCHED_CHKPMEM_DECL(1); if (!MPIR_CVAR_ENABLE_SMP_COLLECTIVES || !MPIR_CVAR_ENABLE_SMP_REDUCE) @@ -691,7 +691,7 @@ fn_fail: #define FUNCNAME MPIR_Ireduce_inter #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Ireduce_inter(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPID_Comm *comm_ptr, MPID_Sched_t s) +int MPIR_Ireduce_inter(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; int rank; @@ -767,7 +767,7 @@ fn_fail: #define FUNCNAME MPIR_Ireduce_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Ireduce_impl(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPID_Comm *comm_ptr, MPI_Request *request) +int MPIR_Ireduce_impl(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPIR_Comm *comm_ptr, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; MPID_Request *reqp = NULL; @@ -829,7 +829,7 @@ int MPI_Ireduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype data MPI_Op op, int root, MPI_Comm comm, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_IREDUCE); MPID_THREAD_CS_ENTER(GLOBAL, MPIR_THREAD_GLOBAL_ALLFUNC_MUTEX); @@ -852,7 +852,7 @@ int MPI_Ireduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype data # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr(comm, comm_ptr); + MPIR_Comm_get_ptr(comm, comm_ptr); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -861,7 +861,7 @@ int MPI_Ireduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype data { int rank; - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { MPID_Datatype *datatype_ptr = NULL; MPID_Datatype_get_ptr(datatype, datatype_ptr); diff --git a/src/mpi/coll/iscan.c b/src/mpi/coll/iscan.c index 53456ac..252064b 100644 --- a/src/mpi/coll/iscan.c +++ b/src/mpi/coll/iscan.c @@ -69,7 +69,7 @@ int MPI_Iscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype dataty #define FUNCNAME MPIR_Iscan_rec_dbl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Iscan_rec_dbl(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPID_Sched_t s) +int MPIR_Iscan_rec_dbl(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; MPI_Aint true_extent, true_lb, extent; @@ -174,12 +174,12 @@ fn_fail: #define FUNCNAME MPIR_Iscan_rec_dbl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Iscan_SMP(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPID_Sched_t s) +int MPIR_Iscan_SMP(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; int rank = comm_ptr->rank; - MPID_Comm *node_comm; - MPID_Comm *roots_comm; + MPIR_Comm *node_comm; + MPIR_Comm *roots_comm; MPI_Aint true_extent, true_lb, extent; void *tempbuf = NULL; void *prefulldata = NULL; @@ -318,7 +318,7 @@ fn_fail: #define FUNCNAME MPIR_Iscan_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Iscan_impl(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPI_Request *request) +int MPIR_Iscan_impl(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; MPID_Request *reqp = NULL; @@ -378,7 +378,7 @@ int MPI_Iscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype dataty MPI_Op op, MPI_Comm comm, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_ISCAN); MPID_THREAD_CS_ENTER(GLOBAL, MPIR_THREAD_GLOBAL_ALLFUNC_MUTEX); @@ -401,14 +401,14 @@ int MPI_Iscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype dataty # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr(comm, comm_ptr); + MPIR_Comm_get_ptr(comm, comm_ptr); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS { - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPIR_ERRTEST_COMM_INTRA(comm_ptr, mpi_errno); diff --git a/src/mpi/coll/iscatter.c b/src/mpi/coll/iscatter.c index aa8ee1e..7904433 100644 --- a/src/mpi/coll/iscatter.c +++ b/src/mpi/coll/iscatter.c @@ -35,27 +35,27 @@ struct shared_state { int nbytes; MPI_Status status; }; -static int get_count(MPID_Comm *comm, int tag, void *state) +static int get_count(MPIR_Comm *comm, int tag, void *state) { struct shared_state *ss = state; MPIR_Get_count_impl(&ss->status, MPI_BYTE, &ss->curr_count); return MPI_SUCCESS; } -static int calc_send_count_root(MPID_Comm *comm, int tag, void *state, void *state2) +static int calc_send_count_root(MPIR_Comm *comm, int tag, void *state, void *state2) { struct shared_state *ss = state; int mask = (int)(size_t)state2; ss->send_subtree_count = ss->curr_count - ss->sendcount * mask; return MPI_SUCCESS; } -static int calc_send_count_non_root(MPID_Comm *comm, int tag, void *state, void *state2) +static int calc_send_count_non_root(MPIR_Comm *comm, int tag, void *state, void *state2) { struct shared_state *ss = state; int mask = (int)(size_t)state2; ss->send_subtree_count = ss->curr_count - ss->nbytes * mask; return MPI_SUCCESS; } -static int calc_curr_count(MPID_Comm *comm, int tag, void *state) +static int calc_curr_count(MPIR_Comm *comm, int tag, void *state) { struct shared_state *ss = state; ss->curr_count -= ss->send_subtree_count; @@ -90,7 +90,7 @@ static int calc_curr_count(MPID_Comm *comm, int tag, void *state) #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Iscatter_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPID_Comm *comm_ptr, MPID_Sched_t s) + int root, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; MPI_Aint extent = 0; @@ -432,7 +432,7 @@ int MPIR_Iscatter_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtyp #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Iscatter_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPID_Comm *comm_ptr, MPID_Sched_t s) + int root, MPIR_Comm *comm_ptr, MPID_Sched_t s) { /* Intercommunicator scatter. For short messages, root sends to rank 0 in remote group. rank 0 @@ -447,7 +447,7 @@ int MPIR_Iscatter_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtyp int i, nbytes, sendtype_size, recvtype_size; MPI_Aint extent, true_extent, true_lb = 0; void *tmp_buf = NULL; - MPID_Comm *newcomm_ptr = NULL; + MPIR_Comm *newcomm_ptr = NULL; MPIR_SCHED_CHKPMEM_DECL(1); if (root == MPI_PROC_NULL) { @@ -547,7 +547,7 @@ fn_fail: #define FUNCNAME MPIR_Iscatter_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Iscatter_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPID_Comm *comm_ptr, MPI_Request *request) +int MPIR_Iscatter_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPIR_Comm *comm_ptr, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; MPID_Request *reqp = NULL; @@ -610,7 +610,7 @@ int MPI_Iscatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPI_Comm comm, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_ISCATTER); MPID_THREAD_CS_ENTER(GLOBAL, MPIR_THREAD_GLOBAL_ALLFUNC_MUTEX); @@ -630,7 +630,7 @@ int MPI_Iscatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr(comm, comm_ptr); + MPIR_Comm_get_ptr(comm, comm_ptr); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -638,7 +638,7 @@ int MPI_Iscatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPID_BEGIN_ERROR_CHECKS { MPID_Datatype *sendtype_ptr, *recvtype_ptr; - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (comm_ptr->comm_kind == MPID_INTRACOMM) { MPIR_ERRTEST_INTRA_ROOT(comm_ptr, root, mpi_errno); diff --git a/src/mpi/coll/iscatterv.c b/src/mpi/coll/iscatterv.c index 6eac943..fc6e84c 100644 --- a/src/mpi/coll/iscatterv.c +++ b/src/mpi/coll/iscatterv.c @@ -52,7 +52,7 @@ int MPI_Iscatterv(const void *sendbuf, const int sendcounts[], const int displs[ #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Iscatterv(const void *sendbuf, const int sendcounts[], const int displs[], MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPID_Comm *comm_ptr, MPID_Sched_t s) + int root, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; int rank, comm_size; @@ -118,7 +118,7 @@ fn_fail: #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Iscatterv_impl(const void *sendbuf, const int sendcounts[], const int displs[], MPI_Datatype sendtype, void *recvbuf, int recvcount, - MPI_Datatype recvtype, int root, MPID_Comm *comm_ptr, MPI_Request *request) + MPI_Datatype recvtype, int root, MPIR_Comm *comm_ptr, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; MPID_Request *reqp = NULL; @@ -182,7 +182,7 @@ int MPI_Iscatterv(const void *sendbuf, const int sendcounts[], const int displs[ int root, MPI_Comm comm, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_ISCATTERV); MPID_THREAD_CS_ENTER(GLOBAL, MPIR_THREAD_GLOBAL_ALLFUNC_MUTEX); @@ -205,7 +205,7 @@ int MPI_Iscatterv(const void *sendbuf, const int sendcounts[], const int displs[ # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr(comm, comm_ptr); + MPIR_Comm_get_ptr(comm, comm_ptr); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -215,7 +215,7 @@ int MPI_Iscatterv(const void *sendbuf, const int sendcounts[], const int displs[ MPID_Datatype *sendtype_ptr=NULL, *recvtype_ptr=NULL; int i, comm_size, rank; - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; if (comm_ptr->comm_kind == MPID_INTRACOMM) { diff --git a/src/mpi/coll/nbcutil.c b/src/mpi/coll/nbcutil.c index b7000ce..e4ec34d 100644 --- a/src/mpi/coll/nbcutil.c +++ b/src/mpi/coll/nbcutil.c @@ -10,7 +10,7 @@ #define FUNCNAME MPIR_Sched_cb_free_buf #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Sched_cb_free_buf(MPID_Comm *comm, int tag, void *state) +int MPIR_Sched_cb_free_buf(MPIR_Comm *comm, int tag, void *state) { MPL_free(state); return MPI_SUCCESS; diff --git a/src/mpi/coll/red_scat.c b/src/mpi/coll/red_scat.c index 83a41ff..61f70fa 100644 --- a/src/mpi/coll/red_scat.c +++ b/src/mpi/coll/red_scat.c @@ -56,7 +56,7 @@ int MPI_Reduce_scatter(const void *sendbuf, void *recvbuf, const int recvcounts[ #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) static int MPIR_Reduce_scatter_noncomm(const void *sendbuf, void *recvbuf, const int recvcounts[], - MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; @@ -240,7 +240,7 @@ fn_fail: /* not declared static because a machine-specific function may call this one in some cases */ int MPIR_Reduce_scatter_intra(const void *sendbuf, void *recvbuf, const int recvcounts[], - MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag) + MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { int rank, comm_size, i; MPI_Aint extent, true_extent, true_lb; @@ -913,7 +913,7 @@ fn_fail: /* not declared static because a machine-specific function may call this one in some cases */ int MPIR_Reduce_scatter_inter(const void *sendbuf, void *recvbuf, const int recvcounts[], - MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { /* Intercommunicator Reduce_scatter. @@ -927,7 +927,7 @@ int MPIR_Reduce_scatter_inter(const void *sendbuf, void *recvbuf, const int recv MPI_Aint true_extent, true_lb = 0, extent; void *tmp_buf=NULL; int *disps=NULL; - MPID_Comm *newcomm_ptr = NULL; + MPIR_Comm *newcomm_ptr = NULL; MPIU_CHKLMEM_DECL(2); rank = comm_ptr->rank; @@ -1044,7 +1044,7 @@ int MPIR_Reduce_scatter_inter(const void *sendbuf, void *recvbuf, const int recv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Reduce_scatter(const void *sendbuf, void *recvbuf, const int recvcounts[], - MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag) + MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; @@ -1075,7 +1075,7 @@ int MPIR_Reduce_scatter(const void *sendbuf, void *recvbuf, const int recvcounts #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Reduce_scatter_impl(const void *sendbuf, void *recvbuf, const int recvcounts[], - MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag) + MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; @@ -1139,7 +1139,7 @@ int MPI_Reduce_scatter(const void *sendbuf, void *recvbuf, const int recvcounts[ MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPIR_Errflag_t errflag = MPIR_ERR_NONE; MPID_MPI_STATE_DECL(MPID_STATE_MPI_REDUCE_SCATTER); @@ -1160,7 +1160,7 @@ int MPI_Reduce_scatter(const void *sendbuf, void *recvbuf, const int recvcounts[ # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -1171,7 +1171,7 @@ int MPI_Reduce_scatter(const void *sendbuf, void *recvbuf, const int recvcounts[ MPID_Op *op_ptr = NULL; int i, size, sum; - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; size = comm_ptr->local_size; diff --git a/src/mpi/coll/red_scat_block.c b/src/mpi/coll/red_scat_block.c index 6afeea2..e6328a8 100644 --- a/src/mpi/coll/red_scat_block.c +++ b/src/mpi/coll/red_scat_block.c @@ -52,7 +52,7 @@ static int MPIR_Reduce_scatter_block_noncomm ( int recvcount, MPI_Datatype datatype, MPI_Op op, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag ) { int mpi_errno = MPI_SUCCESS; @@ -239,7 +239,7 @@ int MPIR_Reduce_scatter_block_intra ( int recvcount, MPI_Datatype datatype, MPI_Op op, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag ) { int rank, comm_size, i; @@ -892,7 +892,7 @@ int MPIR_Reduce_scatter_block_inter ( int recvcount, MPI_Datatype datatype, MPI_Op op, - MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag ) + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag ) { /* Intercommunicator Reduce_scatter_block. We first do an intercommunicator reduce to rank 0 on left group, @@ -904,7 +904,7 @@ int MPIR_Reduce_scatter_block_inter ( int mpi_errno_ret = MPI_SUCCESS; MPI_Aint true_extent, true_lb = 0, extent; void *tmp_buf=NULL; - MPID_Comm *newcomm_ptr = NULL; + MPIR_Comm *newcomm_ptr = NULL; MPIU_CHKLMEM_DECL(1); rank = comm_ptr->rank; @@ -1013,7 +1013,7 @@ int MPIR_Reduce_scatter_block_inter ( #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Reduce_scatter_block(const void *sendbuf, void *recvbuf, int recvcount, MPI_Datatype datatype, - MPI_Op op, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag) + MPI_Op op, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; @@ -1044,7 +1044,7 @@ int MPIR_Reduce_scatter_block(const void *sendbuf, void *recvbuf, #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Reduce_scatter_block_impl(const void *sendbuf, void *recvbuf, int recvcount, MPI_Datatype datatype, - MPI_Op op, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag) + MPI_Op op, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; @@ -1112,7 +1112,7 @@ int MPI_Reduce_scatter_block(const void *sendbuf, void *recvbuf, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPIR_Errflag_t errflag = MPIR_ERR_NONE; MPID_MPI_STATE_DECL(MPID_STATE_MPI_REDUCE_SCATTER_BLOCK); @@ -1133,7 +1133,7 @@ int MPI_Reduce_scatter_block(const void *sendbuf, void *recvbuf, # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -1143,7 +1143,7 @@ int MPI_Reduce_scatter_block(const void *sendbuf, void *recvbuf, MPID_Datatype *datatype_ptr = NULL; MPID_Op *op_ptr = NULL; - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPIR_ERRTEST_COUNT(recvcount,mpi_errno); diff --git a/src/mpi/coll/reduce.c b/src/mpi/coll/reduce.c index 4c29171..57f5b32 100644 --- a/src/mpi/coll/reduce.c +++ b/src/mpi/coll/reduce.c @@ -83,7 +83,7 @@ static int MPIR_Reduce_binomial ( MPI_Datatype datatype, MPI_Op op, int root, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag ) { int mpi_errno = MPI_SUCCESS; @@ -289,7 +289,7 @@ static int MPIR_Reduce_redscat_gather ( MPI_Datatype datatype, MPI_Op op, int root, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag ) { int mpi_errno = MPI_SUCCESS; @@ -733,7 +733,7 @@ int MPIR_Reduce_intra ( MPI_Datatype datatype, MPI_Op op, int root, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag ) { int mpi_errno = MPI_SUCCESS; @@ -924,7 +924,7 @@ int MPIR_Reduce_inter ( MPI_Datatype datatype, MPI_Op op, int root, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag ) { /* Intercommunicator reduce. @@ -939,7 +939,7 @@ int MPIR_Reduce_inter ( MPI_Status status; MPI_Aint true_extent, true_lb, extent; void *tmp_buf=NULL; - MPID_Comm *newcomm_ptr = NULL; + MPIR_Comm *newcomm_ptr = NULL; MPIU_CHKLMEM_DECL(1); if (root == MPI_PROC_NULL) { @@ -1035,7 +1035,7 @@ int MPIR_Reduce_inter ( #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Reduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, int root, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag) + MPI_Op op, int root, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; @@ -1066,7 +1066,7 @@ int MPIR_Reduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype data #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Reduce_impl(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, int root, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag) + MPI_Op op, int root, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; @@ -1140,7 +1140,7 @@ int MPI_Reduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datat MPI_Op op, int root, MPI_Comm comm) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPIR_Errflag_t errflag = MPIR_ERR_NONE; MPID_MPI_STATE_DECL(MPID_STATE_MPI_REDUCE); @@ -1161,7 +1161,7 @@ int MPI_Reduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datat # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -1172,7 +1172,7 @@ int MPI_Reduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datat MPID_Op *op_ptr = NULL; int rank; - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; if (comm_ptr->comm_kind == MPID_INTRACOMM) { diff --git a/src/mpi/coll/scan.c b/src/mpi/coll/scan.c index c19620c..cf88ba9 100644 --- a/src/mpi/coll/scan.c +++ b/src/mpi/coll/scan.c @@ -75,7 +75,7 @@ static int MPIR_Scan_generic ( int count, MPI_Datatype datatype, MPI_Op op, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag ) { MPI_Status status; @@ -241,7 +241,7 @@ int MPIR_Scan( int count, MPI_Datatype datatype, MPI_Op op, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag ) { int mpi_errno = MPI_SUCCESS; @@ -438,7 +438,7 @@ int MPIR_Scan( #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Scan_impl(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag) + MPI_Op op, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; @@ -500,7 +500,7 @@ int MPI_Scan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatyp MPI_Op op, MPI_Comm comm) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPIR_Errflag_t errflag = MPIR_ERR_NONE; MPID_MPI_STATE_DECL(MPID_STATE_MPI_SCAN); @@ -521,7 +521,7 @@ int MPI_Scan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatyp # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -531,7 +531,7 @@ int MPI_Scan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatyp MPID_Datatype *datatype_ptr = NULL; MPID_Op *op_ptr = NULL; - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPIR_ERRTEST_COMM_INTRA(comm_ptr, mpi_errno); diff --git a/src/mpi/coll/scatter.c b/src/mpi/coll/scatter.c index 590b26a..3f6e95d 100644 --- a/src/mpi/coll/scatter.c +++ b/src/mpi/coll/scatter.c @@ -74,7 +74,7 @@ int MPI_Scatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Scatter_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, - MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag) + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { MPI_Status status; MPI_Aint extent=0; @@ -421,7 +421,7 @@ int MPIR_Scatter_intra(const void *sendbuf, int sendcount, MPI_Datatype sendtype #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Scatter_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, int root, MPID_Comm *comm_ptr, + int recvcount, MPI_Datatype recvtype, int root, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { /* Intercommunicator scatter. @@ -439,7 +439,7 @@ int MPIR_Scatter_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype MPI_Status status; MPI_Aint extent, true_extent, true_lb = 0; void *tmp_buf=NULL; - MPID_Comm *newcomm_ptr = NULL; + MPIR_Comm *newcomm_ptr = NULL; MPIU_CHKLMEM_DECL(1); if (root == MPI_PROC_NULL) { @@ -573,7 +573,7 @@ int MPIR_Scatter_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Scatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag) + int root, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; @@ -608,7 +608,7 @@ int MPIR_Scatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Scatter_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag) + int root, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; @@ -672,7 +672,7 @@ int MPI_Scatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPI_Comm comm) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPIR_Errflag_t errflag = MPIR_ERR_NONE; MPID_MPI_STATE_DECL(MPID_STATE_MPI_SCATTER); @@ -693,7 +693,7 @@ int MPI_Scatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -703,7 +703,7 @@ int MPI_Scatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, MPID_Datatype *sendtype_ptr=NULL, *recvtype_ptr=NULL; int rank; - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; if (comm_ptr->comm_kind == MPID_INTRACOMM) { diff --git a/src/mpi/coll/scatterv.c b/src/mpi/coll/scatterv.c index 3945e50..e0347ff 100644 --- a/src/mpi/coll/scatterv.c +++ b/src/mpi/coll/scatterv.c @@ -55,7 +55,7 @@ int MPI_Scatterv(const void *sendbuf, const int *sendcounts, const int *displs, #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Scatterv(const void *sendbuf, const int *sendcounts, const int *displs, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag) + int root, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { int rank, comm_size, mpi_errno = MPI_SUCCESS; int mpi_errno_ret = MPI_SUCCESS; @@ -166,7 +166,7 @@ fn_fail: #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Scatterv_impl(const void *sendbuf, const int *sendcounts, const int *displs, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag) + int root, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; @@ -233,7 +233,7 @@ int MPI_Scatterv(const void *sendbuf, const int *sendcounts, const int *displs, int root, MPI_Comm comm) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPIR_Errflag_t errflag = MPIR_ERR_NONE; MPID_MPI_STATE_DECL(MPID_STATE_MPI_SCATTERV); @@ -254,7 +254,7 @@ int MPI_Scatterv(const void *sendbuf, const int *sendcounts, const int *displs, # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -264,7 +264,7 @@ int MPI_Scatterv(const void *sendbuf, const int *sendcounts, const int *displs, MPID_Datatype *sendtype_ptr=NULL, *recvtype_ptr=NULL; int i, comm_size, rank; - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; if (comm_ptr->comm_kind == MPID_INTRACOMM) { diff --git a/src/mpi/comm/comm_agree.c b/src/mpi/comm/comm_agree.c index 29a0935..404f68a 100644 --- a/src/mpi/comm/comm_agree.c +++ b/src/mpi/comm/comm_agree.c @@ -31,7 +31,7 @@ int MPIX_Comm_agree(MPI_Comm comm, int *flag) __attribute__((weak,alias("PMPIX_C #define FUNCNAME MPIR_Comm_agree #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Comm_agree(MPID_Comm *comm_ptr, int *flag) +int MPIR_Comm_agree(MPIR_Comm *comm_ptr, int *flag) { int mpi_errno = MPI_SUCCESS, mpi_errno_tmp = MPI_SUCCESS; MPID_Group *comm_grp, *failed_grp, *new_group_ptr, *global_failed; @@ -131,7 +131,7 @@ Output Parameters: int MPIX_Comm_agree(MPI_Comm comm, int *flag) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPIX_COMM_AGREE); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -148,19 +148,19 @@ int MPIX_Comm_agree(MPI_Comm comm, int *flag) } MPID_END_ERROR_CHECKS; - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); if (mpi_errno) goto fn_fail; } MPID_END_ERROR_CHECKS; } #else { - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); } #endif diff --git a/src/mpi/comm/comm_compare.c b/src/mpi/comm/comm_compare.c index 0cc5788..d77782a 100644 --- a/src/mpi/comm/comm_compare.c +++ b/src/mpi/comm/comm_compare.c @@ -71,8 +71,8 @@ this routine is only thread-safe.) int MPI_Comm_compare(MPI_Comm comm1, MPI_Comm comm2, int *result) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr1 = NULL; - MPID_Comm *comm_ptr2 = NULL; + MPIR_Comm *comm_ptr1 = NULL; + MPIR_Comm *comm_ptr2 = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_COMPARE); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -92,8 +92,8 @@ int MPI_Comm_compare(MPI_Comm comm1, MPI_Comm comm2, int *result) # endif /* HAVE_ERROR_CHECKING */ /* Get handles to MPI objects. */ - MPID_Comm_get_ptr( comm1, comm_ptr1 ); - MPID_Comm_get_ptr( comm2, comm_ptr2 ); + MPIR_Comm_get_ptr( comm1, comm_ptr1 ); + MPIR_Comm_get_ptr( comm2, comm_ptr2 ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -101,9 +101,9 @@ int MPI_Comm_compare(MPI_Comm comm1, MPI_Comm comm2, int *result) MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr1, mpi_errno, TRUE ); + MPIR_Comm_valid_ptr( comm_ptr1, mpi_errno, TRUE ); if (mpi_errno) goto fn_fail; - MPID_Comm_valid_ptr( comm_ptr2, mpi_errno, TRUE ); + MPIR_Comm_valid_ptr( comm_ptr2, mpi_errno, TRUE ); if (mpi_errno) goto fn_fail; MPIR_ERRTEST_ARGNULL( result, "result", mpi_errno ); } diff --git a/src/mpi/comm/comm_create.c b/src/mpi/comm/comm_create.c index 033a5a9..18d7d96 100644 --- a/src/mpi/comm/comm_create.c +++ b/src/mpi/comm/comm_create.c @@ -22,8 +22,8 @@ int MPI_Comm_create(MPI_Comm comm, MPI_Group group, MPI_Comm *newcomm) __attribu /* prototypes to make the compiler happy in the case that PMPI_LOCAL expands to * nothing instead of "static" */ -PMPI_LOCAL int MPIR_Comm_create_inter(MPID_Comm *comm_ptr, MPID_Group *group_ptr, - MPID_Comm **newcomm_ptr); +PMPI_LOCAL int MPIR_Comm_create_inter(MPIR_Comm *comm_ptr, MPID_Group *group_ptr, + MPIR_Comm **newcomm_ptr); /* Define MPICH_MPI_FROM_PMPI if weak symbols are not supported to build the MPI routines */ @@ -42,9 +42,9 @@ PMPI_LOCAL int MPIR_Comm_create_inter(MPID_Comm *comm_ptr, MPID_Group *group_ptr #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Comm_create_calculate_mapping(MPID_Group *group_ptr, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, int **mapping_out, - MPID_Comm **mapping_comm) + MPIR_Comm **mapping_comm) { int mpi_errno = MPI_SUCCESS; int subsetOfWorld = 0; @@ -162,8 +162,8 @@ int MPIR_Comm_create_map(int local_n, int remote_n, int *local_mapping, int *remote_mapping, - MPID_Comm *mapping_comm, - MPID_Comm *newcomm) + MPIR_Comm *mapping_comm, + MPIR_Comm *newcomm) { int mpi_errno = MPI_SUCCESS; @@ -187,8 +187,8 @@ fn_fail: #define FCNAME MPL_QUOTE(FUNCNAME) /* comm create impl for intracommunicators, assumes that the standard error * checking has already taken place in the calling function */ -int MPIR_Comm_create_intra(MPID_Comm *comm_ptr, MPID_Group *group_ptr, - MPID_Comm **newcomm_ptr) +int MPIR_Comm_create_intra(MPIR_Comm *comm_ptr, MPID_Group *group_ptr, + MPIR_Comm **newcomm_ptr) { int mpi_errno = MPI_SUCCESS; MPIU_Context_id_t new_context_id = 0; @@ -216,7 +216,7 @@ int MPIR_Comm_create_intra(MPID_Comm *comm_ptr, MPID_Group *group_ptr, MPIU_Assert(new_context_id != 0); if (group_ptr->rank != MPI_UNDEFINED) { - MPID_Comm *mapping_comm = NULL; + MPIR_Comm *mapping_comm = NULL; mpi_errno = MPIR_Comm_create_calculate_mapping(group_ptr, comm_ptr, &mapping, &mapping_comm); @@ -283,14 +283,14 @@ fn_fail: #define FCNAME MPL_QUOTE(FUNCNAME) /* comm create impl for intercommunicators, assumes that the standard error * checking has already taken place in the calling function */ -PMPI_LOCAL int MPIR_Comm_create_inter(MPID_Comm *comm_ptr, MPID_Group *group_ptr, - MPID_Comm **newcomm_ptr) +PMPI_LOCAL int MPIR_Comm_create_inter(MPIR_Comm *comm_ptr, MPID_Group *group_ptr, + MPIR_Comm **newcomm_ptr) { int mpi_errno = MPI_SUCCESS; MPIU_Context_id_t new_context_id; int *mapping = NULL; int *remote_mapping = NULL; - MPID_Comm *mapping_comm = NULL; + MPIR_Comm *mapping_comm = NULL; int remote_size = -1; int rinfo[2]; MPIR_Errflag_t errflag = MPIR_ERR_NONE; @@ -485,7 +485,7 @@ Output Parameters: int MPI_Comm_create(MPI_Comm comm, MPI_Group group, MPI_Comm *newcomm) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL, *newcomm_ptr; + MPIR_Comm *comm_ptr = NULL, *newcomm_ptr; MPID_Group *group_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_CREATE); @@ -503,12 +503,12 @@ int MPI_Comm_create(MPI_Comm comm, MPI_Group group, MPI_Comm *newcomm) } MPID_END_ERROR_CHECKS; - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); /* If comm_ptr is not valid, it will be reset to null */ /* only test for MPI_GROUP_NULL after attempting to convert the comm @@ -529,7 +529,7 @@ int MPI_Comm_create(MPI_Comm comm, MPI_Group group, MPI_Comm *newcomm) } # else { - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); MPID_Group_get_ptr( group, group_ptr ); } # endif diff --git a/src/mpi/comm/comm_create_group.c b/src/mpi/comm/comm_create_group.c index 5a21001..dc25d2d 100644 --- a/src/mpi/comm/comm_create_group.c +++ b/src/mpi/comm/comm_create_group.c @@ -33,8 +33,8 @@ int MPI_Comm_create_group(MPI_Comm comm, MPI_Group group, int tag, MPI_Comm *new #define FCNAME MPL_QUOTE(FUNCNAME) /* comm create group impl; assumes that the standard error checking * has already taken place in the calling function */ -int MPIR_Comm_create_group(MPID_Comm * comm_ptr, MPID_Group * group_ptr, int tag, - MPID_Comm ** newcomm_ptr) +int MPIR_Comm_create_group(MPIR_Comm * comm_ptr, MPID_Group * group_ptr, int tag, + MPIR_Comm ** newcomm_ptr) { int mpi_errno = MPI_SUCCESS; MPIU_Context_id_t new_context_id = 0; @@ -52,7 +52,7 @@ int MPIR_Comm_create_group(MPID_Comm * comm_ptr, MPID_Group * group_ptr, int tag /* Create a new communicator from the specified group members */ if (group_ptr->rank != MPI_UNDEFINED) { - MPID_Comm *mapping_comm = NULL; + MPIR_Comm *mapping_comm = NULL; /* For this routine, creation of the id is collective over the input *group*, so processes not in the group do not participate. */ @@ -152,7 +152,7 @@ Output Parameters: int MPI_Comm_create_group(MPI_Comm comm, MPI_Group group, int tag, MPI_Comm * newcomm) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL, *newcomm_ptr; + MPIR_Comm *comm_ptr = NULL, *newcomm_ptr; MPID_Group *group_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_CREATE_GROUP); @@ -170,12 +170,12 @@ int MPI_Comm_create_group(MPI_Comm comm, MPI_Group group, int tag, MPI_Comm * ne } MPID_END_ERROR_CHECKS; - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno) goto fn_fail; /* If comm_ptr is not valid, it will be reset to null */ MPIR_ERRTEST_COMM_INTRA(comm_ptr, mpi_errno); @@ -199,7 +199,7 @@ int MPI_Comm_create_group(MPI_Comm comm, MPI_Group group, int tag, MPI_Comm * ne } # else { - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); MPID_Group_get_ptr( group, group_ptr ); } # endif diff --git a/src/mpi/comm/comm_dup.c b/src/mpi/comm/comm_dup.c index cfb10d8..962d10d 100644 --- a/src/mpi/comm/comm_dup.c +++ b/src/mpi/comm/comm_dup.c @@ -30,7 +30,7 @@ int MPI_Comm_dup(MPI_Comm comm, MPI_Comm *newcomm) __attribute__((weak,alias("PM #define FUNCNAME MPIR_Comm_dup_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Comm_dup_impl(MPID_Comm *comm_ptr, MPID_Comm **newcomm_ptr) +int MPIR_Comm_dup_impl(MPIR_Comm *comm_ptr, MPIR_Comm **newcomm_ptr) { int mpi_errno = MPI_SUCCESS; MPID_Attribute *new_attributes = 0; @@ -119,7 +119,7 @@ Notes: int MPI_Comm_dup(MPI_Comm comm, MPI_Comm *newcomm) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL, *newcomm_ptr; + MPIR_Comm *comm_ptr = NULL, *newcomm_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_DUP); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -139,7 +139,7 @@ int MPI_Comm_dup(MPI_Comm comm, MPI_Comm *newcomm) # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -147,7 +147,7 @@ int MPI_Comm_dup(MPI_Comm comm, MPI_Comm *newcomm) MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno) goto fn_fail; /* If comm_ptr is not valid, it will be reset to null */ MPIR_ERRTEST_ARGNULL(newcomm, "newcomm", mpi_errno); diff --git a/src/mpi/comm/comm_dup_with_info.c b/src/mpi/comm/comm_dup_with_info.c index e0b204b..f5835d2 100644 --- a/src/mpi/comm/comm_dup_with_info.c +++ b/src/mpi/comm/comm_dup_with_info.c @@ -30,8 +30,8 @@ int MPI_Comm_dup_with_info(MPI_Comm comm, MPI_Info info, MPI_Comm *newcomm) __at #define FUNCNAME MPIR_Comm_dup_with_info_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Comm_dup_with_info_impl(MPID_Comm * comm_ptr, MPID_Info * info_ptr, - MPID_Comm ** newcomm_p_p) +int MPIR_Comm_dup_with_info_impl(MPIR_Comm * comm_ptr, MPID_Info * info_ptr, + MPIR_Comm ** newcomm_p_p) { int mpi_errno = MPI_SUCCESS; @@ -88,7 +88,7 @@ Notes: int MPI_Comm_dup_with_info(MPI_Comm comm, MPI_Info info, MPI_Comm * newcomm) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL, *newcomm_ptr; + MPIR_Comm *comm_ptr = NULL, *newcomm_ptr; MPID_Info *info_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_DUP_WITH_INFO); @@ -109,7 +109,7 @@ int MPI_Comm_dup_with_info(MPI_Comm comm, MPI_Info info, MPI_Comm * newcomm) #endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr(comm, comm_ptr); + MPIR_Comm_get_ptr(comm, comm_ptr); MPID_Info_get_ptr(info, info_ptr); /* Validate parameters and objects (post conversion) */ @@ -118,7 +118,7 @@ int MPI_Comm_dup_with_info(MPI_Comm comm, MPI_Info info, MPI_Comm * newcomm) MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno) goto fn_fail; /* If comm_ptr is not valid, it will be reset to null */ MPIR_ERRTEST_ARGNULL(newcomm, "newcomm", mpi_errno); diff --git a/src/mpi/comm/comm_failure_ack.c b/src/mpi/comm/comm_failure_ack.c index 94f3bc5..848bfad 100644 --- a/src/mpi/comm/comm_failure_ack.c +++ b/src/mpi/comm/comm_failure_ack.c @@ -53,7 +53,7 @@ Notes: int MPIX_Comm_failure_ack( MPI_Comm comm ) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPIX_COMM_FAILURE_ACK); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -73,7 +73,7 @@ int MPIX_Comm_failure_ack( MPI_Comm comm ) # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr(comm, comm_ptr); + MPIR_Comm_get_ptr(comm, comm_ptr); /* Validate parameters and objects(post conversion */ # ifdef HAVE_ERROR_CHECKING @@ -81,7 +81,7 @@ int MPIX_Comm_failure_ack( MPI_Comm comm ) MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); /* If comm_ptr is not valid, it will be reset to null */ if (mpi_errno) goto fn_fail; } diff --git a/src/mpi/comm/comm_failure_get_acked.c b/src/mpi/comm/comm_failure_get_acked.c index f16b3bc..dc4956b 100644 --- a/src/mpi/comm/comm_failure_get_acked.c +++ b/src/mpi/comm/comm_failure_get_acked.c @@ -56,7 +56,7 @@ Notes: int MPIX_Comm_failure_get_acked( MPI_Comm comm, MPI_Group *failedgrp ) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_Group *group_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPIX_COMM_FAILURE_GET_ACKED); @@ -77,7 +77,7 @@ int MPIX_Comm_failure_get_acked( MPI_Comm comm, MPI_Group *failedgrp ) # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr(comm, comm_ptr); + MPIR_Comm_get_ptr(comm, comm_ptr); /* Validate parameters and objects(post conversion */ # ifdef HAVE_ERROR_CHECKING @@ -85,7 +85,7 @@ int MPIX_Comm_failure_get_acked( MPI_Comm comm, MPI_Group *failedgrp ) MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); /* If comm_ptr is not valid, it will be reset to null */ if (mpi_errno) goto fn_fail; } diff --git a/src/mpi/comm/comm_free.c b/src/mpi/comm/comm_free.c index ba2cedc..07ba3fb 100644 --- a/src/mpi/comm/comm_free.c +++ b/src/mpi/comm/comm_free.c @@ -30,7 +30,7 @@ int MPI_Comm_free(MPI_Comm *comm) __attribute__((weak,alias("PMPI_Comm_free"))); #define FUNCNAME MPIR_Comm_free_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Comm_free_impl(MPID_Comm * comm_ptr) +int MPIR_Comm_free_impl(MPIR_Comm * comm_ptr) { return MPIR_Comm_release(comm_ptr); } @@ -77,7 +77,7 @@ disallows freeing a null communicator. The text from the standard is: int MPI_Comm_free(MPI_Comm *comm) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_FREE); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -97,7 +97,7 @@ int MPI_Comm_free(MPI_Comm *comm) # endif /* HAVE_ERROR_CHECKING */ /* Get handles to MPI objects. */ - MPID_Comm_get_ptr( *comm, comm_ptr ); + MPIR_Comm_get_ptr( *comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -105,7 +105,7 @@ int MPI_Comm_free(MPI_Comm *comm) MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); /* If comm_ptr is not valid, it will be reset to null */ /* Cannot free the predefined communicators */ diff --git a/src/mpi/comm/comm_get_info.c b/src/mpi/comm/comm_get_info.c index 0c33785..9ed9297 100644 --- a/src/mpi/comm/comm_get_info.c +++ b/src/mpi/comm/comm_get_info.c @@ -30,7 +30,7 @@ int MPI_Comm_get_info(MPI_Comm comm, MPI_Info *info) __attribute__((weak,alias(" #define FUNCNAME MPIR_Comm_get_info_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Comm_get_info_impl(MPID_Comm * comm_ptr, MPID_Info ** info_p_p) +int MPIR_Comm_get_info_impl(MPIR_Comm * comm_ptr, MPID_Info ** info_p_p) { int mpi_errno = MPI_SUCCESS; @@ -78,7 +78,7 @@ Output Parameters: int MPI_Comm_get_info(MPI_Comm comm, MPI_Info * info_used) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_Info *info_used_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_GET_INFO); @@ -99,7 +99,7 @@ int MPI_Comm_get_info(MPI_Comm comm, MPI_Info * info_used) #endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr(comm, comm_ptr); + MPIR_Comm_get_ptr(comm, comm_ptr); /* Validate parameters and objects (post conversion) */ #ifdef HAVE_ERROR_CHECKING @@ -107,7 +107,7 @@ int MPI_Comm_get_info(MPI_Comm comm, MPI_Info * info_used) MPID_BEGIN_ERROR_CHECKS; { /* Validate pointers */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); if (mpi_errno) goto fn_fail; } MPID_END_ERROR_CHECKS; diff --git a/src/mpi/comm/comm_get_name.c b/src/mpi/comm/comm_get_name.c index dd3c3ef..f55c68b 100644 --- a/src/mpi/comm/comm_get_name.c +++ b/src/mpi/comm/comm_get_name.c @@ -25,7 +25,7 @@ int MPI_Comm_get_name(MPI_Comm comm, char *comm_name, int *resultlen) __attribut #undef MPI_Comm_get_name #define MPI_Comm_get_name PMPI_Comm_get_name -void MPIR_Comm_get_name_impl(MPID_Comm *comm_ptr, char *comm_name, int *resultlen) +void MPIR_Comm_get_name_impl(MPIR_Comm *comm_ptr, char *comm_name, int *resultlen) { /* The user must allocate a large enough section of memory */ MPL_strncpy(comm_name, comm_ptr->name, MPI_MAX_OBJECT_NAME); @@ -66,7 +66,7 @@ Output Parameters: int MPI_Comm_get_name(MPI_Comm comm, char *comm_name, int *resultlen) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_GET_NAME); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -85,14 +85,14 @@ int MPI_Comm_get_name(MPI_Comm comm, char *comm_name, int *resultlen) # endif /* HAVE_ERROR_CHECKING */ /* Validate parameters and objects (post conversion) */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS; { - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); if (mpi_errno) goto fn_fail; /* If comm_ptr is not valid, it will be reset to null */ diff --git a/src/mpi/comm/comm_group.c b/src/mpi/comm/comm_group.c index 9976164..2357458 100644 --- a/src/mpi/comm/comm_group.c +++ b/src/mpi/comm/comm_group.c @@ -30,7 +30,7 @@ int MPI_Comm_group(MPI_Comm comm, MPI_Group *group) __attribute__((weak,alias("P #define FUNCNAME MPIR_Comm_group_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Comm_group_impl(MPID_Comm *comm_ptr, MPID_Group **group_ptr) +int MPIR_Comm_group_impl(MPIR_Comm *comm_ptr, MPID_Group **group_ptr) { int mpi_errno = MPI_SUCCESS; int i, lpid, n; @@ -109,7 +109,7 @@ Notes: int MPI_Comm_group(MPI_Comm comm, MPI_Group *group) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_Group *group_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_GROUP); @@ -131,7 +131,7 @@ int MPI_Comm_group(MPI_Comm comm, MPI_Group *group) # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -139,7 +139,7 @@ int MPI_Comm_group(MPI_Comm comm, MPI_Group *group) MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); /* If comm_ptr is not valid, it will be reset to null */ if (mpi_errno) goto fn_fail; } diff --git a/src/mpi/comm/comm_idup.c b/src/mpi/comm/comm_idup.c index 20d2c08..3a4497d 100644 --- a/src/mpi/comm/comm_idup.c +++ b/src/mpi/comm/comm_idup.c @@ -30,7 +30,7 @@ int MPI_Comm_idup(MPI_Comm comm, MPI_Comm *newcomm, MPI_Request *request) __attr #define FUNCNAME MPIR_Comm_idup_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Comm_idup_impl(MPID_Comm *comm_ptr, MPID_Comm **newcommp, MPID_Request **reqp) +int MPIR_Comm_idup_impl(MPIR_Comm *comm_ptr, MPIR_Comm **newcommp, MPID_Request **reqp) { int mpi_errno = MPI_SUCCESS; MPID_Attribute *new_attributes = 0; @@ -95,8 +95,8 @@ Output Parameters: int MPI_Comm_idup(MPI_Comm comm, MPI_Comm *newcomm, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; - MPID_Comm *newcomm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; + MPIR_Comm *newcomm_ptr = NULL; MPID_Request *dreq = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_IDUP); @@ -116,14 +116,14 @@ int MPI_Comm_idup(MPI_Comm comm, MPI_Comm *newcomm, MPI_Request *request) # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr(comm, comm_ptr); + MPIR_Comm_get_ptr(comm, comm_ptr); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS { - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPIR_ERRTEST_ARGNULL(request, "request", mpi_errno); /* TODO more checks may be appropriate (counts, in_place, buffer aliasing, etc) */ diff --git a/src/mpi/comm/comm_rank.c b/src/mpi/comm/comm_rank.c index 97d07aa..8df6f41 100644 --- a/src/mpi/comm/comm_rank.c +++ b/src/mpi/comm/comm_rank.c @@ -52,7 +52,7 @@ Output Parameters: int MPI_Comm_rank( MPI_Comm comm, int *rank ) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = 0; + MPIR_Comm *comm_ptr = 0; MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_RANK); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -72,7 +72,7 @@ int MPI_Comm_rank( MPI_Comm comm, int *rank ) # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -81,7 +81,7 @@ int MPI_Comm_rank( MPI_Comm comm, int *rank ) { MPIR_ERRTEST_ARGNULL(rank,"rank",mpi_errno); /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); /* If comm_ptr is not value, it will be reset to null */ if (mpi_errno) goto fn_fail; } diff --git a/src/mpi/comm/comm_remote_group.c b/src/mpi/comm/comm_remote_group.c index 0e45d7a..63c36d7 100644 --- a/src/mpi/comm/comm_remote_group.c +++ b/src/mpi/comm/comm_remote_group.c @@ -30,7 +30,7 @@ int MPI_Comm_remote_group(MPI_Comm comm, MPI_Group *group) __attribute__((weak,a #define FUNCNAME MPIR_Comm_remote_group_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Comm_remote_group_impl(MPID_Comm *comm_ptr, MPID_Group **group_ptr) +int MPIR_Comm_remote_group_impl(MPIR_Comm *comm_ptr, MPID_Group **group_ptr) { int mpi_errno = MPI_SUCCESS; int i, lpid, n; @@ -99,7 +99,7 @@ The user is responsible for freeing the group when it is no longer needed. int MPI_Comm_remote_group(MPI_Comm comm, MPI_Group *group) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_Group *group_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_REMOTE_GROUP); @@ -120,7 +120,7 @@ int MPI_Comm_remote_group(MPI_Comm comm, MPI_Group *group) # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -128,7 +128,7 @@ int MPI_Comm_remote_group(MPI_Comm comm, MPI_Group *group) MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); /* If comm_ptr is not valid, it will be reset to null */ if (comm_ptr && comm_ptr->comm_kind != MPID_INTERCOMM) { mpi_errno = MPIR_Err_create_code( MPI_SUCCESS, diff --git a/src/mpi/comm/comm_remote_size.c b/src/mpi/comm/comm_remote_size.c index 853d7b3..5523d96 100644 --- a/src/mpi/comm/comm_remote_size.c +++ b/src/mpi/comm/comm_remote_size.c @@ -55,7 +55,7 @@ Output Parameters: int MPI_Comm_remote_size(MPI_Comm comm, int *size) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_REMOTE_SIZE); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -74,7 +74,7 @@ int MPI_Comm_remote_size(MPI_Comm comm, int *size) # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -82,7 +82,7 @@ int MPI_Comm_remote_size(MPI_Comm comm, int *size) MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); /* If comm_ptr is not valid, it will be reset to null */ if (comm_ptr && comm_ptr->comm_kind != MPID_INTERCOMM) { mpi_errno = MPIR_Err_create_code( MPI_SUCCESS, diff --git a/src/mpi/comm/comm_revoke.c b/src/mpi/comm/comm_revoke.c index 5526742..1c0c623 100644 --- a/src/mpi/comm/comm_revoke.c +++ b/src/mpi/comm/comm_revoke.c @@ -53,7 +53,7 @@ call. int MPIX_Comm_revoke(MPI_Comm comm) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPIX_COMM_REVOKE); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -73,7 +73,7 @@ int MPIX_Comm_revoke(MPI_Comm comm) # endif /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -81,7 +81,7 @@ int MPIX_Comm_revoke(MPI_Comm comm) MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); if (mpi_errno) goto fn_fail; } MPID_END_ERROR_CHECKS; diff --git a/src/mpi/comm/comm_set_info.c b/src/mpi/comm/comm_set_info.c index 9cc1f67..7a8f0d0 100644 --- a/src/mpi/comm/comm_set_info.c +++ b/src/mpi/comm/comm_set_info.c @@ -31,7 +31,7 @@ int MPI_Comm_set_info(MPI_Comm comm, MPI_Info info) __attribute__((weak,alias("P #define FUNCNAME MPIR_Comm_set_info_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Comm_set_info_impl(MPID_Comm * comm_ptr, MPID_Info * info_ptr) +int MPIR_Comm_set_info_impl(MPIR_Comm * comm_ptr, MPID_Info * info_ptr) { int mpi_errno = MPI_SUCCESS; MPID_Info *curr_info = NULL; @@ -98,7 +98,7 @@ Input Parameters: int MPI_Comm_set_info(MPI_Comm comm, MPI_Info info) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_Info *info_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_SET_INFO); @@ -119,7 +119,7 @@ int MPI_Comm_set_info(MPI_Comm comm, MPI_Info info) #endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr(comm, comm_ptr); + MPIR_Comm_get_ptr(comm, comm_ptr); MPID_Info_get_ptr(info, info_ptr); /* Validate parameters and objects (post conversion) */ @@ -128,7 +128,7 @@ int MPI_Comm_set_info(MPI_Comm comm, MPI_Info info) MPID_BEGIN_ERROR_CHECKS; { /* Validate pointers */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); if (mpi_errno) goto fn_fail; } MPID_END_ERROR_CHECKS; diff --git a/src/mpi/comm/comm_set_name.c b/src/mpi/comm/comm_set_name.c index dfb8279..ae22f4c 100644 --- a/src/mpi/comm/comm_set_name.c +++ b/src/mpi/comm/comm_set_name.c @@ -50,7 +50,7 @@ Input Parameters: int MPI_Comm_set_name(MPI_Comm comm, const char *comm_name) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_SET_NAME); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -69,7 +69,7 @@ int MPI_Comm_set_name(MPI_Comm comm, const char *comm_name) # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -77,7 +77,7 @@ int MPI_Comm_set_name(MPI_Comm comm, const char *comm_name) MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); if (mpi_errno) goto fn_fail; MPIR_ERRTEST_ARGNULL( comm_name, "comm_name", mpi_errno ); /* If comm_ptr is not valid, it will be reset to null */ diff --git a/src/mpi/comm/comm_shrink.c b/src/mpi/comm/comm_shrink.c index 843630b..2d8fb52 100644 --- a/src/mpi/comm/comm_shrink.c +++ b/src/mpi/comm/comm_shrink.c @@ -47,7 +47,7 @@ int MPIX_Comm_shrink(MPI_Comm comm, MPI_Comm *newcomm) __attribute__((weak,alias #define FCNAME MPL_QUOTE(FUNCNAME) /* comm shrink impl; assumes that standard error checking has already taken * place in the calling function */ -int MPIR_Comm_shrink(MPID_Comm *comm_ptr, MPID_Comm **newcomm_ptr) +int MPIR_Comm_shrink(MPIR_Comm *comm_ptr, MPIR_Comm **newcomm_ptr) { int mpi_errno = MPI_SUCCESS; MPID_Group *global_failed, *comm_grp, *new_group_ptr; @@ -135,7 +135,7 @@ Output Parameters: int MPIX_Comm_shrink(MPI_Comm comm, MPI_Comm *newcomm) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL, *newcomm_ptr; + MPIR_Comm *comm_ptr = NULL, *newcomm_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPIX_COMM_SHRINK); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -152,19 +152,19 @@ int MPIX_Comm_shrink(MPI_Comm comm, MPI_Comm *newcomm) } MPID_END_ERROR_CHECKS; - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); if (mpi_errno) goto fn_fail; } MPID_END_ERROR_CHECKS; } #else { - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); } #endif diff --git a/src/mpi/comm/comm_size.c b/src/mpi/comm/comm_size.c index b8239a7..27dcda1 100644 --- a/src/mpi/comm/comm_size.c +++ b/src/mpi/comm/comm_size.c @@ -56,7 +56,7 @@ Notes: int MPI_Comm_size( MPI_Comm comm, int *size ) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = 0; + MPIR_Comm *comm_ptr = 0; MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_SIZE); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -75,7 +75,7 @@ int MPI_Comm_size( MPI_Comm comm, int *size ) # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -84,7 +84,7 @@ int MPI_Comm_size( MPI_Comm comm, int *size ) { MPIR_ERRTEST_ARGNULL(size,"size",mpi_errno); /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); /* If comm_ptr is not valid, it will be reset to null */ if (mpi_errno) goto fn_fail; } diff --git a/src/mpi/comm/comm_split.c b/src/mpi/comm/comm_split.c index 6d22cc1..c61c8f5 100644 --- a/src/mpi/comm/comm_split.c +++ b/src/mpi/comm/comm_split.c @@ -127,10 +127,10 @@ static void MPIU_Sort_inttable( sorttype *keytable, int size ) #define FUNCNAME MPIR_Comm_split_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Comm_split_impl(MPID_Comm *comm_ptr, int color, int key, MPID_Comm **newcomm_ptr) +int MPIR_Comm_split_impl(MPIR_Comm *comm_ptr, int color, int key, MPIR_Comm **newcomm_ptr) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *local_comm_ptr; + MPIR_Comm *local_comm_ptr; splittype *table, *remotetable=0; sorttype *keytable, *remotekeytable=0; int rank, size, remote_size, i, new_size, new_remote_size, @@ -436,7 +436,7 @@ Algorithm: int MPI_Comm_split(MPI_Comm comm, int color, int key, MPI_Comm *newcomm) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL, *newcomm_ptr; + MPIR_Comm *comm_ptr = NULL, *newcomm_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_SPLIT); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -457,7 +457,7 @@ int MPI_Comm_split(MPI_Comm comm, int color, int key, MPI_Comm *newcomm) # endif /* HAVE_ERROR_CHECKING */ /* Get handles to MPI objects. */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -465,7 +465,7 @@ int MPI_Comm_split(MPI_Comm comm, int color, int key, MPI_Comm *newcomm) MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); /* If comm_ptr is not valid, it will be reset to null */ if (mpi_errno) goto fn_fail; } diff --git a/src/mpi/comm/comm_split_type.c b/src/mpi/comm/comm_split_type.c index 1636db8..d5bab5b 100644 --- a/src/mpi/comm/comm_split_type.c +++ b/src/mpi/comm/comm_split_type.c @@ -30,8 +30,8 @@ int MPI_Comm_split_type(MPI_Comm comm, int split_type, int key, MPI_Info info, M #define FUNCNAME MPIR_Comm_split_type_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Comm_split_type_impl(MPID_Comm * comm_ptr, int split_type, int key, - MPID_Info * info_ptr, MPID_Comm ** newcomm_ptr) +int MPIR_Comm_split_type_impl(MPIR_Comm * comm_ptr, int split_type, int key, + MPID_Info * info_ptr, MPIR_Comm ** newcomm_ptr) { int mpi_errno = MPI_SUCCESS; @@ -55,11 +55,11 @@ int MPIR_Comm_split_type_impl(MPID_Comm * comm_ptr, int split_type, int key, if (flag) { #ifdef HAVE_ROMIO MPI_Comm dummycomm; - MPID_Comm * dummycomm_ptr; + MPIR_Comm * dummycomm_ptr; mpi_errno = MPIR_Comm_split_filesystem(comm_ptr->handle, key, hintval, &dummycomm); - MPID_Comm_get_ptr(dummycomm, dummycomm_ptr); + MPIR_Comm_get_ptr(dummycomm, dummycomm_ptr); *newcomm_ptr = dummycomm_ptr; goto fn_exit; @@ -135,7 +135,7 @@ int MPI_Comm_split_type(MPI_Comm comm, int split_type, int key, MPI_Info info, MPI_Comm * newcomm) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL, *newcomm_ptr; + MPIR_Comm *comm_ptr = NULL, *newcomm_ptr; MPID_Info *info_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_SPLIT_TYPE); @@ -157,7 +157,7 @@ int MPI_Comm_split_type(MPI_Comm comm, int split_type, int key, MPI_Info info, #endif /* HAVE_ERROR_CHECKING */ /* Get handles to MPI objects. */ - MPID_Comm_get_ptr(comm, comm_ptr); + MPIR_Comm_get_ptr(comm, comm_ptr); MPID_Info_get_ptr(info, info_ptr); /* Validate parameters and objects (post conversion) */ @@ -166,7 +166,7 @@ int MPI_Comm_split_type(MPI_Comm comm, int split_type, int key, MPI_Info info, MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); /* If comm_ptr is not valid, it will be reset to null */ if (mpi_errno) goto fn_fail; diff --git a/src/mpi/comm/comm_test_inter.c b/src/mpi/comm/comm_test_inter.c index 46878af..56d7340 100644 --- a/src/mpi/comm/comm_test_inter.c +++ b/src/mpi/comm/comm_test_inter.c @@ -54,7 +54,7 @@ Output Parameters: int MPI_Comm_test_inter(MPI_Comm comm, int *flag) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_TEST_INTER); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -73,7 +73,7 @@ int MPI_Comm_test_inter(MPI_Comm comm, int *flag) # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -81,7 +81,7 @@ int MPI_Comm_test_inter(MPI_Comm comm, int *flag) MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno) goto fn_fail; /* If comm_ptr is not valid, it will be reset to null */ MPIR_ERRTEST_ARGNULL(flag,"flag",mpi_errno); diff --git a/src/mpi/comm/commutil.c b/src/mpi/comm/commutil.c index 2ba75e3..92e376d 100644 --- a/src/mpi/comm/commutil.c +++ b/src/mpi/comm/commutil.c @@ -19,17 +19,17 @@ /* Preallocated comm objects */ /* initialized in initthread.c */ -MPID_Comm MPID_Comm_builtin[MPID_COMM_N_BUILTIN] = { {0} }; -MPID_Comm MPID_Comm_direct[MPID_COMM_PREALLOC] = { {0} }; +MPIR_Comm MPID_Comm_builtin[MPID_COMM_N_BUILTIN] = { {0} }; +MPIR_Comm MPIR_Comm_direct[MPID_COMM_PREALLOC] = { {0} }; -MPIU_Object_alloc_t MPID_Comm_mem = { +MPIU_Object_alloc_t MPIR_Comm_mem = { 0, 0, 0, 0, MPID_COMM, - sizeof(MPID_Comm), - MPID_Comm_direct, + sizeof(MPIR_Comm), + MPIR_Comm_direct, MPID_COMM_PREALLOC }; @@ -68,7 +68,7 @@ static struct MPIR_Comm_hint_fn_elt *MPID_hint_fns = NULL; * to it. * * !!! The resulting struct is _not_ ready for communication !!! */ -int MPIR_Comm_init(MPID_Comm * comm_p) +int MPIR_Comm_init(MPIR_Comm * comm_p) { int mpi_errno = MPI_SUCCESS; @@ -120,15 +120,15 @@ int MPIR_Comm_init(MPID_Comm * comm_p) #define FUNCNAME MPIR_Comm_create #undef FCNAME #define FCNAME "MPIR_Comm_create" -int MPIR_Comm_create(MPID_Comm ** newcomm_ptr) +int MPIR_Comm_create(MPIR_Comm ** newcomm_ptr) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *newptr; + MPIR_Comm *newptr; MPID_MPI_STATE_DECL(MPID_STATE_MPIR_COMM_CREATE); MPID_MPI_FUNC_ENTER(MPID_STATE_MPIR_COMM_CREATE); - newptr = (MPID_Comm *) MPIU_Handle_obj_alloc(&MPID_Comm_mem); + newptr = (MPIR_Comm *) MPIU_Handle_obj_alloc(&MPIR_Comm_mem); MPIR_ERR_CHKANDJUMP(!newptr, mpi_errno, MPI_ERR_OTHER, "**nomem"); *newcomm_ptr = newptr; @@ -155,15 +155,15 @@ int MPIR_Comm_create(MPID_Comm ** newcomm_ptr) #define FUNCNAME MPIR_Setup_intercomm_localcomm #undef FCNAME #define FCNAME "MPIR_Setup_intercomm_localcomm" -int MPIR_Setup_intercomm_localcomm(MPID_Comm * intercomm_ptr) +int MPIR_Setup_intercomm_localcomm(MPIR_Comm * intercomm_ptr) { - MPID_Comm *localcomm_ptr; + MPIR_Comm *localcomm_ptr; int mpi_errno = MPI_SUCCESS; MPID_MPI_STATE_DECL(MPID_STATE_MPIR_SETUP_INTERCOMM_LOCALCOMM); MPID_MPI_FUNC_ENTER(MPID_STATE_MPIR_SETUP_INTERCOMM_LOCALCOMM); - localcomm_ptr = (MPID_Comm *) MPIU_Handle_obj_alloc(&MPID_Comm_mem); + localcomm_ptr = (MPIR_Comm *) MPIU_Handle_obj_alloc(&MPIR_Comm_mem); MPIR_ERR_CHKANDJUMP(!localcomm_ptr, mpi_errno, MPI_ERR_OTHER, "**nomem"); /* get sensible default values for most fields (usually zeros) */ @@ -372,7 +372,7 @@ static int init_default_collops(void) #define FUNCNAME set_collops #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int set_collops(MPID_Comm * comm) +static int set_collops(MPIR_Comm * comm) { int mpi_errno = MPI_SUCCESS; static int initialized = FALSE; @@ -408,7 +408,7 @@ static int set_collops(MPID_Comm * comm) #define FUNCNAME MPIR_Comm_map_irregular #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Comm_map_irregular(MPID_Comm * newcomm, MPID_Comm * src_comm, +int MPIR_Comm_map_irregular(MPIR_Comm * newcomm, MPIR_Comm * src_comm, int *src_mapping, int src_mapping_size, MPIR_Comm_map_dir_t dir, MPIR_Comm_map_t ** map) { @@ -456,7 +456,7 @@ int MPIR_Comm_map_irregular(MPID_Comm * newcomm, MPID_Comm * src_comm, #define FUNCNAME MPIR_Comm_map_dup #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Comm_map_dup(MPID_Comm * newcomm, MPID_Comm * src_comm, MPIR_Comm_map_dir_t dir) +int MPIR_Comm_map_dup(MPIR_Comm * newcomm, MPIR_Comm * src_comm, MPIR_Comm_map_dir_t dir) { int mpi_errno = MPI_SUCCESS; MPIR_Comm_map_t *mapper; @@ -489,7 +489,7 @@ int MPIR_Comm_map_dup(MPID_Comm * newcomm, MPID_Comm * src_comm, MPIR_Comm_map_d #define FUNCNAME MPIR_Comm_map_free #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Comm_map_free(MPID_Comm * comm) +int MPIR_Comm_map_free(MPIR_Comm * comm) { int mpi_errno = MPI_SUCCESS; MPIR_Comm_map_t *mapper, *tmp; @@ -522,7 +522,7 @@ int MPIR_Comm_map_free(MPID_Comm * comm) #define FUNCNAME MPIR_Comm_commit #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Comm_commit(MPID_Comm * comm) +int MPIR_Comm_commit(MPIR_Comm * comm) { int mpi_errno = MPI_SUCCESS; int num_local = -1, num_external = -1; @@ -670,7 +670,7 @@ int MPIR_Comm_commit(MPID_Comm * comm) /* Returns true if the given communicator is aware of node topology information, false otherwise. Such information could be used to implement more efficient collective communication, for example. */ -int MPIR_Comm_is_node_aware(MPID_Comm * comm) +int MPIR_Comm_is_node_aware(MPIR_Comm * comm) { return (comm->hierarchy_kind == MPID_HIERARCHY_PARENT); } @@ -678,7 +678,7 @@ int MPIR_Comm_is_node_aware(MPID_Comm * comm) /* Returns true if the communicator is node-aware and processes in all the nodes are consecutive. For example, if node 0 contains "0, 1, 2, 3", node 1 contains "4, 5, 6", and node 2 contains "7", we shall return true. */ -int MPIR_Comm_is_node_consecutive(MPID_Comm * comm) +int MPIR_Comm_is_node_consecutive(MPIR_Comm * comm) { int i = 0, curr_nodeidx = 0; int *internode_table = comm->internode_table; @@ -712,11 +712,11 @@ int MPIR_Comm_is_node_consecutive(MPID_Comm * comm) #define FUNCNAME MPIR_Comm_copy #undef FCNAME #define FCNAME "MPIR_Comm_copy" -int MPIR_Comm_copy(MPID_Comm * comm_ptr, int size, MPID_Comm ** outcomm_ptr) +int MPIR_Comm_copy(MPIR_Comm * comm_ptr, int size, MPIR_Comm ** outcomm_ptr) { int mpi_errno = MPI_SUCCESS; MPIU_Context_id_t new_context_id, new_recvcontext_id; - MPID_Comm *newcomm_ptr = NULL; + MPIR_Comm *newcomm_ptr = NULL; MPIR_Comm_map_t *map; MPID_MPI_STATE_DECL(MPID_STATE_MPIR_COMM_COPY); @@ -850,10 +850,10 @@ int MPIR_Comm_copy(MPID_Comm * comm_ptr, int size, MPID_Comm ** outcomm_ptr) #define FUNCNAME MPIR_Comm_copy_data #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Comm_copy_data(MPID_Comm * comm_ptr, MPID_Comm ** outcomm_ptr) +int MPIR_Comm_copy_data(MPIR_Comm * comm_ptr, MPIR_Comm ** outcomm_ptr) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *newcomm_ptr = NULL; + MPIR_Comm *newcomm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPIR_COMM_COPY_DATA); MPID_MPI_FUNC_ENTER(MPID_STATE_MPIR_COMM_COPY_DATA); @@ -907,7 +907,7 @@ int MPIR_Comm_copy_data(MPID_Comm * comm_ptr, MPID_Comm ** outcomm_ptr) } /* Common body between MPIR_Comm_release and MPIR_comm_release_always. This - * helper function frees the actual MPID_Comm structure and any associated + * helper function frees the actual MPIR_Comm structure and any associated * storage. It also releases any references to other objects. * This function should only be called when the communicator's reference count * has dropped to 0. @@ -918,7 +918,7 @@ int MPIR_Comm_copy_data(MPID_Comm * comm_ptr, MPID_Comm ** outcomm_ptr) #define FUNCNAME MPIR_Comm_delete_internal #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Comm_delete_internal(MPID_Comm * comm_ptr) +int MPIR_Comm_delete_internal(MPIR_Comm * comm_ptr) { int in_use; int mpi_errno = MPI_SUCCESS; @@ -1017,7 +1017,7 @@ int MPIR_Comm_delete_internal(MPID_Comm * comm_ptr) /* Check for predefined communicators - these should not * be freed */ if (!(HANDLE_GET_KIND(comm_ptr->handle) == HANDLE_KIND_BUILTIN)) - MPIU_Handle_obj_free(&MPID_Comm_mem, comm_ptr); + MPIU_Handle_obj_free(&MPIR_Comm_mem, comm_ptr); } else { /* If the user attribute free function returns an error, @@ -1040,7 +1040,7 @@ int MPIR_Comm_delete_internal(MPID_Comm * comm_ptr) #define FUNCNAME MPIR_Comm_release_always #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Comm_release_always(MPID_Comm * comm_ptr) +int MPIR_Comm_release_always(MPIR_Comm * comm_ptr) { int mpi_errno = MPI_SUCCESS; int in_use; @@ -1070,7 +1070,7 @@ int MPIR_Comm_release_always(MPID_Comm * comm_ptr) #define FUNCNAME MPIR_Comm_apply_hints #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Comm_apply_hints(MPID_Comm * comm_ptr, MPID_Info * info_ptr) +int MPIR_Comm_apply_hints(MPIR_Comm * comm_ptr, MPID_Info * info_ptr) { int mpi_errno = MPI_SUCCESS; MPID_Info *hint = NULL; diff --git a/src/mpi/comm/contextid.c b/src/mpi/comm/contextid.c index e071b9e..1f87111 100644 --- a/src/mpi/comm/contextid.c +++ b/src/mpi/comm/contextid.c @@ -293,7 +293,7 @@ static volatile int mask_in_use = 0; #define FUNCNAME MPIR_Get_contextid_sparse #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Get_contextid_sparse(MPID_Comm * comm_ptr, MPIU_Context_id_t * context_id, int ignore_id) +int MPIR_Get_contextid_sparse(MPIR_Comm * comm_ptr, MPIU_Context_id_t * context_id, int ignore_id) { return MPIR_Get_contextid_sparse_group(comm_ptr, NULL /*group_ptr */ , MPIR_Process.attrs.tag_ub /*tag */ , @@ -307,10 +307,10 @@ struct gcn_state { int own_eager_mask; int first_iter; uint64_t tag; - MPID_Comm *comm_ptr; - MPID_Comm *comm_ptr_inter; + MPIR_Comm *comm_ptr; + MPIR_Comm *comm_ptr_inter; MPID_Sched_t s; - MPID_Comm *new_comm; + MPIR_Comm *new_comm; MPID_Comm_kind_t gcn_cid_kind; uint32_t local_mask[MPIR_MAX_CONTEXT_MASK + 1]; struct gcn_state *next; @@ -372,7 +372,7 @@ static int add_gcn_to_list(struct gcn_state *new_state) #define FUNCNAME MPIR_Get_contextid_sparse_group #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Get_contextid_sparse_group(MPID_Comm * comm_ptr, MPID_Group * group_ptr, int tag, +int MPIR_Get_contextid_sparse_group(MPIR_Comm * comm_ptr, MPID_Group * group_ptr, int tag, MPIU_Context_id_t * context_id, int ignore_id) { int mpi_errno = MPI_SUCCESS; @@ -655,14 +655,14 @@ int MPIR_Get_contextid_sparse_group(MPID_Comm * comm_ptr, MPID_Group * group_ptr -static int sched_cb_gcn_copy_mask(MPID_Comm * comm, int tag, void *state); -static int sched_cb_gcn_allocate_cid(MPID_Comm * comm, int tag, void *state); -static int sched_cb_gcn_bcast(MPID_Comm * comm, int tag, void *state); +static int sched_cb_gcn_copy_mask(MPIR_Comm * comm, int tag, void *state); +static int sched_cb_gcn_allocate_cid(MPIR_Comm * comm, int tag, void *state); +static int sched_cb_gcn_bcast(MPIR_Comm * comm, int tag, void *state); #undef FUNCNAME #define FUNCNAME sched_cb_commit_comm #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int sched_cb_commit_comm(MPID_Comm * comm, int tag, void *state) +static int sched_cb_commit_comm(MPIR_Comm * comm, int tag, void *state) { int mpi_errno = MPI_SUCCESS; struct gcn_state *st = state; @@ -680,7 +680,7 @@ static int sched_cb_commit_comm(MPID_Comm * comm, int tag, void *state) #define FUNCNAME sched_cb_gcn_bcast #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int sched_cb_gcn_bcast(MPID_Comm * comm, int tag, void *state) +static int sched_cb_gcn_bcast(MPIR_Comm * comm, int tag, void *state) { int mpi_errno = MPI_SUCCESS; struct gcn_state *st = state; @@ -736,7 +736,7 @@ static int sched_cb_gcn_bcast(MPID_Comm * comm, int tag, void *state) #define FUNCNAME sched_cb_gcn_allocate_cid #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int sched_cb_gcn_allocate_cid(MPID_Comm * comm, int tag, void *state) +static int sched_cb_gcn_allocate_cid(MPIR_Comm * comm, int tag, void *state) { int mpi_errno = MPI_SUCCESS; struct gcn_state *st = state, *tmp; @@ -845,7 +845,7 @@ static int sched_cb_gcn_allocate_cid(MPID_Comm * comm, int tag, void *state) /* In the case of failure, the new communicator was half created. * So we need to clean the memory allocated for it. */ MPIR_Comm_map_free(st->new_comm); - MPIU_Handle_obj_free(&MPID_Comm_mem, st->new_comm); + MPIU_Handle_obj_free(&MPIR_Comm_mem, st->new_comm); MPL_free(st); goto fn_exit; } @@ -854,7 +854,7 @@ static int sched_cb_gcn_allocate_cid(MPID_Comm * comm, int tag, void *state) #define FUNCNAME sched_cb_gcn_copy_mask #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int sched_cb_gcn_copy_mask(MPID_Comm * comm, int tag, void *state) +static int sched_cb_gcn_copy_mask(MPIR_Comm * comm, int tag, void *state) { int mpi_errno = MPI_SUCCESS; struct gcn_state *st = state; @@ -951,7 +951,7 @@ static int sched_cb_gcn_copy_mask(MPID_Comm * comm, int tag, void *state) #define FUNCNAME sched_get_cid_nonblock #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int sched_get_cid_nonblock(MPID_Comm * comm_ptr, MPID_Comm * newcomm, +static int sched_get_cid_nonblock(MPIR_Comm * comm_ptr, MPIR_Comm * newcomm, MPIU_Context_id_t * ctx0, MPIU_Context_id_t * ctx1, MPID_Sched_t s, MPID_Comm_kind_t gcn_cid_kind) { @@ -1007,7 +1007,7 @@ static int sched_get_cid_nonblock(MPID_Comm * comm_ptr, MPID_Comm * newcomm, #define FUNCNAME MPIR_Get_contextid_nonblock #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Get_contextid_nonblock(MPID_Comm * comm_ptr, MPID_Comm * newcommp, MPID_Request ** req) +int MPIR_Get_contextid_nonblock(MPIR_Comm * comm_ptr, MPIR_Comm * newcommp, MPID_Request ** req) { int mpi_errno = MPI_SUCCESS; int tag; @@ -1050,7 +1050,7 @@ int MPIR_Get_contextid_nonblock(MPID_Comm * comm_ptr, MPID_Comm * newcommp, MPID #define FUNCNAME MPIR_Get_intercomm_contextid_nonblock #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Get_intercomm_contextid_nonblock(MPID_Comm * comm_ptr, MPID_Comm * newcommp, +int MPIR_Get_intercomm_contextid_nonblock(MPIR_Comm * comm_ptr, MPIR_Comm * newcommp, MPID_Request ** req) { int mpi_errno = MPI_SUCCESS; @@ -1119,7 +1119,7 @@ int MPIR_Get_intercomm_contextid_nonblock(MPID_Comm * comm_ptr, MPID_Comm * newc #define FUNCNAME MPIR_Get_intercomm_contextid #undef FCNAME #define FCNAME "MPIR_Get_intercomm_contextid" -int MPIR_Get_intercomm_contextid(MPID_Comm * comm_ptr, MPIU_Context_id_t * context_id, +int MPIR_Get_intercomm_contextid(MPIR_Comm * comm_ptr, MPIU_Context_id_t * context_id, MPIU_Context_id_t * recvcontext_id) { MPIU_Context_id_t mycontext_id, remote_context_id; diff --git a/src/mpi/comm/intercomm_create.c b/src/mpi/comm/intercomm_create.c index 08d2aab..6d61393 100644 --- a/src/mpi/comm/intercomm_create.c +++ b/src/mpi/comm/intercomm_create.c @@ -28,7 +28,7 @@ int MPI_Intercomm_create(MPI_Comm local_comm, int local_leader, MPI_Comm peer_co #ifdef HAVE_ERROR_CHECKING PMPI_LOCAL int MPIR_CheckDisjointLpids( int [], int, int [], int ); #endif /* HAVE_ERROR_CHECKING */ -PMPI_LOCAL int MPID_LPID_GetAllInComm( MPID_Comm *comm_ptr, int local_size, +PMPI_LOCAL int MPID_LPID_GetAllInComm( MPIR_Comm *comm_ptr, int local_size, int local_lpids[] ); #ifndef MPICH_MPI_FROM_PMPI @@ -102,7 +102,7 @@ PMPI_LOCAL int MPIR_CheckDisjointLpids( int lpids1[], int n1, } #endif /* HAVE_ERROR_CHECKING */ -PMPI_LOCAL int MPID_LPID_GetAllInComm( MPID_Comm *comm_ptr, int local_size, +PMPI_LOCAL int MPID_LPID_GetAllInComm( MPIR_Comm *comm_ptr, int local_size, int local_lpids[] ) { int i; @@ -119,9 +119,9 @@ PMPI_LOCAL int MPID_LPID_GetAllInComm( MPID_Comm *comm_ptr, int local_size, #define FUNCNAME MPIR_Intercomm_create_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Intercomm_create_impl(MPID_Comm *local_comm_ptr, int local_leader, - MPID_Comm *peer_comm_ptr, int remote_leader, int tag, - MPID_Comm **new_intercomm_ptr) +int MPIR_Intercomm_create_impl(MPIR_Comm *local_comm_ptr, int local_leader, + MPIR_Comm *peer_comm_ptr, int remote_leader, int tag, + MPIR_Comm **new_intercomm_ptr) { int mpi_errno = MPI_SUCCESS; MPIU_Context_id_t final_context_id, recvcontext_id; @@ -420,9 +420,9 @@ int MPI_Intercomm_create(MPI_Comm local_comm, int local_leader, MPI_Comm *newintercomm) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *local_comm_ptr = NULL; - MPID_Comm *peer_comm_ptr = NULL; - MPID_Comm *new_intercomm_ptr; + MPIR_Comm *local_comm_ptr = NULL; + MPIR_Comm *peer_comm_ptr = NULL; + MPIR_Comm *new_intercomm_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPI_INTERCOMM_CREATE); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -443,7 +443,7 @@ int MPI_Intercomm_create(MPI_Comm local_comm, int local_leader, # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( local_comm, local_comm_ptr ); + MPIR_Comm_get_ptr( local_comm, local_comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -451,7 +451,7 @@ int MPI_Intercomm_create(MPI_Comm local_comm, int local_leader, MPID_BEGIN_ERROR_CHECKS; { /* Validate local_comm_ptr */ - MPID_Comm_valid_ptr( local_comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( local_comm_ptr, mpi_errno, FALSE ); if (local_comm_ptr) { /* Only check if local_comm_ptr valid */ MPIR_ERRTEST_COMM_INTRA(local_comm_ptr, mpi_errno ); @@ -474,12 +474,12 @@ int MPI_Intercomm_create(MPI_Comm local_comm, int local_leader, if (local_comm_ptr->rank == local_leader) { - MPID_Comm_get_ptr( peer_comm, peer_comm_ptr ); + MPIR_Comm_get_ptr( peer_comm, peer_comm_ptr ); # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS; { - MPID_Comm_valid_ptr( peer_comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( peer_comm_ptr, mpi_errno, FALSE ); /* Note: In MPI 1.0, peer_comm was restricted to intracommunicators. In 1.1, it may be any communicator */ diff --git a/src/mpi/comm/intercomm_merge.c b/src/mpi/comm/intercomm_merge.c index 3837c0c..22c41d0 100644 --- a/src/mpi/comm/intercomm_merge.c +++ b/src/mpi/comm/intercomm_merge.c @@ -35,7 +35,7 @@ int MPI_Intercomm_merge(MPI_Comm intercomm, int high, MPI_Comm *newintracomm) __ #define FUNCNAME create_and_map #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int create_and_map(MPID_Comm *comm_ptr, int local_high, MPID_Comm *new_intracomm_ptr) +static int create_and_map(MPIR_Comm *comm_ptr, int local_high, MPIR_Comm *new_intracomm_ptr) { int mpi_errno = MPI_SUCCESS; int i; @@ -69,7 +69,7 @@ fn_fail: #define FUNCNAME MPIR_Intercomm_merge_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Intercomm_merge_impl(MPID_Comm *comm_ptr, int high, MPID_Comm **new_intracomm_ptr) +int MPIR_Intercomm_merge_impl(MPIR_Comm *comm_ptr, int high, MPIR_Comm **new_intracomm_ptr) { int mpi_errno = MPI_SUCCESS; int local_high, remote_high, new_size; @@ -253,8 +253,8 @@ Algorithm: int MPI_Intercomm_merge(MPI_Comm intercomm, int high, MPI_Comm *newintracomm) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; - MPID_Comm *new_intracomm_ptr; + MPIR_Comm *comm_ptr = NULL; + MPIR_Comm *new_intracomm_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPI_INTERCOMM_MERGE); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -274,7 +274,7 @@ int MPI_Intercomm_merge(MPI_Comm intercomm, int high, MPI_Comm *newintracomm) # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( intercomm, comm_ptr ); + MPIR_Comm_get_ptr( intercomm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -282,7 +282,7 @@ int MPI_Intercomm_merge(MPI_Comm intercomm, int high, MPI_Comm *newintracomm) MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); /* If comm_ptr is not valid, it will be reset to null */ if (comm_ptr && comm_ptr->comm_kind != MPID_INTERCOMM) { mpi_errno = MPIR_Err_create_code( MPI_SUCCESS, diff --git a/src/mpi/comm/mpicomm.h b/src/mpi/comm/mpicomm.h index 03b7873..190fe5a 100644 --- a/src/mpi/comm/mpicomm.h +++ b/src/mpi/comm/mpicomm.h @@ -5,4 +5,4 @@ */ /* Function prototypes for communicator helper functions */ -int MPIR_Get_intercomm_contextid( MPID_Comm *, MPIU_Context_id_t *, MPIU_Context_id_t * ); +int MPIR_Get_intercomm_contextid( MPIR_Comm *, MPIU_Context_id_t *, MPIU_Context_id_t * ); diff --git a/src/mpi/datatype/pack.c b/src/mpi/datatype/pack.c index 3232ee0..b28fd1f 100644 --- a/src/mpi/datatype/pack.c +++ b/src/mpi/datatype/pack.c @@ -155,7 +155,7 @@ int MPI_Pack(const void *inbuf, { int mpi_errno = MPI_SUCCESS; MPI_Aint position_x; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_PACK); @@ -175,7 +175,7 @@ int MPI_Pack(const void *inbuf, # endif /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr(comm, comm_ptr); + MPIR_Comm_get_ptr(comm, comm_ptr); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -191,7 +191,7 @@ int MPI_Pack(const void *inbuf, MPIR_ERRTEST_ARGNULL(position, "position", mpi_errno); /* Validate comm_ptr */ /* If comm_ptr is not valid, it will be reset to null */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPIR_ERRTEST_DATATYPE(datatype, "datatype", mpi_errno); diff --git a/src/mpi/datatype/pack_size.c b/src/mpi/datatype/pack_size.c index 33de867..c896085 100644 --- a/src/mpi/datatype/pack_size.c +++ b/src/mpi/datatype/pack_size.c @@ -77,7 +77,7 @@ int MPI_Pack_size(int incount, int *size) { #ifdef HAVE_ERROR_CHECKING - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; #endif int mpi_errno = MPI_SUCCESS; MPI_Aint size_x = MPI_UNDEFINED; @@ -101,7 +101,7 @@ int MPI_Pack_size(int incount, # ifdef HAVE_ERROR_CHECKING { /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); MPID_BEGIN_ERROR_CHECKS; { @@ -110,7 +110,7 @@ int MPI_Pack_size(int incount, MPIR_ERRTEST_COUNT(incount, mpi_errno); MPIR_ERRTEST_ARGNULL(size, "size", mpi_errno); - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno) goto fn_fail; MPIR_ERRTEST_DATATYPE(datatype, "datatype", mpi_errno); diff --git a/src/mpi/datatype/unpack.c b/src/mpi/datatype/unpack.c index a4e56fd..eb58b5c 100644 --- a/src/mpi/datatype/unpack.c +++ b/src/mpi/datatype/unpack.c @@ -141,7 +141,7 @@ int MPI_Unpack(const void *inbuf, int insize, int *position, { int mpi_errno = MPI_SUCCESS; MPI_Aint position_x; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_UNPACK); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -160,7 +160,7 @@ int MPI_Unpack(const void *inbuf, int insize, int *position, # endif /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr(comm, comm_ptr); + MPIR_Comm_get_ptr(comm, comm_ptr); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -175,7 +175,7 @@ int MPI_Unpack(const void *inbuf, int insize, int *position, MPIR_ERRTEST_COUNT(outcount, mpi_errno); /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; /* If comm_ptr is not valid, it will be reset to null */ diff --git a/src/mpi/debugger/allcommdbg.c b/src/mpi/debugger/allcommdbg.c index 690301c..2c49fff 100644 --- a/src/mpi/debugger/allcommdbg.c +++ b/src/mpi/debugger/allcommdbg.c @@ -10,7 +10,7 @@ /* style: allow:printf:6 sig:0 */ /* This definition is almost the same as the MPIR_Comm_list in dbginit, - except a void * is used instead of MPID_Comm * for head; for the use + except a void * is used instead of MPIR_Comm * for head; for the use here, void * is all that is needed */ typedef struct MPIR_Comm_list { int sequence_number; /* Used to detect changes in the list */ diff --git a/src/mpi/debugger/dbginit.c b/src/mpi/debugger/dbginit.c index 0ce4d2c..6d15931 100644 --- a/src/mpi/debugger/dbginit.c +++ b/src/mpi/debugger/dbginit.c @@ -445,12 +445,12 @@ static void SendqInit( void ) debugger message queue interface */ typedef struct MPIR_Comm_list { int sequence_number; /* Used to detect changes in the list */ - MPID_Comm *head; /* Head of the list */ + MPIR_Comm *head; /* Head of the list */ } MPIR_Comm_list; MPIR_Comm_list MPIR_All_communicators = { 0, 0 }; -void MPIR_CommL_remember( MPID_Comm *comm_ptr ) +void MPIR_CommL_remember( MPIR_Comm *comm_ptr ) { MPL_DBG_MSG_P(MPIR_DBG_COMM,VERBOSE, "Adding communicator %p to remember list",comm_ptr); @@ -470,9 +470,9 @@ void MPIR_CommL_remember( MPID_Comm *comm_ptr ) MPID_THREAD_CS_EXIT(POBJ, MPIR_THREAD_POBJ_COMM_MUTEX(comm_ptr)); } -void MPIR_CommL_forget( MPID_Comm *comm_ptr ) +void MPIR_CommL_forget( MPIR_Comm *comm_ptr ) { - MPID_Comm *p, *prev; + MPIR_Comm *p, *prev; MPL_DBG_MSG_P(MPIR_DBG_COMM,VERBOSE, "Forgetting communicator %p from remember list",comm_ptr); diff --git a/src/mpi/debugger/dbgstub.c b/src/mpi/debugger/dbgstub.c index 52c8d74..0df28d8 100644 --- a/src/mpi/debugger/dbgstub.c +++ b/src/mpi/debugger/dbgstub.c @@ -25,7 +25,7 @@ extern MPIR_Sendq *MPIR_Sendq_head; /* This is from dbginit.c; it is not exported to other files */ typedef struct MPIR_Comm_list { int sequence_number; /* Used to detect changes in the list */ - MPID_Comm *head; /* Head of the list */ + MPIR_Comm *head; /* Head of the list */ } MPIR_Comm_list; extern MPIR_Comm_list MPIR_All_communicators; @@ -104,7 +104,7 @@ int dbgrI_field_offset(mqs_type *type, char *name) switch (curType) { case TYPE_MPID_COMM: { - MPID_Comm c; + MPIR_Comm c; if (strcmp( name, "name" ) == 0) { off = ((char*)&(c.name[0]) - (char*)&c.handle); } diff --git a/src/mpi/debugger/mpich_dll_defs.h b/src/mpi/debugger/mpich_dll_defs.h index c66c39a..749644e 100644 --- a/src/mpi/debugger/mpich_dll_defs.h +++ b/src/mpi/debugger/mpich_dll_defs.h @@ -20,7 +20,7 @@ typedef struct int sequence_number_offs; int comm_head_offs; - /* Fields in MPID_Comm */ + /* Fields in MPIR_Comm */ int comm_rsize_offs; int lrank_to_grank_offs; int comm_rank_offs; diff --git a/src/mpi/errhan/comm_call_errhandler.c b/src/mpi/errhan/comm_call_errhandler.c index 4ce38f9..b993e83 100644 --- a/src/mpi/errhan/comm_call_errhandler.c +++ b/src/mpi/errhan/comm_call_errhandler.c @@ -56,7 +56,7 @@ int MPI_Comm_call_errhandler(MPI_Comm comm, int errorcode) { int mpi_errno = MPI_SUCCESS; int in_cs = FALSE; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_CALL_ERRHANDLER); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -75,7 +75,7 @@ int MPI_Comm_call_errhandler(MPI_Comm comm, int errorcode) # endif /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); MPID_THREAD_CS_ENTER(POBJ, MPIR_THREAD_POBJ_COMM_MUTEX(comm_ptr)); /* protect access to comm_ptr->errhandler */ in_cs = TRUE; @@ -87,7 +87,7 @@ int MPI_Comm_call_errhandler(MPI_Comm comm, int errorcode) { /* Validate comm_ptr; if comm_ptr is not value, it will be reset to null */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; if (comm_ptr->errhandler) { diff --git a/src/mpi/errhan/comm_get_errhandler.c b/src/mpi/errhan/comm_get_errhandler.c index f5e8bf3..3acd00f 100644 --- a/src/mpi/errhan/comm_get_errhandler.c +++ b/src/mpi/errhan/comm_get_errhandler.c @@ -31,7 +31,7 @@ int MPI_Comm_get_errhandler(MPI_Comm comm, MPI_Errhandler *errhandler) __attribu #define FUNCNAME MPIR_Comm_get_errhandler_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -void MPIR_Comm_get_errhandler_impl(MPID_Comm *comm_ptr, MPID_Errhandler **errhandler_ptr) +void MPIR_Comm_get_errhandler_impl(MPIR_Comm *comm_ptr, MPID_Errhandler **errhandler_ptr) { MPID_THREAD_CS_ENTER(POBJ, MPIR_THREAD_POBJ_COMM_MUTEX(comm_ptr)); *errhandler_ptr = comm_ptr->errhandler; @@ -68,7 +68,7 @@ Output Parameters: int MPI_Comm_get_errhandler(MPI_Comm comm, MPI_Errhandler *errhandler) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_Errhandler *errhandler_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_GET_ERRHANDLER); @@ -89,7 +89,7 @@ int MPI_Comm_get_errhandler(MPI_Comm comm, MPI_Errhandler *errhandler) # endif /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -97,7 +97,7 @@ int MPI_Comm_get_errhandler(MPI_Comm comm, MPI_Errhandler *errhandler) MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr; if comm_ptr is not valid, it will be reset to null */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); if (mpi_errno) goto fn_fail; MPIR_ERRTEST_ARGNULL(errhandler,"errhandler",mpi_errno); } diff --git a/src/mpi/errhan/comm_set_errhandler.c b/src/mpi/errhan/comm_set_errhandler.c index ec1d1de..d4730b9 100644 --- a/src/mpi/errhan/comm_set_errhandler.c +++ b/src/mpi/errhan/comm_set_errhandler.c @@ -29,7 +29,7 @@ int MPI_Comm_set_errhandler(MPI_Comm comm, MPI_Errhandler errhandler) __attribut #define FUNCNAME MPIR_Comm_set_errhandler_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -void MPIR_Comm_set_errhandler_impl(MPID_Comm *comm_ptr, MPID_Errhandler *errhandler_ptr) +void MPIR_Comm_set_errhandler_impl(MPIR_Comm *comm_ptr, MPID_Errhandler *errhandler_ptr) { int in_use; @@ -80,7 +80,7 @@ Input Parameters: int MPI_Comm_set_errhandler(MPI_Comm comm, MPI_Errhandler errhandler) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_Errhandler *errhan_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_SET_ERRHANDLER); @@ -101,7 +101,7 @@ int MPI_Comm_set_errhandler(MPI_Comm comm, MPI_Errhandler errhandler) # endif /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); MPID_Errhandler_get_ptr( errhandler, errhan_ptr ); /* Validate parameters and objects (post conversion) */ @@ -110,7 +110,7 @@ int MPI_Comm_set_errhandler(MPI_Comm comm, MPI_Errhandler errhandler) MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr; if comm_ptr is not valid, it will be reset to null */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); if (HANDLE_GET_KIND(errhandler) != HANDLE_KIND_BUILTIN) { MPID_Errhandler_valid_ptr( errhan_ptr, mpi_errno ); diff --git a/src/mpi/errhan/errhandler_get.c b/src/mpi/errhan/errhandler_get.c index f9c8a76..71c310c 100644 --- a/src/mpi/errhan/errhandler_get.c +++ b/src/mpi/errhan/errhandler_get.c @@ -64,7 +64,7 @@ by 'MPI_Comm_group' is no longer needed. int MPI_Errhandler_get(MPI_Comm comm, MPI_Errhandler *errhandler) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_Errhandler *errhandler_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPI_ERRHANDLER_GET); @@ -85,7 +85,7 @@ int MPI_Errhandler_get(MPI_Comm comm, MPI_Errhandler *errhandler) # endif /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -93,7 +93,7 @@ int MPI_Errhandler_get(MPI_Comm comm, MPI_Errhandler *errhandler) MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr; if comm_ptr is not value, it will be reset to null */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); if (mpi_errno) goto fn_fail; MPIR_ERRTEST_ARGNULL(errhandler, "errhandler", mpi_errno); } diff --git a/src/mpi/errhan/errhandler_set.c b/src/mpi/errhan/errhandler_set.c index 33f6b3c..9c8d282 100644 --- a/src/mpi/errhan/errhandler_set.c +++ b/src/mpi/errhan/errhandler_set.c @@ -55,7 +55,7 @@ The replacement for this routine is 'MPI_Comm_set_errhandler'. int MPI_Errhandler_set(MPI_Comm comm, MPI_Errhandler errhandler) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_Errhandler *errhan_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPI_ERRHANDLER_SET); @@ -76,7 +76,7 @@ int MPI_Errhandler_set(MPI_Comm comm, MPI_Errhandler errhandler) # endif /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); MPID_Errhandler_get_ptr( errhandler, errhan_ptr ); /* Validate parameters and objects (post conversion) */ @@ -85,7 +85,7 @@ int MPI_Errhandler_set(MPI_Comm comm, MPI_Errhandler errhandler) MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr; if comm_ptr is not value, it will be reset to null */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); if (mpi_errno) goto fn_fail; MPIR_ERRTEST_ERRHANDLER(errhandler, mpi_errno); diff --git a/src/mpi/errhan/errutil.c b/src/mpi/errhan/errutil.c index bc1832d..0068003 100644 --- a/src/mpi/errhan/errutil.c +++ b/src/mpi/errhan/errutil.c @@ -234,7 +234,7 @@ int MPIR_Err_is_fatal(int errcode) * report an error. It is legitimate to pass NULL for comm_ptr in order to get * the default (MPI_COMM_WORLD) error handling. */ -int MPIR_Err_return_comm( MPID_Comm *comm_ptr, const char fcname[], +int MPIR_Err_return_comm( MPIR_Comm *comm_ptr, const char fcname[], int errcode ) { const int error_class = ERROR_GET_CLASS(errcode); @@ -431,7 +431,7 @@ static void CombineSpecificCodes( int, int, int ); static const char *get_class_msg( int ); /* --BEGIN ERROR HANDLING-- */ -void MPIR_Handle_fatal_error( MPID_Comm *comm_ptr, +void MPIR_Handle_fatal_error( MPIR_Comm *comm_ptr, const char fcname[], int errcode ) { /* Define length of the the maximum error message line (or string with diff --git a/src/mpi/group/grouputil.c b/src/mpi/group/grouputil.c index 7623a70..4a7e3b6 100644 --- a/src/mpi/group/grouputil.c +++ b/src/mpi/group/grouputil.c @@ -373,7 +373,7 @@ int MPIR_Group_check_valid_ranges( MPID_Group *group_ptr, We sort the lpids for the group and the comm. If the group has an lpid that is not in the comm, then report an error. */ -int MPIR_Group_check_subset( MPID_Group *group_ptr, MPID_Comm *comm_ptr ) +int MPIR_Group_check_subset( MPID_Group *group_ptr, MPIR_Comm *comm_ptr ) { int mpi_errno = MPI_SUCCESS; int g1_idx, g2_idx, l1_pid, l2_pid, i; diff --git a/src/mpi/init/abort.c b/src/mpi/init/abort.c index c6ff359..ecf929e 100644 --- a/src/mpi/init/abort.c +++ b/src/mpi/init/abort.c @@ -74,7 +74,7 @@ int MPI_Abort(MPI_Comm comm, int errorcode) { static const char FCNAME[] = "MPI_Abort"; int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; /* FIXME: 100 is arbitrary and may not be long enough */ char abort_str[100] = "", comm_name[MPI_MAX_OBJECT_NAME]; int len = MPI_MAX_OBJECT_NAME; @@ -101,7 +101,7 @@ int MPI_Abort(MPI_Comm comm, int errorcode) # endif /* HAVE_ERROR_CHECKING */ /* Get handles to MPI objects. */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -109,7 +109,7 @@ int MPI_Abort(MPI_Comm comm, int errorcode) MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); /* If comm_ptr is not valid, it will be reset to null */ if (mpi_errno) goto fn_fail; } diff --git a/src/mpi/init/async.c b/src/mpi/init/async.c index 2f92942..eb0af4a 100644 --- a/src/mpi/init/async.c +++ b/src/mpi/init/async.c @@ -10,7 +10,7 @@ #ifndef MPICH_MPI_FROM_PMPI #if MPICH_THREAD_LEVEL == MPI_THREAD_MULTIPLE -static MPID_Comm *progress_comm_ptr; +static MPIR_Comm *progress_comm_ptr; static MPID_Thread_id_t progress_thread_id; static MPID_Thread_mutex_t progress_mutex; static MPID_Thread_cond_t progress_cond; @@ -79,7 +79,7 @@ int MPIR_Init_async_thread(void) { #if MPICH_THREAD_LEVEL == MPI_THREAD_MULTIPLE int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_self_ptr; + MPIR_Comm *comm_self_ptr; int err = 0; MPID_MPI_STATE_DECL(MPID_STATE_MPIR_INIT_ASYNC_THREAD); @@ -87,7 +87,7 @@ int MPIR_Init_async_thread(void) /* Dup comm world for the progress thread */ - MPID_Comm_get_ptr(MPI_COMM_SELF, comm_self_ptr); + MPIR_Comm_get_ptr(MPI_COMM_SELF, comm_self_ptr); mpi_errno = MPIR_Comm_dup_impl(comm_self_ptr, &progress_comm_ptr); if (mpi_errno) MPIR_ERR_POP(mpi_errno); diff --git a/src/mpi/pt2pt/bsend.c b/src/mpi/pt2pt/bsend.c index caed31e..bba508d 100644 --- a/src/mpi/pt2pt/bsend.c +++ b/src/mpi/pt2pt/bsend.c @@ -91,7 +91,7 @@ int MPI_Bsend(const void *buf, int count, MPI_Datatype datatype, int dest, int t { static const char FCNAME[] = "MPI_Bsend"; int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_Request *request_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_BSEND); @@ -112,7 +112,7 @@ int MPI_Bsend(const void *buf, int count, MPI_Datatype datatype, int dest, int t # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate object pointers if error checking is enabled */ # ifdef HAVE_ERROR_CHECKING @@ -121,7 +121,7 @@ int MPI_Bsend(const void *buf, int count, MPI_Datatype datatype, int dest, int t { MPIR_ERRTEST_COUNT(count,mpi_errno); /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno) goto fn_fail; /* If comm_ptr is not valid, it will be reset to null */ if (comm_ptr) { diff --git a/src/mpi/pt2pt/bsend_init.c b/src/mpi/pt2pt/bsend_init.c index fe5bfb5..9035571 100644 --- a/src/mpi/pt2pt/bsend_init.c +++ b/src/mpi/pt2pt/bsend_init.c @@ -65,7 +65,7 @@ int MPI_Bsend_init(const void *buf, int count, MPI_Datatype datatype, static const char FCNAME[] = "MPI_Bsend_init"; int mpi_errno = MPI_SUCCESS; MPID_Request *request_ptr = NULL; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_BSEND_INIT); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -85,14 +85,14 @@ int MPI_Bsend_init(const void *buf, int count, MPI_Datatype datatype, # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters if error checking is enabled */ # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS; { - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno) goto fn_fail; MPIR_ERRTEST_COUNT(count, mpi_errno); diff --git a/src/mpi/pt2pt/bsendutil.c b/src/mpi/pt2pt/bsendutil.c index 144d64e..95c52ae 100644 --- a/src/mpi/pt2pt/bsendutil.c +++ b/src/mpi/pt2pt/bsendutil.c @@ -208,7 +208,7 @@ int MPIR_Bsend_detach( void *bufferp, int *size ) #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Bsend_isend(const void *buf, int count, MPI_Datatype dtype, - int dest, int tag, MPID_Comm *comm_ptr, + int dest, int tag, MPIR_Comm *comm_ptr, MPIR_Bsend_kind_t kind, MPID_Request **request ) { int mpi_errno = MPI_SUCCESS; diff --git a/src/mpi/pt2pt/bsendutil.h b/src/mpi/pt2pt/bsendutil.h index ba29964..997cf7e 100644 --- a/src/mpi/pt2pt/bsendutil.h +++ b/src/mpi/pt2pt/bsendutil.h @@ -10,7 +10,7 @@ /* Function Prototypes for the bsend utility functions */ int MPIR_Bsend_attach( void *, int ); int MPIR_Bsend_detach( void *, int * ); -int MPIR_Bsend_isend(const void *, int, MPI_Datatype, int, int, MPID_Comm *, +int MPIR_Bsend_isend(const void *, int, MPI_Datatype, int, int, MPIR_Comm *, MPIR_Bsend_kind_t, MPID_Request ** ); int MPIR_Bsend_free_req_seg(MPID_Request * ); diff --git a/src/mpi/pt2pt/ibsend.c b/src/mpi/pt2pt/ibsend.c index b8cc4cf..d9bc9e7 100644 --- a/src/mpi/pt2pt/ibsend.c +++ b/src/mpi/pt2pt/ibsend.c @@ -93,7 +93,7 @@ PMPI_LOCAL int MPIR_Ibsend_cancel( void *extra, int complete ) #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Ibsend_impl(const void *buf, int count, MPI_Datatype datatype, int dest, int tag, - MPID_Comm *comm_ptr, MPI_Request *request) + MPIR_Comm *comm_ptr, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; MPID_Request *request_ptr, *new_request_ptr; @@ -164,7 +164,7 @@ int MPI_Ibsend(const void *buf, int count, MPI_Datatype datatype, int dest, int MPI_Comm comm, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_IBSEND); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -184,7 +184,7 @@ int MPI_Ibsend(const void *buf, int count, MPI_Datatype datatype, int dest, int # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters if error checking is enabled */ # ifdef HAVE_ERROR_CHECKING @@ -193,7 +193,7 @@ int MPI_Ibsend(const void *buf, int count, MPI_Datatype datatype, int dest, int { MPIR_ERRTEST_COUNT(count,mpi_errno); /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno) goto fn_fail; /* If comm_ptr is not valid, it will be reset to null */ if (comm_ptr) { diff --git a/src/mpi/pt2pt/improbe.c b/src/mpi/pt2pt/improbe.c index 253ad01..31974a6 100644 --- a/src/mpi/pt2pt/improbe.c +++ b/src/mpi/pt2pt/improbe.c @@ -56,7 +56,7 @@ int MPI_Improbe(int source, int tag, MPI_Comm comm, int *flag, MPI_Message *mess { int mpi_errno = MPI_SUCCESS; MPID_Request *msgp = NULL; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_IMPROBE); MPID_THREAD_CS_ENTER(GLOBAL, MPIR_THREAD_GLOBAL_ALLFUNC_MUTEX); @@ -76,14 +76,14 @@ int MPI_Improbe(int source, int tag, MPI_Comm comm, int *flag, MPI_Message *mess # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr(comm, comm_ptr); + MPIR_Comm_get_ptr(comm, comm_ptr); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS { - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPIR_ERRTEST_ARGNULL(flag, "flag", mpi_errno); diff --git a/src/mpi/pt2pt/iprobe.c b/src/mpi/pt2pt/iprobe.c index 82df3fa..3729a95 100644 --- a/src/mpi/pt2pt/iprobe.c +++ b/src/mpi/pt2pt/iprobe.c @@ -59,7 +59,7 @@ int MPI_Iprobe(int source, int tag, MPI_Comm comm, int *flag, { static const char FCNAME[] = "MPI_Iprobe"; int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_IPROBE); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -79,7 +79,7 @@ int MPI_Iprobe(int source, int tag, MPI_Comm comm, int *flag, # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters if error checking is enabled */ # ifdef HAVE_ERROR_CHECKING @@ -87,7 +87,7 @@ int MPI_Iprobe(int source, int tag, MPI_Comm comm, int *flag, MPID_BEGIN_ERROR_CHECKS; { /* Validate communicator */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno) goto fn_fail; MPIR_ERRTEST_ARGNULL( flag, "flag", mpi_errno ); diff --git a/src/mpi/pt2pt/irecv.c b/src/mpi/pt2pt/irecv.c index 2d532ca..ab950a3 100644 --- a/src/mpi/pt2pt/irecv.c +++ b/src/mpi/pt2pt/irecv.c @@ -63,7 +63,7 @@ int MPI_Irecv(void *buf, int count, MPI_Datatype datatype, int source, { static const char FCNAME[] = "MPI_Irecv"; int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_Request *request_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_IRECV); @@ -84,14 +84,14 @@ int MPI_Irecv(void *buf, int count, MPI_Datatype datatype, int source, # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters if error checking is enabled */ # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS; { - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno) goto fn_fail; MPIR_ERRTEST_COUNT(count, mpi_errno); diff --git a/src/mpi/pt2pt/irsend.c b/src/mpi/pt2pt/irsend.c index 985f6f1..12a05c5 100644 --- a/src/mpi/pt2pt/irsend.c +++ b/src/mpi/pt2pt/irsend.c @@ -64,7 +64,7 @@ int MPI_Irsend(const void *buf, int count, MPI_Datatype datatype, int dest, int { static const char FCNAME[] = "MPI_Irsend"; int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_Request *request_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_IRSEND); @@ -85,14 +85,14 @@ int MPI_Irsend(const void *buf, int count, MPI_Datatype datatype, int dest, int # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters if error checking is enabled */ # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS; { - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno) goto fn_fail; MPIR_ERRTEST_COUNT(count, mpi_errno); diff --git a/src/mpi/pt2pt/isend.c b/src/mpi/pt2pt/isend.c index 5cfbcff..780d5bb 100644 --- a/src/mpi/pt2pt/isend.c +++ b/src/mpi/pt2pt/isend.c @@ -62,7 +62,7 @@ int MPI_Isend(const void *buf, int count, MPI_Datatype datatype, int dest, int t MPI_Comm comm, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_Request *request_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_ISEND); @@ -83,14 +83,14 @@ int MPI_Isend(const void *buf, int count, MPI_Datatype datatype, int dest, int t # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters if error checking is enabled */ # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS; { - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno) goto fn_fail; MPIR_ERRTEST_COUNT(count, mpi_errno); diff --git a/src/mpi/pt2pt/issend.c b/src/mpi/pt2pt/issend.c index a3a234d..b8042a2 100644 --- a/src/mpi/pt2pt/issend.c +++ b/src/mpi/pt2pt/issend.c @@ -63,7 +63,7 @@ int MPI_Issend(const void *buf, int count, MPI_Datatype datatype, int dest, int { static const char FCNAME[] = "MPI_Issend"; int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_Request *request_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_ISSEND); @@ -84,14 +84,14 @@ int MPI_Issend(const void *buf, int count, MPI_Datatype datatype, int dest, int # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters if error checking is enabled */ # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS; { - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno) goto fn_fail; MPIR_ERRTEST_COUNT(count, mpi_errno); diff --git a/src/mpi/pt2pt/mprobe.c b/src/mpi/pt2pt/mprobe.c index b3c962a..4141e15 100644 --- a/src/mpi/pt2pt/mprobe.c +++ b/src/mpi/pt2pt/mprobe.c @@ -54,7 +54,7 @@ int MPI_Mprobe(int source, int tag, MPI_Comm comm, MPI_Message *message, MPI_Sta { int mpi_errno = MPI_SUCCESS; MPID_Request *msgp = NULL; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_MPROBE); MPID_THREAD_CS_ENTER(GLOBAL, MPIR_THREAD_GLOBAL_ALLFUNC_MUTEX); @@ -74,14 +74,14 @@ int MPI_Mprobe(int source, int tag, MPI_Comm comm, MPI_Message *message, MPI_Sta # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr(comm, comm_ptr); + MPIR_Comm_get_ptr(comm, comm_ptr); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS { - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); /* TODO more checks may be appropriate (counts, in_place, buffer aliasing, etc) */ if (mpi_errno != MPI_SUCCESS) goto fn_fail; } diff --git a/src/mpi/pt2pt/probe.c b/src/mpi/pt2pt/probe.c index 68c9398..81c33d6 100644 --- a/src/mpi/pt2pt/probe.c +++ b/src/mpi/pt2pt/probe.c @@ -55,7 +55,7 @@ int MPI_Probe(int source, int tag, MPI_Comm comm, MPI_Status *status) { static const char FCNAME[] = "MPI_Probe"; int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_PROBE); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -75,7 +75,7 @@ int MPI_Probe(int source, int tag, MPI_Comm comm, MPI_Status *status) # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters if error checking is enabled */ # ifdef HAVE_ERROR_CHECKING @@ -83,7 +83,7 @@ int MPI_Probe(int source, int tag, MPI_Comm comm, MPI_Status *status) MPID_BEGIN_ERROR_CHECKS; { /* Validate communicator */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno) goto fn_fail; MPIR_ERRTEST_RECV_TAG(tag,mpi_errno); diff --git a/src/mpi/pt2pt/recv.c b/src/mpi/pt2pt/recv.c index e0a9185..aea1854 100644 --- a/src/mpi/pt2pt/recv.c +++ b/src/mpi/pt2pt/recv.c @@ -69,7 +69,7 @@ int MPI_Recv(void *buf, int count, MPI_Datatype datatype, int source, int tag, { static const char FCNAME[] = "MPI_Recv"; int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_Request * request_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_RECV); @@ -93,14 +93,14 @@ int MPI_Recv(void *buf, int count, MPI_Datatype datatype, int source, int tag, # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters if error checking is enabled */ # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS; { - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno) goto fn_fail; MPIR_ERRTEST_COUNT(count, mpi_errno); diff --git a/src/mpi/pt2pt/recv_init.c b/src/mpi/pt2pt/recv_init.c index 45cefcc..494df48 100644 --- a/src/mpi/pt2pt/recv_init.c +++ b/src/mpi/pt2pt/recv_init.c @@ -65,7 +65,7 @@ int MPI_Recv_init(void *buf, int count, MPI_Datatype datatype, int source, { static const char FCNAME[] = "MPI_Recv_init"; int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_Request *request_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_RECV_INIT); @@ -86,14 +86,14 @@ int MPI_Recv_init(void *buf, int count, MPI_Datatype datatype, int source, # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters if error checking is enabled */ # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS; { - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno) goto fn_fail; MPIR_ERRTEST_COUNT(count, mpi_errno); diff --git a/src/mpi/pt2pt/rsend.c b/src/mpi/pt2pt/rsend.c index 3146b72..8b29f89 100644 --- a/src/mpi/pt2pt/rsend.c +++ b/src/mpi/pt2pt/rsend.c @@ -60,7 +60,7 @@ int MPI_Rsend(const void *buf, int count, MPI_Datatype datatype, int dest, int t { static const char FCNAME[] = "MPI_Rsend"; int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_Request * request_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_RSEND); @@ -81,14 +81,14 @@ int MPI_Rsend(const void *buf, int count, MPI_Datatype datatype, int dest, int t # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters if error checking is enabled */ # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS; { - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno) goto fn_fail; MPIR_ERRTEST_COUNT(count, mpi_errno); diff --git a/src/mpi/pt2pt/rsend_init.c b/src/mpi/pt2pt/rsend_init.c index 28714de..68aa5d2 100644 --- a/src/mpi/pt2pt/rsend_init.c +++ b/src/mpi/pt2pt/rsend_init.c @@ -65,7 +65,7 @@ int MPI_Rsend_init(const void *buf, int count, MPI_Datatype datatype, int dest, { static const char FCNAME[] = "MPI_Rsend_init"; int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_Request *request_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_RSEND_INIT); @@ -86,14 +86,14 @@ int MPI_Rsend_init(const void *buf, int count, MPI_Datatype datatype, int dest, # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters if error checking is enabled */ # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS; { - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno) goto fn_fail; MPIR_ERRTEST_COUNT(count, mpi_errno); diff --git a/src/mpi/pt2pt/send.c b/src/mpi/pt2pt/send.c index 67752fb..df2a4b3 100644 --- a/src/mpi/pt2pt/send.c +++ b/src/mpi/pt2pt/send.c @@ -65,7 +65,7 @@ int MPI_Send(const void *buf, int count, MPI_Datatype datatype, int dest, int ta { static const char FCNAME[] = "MPI_Send"; int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_Request * request_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_SEND); @@ -86,14 +86,14 @@ int MPI_Send(const void *buf, int count, MPI_Datatype datatype, int dest, int ta # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters if error checking is enabled */ # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS; { - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno) goto fn_fail; MPIR_ERRTEST_COUNT(count, mpi_errno); diff --git a/src/mpi/pt2pt/send_init.c b/src/mpi/pt2pt/send_init.c index 1a3cad7..fa54159 100644 --- a/src/mpi/pt2pt/send_init.c +++ b/src/mpi/pt2pt/send_init.c @@ -65,7 +65,7 @@ int MPI_Send_init(const void *buf, int count, MPI_Datatype datatype, int dest, { static const char FCNAME[] = "MPI_Send_init"; int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_Request *request_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_SEND_INIT); @@ -86,14 +86,14 @@ int MPI_Send_init(const void *buf, int count, MPI_Datatype datatype, int dest, # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters if error checking is enabled */ # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS; { - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno) goto fn_fail; MPIR_ERRTEST_COUNT(count, mpi_errno); diff --git a/src/mpi/pt2pt/sendrecv.c b/src/mpi/pt2pt/sendrecv.c index 7787547..36a5f45 100644 --- a/src/mpi/pt2pt/sendrecv.c +++ b/src/mpi/pt2pt/sendrecv.c @@ -75,7 +75,7 @@ int MPI_Sendrecv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, { static const char FCNAME[] = "MPI_Sendrecv"; int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_Request * sreq; MPID_Request * rreq; MPID_MPI_STATE_DECL(MPID_STATE_MPI_SENDRECV); @@ -97,14 +97,14 @@ int MPI_Sendrecv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, # endif /* HAVE_ERROR_CHECKING */ /* Convert handles to MPI objects. */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS; { /* Validate communicator */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno) goto fn_fail; /* Validate count */ diff --git a/src/mpi/pt2pt/sendrecv_rep.c b/src/mpi/pt2pt/sendrecv_rep.c index 140303f..7569cd0 100644 --- a/src/mpi/pt2pt/sendrecv_rep.c +++ b/src/mpi/pt2pt/sendrecv_rep.c @@ -71,7 +71,7 @@ int MPI_Sendrecv_replace(void *buf, int count, MPI_Datatype datatype, { static const char FCNAME[] = "MPI_Sendrecv_replace"; int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; #ifdef MPID_LOG_ARROWS /* This isn't the right test, but it is close enough for now */ int sendcount = count, recvcount = count; @@ -85,14 +85,14 @@ int MPI_Sendrecv_replace(void *buf, int count, MPI_Datatype datatype, MPID_MPI_PT2PT_FUNC_ENTER_BOTH(MPID_STATE_MPI_SENDRECV_REPLACE); /* Convert handles to MPI objects. */ - MPID_Comm_get_ptr(comm, comm_ptr); + MPIR_Comm_get_ptr(comm, comm_ptr); # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS; { /* Validate communicator */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno) goto fn_fail; /* Validate count */ diff --git a/src/mpi/pt2pt/ssend.c b/src/mpi/pt2pt/ssend.c index 74df40f..8512fe6 100644 --- a/src/mpi/pt2pt/ssend.c +++ b/src/mpi/pt2pt/ssend.c @@ -59,7 +59,7 @@ int MPI_Ssend(const void *buf, int count, MPI_Datatype datatype, int dest, int t { static const char FCNAME[] = "MPI_Ssend"; int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_Request * request_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_SSEND); @@ -80,14 +80,14 @@ int MPI_Ssend(const void *buf, int count, MPI_Datatype datatype, int dest, int t # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters if error checking is enabled */ # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS; { - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno) goto fn_fail; MPIR_ERRTEST_COUNT(count, mpi_errno); diff --git a/src/mpi/pt2pt/ssend_init.c b/src/mpi/pt2pt/ssend_init.c index e9af88f..05ec5d2 100644 --- a/src/mpi/pt2pt/ssend_init.c +++ b/src/mpi/pt2pt/ssend_init.c @@ -62,7 +62,7 @@ int MPI_Ssend_init(const void *buf, int count, MPI_Datatype datatype, int dest, { static const char FCNAME[] = "MPI_Ssend_init"; int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_Request *request_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_SSEND_INIT); @@ -83,14 +83,14 @@ int MPI_Ssend_init(const void *buf, int count, MPI_Datatype datatype, int dest, # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters if error checking is enabled */ # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS; { - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno) goto fn_fail; MPIR_ERRTEST_COUNT(count, mpi_errno); diff --git a/src/mpi/pt2pt/wait.c b/src/mpi/pt2pt/wait.c index c6d8930..8408864 100644 --- a/src/mpi/pt2pt/wait.c +++ b/src/mpi/pt2pt/wait.c @@ -137,7 +137,7 @@ int MPI_Wait(MPI_Request *request, MPI_Status *status) { MPID_Request * request_ptr = NULL; int mpi_errno = MPI_SUCCESS; - MPID_Comm * comm_ptr = NULL; + MPIR_Comm * comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WAIT); MPIR_ERRTEST_INITIALIZED_ORDIE(); diff --git a/src/mpi/rma/accumulate.c b/src/mpi/rma/accumulate.c index b5aaf4f..5d014c4 100644 --- a/src/mpi/rma/accumulate.c +++ b/src/mpi/rma/accumulate.c @@ -99,7 +99,7 @@ int MPI_Accumulate(const void *origin_addr, int origin_count, MPI_Datatype { MPID_BEGIN_ERROR_CHECKS; { - MPID_Comm * comm_ptr; + MPIR_Comm * comm_ptr; /* Validate win_ptr */ MPID_Win_valid_ptr( win_ptr, mpi_errno ); diff --git a/src/mpi/rma/compare_and_swap.c b/src/mpi/rma/compare_and_swap.c index a50f7df..7a19118 100644 --- a/src/mpi/rma/compare_and_swap.c +++ b/src/mpi/rma/compare_and_swap.c @@ -105,7 +105,7 @@ int MPI_Compare_and_swap(const void *origin_addr, const void *compare_addr, { MPID_BEGIN_ERROR_CHECKS; { - MPID_Comm *comm_ptr; + MPIR_Comm *comm_ptr; /* Validate win_ptr */ MPID_Win_valid_ptr( win_ptr, mpi_errno ); diff --git a/src/mpi/rma/fetch_and_op.c b/src/mpi/rma/fetch_and_op.c index 0f14079..f9ff961 100644 --- a/src/mpi/rma/fetch_and_op.c +++ b/src/mpi/rma/fetch_and_op.c @@ -110,7 +110,7 @@ int MPI_Fetch_and_op(const void *origin_addr, void *result_addr, { MPID_BEGIN_ERROR_CHECKS; { - MPID_Comm *comm_ptr; + MPIR_Comm *comm_ptr; /* Validate win_ptr */ MPID_Win_valid_ptr( win_ptr, mpi_errno ); diff --git a/src/mpi/rma/get.c b/src/mpi/rma/get.c index 23c7bed..9daa458 100644 --- a/src/mpi/rma/get.c +++ b/src/mpi/rma/get.c @@ -94,7 +94,7 @@ int MPI_Get(void *origin_addr, int origin_count, MPI_Datatype { MPID_BEGIN_ERROR_CHECKS; { - MPID_Comm * comm_ptr; + MPIR_Comm * comm_ptr; /* Validate win_ptr */ MPID_Win_valid_ptr( win_ptr, mpi_errno ); diff --git a/src/mpi/rma/get_accumulate.c b/src/mpi/rma/get_accumulate.c index 0797a29..ab8cd64 100644 --- a/src/mpi/rma/get_accumulate.c +++ b/src/mpi/rma/get_accumulate.c @@ -130,7 +130,7 @@ int MPI_Get_accumulate(const void *origin_addr, int origin_count, { MPID_BEGIN_ERROR_CHECKS; { - MPID_Comm * comm_ptr; + MPIR_Comm * comm_ptr; /* Validate win_ptr */ MPID_Win_valid_ptr( win_ptr, mpi_errno ); diff --git a/src/mpi/rma/put.c b/src/mpi/rma/put.c index 5b46007..39d0b3a 100644 --- a/src/mpi/rma/put.c +++ b/src/mpi/rma/put.c @@ -94,7 +94,7 @@ int MPI_Put(const void *origin_addr, int origin_count, MPI_Datatype { MPID_BEGIN_ERROR_CHECKS; { - MPID_Comm * comm_ptr; + MPIR_Comm * comm_ptr; /* Validate win_ptr */ MPID_Win_valid_ptr( win_ptr, mpi_errno ); diff --git a/src/mpi/rma/raccumulate.c b/src/mpi/rma/raccumulate.c index 9fb0edd..6e78c11 100644 --- a/src/mpi/rma/raccumulate.c +++ b/src/mpi/rma/raccumulate.c @@ -113,7 +113,7 @@ int MPI_Raccumulate(const void *origin_addr, int origin_count, MPI_Datatype { MPID_BEGIN_ERROR_CHECKS; { - MPID_Comm * comm_ptr; + MPIR_Comm * comm_ptr; /* Validate win_ptr */ MPID_Win_valid_ptr( win_ptr, mpi_errno ); diff --git a/src/mpi/rma/rget.c b/src/mpi/rma/rget.c index cac765d..18a614e 100644 --- a/src/mpi/rma/rget.c +++ b/src/mpi/rma/rget.c @@ -108,7 +108,7 @@ int MPI_Rget(void *origin_addr, int origin_count, MPI_Datatype { MPID_BEGIN_ERROR_CHECKS; { - MPID_Comm * comm_ptr; + MPIR_Comm * comm_ptr; /* Validate win_ptr */ MPID_Win_valid_ptr( win_ptr, mpi_errno ); diff --git a/src/mpi/rma/rget_accumulate.c b/src/mpi/rma/rget_accumulate.c index f46bd05..d653cb7 100644 --- a/src/mpi/rma/rget_accumulate.c +++ b/src/mpi/rma/rget_accumulate.c @@ -123,7 +123,7 @@ int MPI_Rget_accumulate(const void *origin_addr, int origin_count, { MPID_BEGIN_ERROR_CHECKS; { - MPID_Comm * comm_ptr; + MPIR_Comm * comm_ptr; /* Validate win_ptr */ MPID_Win_valid_ptr( win_ptr, mpi_errno ); diff --git a/src/mpi/rma/rput.c b/src/mpi/rma/rput.c index d149d44..8a92aa7 100644 --- a/src/mpi/rma/rput.c +++ b/src/mpi/rma/rput.c @@ -110,7 +110,7 @@ int MPI_Rput(const void *origin_addr, int origin_count, MPI_Datatype { MPID_BEGIN_ERROR_CHECKS; { - MPID_Comm * comm_ptr; + MPIR_Comm * comm_ptr; /* Validate win_ptr */ MPID_Win_valid_ptr( win_ptr, mpi_errno ); diff --git a/src/mpi/rma/win_allocate.c b/src/mpi/rma/win_allocate.c index 0361857..20b086b 100644 --- a/src/mpi/rma/win_allocate.c +++ b/src/mpi/rma/win_allocate.c @@ -74,7 +74,7 @@ int MPI_Win_allocate(MPI_Aint size, int disp_unit, MPI_Info info, static const char FCNAME[] = "MPI_Win_allocate"; int mpi_errno = MPI_SUCCESS; MPID_Win *win_ptr = NULL; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_Info *info_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_ALLOCATE); @@ -97,7 +97,7 @@ int MPI_Win_allocate(MPI_Aint size, int disp_unit, MPI_Info info, # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); MPID_Info_get_ptr( info, info_ptr ); /* Validate parameters and objects (post conversion) */ @@ -106,7 +106,7 @@ int MPI_Win_allocate(MPI_Aint size, int disp_unit, MPI_Info info, MPID_BEGIN_ERROR_CHECKS; { /* Validate pointers */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; if (size < 0) mpi_errno = MPIR_Err_create_code( MPI_SUCCESS, diff --git a/src/mpi/rma/win_allocate_shared.c b/src/mpi/rma/win_allocate_shared.c index 4b68e7c..8c1e51e 100644 --- a/src/mpi/rma/win_allocate_shared.c +++ b/src/mpi/rma/win_allocate_shared.c @@ -84,7 +84,7 @@ int MPI_Win_allocate_shared(MPI_Aint size, int disp_unit, MPI_Info info, MPI_Com { int mpi_errno = MPI_SUCCESS; MPID_Win *win_ptr = NULL; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_Info *info_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_ALLOCATE_SHARED); @@ -107,7 +107,7 @@ int MPI_Win_allocate_shared(MPI_Aint size, int disp_unit, MPI_Info info, MPI_Com # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); MPID_Info_get_ptr( info, info_ptr ); /* Validate parameters and objects (post conversion) */ @@ -116,7 +116,7 @@ int MPI_Win_allocate_shared(MPI_Aint size, int disp_unit, MPI_Info info, MPI_Com MPID_BEGIN_ERROR_CHECKS; { /* Validate pointers */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPIR_ERR_CHKANDJUMP1(disp_unit <= 0, mpi_errno, MPI_ERR_ARG, diff --git a/src/mpi/rma/win_create.c b/src/mpi/rma/win_create.c index 112bfb1..b6901b1 100644 --- a/src/mpi/rma/win_create.c +++ b/src/mpi/rma/win_create.c @@ -102,7 +102,7 @@ int MPI_Win_create(void *base, MPI_Aint size, int disp_unit, MPI_Info info, static const char FCNAME[] = "MPI_Win_create"; int mpi_errno = MPI_SUCCESS; MPID_Win *win_ptr = NULL; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_Info *info_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_CREATE); @@ -125,7 +125,7 @@ int MPI_Win_create(void *base, MPI_Aint size, int disp_unit, MPI_Info info, # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); MPID_Info_get_ptr( info, info_ptr ); /* Validate parameters and objects (post conversion) */ @@ -134,7 +134,7 @@ int MPI_Win_create(void *base, MPI_Aint size, int disp_unit, MPI_Info info, MPID_BEGIN_ERROR_CHECKS; { /* Validate pointers */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; if (size < 0) mpi_errno = MPIR_Err_create_code( MPI_SUCCESS, diff --git a/src/mpi/rma/win_create_dynamic.c b/src/mpi/rma/win_create_dynamic.c index ddc5dfa..44af241 100644 --- a/src/mpi/rma/win_create_dynamic.c +++ b/src/mpi/rma/win_create_dynamic.c @@ -90,7 +90,7 @@ int MPI_Win_create_dynamic(MPI_Info info, MPI_Comm comm, MPI_Win *win) static const char FCNAME[] = "MPI_Win_create_dynamic"; int mpi_errno = MPI_SUCCESS; MPID_Win *win_ptr = NULL; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_Info *info_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_CREATE_DYNAMIC); @@ -113,7 +113,7 @@ int MPI_Win_create_dynamic(MPI_Info info, MPI_Comm comm, MPI_Win *win) # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); MPID_Info_get_ptr( info, info_ptr ); /* Validate parameters and objects (post conversion) */ @@ -122,7 +122,7 @@ int MPI_Win_create_dynamic(MPI_Info info, MPI_Comm comm, MPI_Win *win) MPID_BEGIN_ERROR_CHECKS; { /* Validate pointers */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; } MPID_END_ERROR_CHECKS; diff --git a/src/mpi/rma/win_flush.c b/src/mpi/rma/win_flush.c index e751e47..4a8f5e6 100644 --- a/src/mpi/rma/win_flush.c +++ b/src/mpi/rma/win_flush.c @@ -85,7 +85,7 @@ int MPI_Win_flush(int rank, MPI_Win win) { MPID_BEGIN_ERROR_CHECKS; { - MPID_Comm * comm_ptr; + MPIR_Comm * comm_ptr; /* Validate win_ptr */ MPID_Win_valid_ptr( win_ptr, mpi_errno ); diff --git a/src/mpi/rma/win_flush_local.c b/src/mpi/rma/win_flush_local.c index fd64eee..9b10972 100644 --- a/src/mpi/rma/win_flush_local.c +++ b/src/mpi/rma/win_flush_local.c @@ -87,7 +87,7 @@ int MPI_Win_flush_local(int rank, MPI_Win win) { MPID_BEGIN_ERROR_CHECKS; { - MPID_Comm * comm_ptr; + MPIR_Comm * comm_ptr; /* Validate win_ptr */ MPID_Win_valid_ptr( win_ptr, mpi_errno ); diff --git a/src/mpi/rma/win_get_group.c b/src/mpi/rma/win_get_group.c index 6a5cb1f..fb32aae 100644 --- a/src/mpi/rma/win_get_group.c +++ b/src/mpi/rma/win_get_group.c @@ -60,7 +60,7 @@ int MPI_Win_get_group(MPI_Win win, MPI_Group *group) static const char FCNAME[] = "MPI_Win_get_group"; int mpi_errno = MPI_SUCCESS; MPID_Win *win_ptr = NULL; - MPID_Comm *win_comm_ptr; + MPIR_Comm *win_comm_ptr; MPID_Group *group_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_GET_GROUP); diff --git a/src/mpi/rma/win_lock.c b/src/mpi/rma/win_lock.c index 7972ef3..f49fce6 100644 --- a/src/mpi/rma/win_lock.c +++ b/src/mpi/rma/win_lock.c @@ -104,7 +104,7 @@ int MPI_Win_lock(int lock_type, int rank, int assert, MPI_Win win) { MPID_BEGIN_ERROR_CHECKS; { - MPID_Comm *comm_ptr; + MPIR_Comm *comm_ptr; /* Validate win_ptr */ MPID_Win_valid_ptr( win_ptr, mpi_errno ); diff --git a/src/mpi/rma/win_shared_query.c b/src/mpi/rma/win_shared_query.c index 9931dda..ccd012b 100644 --- a/src/mpi/rma/win_shared_query.c +++ b/src/mpi/rma/win_shared_query.c @@ -102,7 +102,7 @@ int MPI_Win_shared_query(MPI_Win win, int rank, MPI_Aint *size, int *disp_unit, { MPID_BEGIN_ERROR_CHECKS; { - MPID_Comm * comm_ptr; + MPIR_Comm * comm_ptr; /* Validate win_ptr */ MPID_Win_valid_ptr( win_ptr, mpi_errno ); diff --git a/src/mpi/rma/win_unlock.c b/src/mpi/rma/win_unlock.c index 0211e15..b511446 100644 --- a/src/mpi/rma/win_unlock.c +++ b/src/mpi/rma/win_unlock.c @@ -80,7 +80,7 @@ int MPI_Win_unlock(int rank, MPI_Win win) { MPID_BEGIN_ERROR_CHECKS; { - MPID_Comm * comm_ptr; + MPIR_Comm * comm_ptr; /* Validate win_ptr */ MPID_Win_valid_ptr( win_ptr, mpi_errno ); diff --git a/src/mpi/romio/adio/ad_gpfs/pe/ad_pe_aggrs.c b/src/mpi/romio/adio/ad_gpfs/pe/ad_pe_aggrs.c index 7785eb8..3849048 100644 --- a/src/mpi/romio/adio/ad_gpfs/pe/ad_pe_aggrs.c +++ b/src/mpi/romio/adio/ad_gpfs/pe/ad_pe_aggrs.c @@ -143,9 +143,9 @@ ADIOI_PE_gen_agg_ranklist(ADIO_File fd) } } if (numAggs == 0) { - MPID_Comm *mpidCommData; + MPIR_Comm *mpidCommData; - MPID_Comm_get_ptr(fd->comm,mpidCommData); + MPIR_Comm_get_ptr(fd->comm,mpidCommData); int localSize = mpidCommData->local_size; // get my node rank @@ -157,7 +157,7 @@ ADIOI_PE_gen_agg_ranklist(ADIO_File fd) MPI_Allgather(MPI_IN_PLACE, 1, MPI_INT, allNodeRanks, 1, MPI_INT, fd->comm); #ifdef AGG_DEBUG - printf("MPID_Comm data: local_size is %d\nintranode_table entries:\n",mpidCommData->local_size); + printf("MPIR_Comm data: local_size is %d\nintranode_table entries:\n",mpidCommData->local_size); for (i=0;i<localSize;i++) { printf("%d ",mpidCommData->intranode_table[i]); } diff --git a/src/mpi/romio/mpi-io/glue/mpich/mpio_err.c b/src/mpi/romio/mpi-io/glue/mpich/mpio_err.c index 77e6b1d..dbb02a8 100644 --- a/src/mpi/romio/mpi-io/glue/mpich/mpio_err.c +++ b/src/mpi/romio/mpi-io/glue/mpich/mpio_err.c @@ -26,8 +26,8 @@ int MPIR_File_call_cxx_errhandler( MPI_File *, int *, typedef int (* MPIR_Err_get_class_string_func_t)(int error, char *str, int length); void MPIR_Err_get_string( int, char *, int, MPIR_Err_get_class_string_func_t ); -struct MPID_Comm; -int MPID_Abort(struct MPID_Comm *comm, int mpi_errno, int exit_code, const char *error_msg); +struct MPIR_Comm; +int MPID_Abort(struct MPIR_Comm *comm, int mpi_errno, int exit_code, const char *error_msg); int MPIO_Err_create_code(int lastcode, int fatal, const char fcname[], int line, int error_class, const char generic_msg[], diff --git a/src/mpi/spawn/comm_accept.c b/src/mpi/spawn/comm_accept.c index 7f33bf1..af5d679 100644 --- a/src/mpi/spawn/comm_accept.c +++ b/src/mpi/spawn/comm_accept.c @@ -31,7 +31,7 @@ int MPI_Comm_accept(const char *port_name, MPI_Info info, int root, MPI_Comm com #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Comm_accept_impl(const char * port_name, MPID_Info * info_ptr, int root, - MPID_Comm * comm_ptr, MPID_Comm ** newcomm_ptr) + MPIR_Comm * comm_ptr, MPIR_Comm ** newcomm_ptr) { return MPID_Comm_accept(port_name, info_ptr, root, comm_ptr, newcomm_ptr); } @@ -68,8 +68,8 @@ int MPI_Comm_accept(const char *port_name, MPI_Info info, int root, MPI_Comm com MPI_Comm *newcomm) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; - MPID_Comm *newcomm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; + MPIR_Comm *newcomm_ptr = NULL; MPID_Info *info_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_ACCEPT); @@ -91,7 +91,7 @@ int MPI_Comm_accept(const char *port_name, MPI_Info info, int root, MPI_Comm com # endif /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); MPID_Info_get_ptr( info, info_ptr ); /* Validate parameters and objects (post conversion) */ @@ -100,7 +100,7 @@ int MPI_Comm_accept(const char *port_name, MPI_Info info, int root, MPI_Comm com MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno) goto fn_fail; } MPID_END_ERROR_CHECKS; diff --git a/src/mpi/spawn/comm_connect.c b/src/mpi/spawn/comm_connect.c index e76e897..7f47222 100644 --- a/src/mpi/spawn/comm_connect.c +++ b/src/mpi/spawn/comm_connect.c @@ -30,7 +30,7 @@ int MPI_Comm_connect(const char *port_name, MPI_Info info, int root, MPI_Comm co #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIR_Comm_connect_impl(const char * port_name, MPID_Info * info_ptr, int root, - MPID_Comm * comm_ptr, MPID_Comm ** newcomm_ptr) + MPIR_Comm * comm_ptr, MPIR_Comm ** newcomm_ptr) { return MPID_Comm_connect(port_name, info_ptr, root, comm_ptr, newcomm_ptr); } @@ -67,8 +67,8 @@ int MPI_Comm_connect(const char *port_name, MPI_Info info, int root, MPI_Comm co MPI_Comm *newcomm) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; - MPID_Comm *newcomm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; + MPIR_Comm *newcomm_ptr = NULL; MPID_Info *info_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_CONNECT); @@ -90,7 +90,7 @@ int MPI_Comm_connect(const char *port_name, MPI_Info info, int root, MPI_Comm co # endif /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); MPID_Info_get_ptr( info, info_ptr ); /* Validate parameters and objects (post conversion) */ @@ -99,7 +99,7 @@ int MPI_Comm_connect(const char *port_name, MPI_Info info, int root, MPI_Comm co MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); /* If comm_ptr is not valid, it will be reset to null */ if (mpi_errno) goto fn_fail; } diff --git a/src/mpi/spawn/comm_disconnect.c b/src/mpi/spawn/comm_disconnect.c index 3c6b7f4..a56a3f6 100644 --- a/src/mpi/spawn/comm_disconnect.c +++ b/src/mpi/spawn/comm_disconnect.c @@ -54,7 +54,7 @@ int MPI_Comm_disconnect(MPI_Comm * comm) { static const char FCNAME[] = "MPI_Comm_disconnect"; int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_DISCONNECT); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -74,7 +74,7 @@ int MPI_Comm_disconnect(MPI_Comm * comm) # endif /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( *comm, comm_ptr ); + MPIR_Comm_get_ptr( *comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -82,7 +82,7 @@ int MPI_Comm_disconnect(MPI_Comm * comm) MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); /* If comm_ptr is not valid, it will be reset to null */ if (mpi_errno) { diff --git a/src/mpi/spawn/comm_join.c b/src/mpi/spawn/comm_join.c index 8d6655b..ee5837d 100644 --- a/src/mpi/spawn/comm_join.c +++ b/src/mpi/spawn/comm_join.c @@ -137,7 +137,7 @@ int MPI_Comm_join(int fd, MPI_Comm *intercomm) { static const char FCNAME[] = "MPI_Comm_join"; int mpi_errno = MPI_SUCCESS, err; - MPID_Comm *intercomm_ptr; + MPIR_Comm *intercomm_ptr; char *local_port, *remote_port; MPIU_CHKLMEM_DECL(2); MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_JOIN); @@ -167,13 +167,13 @@ int MPI_Comm_join(int fd, MPI_Comm *intercomm) "**join_portname %s %s", local_port, remote_port); if (strcmp(local_port, remote_port) < 0) { - MPID_Comm *comm_self_ptr; - MPID_Comm_get_ptr( MPI_COMM_SELF, comm_self_ptr ); + MPIR_Comm *comm_self_ptr; + MPIR_Comm_get_ptr( MPI_COMM_SELF, comm_self_ptr ); mpi_errno = MPIR_Comm_accept_impl(local_port, NULL, 0, comm_self_ptr, &intercomm_ptr); if (mpi_errno) MPIR_ERR_POP(mpi_errno); } else { - MPID_Comm *comm_self_ptr; - MPID_Comm_get_ptr( MPI_COMM_SELF, comm_self_ptr ); + MPIR_Comm *comm_self_ptr; + MPIR_Comm_get_ptr( MPI_COMM_SELF, comm_self_ptr ); mpi_errno = MPIR_Comm_connect_impl(remote_port, NULL, 0, comm_self_ptr, &intercomm_ptr); if (mpi_errno) MPIR_ERR_POP(mpi_errno); } diff --git a/src/mpi/spawn/comm_spawn.c b/src/mpi/spawn/comm_spawn.c index bdf9732..fdeee37 100644 --- a/src/mpi/spawn/comm_spawn.c +++ b/src/mpi/spawn/comm_spawn.c @@ -66,7 +66,7 @@ int MPI_Comm_spawn(const char *command, char *argv[], int maxprocs, MPI_Info inf { static const char FCNAME[] = "MPI_Comm_spawn"; int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL, *intercomm_ptr; + MPIR_Comm *comm_ptr = NULL, *intercomm_ptr; MPID_Info *info_ptr=NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_SPAWN); @@ -87,7 +87,7 @@ int MPI_Comm_spawn(const char *command, char *argv[], int maxprocs, MPI_Info inf # endif /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -95,7 +95,7 @@ int MPI_Comm_spawn(const char *command, char *argv[], int maxprocs, MPI_Info inf MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); /* If comm_ptr is not valid, it will be reset to null */ if (mpi_errno) goto fn_fail; diff --git a/src/mpi/spawn/comm_spawn_multiple.c b/src/mpi/spawn/comm_spawn_multiple.c index 3321f77..feddb7f 100644 --- a/src/mpi/spawn/comm_spawn_multiple.c +++ b/src/mpi/spawn/comm_spawn_multiple.c @@ -70,8 +70,8 @@ int MPI_Comm_spawn_multiple(int count, char *array_of_commands[], { static const char FCNAME[] = "MPI_Comm_spawn_multiple"; int mpi_errno = MPI_SUCCESS, i; - MPID_Comm *comm_ptr = NULL; - MPID_Comm *intercomm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; + MPIR_Comm *intercomm_ptr = NULL; MPID_Info **array_of_info_ptrs = NULL; MPIU_CHKLMEM_DECL(1); MPID_MPI_STATE_DECL(MPID_STATE_MPI_COMM_SPAWN_MULTIPLE); @@ -93,7 +93,7 @@ int MPI_Comm_spawn_multiple(int count, char *array_of_commands[], # endif /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -101,7 +101,7 @@ int MPI_Comm_spawn_multiple(int count, char *array_of_commands[], MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); /* If comm_ptr is not valid, it will be reset to null */ if (mpi_errno) goto fn_fail; diff --git a/src/mpi/topo/cart_coords.c b/src/mpi/topo/cart_coords.c index 5ffbf3c..844161a 100644 --- a/src/mpi/topo/cart_coords.c +++ b/src/mpi/topo/cart_coords.c @@ -59,7 +59,7 @@ int MPI_Cart_coords(MPI_Comm comm, int rank, int maxdims, int coords[]) { static const char FCNAME[] = "MPI_Cart_coords"; int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPIR_Topology *cart_ptr; int i, nnodes; MPID_MPI_STATE_DECL(MPID_STATE_MPI_CART_COORDS); @@ -80,7 +80,7 @@ int MPI_Cart_coords(MPI_Comm comm, int rank, int maxdims, int coords[]) # endif /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -88,7 +88,7 @@ int MPI_Cart_coords(MPI_Comm comm, int rank, int maxdims, int coords[]) MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); /* If comm_ptr is not valid, it will be reset to null */ if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/topo/cart_create.c b/src/mpi/topo/cart_create.c index c5ecdbc..1f0c130 100644 --- a/src/mpi/topo/cart_create.c +++ b/src/mpi/topo/cart_create.c @@ -36,11 +36,11 @@ int MPI_Cart_create(MPI_Comm comm_old, int ndims, const int dims[], const int pe #define FUNCNAME MPIR_Cart_create #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Cart_create( MPID_Comm *comm_ptr, int ndims, const int dims[], +int MPIR_Cart_create( MPIR_Comm *comm_ptr, int ndims, const int dims[], const int periods[], int reorder, MPI_Comm *comm_cart ) { int i, newsize, rank, nranks, mpi_errno = MPI_SUCCESS; - MPID_Comm *newcomm_ptr = NULL; + MPIR_Comm *newcomm_ptr = NULL; MPIR_Topology *cart_ptr = NULL; MPIU_CHKPMEM_DECL(4); @@ -65,8 +65,8 @@ int MPIR_Cart_create( MPID_Comm *comm_ptr, int ndims, const int dims[], rank = comm_ptr->rank; if (rank == 0) { - MPID_Comm *comm_self_ptr; - MPID_Comm_get_ptr(MPI_COMM_SELF, comm_self_ptr); + MPIR_Comm *comm_self_ptr; + MPIR_Comm_get_ptr(MPI_COMM_SELF, comm_self_ptr); mpi_errno = MPIR_Comm_dup_impl(comm_self_ptr, &newcomm_ptr); if (mpi_errno) MPIR_ERR_POP(mpi_errno); @@ -113,7 +113,7 @@ int MPIR_Cart_create( MPID_Comm *comm_ptr, int ndims, const int dims[], if (mpi_errno) MPIR_ERR_POP(mpi_errno); } else { - mpi_errno = MPIR_Comm_copy( (MPID_Comm *)comm_ptr, newsize, + mpi_errno = MPIR_Comm_copy( (MPIR_Comm *)comm_ptr, newsize, &newcomm_ptr ); if (mpi_errno) MPIR_ERR_POP(mpi_errno); rank = comm_ptr->rank; @@ -172,7 +172,7 @@ int MPIR_Cart_create( MPID_Comm *comm_ptr, int ndims, const int dims[], #define FUNCNAME MPIR_Cart_create_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Cart_create_impl(MPID_Comm *comm_ptr, int ndims, const int dims[], +int MPIR_Cart_create_impl(MPIR_Comm *comm_ptr, int ndims, const int dims[], const int periods[], int reorder, MPI_Comm *comm_cart) { int mpi_errno = MPI_SUCCESS; @@ -240,7 +240,7 @@ int MPI_Cart_create(MPI_Comm comm_old, int ndims, const int dims[], const int periods[], int reorder, MPI_Comm *comm_cart) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_CART_CREATE); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -260,7 +260,7 @@ int MPI_Cart_create(MPI_Comm comm_old, int ndims, const int dims[], # endif /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm_old, comm_ptr ); + MPIR_Comm_get_ptr( comm_old, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -268,7 +268,7 @@ int MPI_Cart_create(MPI_Comm comm_old, int ndims, const int dims[], MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; /* If comm_ptr is not valid, it will be reset to null */ if (comm_ptr) { diff --git a/src/mpi/topo/cart_get.c b/src/mpi/topo/cart_get.c index bc2c8e4..6e7dabf 100644 --- a/src/mpi/topo/cart_get.c +++ b/src/mpi/topo/cart_get.c @@ -63,7 +63,7 @@ int MPI_Cart_get(MPI_Comm comm, int maxdims, int dims[], int periods[], { static const char FCNAME[] = "MPI_Cart_get"; int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPIR_Topology *cart_ptr; int i, n, *vals; MPID_MPI_STATE_DECL(MPID_STATE_MPI_CART_GET); @@ -84,7 +84,7 @@ int MPI_Cart_get(MPI_Comm comm, int maxdims, int dims[], int periods[], # endif /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -92,7 +92,7 @@ int MPI_Cart_get(MPI_Comm comm, int maxdims, int dims[], int periods[], MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); /* If comm_ptr is not valid, it will be reset to null */ if (mpi_errno) goto fn_fail; } diff --git a/src/mpi/topo/cart_map.c b/src/mpi/topo/cart_map.c index 29547e4..457afa6 100644 --- a/src/mpi/topo/cart_map.c +++ b/src/mpi/topo/cart_map.c @@ -30,7 +30,7 @@ int MPI_Cart_map(MPI_Comm comm, int ndims, const int dims[], const int periods[] #define FUNCNAME MPIR_Cart_map #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Cart_map( const MPID_Comm *comm_ptr, int ndims, const int dims[], +int MPIR_Cart_map( const MPIR_Comm *comm_ptr, int ndims, const int dims[], const int periodic[], int *newrank ) { int rank, nranks, i, size, mpi_errno = MPI_SUCCESS; @@ -70,7 +70,7 @@ int MPIR_Cart_map( const MPID_Comm *comm_ptr, int ndims, const int dims[], #define FUNCNAME MPIR_Cart_map_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Cart_map_impl(const MPID_Comm *comm_ptr, int ndims, const int dims[], +int MPIR_Cart_map_impl(const MPIR_Comm *comm_ptr, int ndims, const int dims[], const int periods[], int *newrank) { int mpi_errno = MPI_SUCCESS; @@ -131,7 +131,7 @@ int MPI_Cart_map(MPI_Comm comm, int ndims, const int dims[], const int periods[] int *newrank) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_CART_MAP); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -150,7 +150,7 @@ int MPI_Cart_map(MPI_Comm comm, int ndims, const int dims[], const int periods[] # endif /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -158,7 +158,7 @@ int MPI_Cart_map(MPI_Comm comm, int ndims, const int dims[], const int periods[] MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); if (mpi_errno) goto fn_fail; /* If comm_ptr is not valid, it will be reset to null */ MPIR_ERRTEST_ARGNULL(newrank,"newrank",mpi_errno); diff --git a/src/mpi/topo/cart_rank.c b/src/mpi/topo/cart_rank.c index bf67ba4..14cd85e 100644 --- a/src/mpi/topo/cart_rank.c +++ b/src/mpi/topo/cart_rank.c @@ -91,7 +91,7 @@ Notes: int MPI_Cart_rank(MPI_Comm comm, const int coords[], int *rank) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPIR_Topology *cart_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPI_CART_RANK); @@ -111,13 +111,13 @@ int MPI_Cart_rank(MPI_Comm comm, const int coords[], int *rank) # endif /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); if (mpi_errno) goto fn_fail; /* If comm_ptr is not valid, it will be reset to null */ MPIR_ERRTEST_ARGNULL(rank,"rank",mpi_errno); diff --git a/src/mpi/topo/cart_shift.c b/src/mpi/topo/cart_shift.c index c58eeb3..396da61 100644 --- a/src/mpi/topo/cart_shift.c +++ b/src/mpi/topo/cart_shift.c @@ -30,7 +30,7 @@ int MPI_Cart_shift(MPI_Comm comm, int direction, int disp, int *rank_source, int #define FUNCNAME MPIR_Cart_shift_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Cart_shift_impl(MPID_Comm *comm_ptr, int direction, int disp, int *rank_source, int *rank_dest) +int MPIR_Cart_shift_impl(MPIR_Comm *comm_ptr, int direction, int disp, int *rank_source, int *rank_dest) { int mpi_errno = MPI_SUCCESS; MPIR_Topology *cart_ptr; @@ -123,7 +123,7 @@ int MPI_Cart_shift(MPI_Comm comm, int direction, int disp, int *rank_source, int *rank_dest) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_CART_SHIFT); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -142,7 +142,7 @@ int MPI_Cart_shift(MPI_Comm comm, int direction, int disp, int *rank_source, # endif /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -150,7 +150,7 @@ int MPI_Cart_shift(MPI_Comm comm, int direction, int disp, int *rank_source, MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); if (mpi_errno) goto fn_fail; /* If comm_ptr is not valid, it will be reset to null */ diff --git a/src/mpi/topo/cart_sub.c b/src/mpi/topo/cart_sub.c index e6a4040..5002239 100644 --- a/src/mpi/topo/cart_sub.c +++ b/src/mpi/topo/cart_sub.c @@ -61,7 +61,7 @@ int MPI_Cart_sub(MPI_Comm comm, const int remain_dims[], MPI_Comm *newcomm) { int mpi_errno = MPI_SUCCESS, all_false; int ndims, key, color, ndims_in_subcomm, nnodes_in_subcomm, i, j, rank; - MPID_Comm *comm_ptr = NULL, *newcomm_ptr; + MPIR_Comm *comm_ptr = NULL, *newcomm_ptr; MPIR_Topology *topo_ptr, *toponew_ptr; MPIU_CHKPMEM_DECL(4); MPID_MPI_STATE_DECL(MPID_STATE_MPI_CART_SUB); @@ -83,7 +83,7 @@ int MPI_Cart_sub(MPI_Comm comm, const int remain_dims[], MPI_Comm *newcomm) # endif /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -91,7 +91,7 @@ int MPI_Cart_sub(MPI_Comm comm, const int remain_dims[], MPI_Comm *newcomm) MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); /* If comm_ptr is not valid, it will be reset to null */ if (mpi_errno) goto fn_fail; } diff --git a/src/mpi/topo/cartdim_get.c b/src/mpi/topo/cartdim_get.c index 201e6eb..51b437f 100644 --- a/src/mpi/topo/cartdim_get.c +++ b/src/mpi/topo/cartdim_get.c @@ -55,7 +55,7 @@ int MPI_Cartdim_get(MPI_Comm comm, int *ndims) { static const char FCNAME[] = "MPI_Cartdim_get"; int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPIR_Topology *cart_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPI_CARTDIM_GET); @@ -75,7 +75,7 @@ int MPI_Cartdim_get(MPI_Comm comm, int *ndims) # endif /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -84,7 +84,7 @@ int MPI_Cartdim_get(MPI_Comm comm, int *ndims) { MPIR_ERRTEST_ARGNULL(ndims,"ndims",mpi_errno); /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); /* If comm_ptr is not valid, it will be reset to null */ if (mpi_errno) goto fn_fail; } diff --git a/src/mpi/topo/dist_gr_create.c b/src/mpi/topo/dist_gr_create.c index 45053b5..914a305 100644 --- a/src/mpi/topo/dist_gr_create.c +++ b/src/mpi/topo/dist_gr_create.c @@ -73,8 +73,8 @@ int MPI_Dist_graph_create(MPI_Comm comm_old, int n, const int sources[], MPI_Info info, int reorder, MPI_Comm *comm_dist_graph) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; - MPID_Comm *comm_dist_graph_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; + MPIR_Comm *comm_dist_graph_ptr = NULL; MPID_Request **reqs = NULL; MPIR_Topology *topo_ptr = NULL; MPIR_Dist_graph_topology *dist_graph_ptr = NULL; @@ -116,7 +116,7 @@ int MPI_Dist_graph_create(MPI_Comm comm_old, int n, const int sources[], # endif /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr(comm_old, comm_ptr); + MPIR_Comm_get_ptr(comm_old, comm_ptr); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -124,7 +124,7 @@ int MPI_Dist_graph_create(MPI_Comm comm_old, int n, const int sources[], MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); /* If comm_ptr is not valid, it will be reset to null */ if (comm_ptr) { MPIR_ERRTEST_COMM_INTRA(comm_ptr, mpi_errno); diff --git a/src/mpi/topo/dist_gr_create_adj.c b/src/mpi/topo/dist_gr_create_adj.c index f761af0..d3e12a9 100644 --- a/src/mpi/topo/dist_gr_create_adj.c +++ b/src/mpi/topo/dist_gr_create_adj.c @@ -75,8 +75,8 @@ int MPI_Dist_graph_create_adjacent(MPI_Comm comm_old, MPI_Info info, int reorder, MPI_Comm *comm_dist_graph) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; - MPID_Comm *comm_dist_graph_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; + MPIR_Comm *comm_dist_graph_ptr = NULL; MPIR_Topology *topo_ptr = NULL; MPIR_Dist_graph_topology *dist_graph_ptr = NULL; MPIU_CHKPMEM_DECL(5); @@ -100,7 +100,7 @@ int MPI_Dist_graph_create_adjacent(MPI_Comm comm_old, # endif /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr(comm_old, comm_ptr); + MPIR_Comm_get_ptr(comm_old, comm_ptr); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -108,7 +108,7 @@ int MPI_Dist_graph_create_adjacent(MPI_Comm comm_old, MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; /* If comm_ptr is not valid, it will be reset to null */ if (comm_ptr) { diff --git a/src/mpi/topo/dist_gr_neighb.c b/src/mpi/topo/dist_gr_neighb.c index 01304ec..cf1a88a 100644 --- a/src/mpi/topo/dist_gr_neighb.c +++ b/src/mpi/topo/dist_gr_neighb.c @@ -33,7 +33,7 @@ int MPI_Dist_graph_neighbors(MPI_Comm comm, int maxindegree, int sources[], int #define FUNCNAME MPIR_Dist_graph_neighbors_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Dist_graph_neighbors_impl(MPID_Comm *comm_ptr, +int MPIR_Dist_graph_neighbors_impl(MPIR_Comm *comm_ptr, int maxindegree, int sources[], int sourceweights[], int maxoutdegree, int destinations[], int destweights[]) { @@ -91,7 +91,7 @@ int MPI_Dist_graph_neighbors(MPI_Comm comm, int maxoutdegree, int destinations[], int destweights[]) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_DIST_GRAPH_NEIGHBORS); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -112,7 +112,7 @@ int MPI_Dist_graph_neighbors(MPI_Comm comm, # endif /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr(comm, comm_ptr); + MPIR_Comm_get_ptr(comm, comm_ptr); /* Validate parameters */ # ifdef HAVE_ERROR_CHECKING diff --git a/src/mpi/topo/dist_gr_neighb_count.c b/src/mpi/topo/dist_gr_neighb_count.c index 239d59f..26daeca 100644 --- a/src/mpi/topo/dist_gr_neighb_count.c +++ b/src/mpi/topo/dist_gr_neighb_count.c @@ -32,7 +32,7 @@ int MPI_Dist_graph_neighbors_count(MPI_Comm comm, int *indegree, int *outdegree, #define FUNCNAME MPIR_Dist_graph_neighbors_count_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Dist_graph_neighbors_count_impl(MPID_Comm *comm_ptr, int *indegree, int *outdegree, int *weighted) +int MPIR_Dist_graph_neighbors_count_impl(MPIR_Comm *comm_ptr, int *indegree, int *outdegree, int *weighted) { int mpi_errno = MPI_SUCCESS; MPIR_Topology *topo_ptr = NULL; @@ -76,7 +76,7 @@ Output Parameters: int MPI_Dist_graph_neighbors_count(MPI_Comm comm, int *indegree, int *outdegree, int *weighted) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_DIST_GRAPH_NEIGHBORS_COUNT); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -97,14 +97,14 @@ int MPI_Dist_graph_neighbors_count(MPI_Comm comm, int *indegree, int *outdegree, # endif /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr(comm, comm_ptr); + MPIR_Comm_get_ptr(comm, comm_ptr); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS; { - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPIR_ERRTEST_ARGNULL(indegree, "indegree", mpi_errno); diff --git a/src/mpi/topo/graph_get.c b/src/mpi/topo/graph_get.c index a61e6bb..8d028be 100644 --- a/src/mpi/topo/graph_get.c +++ b/src/mpi/topo/graph_get.c @@ -60,7 +60,7 @@ int MPI_Graph_get(MPI_Comm comm, int maxindex, int maxedges, { static const char FCNAME[] = "MPI_Graph_get"; int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPIR_Topology *topo_ptr; int i, n, *vals; MPID_MPI_STATE_DECL(MPID_STATE_MPI_GRAPH_GET); @@ -81,7 +81,7 @@ int MPI_Graph_get(MPI_Comm comm, int maxindex, int maxedges, # endif /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -89,7 +89,7 @@ int MPI_Graph_get(MPI_Comm comm, int maxindex, int maxedges, MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); if (mpi_errno) goto fn_fail; /* If comm_ptr is not valid, it will be reset to null */ diff --git a/src/mpi/topo/graph_map.c b/src/mpi/topo/graph_map.c index 6f85545..89410e6 100644 --- a/src/mpi/topo/graph_map.c +++ b/src/mpi/topo/graph_map.c @@ -25,7 +25,7 @@ int MPI_Graph_map(MPI_Comm comm, int nnodes, const int indx[], const int edges[] #ifndef MPICH_MPI_FROM_PMPI #undef MPI_Graph_map #define MPI_Graph_map PMPI_Graph_map -int MPIR_Graph_map( const MPID_Comm *comm_ptr, int nnodes, +int MPIR_Graph_map( const MPIR_Comm *comm_ptr, int nnodes, const int indx[] ATTRIBUTE((unused)), const int edges[] ATTRIBUTE((unused)), int *newrank ) { @@ -46,7 +46,7 @@ int MPIR_Graph_map( const MPID_Comm *comm_ptr, int nnodes, #define FUNCNAME MPIR_Graph_map_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Graph_map_impl(const MPID_Comm *comm_ptr, int nnodes, +int MPIR_Graph_map_impl(const MPIR_Comm *comm_ptr, int nnodes, const int indx[], const int edges[], int *newrank) { int mpi_errno = MPI_SUCCESS; @@ -105,7 +105,7 @@ int MPI_Graph_map(MPI_Comm comm, int nnodes, const int indx[], const int edges[] int *newrank) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_GRAPH_MAP); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -124,7 +124,7 @@ int MPI_Graph_map(MPI_Comm comm, int nnodes, const int indx[], const int edges[] # endif /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -132,7 +132,7 @@ int MPI_Graph_map(MPI_Comm comm, int nnodes, const int indx[], const int edges[] MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno) goto fn_fail; /* If comm_ptr is not valid, it will be reset to null */ MPIR_ERRTEST_ARGNULL(newrank,"newrank",mpi_errno); diff --git a/src/mpi/topo/graph_nbr.c b/src/mpi/topo/graph_nbr.c index 83229cb..46e17fd 100644 --- a/src/mpi/topo/graph_nbr.c +++ b/src/mpi/topo/graph_nbr.c @@ -32,7 +32,7 @@ int MPI_Graph_neighbors(MPI_Comm comm, int rank, int maxneighbors, int neighbors #define FUNCNAME MPIR_Graph_neighbors_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Graph_neighbors_impl(MPID_Comm *comm_ptr, int rank, int maxneighbors, int neighbors[]) +int MPIR_Graph_neighbors_impl(MPIR_Comm *comm_ptr, int rank, int maxneighbors, int neighbors[]) { int mpi_errno = MPI_SUCCESS; MPIR_Topology *graph_ptr; @@ -93,7 +93,7 @@ int MPI_Graph_neighbors(MPI_Comm comm, int rank, int maxneighbors, int neighbors[]) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_GRAPH_NEIGHBORS); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -112,7 +112,7 @@ int MPI_Graph_neighbors(MPI_Comm comm, int rank, int maxneighbors, # endif /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -120,7 +120,7 @@ int MPI_Graph_neighbors(MPI_Comm comm, int rank, int maxneighbors, MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno) goto fn_fail; /* If comm_ptr is not valid, it will be reset to null */ MPIR_ERRTEST_ARGNULL(neighbors,"neighbors",mpi_errno); diff --git a/src/mpi/topo/graphcreate.c b/src/mpi/topo/graphcreate.c index 94492d5..5d86fd0 100644 --- a/src/mpi/topo/graphcreate.c +++ b/src/mpi/topo/graphcreate.c @@ -42,13 +42,13 @@ int MPI_Graph_create(MPI_Comm comm_old, int nnodes, const int indx[], const int #define FUNCNAME MPIR_Graph_create #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Graph_create( MPID_Comm *comm_ptr, int nnodes, +int MPIR_Graph_create( MPIR_Comm *comm_ptr, int nnodes, const int indx[], const int edges[], int reorder, MPI_Comm *comm_graph) { int mpi_errno = MPI_SUCCESS; int i, nedges; - MPID_Comm *newcomm_ptr = NULL; + MPIR_Comm *newcomm_ptr = NULL; MPIR_Topology *graph_ptr = NULL; MPIU_CHKPMEM_DECL(3); @@ -72,7 +72,7 @@ int MPIR_Graph_create( MPID_Comm *comm_ptr, int nnodes, if (mpi_errno) MPIR_ERR_POP(mpi_errno); } else { /* Just use the first nnodes processes in the communicator */ - mpi_errno = MPIR_Comm_copy( (MPID_Comm *)comm_ptr, nnodes, + mpi_errno = MPIR_Comm_copy( (MPIR_Comm *)comm_ptr, nnodes, &newcomm_ptr ); if (mpi_errno) MPIR_ERR_POP(mpi_errno); } @@ -126,7 +126,7 @@ int MPIR_Graph_create( MPID_Comm *comm_ptr, int nnodes, edges, reorder, comm_graph); } # endif - mpi_errno = MPIR_Err_return_comm( (MPID_Comm*)comm_ptr, FCNAME, mpi_errno ); + mpi_errno = MPIR_Err_return_comm( (MPIR_Comm*)comm_ptr, FCNAME, mpi_errno ); goto fn_exit; /* --END ERROR HANDLING-- */ } @@ -172,7 +172,7 @@ int MPI_Graph_create(MPI_Comm comm_old, int nnodes, const int indx[], const int edges[], int reorder, MPI_Comm *comm_graph) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_GRAPH_CREATE); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -192,7 +192,7 @@ int MPI_Graph_create(MPI_Comm comm_old, int nnodes, const int indx[], # endif /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm_old, comm_ptr ); + MPIR_Comm_get_ptr( comm_old, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -200,7 +200,7 @@ int MPI_Graph_create(MPI_Comm comm_old, int nnodes, const int indx[], MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno) goto fn_fail; /* If comm_ptr is not valid, it will be reset to null */ if (comm_ptr) { diff --git a/src/mpi/topo/graphdimsget.c b/src/mpi/topo/graphdimsget.c index 2a84b86..db02477 100644 --- a/src/mpi/topo/graphdimsget.c +++ b/src/mpi/topo/graphdimsget.c @@ -57,7 +57,7 @@ int MPI_Graphdims_get(MPI_Comm comm, int *nnodes, int *nedges) { static const char FCNAME[] = "MPI_Graphdims_get"; int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPIR_Topology *topo_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPI_GRAPHDIMS_GET); @@ -77,7 +77,7 @@ int MPI_Graphdims_get(MPI_Comm comm, int *nnodes, int *nedges) # endif /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -85,7 +85,7 @@ int MPI_Graphdims_get(MPI_Comm comm, int *nnodes, int *nedges) MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); if (mpi_errno) goto fn_fail; /* If comm_ptr is not valid, it will be reset to null */ MPIR_ERRTEST_ARGNULL(nnodes, "nnodes", mpi_errno ); diff --git a/src/mpi/topo/graphnbrcnt.c b/src/mpi/topo/graphnbrcnt.c index 8d1014d..a195fe3 100644 --- a/src/mpi/topo/graphnbrcnt.c +++ b/src/mpi/topo/graphnbrcnt.c @@ -30,7 +30,7 @@ int MPI_Graph_neighbors_count(MPI_Comm comm, int rank, int *nneighbors) __attrib #define FUNCNAME MPIR_Graph_neighbors_count_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Graph_neighbors_count_impl(MPID_Comm *comm_ptr, int rank, int *nneighbors) +int MPIR_Graph_neighbors_count_impl(MPIR_Comm *comm_ptr, int rank, int *nneighbors) { int mpi_errno = MPI_SUCCESS; MPIR_Topology *graph_ptr; @@ -85,7 +85,7 @@ Output Parameters: int MPI_Graph_neighbors_count(MPI_Comm comm, int rank, int *nneighbors) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_GRAPH_NEIGHBORS_COUNT); MPIR_ERRTEST_INITIALIZED_ORDIE(); @@ -104,7 +104,7 @@ int MPI_Graph_neighbors_count(MPI_Comm comm, int rank, int *nneighbors) # endif /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -112,7 +112,7 @@ int MPI_Graph_neighbors_count(MPI_Comm comm, int rank, int *nneighbors) MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); if (mpi_errno) goto fn_fail; MPIR_ERRTEST_ARGNULL(nneighbors, "nneighbors", mpi_errno); /* If comm_ptr is not value, it will be reset to null */ diff --git a/src/mpi/topo/inhb_allgather.c b/src/mpi/topo/inhb_allgather.c index 91b0d3d..8d2b30e 100644 --- a/src/mpi/topo/inhb_allgather.c +++ b/src/mpi/topo/inhb_allgather.c @@ -34,7 +34,7 @@ int MPI_Ineighbor_allgather(const void *sendbuf, int sendcount, MPI_Datatype sen #define FUNCNAME MPIR_Ineighbor_allgather_default #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Ineighbor_allgather_default(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPID_Sched_t s) +int MPIR_Ineighbor_allgather_default(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; int indegree, outdegree, weighted; @@ -82,7 +82,7 @@ fn_fail: #define FUNCNAME MPIR_Ineighbor_allgather_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Ineighbor_allgather_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPI_Request *request) +int MPIR_Ineighbor_allgather_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; int tag = -1; @@ -143,7 +143,7 @@ Output Parameters: int MPI_Ineighbor_allgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_INEIGHBOR_ALLGATHER); MPID_THREAD_CS_ENTER(GLOBAL, MPIR_THREAD_GLOBAL_ALLFUNC_MUTEX); @@ -165,7 +165,7 @@ int MPI_Ineighbor_allgather(const void *sendbuf, int sendcount, MPI_Datatype sen # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr(comm, comm_ptr); + MPIR_Comm_get_ptr(comm, comm_ptr); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -190,7 +190,7 @@ int MPI_Ineighbor_allgather(const void *sendbuf, int sendcount, MPI_Datatype sen if (mpi_errno != MPI_SUCCESS) goto fn_fail; } - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPIR_ERRTEST_ARGNULL(request, "request", mpi_errno); /* TODO more checks may be appropriate (counts, in_place, buffer aliasing, etc) */ diff --git a/src/mpi/topo/inhb_allgatherv.c b/src/mpi/topo/inhb_allgatherv.c index 9c58695..8bb795f 100644 --- a/src/mpi/topo/inhb_allgatherv.c +++ b/src/mpi/topo/inhb_allgatherv.c @@ -34,7 +34,7 @@ int MPI_Ineighbor_allgatherv(const void *sendbuf, int sendcount, MPI_Datatype se #define FUNCNAME MPIR_Ineighbor_allgatherv_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Ineighbor_allgatherv_default(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int displs[], MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPID_Sched_t s) +int MPIR_Ineighbor_allgatherv_default(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int displs[], MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; int indegree, outdegree, weighted; @@ -86,7 +86,7 @@ fn_fail: #define FUNCNAME MPIR_Ineighbor_allgatherv_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Ineighbor_allgatherv_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int displs[], MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPI_Request *request) +int MPIR_Ineighbor_allgatherv_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int displs[], MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; int tag = -1; @@ -148,7 +148,7 @@ Output Parameters: int MPI_Ineighbor_allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int displs[], MPI_Datatype recvtype, MPI_Comm comm, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_INEIGHBOR_ALLGATHERV); MPID_THREAD_CS_ENTER(GLOBAL, MPIR_THREAD_GLOBAL_ALLFUNC_MUTEX); @@ -170,7 +170,7 @@ int MPI_Ineighbor_allgatherv(const void *sendbuf, int sendcount, MPI_Datatype se # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr(comm, comm_ptr); + MPIR_Comm_get_ptr(comm, comm_ptr); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -195,7 +195,7 @@ int MPI_Ineighbor_allgatherv(const void *sendbuf, int sendcount, MPI_Datatype se if (mpi_errno != MPI_SUCCESS) goto fn_fail; } - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPIR_ERRTEST_ARGNULL(request, "request", mpi_errno); diff --git a/src/mpi/topo/inhb_alltoall.c b/src/mpi/topo/inhb_alltoall.c index 109ff7b..1a7e708 100644 --- a/src/mpi/topo/inhb_alltoall.c +++ b/src/mpi/topo/inhb_alltoall.c @@ -34,7 +34,7 @@ int MPI_Ineighbor_alltoall(const void *sendbuf, int sendcount, MPI_Datatype send #define FUNCNAME MPIR_Ineighbor_alltoall_default #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Ineighbor_alltoall_default(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPID_Sched_t s) +int MPIR_Ineighbor_alltoall_default(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; int indegree, outdegree, weighted; @@ -87,7 +87,7 @@ fn_fail: #define FUNCNAME MPIR_Ineighbor_alltoall_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Ineighbor_alltoall_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPI_Request *request) +int MPIR_Ineighbor_alltoall_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; int tag = -1; @@ -149,7 +149,7 @@ Output Parameters: int MPI_Ineighbor_alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_INEIGHBOR_ALLTOALL); MPID_THREAD_CS_ENTER(GLOBAL, MPIR_THREAD_GLOBAL_ALLFUNC_MUTEX); @@ -171,7 +171,7 @@ int MPI_Ineighbor_alltoall(const void *sendbuf, int sendcount, MPI_Datatype send # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr(comm, comm_ptr); + MPIR_Comm_get_ptr(comm, comm_ptr); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -196,7 +196,7 @@ int MPI_Ineighbor_alltoall(const void *sendbuf, int sendcount, MPI_Datatype send if (mpi_errno != MPI_SUCCESS) goto fn_fail; } - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); if (mpi_errno != MPI_SUCCESS) goto fn_fail; MPIR_ERRTEST_ARGNULL(request, "request", mpi_errno); /* TODO more checks may be appropriate (counts, in_place, buffer aliasing, etc) */ diff --git a/src/mpi/topo/inhb_alltoallv.c b/src/mpi/topo/inhb_alltoallv.c index 93370c0..4ff4477 100644 --- a/src/mpi/topo/inhb_alltoallv.c +++ b/src/mpi/topo/inhb_alltoallv.c @@ -35,7 +35,7 @@ int MPI_Ineighbor_alltoallv(const void *sendbuf, const int sendcounts[], const i #define FUNCNAME MPIR_Ineighbor_alltoallv_default #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Ineighbor_alltoallv_default(const void *sendbuf, const int sendcounts[], const int sdispls[], MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int rdispls[], MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPID_Sched_t s) +int MPIR_Ineighbor_alltoallv_default(const void *sendbuf, const int sendcounts[], const int sdispls[], MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int rdispls[], MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; int indegree, outdegree, weighted; @@ -91,7 +91,7 @@ fn_fail: #define FUNCNAME MPIR_Ineighbor_alltoallv_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Ineighbor_alltoallv_impl(const void *sendbuf, const int sendcounts[], const int sdispls[], MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int rdispls[], MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPI_Request *request) +int MPIR_Ineighbor_alltoallv_impl(const void *sendbuf, const int sendcounts[], const int sdispls[], MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int rdispls[], MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; int tag = -1; @@ -154,7 +154,7 @@ Output Parameters: int MPI_Ineighbor_alltoallv(const void *sendbuf, const int sendcounts[], const int sdispls[], MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int rdispls[], MPI_Datatype recvtype, MPI_Comm comm, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_INEIGHBOR_ALLTOALLV); MPID_THREAD_CS_ENTER(GLOBAL, MPIR_THREAD_GLOBAL_ALLFUNC_MUTEX); @@ -176,7 +176,7 @@ int MPI_Ineighbor_alltoallv(const void *sendbuf, const int sendcounts[], const i # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr(comm, comm_ptr); + MPIR_Comm_get_ptr(comm, comm_ptr); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -201,7 +201,7 @@ int MPI_Ineighbor_alltoallv(const void *sendbuf, const int sendcounts[], const i if (mpi_errno != MPI_SUCCESS) goto fn_fail; } - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); MPIR_ERRTEST_ARGNULL(request, "request", mpi_errno); /* TODO more checks may be appropriate (counts, in_place, buffer aliasing, etc) */ } diff --git a/src/mpi/topo/inhb_alltoallw.c b/src/mpi/topo/inhb_alltoallw.c index 8b3085b..c7be13d 100644 --- a/src/mpi/topo/inhb_alltoallw.c +++ b/src/mpi/topo/inhb_alltoallw.c @@ -34,7 +34,7 @@ int MPI_Ineighbor_alltoallw(const void *sendbuf, const int sendcounts[], #define FUNCNAME MPIR_Ineighbor_alltoallw_default #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Ineighbor_alltoallw_default(const void *sendbuf, const int sendcounts[], const MPI_Aint sdispls[], const MPI_Datatype sendtypes[], void *recvbuf, const int recvcounts[], const MPI_Aint rdispls[], const MPI_Datatype recvtypes[], MPID_Comm *comm_ptr, MPID_Sched_t s) +int MPIR_Ineighbor_alltoallw_default(const void *sendbuf, const int sendcounts[], const MPI_Aint sdispls[], const MPI_Datatype sendtypes[], void *recvbuf, const int recvcounts[], const MPI_Aint rdispls[], const MPI_Datatype recvtypes[], MPIR_Comm *comm_ptr, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; int indegree, outdegree, weighted; @@ -82,7 +82,7 @@ fn_fail: #define FUNCNAME MPIR_Ineighbor_alltoallw_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Ineighbor_alltoallw_impl(const void *sendbuf, const int sendcounts[], const MPI_Aint sdispls[], const MPI_Datatype sendtypes[], void *recvbuf, const int recvcounts[], const MPI_Aint rdispls[], const MPI_Datatype recvtypes[], MPID_Comm *comm_ptr, MPI_Request *request) +int MPIR_Ineighbor_alltoallw_impl(const void *sendbuf, const int sendcounts[], const MPI_Aint sdispls[], const MPI_Datatype sendtypes[], void *recvbuf, const int recvcounts[], const MPI_Aint rdispls[], const MPI_Datatype recvtypes[], MPIR_Comm *comm_ptr, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; int tag = -1; @@ -145,7 +145,7 @@ Output Parameters: int MPI_Ineighbor_alltoallw(const void *sendbuf, const int sendcounts[], const MPI_Aint sdispls[], const MPI_Datatype sendtypes[], void *recvbuf, const int recvcounts[], const MPI_Aint rdispls[], const MPI_Datatype recvtypes[], MPI_Comm comm, MPI_Request *request) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_INEIGHBOR_ALLTOALLW); MPID_THREAD_CS_ENTER(GLOBAL, MPIR_THREAD_GLOBAL_ALLFUNC_MUTEX); @@ -166,14 +166,14 @@ int MPI_Ineighbor_alltoallw(const void *sendbuf, const int sendcounts[], const M # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr(comm, comm_ptr); + MPIR_Comm_get_ptr(comm, comm_ptr); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS { - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); MPIR_ERRTEST_ARGNULL(request, "request", mpi_errno); /* TODO more checks may be appropriate (counts, in_place, buffer aliasing, etc) */ if (mpi_errno != MPI_SUCCESS) goto fn_fail; diff --git a/src/mpi/topo/nhb_allgather.c b/src/mpi/topo/nhb_allgather.c index 2af50a2..6b16711 100644 --- a/src/mpi/topo/nhb_allgather.c +++ b/src/mpi/topo/nhb_allgather.c @@ -32,7 +32,7 @@ int MPI_Neighbor_allgather(const void *sendbuf, int sendcount, MPI_Datatype send #define FUNCNAME MPIR_Neighbor_allgather_default #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Neighbor_allgather_default(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr) +int MPIR_Neighbor_allgather_default(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr) { int mpi_errno = MPI_SUCCESS; MPI_Request req; @@ -53,7 +53,7 @@ fn_fail: #define FUNCNAME MPIR_Neighbor_allgather_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Neighbor_allgather_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr) +int MPIR_Neighbor_allgather_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr) { int mpi_errno = MPI_SUCCESS; @@ -103,7 +103,7 @@ Output Parameters: int MPI_Neighbor_allgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_NEIGHBOR_ALLGATHER); MPID_THREAD_CS_ENTER(GLOBAL, MPIR_THREAD_GLOBAL_ALLFUNC_MUTEX); @@ -125,7 +125,7 @@ int MPI_Neighbor_allgather(const void *sendbuf, int sendcount, MPI_Datatype send # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr(comm, comm_ptr); + MPIR_Comm_get_ptr(comm, comm_ptr); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -146,7 +146,7 @@ int MPI_Neighbor_allgather(const void *sendbuf, int sendcount, MPI_Datatype send MPID_Datatype_committed_ptr(recvtype_ptr, mpi_errno); } - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); /* TODO more checks may be appropriate (counts, in_place, buffer aliasing, etc) */ if (mpi_errno != MPI_SUCCESS) goto fn_fail; } diff --git a/src/mpi/topo/nhb_allgatherv.c b/src/mpi/topo/nhb_allgatherv.c index 9288623..d3ae882 100644 --- a/src/mpi/topo/nhb_allgatherv.c +++ b/src/mpi/topo/nhb_allgatherv.c @@ -33,7 +33,7 @@ int MPI_Neighbor_allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sen #define FUNCNAME MPIR_Neighbor_allgatherv_default #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Neighbor_allgatherv_default(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int displs[], MPI_Datatype recvtype, MPID_Comm *comm_ptr) +int MPIR_Neighbor_allgatherv_default(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int displs[], MPI_Datatype recvtype, MPIR_Comm *comm_ptr) { int mpi_errno = MPI_SUCCESS; @@ -57,7 +57,7 @@ fn_fail: #define FUNCNAME MPIR_Neighbor_allgatherv_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Neighbor_allgatherv_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int displs[], MPI_Datatype recvtype, MPID_Comm *comm_ptr) +int MPIR_Neighbor_allgatherv_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int displs[], MPI_Datatype recvtype, MPIR_Comm *comm_ptr) { int mpi_errno = MPI_SUCCESS; @@ -104,7 +104,7 @@ Output Parameters: int MPI_Neighbor_allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int displs[], MPI_Datatype recvtype, MPI_Comm comm) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_NEIGHBOR_ALLGATHERV); MPID_THREAD_CS_ENTER(GLOBAL, MPIR_THREAD_GLOBAL_ALLFUNC_MUTEX); @@ -126,7 +126,7 @@ int MPI_Neighbor_allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sen # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr(comm, comm_ptr); + MPIR_Comm_get_ptr(comm, comm_ptr); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -147,7 +147,7 @@ int MPI_Neighbor_allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sen MPID_Datatype_committed_ptr(recvtype_ptr, mpi_errno); } - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); /* TODO more checks may be appropriate (counts, in_place, buffer aliasing, etc) */ if (mpi_errno != MPI_SUCCESS) goto fn_fail; } diff --git a/src/mpi/topo/nhb_alltoall.c b/src/mpi/topo/nhb_alltoall.c index 0784722..47ecd3b 100644 --- a/src/mpi/topo/nhb_alltoall.c +++ b/src/mpi/topo/nhb_alltoall.c @@ -32,7 +32,7 @@ int MPI_Neighbor_alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendt #define FUNCNAME MPIR_Neighbor_alltoall_default #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Neighbor_alltoall_default(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr) +int MPIR_Neighbor_alltoall_default(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr) { int mpi_errno = MPI_SUCCESS; MPI_Request req; @@ -55,7 +55,7 @@ fn_fail: #define FUNCNAME MPIR_Neighbor_alltoall_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Neighbor_alltoall_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr) +int MPIR_Neighbor_alltoall_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr) { int mpi_errno = MPI_SUCCESS; @@ -107,7 +107,7 @@ Output Parameters: int MPI_Neighbor_alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_NEIGHBOR_ALLTOALL); MPID_THREAD_CS_ENTER(GLOBAL, MPIR_THREAD_GLOBAL_ALLFUNC_MUTEX); @@ -129,7 +129,7 @@ int MPI_Neighbor_alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendt # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr(comm, comm_ptr); + MPIR_Comm_get_ptr(comm, comm_ptr); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -150,7 +150,7 @@ int MPI_Neighbor_alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendt MPID_Datatype_committed_ptr(recvtype_ptr, mpi_errno); } - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); /* TODO more checks may be appropriate (counts, in_place, buffer aliasing, etc) */ if (mpi_errno != MPI_SUCCESS) goto fn_fail; } diff --git a/src/mpi/topo/nhb_alltoallv.c b/src/mpi/topo/nhb_alltoallv.c index 5a998ba..b30cf8d 100644 --- a/src/mpi/topo/nhb_alltoallv.c +++ b/src/mpi/topo/nhb_alltoallv.c @@ -33,7 +33,7 @@ int MPI_Neighbor_alltoallv(const void *sendbuf, const int sendcounts[], const in #define FUNCNAME MPIR_Neighbor_alltoallv_default #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Neighbor_alltoallv_default(const void *sendbuf, const int sendcounts[], const int sdispls[], MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int rdispls[], MPI_Datatype recvtype, MPID_Comm *comm_ptr) +int MPIR_Neighbor_alltoallv_default(const void *sendbuf, const int sendcounts[], const int sdispls[], MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int rdispls[], MPI_Datatype recvtype, MPIR_Comm *comm_ptr) { int mpi_errno = MPI_SUCCESS; MPI_Request req; @@ -54,7 +54,7 @@ fn_fail: #define FUNCNAME MPIR_Neighbor_alltoallv_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Neighbor_alltoallv_impl(const void *sendbuf, const int sendcounts[], const int sdispls[], MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int rdispls[], MPI_Datatype recvtype, MPID_Comm *comm_ptr) +int MPIR_Neighbor_alltoallv_impl(const void *sendbuf, const int sendcounts[], const int sdispls[], MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int rdispls[], MPI_Datatype recvtype, MPIR_Comm *comm_ptr) { int mpi_errno = MPI_SUCCESS; @@ -102,7 +102,7 @@ Output Parameters: int MPI_Neighbor_alltoallv(const void *sendbuf, const int sendcounts[], const int sdispls[], MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int rdispls[], MPI_Datatype recvtype, MPI_Comm comm) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_NEIGHBOR_ALLTOALLV); MPID_THREAD_CS_ENTER(GLOBAL, MPIR_THREAD_GLOBAL_ALLFUNC_MUTEX); @@ -124,7 +124,7 @@ int MPI_Neighbor_alltoallv(const void *sendbuf, const int sendcounts[], const in # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr(comm, comm_ptr); + MPIR_Comm_get_ptr(comm, comm_ptr); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -145,7 +145,7 @@ int MPI_Neighbor_alltoallv(const void *sendbuf, const int sendcounts[], const in MPID_Datatype_committed_ptr(recvtype_ptr, mpi_errno); } - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); /* TODO more checks may be appropriate (counts, in_place, buffer aliasing, etc) */ if (mpi_errno != MPI_SUCCESS) goto fn_fail; } diff --git a/src/mpi/topo/nhb_alltoallw.c b/src/mpi/topo/nhb_alltoallw.c index 282f637..d8a5614 100644 --- a/src/mpi/topo/nhb_alltoallw.c +++ b/src/mpi/topo/nhb_alltoallw.c @@ -32,7 +32,7 @@ int MPI_Neighbor_alltoallw(const void *sendbuf, const int sendcounts[], const MP #define FUNCNAME MPIR_Neighbor_alltoallw_default #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Neighbor_alltoallw_default(const void *sendbuf, const int sendcounts[], const MPI_Aint sdispls[], const MPI_Datatype sendtypes[], void *recvbuf, const int recvcounts[], const MPI_Aint rdispls[], const MPI_Datatype recvtypes[], MPID_Comm *comm_ptr) +int MPIR_Neighbor_alltoallw_default(const void *sendbuf, const int sendcounts[], const MPI_Aint sdispls[], const MPI_Datatype sendtypes[], void *recvbuf, const int recvcounts[], const MPI_Aint rdispls[], const MPI_Datatype recvtypes[], MPIR_Comm *comm_ptr) { int mpi_errno = MPI_SUCCESS; MPI_Request req; @@ -53,7 +53,7 @@ fn_fail: #define FUNCNAME MPIR_Neighbor_alltoallw_impl #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Neighbor_alltoallw_impl(const void *sendbuf, const int sendcounts[], const MPI_Aint sdispls[], const MPI_Datatype sendtypes[], void *recvbuf, const int recvcounts[], const MPI_Aint rdispls[], const MPI_Datatype recvtypes[], MPID_Comm *comm_ptr) +int MPIR_Neighbor_alltoallw_impl(const void *sendbuf, const int sendcounts[], const MPI_Aint sdispls[], const MPI_Datatype sendtypes[], void *recvbuf, const int recvcounts[], const MPI_Aint rdispls[], const MPI_Datatype recvtypes[], MPIR_Comm *comm_ptr) { int mpi_errno = MPI_SUCCESS; @@ -102,7 +102,7 @@ Output Parameters: int MPI_Neighbor_alltoallw(const void *sendbuf, const int sendcounts[], const MPI_Aint sdispls[], const MPI_Datatype sendtypes[], void *recvbuf, const int recvcounts[], const MPI_Aint rdispls[], const MPI_Datatype recvtypes[], MPI_Comm comm) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPID_MPI_STATE_DECL(MPID_STATE_MPI_NEIGHBOR_ALLTOALLW); MPID_THREAD_CS_ENTER(GLOBAL, MPIR_THREAD_GLOBAL_ALLFUNC_MUTEX); @@ -123,14 +123,14 @@ int MPI_Neighbor_alltoallw(const void *sendbuf, const int sendcounts[], const MP # endif /* HAVE_ERROR_CHECKING */ /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr(comm, comm_ptr); + MPIR_Comm_get_ptr(comm, comm_ptr); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING { MPID_BEGIN_ERROR_CHECKS { - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, FALSE ); /* TODO more checks may be appropriate (counts, in_place, buffer aliasing, etc) */ if (mpi_errno != MPI_SUCCESS) goto fn_fail; } diff --git a/src/mpi/topo/topo.h b/src/mpi/topo/topo.h index 12cc607..d2d851d 100644 --- a/src/mpi/topo/topo.h +++ b/src/mpi/topo/topo.h @@ -39,28 +39,28 @@ typedef struct MPIR_Topology { } topo; } MPIR_Topology; -MPIR_Topology *MPIR_Topology_get( MPID_Comm * ); -int MPIR_Topology_put( MPID_Comm *, MPIR_Topology * ); -int MPIR_Cart_create( MPID_Comm *, int, const int [], +MPIR_Topology *MPIR_Topology_get( MPIR_Comm * ); +int MPIR_Topology_put( MPIR_Comm *, MPIR_Topology * ); +int MPIR_Cart_create( MPIR_Comm *, int, const int [], const int [], int, MPI_Comm * ); -int MPIR_Graph_create( MPID_Comm *, int, +int MPIR_Graph_create( MPIR_Comm *, int, const int[], const int[], int, MPI_Comm *); int MPIR_Dims_create( int, int, int * ); -int MPIR_Graph_map( const MPID_Comm *, int, const int[], const int[], int* ); -int MPIR_Cart_map( const MPID_Comm *, int, const int[], const int[], int* ); +int MPIR_Graph_map( const MPIR_Comm *, int, const int[], const int[], int* ); +int MPIR_Cart_map( const MPIR_Comm *, int, const int[], const int[], int* ); /* Returns the canonicalized count of neighbors for the given topology as though * MPI_Dist_graph_neighbors_count were called with a distributed graph topology, * even if the given topology is actually Cartesian or Graph. Useful for * implementing neighborhood collective operations. */ -int MPIR_Topo_canon_nhb_count(MPID_Comm *comm_ptr, int *indegree, int *outdegree, int *weighted); +int MPIR_Topo_canon_nhb_count(MPIR_Comm *comm_ptr, int *indegree, int *outdegree, int *weighted); /* Returns the canonicalized list of neighbors for a given topology, separated * into inbound and outbound edges. Equivalent to MPI_Dist_graph_neighbors but * works for any topology type by canonicalizing according to the rules in * Section 7.6 of the MPI-3.0 standard. */ -int MPIR_Topo_canon_nhb(MPID_Comm *comm_ptr, +int MPIR_Topo_canon_nhb(MPIR_Comm *comm_ptr, int indegree, int sources[], int inweights[], int outdegree, int dests[], int outweights[]); diff --git a/src/mpi/topo/topo_test.c b/src/mpi/topo/topo_test.c index 62dbb5d..83e78c5 100644 --- a/src/mpi/topo/topo_test.c +++ b/src/mpi/topo/topo_test.c @@ -60,7 +60,7 @@ int MPI_Topo_test(MPI_Comm comm, int *status) static const char FCNAME[] = "MPI_Topo_test"; #endif int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPIR_Topology *topo_ptr; MPID_MPI_STATE_DECL(MPID_STATE_MPI_TOPO_TEST); @@ -80,7 +80,7 @@ int MPI_Topo_test(MPI_Comm comm, int *status) # endif /* Convert MPI object handles to object pointers */ - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); /* Validate parameters and objects (post conversion) */ # ifdef HAVE_ERROR_CHECKING @@ -88,7 +88,7 @@ int MPI_Topo_test(MPI_Comm comm, int *status) MPID_BEGIN_ERROR_CHECKS; { /* Validate comm_ptr */ - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); if (mpi_errno) goto fn_fail; /* If comm_ptr is not valid, it will be reset to null */ MPIR_ERRTEST_ARGNULL(status, "status", mpi_errno); diff --git a/src/mpi/topo/topoutil.c b/src/mpi/topo/topoutil.c index 9bb2638..a94be22 100644 --- a/src/mpi/topo/topoutil.c +++ b/src/mpi/topo/topoutil.c @@ -26,7 +26,7 @@ static int MPIR_Topology_finalize ( void * ); Return a poiner to the topology structure on a communicator. Returns null if no topology structure is defined */ -MPIR_Topology *MPIR_Topology_get( MPID_Comm *comm_ptr ) +MPIR_Topology *MPIR_Topology_get( MPIR_Comm *comm_ptr ) { int mpi_errno = MPI_SUCCESS; MPIR_Topology *topo_ptr; @@ -49,7 +49,7 @@ MPIR_Topology *MPIR_Topology_get( MPID_Comm *comm_ptr ) #define FUNCNAME MPIR_Topology_put #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Topology_put( MPID_Comm *comm_ptr, MPIR_Topology *topo_ptr ) +int MPIR_Topology_put( MPIR_Comm *comm_ptr, MPIR_Topology *topo_ptr ) { int mpi_errno = MPI_SUCCESS; @@ -274,7 +274,7 @@ static int MPIR_Topology_delete_fn ( MPI_Comm comm ATTRIBUTE((unused)), #define FUNCNAME MPIR_Topo_canon_nhb_count #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Topo_canon_nhb_count(MPID_Comm *comm_ptr, int *indegree, int *outdegree, int *weighted) +int MPIR_Topo_canon_nhb_count(MPIR_Comm *comm_ptr, int *indegree, int *outdegree, int *weighted) { int mpi_errno = MPI_SUCCESS; MPIR_Topology *topo_ptr; @@ -312,7 +312,7 @@ fn_fail: #define FUNCNAME MPIR_Topo_canon_nhb #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIR_Topo_canon_nhb(MPID_Comm *comm_ptr, +int MPIR_Topo_canon_nhb(MPIR_Comm *comm_ptr, int indegree, int sources[], int inweights[], int outdegree, int dests[], int outweights[]) { diff --git a/src/mpid/ch3/channels/nemesis/include/mpid_nem_impl.h b/src/mpid/ch3/channels/nemesis/include/mpid_nem_impl.h index 0b64cf5..b41720a 100644 --- a/src/mpid/ch3/channels/nemesis/include/mpid_nem_impl.h +++ b/src/mpid/ch3/channels/nemesis/include/mpid_nem_impl.h @@ -29,12 +29,12 @@ int MPID_nem_send_iov(MPIDI_VC_t *vc, MPID_Request **sreq_ptr, MPL_IOV *iov, int int MPID_nem_lmt_pkthandler_init(MPIDI_CH3_PktHandler_Fcn *pktArray[], int arraySize); int MPID_nem_register_initcomp_cb(int (* callback)(void)); int MPID_nem_choose_netmod(void); -int MPIDI_CH3I_comm_create(MPID_Comm *comm, void *param); -int MPIDI_CH3I_comm_destroy(MPID_Comm *comm, void *param); +int MPIDI_CH3I_comm_create(MPIR_Comm *comm, void *param); +int MPIDI_CH3I_comm_destroy(MPIR_Comm *comm, void *param); /* rendezvous hooks */ int MPID_nem_lmt_RndvSend(MPID_Request **sreq_p, const void * buf, MPI_Aint count, MPI_Datatype datatype, int dt_contig, - intptr_t data_sz, MPI_Aint dt_true_lb, int rank, int tag, MPID_Comm * comm, int context_offset); + intptr_t data_sz, MPI_Aint dt_true_lb, int rank, int tag, MPIR_Comm * comm, int context_offset); int MPID_nem_lmt_RndvRecv(struct MPIDI_VC *vc, MPID_Request *rreq); #define MPID_nem_mpich_release_fbox(cell) \ diff --git a/src/mpid/ch3/channels/nemesis/include/mpid_nem_nets.h b/src/mpid/ch3/channels/nemesis/include/mpid_nem_nets.h index 91975fd..57b5448 100644 --- a/src/mpid/ch3/channels/nemesis/include/mpid_nem_nets.h +++ b/src/mpid/ch3/channels/nemesis/include/mpid_nem_nets.h @@ -21,9 +21,9 @@ typedef int (* MPID_nem_net_module_connect_to_root_t)(const char *business_card, typedef int (* MPID_nem_net_module_vc_init_t)(MPIDI_VC_t *vc); typedef int (* MPID_nem_net_module_vc_destroy_t)(MPIDI_VC_t *vc); typedef int (* MPID_nem_net_module_vc_terminate_t)(MPIDI_VC_t *vc); -typedef int (* MPID_nem_net_module_anysource_iprobe_t)(int tag, MPID_Comm *comm, int context_offset, int *flag, +typedef int (* MPID_nem_net_module_anysource_iprobe_t)(int tag, MPIR_Comm *comm, int context_offset, int *flag, MPI_Status *status); -typedef int (* MPID_nem_net_module_anysource_improbe_t)(int tag, MPID_Comm *comm, int context_offset, int *flag, +typedef int (* MPID_nem_net_module_anysource_improbe_t)(int tag, MPIR_Comm *comm, int context_offset, int *flag, MPID_Request **message, MPI_Status *status); typedef void (* MPID_nem_net_module_vc_dbg_print_sendq_t)(FILE *stream, MPIDI_VC_t *vc); diff --git a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_impl.h b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_impl.h index dee01a2..b391a3e 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_impl.h +++ b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_impl.h @@ -77,9 +77,9 @@ int MPID_nem_llc_vc_init(MPIDI_VC_t * vc); int MPID_nem_llc_vc_destroy(MPIDI_VC_t * vc); int MPID_nem_llc_vc_terminate(MPIDI_VC_t * vc); -int MPID_nem_llc_anysource_iprobe(int tag, MPID_Comm * comm, int context_offset, int *flag, +int MPID_nem_llc_anysource_iprobe(int tag, MPIR_Comm * comm, int context_offset, int *flag, MPI_Status * status); -int MPID_nem_llc_anysource_improbe(int tag, MPID_Comm * comm, int context_offset, int *flag, +int MPID_nem_llc_anysource_improbe(int tag, MPIR_Comm * comm, int context_offset, int *flag, MPID_Request ** message, MPI_Status * status); int MPID_nem_llc_get_ordering(int *ordering); @@ -94,21 +94,21 @@ int MPIDI_nem_llc_Rqst_iov_update(MPID_Request * mreq, intptr_t consume); int MPID_nem_llc_send_queued(MPIDI_VC_t * vc, rque_t * send_queue); int MPID_nem_llc_isend(struct MPIDI_VC *vc, const void *buf, int count, MPI_Datatype datatype, - int dest, int tag, MPID_Comm * comm, int context_offset, + int dest, int tag, MPIR_Comm * comm, int context_offset, struct MPID_Request **request); int MPID_nem_llc_issend(struct MPIDI_VC *vc, const void *buf, int count, MPI_Datatype datatype, - int dest, int tag, MPID_Comm * comm, int context_offset, + int dest, int tag, MPIR_Comm * comm, int context_offset, struct MPID_Request **request); int MPID_nem_llc_recv_posted(struct MPIDI_VC *vc, struct MPID_Request *req); int MPID_nem_llc_kvs_put_binary(int from, const char *postfix, const uint8_t * buf, int length); int MPID_nem_llc_kvs_get_binary(int from, const char *postfix, char *buf, int length); void MPID_nem_llc_anysource_posted(MPID_Request * req); int MPID_nem_llc_anysource_matched(MPID_Request * req); -int MPID_nem_llc_probe(MPIDI_VC_t * vc, int source, int tag, MPID_Comm * comm, int context_offset, +int MPID_nem_llc_probe(MPIDI_VC_t * vc, int source, int tag, MPIR_Comm * comm, int context_offset, MPI_Status * status); -int MPID_nem_llc_iprobe(MPIDI_VC_t * vc, int source, int tag, MPID_Comm * comm, int context_offset, +int MPID_nem_llc_iprobe(MPIDI_VC_t * vc, int source, int tag, MPIR_Comm * comm, int context_offset, int *flag, MPI_Status * status); -int MPID_nem_llc_improbe(MPIDI_VC_t * vc, int source, int tag, MPID_Comm * comm, int context_offset, +int MPID_nem_llc_improbe(MPIDI_VC_t * vc, int source, int tag, MPIR_Comm * comm, int context_offset, int *flag, MPID_Request ** message, MPI_Status * status); int MPID_nem_llc_cancel_recv(struct MPIDI_VC *vc, struct MPID_Request *req); @@ -126,7 +126,7 @@ extern int llc_unbind(void *endpt); extern int llc_poll(int in_blocking_poll, llc_send_f sfnc, llc_recv_f rfnc); -extern int convert_rank_llc2mpi(MPID_Comm * comm, int llc_rank, int *mpi_rank); +extern int convert_rank_llc2mpi(MPIR_Comm * comm, int llc_rank, int *mpi_rank); typedef struct MPID_nem_llc_netmod_hdr { int initiator_pg_rank; #ifndef notdef_hsiz_hack diff --git a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_init.c b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_init.c index 9bd2a53..c1265d0 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_init.c +++ b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_init.c @@ -205,7 +205,7 @@ int MPID_nem_llc_connect_to_root(const char *business_card, MPIDI_VC_t * new_vc) #define FUNCNAME MPID_nem_llc_anysource_iprobe #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_llc_anysource_iprobe(int tag, MPID_Comm * comm, int context_offset, int *flag, +int MPID_nem_llc_anysource_iprobe(int tag, MPIR_Comm * comm, int context_offset, int *flag, MPI_Status * status) { return MPID_nem_llc_iprobe(NULL, MPI_ANY_SOURCE, tag, comm, context_offset, flag, status); @@ -216,7 +216,7 @@ int MPID_nem_llc_anysource_iprobe(int tag, MPID_Comm * comm, int context_offset, #define FUNCNAME MPID_nem_llc_anysource_improbe #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_llc_anysource_improbe(int tag, MPID_Comm * comm, int context_offset, int *flag, +int MPID_nem_llc_anysource_improbe(int tag, MPIR_Comm * comm, int context_offset, int *flag, MPID_Request ** message, MPI_Status * status) { return MPID_nem_llc_improbe(NULL, MPI_ANY_SOURCE, tag, comm, context_offset, flag, message, diff --git a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_probe.c b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_probe.c index be4d818..c7c8c56 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_probe.c +++ b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_probe.c @@ -21,7 +21,7 @@ #define FUNCNAME MPID_nem_llc_probe #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_llc_probe(MPIDI_VC_t * vc, int source, int tag, MPID_Comm * comm, int context_offset, +int MPID_nem_llc_probe(MPIDI_VC_t * vc, int source, int tag, MPIR_Comm * comm, int context_offset, MPI_Status * status) { int mpi_errno = MPI_SUCCESS; @@ -42,7 +42,7 @@ int MPID_nem_llc_probe(MPIDI_VC_t * vc, int source, int tag, MPID_Comm * comm, i #define FUNCNAME MPID_nem_llc_iprobe #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_llc_iprobe(MPIDI_VC_t * vc, int source, int tag, MPID_Comm * comm, int context_offset, +int MPID_nem_llc_iprobe(MPIDI_VC_t * vc, int source, int tag, MPIR_Comm * comm, int context_offset, int *flag, MPI_Status * status) { int mpi_errno = MPI_SUCCESS, llc_errno; @@ -112,7 +112,7 @@ int MPID_nem_llc_iprobe(MPIDI_VC_t * vc, int source, int tag, MPID_Comm * comm, #define FUNCNAME MPID_nem_llc_improbe #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_llc_improbe(MPIDI_VC_t * vc, int source, int tag, MPID_Comm * comm, int context_offset, +int MPID_nem_llc_improbe(MPIDI_VC_t * vc, int source, int tag, MPIR_Comm * comm, int context_offset, int *flag, MPID_Request ** message, MPI_Status * status) { int mpi_errno = MPI_SUCCESS; diff --git a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_send.c b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_send.c index 895ae2d..22b0cf4 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_send.c +++ b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_send.c @@ -21,7 +21,7 @@ #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_nem_llc_isend(struct MPIDI_VC *vc, const void *buf, int count, MPI_Datatype datatype, - int dest, int tag, MPID_Comm * comm, int context_offset, + int dest, int tag, MPIR_Comm * comm, int context_offset, struct MPID_Request **req_out) { int mpi_errno = MPI_SUCCESS, llc_errno; @@ -670,7 +670,7 @@ ssize_t llc_writev(void *endpt, uint64_t raddr, return nw; } -int convert_rank_llc2mpi(MPID_Comm * comm, int llc_rank, int *mpi_rank) +int convert_rank_llc2mpi(MPIR_Comm * comm, int llc_rank, int *mpi_rank) { int size, rank; int found = 0; @@ -954,7 +954,7 @@ int llc_poll(int in_blocking_poll, llc_send_f sfnc, llc_recv_f rfnc) #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_nem_llc_issend(struct MPIDI_VC *vc, const void *buf, int count, MPI_Datatype datatype, - int dest, int tag, MPID_Comm * comm, int context_offset, + int dest, int tag, MPIR_Comm * comm, int context_offset, struct MPID_Request **request) { int mpi_errno = MPI_SUCCESS, llc_errno; diff --git a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_impl.h b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_impl.h index bbad8ae..4cc912b 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_impl.h +++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_impl.h @@ -43,29 +43,29 @@ int MPID_nem_mxm_SendNoncontig(MPIDI_VC_t * vc, MPID_Request * sreq, void *heade /* direct interface */ int MPID_nem_mxm_recv(MPIDI_VC_t * vc, MPID_Request * rreq); int MPID_nem_mxm_send(MPIDI_VC_t * vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, - int rank, int tag, MPID_Comm * comm, int context_offset, + int rank, int tag, MPIR_Comm * comm, int context_offset, MPID_Request ** sreq_p); int MPID_nem_mxm_ssend(MPIDI_VC_t * vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, - int rank, int tag, MPID_Comm * comm, int context_offset, + int rank, int tag, MPIR_Comm * comm, int context_offset, MPID_Request ** sreq_p); int MPID_nem_mxm_isend(MPIDI_VC_t * vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, - int rank, int tag, MPID_Comm * comm, int context_offset, + int rank, int tag, MPIR_Comm * comm, int context_offset, MPID_Request ** sreq_p); int MPID_nem_mxm_issend(MPIDI_VC_t * vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, - int rank, int tag, MPID_Comm * comm, int context_offset, + int rank, int tag, MPIR_Comm * comm, int context_offset, MPID_Request ** sreq_p); int MPID_nem_mxm_cancel_send(MPIDI_VC_t * vc, MPID_Request * sreq); int MPID_nem_mxm_cancel_recv(MPIDI_VC_t * vc, MPID_Request * rreq); -int MPID_nem_mxm_probe(MPIDI_VC_t * vc, int source, int tag, MPID_Comm * comm, int context_offset, +int MPID_nem_mxm_probe(MPIDI_VC_t * vc, int source, int tag, MPIR_Comm * comm, int context_offset, MPI_Status * status); -int MPID_nem_mxm_iprobe(MPIDI_VC_t * vc, int source, int tag, MPID_Comm * comm, int context_offset, +int MPID_nem_mxm_iprobe(MPIDI_VC_t * vc, int source, int tag, MPIR_Comm * comm, int context_offset, int *flag, MPI_Status * status); -int MPID_nem_mxm_improbe(MPIDI_VC_t * vc, int source, int tag, MPID_Comm * comm, int context_offset, +int MPID_nem_mxm_improbe(MPIDI_VC_t * vc, int source, int tag, MPIR_Comm * comm, int context_offset, int *flag, MPID_Request ** message, MPI_Status * status); -int MPID_nem_mxm_anysource_iprobe(int tag, MPID_Comm * comm, int context_offset, int *flag, +int MPID_nem_mxm_anysource_iprobe(int tag, MPIR_Comm * comm, int context_offset, int *flag, MPI_Status * status); -int MPID_nem_mxm_anysource_improbe(int tag, MPID_Comm * comm, int context_offset, int *flag, +int MPID_nem_mxm_anysource_improbe(int tag, MPIR_Comm * comm, int context_offset, int *flag, MPID_Request ** message, MPI_Status * status); /* active message callback */ diff --git a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_init.c b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_init.c index b714ae3..9034745 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_init.c +++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_init.c @@ -114,8 +114,8 @@ static int _mxm_post_init(void); static int _mxm_connect(MPID_nem_mxm_ep_t * ep, const char *business_card, MPID_nem_mxm_vc_area * vc_area); static int _mxm_disconnect(MPID_nem_mxm_ep_t * ep); -static int _mxm_add_comm(MPID_Comm * comm, void *param); -static int _mxm_del_comm(MPID_Comm * comm, void *param); +static int _mxm_add_comm(MPIR_Comm * comm, void *param); +static int _mxm_del_comm(MPIR_Comm * comm, void *param); static int _mxm_conf(void); @@ -631,7 +631,7 @@ static int _mxm_disconnect(MPID_nem_mxm_ep_t * ep) goto fn_exit; } -static int _mxm_add_comm(MPID_Comm * comm, void *param) +static int _mxm_add_comm(MPIR_Comm * comm, void *param) { int mpi_errno = MPI_SUCCESS; mxm_error_t ret = MXM_OK; @@ -669,7 +669,7 @@ static int _mxm_add_comm(MPID_Comm * comm, void *param) goto fn_exit; } -static int _mxm_del_comm(MPID_Comm * comm, void *param) +static int _mxm_del_comm(MPIR_Comm * comm, void *param) { int mpi_errno = MPI_SUCCESS; mxm_mq_h *mxm_mq = (mxm_mq_h *) comm->dev.ch.netmod_priv; diff --git a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_probe.c b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_probe.c index fc164e5..b433f62 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_probe.c +++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_probe.c @@ -17,7 +17,7 @@ #define FUNCNAME MPID_nem_mxm_probe #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_mxm_probe(MPIDI_VC_t * vc, int source, int tag, MPID_Comm * comm, int context_offset, +int MPID_nem_mxm_probe(MPIDI_VC_t * vc, int source, int tag, MPIR_Comm * comm, int context_offset, MPI_Status * status) { int mpi_errno = MPI_SUCCESS; @@ -63,7 +63,7 @@ int MPID_nem_mxm_probe(MPIDI_VC_t * vc, int source, int tag, MPID_Comm * comm, i #define FUNCNAME MPID_nem_mxm_iprobe #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_mxm_iprobe(MPIDI_VC_t * vc, int source, int tag, MPID_Comm * comm, int context_offset, +int MPID_nem_mxm_iprobe(MPIDI_VC_t * vc, int source, int tag, MPIR_Comm * comm, int context_offset, int *flag, MPI_Status * status) { int mpi_errno = MPI_SUCCESS; @@ -109,7 +109,7 @@ int MPID_nem_mxm_iprobe(MPIDI_VC_t * vc, int source, int tag, MPID_Comm * comm, #define FUNCNAME MPID_nem_mxm_improbe #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_mxm_improbe(MPIDI_VC_t * vc, int source, int tag, MPID_Comm * comm, int context_offset, +int MPID_nem_mxm_improbe(MPIDI_VC_t * vc, int source, int tag, MPIR_Comm * comm, int context_offset, int *flag, MPID_Request ** message, MPI_Status * status) { int mpi_errno = MPI_SUCCESS; @@ -201,7 +201,7 @@ int MPID_nem_mxm_improbe(MPIDI_VC_t * vc, int source, int tag, MPID_Comm * comm, #define FUNCNAME MPID_nem_mxm_anysource_iprobe #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_mxm_anysource_iprobe(int tag, MPID_Comm * comm, int context_offset, int *flag, +int MPID_nem_mxm_anysource_iprobe(int tag, MPIR_Comm * comm, int context_offset, int *flag, MPI_Status * status) { return MPID_nem_mxm_iprobe(NULL, MPI_ANY_SOURCE, tag, comm, context_offset, flag, status); @@ -212,7 +212,7 @@ int MPID_nem_mxm_anysource_iprobe(int tag, MPID_Comm * comm, int context_offset, #define FUNCNAME MPID_nem_mxm_anysource_iprobe #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_mxm_anysource_improbe(int tag, MPID_Comm * comm, int context_offset, int *flag, +int MPID_nem_mxm_anysource_improbe(int tag, MPIR_Comm * comm, int context_offset, int *flag, MPID_Request ** message, MPI_Status * status) { return MPID_nem_mxm_improbe(NULL, MPI_ANY_SOURCE, tag, comm, context_offset, flag, message, diff --git a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c index e2e3cac..a143e17 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c +++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c @@ -241,7 +241,7 @@ int MPID_nem_mxm_SendNoncontig(MPIDI_VC_t * vc, MPID_Request * sreq, void *hdr, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_nem_mxm_send(MPIDI_VC_t * vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, - int rank, int tag, MPID_Comm * comm, int context_offset, + int rank, int tag, MPIR_Comm * comm, int context_offset, MPID_Request ** sreq_ptr) { int mpi_errno = MPI_SUCCESS; @@ -344,7 +344,7 @@ int MPID_nem_mxm_send(MPIDI_VC_t * vc, const void *buf, MPI_Aint count, MPI_Data #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_nem_mxm_ssend(MPIDI_VC_t * vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, - int rank, int tag, MPID_Comm * comm, int context_offset, + int rank, int tag, MPIR_Comm * comm, int context_offset, MPID_Request ** sreq_ptr) { int mpi_errno = MPI_SUCCESS; @@ -447,7 +447,7 @@ int MPID_nem_mxm_ssend(MPIDI_VC_t * vc, const void *buf, MPI_Aint count, MPI_Dat #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_nem_mxm_isend(MPIDI_VC_t * vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, - int rank, int tag, MPID_Comm * comm, int context_offset, + int rank, int tag, MPIR_Comm * comm, int context_offset, MPID_Request ** sreq_ptr) { int mpi_errno = MPI_SUCCESS; @@ -550,7 +550,7 @@ int MPID_nem_mxm_isend(MPIDI_VC_t * vc, const void *buf, MPI_Aint count, MPI_Dat #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_nem_mxm_issend(MPIDI_VC_t * vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, - int rank, int tag, MPID_Comm * comm, int context_offset, + int rank, int tag, MPIR_Comm * comm, int context_offset, MPID_Request ** sreq_ptr) { int mpi_errno = MPI_SUCCESS; diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h index 8b3c34f..0b55dc0 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h @@ -304,28 +304,28 @@ static inline int MPID_nem_ofi_create_req_lw(MPID_Request ** request, int refcnt DECLARE_TWO_API_SETS(int, MPID_nem_ofi_recv_posted, struct MPIDI_VC *vc, struct MPID_Request *req); DECLARE_TWO_API_SETS(int, MPID_nem_ofi_send, struct MPIDI_VC *vc, const void *buf, MPI_Aint count,\ - MPI_Datatype datatype, int dest, int tag, MPID_Comm * comm,\ + MPI_Datatype datatype, int dest, int tag, MPIR_Comm * comm,\ int context_offset, struct MPID_Request **request); DECLARE_TWO_API_SETS(int, MPID_nem_ofi_isend, struct MPIDI_VC *vc, const void *buf, MPI_Aint count,\ - MPI_Datatype datatype, int dest, int tag, MPID_Comm * comm,\ + MPI_Datatype datatype, int dest, int tag, MPIR_Comm * comm,\ int context_offset, struct MPID_Request **request); DECLARE_TWO_API_SETS(int, MPID_nem_ofi_ssend, struct MPIDI_VC *vc, const void *buf, MPI_Aint count,\ - MPI_Datatype datatype, int dest, int tag, MPID_Comm * comm, + MPI_Datatype datatype, int dest, int tag, MPIR_Comm * comm, int context_offset, struct MPID_Request **request); DECLARE_TWO_API_SETS(int, MPID_nem_ofi_issend, struct MPIDI_VC *vc, const void *buf, MPI_Aint count,\ - MPI_Datatype datatype, int dest, int tag, MPID_Comm * comm,\ + MPI_Datatype datatype, int dest, int tag, MPIR_Comm * comm,\ int context_offset, struct MPID_Request **request); int MPID_nem_ofi_cancel_send(struct MPIDI_VC *vc, struct MPID_Request *sreq); int MPID_nem_ofi_cancel_recv(struct MPIDI_VC *vc, struct MPID_Request *rreq); -DECLARE_TWO_API_SETS(int, MPID_nem_ofi_iprobe, struct MPIDI_VC *vc, int source, int tag, MPID_Comm * comm, +DECLARE_TWO_API_SETS(int, MPID_nem_ofi_iprobe, struct MPIDI_VC *vc, int source, int tag, MPIR_Comm * comm, int context_offset, int *flag, MPI_Status * status); -DECLARE_TWO_API_SETS(int, MPID_nem_ofi_improbe,struct MPIDI_VC *vc, int source, int tag, MPID_Comm * comm, +DECLARE_TWO_API_SETS(int, MPID_nem_ofi_improbe,struct MPIDI_VC *vc, int source, int tag, MPIR_Comm * comm, int context_offset, int *flag, MPID_Request ** message, MPI_Status * status); -DECLARE_TWO_API_SETS(int, MPID_nem_ofi_anysource_iprobe,int tag, MPID_Comm * comm, int context_offset, +DECLARE_TWO_API_SETS(int, MPID_nem_ofi_anysource_iprobe,int tag, MPIR_Comm * comm, int context_offset, int *flag, MPI_Status * status); -DECLARE_TWO_API_SETS(int, MPID_nem_ofi_anysource_improbe,int tag, MPID_Comm * comm, int context_offset, +DECLARE_TWO_API_SETS(int, MPID_nem_ofi_anysource_improbe,int tag, MPIR_Comm * comm, int context_offset, int *flag, MPID_Request ** message, MPI_Status * status); DECLARE_TWO_API_SETS(void, MPID_nem_ofi_anysource_posted, MPID_Request * rreq); diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_probe_template.c b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_probe_template.c index 4de25f0..05f61fa 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_probe_template.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_probe_template.c @@ -39,7 +39,7 @@ ADD_SUFFIX(peek_callback)(cq_tagged_entry_t * wc, MPID_Request * rreq) int ADD_SUFFIX(MPID_nem_ofi_iprobe_impl)(struct MPIDI_VC *vc, int source, int tag, - MPID_Comm * comm, + MPIR_Comm * comm, int context_offset, int *flag, MPI_Status * status, MPID_Request ** rreq_ptr) { @@ -137,7 +137,7 @@ int ADD_SUFFIX(MPID_nem_ofi_iprobe_impl)(struct MPIDI_VC *vc, int ADD_SUFFIX(MPID_nem_ofi_iprobe)(struct MPIDI_VC *vc, int source, int tag, - MPID_Comm * comm, int context_offset, int *flag, MPI_Status * status) + MPIR_Comm * comm, int context_offset, int *flag, MPI_Status * status) { int rc; BEGIN_FUNC(FCNAME); @@ -153,7 +153,7 @@ int ADD_SUFFIX(MPID_nem_ofi_iprobe)(struct MPIDI_VC *vc, int ADD_SUFFIX(MPID_nem_ofi_improbe)(struct MPIDI_VC *vc, int source, int tag, - MPID_Comm * comm, + MPIR_Comm * comm, int context_offset, int *flag, MPID_Request ** message, MPI_Status * status) { @@ -174,7 +174,7 @@ int ADD_SUFFIX(MPID_nem_ofi_improbe)(struct MPIDI_VC *vc, #undef FCNAME #define FCNAME DECL_FUNC(MPID_nem_ofi_anysource_iprobe) int ADD_SUFFIX(MPID_nem_ofi_anysource_iprobe)(int tag, - MPID_Comm * comm, + MPIR_Comm * comm, int context_offset, int *flag, MPI_Status * status) { int rc; @@ -189,7 +189,7 @@ int ADD_SUFFIX(MPID_nem_ofi_anysource_iprobe)(int tag, #undef FCNAME #define FCNAME DECL_FUNC(MPID_nem_ofi_anysource_improbe) int ADD_SUFFIX(MPID_nem_ofi_anysource_improbe)(int tag, - MPID_Comm * comm, + MPIR_Comm * comm, int context_offset, int *flag, MPID_Request ** message, MPI_Status * status) { diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_tagged_template.c b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_tagged_template.c index 6b54306..f0f2f00 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_tagged_template.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_tagged_template.c @@ -108,7 +108,7 @@ int ADD_SUFFIX(MPID_nem_ofi_recv_callback)(cq_tagged_entry_t * wc, MPID_Request #define FCNAME DECL_FUNC(send_normal) static inline int ADD_SUFFIX(send_normal)(struct MPIDI_VC *vc, const void *buf, int count, MPI_Datatype datatype, - int dest, int tag, MPID_Comm *comm, + int dest, int tag, MPIR_Comm *comm, int context_offset, MPID_Request **request, int dt_contig, intptr_t data_sz, @@ -226,7 +226,7 @@ ADD_SUFFIX(send_lightweight)(struct MPIDI_VC *vc, intptr_t data_sz, int rank, int tag, - MPID_Comm *comm, + MPIR_Comm *comm, int context_offset) { int mpi_errno = MPI_SUCCESS; @@ -267,7 +267,7 @@ ADD_SUFFIX(do_isend)(struct MPIDI_VC *vc, MPI_Datatype datatype, int dest, int tag, - MPID_Comm * comm, + MPIR_Comm * comm, int context_offset, struct MPID_Request **request, int should_create_req, @@ -309,7 +309,7 @@ int ADD_SUFFIX(MPID_nem_ofi_send)(struct MPIDI_VC *vc, MPI_Aint count, MPI_Datatype datatype, int dest, - int tag, MPID_Comm * comm, int context_offset, struct MPID_Request **request) + int tag, MPIR_Comm * comm, int context_offset, struct MPID_Request **request) { int mpi_errno = MPI_SUCCESS; @@ -327,7 +327,7 @@ int ADD_SUFFIX(MPID_nem_ofi_isend)(struct MPIDI_VC *vc, MPI_Aint count, MPI_Datatype datatype, int dest, - int tag, MPID_Comm * comm, int context_offset, struct MPID_Request **request) + int tag, MPIR_Comm * comm, int context_offset, struct MPID_Request **request) { int mpi_errno = MPI_SUCCESS; BEGIN_FUNC(FCNAME); @@ -344,7 +344,7 @@ int ADD_SUFFIX(MPID_nem_ofi_ssend)(struct MPIDI_VC *vc, MPI_Aint count, MPI_Datatype datatype, int dest, - int tag, MPID_Comm * comm, int context_offset, struct MPID_Request **request) + int tag, MPIR_Comm * comm, int context_offset, struct MPID_Request **request) { int mpi_errno = MPI_SUCCESS; BEGIN_FUNC(FCNAME); @@ -362,7 +362,7 @@ int ADD_SUFFIX(MPID_nem_ofi_issend)(struct MPIDI_VC *vc, MPI_Datatype datatype, int dest, int tag, - MPID_Comm * comm, int context_offset, struct MPID_Request **request) + MPIR_Comm * comm, int context_offset, struct MPID_Request **request) { int mpi_errno = MPI_SUCCESS; BEGIN_FUNC(FCNAME); diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h index e72a142..e58564a 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h @@ -157,19 +157,19 @@ int MPID_nem_ptl_get_id_from_bc(const char *business_card, ptl_process_t *id, pt int MPID_nem_ptl_recv_posted(struct MPIDI_VC *vc, struct MPID_Request *req); /* isend is also used to implement send, rsend and irsend */ int MPID_nem_ptl_isend(struct MPIDI_VC *vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, - MPID_Comm *comm, int context_offset, struct MPID_Request **request); + MPIR_Comm *comm, int context_offset, struct MPID_Request **request); /* issend is also used to implement ssend */ int MPID_nem_ptl_issend(struct MPIDI_VC *vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, - MPID_Comm *comm, int context_offset, struct MPID_Request **request); + MPIR_Comm *comm, int context_offset, struct MPID_Request **request); int MPID_nem_ptl_cancel_send(struct MPIDI_VC *vc, struct MPID_Request *sreq); int MPID_nem_ptl_cancel_recv(struct MPIDI_VC *vc, struct MPID_Request *rreq); -int MPID_nem_ptl_probe(struct MPIDI_VC *vc, int source, int tag, MPID_Comm *comm, int context_offset, MPI_Status *status); -int MPID_nem_ptl_iprobe(struct MPIDI_VC *vc, int source, int tag, MPID_Comm *comm, int context_offset, int *flag, +int MPID_nem_ptl_probe(struct MPIDI_VC *vc, int source, int tag, MPIR_Comm *comm, int context_offset, MPI_Status *status); +int MPID_nem_ptl_iprobe(struct MPIDI_VC *vc, int source, int tag, MPIR_Comm *comm, int context_offset, int *flag, MPI_Status *status); -int MPID_nem_ptl_improbe(struct MPIDI_VC *vc, int source, int tag, MPID_Comm *comm, int context_offset, int *flag, +int MPID_nem_ptl_improbe(struct MPIDI_VC *vc, int source, int tag, MPIR_Comm *comm, int context_offset, int *flag, MPID_Request **message, MPI_Status *status); -int MPID_nem_ptl_anysource_iprobe(int tag, MPID_Comm * comm, int context_offset, int *flag, MPI_Status * status); -int MPID_nem_ptl_anysource_improbe(int tag, MPID_Comm * comm, int context_offset, int *flag, MPID_Request **message, +int MPID_nem_ptl_anysource_iprobe(int tag, MPIR_Comm * comm, int context_offset, int *flag, MPI_Status * status); +int MPID_nem_ptl_anysource_improbe(int tag, MPIR_Comm * comm, int context_offset, int *flag, MPID_Request **message, MPI_Status * status); void MPID_nem_ptl_anysource_posted(MPID_Request *rreq); int MPID_nem_ptl_anysource_matched(MPID_Request *rreq); diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_probe.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_probe.c index d8d0f1d..f70940d 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_probe.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_probe.c @@ -101,7 +101,7 @@ static int handle_mprobe(const ptl_event_t *e) #define FUNCNAME MPID_nem_ptl_probe #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_ptl_probe(MPIDI_VC_t *vc, int source, int tag, MPID_Comm *comm, int context_offset, MPI_Status *status) +int MPID_nem_ptl_probe(MPIDI_VC_t *vc, int source, int tag, MPIR_Comm *comm, int context_offset, MPI_Status *status) { MPIU_Assertp(0 && "This function shouldn't be called."); return MPI_SUCCESS; @@ -111,7 +111,7 @@ int MPID_nem_ptl_probe(MPIDI_VC_t *vc, int source, int tag, MPID_Comm *comm, int #define FUNCNAME MPID_nem_ptl_iprobe #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_ptl_iprobe(MPIDI_VC_t *vc, int source, int tag, MPID_Comm *comm, int context_offset, int *flag, MPI_Status *status) +int MPID_nem_ptl_iprobe(MPIDI_VC_t *vc, int source, int tag, MPIR_Comm *comm, int context_offset, int *flag, MPI_Status *status) { int mpi_errno = MPI_SUCCESS; MPID_nem_ptl_vc_area *const vc_ptl = VC_PTL(vc); @@ -184,7 +184,7 @@ int MPID_nem_ptl_iprobe(MPIDI_VC_t *vc, int source, int tag, MPID_Comm *comm, in #define FUNCNAME MPID_nem_ptl_improbe #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_ptl_improbe(MPIDI_VC_t *vc, int source, int tag, MPID_Comm *comm, int context_offset, int *flag, +int MPID_nem_ptl_improbe(MPIDI_VC_t *vc, int source, int tag, MPIR_Comm *comm, int context_offset, int *flag, MPID_Request **message, MPI_Status *status) { int mpi_errno = MPI_SUCCESS; @@ -265,7 +265,7 @@ int MPID_nem_ptl_improbe(MPIDI_VC_t *vc, int source, int tag, MPID_Comm *comm, i #define FUNCNAME MPID_nem_ptl_anysource_iprobe #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_ptl_anysource_iprobe(int tag, MPID_Comm * comm, int context_offset, int *flag, MPI_Status * status) +int MPID_nem_ptl_anysource_iprobe(int tag, MPIR_Comm * comm, int context_offset, int *flag, MPI_Status * status) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_PTL_ANYSOURCE_IPROBE); @@ -285,7 +285,7 @@ int MPID_nem_ptl_anysource_iprobe(int tag, MPID_Comm * comm, int context_offset, #define FUNCNAME MPID_nem_ptl_anysource_improbe #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_nem_ptl_anysource_improbe(int tag, MPID_Comm * comm, int context_offset, int *flag, MPID_Request **message, +int MPID_nem_ptl_anysource_improbe(int tag, MPIR_Comm * comm, int context_offset, int *flag, MPID_Request **message, MPI_Status * status) { int mpi_errno = MPI_SUCCESS; diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c index be3ec5f..fb9a517 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c @@ -101,7 +101,7 @@ static int handler_send(const ptl_event_t *e) #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) static int send_msg(ptl_hdr_data_t ssend_flag, struct MPIDI_VC *vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, - int tag, MPID_Comm *comm, int context_offset, struct MPID_Request **request) + int tag, MPIR_Comm *comm, int context_offset, struct MPID_Request **request) { int mpi_errno = MPI_SUCCESS; MPID_nem_ptl_vc_area *const vc_ptl = VC_PTL(vc); @@ -336,7 +336,7 @@ static int send_msg(ptl_hdr_data_t ssend_flag, struct MPIDI_VC *vc, const void * #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_nem_ptl_isend(struct MPIDI_VC *vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, - MPID_Comm *comm, int context_offset, struct MPID_Request **request) + MPIR_Comm *comm, int context_offset, struct MPID_Request **request) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_PTL_ISEND); @@ -355,7 +355,7 @@ int MPID_nem_ptl_isend(struct MPIDI_VC *vc, const void *buf, MPI_Aint count, MPI #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_nem_ptl_issend(struct MPIDI_VC *vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, int tag, - MPID_Comm *comm, int context_offset, struct MPID_Request **request) + MPIR_Comm *comm, int context_offset, struct MPID_Request **request) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_PTL_ISSEND); diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_init.c b/src/mpid/ch3/channels/nemesis/src/ch3_init.c index 27fe4da..c63cfd9 100644 --- a/src/mpid/ch3/channels/nemesis/src/ch3_init.c +++ b/src/mpid/ch3/channels/nemesis/src/ch3_init.c @@ -23,8 +23,8 @@ static int nemesis_initialized = 0; #define FUNCNAME split_type #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int split_type(MPID_Comm * comm_ptr, int stype, int key, - MPID_Info *info_ptr, MPID_Comm ** newcomm_ptr) +static int split_type(MPIR_Comm * comm_ptr, int stype, int key, + MPID_Info *info_ptr, MPIR_Comm ** newcomm_ptr) { MPID_Node_id_t id; MPIDI_Rank_t nid; diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_rma_shm.c b/src/mpid/ch3/channels/nemesis/src/ch3_rma_shm.c index ee4cb25..9f083b5 100644 --- a/src/mpid/ch3/channels/nemesis/src/ch3_rma_shm.c +++ b/src/mpid/ch3/channels/nemesis/src/ch3_rma_shm.c @@ -113,7 +113,7 @@ int MPIDI_CH3_SHM_Win_free(MPID_Win ** win_ptr) if (((*win_ptr)->create_flavor == MPI_WIN_FLAVOR_SHARED || (*win_ptr)->create_flavor == MPI_WIN_FLAVOR_ALLOCATE) && (*win_ptr)->shm_mutex && (*win_ptr)->shm_segment_len > 0) { - MPID_Comm *node_comm_ptr = NULL; + MPIR_Comm *node_comm_ptr = NULL; /* When allocating shared memory region segment, we need comm of processes * that are on the same node as this process (node_comm). diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c b/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c index 5162deb..dbf3165 100644 --- a/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c +++ b/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c @@ -19,15 +19,15 @@ extern MPIR_T_pvar_timer_t PVAR_TIMER_rma_wincreate_allgather ATTRIBUTE((unused) MPIDI_SHM_Wins_list_t shm_wins_list; static int MPIDI_CH3I_Win_init(MPI_Aint size, int disp_unit, int create_flavor, int model, - MPID_Info * info, MPID_Comm * comm_ptr, MPID_Win ** win_ptr); + MPID_Info * info, MPIR_Comm * comm_ptr, MPID_Win ** win_ptr); static int MPIDI_CH3I_Win_allocate_shm(MPI_Aint size, int disp_unit, MPID_Info * info, - MPID_Comm * comm_ptr, void *base_ptr, MPID_Win ** win_ptr); + MPIR_Comm * comm_ptr, void *base_ptr, MPID_Win ** win_ptr); static int MPIDI_CH3I_Win_detect_shm(MPID_Win ** win_ptr); static int MPIDI_CH3I_Win_gather_info(void *base, MPI_Aint size, int disp_unit, MPID_Info * info, - MPID_Comm * comm_ptr, MPID_Win ** win_ptr); + MPIR_Comm * comm_ptr, MPID_Win ** win_ptr); #undef FUNCNAME #define FUNCNAME MPIDI_CH3_Win_fns_init @@ -114,7 +114,7 @@ int MPIDI_CH3_Win_pkt_orderings_init(MPIDI_CH3U_Win_pkt_ordering_t * win_pkt_ord #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) static int MPIDI_CH3I_Win_init(MPI_Aint size, int disp_unit, int create_flavor, int model, - MPID_Info * info, MPID_Comm * comm_ptr, MPID_Win ** win_ptr) + MPID_Info * info, MPIR_Comm * comm_ptr, MPID_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3I_WIN_INIT); @@ -153,7 +153,7 @@ static int MPIDI_CH3I_SHM_Wins_match(MPID_Win ** win_ptr, MPID_Win ** matched_wi int group_diff; int base_diff; - MPID_Comm *node_comm_ptr = NULL, *shm_node_comm_ptr = NULL; + MPIR_Comm *node_comm_ptr = NULL, *shm_node_comm_ptr = NULL; int *node_ranks = NULL, *node_ranks_in_shm_node = NULL; MPID_Group *node_group_ptr = NULL, *shm_node_group_ptr = NULL; MPIR_Errflag_t errflag = MPIR_ERR_NONE; @@ -348,9 +348,9 @@ static int MPIDI_CH3I_Win_detect_shm(MPID_Win ** win_ptr) #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) static int MPIDI_CH3I_Win_gather_info(void *base, MPI_Aint size, int disp_unit, MPID_Info * info, - MPID_Comm * comm_ptr, MPID_Win ** win_ptr) + MPIR_Comm * comm_ptr, MPID_Win ** win_ptr) { - MPID_Comm *node_comm_ptr = NULL; + MPIR_Comm *node_comm_ptr = NULL; int node_rank; int comm_rank, comm_size; MPI_Aint *tmp_buf = NULL; @@ -491,12 +491,12 @@ static int MPIDI_CH3I_Win_gather_info(void *base, MPI_Aint size, int disp_unit, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) static int MPIDI_CH3I_Win_allocate_shm(MPI_Aint size, int disp_unit, MPID_Info * info, - MPID_Comm * comm_ptr, void *base_ptr, MPID_Win ** win_ptr) + MPIR_Comm * comm_ptr, void *base_ptr, MPID_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; void **base_pp = (void **) base_ptr; int i, node_size, node_rank; - MPID_Comm *node_comm_ptr; + MPIR_Comm *node_comm_ptr; MPI_Aint *node_sizes; MPIR_Errflag_t errflag = MPIR_ERR_NONE; int noncontig = FALSE; diff --git a/src/mpid/ch3/channels/nemesis/src/ch3i_comm.c b/src/mpid/ch3/channels/nemesis/src/ch3i_comm.c index aec3780..620e8c6 100644 --- a/src/mpid/ch3/channels/nemesis/src/ch3i_comm.c +++ b/src/mpid/ch3/channels/nemesis/src/ch3i_comm.c @@ -11,8 +11,8 @@ #define NULL_CONTEXT_ID -1 -static int barrier (MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag); -static int alloc_barrier_vars (MPID_Comm *comm, MPID_nem_barrier_vars_t **vars); +static int barrier (MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag); +static int alloc_barrier_vars (MPIR_Comm *comm, MPID_nem_barrier_vars_t **vars); UT_array *coll_fns_array = NULL; @@ -20,7 +20,7 @@ UT_array *coll_fns_array = NULL; #define FUNCNAME MPIDI_CH3I_comm_create #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3I_comm_create(MPID_Comm *comm, void *param) +int MPIDI_CH3I_comm_create(MPIR_Comm *comm, void *param) { int mpi_errno = MPI_SUCCESS; MPIU_CHKPMEM_DECL(1); @@ -86,7 +86,7 @@ int MPIDI_CH3I_comm_create(MPID_Comm *comm, void *param) #define FUNCNAME MPIDI_CH3I_comm_destroy #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3I_comm_destroy(MPID_Comm *comm, void *param) +int MPIDI_CH3I_comm_destroy(MPIR_Comm *comm, void *param) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3I_COMM_DESTROY); @@ -124,7 +124,7 @@ int MPIDI_CH3I_comm_destroy(MPID_Comm *comm, void *param) #define FUNCNAME alloc_barrier_vars #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int alloc_barrier_vars (MPID_Comm *comm, MPID_nem_barrier_vars_t **vars) +static int alloc_barrier_vars (MPIR_Comm *comm, MPID_nem_barrier_vars_t **vars) { int mpi_errno = MPI_SUCCESS; int i; @@ -161,7 +161,7 @@ static int alloc_barrier_vars (MPID_Comm *comm, MPID_nem_barrier_vars_t **vars) #define FUNCNAME barrier #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int barrier(MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag) +static int barrier(MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) { int mpi_errno = MPI_SUCCESS; MPID_nem_barrier_vars_t *barrier_vars; diff --git a/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt.c b/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt.c index 7370a35..fc345d1 100644 --- a/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt.c +++ b/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt.c @@ -85,7 +85,7 @@ int MPID_nem_lmt_pkthandler_init(MPIDI_CH3_PktHandler_Fcn *pktArray[], int array int MPID_nem_lmt_RndvSend(MPID_Request **sreq_p, const void * buf, MPI_Aint count, MPI_Datatype datatype, int dt_contig ATTRIBUTE((unused)), intptr_t data_sz, MPI_Aint dt_true_lb ATTRIBUTE((unused)), - int rank, int tag, MPID_Comm * comm, int context_offset) + int rank, int tag, MPIR_Comm * comm, int context_offset) { int mpi_errno = MPI_SUCCESS; MPID_PKT_DECL_CAST(upkt, MPID_nem_pkt_lmt_rts_t, rts_pkt); diff --git a/src/mpid/ch3/include/mpid_rma_issue.h b/src/mpid/ch3/include/mpid_rma_issue.h index eb27220..e6e7baa 100644 --- a/src/mpid/ch3/include/mpid_rma_issue.h +++ b/src/mpid/ch3/include/mpid_rma_issue.h @@ -398,7 +398,7 @@ static int issue_put_op(MPIDI_RMA_Op_t * rma_op, MPID_Win * win_ptr, MPIDI_RMA_Target_t * target_ptr, MPIDI_CH3_Pkt_flags_t flags) { MPIDI_VC_t *vc = NULL; - MPID_Comm *comm_ptr = win_ptr->comm_ptr; + MPIR_Comm *comm_ptr = win_ptr->comm_ptr; MPIDI_CH3_Pkt_put_t *put_pkt = &rma_op->pkt.put; MPID_Request *curr_req = NULL; MPI_Datatype target_datatype; @@ -481,7 +481,7 @@ static int issue_acc_op(MPIDI_RMA_Op_t * rma_op, MPID_Win * win_ptr, MPIDI_RMA_Target_t * target_ptr, MPIDI_CH3_Pkt_flags_t flags) { MPIDI_VC_t *vc = NULL; - MPID_Comm *comm_ptr = win_ptr->comm_ptr; + MPIR_Comm *comm_ptr = win_ptr->comm_ptr; MPIDI_CH3_Pkt_accum_t *accum_pkt = &rma_op->pkt.accum; int i, j; MPI_Aint stream_elem_count, stream_unit_count; @@ -648,7 +648,7 @@ static int issue_get_acc_op(MPIDI_RMA_Op_t * rma_op, MPID_Win * win_ptr, MPIDI_RMA_Target_t * target_ptr, MPIDI_CH3_Pkt_flags_t flags) { MPIDI_VC_t *vc = NULL; - MPID_Comm *comm_ptr = win_ptr->comm_ptr; + MPIR_Comm *comm_ptr = win_ptr->comm_ptr; MPIDI_CH3_Pkt_get_accum_t *get_accum_pkt = &rma_op->pkt.get_accum; int i, j; MPI_Aint stream_elem_count, stream_unit_count; @@ -881,7 +881,7 @@ static int issue_get_op(MPIDI_RMA_Op_t * rma_op, MPID_Win * win_ptr, MPIDI_CH3_Pkt_get_t *get_pkt = &rma_op->pkt.get; int mpi_errno = MPI_SUCCESS; MPIDI_VC_t *vc; - MPID_Comm *comm_ptr; + MPIR_Comm *comm_ptr; MPIDU_Datatype*dtp; MPI_Datatype target_datatype; MPID_Request *req = NULL; @@ -1008,7 +1008,7 @@ static int issue_cas_op(MPIDI_RMA_Op_t * rma_op, MPIDI_CH3_Pkt_flags_t flags) { MPIDI_VC_t *vc = NULL; - MPID_Comm *comm_ptr = win_ptr->comm_ptr; + MPIR_Comm *comm_ptr = win_ptr->comm_ptr; MPIDI_CH3_Pkt_cas_t *cas_pkt = &rma_op->pkt.cas; MPID_Request *rmw_req = NULL; MPID_Request *curr_req = NULL; @@ -1071,7 +1071,7 @@ static int issue_fop_op(MPIDI_RMA_Op_t * rma_op, MPIDI_CH3_Pkt_flags_t flags) { MPIDI_VC_t *vc = NULL; - MPID_Comm *comm_ptr = win_ptr->comm_ptr; + MPIR_Comm *comm_ptr = win_ptr->comm_ptr; MPIDI_CH3_Pkt_fop_t *fop_pkt = &rma_op->pkt.fop; MPID_Request *resp_req = NULL; MPID_Request *curr_req = NULL; diff --git a/src/mpid/ch3/include/mpidimpl.h b/src/mpid/ch3/include/mpidimpl.h index 35687cd..92bc3e3 100644 --- a/src/mpid/ch3/include/mpidimpl.h +++ b/src/mpid/ch3/include/mpidimpl.h @@ -613,7 +613,7 @@ typedef enum MPIDI_VC_State MPIDI_VC_STATE_MORIBUND /* Abnormally terminated, there may be unsent/unreceived msgs */ } MPIDI_VC_State_t; -struct MPID_Comm; +struct MPIR_Comm; #ifdef ENABLE_COMM_OVERRIDES typedef struct MPIDI_Comm_ops @@ -622,53 +622,53 @@ typedef struct MPIDI_Comm_ops int (*recv_posted)(struct MPIDI_VC *vc, struct MPID_Request *req); int (*send)(struct MPIDI_VC *vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, - int dest, int tag, MPID_Comm *comm, int context_offset, + int dest, int tag, MPIR_Comm *comm, int context_offset, struct MPID_Request **request); int (*rsend)(struct MPIDI_VC *vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, - int dest, int tag, MPID_Comm *comm, int context_offset, + int dest, int tag, MPIR_Comm *comm, int context_offset, struct MPID_Request **request); int (*ssend)(struct MPIDI_VC *vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, - int dest, int tag, MPID_Comm *comm, int context_offset, + int dest, int tag, MPIR_Comm *comm, int context_offset, struct MPID_Request **request ); int (*isend)(struct MPIDI_VC *vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, - int dest, int tag, MPID_Comm *comm, int context_offset, + int dest, int tag, MPIR_Comm *comm, int context_offset, struct MPID_Request **request ); int (*irsend)(struct MPIDI_VC *vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, - int dest, int tag, MPID_Comm *comm, int context_offset, + int dest, int tag, MPIR_Comm *comm, int context_offset, struct MPID_Request **request ); int (*issend)(struct MPIDI_VC *vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, - int dest, int tag, MPID_Comm *comm, int context_offset, + int dest, int tag, MPIR_Comm *comm, int context_offset, struct MPID_Request **request ); int (*send_init)(struct MPIDI_VC *vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, - int dest, int tag, MPID_Comm *comm, int context_offset, + int dest, int tag, MPIR_Comm *comm, int context_offset, struct MPID_Request **request ); int (*bsend_init)(struct MPIDI_VC *vc, const void *buf, int count, MPI_Datatype datatype, - int dest, int tag, MPID_Comm *comm, int context_offset, + int dest, int tag, MPIR_Comm *comm, int context_offset, struct MPID_Request **request); int (*rsend_init)(struct MPIDI_VC *vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, - int dest, int tag, MPID_Comm *comm, int context_offset, + int dest, int tag, MPIR_Comm *comm, int context_offset, struct MPID_Request **request ); int (*ssend_init)(struct MPIDI_VC *vc, const void *buf, MPI_Aint count, MPI_Datatype datatype, - int dest, int tag, MPID_Comm *comm, int context_offset, + int dest, int tag, MPIR_Comm *comm, int context_offset, struct MPID_Request **request ); int (*startall)(struct MPIDI_VC *vc, int count, struct MPID_Request *requests[]); int (*cancel_send)(struct MPIDI_VC *vc, struct MPID_Request *sreq); int (*cancel_recv)(struct MPIDI_VC *vc, struct MPID_Request *rreq); - int (*probe)(struct MPIDI_VC *vc, int source, int tag, MPID_Comm *comm, int context_offset, + int (*probe)(struct MPIDI_VC *vc, int source, int tag, MPIR_Comm *comm, int context_offset, MPI_Status *status); - int (*iprobe)(struct MPIDI_VC *vc, int source, int tag, MPID_Comm *comm, int context_offset, + int (*iprobe)(struct MPIDI_VC *vc, int source, int tag, MPIR_Comm *comm, int context_offset, int *flag, MPI_Status *status); - int (*improbe)(struct MPIDI_VC *vc, int source, int tag, MPID_Comm *comm, int context_offset, + int (*improbe)(struct MPIDI_VC *vc, int source, int tag, MPIR_Comm *comm, int context_offset, int *flag, MPID_Request **message, MPI_Status *status); int (*imrecv)(struct MPIDI_VC *vc, struct MPID_Request *req); } MPIDI_Comm_ops_t; -extern int (*MPIDI_Anysource_iprobe_fn)(int tag, MPID_Comm * comm, int context_offset, int *flag, +extern int (*MPIDI_Anysource_iprobe_fn)(int tag, MPIR_Comm * comm, int context_offset, int *flag, MPI_Status * status); -extern int (*MPIDI_Anysource_improbe_fn)(int tag, MPID_Comm * comm, int context_offset, +extern int (*MPIDI_Anysource_improbe_fn)(int tag, MPIR_Comm * comm, int context_offset, int *flag, MPID_Request **message, MPI_Status * status); #endif @@ -722,7 +722,7 @@ typedef struct MPIDI_VC int (* rndvSend_fn)( struct MPID_Request **sreq_p, const void * buf, MPI_Aint count, MPI_Datatype datatype, int dt_contig, intptr_t data_sz, MPI_Aint dt_true_lb, int rank, int tag, - struct MPID_Comm * comm, int context_offset ); + struct MPIR_Comm * comm, int context_offset ); int (* rndvRecv_fn)( struct MPIDI_VC * vc, struct MPID_Request *rreq ); /* eager message threshold */ @@ -993,18 +993,18 @@ const char * MPIDI_VC_GetStateString(int); /* Prototypes for internal device routines */ -int MPIDI_Isend_self(const void *, MPI_Aint, MPI_Datatype, int, int, MPID_Comm *, +int MPIDI_Isend_self(const void *, MPI_Aint, MPI_Datatype, int, int, MPIR_Comm *, int, int, MPID_Request **); /*-------------------------- BEGIN MPI PORT SECTION --------------------------*/ /* These are the default functions */ -int MPIDI_Comm_connect(const char *, MPID_Info *, int, MPID_Comm *, MPID_Comm **); -int MPIDI_Comm_accept(const char *, MPID_Info *, int, MPID_Comm *, MPID_Comm **); +int MPIDI_Comm_connect(const char *, MPID_Info *, int, MPIR_Comm *, MPIR_Comm **); +int MPIDI_Comm_accept(const char *, MPID_Info *, int, MPIR_Comm *, MPIR_Comm **); int MPIDI_Comm_spawn_multiple(int, char **, char ***, const int *, MPID_Info **, - int, MPID_Comm *, MPID_Comm **, int *); + int, MPIR_Comm *, MPIR_Comm **, int *); /* This structure defines a module that handles the routines that @@ -1012,10 +1012,10 @@ int MPIDI_Comm_spawn_multiple(int, char **, char ***, const int *, MPID_Info **, typedef struct MPIDI_Port_Ops { int (*OpenPort)( MPID_Info *, char * ); int (*ClosePort)( const char * ); - int (*CommAccept)( const char *, MPID_Info *, int, MPID_Comm *, - MPID_Comm ** ); - int (*CommConnect)( const char *, MPID_Info *, int, MPID_Comm *, - MPID_Comm ** ); + int (*CommAccept)( const char *, MPID_Info *, int, MPIR_Comm *, + MPIR_Comm ** ); + int (*CommConnect)( const char *, MPID_Info *, int, MPIR_Comm *, + MPIR_Comm ** ); } MPIDI_PortFns; #define MPIDI_PORTFNS_VERSION 1 int MPIDI_CH3_PortFnsInit( MPIDI_PortFns * ); @@ -1048,20 +1048,20 @@ void MPIDI_RMA_finalize(void); */ typedef struct { - int (*create)(void *, MPI_Aint, int, MPID_Info *, MPID_Comm *, MPID_Win **); - int (*allocate)(MPI_Aint, int, MPID_Info *, MPID_Comm *, void *, MPID_Win **); - int (*allocate_shared)(MPI_Aint, int, MPID_Info *, MPID_Comm *, void *, MPID_Win **); - int (*allocate_shm)(MPI_Aint, int, MPID_Info *, MPID_Comm *, void *, MPID_Win **); - int (*create_dynamic)(MPID_Info *, MPID_Comm *, MPID_Win **); + int (*create)(void *, MPI_Aint, int, MPID_Info *, MPIR_Comm *, MPID_Win **); + int (*allocate)(MPI_Aint, int, MPID_Info *, MPIR_Comm *, void *, MPID_Win **); + int (*allocate_shared)(MPI_Aint, int, MPID_Info *, MPIR_Comm *, void *, MPID_Win **); + int (*allocate_shm)(MPI_Aint, int, MPID_Info *, MPIR_Comm *, void *, MPID_Win **); + int (*create_dynamic)(MPID_Info *, MPIR_Comm *, MPID_Win **); int (*detect_shm)(MPID_Win **); - int (*gather_info)(void *, MPI_Aint, int, MPID_Info *, MPID_Comm *, MPID_Win **); + int (*gather_info)(void *, MPI_Aint, int, MPID_Info *, MPIR_Comm *, MPID_Win **); int (*shared_query)(MPID_Win *, int, MPI_Aint *, int *, void *); } MPIDI_CH3U_Win_fns_t; extern MPIDI_CH3U_Win_fns_t MPIDI_CH3U_Win_fns; typedef struct { - int (*win_init)(MPI_Aint, int, int, int, MPID_Info *, MPID_Comm *, MPID_Win **); + int (*win_init)(MPI_Aint, int, int, int, MPID_Info *, MPIR_Comm *, MPID_Win **); int (*win_free)(MPID_Win **); } MPIDI_CH3U_Win_hooks_t; @@ -1089,19 +1089,19 @@ int MPIDI_CH3_Win_hooks_init(MPIDI_CH3U_Win_hooks_t *win_hooks); int MPIDI_CH3_Win_pkt_orderings_init(MPIDI_CH3U_Win_pkt_ordering_t * win_pkt_orderings); /* Default window creation functions provided by CH3 */ -int MPIDI_CH3U_Win_create(void *, MPI_Aint, int, MPID_Info *, MPID_Comm *, +int MPIDI_CH3U_Win_create(void *, MPI_Aint, int, MPID_Info *, MPIR_Comm *, MPID_Win **); int MPIDI_CH3U_Win_allocate(MPI_Aint size, int disp_unit, MPID_Info *info, - MPID_Comm *comm, void *baseptr, MPID_Win **win); + MPIR_Comm *comm, void *baseptr, MPID_Win **win); int MPIDI_CH3U_Win_allocate_no_shm(MPI_Aint size, int disp_unit, MPID_Info *info, - MPID_Comm *comm_ptr, void *baseptr, MPID_Win **win_ptr); -int MPIDI_CH3U_Win_create_dynamic(MPID_Info *info, MPID_Comm *comm, MPID_Win **win); + MPIR_Comm *comm_ptr, void *baseptr, MPID_Win **win_ptr); +int MPIDI_CH3U_Win_create_dynamic(MPID_Info *info, MPIR_Comm *comm, MPID_Win **win); int MPIDI_CH3U_Win_shared_query(MPID_Win * win_ptr, int target_rank, MPI_Aint * size, int *disp_unit, void *baseptr); /* MPI RMA Utility functions */ -int MPIDI_CH3U_Win_gather_info(void *, MPI_Aint, int, MPID_Info *, MPID_Comm *, +int MPIDI_CH3U_Win_gather_info(void *, MPI_Aint, int, MPID_Info *, MPIR_Comm *, MPID_Win **); @@ -1254,7 +1254,7 @@ int MPIDI_CH3I_VC_post_sockconnect(MPIDI_VC_t * ); /* Used internally to broadcast process groups belonging to peercomm to all processes in comm*/ -int MPID_PG_BCast( MPID_Comm *peercomm_p, MPID_Comm *comm_p, int root ); +int MPID_PG_BCast( MPIR_Comm *peercomm_p, MPIR_Comm *comm_p, int root ); /* Channel defintitions */ /*@ @@ -1407,17 +1407,17 @@ int MPIDI_CH3_Connect_to_root(const char *, MPIDI_VC_t **); int MPIDI_CH3U_Recvq_init(void); int MPIDI_CH3U_Recvq_FU(int, int, int, MPI_Status * ); MPID_Request * MPIDI_CH3U_Recvq_FDU(MPI_Request, MPIDI_Message_match *); -MPID_Request * MPIDI_CH3U_Recvq_FDU_matchonly(int source, int tag, int context_id, MPID_Comm *comm, +MPID_Request * MPIDI_CH3U_Recvq_FDU_matchonly(int source, int tag, int context_id, MPIR_Comm *comm, int *foundp); MPID_Request * MPIDI_CH3U_Recvq_FDU_or_AEP(int source, int tag, - int context_id, MPID_Comm *comm, void *user_buf, + int context_id, MPIR_Comm *comm, void *user_buf, MPI_Aint user_count, MPI_Datatype datatype, int * foundp); int MPIDI_CH3U_Recvq_DP(MPID_Request * rreq); MPID_Request * MPIDI_CH3U_Recvq_FDP_or_AEU(MPIDI_Message_match * match, int * found); int MPIDI_CH3U_Recvq_count_unexp(void); int MPIDI_CH3U_Complete_posted_with_error(MPIDI_VC_t *vc); -int MPIDI_CH3U_Clean_recvq(MPID_Comm *comm_ptr); +int MPIDI_CH3U_Clean_recvq(MPIR_Comm *comm_ptr); int MPIDI_CH3U_Request_load_send_iov(MPID_Request * const sreq, @@ -1440,14 +1440,14 @@ int MPIDI_CH3U_Receive_data_unexpected(MPID_Request * rreq, char *buf, intptr_t int MPIDI_CH3I_Comm_init(void); int MPIDI_CH3I_Comm_handle_failed_procs(MPID_Group *new_failed_procs); -void MPIDI_CH3I_Comm_find(MPIU_Context_id_t context_id, MPID_Comm **comm); +void MPIDI_CH3I_Comm_find(MPIU_Context_id_t context_id, MPIR_Comm **comm); /* The functions below allow channels to register functions to be called immediately after a communicator has been created, and immediately before a communicator is to be destroyed. */ -int MPIDI_CH3U_Comm_register_create_hook(int (*hook_fn)(struct MPID_Comm *, void *), void *param); -int MPIDI_CH3U_Comm_register_destroy_hook(int (*hook_fn)(struct MPID_Comm *, void *), void *param); +int MPIDI_CH3U_Comm_register_create_hook(int (*hook_fn)(struct MPIR_Comm *, void *), void *param); +int MPIDI_CH3U_Comm_register_destroy_hook(int (*hook_fn)(struct MPIR_Comm *, void *), void *param); /* FIXME: This is a macro! */ #ifndef MPIDI_CH3_Request_add_ref @@ -1754,26 +1754,26 @@ int MPIDI_CH3_PktPrint_EagerSyncAck( FILE *fp, MPIDI_CH3_Pkt_t *pkt ); /* Routines to create packets (used in implementing MPI communications */ int MPIDI_CH3_EagerNoncontigSend( MPID_Request **, MPIDI_CH3_Pkt_type_t, const void *, MPI_Aint, - MPI_Datatype, intptr_t, int, int, MPID_Comm *, + MPI_Datatype, intptr_t, int, int, MPIR_Comm *, int ); int MPIDI_CH3_EagerContigSend( MPID_Request **, MPIDI_CH3_Pkt_type_t, const void *, intptr_t, int, - int, MPID_Comm *, int ); + int, MPIR_Comm *, int ); int MPIDI_CH3_EagerContigShortSend( MPID_Request **, MPIDI_CH3_Pkt_type_t, const void *, intptr_t, - int, int, MPID_Comm *, int ); + int, int, MPIR_Comm *, int ); int MPIDI_CH3_EagerContigIsend( MPID_Request **, MPIDI_CH3_Pkt_type_t, const void *, intptr_t, int, - int, MPID_Comm *, int ); + int, MPIR_Comm *, int ); int MPIDI_CH3_RndvSend( MPID_Request **, const void *, MPI_Aint, MPI_Datatype, - int, intptr_t, MPI_Aint, int, int, MPID_Comm *, int ); + int, intptr_t, MPI_Aint, int, int, MPIR_Comm *, int ); int MPIDI_CH3_EagerSyncNoncontigSend( MPID_Request **, const void *, int, MPI_Datatype, intptr_t, int, MPI_Aint, - int, int, MPID_Comm *, int ); -int MPIDI_CH3_EagerSyncZero(MPID_Request **, int, int, MPID_Comm *, int ); + int, int, MPIR_Comm *, int ); +int MPIDI_CH3_EagerSyncZero(MPID_Request **, int, int, MPIR_Comm *, int ); int MPIDI_CH3_SendNoncontig_iov( struct MPIDI_VC *vc, struct MPID_Request *sreq, void *header, intptr_t hdr_sz ); diff --git a/src/mpid/ch3/include/mpidpost.h b/src/mpid/ch3/include/mpidpost.h index dde3f1b..2490343 100644 --- a/src/mpid/ch3/include/mpidpost.h +++ b/src/mpid/ch3/include/mpidpost.h @@ -125,14 +125,14 @@ int MPIDI_CH3_Open_port(char *port_name); int MPIDI_CH3_Comm_spawn_multiple(int count, char ** commands, char *** argvs, int * maxprocs, MPID_Info ** info_ptrs, int root, - MPID_Comm * comm_ptr, MPID_Comm ** intercomm, + MPIR_Comm * comm_ptr, MPIR_Comm ** intercomm, int * errcodes); -int MPIDI_CH3_Comm_accept(char * port_name, int root, MPID_Comm * comm_ptr, - MPID_Comm ** newcomm); +int MPIDI_CH3_Comm_accept(char * port_name, int root, MPIR_Comm * comm_ptr, + MPIR_Comm ** newcomm); -int MPIDI_CH3_Comm_connect(char * port_name, int root, MPID_Comm * comm_ptr, - MPID_Comm ** newcomm); +int MPIDI_CH3_Comm_connect(char * port_name, int root, MPIR_Comm * comm_ptr, + MPIR_Comm ** newcomm); /* Include definitions from the channel which require items defined by this @@ -175,13 +175,13 @@ int MPIDI_CH3_Comm_connect(char * port_name, int root, MPID_Comm * comm_ptr, #define MPID_Progress_poke() MPIDI_CH3_Progress_poke() /* Dynamic process support */ -int MPID_GPID_GetAllInComm( MPID_Comm *comm_ptr, int local_size, +int MPID_GPID_GetAllInComm( MPIR_Comm *comm_ptr, int local_size, MPIR_Gpid local_gpids[], int *singlePG ); -int MPID_GPID_Get( MPID_Comm *comm_ptr, int rank, MPIR_Gpid *gpid ); +int MPID_GPID_Get( MPIR_Comm *comm_ptr, int rank, MPIR_Gpid *gpid ); int MPID_GPID_ToLpidArray( int size, MPIR_Gpid gpid[], int lpid[] ); -int MPID_Create_intercomm_from_lpids( MPID_Comm *newcomm_ptr, +int MPID_Create_intercomm_from_lpids( MPIR_Comm *newcomm_ptr, int size, const int lpids[] ); -int MPID_PG_ForwardPGInfo( MPID_Comm *peer_ptr, MPID_Comm *comm_ptr, +int MPID_PG_ForwardPGInfo( MPIR_Comm *peer_ptr, MPIR_Comm *comm_ptr, int nPGids, const MPIR_Gpid gpids[], int root ); /* PG_ForwardPGInfo is used as the implementation of the intercomm-create @@ -191,7 +191,7 @@ int MPID_PG_ForwardPGInfo( MPID_Comm *peer_ptr, MPID_Comm *comm_ptr, MPID_PG_ForwardPGInfo(_p,_c,_np,_gp,_r) /* communicator hooks */ -int MPIDI_CH3I_Comm_create_hook(struct MPID_Comm *); -int MPIDI_CH3I_Comm_destroy_hook(struct MPID_Comm *); +int MPIDI_CH3I_Comm_create_hook(struct MPIR_Comm *); +int MPIDI_CH3I_Comm_destroy_hook(struct MPIR_Comm *); #endif /* !defined(MPICH_MPIDPOST_H_INCLUDED) */ diff --git a/src/mpid/ch3/include/mpidpre.h b/src/mpid/ch3/include/mpidpre.h index 95a2838..d02dd68 100644 --- a/src/mpid/ch3/include/mpidpre.h +++ b/src/mpid/ch3/include/mpidpre.h @@ -188,8 +188,8 @@ typedef struct MPIDI_CH3I_comm struct MPIDI_VCRT *vcrt; /* virtual connecton reference table */ struct MPIDI_VCRT *local_vcrt; /* local virtual connecton reference table */ - struct MPID_Comm *next; /* next pointer for list of communicators */ - struct MPID_Comm *prev; /* prev pointer for list of communicators */ + struct MPIR_Comm *next; /* next pointer for list of communicators */ + struct MPIR_Comm *prev; /* prev pointer for list of communicators */ MPIDI_CH3I_CH_comm_t ch; } MPIDI_CH3I_comm_t; diff --git a/src/mpid/ch3/src/ch3u_comm.c b/src/mpid/ch3/src/ch3u_comm.c index 1a0428a..9c87cce 100644 --- a/src/mpid/ch3/src/ch3u_comm.c +++ b/src/mpid/ch3/src/ch3u_comm.c @@ -28,18 +28,18 @@ cvars: */ static int register_hook_finalize(void *param); -static int comm_created(MPID_Comm *comm, void *param); -static int comm_destroyed(MPID_Comm *comm, void *param); +static int comm_created(MPIR_Comm *comm, void *param); +static int comm_destroyed(MPIR_Comm *comm, void *param); /* macros and head for list of communicators */ #define COMM_ADD(comm) MPL_DL_PREPEND_NP(comm_list, comm, dev.next, dev.prev) #define COMM_DEL(comm) MPL_DL_DELETE_NP(comm_list, comm, dev.next, dev.prev) #define COMM_FOREACH(elt) MPL_DL_FOREACH_NP(comm_list, elt, dev.next, dev.prev) -static MPID_Comm *comm_list = NULL; +static MPIR_Comm *comm_list = NULL; typedef struct hook_elt { - int (*hook_fn)(struct MPID_Comm *, void *); + int (*hook_fn)(struct MPIR_Comm *, void *); void *param; struct hook_elt *prev; struct hook_elt *next; @@ -182,12 +182,12 @@ static inline int map_size(MPIR_Comm_map_t map) #define FUNCNAME MPIDI_CH3U_Comm_create_hook #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3I_Comm_create_hook(MPID_Comm *comm) +int MPIDI_CH3I_Comm_create_hook(MPIR_Comm *comm) { int mpi_errno = MPI_SUCCESS; hook_elt *elt; MPIR_Comm_map_t *mapper; - MPID_Comm *src_comm; + MPIR_Comm *src_comm; int vcrt_size, vcrt_offset; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3U_COMM_CREATE_HOOK); @@ -316,7 +316,7 @@ int MPIDI_CH3I_Comm_create_hook(MPID_Comm *comm) #define FUNCNAME MPIDI_CH3U_Comm_destroy_hook #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3I_Comm_destroy_hook(MPID_Comm *comm) +int MPIDI_CH3I_Comm_destroy_hook(MPIR_Comm *comm) { int mpi_errno = MPI_SUCCESS; hook_elt *elt; @@ -349,7 +349,7 @@ int MPIDI_CH3I_Comm_destroy_hook(MPID_Comm *comm) #define FUNCNAME MPIDI_CH3U_Comm_register_create_hook #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3U_Comm_register_create_hook(int (*hook_fn)(struct MPID_Comm *, void *), void *param) +int MPIDI_CH3U_Comm_register_create_hook(int (*hook_fn)(struct MPIR_Comm *, void *), void *param) { int mpi_errno = MPI_SUCCESS; hook_elt *elt; @@ -378,7 +378,7 @@ int MPIDI_CH3U_Comm_register_create_hook(int (*hook_fn)(struct MPID_Comm *, void #define FUNCNAME MPIDI_CH3U_Comm_register_destroy_hook #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3U_Comm_register_destroy_hook(int (*hook_fn)(struct MPID_Comm *, void *), void *param) +int MPIDI_CH3U_Comm_register_destroy_hook(int (*hook_fn)(struct MPIR_Comm *, void *), void *param) { int mpi_errno = MPI_SUCCESS; hook_elt *elt; @@ -436,7 +436,7 @@ static int register_hook_finalize(void *param) #define FUNCNAME comm_created #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int comm_created(MPID_Comm *comm, void *param) +int comm_created(MPIR_Comm *comm, void *param) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_COMM_CREATED); @@ -464,7 +464,7 @@ int comm_created(MPID_Comm *comm, void *param) #define FUNCNAME comm_destroyed #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int comm_destroyed(MPID_Comm *comm, void *param) +int comm_destroyed(MPIR_Comm *comm, void *param) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_COMM_DESTROYED); @@ -488,7 +488,7 @@ int comm_destroyed(MPID_Comm *comm, void *param) #define FUNCNAME nonempty_intersection #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int nonempty_intersection(MPID_Comm *comm, MPID_Group *group, int *flag) +static int nonempty_intersection(MPIR_Comm *comm, MPID_Group *group, int *flag) { int mpi_errno = MPI_SUCCESS; int i_g, i_c; @@ -536,7 +536,7 @@ static int nonempty_intersection(MPID_Comm *comm, MPID_Group *group, int *flag) int MPIDI_CH3I_Comm_handle_failed_procs(MPID_Group *new_failed_procs) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm; + MPIR_Comm *comm; int flag = FALSE; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3I_COMM_HANDLE_FAILED_PROCS); @@ -572,7 +572,7 @@ int MPIDI_CH3I_Comm_handle_failed_procs(MPID_Group *new_failed_procs) goto fn_exit; } -void MPIDI_CH3I_Comm_find(MPIU_Context_id_t context_id, MPID_Comm **comm) +void MPIDI_CH3I_Comm_find(MPIU_Context_id_t context_id, MPIR_Comm **comm) { MPIDI_STATE_DECL(MPIDI_STATE_MPIDI_CH3I_COMM_FIND); MPIDI_FUNC_ENTER(MPIDI_STATE_MPIDI_CH3I_COMM_FIND); diff --git a/src/mpid/ch3/src/ch3u_comm_spawn_multiple.c b/src/mpid/ch3/src/ch3u_comm_spawn_multiple.c index 23b6165..d14e9d6 100644 --- a/src/mpid/ch3/src/ch3u_comm_spawn_multiple.c +++ b/src/mpid/ch3/src/ch3u_comm_spawn_multiple.c @@ -105,7 +105,7 @@ static void free_pmi_keyvals(PMI_keyval_t **kv, int size, int *counts) int MPIDI_Comm_spawn_multiple(int count, char **commands, char ***argvs, const int *maxprocs, MPID_Info **info_ptrs, int root, - MPID_Comm *comm_ptr, MPID_Comm + MPIR_Comm *comm_ptr, MPIR_Comm **intercomm, int *errcodes) { char port_name[MPI_MAX_PORT_NAME]; diff --git a/src/mpid/ch3/src/ch3u_eager.c b/src/mpid/ch3/src/ch3u_eager.c index f493910..e34e35f 100644 --- a/src/mpid/ch3/src/ch3u_eager.c +++ b/src/mpid/ch3/src/ch3u_eager.c @@ -90,7 +90,7 @@ int MPIDI_CH3_EagerNoncontigSend( MPID_Request **sreq_p, const void * buf, MPI_Aint count, MPI_Datatype datatype, intptr_t data_sz, int rank, - int tag, MPID_Comm * comm, + int tag, MPIR_Comm * comm, int context_offset ) { int mpi_errno = MPI_SUCCESS; @@ -154,7 +154,7 @@ int MPIDI_CH3_EagerNoncontigSend( MPID_Request **sreq_p, int MPIDI_CH3_EagerContigSend( MPID_Request **sreq_p, MPIDI_CH3_Pkt_type_t reqtype, const void * buf, intptr_t data_sz, int rank, - int tag, MPID_Comm * comm, int context_offset ) + int tag, MPIR_Comm * comm, int context_offset ) { int mpi_errno = MPI_SUCCESS; MPIDI_VC_t * vc; @@ -220,7 +220,7 @@ int MPIDI_CH3_EagerContigSend( MPID_Request **sreq_p, int MPIDI_CH3_EagerContigShortSend( MPID_Request **sreq_p, MPIDI_CH3_Pkt_type_t reqtype, const void * buf, intptr_t data_sz, int rank, - int tag, MPID_Comm * comm, + int tag, MPIR_Comm * comm, int context_offset ) { int mpi_errno = MPI_SUCCESS; @@ -528,7 +528,7 @@ int MPIDI_CH3_PktHandler_EagerShortSend( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, int MPIDI_CH3_EagerContigIsend( MPID_Request **sreq_p, MPIDI_CH3_Pkt_type_t reqtype, const void * buf, intptr_t data_sz, int rank, - int tag, MPID_Comm * comm, int context_offset ) + int tag, MPIR_Comm * comm, int context_offset ) { int mpi_errno = MPI_SUCCESS; MPIDI_VC_t * vc; diff --git a/src/mpid/ch3/src/ch3u_eagersync.c b/src/mpid/ch3/src/ch3u_eagersync.c index 73af293..cf09ea8 100644 --- a/src/mpid/ch3/src/ch3u_eagersync.c +++ b/src/mpid/ch3/src/ch3u_eagersync.c @@ -31,7 +31,7 @@ int MPIDI_CH3_EagerSyncNoncontigSend( MPID_Request **sreq_p, MPI_Datatype datatype, intptr_t data_sz, int dt_contig, MPI_Aint dt_true_lb, int rank, - int tag, MPID_Comm * comm, + int tag, MPIR_Comm * comm, int context_offset ) { int mpi_errno = MPI_SUCCESS; @@ -117,7 +117,7 @@ int MPIDI_CH3_EagerSyncNoncontigSend( MPID_Request **sreq_p, routine, as we may want to replace this with a counterpart to the Eager Short message */ int MPIDI_CH3_EagerSyncZero(MPID_Request **sreq_p, int rank, int tag, - MPID_Comm * comm, int context_offset ) + MPIR_Comm * comm, int context_offset ) { int mpi_errno = MPI_SUCCESS; MPIDI_CH3_Pkt_t upkt; diff --git a/src/mpid/ch3/src/ch3u_handle_revoke_pkt.c b/src/mpid/ch3/src/ch3u_handle_revoke_pkt.c index 3980c76..c412135 100644 --- a/src/mpid/ch3/src/ch3u_handle_revoke_pkt.c +++ b/src/mpid/ch3/src/ch3u_handle_revoke_pkt.c @@ -15,7 +15,7 @@ int MPIDI_CH3_PktHandler_Revoke(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, { MPIDI_CH3_Pkt_revoke_t *revoke_pkt = &pkt->revoke; int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL; MPL_DBG_MSG_D(MPIDI_CH3_DBG_OTHER, VERBOSE, "Received revoke pkt from %d", vc->pg_rank); diff --git a/src/mpid/ch3/src/ch3u_port.c b/src/mpid/ch3/src/ch3u_port.c index d1f966b..9ca6b12 100644 --- a/src/mpid/ch3/src/ch3u_port.c +++ b/src/mpid/ch3/src/ch3u_port.c @@ -38,17 +38,17 @@ typedef struct pg_node { } pg_node; /* These functions help implement the connect/accept algorithm */ -static int ExtractLocalPGInfo( MPID_Comm *, pg_translation [], +static int ExtractLocalPGInfo( MPIR_Comm *, pg_translation [], pg_node **, int * ); -static int ReceivePGAndDistribute( MPID_Comm *, MPID_Comm *, int, int *, +static int ReceivePGAndDistribute( MPIR_Comm *, MPIR_Comm *, int, int *, int, MPIDI_PG_t *[] ); -static int SendPGtoPeerAndFree( MPID_Comm *, int *, pg_node * ); +static int SendPGtoPeerAndFree( MPIR_Comm *, int *, pg_node * ); static int FreeNewVC( MPIDI_VC_t *new_vc ); -static int SetupNewIntercomm( MPID_Comm *comm_ptr, int remote_comm_size, +static int SetupNewIntercomm( MPIR_Comm *comm_ptr, int remote_comm_size, pg_translation remote_translation[], MPIDI_PG_t **remote_pg, - MPID_Comm *intercomm ); -static int MPIDI_CH3I_Initialize_tmp_comm(MPID_Comm **comm_pptr, + MPIR_Comm *intercomm ); +static int MPIDI_CH3I_Initialize_tmp_comm(MPIR_Comm **comm_pptr, MPIDI_VC_t *vc_ptr, int is_low_group, int context_id_offset); /* ------------------------------------------------------------------------- */ /* @@ -114,11 +114,11 @@ static int MPIDI_CH3I_Initialize_tmp_comm(MPID_Comm **comm_pptr, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) static int MPIDI_Create_inter_root_communicator_connect(const char *port_name, - MPID_Comm **comm_pptr, + MPIR_Comm **comm_pptr, MPIDI_VC_t **vc_pptr) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *tmp_comm; + MPIR_Comm *tmp_comm; MPIDI_VC_t *connect_vc = NULL; int port_name_tag; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CREATE_INTER_ROOT_COMMUNICATOR_CONNECT); @@ -163,11 +163,11 @@ static int MPIDI_Create_inter_root_communicator_connect(const char *port_name, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) static int MPIDI_Create_inter_root_communicator_accept(const char *port_name, - MPID_Comm **comm_pptr, + MPIR_Comm **comm_pptr, MPIDI_VC_t **vc_pptr) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *tmp_comm; + MPIR_Comm *tmp_comm; MPIDI_VC_t *new_vc = NULL; MPID_Progress_state progress_state; int port_name_tag; @@ -234,16 +234,16 @@ fn_fail: #define FUNCNAME MPIDI_CH3I_Initialize_tmp_comm #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int MPIDI_CH3I_Initialize_tmp_comm(MPID_Comm **comm_pptr, +static int MPIDI_CH3I_Initialize_tmp_comm(MPIR_Comm **comm_pptr, MPIDI_VC_t *vc_ptr, int is_low_group, int context_id_offset) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *tmp_comm, *commself_ptr; + MPIR_Comm *tmp_comm, *commself_ptr; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3I_INITIALIZE_TMP_COMM); MPIDI_FUNC_ENTER(MPID_STATE_MPIDI_CH3I_INITIALIZE_TMP_COMM); - MPID_Comm_get_ptr( MPI_COMM_SELF, commself_ptr ); + MPIR_Comm_get_ptr( MPI_COMM_SELF, commself_ptr ); /* WDG-old code allocated a context id that was then discarded */ mpi_errno = MPIR_Comm_create(&tmp_comm); @@ -331,12 +331,12 @@ fn_fail: #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_Comm_connect(const char *port_name, MPID_Info *info, int root, - MPID_Comm *comm_ptr, MPID_Comm **newcomm) + MPIR_Comm *comm_ptr, MPIR_Comm **newcomm) { int mpi_errno=MPI_SUCCESS; int j, i, rank, recv_ints[3], send_ints[3], context_id; int remote_comm_size=0; - MPID_Comm *tmp_comm = NULL; + MPIR_Comm *tmp_comm = NULL; MPIDI_VC_t *new_vc = NULL; int sendtag=100, recvtag=100, n_remote_pgs; int n_local_pgs=1, local_comm_size; @@ -574,7 +574,7 @@ int MPIDI_Comm_connect(const char *port_name, MPID_Info *info, int root, #define FUNCNAME ExtractLocalPGInfo #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int ExtractLocalPGInfo( MPID_Comm *comm_p, +static int ExtractLocalPGInfo( MPIR_Comm *comm_p, pg_translation local_translation[], pg_node **pg_list_p, int *n_local_pgs_p ) @@ -681,7 +681,7 @@ static int ExtractLocalPGInfo( MPID_Comm *comm_p, #define FUNCNAME ReceivePGAndDistribute #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int ReceivePGAndDistribute( MPID_Comm *tmp_comm, MPID_Comm *comm_ptr, +static int ReceivePGAndDistribute( MPIR_Comm *tmp_comm, MPIR_Comm *comm_ptr, int root, int *recvtag_p, int n_remote_pgs, MPIDI_PG_t *remote_pg[] ) { @@ -760,7 +760,7 @@ static int ReceivePGAndDistribute( MPID_Comm *tmp_comm, MPID_Comm *comm_ptr, #define FUNCNAME MPID_PG_BCast #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_PG_BCast( MPID_Comm *peercomm_p, MPID_Comm *comm_p, int root ) +int MPID_PG_BCast( MPIR_Comm *peercomm_p, MPIR_Comm *comm_p, int root ) { int n_local_pgs=0, mpi_errno = MPI_SUCCESS; pg_translation *local_translation = 0; @@ -864,7 +864,7 @@ int MPID_PG_BCast( MPID_Comm *peercomm_p, MPID_Comm *comm_p, int root ) #define FUNCNAME SendPGtoPeerAndFree #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int SendPGtoPeerAndFree( MPID_Comm *tmp_comm, int *sendtag_p, +static int SendPGtoPeerAndFree( MPIR_Comm *tmp_comm, int *sendtag_p, pg_node *pg_list ) { int mpi_errno = 0; @@ -927,12 +927,12 @@ static int SendPGtoPeerAndFree( MPID_Comm *tmp_comm, int *sendtag_p, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_Comm_accept(const char *port_name, MPID_Info *info, int root, - MPID_Comm *comm_ptr, MPID_Comm **newcomm) + MPIR_Comm *comm_ptr, MPIR_Comm **newcomm) { int mpi_errno=MPI_SUCCESS; int i, j, rank, recv_ints[3], send_ints[3], context_id; int remote_comm_size=0; - MPID_Comm *tmp_comm = NULL, *intercomm; + MPIR_Comm *tmp_comm = NULL, *intercomm; MPIDI_VC_t *new_vc = NULL; int sendtag=100, recvtag=100, local_comm_size; int n_local_pgs=1, n_remote_pgs; @@ -1147,10 +1147,10 @@ Input/Output Parameters: #define FUNCNAME SetupNewIntercomm #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int SetupNewIntercomm( MPID_Comm *comm_ptr, int remote_comm_size, +static int SetupNewIntercomm( MPIR_Comm *comm_ptr, int remote_comm_size, pg_translation remote_translation[], MPIDI_PG_t **remote_pg, - MPID_Comm *intercomm ) + MPIR_Comm *intercomm ) { int mpi_errno = MPI_SUCCESS, i; MPIR_Errflag_t errflag = MPIR_ERR_NONE; diff --git a/src/mpid/ch3/src/ch3u_recvq.c b/src/mpid/ch3/src/ch3u_recvq.c index 717fa27..cdda99a 100644 --- a/src/mpid/ch3/src/ch3u_recvq.c +++ b/src/mpid/ch3/src/ch3u_recvq.c @@ -373,7 +373,7 @@ MPID_Request * MPIDI_CH3U_Recvq_FDU(MPI_Request sreq_id, #define FUNCNAME MPIDI_CH3U_Recvq_FDU_matchonly #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -MPID_Request * MPIDI_CH3U_Recvq_FDU_matchonly(int source, int tag, int context_id, MPID_Comm *comm, int *foundp) +MPID_Request * MPIDI_CH3U_Recvq_FDU_matchonly(int source, int tag, int context_id, MPIR_Comm *comm, int *foundp) { int found = FALSE; MPID_Request *rreq, *prev_rreq; @@ -491,7 +491,7 @@ lock_exit: #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) MPID_Request * MPIDI_CH3U_Recvq_FDU_or_AEP(int source, int tag, - int context_id, MPID_Comm *comm, void *user_buf, + int context_id, MPIR_Comm *comm, void *user_buf, MPI_Aint user_count, MPI_Datatype datatype, int * foundp) { int mpi_errno = MPI_SUCCESS; @@ -806,7 +806,7 @@ MPID_Request * MPIDI_CH3U_Recvq_FDP_or_AEU(MPIDI_Message_match * match, * revoked. If so, just throw this request away since it won't be used * anyway. */ { - MPID_Comm *comm_ptr; + MPIR_Comm *comm_ptr; int mpi_errno ATTRIBUTE((unused)) = MPI_SUCCESS; MPIDI_CH3I_Comm_find(match->parts.context_id, &comm_ptr); @@ -912,7 +912,7 @@ static inline void dequeue_and_set_error(MPID_Request **req, MPID_Request *prev * may then find it and dequeue it. * */ -int MPIDI_CH3U_Clean_recvq(MPID_Comm *comm_ptr) +int MPIDI_CH3U_Clean_recvq(MPIR_Comm *comm_ptr) { int mpi_errno = MPI_SUCCESS; int error = MPI_SUCCESS; diff --git a/src/mpid/ch3/src/ch3u_rma_sync.c b/src/mpid/ch3/src/ch3u_rma_sync.c index 5c68197..6dcccc6 100644 --- a/src/mpid/ch3/src/ch3u_rma_sync.c +++ b/src/mpid/ch3/src/ch3u_rma_sync.c @@ -515,7 +515,7 @@ int MPID_Win_fence(int assert, MPID_Win * win_ptr) MPI_Request fence_sync_req; if (win_ptr->shm_allocated == TRUE) { - MPID_Comm *node_comm_ptr = win_ptr->comm_ptr->node_comm; + MPIR_Comm *node_comm_ptr = win_ptr->comm_ptr->node_comm; mpi_errno = MPIR_Barrier_impl(node_comm_ptr, &errflag); if (mpi_errno != MPI_SUCCESS) @@ -676,7 +676,7 @@ int MPID_Win_fence(int assert, MPID_Win * win_ptr) } if (win_ptr->shm_allocated == TRUE) { - MPID_Comm *node_comm_ptr = win_ptr->comm_ptr->node_comm; + MPIR_Comm *node_comm_ptr = win_ptr->comm_ptr->node_comm; mpi_errno = MPIR_Barrier_impl(node_comm_ptr, &errflag); if (mpi_errno != MPI_SUCCESS) MPIR_ERR_POP(mpi_errno); @@ -736,7 +736,7 @@ int MPID_Win_post(MPID_Group * post_grp_ptr, int assert, MPID_Win * win_ptr) MPI_Request *req; MPI_Status *status; int i, post_grp_size, dst, rank; - MPID_Comm *win_comm_ptr; + MPIR_Comm *win_comm_ptr; /* NOCHECK not specified. We need to notify the source * processes that Post has been called. */ @@ -869,7 +869,7 @@ int MPID_Win_start(MPID_Group * group_ptr, int assert, MPID_Win * win_ptr) int i, intra_cnt; MPI_Request *intra_start_req = NULL; MPI_Status *intra_start_status = NULL; - MPID_Comm *comm_ptr = win_ptr->comm_ptr; + MPIR_Comm *comm_ptr = win_ptr->comm_ptr; int rank = comm_ptr->rank; /* wait for messages from local processes */ diff --git a/src/mpid/ch3/src/ch3u_rndv.c b/src/mpid/ch3/src/ch3u_rndv.c index 1787628..cbb3885 100644 --- a/src/mpid/ch3/src/ch3u_rndv.c +++ b/src/mpid/ch3/src/ch3u_rndv.c @@ -20,7 +20,7 @@ int MPIDI_CH3_RndvSend( MPID_Request **sreq_p, const void * buf, MPI_Aint count, MPI_Datatype datatype, int dt_contig, intptr_t data_sz, MPI_Aint dt_true_lb, int rank, - int tag, MPID_Comm * comm, int context_offset ) + int tag, MPIR_Comm * comm, int context_offset ) { MPIDI_CH3_Pkt_t upkt; MPIDI_CH3_Pkt_rndv_req_to_send_t * const rts_pkt = &upkt.rndv_req_to_send; diff --git a/src/mpid/ch3/src/ch3u_win_fns.c b/src/mpid/ch3/src/ch3u_win_fns.c index 5f69346..9cbbdc2 100644 --- a/src/mpid/ch3/src/ch3u_win_fns.c +++ b/src/mpid/ch3/src/ch3u_win_fns.c @@ -39,7 +39,7 @@ int MPIDI_Win_fns_init(MPIDI_CH3U_Win_fns_t * win_fns) #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3U_Win_gather_info(void *base, MPI_Aint size, int disp_unit, - MPID_Info * info, MPID_Comm * comm_ptr, MPID_Win ** win_ptr) + MPID_Info * info, MPIR_Comm * comm_ptr, MPID_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS, i, k, comm_size, rank; MPI_Aint *tmp_buf; @@ -106,7 +106,7 @@ int MPIDI_CH3U_Win_gather_info(void *base, MPI_Aint size, int disp_unit, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3U_Win_create(void *base, MPI_Aint size, int disp_unit, MPID_Info * info, - MPID_Comm * comm_ptr, MPID_Win ** win_ptr) + MPIR_Comm * comm_ptr, MPID_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3U_WIN_CREATE); @@ -140,7 +140,7 @@ int MPIDI_CH3U_Win_create(void *base, MPI_Aint size, int disp_unit, MPID_Info * #define FUNCNAME MPIDI_CH3U_Win_create_dynamic #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3U_Win_create_dynamic(MPID_Info * info, MPID_Comm * comm_ptr, MPID_Win ** win_ptr) +int MPIDI_CH3U_Win_create_dynamic(MPID_Info * info, MPIR_Comm * comm_ptr, MPID_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3U_WIN_CREATE_DYNAMIC); @@ -211,7 +211,7 @@ int MPID_Win_detach(MPID_Win * win, const void *base) #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3U_Win_allocate(MPI_Aint size, int disp_unit, MPID_Info * info, - MPID_Comm * comm_ptr, void *baseptr, MPID_Win ** win_ptr) + MPIR_Comm * comm_ptr, void *baseptr, MPID_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3U_WIN_ALLOCATE); @@ -245,7 +245,7 @@ int MPIDI_CH3U_Win_allocate(MPI_Aint size, int disp_unit, MPID_Info * info, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDI_CH3U_Win_allocate_no_shm(MPI_Aint size, int disp_unit, MPID_Info * info, - MPID_Comm * comm_ptr, void *baseptr, MPID_Win ** win_ptr) + MPIR_Comm * comm_ptr, void *baseptr, MPID_Win ** win_ptr) { void **base_pp = (void **) baseptr; int mpi_errno = MPI_SUCCESS; diff --git a/src/mpid/ch3/src/mpid_abort.c b/src/mpid/ch3/src/mpid_abort.c index e598fcc..8cb5d37 100644 --- a/src/mpid/ch3/src/mpid_abort.c +++ b/src/mpid/ch3/src/mpid_abort.c @@ -30,7 +30,7 @@ #define FUNCNAME MPID_Abort #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Abort(MPID_Comm * comm, int mpi_errno, int exit_code, +int MPID_Abort(MPIR_Comm * comm, int mpi_errno, int exit_code, const char *error_msg) { int rank; diff --git a/src/mpid/ch3/src/mpid_coll.c b/src/mpid/ch3/src/mpid_coll.c new file mode 100644 index 0000000..a302616 --- /dev/null +++ b/src/mpid/ch3/src/mpid_coll.c @@ -0,0 +1,710 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + * (C) 2001 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ + +#include "mpidimpl.h" + +#undef FUNCNAME +#define FUNCNAME MPID_Barrier +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPID_Barrier(MPIR_Comm * comm, MPIR_Errflag_t * errflag) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Barrier_impl(comm, errflag); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Bcast +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPID_Bcast(void * buffer, int count, MPI_Datatype datatype, int root, + MPIR_Comm * comm, MPIR_Errflag_t * errflag) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Bcast_impl(buffer, count, datatype, root, comm, errflag); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Allreduce +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPID_Allreduce(const void * sendbuf, void * recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, + MPIR_Errflag_t * errflag) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Allreduce_impl(sendbuf, recvbuf, count, datatype, op, comm, errflag); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Allgather +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPID_Allgather(const void * sendbuf, int sendcount, MPI_Datatype sendtype, + void * recvbuf, int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm, MPIR_Errflag_t * errflag) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Allgather_impl(sendbuf, sendcount, sendtype, recvbuf, + recvcount, recvtype, comm, errflag); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Allgatherv +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPID_Allgatherv(const void * sendbuf, int sendcount, MPI_Datatype sendtype, + void * recvbuf, const int * recvcounts, const int * displs, + MPI_Datatype recvtype, MPIR_Comm * comm, MPIR_Errflag_t * errflag) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Allgatherv_impl(sendbuf, sendcount, sendtype, recvbuf, + recvcounts, displs, recvtype, comm, errflag); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Scatter +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPID_Scatter(const void * sendbuf, int sendcount, MPI_Datatype sendtype, + void * recvbuf, int recvcount, MPI_Datatype recvtype, + int root, MPIR_Comm * comm, MPIR_Errflag_t * errflag) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Scatter_impl(sendbuf, sendcount, sendtype, recvbuf, recvcount, + recvtype, root, comm, errflag); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Scatterv +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPID_Scatterv(const void * sendbuf, const int * sendcounts, const int * displs, + MPI_Datatype sendtype, void * recvbuf, int recvcount, + MPI_Datatype recvtype, int root, MPIR_Comm * comm, + MPIR_Errflag_t * errflag) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Scatterv_impl(sendbuf, sendcounts, displs, sendtype, recvbuf, + recvcount, recvtype, root, comm, errflag); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Gather +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPID_Gather(const void * sendbuf, int sendcount, MPI_Datatype sendtype, + void * recvbuf, int recvcount, MPI_Datatype recvtype, + int root, MPIR_Comm * comm, MPIR_Errflag_t * errflag) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Gather_impl(sendbuf, sendcount, sendtype, recvbuf, recvcount, + recvtype, root, comm, errflag); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Gatherv +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPID_Gatherv(const void * sendbuf, int sendcount, MPI_Datatype sendtype, + void * recvbuf, const int * recvcounts, const int * displs, + MPI_Datatype recvtype, int root, MPIR_Comm * comm, + MPIR_Errflag_t * errflag) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Gatherv_impl(sendbuf, sendcount, sendtype, recvbuf, recvcounts, + displs, recvtype, root, comm, errflag); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Alltoall +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPID_Alltoall(const void * sendbuf, int sendcount, MPI_Datatype sendtype, + void * recvbuf, int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm, MPIR_Errflag_t * errflag) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Alltoall_impl(sendbuf, sendcount, sendtype, recvbuf, recvcount, + recvtype, comm, errflag); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Alltoallv +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPID_Alltoallv(const void * sendbuf, const int * sendcounts, const int * sdispls, + MPI_Datatype sendtype, void * recvbuf, const int * recvcounts, + const int * rdispls, MPI_Datatype recvtype, MPIR_Comm * comm, + MPIR_Errflag_t * errflag) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Alltoallv_impl(sendbuf, sendcounts, sdispls, sendtype, recvbuf, + recvcounts, rdispls, recvtype, comm, errflag); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Alltoallw +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPID_Alltoallw(const void *sendbuf, const int sendcounts[], const int sdispls[], + const MPI_Datatype sendtypes[], void *recvbuf, const int recvcounts[], + const int rdispls[], const MPI_Datatype recvtypes[], + MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Alltoallw_impl(sendbuf, sendcounts, sdispls, + sendtypes, recvbuf, recvcounts, + rdispls, recvtypes, comm_ptr, errflag); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Reduce +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPID_Reduce(const void * sendbuf, void * recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, int root, + MPIR_Comm * comm, MPIR_Errflag_t * errflag) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Reduce_impl(sendbuf, recvbuf, count, datatype, op, root, comm, errflag); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Reduce_scatter +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPID_Reduce_scatter(const void *sendbuf, void *recvbuf, const int recvcounts[], + MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, + MPIR_Errflag_t *errflag) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Reduce_scatter_impl(sendbuf, recvbuf, recvcounts, + datatype, op, comm_ptr, errflag); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Reduce_scatter_block +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPID_Reduce_scatter_block(const void *sendbuf, void *recvbuf, + int recvcount, MPI_Datatype datatype, + MPI_Op op, MPIR_Comm *comm_ptr, MPIR_Errflag_t *errflag) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Reduce_scatter_block_impl(sendbuf, recvbuf, recvcount, + datatype, op, comm_ptr, errflag); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Scan +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPID_Scan(const void * sendbuf, void * recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, + MPIR_Errflag_t * errflag) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Scan_impl(sendbuf, recvbuf, count, datatype, op, comm, errflag); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Exscan +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPID_Exscan(const void * sendbuf, void * recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, + MPIR_Errflag_t * errflag) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Exscan_impl(sendbuf, recvbuf, count, datatype, op, comm, errflag); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Neighbor_allgather +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPID_Neighbor_allgather(const void * sendbuf, int sendcount, MPI_Datatype sendtype, + void * recvbuf, int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Neighbor_allgather_impl(sendbuf, sendcount, sendtype, recvbuf, + recvcount, recvtype, comm); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Neighbor_allgatherv +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPID_Neighbor_allgatherv(const void * sendbuf, int sendcount, MPI_Datatype sendtype, + void * recvbuf, const int recvcounts[], const int displs[], + MPI_Datatype recvtype, MPIR_Comm * comm) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Neighbor_allgatherv_impl(sendbuf, sendcount, sendtype, recvbuf, + recvcounts, displs, recvtype, comm); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Neighbor_alltoallv +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPID_Neighbor_alltoallv(const void * sendbuf, const int sendcounts[], + const int sdispls[], MPI_Datatype sendtype, + void * recvbuf, const int recvcounts[], + const int rdispls[], MPI_Datatype recvtype, + MPIR_Comm * comm) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Neighbor_alltoallv_impl(sendbuf, sendcounts, sdispls, sendtype, + recvbuf, recvcounts, rdispls, recvtype, comm); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Neighbor_alltoallw +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPID_Neighbor_alltoallw(const void * sendbuf, const int sendcounts[], + const MPI_Aint sdispls[], const MPI_Datatype sendtypes[], + void * recvbuf, const int recvcounts[], + const MPI_Aint rdispls[], const MPI_Datatype recvtypes[], + MPIR_Comm * comm) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Neighbor_alltoallw_impl(sendbuf, sendcounts, sdispls, + sendtypes, recvbuf, recvcounts, rdispls, recvtypes, comm); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Neighbor_alltoall +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPID_Neighbor_alltoall(const void * sendbuf, int sendcount, MPI_Datatype sendtype, + void * recvbuf, int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Neighbor_alltoall_impl(sendbuf, sendcount, sendtype, recvbuf, + recvcount, recvtype, comm); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Ineighbor_allgather +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPID_Ineighbor_allgather(const void * sendbuf, int sendcount, MPI_Datatype sendtype, + void * recvbuf, int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm, MPI_Request * request) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Ineighbor_allgather_impl(sendbuf, sendcount, sendtype, recvbuf, + recvcount, recvtype, comm, request); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Ineighbor_allgatherv +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPID_Ineighbor_allgatherv(const void * sendbuf, int sendcount, MPI_Datatype sendtype, + void * recvbuf, const int recvcounts[], const int displs[], MPI_Datatype recvtype, + MPIR_Comm * comm, MPI_Request *request) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Ineighbor_allgatherv_impl(sendbuf, sendcount, sendtype, + recvbuf, recvcounts, displs, recvtype, comm, request); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Ineighbor_alltoall +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPID_Ineighbor_alltoall(const void * sendbuf, int sendcount, MPI_Datatype sendtype, + void * recvbuf, int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm, MPI_Request * request) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Ineighbor_alltoall_impl(sendbuf, sendcount, sendtype, recvbuf, + recvcount, recvtype, comm, request); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Ineighbor_alltoallv +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPID_Ineighbor_alltoallv(const void * sendbuf, const int sendcounts[], + const int sdispls[], MPI_Datatype sendtype, + void * recvbuf, const int recvcounts[], + const int rdispls[], MPI_Datatype recvtype, + MPIR_Comm * comm, MPI_Request * request) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Ineighbor_alltoallv_impl(sendbuf, sendcounts, sdispls, + sendtype, recvbuf, recvcounts, rdispls, recvtype, comm, request); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Ineighbor_alltoallw +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPID_Ineighbor_alltoallw(const void * sendbuf, const int sendcounts[], + const MPI_Aint sdispls[], const MPI_Datatype sendtypes[], + void * recvbuf, const int recvcounts[], + const MPI_Aint rdispls[], const MPI_Datatype recvtypes[], + MPIR_Comm * comm, MPI_Request * request) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Ineighbor_alltoallw_impl(sendbuf, sendcounts, sdispls, + sendtypes, recvbuf, recvcounts, rdispls, recvtypes, comm, request); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Ibarrier +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPID_Ibarrier(MPIR_Comm * comm, MPI_Request * request) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Ibarrier_impl(comm, request); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Ibcast +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPID_Ibcast(void * buffer, int count, MPI_Datatype datatype, int root, + MPIR_Comm * comm, MPI_Request * request) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Ibcast_impl(buffer, count, datatype, root, comm, request); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Iallgather +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPID_Iallgather(const void * sendbuf, int sendcount, MPI_Datatype sendtype, + void * recvbuf, int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm, MPI_Request * request) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Iallgather_impl(sendbuf, sendcount, sendtype, recvbuf, + recvcount, recvtype, comm, request); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Iallgatherv +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPID_Iallgatherv(const void * sendbuf, int sendcount, MPI_Datatype sendtype, + void * recvbuf, const int * recvcounts, const int * displs, MPI_Datatype recvtype, + MPIR_Comm * comm, MPI_Request * request) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Iallgatherv_impl(sendbuf, sendcount, sendtype, recvbuf, + recvcounts, displs, recvtype, comm, request); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Iallreduce +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPID_Iallreduce(const void * sendbuf, void * recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, + MPI_Request * request) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Iallreduce_impl(sendbuf, recvbuf, count, datatype, op, comm, + request); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Ialltoall +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPID_Ialltoall(const void * sendbuf, int sendcount, MPI_Datatype sendtype, + void * recvbuf, int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm, MPI_Request * request) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Ialltoall_impl(sendbuf, sendcount, sendtype, recvbuf, + recvcount, recvtype, comm, request); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Ialltoallv +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPID_Ialltoallv(const void * sendbuf, const int sendcounts[], + const int sdispls[], MPI_Datatype sendtype, + void * recvbuf, const int recvcounts[], + const int rdispls[], MPI_Datatype recvtype, + MPIR_Comm * comm, MPI_Request * request) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Ialltoallv_impl(sendbuf, sendcounts, sdispls, sendtype, + recvbuf, recvcounts, rdispls, recvtype, comm, request); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Ialltoallw +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPID_Ialltoallw(const void * sendbuf, const int sendcounts[], + const int sdispls[], const MPI_Datatype sendtypes[], + void * recvbuf, const int recvcounts[], + const int rdispls[], const MPI_Datatype recvtypes[], + MPIR_Comm * comm, MPI_Request * request) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Ialltoallw_impl(sendbuf, sendcounts, sdispls, sendtypes, + recvbuf, recvcounts, rdispls, recvtypes, comm, request); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Iexscan +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPID_Iexscan(const void * sendbuf, void * recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, + MPI_Request * request) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Iexscan_impl(sendbuf, recvbuf, count, datatype, op, comm, request); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Igather +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPID_Igather(const void * sendbuf, int sendcount, MPI_Datatype sendtype, + void * recvbuf, int recvcount, MPI_Datatype recvtype, + int root, MPIR_Comm * comm, MPI_Request * request) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Igather_impl(sendbuf, sendcount, sendtype, recvbuf, recvcount, + recvtype, root, comm, request); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Igatherv +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPID_Igatherv(const void * sendbuf, int sendcount, MPI_Datatype sendtype, + void * recvbuf, const int * recvcounts, const int * displs, MPI_Datatype recvtype, + int root, MPIR_Comm * comm, MPI_Request * request) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Igatherv_impl(sendbuf, sendcount, sendtype, recvbuf, recvcounts, + displs, recvtype, root, comm, request); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Ireduce_scatter_block +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPID_Ireduce_scatter_block(const void * sendbuf, void * recvbuf, int recvcount, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, + MPI_Request * request) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Ireduce_scatter_block_impl(sendbuf, recvbuf, recvcount, + datatype, op, comm, request); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Ireduce_scatter +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPID_Ireduce_scatter(const void * sendbuf, void * recvbuf, const int recvcounts[], + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, + MPI_Request * request) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Ireduce_scatter_impl(sendbuf, recvbuf, recvcounts, datatype, + op, comm, request); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Ireduce +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPID_Ireduce(const void * sendbuf, void * recvbuf, int count, MPI_Datatype datatype, + MPI_Op op, int root, MPIR_Comm * comm, MPI_Request * request) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Ireduce_impl(sendbuf, recvbuf, count, datatype, op, root, comm, request); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Iscan +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPID_Iscan(const void * sendbuf, void * recvbuf, int count, MPI_Datatype datatype, + MPI_Op op, MPIR_Comm * comm, MPI_Request * request) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Iscan_impl(sendbuf, recvbuf, count, datatype, op, comm, request); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Iscatter +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPID_Iscatter(const void * sendbuf, int sendcount, MPI_Datatype sendtype, + void * recvbuf, int recvcount, MPI_Datatype recvtype, + int root, MPIR_Comm * comm, MPI_Request * request) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Iscatter_impl(sendbuf, sendcount, sendtype, recvbuf, recvcount, + recvtype, root, comm, request); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Iscatterv +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPID_Iscatterv(const void * sendbuf, const int * sendcounts, + const int * displs, MPI_Datatype sendtype, + void * recvbuf, int recvcount, MPI_Datatype recvtype, + int root, MPIR_Comm * comm, MPI_Request * request) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Iscatterv_impl(sendbuf, sendcounts, displs, sendtype, recvbuf, + recvcount, recvtype, root, comm, request); + + return mpi_errno; +} diff --git a/src/mpid/ch3/src/mpid_comm_disconnect.c b/src/mpid/ch3/src/mpid_comm_disconnect.c index f2fc65f..de414e6 100644 --- a/src/mpid/ch3/src/mpid_comm_disconnect.c +++ b/src/mpid/ch3/src/mpid_comm_disconnect.c @@ -22,7 +22,7 @@ #define FUNCNAME MPID_Comm_disconnect #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Comm_disconnect(MPID_Comm *comm_ptr) +int MPID_Comm_disconnect(MPIR_Comm *comm_ptr) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPID_COMM_DISCONNECT); diff --git a/src/mpid/ch3/src/mpid_comm_failure_ack.c b/src/mpid/ch3/src/mpid_comm_failure_ack.c index 947056c..32bc61f 100644 --- a/src/mpid/ch3/src/mpid_comm_failure_ack.c +++ b/src/mpid/ch3/src/mpid_comm_failure_ack.c @@ -10,7 +10,7 @@ #define FUNCNAME MPID_Comm_failure_ack #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Comm_failure_ack(MPID_Comm *comm_ptr) +int MPID_Comm_failure_ack(MPIR_Comm *comm_ptr) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPID_COMM_FAILURE_ACK); @@ -42,7 +42,7 @@ fn_fail: #define FUNCNAME MPID_Comm_failure_get_acked #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Comm_failure_get_acked(MPID_Comm *comm_ptr, MPID_Group **group_ptr) +int MPID_Comm_failure_get_acked(MPIR_Comm *comm_ptr, MPID_Group **group_ptr) { int mpi_errno = MPI_SUCCESS; MPID_Group *failed_group, *comm_group; @@ -77,7 +77,7 @@ fn_fail: #define FUNCNAME MPID_Comm_AS_enabled #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Comm_AS_enabled(MPID_Comm *comm_ptr) { +int MPID_Comm_AS_enabled(MPIR_Comm *comm_ptr) { return comm_ptr->dev.anysource_enabled; } diff --git a/src/mpid/ch3/src/mpid_comm_get_all_failed_procs.c b/src/mpid/ch3/src/mpid_comm_get_all_failed_procs.c index 7d23a6d..706e27d 100644 --- a/src/mpid/ch3/src/mpid_comm_get_all_failed_procs.c +++ b/src/mpid/ch3/src/mpid_comm_get_all_failed_procs.c @@ -12,7 +12,7 @@ #endif /* Generates a bitarray based on orig_comm where all procs in group are marked with 1 */ -static void group_to_bitarray(MPID_Group *group, MPID_Comm *orig_comm, int **bitarray, int *bitarray_size) { +static void group_to_bitarray(MPID_Group *group, MPIR_Comm *orig_comm, int **bitarray, int *bitarray_size) { int mask; int *group_ranks, *comm_ranks, i, index; @@ -50,7 +50,7 @@ static void group_to_bitarray(MPID_Group *group, MPID_Comm *orig_comm, int **bit } /* Generates an MPID_Group from a bitarray */ -static MPID_Group *bitarray_to_group(MPID_Comm *comm_ptr, int *bitarray) +static MPID_Group *bitarray_to_group(MPIR_Comm *comm_ptr, int *bitarray) { MPID_Group *ret_group; MPID_Group *comm_group; @@ -86,7 +86,7 @@ static MPID_Group *bitarray_to_group(MPID_Comm *comm_ptr, int *bitarray) #define FUNCNAME MPID_Comm_get_all_failed_procs #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Comm_get_all_failed_procs(MPID_Comm *comm_ptr, MPID_Group **failed_group, int tag) +int MPID_Comm_get_all_failed_procs(MPIR_Comm *comm_ptr, MPID_Group **failed_group, int tag) { int mpi_errno = MPI_SUCCESS, ret_errno; MPIR_Errflag_t errflag = MPIR_ERR_NONE; diff --git a/src/mpid/ch3/src/mpid_comm_revoke.c b/src/mpid/ch3/src/mpid_comm_revoke.c index ee7fdc6..1bfc210 100644 --- a/src/mpid/ch3/src/mpid_comm_revoke.c +++ b/src/mpid/ch3/src/mpid_comm_revoke.c @@ -19,7 +19,7 @@ #define FUNCNAME MPID_Comm_revoke #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Comm_revoke(MPID_Comm *comm_ptr, int is_remote) +int MPID_Comm_revoke(MPIR_Comm *comm_ptr, int is_remote) { MPIDI_VC_t *vc; MPL_IOV iov[MPL_IOV_LIMIT]; diff --git a/src/mpid/ch3/src/mpid_comm_spawn_multiple.c b/src/mpid/ch3/src/mpid_comm_spawn_multiple.c index 36d6f14..98f88b3 100644 --- a/src/mpid/ch3/src/mpid_comm_spawn_multiple.c +++ b/src/mpid/ch3/src/mpid_comm_spawn_multiple.c @@ -35,7 +35,7 @@ int MPID_Comm_spawn_multiple(int count, char *array_of_commands[], char ** array_of_argv[], const int array_of_maxprocs[], MPID_Info * array_of_info_ptrs[], int root, - MPID_Comm * comm_ptr, MPID_Comm ** intercomm, + MPIR_Comm * comm_ptr, MPIR_Comm ** intercomm, int array_of_errcodes[]) { int mpi_errno = MPI_SUCCESS; diff --git a/src/mpid/ch3/src/mpid_improbe.c b/src/mpid/ch3/src/mpid_improbe.c index 4dbb6b7..83b8e33 100644 --- a/src/mpid/ch3/src/mpid_improbe.c +++ b/src/mpid/ch3/src/mpid_improbe.c @@ -6,7 +6,7 @@ #include "mpidimpl.h" -int (*MPIDI_Anysource_improbe_fn)(int tag, MPID_Comm * comm, int context_offset, +int (*MPIDI_Anysource_improbe_fn)(int tag, MPIR_Comm * comm, int context_offset, int *flag, MPID_Request **message, MPI_Status * status) = NULL; @@ -14,7 +14,7 @@ int (*MPIDI_Anysource_improbe_fn)(int tag, MPID_Comm * comm, int context_offset, #define FUNCNAME MPID_Improbe #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Improbe(int source, int tag, MPID_Comm *comm, int context_offset, +int MPID_Improbe(int source, int tag, MPIR_Comm *comm, int context_offset, int *flag, MPID_Request **message, MPI_Status *status) { int mpi_errno = MPI_SUCCESS; diff --git a/src/mpid/ch3/src/mpid_imrecv.c b/src/mpid/ch3/src/mpid_imrecv.c index 8b46e1e..205ef1d 100644 --- a/src/mpid/ch3/src/mpid_imrecv.c +++ b/src/mpid/ch3/src/mpid_imrecv.c @@ -15,7 +15,7 @@ int MPID_Imrecv(void *buf, int count, MPI_Datatype datatype, { int mpi_errno = MPI_SUCCESS; MPID_Request *rreq; - MPID_Comm *comm; + MPIR_Comm *comm; MPIDI_VC_t *vc = NULL; /* message==NULL is equivalent to MPI_MESSAGE_NO_PROC being passed at the diff --git a/src/mpid/ch3/src/mpid_init.c b/src/mpid/ch3/src/mpid_init.c index a4a551d..e2cfffe 100644 --- a/src/mpid/ch3/src/mpid_init.c +++ b/src/mpid/ch3/src/mpid_init.c @@ -35,7 +35,7 @@ static int init_pg( int *argc_p, char ***argv_p, int *pg_rank_p, MPIDI_PG_t **pg_p ); static int pg_compare_ids(void * id1, void * id2); static int pg_destroy(MPIDI_PG_t * pg ); -static int set_eager_threshold(MPID_Comm *comm_ptr, MPID_Info *info, void *state); +static int set_eager_threshold(MPIR_Comm *comm_ptr, MPID_Info *info, void *state); MPIDI_Process_t MPIDI_Process = { NULL }; MPIDI_CH3U_SRBuf_element_t * MPIDI_CH3U_SRBuf_pool = NULL; @@ -74,7 +74,7 @@ static int finalize_failed_procs_group(void *param) #define FUNCNAME set_eager_threshold #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int set_eager_threshold(MPID_Comm *comm_ptr, MPID_Info *info, void *state) +static int set_eager_threshold(MPIR_Comm *comm_ptr, MPID_Info *info, void *state) { int mpi_errno = MPI_SUCCESS; char *endptr; @@ -108,7 +108,7 @@ int MPID_Init(int *argc, char ***argv, int requested, int *provided, MPIDI_PG_t * pg=NULL; int pg_rank=-1; int pg_size; - MPID_Comm * comm; + MPIR_Comm * comm; int p; int val; MPIDI_STATE_DECL(MPID_STATE_MPID_INIT); diff --git a/src/mpid/ch3/src/mpid_iprobe.c b/src/mpid/ch3/src/mpid_iprobe.c index e30a1b2..4911c9b 100644 --- a/src/mpid/ch3/src/mpid_iprobe.c +++ b/src/mpid/ch3/src/mpid_iprobe.c @@ -6,14 +6,14 @@ #include "mpidimpl.h" -int (*MPIDI_Anysource_iprobe_fn)(int tag, MPID_Comm * comm, int context_offset, int *flag, +int (*MPIDI_Anysource_iprobe_fn)(int tag, MPIR_Comm * comm, int context_offset, int *flag, MPI_Status * status) = NULL; #undef FUNCNAME #define FUNCNAME MPID_Iprobe #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Iprobe(int source, int tag, MPID_Comm *comm, int context_offset, +int MPID_Iprobe(int source, int tag, MPIR_Comm *comm, int context_offset, int *flag, MPI_Status *status) { const int context = comm->recvcontext_id + context_offset; diff --git a/src/mpid/ch3/src/mpid_irecv.c b/src/mpid/ch3/src/mpid_irecv.c index 3261621..2fae936 100644 --- a/src/mpid/ch3/src/mpid_irecv.c +++ b/src/mpid/ch3/src/mpid_irecv.c @@ -11,7 +11,7 @@ #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_Irecv(void * buf, MPI_Aint count, MPI_Datatype datatype, int rank, int tag, - MPID_Comm * comm, int context_offset, + MPIR_Comm * comm, int context_offset, MPID_Request ** request) { MPID_Request * rreq; diff --git a/src/mpid/ch3/src/mpid_irsend.c b/src/mpid/ch3/src/mpid_irsend.c index bc3b78d..9707dc0 100644 --- a/src/mpid/ch3/src/mpid_irsend.c +++ b/src/mpid/ch3/src/mpid_irsend.c @@ -15,7 +15,7 @@ #define FUNCNAME MPID_Irsend #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Irsend(const void * buf, int count, MPI_Datatype datatype, int rank, int tag, MPID_Comm * comm, int context_offset, +int MPID_Irsend(const void * buf, int count, MPI_Datatype datatype, int rank, int tag, MPIR_Comm * comm, int context_offset, MPID_Request ** request) { MPIDI_CH3_Pkt_t upkt; diff --git a/src/mpid/ch3/src/mpid_isend.c b/src/mpid/ch3/src/mpid_isend.c index 7e774be..420f7ad 100644 --- a/src/mpid/ch3/src/mpid_isend.c +++ b/src/mpid/ch3/src/mpid_isend.c @@ -28,7 +28,7 @@ #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_Isend(const void * buf, MPI_Aint count, MPI_Datatype datatype, int rank, - int tag, MPID_Comm * comm, int context_offset, + int tag, MPIR_Comm * comm, int context_offset, MPID_Request ** request) { intptr_t data_sz; diff --git a/src/mpid/ch3/src/mpid_issend.c b/src/mpid/ch3/src/mpid_issend.c index 1ee104b..458f507 100644 --- a/src/mpid/ch3/src/mpid_issend.c +++ b/src/mpid/ch3/src/mpid_issend.c @@ -15,7 +15,7 @@ #define FUNCNAME MPID_Issend #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Issend(const void * buf, int count, MPI_Datatype datatype, int rank, int tag, MPID_Comm * comm, int context_offset, +int MPID_Issend(const void * buf, int count, MPI_Datatype datatype, int rank, int tag, MPIR_Comm * comm, int context_offset, MPID_Request ** request) { intptr_t data_sz; diff --git a/src/mpid/ch3/src/mpid_mprobe.c b/src/mpid/ch3/src/mpid_mprobe.c index 6e50eaf..fa53dc2 100644 --- a/src/mpid/ch3/src/mpid_mprobe.c +++ b/src/mpid/ch3/src/mpid_mprobe.c @@ -10,7 +10,7 @@ #define FUNCNAME MPID_Mprobe #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Mprobe(int source, int tag, MPID_Comm *comm, int context_offset, +int MPID_Mprobe(int source, int tag, MPIR_Comm *comm, int context_offset, MPID_Request **message, MPI_Status *status) { int mpi_errno = MPI_SUCCESS; diff --git a/src/mpid/ch3/src/mpid_port.c b/src/mpid/ch3/src/mpid_port.c index 9069996..8b014f1 100644 --- a/src/mpid/ch3/src/mpid_port.c +++ b/src/mpid/ch3/src/mpid_port.c @@ -129,7 +129,7 @@ int MPID_Close_port(const char *port_name) #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_Comm_accept(const char * port_name, MPID_Info * info, int root, - MPID_Comm * comm, MPID_Comm ** newcomm_ptr) + MPIR_Comm * comm, MPIR_Comm ** newcomm_ptr) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPID_COMM_ACCEPT); @@ -167,7 +167,7 @@ int MPID_Comm_accept(const char * port_name, MPID_Info * info, int root, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_Comm_connect(const char * port_name, MPID_Info * info, int root, - MPID_Comm * comm, MPID_Comm ** newcomm_ptr) + MPIR_Comm * comm, MPIR_Comm ** newcomm_ptr) { int mpi_errno=MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPID_COMM_CONNECT); diff --git a/src/mpid/ch3/src/mpid_probe.c b/src/mpid/ch3/src/mpid_probe.c index 2c37309..d7279bf 100644 --- a/src/mpid/ch3/src/mpid_probe.c +++ b/src/mpid/ch3/src/mpid_probe.c @@ -10,7 +10,7 @@ #define FUNCNAME MPID_Probe #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Probe(int source, int tag, MPID_Comm * comm, int context_offset, +int MPID_Probe(int source, int tag, MPIR_Comm * comm, int context_offset, MPI_Status * status) { MPID_Progress_state progress_state; diff --git a/src/mpid/ch3/src/mpid_recv.c b/src/mpid/ch3/src/mpid_recv.c index 9dc5f3d..eb70e1f 100644 --- a/src/mpid/ch3/src/mpid_recv.c +++ b/src/mpid/ch3/src/mpid_recv.c @@ -11,7 +11,7 @@ #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_Recv(void * buf, MPI_Aint count, MPI_Datatype datatype, int rank, int tag, - MPID_Comm * comm, int context_offset, + MPIR_Comm * comm, int context_offset, MPI_Status * status, MPID_Request ** request) { /* FIXME: in the common case, we want to simply complete the message diff --git a/src/mpid/ch3/src/mpid_rma.c b/src/mpid/ch3/src/mpid_rma.c index 872d514..e32c838 100644 --- a/src/mpid/ch3/src/mpid_rma.c +++ b/src/mpid/ch3/src/mpid_rma.c @@ -51,7 +51,7 @@ int MPIDI_CH3I_RMA_Active_req_cnt = 0; int MPIDI_CH3I_RMA_Progress_hook_id = 0; static int win_init(MPI_Aint size, int disp_unit, int create_flavor, int model, MPID_Info * info, - MPID_Comm * comm_ptr, MPID_Win ** win_ptr); + MPIR_Comm * comm_ptr, MPID_Win ** win_ptr); #undef FUNCNAME @@ -59,7 +59,7 @@ static int win_init(MPI_Aint size, int disp_unit, int create_flavor, int model, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_Win_create(void *base, MPI_Aint size, int disp_unit, MPID_Info * info, - MPID_Comm * comm_ptr, MPID_Win ** win_ptr) + MPIR_Comm * comm_ptr, MPID_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; @@ -94,7 +94,7 @@ int MPID_Win_create(void *base, MPI_Aint size, int disp_unit, MPID_Info * info, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_Win_allocate(MPI_Aint size, int disp_unit, MPID_Info * info, - MPID_Comm * comm_ptr, void *baseptr, MPID_Win ** win_ptr) + MPIR_Comm * comm_ptr, void *baseptr, MPID_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPID_WIN_ALLOCATE); @@ -123,7 +123,7 @@ int MPID_Win_allocate(MPI_Aint size, int disp_unit, MPID_Info * info, #define FUNCNAME MPID_Win_create_dynamic #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Win_create_dynamic(MPID_Info * info, MPID_Comm * comm_ptr, MPID_Win ** win_ptr) +int MPID_Win_create_dynamic(MPID_Info * info, MPIR_Comm * comm_ptr, MPID_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; @@ -193,7 +193,7 @@ int MPID_Free_mem(void *ptr) #define FUNCNAME MPID_Win_allocate_shared #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Win_allocate_shared(MPI_Aint size, int disp_unit, MPID_Info * info, MPID_Comm * comm_ptr, +int MPID_Win_allocate_shared(MPI_Aint size, int disp_unit, MPID_Info * info, MPIR_Comm * comm_ptr, void *base_ptr, MPID_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; @@ -246,11 +246,11 @@ int MPID_Win_shared_query(MPID_Win * win, int rank, MPI_Aint * size, int *disp_u #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) static int win_init(MPI_Aint size, int disp_unit, int create_flavor, int model, MPID_Info * info, - MPID_Comm * comm_ptr, MPID_Win ** win_ptr) + MPIR_Comm * comm_ptr, MPID_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; int i; - MPID_Comm *win_comm_ptr; + MPIR_Comm *win_comm_ptr; int win_target_pool_size; MPIU_CHKPMEM_DECL(5); MPIDI_STATE_DECL(MPID_STATE_WIN_INIT); diff --git a/src/mpid/ch3/src/mpid_rsend.c b/src/mpid/ch3/src/mpid_rsend.c index 960aac9..e82eeba 100644 --- a/src/mpid/ch3/src/mpid_rsend.c +++ b/src/mpid/ch3/src/mpid_rsend.c @@ -19,7 +19,7 @@ #define FUNCNAME MPID_Rsend #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Rsend(const void * buf, int count, MPI_Datatype datatype, int rank, int tag, MPID_Comm * comm, int context_offset, +int MPID_Rsend(const void * buf, int count, MPI_Datatype datatype, int rank, int tag, MPIR_Comm * comm, int context_offset, MPID_Request ** request) { intptr_t data_sz; diff --git a/src/mpid/ch3/src/mpid_send.c b/src/mpid/ch3/src/mpid_send.c index 2f1b477..8754b65 100644 --- a/src/mpid/ch3/src/mpid_send.c +++ b/src/mpid/ch3/src/mpid_send.c @@ -16,7 +16,7 @@ #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPID_Send(const void * buf, MPI_Aint count, MPI_Datatype datatype, int rank, - int tag, MPID_Comm * comm, int context_offset, + int tag, MPIR_Comm * comm, int context_offset, MPID_Request ** request) { intptr_t data_sz; diff --git a/src/mpid/ch3/src/mpid_ssend.c b/src/mpid/ch3/src/mpid_ssend.c index f1db29d..aa3e3b9 100644 --- a/src/mpid/ch3/src/mpid_ssend.c +++ b/src/mpid/ch3/src/mpid_ssend.c @@ -15,7 +15,7 @@ #define FUNCNAME MPID_Ssend #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Ssend(const void * buf, MPI_Aint count, MPI_Datatype datatype, int rank, int tag, MPID_Comm * comm, int context_offset, +int MPID_Ssend(const void * buf, MPI_Aint count, MPI_Datatype datatype, int rank, int tag, MPIR_Comm * comm, int context_offset, MPID_Request ** request) { intptr_t data_sz; diff --git a/src/mpid/ch3/src/mpid_startall.c b/src/mpid/ch3/src/mpid_startall.c index f288dfb..c76defd 100644 --- a/src/mpid/ch3/src/mpid_startall.c +++ b/src/mpid/ch3/src/mpid_startall.c @@ -162,7 +162,7 @@ int MPID_Startall(int count, MPID_Request * requests[]) #define FUNCNAME MPID_Send_init #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Send_init(const void * buf, int count, MPI_Datatype datatype, int rank, int tag, MPID_Comm * comm, int context_offset, +int MPID_Send_init(const void * buf, int count, MPI_Datatype datatype, int rank, int tag, MPIR_Comm * comm, int context_offset, MPID_Request ** request) { MPID_Request * sreq; @@ -192,7 +192,7 @@ int MPID_Send_init(const void * buf, int count, MPI_Datatype datatype, int rank, #define FUNCNAME MPID_Ssend_init #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Ssend_init(const void * buf, int count, MPI_Datatype datatype, int rank, int tag, MPID_Comm * comm, int context_offset, +int MPID_Ssend_init(const void * buf, int count, MPI_Datatype datatype, int rank, int tag, MPIR_Comm * comm, int context_offset, MPID_Request ** request) { MPID_Request * sreq; @@ -222,7 +222,7 @@ int MPID_Ssend_init(const void * buf, int count, MPI_Datatype datatype, int rank #define FUNCNAME MPID_Rsend_init #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Rsend_init(const void * buf, int count, MPI_Datatype datatype, int rank, int tag, MPID_Comm * comm, int context_offset, +int MPID_Rsend_init(const void * buf, int count, MPI_Datatype datatype, int rank, int tag, MPIR_Comm * comm, int context_offset, MPID_Request ** request) { MPID_Request * sreq; @@ -252,7 +252,7 @@ int MPID_Rsend_init(const void * buf, int count, MPI_Datatype datatype, int rank #define FUNCNAME MPID_Bsend_init #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Bsend_init(const void * buf, int count, MPI_Datatype datatype, int rank, int tag, MPID_Comm * comm, int context_offset, +int MPID_Bsend_init(const void * buf, int count, MPI_Datatype datatype, int rank, int tag, MPIR_Comm * comm, int context_offset, MPID_Request ** request) { MPID_Request * sreq; @@ -290,7 +290,7 @@ int MPID_Bsend_init(const void * buf, int count, MPI_Datatype datatype, int rank #define FUNCNAME MPID_Recv_init #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Recv_init(void * buf, int count, MPI_Datatype datatype, int rank, int tag, MPID_Comm * comm, int context_offset, +int MPID_Recv_init(void * buf, int count, MPI_Datatype datatype, int rank, int tag, MPIR_Comm * comm, int context_offset, MPID_Request ** request) { MPID_Request * rreq; diff --git a/src/mpid/ch3/src/mpid_vc.c b/src/mpid/ch3/src/mpid_vc.c index a728a9b..1da27f1 100644 --- a/src/mpid/ch3/src/mpid_vc.c +++ b/src/mpid/ch3/src/mpid_vc.c @@ -300,7 +300,7 @@ int MPIDI_VCR_Dup(MPIDI_VCR orig_vcr, MPIDI_VCR * new_vcr) #define FUNCNAME MPID_Comm_get_lpid #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Comm_get_lpid(MPID_Comm *comm_ptr, int idx, int * lpid_ptr, MPIU_BOOL is_remote) +int MPID_Comm_get_lpid(MPIR_Comm *comm_ptr, int idx, int * lpid_ptr, MPIU_BOOL is_remote) { MPIDI_STATE_DECL(MPID_STATE_MPID_VCR_GET_LPID); @@ -327,7 +327,7 @@ int MPID_Comm_get_lpid(MPID_Comm *comm_ptr, int idx, int * lpid_ptr, MPIU_BOOL i #define FUNCNAME MPID_GPID_GetAllInComm #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_GPID_GetAllInComm( MPID_Comm *comm_ptr, int local_size, +int MPID_GPID_GetAllInComm( MPIR_Comm *comm_ptr, int local_size, MPIR_Gpid local_gpids[], int *singlePG ) { int mpi_errno = MPI_SUCCESS; @@ -369,7 +369,7 @@ int MPID_GPID_GetAllInComm( MPID_Comm *comm_ptr, int local_size, #define FUNCNAME MPID_GPID_Get #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_GPID_Get( MPID_Comm *comm_ptr, int rank, MPIR_Gpid *in_gpid ) +int MPID_GPID_Get( MPIR_Comm *comm_ptr, int rank, MPIR_Gpid *in_gpid ) { int pgid; MPIDI_VCR vc; @@ -462,11 +462,11 @@ int MPID_GPID_ToLpidArray( int size, MPIR_Gpid in_gpid[], int lpid[] ) #define FUNCNAME MPID_Create_intercomm_from_lpids #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Create_intercomm_from_lpids( MPID_Comm *newcomm_ptr, +int MPID_Create_intercomm_from_lpids( MPIR_Comm *newcomm_ptr, int size, const int lpids[] ) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *commworld_ptr; + MPIR_Comm *commworld_ptr; int i; MPIDI_PG_iterator iter; @@ -545,7 +545,7 @@ fn_fail: #define FUNCNAME MPID_PG_ForwardPGInfo #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_PG_ForwardPGInfo( MPID_Comm *peer_ptr, MPID_Comm *comm_ptr, +int MPID_PG_ForwardPGInfo( MPIR_Comm *peer_ptr, MPIR_Comm *comm_ptr, int nPGids, const MPIR_Gpid in_gpids[], int root ) { @@ -663,7 +663,7 @@ char MPIU_hostname[MAX_HOSTNAME_LEN] = "_UNKNOWN_"; /* '_' is an illegal char fo #define FUNCNAME MPID_Get_node_id #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPID_Get_node_id(MPID_Comm *comm, int rank, MPID_Node_id_t *id_p) +int MPID_Get_node_id(MPIR_Comm *comm, int rank, MPID_Node_id_t *id_p) { *id_p = comm->dev.vcrt->vcr_table[rank]->node_id; return MPI_SUCCESS; @@ -675,7 +675,7 @@ int MPID_Get_node_id(MPID_Comm *comm, int rank, MPID_Node_id_t *id_p) #define FCNAME MPL_QUOTE(FUNCNAME) /* Providing a comm argument permits optimization, but this function is always allowed to return the max for the universe. */ -int MPID_Get_max_node_id(MPID_Comm *comm, MPID_Node_id_t *max_id_p) +int MPID_Get_max_node_id(MPIR_Comm *comm, MPID_Node_id_t *max_id_p) { /* easiest way to implement this is to track it at PG create/destroy time */ *max_id_p = g_max_node_id; diff --git a/src/mpid/ch3/src/mpidi_isend_self.c b/src/mpid/ch3/src/mpidi_isend_self.c index 412dd66..e28c6f1 100644 --- a/src/mpid/ch3/src/mpidi_isend_self.c +++ b/src/mpid/ch3/src/mpidi_isend_self.c @@ -16,7 +16,7 @@ #define FUNCNAME MPIDI_Isend_self #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_Isend_self(const void * buf, MPI_Aint count, MPI_Datatype datatype, int rank, int tag, MPID_Comm * comm, int context_offset, +int MPIDI_Isend_self(const void * buf, MPI_Aint count, MPI_Datatype datatype, int rank, int tag, MPIR_Comm * comm, int context_offset, int type, MPID_Request ** request) { MPIDI_Message_match match; diff --git a/src/mpid/ch3/src/mpidi_rma.c b/src/mpid/ch3/src/mpidi_rma.c index 590f30a..311493f 100644 --- a/src/mpid/ch3/src/mpidi_rma.c +++ b/src/mpid/ch3/src/mpidi_rma.c @@ -147,7 +147,7 @@ int MPID_Win_free(MPID_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; int in_use; - MPID_Comm *comm_ptr; + MPIR_Comm *comm_ptr; MPIR_Errflag_t errflag = MPIR_ERR_NONE; MPIDI_STATE_DECL(MPID_STATE_MPID_WIN_FREE); diff --git a/src/mpid/common/hcoll/hcoll.h b/src/mpid/common/hcoll/hcoll.h index a2a186f..ace0545 100644 --- a/src/mpid/common/hcoll/hcoll.h +++ b/src/mpid/common/hcoll/hcoll.h @@ -17,25 +17,25 @@ extern int world_comm_destroying; extern MPL_dbg_class MPIR_DBG_HCOLL; #endif /* MPL_USE_DBG_LOGGING */ -int hcoll_comm_create(MPID_Comm * comm, void *param); -int hcoll_comm_destroy(MPID_Comm * comm, void *param); +int hcoll_comm_create(MPIR_Comm * comm, void *param); +int hcoll_comm_destroy(MPIR_Comm * comm, void *param); -int hcoll_Barrier(MPID_Comm * comm_ptr, MPIR_Errflag_t *err); +int hcoll_Barrier(MPIR_Comm * comm_ptr, MPIR_Errflag_t *err); int hcoll_Bcast(void *buffer, int count, MPI_Datatype datatype, int root, - MPID_Comm * comm_ptr, MPIR_Errflag_t *err); + MPIR_Comm * comm_ptr, MPIR_Errflag_t *err); int hcoll_Allgather(const void *sbuf, int scount, MPI_Datatype sdtype, - void *rbuf, int rcount, MPI_Datatype rdtype, MPID_Comm * comm_ptr, MPIR_Errflag_t *err); + void *rbuf, int rcount, MPI_Datatype rdtype, MPIR_Comm * comm_ptr, MPIR_Errflag_t *err); int hcoll_Allreduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, MPID_Comm * comm_ptr, MPIR_Errflag_t *err); + MPI_Op op, MPIR_Comm * comm_ptr, MPIR_Errflag_t *err); -int hcoll_Ibarrier_req(MPID_Comm * comm_ptr, MPID_Request ** request); +int hcoll_Ibarrier_req(MPIR_Comm * comm_ptr, MPID_Request ** request); int hcoll_Ibcast_req(void *buffer, int count, MPI_Datatype datatype, int root, - MPID_Comm * comm_ptr, MPID_Request ** request); + MPIR_Comm * comm_ptr, MPID_Request ** request); int hcoll_Iallgather_req(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, MPID_Comm * comm_ptr, + int recvcount, MPI_Datatype recvtype, MPIR_Comm * comm_ptr, MPID_Request ** request); int hcoll_Iallreduce_req(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, MPID_Comm * comm_ptr, MPID_Request ** request); + MPI_Op op, MPIR_Comm * comm_ptr, MPID_Request ** request); int hcoll_do_progress(int *made_progress); #endif diff --git a/src/mpid/common/hcoll/hcoll_init.c b/src/mpid/common/hcoll/hcoll_init.c index dfd5b5c..c09457b 100644 --- a/src/mpid/common/hcoll/hcoll_init.c +++ b/src/mpid/common/hcoll/hcoll_init.c @@ -139,7 +139,7 @@ int hcoll_initialize(void) #define FUNCNAME hcoll_comm_create #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int hcoll_comm_create(MPID_Comm * comm_ptr, void *param) +int hcoll_comm_create(MPIR_Comm * comm_ptr, void *param) { int mpi_errno; int num_ranks; @@ -207,7 +207,7 @@ int hcoll_comm_create(MPID_Comm * comm_ptr, void *param) #define FUNCNAME hcoll_comm_destroy #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int hcoll_comm_destroy(MPID_Comm * comm_ptr, void *param) +int hcoll_comm_destroy(MPIR_Comm * comm_ptr, void *param) { int mpi_errno; int context_destroyed; diff --git a/src/mpid/common/hcoll/hcoll_ops.c b/src/mpid/common/hcoll/hcoll_ops.c index d2d345f..2ab0c3f 100644 --- a/src/mpid/common/hcoll/hcoll_ops.c +++ b/src/mpid/common/hcoll/hcoll_ops.c @@ -11,7 +11,7 @@ #define FUNCNAME hcoll_Barrier #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int hcoll_Barrier(MPID_Comm * comm_ptr, MPIR_Errflag_t *err) +int hcoll_Barrier(MPIR_Comm * comm_ptr, MPIR_Errflag_t *err) { int rc; MPI_Comm comm = comm_ptr->handle; @@ -35,7 +35,7 @@ int hcoll_Barrier(MPID_Comm * comm_ptr, MPIR_Errflag_t *err) #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int hcoll_Bcast(void *buffer, int count, MPI_Datatype datatype, int root, - MPID_Comm * comm_ptr, MPIR_Errflag_t *err) + MPIR_Comm * comm_ptr, MPIR_Errflag_t *err) { dte_data_representation_t dtype; int rc; @@ -79,7 +79,7 @@ int hcoll_Bcast(void *buffer, int count, MPI_Datatype datatype, int root, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int hcoll_Allreduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, MPID_Comm * comm_ptr, MPIR_Errflag_t *err) + MPI_Op op, MPIR_Comm * comm_ptr, MPIR_Errflag_t *err) { dte_data_representation_t Dtype; hcoll_dte_op_t *Op; @@ -130,7 +130,7 @@ int hcoll_Allreduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int hcoll_Allgather(const void *sbuf, int scount, MPI_Datatype sdtype, - void *rbuf, int rcount, MPI_Datatype rdtype, MPID_Comm * comm_ptr, MPIR_Errflag_t *err) + void *rbuf, int rcount, MPI_Datatype rdtype, MPIR_Comm * comm_ptr, MPIR_Errflag_t *err) { int is_homogeneous = 1, use_fallback = 0; MPI_Comm comm = comm_ptr->handle; @@ -181,7 +181,7 @@ int hcoll_Allgather(const void *sbuf, int scount, MPI_Datatype sdtype, #define FUNCNAME hcoll_Ibarrier_req #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int hcoll_Ibarrier_req(MPID_Comm * comm_ptr, MPID_Request ** request) +int hcoll_Ibarrier_req(MPIR_Comm * comm_ptr, MPID_Request ** request) { int rc; void **rt_handle; @@ -210,7 +210,7 @@ int hcoll_Ibarrier_req(MPID_Comm * comm_ptr, MPID_Request ** request) #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int hcoll_Ibcast_req(void *buffer, int count, MPI_Datatype datatype, int root, - MPID_Comm * comm_ptr, MPID_Request ** request) + MPIR_Comm * comm_ptr, MPID_Request ** request) { int rc; void **rt_handle; @@ -258,7 +258,7 @@ int hcoll_Ibcast_req(void *buffer, int count, MPI_Datatype datatype, int root, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int hcoll_Iallgather_req(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, MPID_Comm * comm_ptr, + int recvcount, MPI_Datatype recvtype, MPIR_Comm * comm_ptr, MPID_Request ** request) { int is_homogeneous = 1, use_fallback = 0; @@ -316,7 +316,7 @@ int hcoll_Iallgather_req(const void *sendbuf, int sendcount, MPI_Datatype sendty #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int hcoll_Iallreduce_req(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, MPID_Comm * comm_ptr, MPID_Request ** request) + MPI_Op op, MPIR_Comm * comm_ptr, MPID_Request ** request) { dte_data_representation_t Dtype; hcoll_dte_op_t *Op; diff --git a/src/mpid/common/hcoll/hcoll_rte.c b/src/mpid/common/hcoll/hcoll_rte.c index 80badc0..52939fa 100644 --- a/src/mpid/common/hcoll/hcoll_rte.c +++ b/src/mpid/common/hcoll/hcoll_rte.c @@ -127,12 +127,12 @@ static int recv_nb(struct dte_data_representation_t data, int mpi_errno; MPI_Datatype dtype; MPID_Request *request; - MPID_Comm *comm; + MPIR_Comm *comm; int context_offset; size_t size; mpi_errno = MPI_SUCCESS; context_offset = MPID_CONTEXT_INTRA_COLL; - comm = (MPID_Comm *) grp_h; + comm = (MPIR_Comm *) grp_h; if (!ec_h.handle) { MPIR_ERR_SETANDJUMP2(mpi_errno, MPI_ERR_OTHER, "**hcoll_wrong_arg", "**hcoll_wrong_arg %p %d", ec_h.handle, ec_h.rank); @@ -194,12 +194,12 @@ static int send_nb(dte_data_representation_t data, int mpi_errno; MPI_Datatype dtype; MPID_Request *request; - MPID_Comm *comm; + MPIR_Comm *comm; int context_offset; size_t size; mpi_errno = MPI_SUCCESS; context_offset = MPID_CONTEXT_INTRA_COLL; - comm = (MPID_Comm *) grp_h; + comm = (MPIR_Comm *) grp_h; if (!ec_h.handle) { MPIR_ERR_SETANDJUMP2(mpi_errno, MPI_ERR_OTHER, "**hcoll_wrong_arg", "**hcoll_wrong_arg %p %d", ec_h.handle, ec_h.rank); @@ -290,8 +290,8 @@ static int get_ec_handles(int num_ec, int *ec_indexes, rte_grp_handle_t grp_h, rte_ec_handle_t * ec_handles) { int i; - MPID_Comm *comm; - comm = (MPID_Comm *) grp_h; + MPIR_Comm *comm; + comm = (MPIR_Comm *) grp_h; for (i = 0; i < num_ec; i++) { ec_handles[i].rank = ec_indexes[i]; ec_handles[i].handle = (void *) (comm->vcrt->vcr_table[ec_indexes[i]]); @@ -305,8 +305,8 @@ static int get_ec_handles(int num_ec, #define FCNAME MPL_QUOTE(FUNCNAME) static int get_my_ec(rte_grp_handle_t grp_h, rte_ec_handle_t * ec_handle) { - MPID_Comm *comm; - comm = (MPID_Comm *) grp_h; + MPIR_Comm *comm; + comm = (MPIR_Comm *) grp_h; int my_rank = MPIR_Comm_rank(comm); ec_handle->handle = (void *) (comm->vcrt->vcr_table[my_rank]); ec_handle->rank = my_rank; @@ -320,7 +320,7 @@ static int get_my_ec(rte_grp_handle_t grp_h, rte_ec_handle_t * ec_handle) #define FCNAME MPL_QUOTE(FUNCNAME) static int group_size(rte_grp_handle_t grp_h) { - return MPIR_Comm_size((MPID_Comm *) grp_h); + return MPIR_Comm_size((MPIR_Comm *) grp_h); } #undef FUNCNAME @@ -329,7 +329,7 @@ static int group_size(rte_grp_handle_t grp_h) #define FCNAME MPL_QUOTE(FUNCNAME) static int my_rank(rte_grp_handle_t grp_h) { - return MPIR_Comm_rank((MPID_Comm *) grp_h); + return MPIR_Comm_rank((MPIR_Comm *) grp_h); } #undef FUNCNAME @@ -338,10 +338,10 @@ static int my_rank(rte_grp_handle_t grp_h) #define FCNAME MPL_QUOTE(FUNCNAME) static int ec_on_local_node(rte_ec_handle_t ec, rte_grp_handle_t group) { - MPID_Comm *comm; + MPIR_Comm *comm; MPID_Node_id_t nodeid, my_nodeid; int my_rank; - comm = (MPID_Comm *) group; + comm = (MPIR_Comm *) group; MPID_Get_node_id(comm, ec.rank, &nodeid); my_rank = MPIR_Comm_rank(comm); MPID_Get_node_id(comm, my_rank, &my_nodeid); @@ -374,8 +374,8 @@ static uint32_t jobid(void) #define FCNAME MPL_QUOTE(FUNCNAME) static int group_id(rte_grp_handle_t group) { - MPID_Comm *comm; - comm = (MPID_Comm *) group; + MPIR_Comm *comm; + comm = (MPIR_Comm *) group; return comm->context_id; } diff --git a/src/mpid/common/sched/mpidu_sched.c b/src/mpid/common/sched/mpidu_sched.c index 5af6535..ef6783d 100644 --- a/src/mpid/common/sched/mpidu_sched.c +++ b/src/mpid/common/sched/mpidu_sched.c @@ -71,7 +71,7 @@ int MPIDU_Sched_are_pending(void) #define FUNCNAME MPIDU_Sched_next_tag #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDU_Sched_next_tag(MPID_Comm * comm_ptr, int *tag) +int MPIDU_Sched_next_tag(MPIR_Comm * comm_ptr, int *tag) { int mpi_errno = MPI_SUCCESS; /* TODO there should be an internal accessor/utility macro for getting the @@ -128,7 +128,7 @@ static int MPIDU_Sched_start_entry(struct MPIDU_Sched *s, size_t idx, struct MPI { int mpi_errno = MPI_SUCCESS, ret_errno = MPI_SUCCESS; MPID_Request *r = s->req; - MPID_Comm *comm; + MPIR_Comm *comm; MPIU_Assert(e->status == MPIDU_SCHED_ENTRY_STATUS_NOT_STARTED); @@ -389,7 +389,7 @@ int MPIDU_Sched_clone(MPID_Sched_t orig, MPID_Sched_t * cloned) #define FCNAME MPL_QUOTE(FUNCNAME) /* sets (*sp) to MPID_SCHED_NULL and gives you back a request pointer in (*req). * The caller is giving up ownership of the opaque schedule object. */ -int MPIDU_Sched_start(MPID_Sched_t * sp, MPID_Comm * comm, int tag, MPID_Request ** req) +int MPIDU_Sched_start(MPID_Sched_t * sp, MPIR_Comm * comm, int tag, MPID_Request ** req) { int mpi_errno = MPI_SUCCESS; MPID_Request *r; @@ -499,7 +499,7 @@ static int MPIDU_Sched_add_entry(struct MPIDU_Sched *s, int *idx, struct MPIDU_S #define FCNAME MPL_QUOTE(FUNCNAME) /* do these ops need an entry handle returned? */ int MPIDU_Sched_send(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, - MPID_Comm * comm, MPID_Sched_t s) + MPIR_Comm * comm, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; struct MPIDU_Sched_entry *e = NULL; @@ -539,7 +539,7 @@ int MPIDU_Sched_send(const void *buf, MPI_Aint count, MPI_Datatype datatype, int #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDU_Sched_ssend(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, - MPID_Comm * comm, MPID_Sched_t s) + MPIR_Comm * comm, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; struct MPIDU_Sched_entry *e = NULL; @@ -579,7 +579,7 @@ int MPIDU_Sched_ssend(const void *buf, MPI_Aint count, MPI_Datatype datatype, in #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDU_Sched_send_defer(const void *buf, const MPI_Aint * count, MPI_Datatype datatype, int dest, - MPID_Comm * comm, MPID_Sched_t s) + MPIR_Comm * comm, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; struct MPIDU_Sched_entry *e = NULL; @@ -618,7 +618,7 @@ int MPIDU_Sched_send_defer(const void *buf, const MPI_Aint * count, MPI_Datatype #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) int MPIDU_Sched_recv_status(void *buf, MPI_Aint count, MPI_Datatype datatype, int src, - MPID_Comm * comm, MPI_Status * status, MPID_Sched_t s) + MPIR_Comm * comm, MPI_Status * status, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; struct MPIDU_Sched_entry *e = NULL; @@ -652,7 +652,7 @@ int MPIDU_Sched_recv_status(void *buf, MPI_Aint count, MPI_Datatype datatype, in #define FUNCNAME MPIDU_Sched_recv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDU_Sched_recv(void *buf, MPI_Aint count, MPI_Datatype datatype, int src, MPID_Comm * comm, +int MPIDU_Sched_recv(void *buf, MPI_Aint count, MPI_Datatype datatype, int src, MPIR_Comm * comm, MPID_Sched_t s) { int mpi_errno = MPI_SUCCESS; diff --git a/src/mpid/common/sched/mpidu_sched.h b/src/mpid/common/sched/mpidu_sched.h index 9680f06..1b21a68 100644 --- a/src/mpid/common/sched/mpidu_sched.h +++ b/src/mpid/common/sched/mpidu_sched.h @@ -33,7 +33,7 @@ struct MPIDU_Sched_send { const MPI_Aint *count_p; MPI_Datatype datatype; int dest; - struct MPID_Comm *comm; + struct MPIR_Comm *comm; struct MPID_Request *sreq; int is_sync; /* TRUE iff this send is an ssend */ }; @@ -43,7 +43,7 @@ struct MPIDU_Sched_recv { MPI_Aint count; MPI_Datatype datatype; int src; - struct MPID_Comm *comm; + struct MPIR_Comm *comm; struct MPID_Request *rreq; MPI_Status *status; }; @@ -121,17 +121,17 @@ struct MPIDU_Sched { /* prototypes */ int MPIDU_Sched_progress(int *made_progress); int MPIDU_Sched_are_pending(void); -int MPIDU_Sched_next_tag(struct MPID_Comm *comm_ptr, int *tag); +int MPIDU_Sched_next_tag(struct MPIR_Comm *comm_ptr, int *tag); int MPIDU_Sched_create(MPID_Sched_t * sp); int MPIDU_Sched_clone(MPID_Sched_t orig, MPID_Sched_t * cloned); -int MPIDU_Sched_start(MPID_Sched_t * sp, struct MPID_Comm *comm, int tag, +int MPIDU_Sched_start(MPID_Sched_t * sp, struct MPIR_Comm *comm, int tag, struct MPID_Request **req); int MPIDU_Sched_send(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, - struct MPID_Comm *comm, MPID_Sched_t s); + struct MPIR_Comm *comm, MPID_Sched_t s); int MPIDU_Sched_recv(void *buf, MPI_Aint count, MPI_Datatype datatype, int src, - struct MPID_Comm *comm, MPID_Sched_t s); + struct MPIR_Comm *comm, MPID_Sched_t s); int MPID_Sched_ssend(const void *buf, MPI_Aint count, MPI_Datatype datatype, int dest, - struct MPID_Comm *comm, MPID_Sched_t s); + struct MPIR_Comm *comm, MPID_Sched_t s); int MPID_Sched_reduce(const void *inbuf, void *inoutbuf, MPI_Aint count, MPI_Datatype datatype, MPI_Op op, MPID_Sched_t s); int MPIDU_Sched_copy(const void *inbuf, MPI_Aint incount, MPI_Datatype intype, void *outbuf, diff --git a/src/mpid/include/mpidu_pre.h b/src/mpid/include/mpidu_pre.h index a89671a..469e459 100644 --- a/src/mpid/include/mpidu_pre.h +++ b/src/mpid/include/mpidu_pre.h @@ -12,14 +12,14 @@ /* some common MPI forward declarations */ struct MPID_Request; -struct MPID_Comm; +struct MPIR_Comm; /* Scheduling forward declarations */ struct MPIDU_Sched; typedef struct MPIDU_Sched *MPID_Sched_t; -typedef int (MPID_Sched_cb_t) (struct MPID_Comm * comm, int tag, void *state); -typedef int (MPID_Sched_cb2_t) (struct MPID_Comm * comm, int tag, void *state, void *state2); +typedef int (MPID_Sched_cb_t) (struct MPIR_Comm * comm, int tag, void *state); +typedef int (MPID_Sched_cb2_t) (struct MPIR_Comm * comm, int tag, void *state, void *state2); #endif diff --git a/src/mpid/pamid/include/mpidi_datatypes.h b/src/mpid/pamid/include/mpidi_datatypes.h index 53083b9..f2d24e7 100644 --- a/src/mpid/pamid/include/mpidi_datatypes.h +++ b/src/mpid/pamid/include/mpidi_datatypes.h @@ -310,7 +310,7 @@ struct MPIDI_Request }; typedef void* fast_query_t; -/** \brief This defines the portion of MPID_Comm that is specific to the Device */ +/** \brief This defines the portion of MPIR_Comm that is specific to the Device */ struct MPIDI_Comm { pami_geometry_t geometry; /**< Geometry component for collectives */ @@ -379,8 +379,8 @@ typedef struct } MPIDI_Post_coll_t; -/** \brief Forward declaration of the MPID_Comm structure */ -struct MPID_Comm; +/** \brief Forward declaration of the MPIR_Comm structure */ +struct MPIR_Comm; /** \brief Forward declaration of the MPID_Win structure */ struct MPID_Win; /** \brief Forward declaration of the MPID_Group structure */ diff --git a/src/mpid/pamid/include/mpidi_hooks.h b/src/mpid/pamid/include/mpidi_hooks.h index 16df7cb..56b81c0 100644 --- a/src/mpid/pamid/include/mpidi_hooks.h +++ b/src/mpid/pamid/include/mpidi_hooks.h @@ -53,15 +53,15 @@ typedef size_t intptr_t; /** \brief This defines the portion of MPID_Request that is specific to the Device */ #define MPID_DEV_REQUEST_DECL struct MPIDI_Request mpid; -/** \brief This defines the portion of MPID_Comm that is specific to the Device */ +/** \brief This defines the portion of MPIR_Comm that is specific to the Device */ #define MPID_DEV_COMM_DECL struct MPIDI_Comm mpid; /** \brief This defines the portion of MPID_Win that is specific to the Device */ #define MPID_DEV_WIN_DECL struct MPIDI_Win mpid; #define HAVE_DEV_COMM_HOOK -#define MPID_Dev_comm_create_hook(a) ({ int MPIDI_Comm_create (MPID_Comm *comm); MPIDI_Comm_create (a); }) -#define MPID_Dev_comm_destroy_hook(a) ({ int MPIDI_Comm_destroy(MPID_Comm *comm); MPIDI_Comm_destroy(a); }) +#define MPID_Dev_comm_create_hook(a) ({ int MPIDI_Comm_create (MPIR_Comm *comm); MPIDI_Comm_create (a); }) +#define MPID_Dev_comm_destroy_hook(a) ({ int MPIDI_Comm_destroy(MPIR_Comm *comm); MPIDI_Comm_destroy(a); }) #endif diff --git a/src/mpid/pamid/include/mpidi_prototypes.h b/src/mpid/pamid/include/mpidi_prototypes.h index be09041..e1ae621 100644 --- a/src/mpid/pamid/include/mpidi_prototypes.h +++ b/src/mpid/pamid/include/mpidi_prototypes.h @@ -73,7 +73,7 @@ pami_result_t MPIDI_Ssend_handoff(pami_context_t context, void * sreq); pami_result_t MPIDI_Isend_handoff(pami_context_t context, void * sreq); pami_result_t MPIDI_Isend_handoff_internal(pami_context_t context, void * sreq); -void MPIDI_RecvMsg_procnull(MPID_Comm * comm, +void MPIDI_RecvMsg_procnull(MPIR_Comm * comm, unsigned is_blocking, MPI_Status * status, MPID_Request ** request); @@ -252,10 +252,10 @@ pami_result_t MPIDI_RendezvousTransfer_SyncAck(pami_context_t context, void* rre pami_result_t MPIDI_RendezvousTransfer_zerobyte(pami_context_t context, void* rreq); -int MPIDI_Comm_create (MPID_Comm *comm); -int MPIDI_Comm_destroy (MPID_Comm *comm); -void MPIDI_Coll_comm_create (MPID_Comm *comm); -void MPIDI_Coll_comm_destroy (MPID_Comm *comm); +int MPIDI_Comm_create (MPIR_Comm *comm); +int MPIDI_Comm_destroy (MPIR_Comm *comm); +void MPIDI_Coll_comm_create (MPIR_Comm *comm); +void MPIDI_Coll_comm_destroy (MPIR_Comm *comm); void MPIDI_Env_setup (); void MPIDI_Comm_world_setup (); @@ -277,168 +277,168 @@ const char * CudaGetErrorString( int error); #endif inline bool MPIDI_enable_cuda(); inline bool MPIDI_cuda_is_device_buf(const void* ptr); -void MPIDI_Coll_Comm_create (MPID_Comm *comm); -void MPIDI_Coll_Comm_destroy(MPID_Comm *comm); -void MPIDI_Comm_coll_query (MPID_Comm *comm); -void MPIDI_Comm_coll_envvars(MPID_Comm *comm); -void MPIDI_Comm_coll_select(MPID_Comm *comm); +void MPIDI_Coll_Comm_create (MPIR_Comm *comm); +void MPIDI_Coll_Comm_destroy(MPIR_Comm *comm); +void MPIDI_Comm_coll_query (MPIR_Comm *comm); +void MPIDI_Comm_coll_envvars(MPIR_Comm *comm); +void MPIDI_Comm_coll_select(MPIR_Comm *comm); void MPIDI_Coll_register (void); -int MPIDO_Bcast(void *buffer, int count, MPI_Datatype dt, int root, MPID_Comm *comm_ptr, int *mpierrno); -int MPIDO_Bcast_simple(void *buffer, int count, MPI_Datatype dt, int root, MPID_Comm *comm_ptr, int *mpierrno); +int MPIDO_Bcast(void *buffer, int count, MPI_Datatype dt, int root, MPIR_Comm *comm_ptr, int *mpierrno); +int MPIDO_Bcast_simple(void *buffer, int count, MPI_Datatype dt, int root, MPIR_Comm *comm_ptr, int *mpierrno); int MPIDO_CSWrapper_bcast(pami_xfer_t *bcast, void *comm); -int MPIDO_Ibcast(void *buffer, int count, MPI_Datatype datatype, int root, MPID_Comm *comm_ptr, MPID_Request **request); -int MPIDO_Barrier(MPID_Comm *comm_ptr, int *mpierrno); -int MPIDO_Barrier_simple(MPID_Comm *comm_ptr, int *mpierrno); +int MPIDO_Ibcast(void *buffer, int count, MPI_Datatype datatype, int root, MPIR_Comm *comm_ptr, MPID_Request **request); +int MPIDO_Barrier(MPIR_Comm *comm_ptr, int *mpierrno); +int MPIDO_Barrier_simple(MPIR_Comm *comm_ptr, int *mpierrno); int MPIDO_CSWrapper_barrier(pami_xfer_t *barrier, void *comm); -int MPIDO_Ibarrier(MPID_Comm *comm_ptr, MPID_Request **request); +int MPIDO_Ibarrier(MPIR_Comm *comm_ptr, MPID_Request **request); int MPIDO_Allreduce(const void *sbuffer, void *rbuffer, int count, - MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, int *mpierrno); + MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, int *mpierrno); int MPIDO_Allreduce_simple(const void *sbuffer, void *rbuffer, int count, - MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, int *mpierrno); + MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, int *mpierrno); int MPIDO_CSWrapper_allreduce(pami_xfer_t *allreduce, void *comm); int MPIDO_Iallreduce(const void *sbuffer, void *rbuffer, int count, - MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Request ** request); int MPIDO_Reduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, int root, MPID_Comm *comm_ptr, int *mpierrno); + MPI_Op op, int root, MPIR_Comm *comm_ptr, int *mpierrno); int MPIDO_Reduce_simple(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, int root, MPID_Comm *comm_ptr, int *mpierrno); + MPI_Op op, int root, MPIR_Comm *comm_ptr, int *mpierrno); int MPIDO_CSWrapper_reduce(pami_xfer_t *reduce, void *comm); int MPIDO_Ireduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, int root, MPID_Comm *comm_ptr, MPID_Request **request); + MPI_Op op, int root, MPIR_Comm *comm_ptr, MPID_Request **request); int MPIDO_Allgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPID_Comm *comm_ptr, int *mpierrno); + MPIR_Comm *comm_ptr, int *mpierrno); int MPIDO_Allgather_simple(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPID_Comm *comm_ptr, int *mpierrno); + MPIR_Comm *comm_ptr, int *mpierrno); int MPIDO_CSWrapper_allgather(pami_xfer_t *allgather, void *comm); int MPIDO_Iallgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr, + int recvcount, MPI_Datatype recvtype, MPIR_Comm *comm_ptr, MPID_Request **request); int MPIDO_Allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, - MPI_Datatype recvtype, MPID_Comm * comm_ptr, int *mpierrno); + MPI_Datatype recvtype, MPIR_Comm * comm_ptr, int *mpierrno); int MPIDO_Allgatherv_simple(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, - MPI_Datatype recvtype, MPID_Comm * comm_ptr, int *mpierrno); + MPI_Datatype recvtype, MPIR_Comm * comm_ptr, int *mpierrno); int MPIDO_CSWrapper_allgatherv(pami_xfer_t *allgatherv, void *comm); int MPIDO_Iallgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, - MPI_Datatype recvtype, MPID_Comm * comm_ptr, + MPI_Datatype recvtype, MPIR_Comm * comm_ptr, MPID_Request ** request); int MPIDO_Gather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPID_Comm * comm_ptr, int *mpierrno); + int root, MPIR_Comm * comm_ptr, int *mpierrno); int MPIDO_Gather_simple(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPID_Comm * comm_ptr, int *mpierrno); + int root, MPIR_Comm * comm_ptr, int *mpierrno); int MPIDO_CSWrapper_gather(pami_xfer_t *gather, void *comm); int MPIDO_Igather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPID_Comm * comm_ptr, MPID_Request **request); + int root, MPIR_Comm * comm_ptr, MPID_Request **request); int MPIDO_Gatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, - int root, MPID_Comm * comm_ptr, int *mpierrno); + int root, MPIR_Comm * comm_ptr, int *mpierrno); int MPIDO_Gatherv_simple(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, - int root, MPID_Comm * comm_ptr, int *mpierrno); + int root, MPIR_Comm * comm_ptr, int *mpierrno); int MPIDO_CSWrapper_gatherv(pami_xfer_t *gatherv, void *comm); int MPIDO_Igatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, - int root, MPID_Comm * comm_ptr, MPID_Request **request); + int root, MPIR_Comm * comm_ptr, MPID_Request **request); int MPIDO_Scan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, MPID_Comm * comm_ptr, int *mpierrno); + MPI_Op op, MPIR_Comm * comm_ptr, int *mpierrno); int MPIDO_Scan_simple(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, MPID_Comm * comm_ptr, int *mpierrno); + MPI_Op op, MPIR_Comm * comm_ptr, int *mpierrno); int MPIDO_CSWrapper_scan(pami_xfer_t *scan, void *comm); int MPIDO_Iscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, MPID_Comm * comm_ptr, MPID_Request **request); + MPI_Op op, MPIR_Comm * comm_ptr, MPID_Request **request); int MPIDO_Exscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, MPID_Comm * comm_ptr, int *mpierrno); + MPI_Op op, MPIR_Comm * comm_ptr, int *mpierrno); int MPIDO_Exscan_simple(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, MPID_Comm * comm_ptr, int *mpierrno); + MPI_Op op, MPIR_Comm * comm_ptr, int *mpierrno); int MPIDO_Iexscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, MPID_Comm * comm_ptr, MPID_Request **request); + MPI_Op op, MPIR_Comm * comm_ptr, MPID_Request **request); int MPIDO_Scatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPID_Comm * comm_ptr, int *mpierrno); + int root, MPIR_Comm * comm_ptr, int *mpierrno); int MPIDO_Scatter_simple(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPID_Comm * comm_ptr, int *mpierrno); + int root, MPIR_Comm * comm_ptr, int *mpierrno); int MPIDO_CSWrapper_scatter(pami_xfer_t *scatter, void *comm); int MPIDO_Iscatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPID_Comm * comm_ptr, MPID_Request **request); + int root, MPIR_Comm * comm_ptr, MPID_Request **request); int MPIDO_Scatterv(const void *sendbuf, const int *sendcounts, const int *displs, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPID_Comm * comm_ptr, int *mpierrno); + int root, MPIR_Comm * comm_ptr, int *mpierrno); int MPIDO_Scatterv_simple(const void *sendbuf, const int *sendcounts, const int *displs, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPID_Comm * comm_ptr, int *mpierrno); + int root, MPIR_Comm * comm_ptr, int *mpierrno); int MPIDO_CSWrapper_scatterv(pami_xfer_t *scatterv, void *comm); int MPIDO_Iscatterv(const void *sendbuf, const int *sendcounts, const int *displs, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPID_Comm * comm_ptr, MPID_Request **request); + int root, MPIR_Comm * comm_ptr, MPID_Request **request); int MPIDO_Alltoallv(const void *sendbuf, const int *sendcounts, const int *senddispls, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *recvdispls, MPI_Datatype recvtype, - MPID_Comm *comm_ptr, int *mpierrno); + MPIR_Comm *comm_ptr, int *mpierrno); int MPIDO_Alltoallv_simple(const void *sendbuf, const int *sendcounts, const int *senddispls, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *recvdispls, MPI_Datatype recvtype, - MPID_Comm *comm_ptr, int *mpierrno); + MPIR_Comm *comm_ptr, int *mpierrno); int MPIDO_CSWrapper_alltoallv(pami_xfer_t *alltoallv, void *comm); int MPIDO_Ialltoallv(const void *sendbuf, const int *sendcounts, const int *senddispls, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *recvdispls, MPI_Datatype recvtype, - MPID_Comm *comm_ptr, MPID_Request **request); + MPIR_Comm *comm_ptr, MPID_Request **request); int MPIDO_Alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPID_Comm *comm_ptr, int *mpierrno); + MPIR_Comm *comm_ptr, int *mpierrno); int MPIDO_Alltoall_simple(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPID_Comm *comm_ptr, int *mpierrno); + MPIR_Comm *comm_ptr, int *mpierrno); int MPIDO_CSWrapper_alltoall(pami_xfer_t *alltoall, void *comm); int MPIDO_Ialltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPID_Comm *comm_ptr, MPID_Request **request); + MPIR_Comm *comm_ptr, MPID_Request **request); int MPIDO_Ialltoallw(const void *sendbuf, const int *sendcounts, const int *senddispls, const MPI_Datatype * sendtypes, void *recvbuf, const int *recvcounts, const int *recvdispls, const MPI_Datatype * recvtypes, - MPID_Comm *comm_ptr, MPID_Request **request); + MPIR_Comm *comm_ptr, MPID_Request **request); int MPIDO_Reduce_scatter(const void *sendbuf, void *recvbuf, int *recvcounts, MPI_Datatype datatype, - MPI_Op op, MPID_Comm *comm_ptr, int *mpierrno); + MPI_Op op, MPIR_Comm *comm_ptr, int *mpierrno); int MPIDO_Reduce_scatter_block(const void *sendbuf, void *recvbuf, int recvcount, - MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, int *mpierrno); + MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, int *mpierrno); int MPIDO_Ireduce_scatter_block(const void *sendbuf, void *recvbuf, int recvcount, - MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Request **request); int MPIDO_Ireduce_scatter(const void *sendbuf, void *recvbuf, const int *recvcounts, - MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPID_Request **request); + MPI_Datatype datatype, MPI_Op op, MPIR_Comm *comm_ptr, MPID_Request **request); int MPIDI_Datatype_to_pami(MPI_Datatype dt, pami_type_t *pdt, diff --git a/src/mpid/pamid/include/mpidimpl.h b/src/mpid/pamid/include/mpidimpl.h index 65a88dd..52623ff 100644 --- a/src/mpid/pamid/include/mpidimpl.h +++ b/src/mpid/pamid/include/mpidimpl.h @@ -125,20 +125,20 @@ typedef struct transactionID_struct { BEGIN MPI PORT SECTION --------------------------*/ /* These are the default functions */ -int MPIDI_Comm_connect(const char *, struct MPID_Info *, int, struct MPID_Comm *, struct MPID_Comm **); -int MPIDI_Comm_accept(const char *, struct MPID_Info *, int, struct MPID_Comm *, struct MPID_Comm **); +int MPIDI_Comm_connect(const char *, struct MPID_Info *, int, struct MPIR_Comm *, struct MPIR_Comm **); +int MPIDI_Comm_accept(const char *, struct MPID_Info *, int, struct MPIR_Comm *, struct MPIR_Comm **); int MPIDI_Comm_spawn_multiple(int, char **, char ***, int *, struct MPID_Info **, - int, struct MPID_Comm *, struct MPID_Comm **, int *); + int, struct MPIR_Comm *, struct MPIR_Comm **, int *); typedef struct MPIDI_Port_Ops { int (*OpenPort)( struct MPID_Info *, char *); int (*ClosePort)( const char * ); - int (*CommAccept)( const char *, struct MPID_Info *, int, struct MPID_Comm *, - struct MPID_Comm ** ); - int (*CommConnect)( const char *, struct MPID_Info *, int, struct MPID_Comm *, - struct MPID_Comm ** ); + int (*CommAccept)( const char *, struct MPID_Info *, int, struct MPIR_Comm *, + struct MPIR_Comm ** ); + int (*CommConnect)( const char *, struct MPID_Info *, int, struct MPIR_Comm *, + struct MPIR_Comm ** ); } MPIDI_PortFns; diff --git a/src/mpid/pamid/include/mpidpost.h b/src/mpid/pamid/include/mpidpost.h index 601c56b..a9ae835 100644 --- a/src/mpid/pamid/include/mpidpost.h +++ b/src/mpid/pamid/include/mpidpost.h @@ -45,7 +45,7 @@ so provide one here. **/ /* FIXME: A temporary version for lpids within my comm world */ -static inline int MPID_GPID_GetAllInComm( MPID_Comm *comm_ptr, int local_size, +static inline int MPID_GPID_GetAllInComm( MPIR_Comm *comm_ptr, int local_size, int local_gpids[], int *singlePG ) { int i; @@ -72,10 +72,10 @@ static inline int MPID_GPID_ToLpidArray( int size, int gpid[], int lpid[] ) } /* FIXME: for MPI1, all process ids are relative to MPI_COMM_WORLD. For MPI2, we'll need to do something more complex */ -static inline int MPID_VCR_CommFromLpids( MPID_Comm *newcomm_ptr, +static inline int MPID_VCR_CommFromLpids( MPIR_Comm *newcomm_ptr, int size, const int lpids[] ) { - MPID_Comm *commworld_ptr; + MPIR_Comm *commworld_ptr; int i; commworld_ptr = MPIR_Process.comm_world; diff --git a/src/mpid/pamid/src/coll/allgather/mpido_allgather.c b/src/mpid/pamid/src/coll/allgather/mpido_allgather.c index 2d4d8a3..0775cdb 100644 --- a/src/mpid/pamid/src/coll/allgather/mpido_allgather.c +++ b/src/mpid/pamid/src/coll/allgather/mpido_allgather.c @@ -60,7 +60,7 @@ int MPIDO_Allgather_allreduce(const void *sendbuf, MPI_Aint recv_true_lb, size_t send_size, size_t recv_size, - MPID_Comm * comm_ptr, + MPIR_Comm * comm_ptr, int *mpierrno) { @@ -164,7 +164,7 @@ int MPIDO_Allgather_bcast(const void *sendbuf, MPI_Aint recv_true_lb, size_t send_size, size_t recv_size, - MPID_Comm * comm_ptr, + MPIR_Comm * comm_ptr, int *mpierrno) { int i, np, rc = 0; @@ -224,7 +224,7 @@ int MPIDO_Allgather_alltoall(const void *sendbuf, MPI_Aint recv_true_lb, size_t send_size, size_t recv_size, - MPID_Comm * comm_ptr, + MPIR_Comm * comm_ptr, int *mpierrno) { int i, rc; @@ -286,7 +286,7 @@ MPIDO_Allgather(const void *sendbuf, void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPID_Comm * comm_ptr, + MPIR_Comm * comm_ptr, int *mpierrno) { #ifndef HAVE_PAMI_IN_PLACE @@ -631,7 +631,7 @@ MPIDO_Allgather_simple(const void *sendbuf, void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPID_Comm * comm_ptr, + MPIR_Comm * comm_ptr, int *mpierrno) { #ifndef HAVE_PAMI_IN_PLACE @@ -791,7 +791,7 @@ MPIDO_CSWrapper_allgather(pami_xfer_t *allgather, void *comm) { int mpierrno = 0; - MPID_Comm *comm_ptr = (MPID_Comm*)comm; + MPIR_Comm *comm_ptr = (MPIR_Comm*)comm; MPI_Datatype sendtype, recvtype; void *sbuf; MPIDI_coll_check_in_place(allgather->cmd.xfer_allgather.sndbuf, &sbuf); diff --git a/src/mpid/pamid/src/coll/allgather/mpido_iallgather.c b/src/mpid/pamid/src/coll/allgather/mpido_iallgather.c index 82b7e97..f8a4405 100644 --- a/src/mpid/pamid/src/coll/allgather/mpido_iallgather.c +++ b/src/mpid/pamid/src/coll/allgather/mpido_iallgather.c @@ -30,7 +30,7 @@ MPIDO_Iallgather(const void *sendbuf, void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPID_Comm * comm_ptr, + MPIR_Comm * comm_ptr, MPID_Request ** request) { /*if (unlikely((data_size == 0) || (user_selected_type == MPID_COLL_USE_MPICH)))*/ diff --git a/src/mpid/pamid/src/coll/allgatherv/mpido_allgatherv.c b/src/mpid/pamid/src/coll/allgatherv/mpido_allgatherv.c index 8bc3523..1df9876 100644 --- a/src/mpid/pamid/src/coll/allgatherv/mpido_allgatherv.c +++ b/src/mpid/pamid/src/coll/allgatherv/mpido_allgatherv.c @@ -59,7 +59,7 @@ int MPIDO_Allgatherv_allreduce(const void *sendbuf, MPI_Aint recv_true_lb, size_t send_size, size_t recv_size, - MPID_Comm * comm_ptr, + MPIR_Comm * comm_ptr, int *mpierrno) { int start, rc, i; @@ -171,7 +171,7 @@ int MPIDO_Allgatherv_bcast(const void *sendbuf, MPI_Aint recv_true_lb, size_t send_size, size_t recv_size, - MPID_Comm * comm_ptr, + MPIR_Comm * comm_ptr, int *mpierrno) { const int rank = comm_ptr->rank; @@ -230,7 +230,7 @@ int MPIDO_Allgatherv_alltoall(const void *sendbuf, MPI_Aint recv_true_lb, size_t send_size, size_t recv_size, - MPID_Comm * comm_ptr, + MPIR_Comm * comm_ptr, int *mpierrno) { TRACE_ERR("Entering MPIDO_Allgatherv_alltoallv\n"); @@ -293,7 +293,7 @@ MPIDO_Allgatherv(const void *sendbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, - MPID_Comm * comm_ptr, + MPIR_Comm * comm_ptr, int *mpierrno) { #ifndef HAVE_PAMI_IN_PLACE @@ -677,7 +677,7 @@ MPIDO_Allgatherv_simple(const void *sendbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, - MPID_Comm * comm_ptr, + MPIR_Comm * comm_ptr, int *mpierrno) { #ifndef HAVE_PAMI_IN_PLACE @@ -890,7 +890,7 @@ MPIDO_CSWrapper_allgatherv(pami_xfer_t *allgatherv, void *comm) { int mpierrno = 0; - MPID_Comm *comm_ptr = (MPID_Comm*)comm; + MPIR_Comm *comm_ptr = (MPIR_Comm*)comm; MPI_Datatype sendtype, recvtype; void *sbuf; MPIDI_coll_check_in_place(allgatherv->cmd.xfer_allgatherv_int.sndbuf, &sbuf); diff --git a/src/mpid/pamid/src/coll/allgatherv/mpido_iallgatherv.c b/src/mpid/pamid/src/coll/allgatherv/mpido_iallgatherv.c index 68d47c7..b919b5d 100644 --- a/src/mpid/pamid/src/coll/allgatherv/mpido_iallgatherv.c +++ b/src/mpid/pamid/src/coll/allgatherv/mpido_iallgatherv.c @@ -31,7 +31,7 @@ MPIDO_Iallgatherv(const void *sendbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, - MPID_Comm * comm_ptr, + MPIR_Comm * comm_ptr, MPID_Request ** request) { TRACE_ERR("Entering MPIDO_Iallgatherv\n"); diff --git a/src/mpid/pamid/src/coll/allreduce/mpido_allreduce.c b/src/mpid/pamid/src/coll/allreduce/mpido_allreduce.c index 58f8dff..48f0bfc 100644 --- a/src/mpid/pamid/src/coll/allreduce/mpido_allreduce.c +++ b/src/mpid/pamid/src/coll/allreduce/mpido_allreduce.c @@ -40,7 +40,7 @@ int MPIDO_Allreduce(const void *sendbuf, int count, MPI_Datatype dt, MPI_Op op, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, int *mpierrno) { #ifndef HAVE_PAMI_IN_PLACE @@ -440,7 +440,7 @@ int MPIDO_Allreduce_simple(const void *sendbuf, int count, MPI_Datatype dt, MPI_Op op, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, int *mpierrno) { #ifndef HAVE_PAMI_IN_PLACE @@ -539,7 +539,7 @@ MPIDO_CSWrapper_allreduce(pami_xfer_t *allreduce, void *comm) { int mpierrno = 0; - MPID_Comm *comm_ptr = (MPID_Comm*)comm; + MPIR_Comm *comm_ptr = (MPIR_Comm*)comm; MPI_Datatype type; MPI_Op op; void *sbuf; diff --git a/src/mpid/pamid/src/coll/allreduce/mpido_iallreduce.c b/src/mpid/pamid/src/coll/allreduce/mpido_iallreduce.c index 6446db7..91dec6c 100644 --- a/src/mpid/pamid/src/coll/allreduce/mpido_iallreduce.c +++ b/src/mpid/pamid/src/coll/allreduce/mpido_iallreduce.c @@ -29,7 +29,7 @@ int MPIDO_Iallreduce(const void *sendbuf, int count, MPI_Datatype dt, MPI_Op op, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, MPID_Request **request) { TRACE_ERR("Entering mpido_iallreduce\n"); diff --git a/src/mpid/pamid/src/coll/alltoall/mpido_alltoall.c b/src/mpid/pamid/src/coll/alltoall/mpido_alltoall.c index 66dc8ac..a3354ae 100644 --- a/src/mpid/pamid/src/coll/alltoall/mpido_alltoall.c +++ b/src/mpid/pamid/src/coll/alltoall/mpido_alltoall.c @@ -39,7 +39,7 @@ int MPIDO_Alltoall(const void *sendbuf, void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, int *mpierrno) { #ifndef HAVE_PAMI_IN_PLACE @@ -272,7 +272,7 @@ int MPIDO_Alltoall_simple(const void *sendbuf, void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, int *mpierrno) { #ifndef HAVE_PAMI_IN_PLACE @@ -420,7 +420,7 @@ MPIDO_CSWrapper_alltoall(pami_xfer_t *alltoall, void *comm) { int mpierrno = 0; - MPID_Comm *comm_ptr = (MPID_Comm*)comm; + MPIR_Comm *comm_ptr = (MPIR_Comm*)comm; MPI_Datatype sendtype, recvtype; void *sbuf; MPIDI_coll_check_in_place(alltoall->cmd.xfer_alltoall.sndbuf, &sbuf); diff --git a/src/mpid/pamid/src/coll/alltoall/mpido_ialltoall.c b/src/mpid/pamid/src/coll/alltoall/mpido_ialltoall.c index 2d1a2c5..682eae0 100644 --- a/src/mpid/pamid/src/coll/alltoall/mpido_ialltoall.c +++ b/src/mpid/pamid/src/coll/alltoall/mpido_ialltoall.c @@ -30,7 +30,7 @@ int MPIDO_Ialltoall(const void *sendbuf, void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, MPID_Request **request) { TRACE_ERR("Entering MPIDO_Ialltoall\n"); diff --git a/src/mpid/pamid/src/coll/alltoallv/mpido_alltoallv.c b/src/mpid/pamid/src/coll/alltoallv/mpido_alltoallv.c index 4a6215f..a66fdea 100644 --- a/src/mpid/pamid/src/coll/alltoallv/mpido_alltoallv.c +++ b/src/mpid/pamid/src/coll/alltoallv/mpido_alltoallv.c @@ -40,7 +40,7 @@ int MPIDO_Alltoallv(const void *sendbuf, const int *recvcounts, const int *recvdispls, MPI_Datatype recvtype, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, int *mpierrno) { #ifndef HAVE_PAMI_IN_PLACE @@ -405,7 +405,7 @@ int MPIDO_Alltoallv_simple(const void *sendbuf, const int *recvcounts, const int *recvdispls, MPI_Datatype recvtype, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, int *mpierrno) { #ifndef HAVE_PAMI_IN_PLACE @@ -703,7 +703,7 @@ MPIDO_CSWrapper_alltoallv(pami_xfer_t *alltoallv, void *comm) { int mpierrno = 0; - MPID_Comm *comm_ptr = (MPID_Comm*)comm; + MPIR_Comm *comm_ptr = (MPIR_Comm*)comm; MPI_Datatype sendtype, recvtype; void *sbuf; MPIDI_coll_check_in_place(alltoallv->cmd.xfer_alltoallv_int.sndbuf, &sbuf); diff --git a/src/mpid/pamid/src/coll/alltoallv/mpido_ialltoallv.c b/src/mpid/pamid/src/coll/alltoallv/mpido_ialltoallv.c index 14ee4d0..ef5dff1 100644 --- a/src/mpid/pamid/src/coll/alltoallv/mpido_ialltoallv.c +++ b/src/mpid/pamid/src/coll/alltoallv/mpido_ialltoallv.c @@ -31,7 +31,7 @@ int MPIDO_Ialltoallv(const void *sendbuf, const int *recvcounts, const int *recvdispls, MPI_Datatype recvtype, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, MPID_Request **request) { if(comm_ptr->rank == 0) diff --git a/src/mpid/pamid/src/coll/alltoallw/mpido_ialltoallw.c b/src/mpid/pamid/src/coll/alltoallw/mpido_ialltoallw.c index 0a82baf..61bd705 100644 --- a/src/mpid/pamid/src/coll/alltoallw/mpido_ialltoallw.c +++ b/src/mpid/pamid/src/coll/alltoallw/mpido_ialltoallw.c @@ -31,7 +31,7 @@ int MPIDO_Ialltoallw(const void *sendbuf, const int *recvcounts, const int *recvdispls, const MPI_Datatype *recvtypes, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, MPID_Request **request) { if(comm_ptr->rank == 0) diff --git a/src/mpid/pamid/src/coll/barrier/mpido_barrier.c b/src/mpid/pamid/src/coll/barrier/mpido_barrier.c index b53a8fa..9e91334 100644 --- a/src/mpid/pamid/src/coll/barrier/mpido_barrier.c +++ b/src/mpid/pamid/src/coll/barrier/mpido_barrier.c @@ -32,7 +32,7 @@ static void cb_barrier(void *ctxt, void *clientdata, pami_result_t err) (*active)--; } -int MPIDO_Barrier(MPID_Comm *comm_ptr, int *mpierrno) +int MPIDO_Barrier(MPIR_Comm *comm_ptr, int *mpierrno) { TRACE_ERR("Entering MPIDO_Barrier\n"); volatile unsigned active=1; @@ -102,7 +102,7 @@ int MPIDO_Barrier(MPID_Comm *comm_ptr, int *mpierrno) } -int MPIDO_Barrier_simple(MPID_Comm *comm_ptr, int *mpierrno) +int MPIDO_Barrier_simple(MPIR_Comm *comm_ptr, int *mpierrno) { TRACE_ERR("Entering MPIDO_Barrier_optimized\n"); volatile unsigned active=1; @@ -136,7 +136,7 @@ MPIDO_CSWrapper_barrier(pami_xfer_t *barrier, void *comm) { int mpierrno = 0; - MPID_Comm *comm_ptr = (MPID_Comm*)comm; + MPIR_Comm *comm_ptr = (MPIR_Comm*)comm; int rc = MPIR_Barrier(comm_ptr, &mpierrno); if(barrier->cb_done && rc == 0) barrier->cb_done(NULL, barrier->cookie, PAMI_SUCCESS); diff --git a/src/mpid/pamid/src/coll/barrier/mpido_ibarrier.c b/src/mpid/pamid/src/coll/barrier/mpido_ibarrier.c index fd33193..61d2fcf 100644 --- a/src/mpid/pamid/src/coll/barrier/mpido_ibarrier.c +++ b/src/mpid/pamid/src/coll/barrier/mpido_ibarrier.c @@ -30,7 +30,7 @@ static void cb_ibarrier(void *ctxt, void *clientdata, pami_result_t err) MPIDI_Request_complete_norelease_inline(mpid_request); } -int MPIDO_Ibarrier(MPID_Comm *comm_ptr, MPID_Request **request) +int MPIDO_Ibarrier(MPIR_Comm *comm_ptr, MPID_Request **request) { TRACE_ERR("Entering MPIDO_Ibarrier\n"); diff --git a/src/mpid/pamid/src/coll/bcast/mpido_bcast.c b/src/mpid/pamid/src/coll/bcast/mpido_bcast.c index f6be944..d10a916 100644 --- a/src/mpid/pamid/src/coll/bcast/mpido_bcast.c +++ b/src/mpid/pamid/src/coll/bcast/mpido_bcast.c @@ -36,7 +36,7 @@ int MPIDO_Bcast(void *buffer, int count, MPI_Datatype datatype, int root, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, int *mpierrno) { TRACE_ERR("in mpido_bcast\n"); @@ -272,7 +272,7 @@ int MPIDO_Bcast_simple(void *buffer, int count, MPI_Datatype datatype, int root, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, int *mpierrno) { TRACE_ERR("Entering MPIDO_Bcast_optimized\n"); @@ -376,7 +376,7 @@ MPIDO_CSWrapper_bcast(pami_xfer_t *bcast, void *comm) { int mpierrno = 0; - MPID_Comm *comm_ptr = (MPID_Comm*)comm; + MPIR_Comm *comm_ptr = (MPIR_Comm*)comm; MPI_Datatype type; int rc = MPIDI_Dtpami_to_dtmpi( bcast->cmd.xfer_broadcast.type, &type, diff --git a/src/mpid/pamid/src/coll/bcast/mpido_ibcast.c b/src/mpid/pamid/src/coll/bcast/mpido_ibcast.c index 836ccfe..b5b6c58 100644 --- a/src/mpid/pamid/src/coll/bcast/mpido_ibcast.c +++ b/src/mpid/pamid/src/coll/bcast/mpido_ibcast.c @@ -28,7 +28,7 @@ int MPIDO_Ibcast(void *buffer, int count, MPI_Datatype datatype, int root, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, MPID_Request **request) { TRACE_ERR("in mpido_ibcast\n"); diff --git a/src/mpid/pamid/src/coll/exscan/mpido_iexscan.c b/src/mpid/pamid/src/coll/exscan/mpido_iexscan.c index a45dc41..1e63087 100644 --- a/src/mpid/pamid/src/coll/exscan/mpido_iexscan.c +++ b/src/mpid/pamid/src/coll/exscan/mpido_iexscan.c @@ -25,7 +25,7 @@ int MPIDO_Iexscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, MPID_Comm * comm_ptr, MPID_Request **request) + MPI_Op op, MPIR_Comm * comm_ptr, MPID_Request **request) { /*if (unlikely((data_size == 0) || (user_selected_type == MPID_COLL_USE_MPICH)))*/ { diff --git a/src/mpid/pamid/src/coll/gather/mpido_gather.c b/src/mpid/pamid/src/coll/gather/mpido_gather.c index 75df3ee..c99265d 100644 --- a/src/mpid/pamid/src/coll/gather/mpido_gather.c +++ b/src/mpid/pamid/src/coll/gather/mpido_gather.c @@ -44,7 +44,7 @@ int MPIDO_Gather_reduce(void * sendbuf, int recvcount, MPI_Datatype recvtype, int root, - MPID_Comm * comm_ptr, + MPIR_Comm * comm_ptr, int *mpierrno) { MPIDU_Datatype* data_ptr; @@ -128,7 +128,7 @@ int MPIDO_Gather(const void *sendbuf, int recvcount, MPI_Datatype recvtype, int root, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, int *mpierrno) { #ifndef HAVE_PAMI_IN_PLACE @@ -426,7 +426,7 @@ int MPIDO_Gather_simple(const void *sendbuf, int recvcount, MPI_Datatype recvtype, int root, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, int *mpierrno) { #ifndef HAVE_PAMI_IN_PLACE @@ -612,7 +612,7 @@ MPIDO_CSWrapper_gather(pami_xfer_t *gather, void *comm) { int mpierrno = 0; - MPID_Comm *comm_ptr = (MPID_Comm*)comm; + MPIR_Comm *comm_ptr = (MPIR_Comm*)comm; MPI_Datatype sendtype, recvtype; void *sbuf; MPIDI_coll_check_in_place(gather->cmd.xfer_gather.sndbuf, &sbuf); diff --git a/src/mpid/pamid/src/coll/gather/mpido_igather.c b/src/mpid/pamid/src/coll/gather/mpido_igather.c index dfaa8fa..63c1b25 100644 --- a/src/mpid/pamid/src/coll/gather/mpido_igather.c +++ b/src/mpid/pamid/src/coll/gather/mpido_igather.c @@ -29,7 +29,7 @@ int MPIDO_Igather(const void *sendbuf, int recvcount, MPI_Datatype recvtype, int root, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, MPID_Request **request) { /*if (unlikely((data_size == 0) || (user_selected_type == MPID_COLL_USE_MPICH)))*/ diff --git a/src/mpid/pamid/src/coll/gatherv/mpido_gatherv.c b/src/mpid/pamid/src/coll/gatherv/mpido_gatherv.c index d675318..5832468 100644 --- a/src/mpid/pamid/src/coll/gatherv/mpido_gatherv.c +++ b/src/mpid/pamid/src/coll/gatherv/mpido_gatherv.c @@ -38,7 +38,7 @@ int MPIDO_Gatherv(const void *sendbuf, const int *displs, MPI_Datatype recvtype, int root, - MPID_Comm * comm_ptr, + MPIR_Comm * comm_ptr, int *mpierrno) { @@ -301,7 +301,7 @@ int MPIDO_Gatherv_simple(const void *sendbuf, const int *displs, MPI_Datatype recvtype, int root, - MPID_Comm * comm_ptr, + MPIR_Comm * comm_ptr, int *mpierrno) { @@ -540,7 +540,7 @@ MPIDO_CSWrapper_gatherv(pami_xfer_t *gatherv, void *comm) { int mpierrno = 0; - MPID_Comm *comm_ptr = (MPID_Comm*)comm; + MPIR_Comm *comm_ptr = (MPIR_Comm*)comm; MPI_Datatype sendtype, recvtype; void *sbuf; MPIDI_coll_check_in_place(gatherv->cmd.xfer_gatherv_int.sndbuf, &sbuf); diff --git a/src/mpid/pamid/src/coll/gatherv/mpido_igatherv.c b/src/mpid/pamid/src/coll/gatherv/mpido_igatherv.c index 6b8bdce..07b5d69 100644 --- a/src/mpid/pamid/src/coll/gatherv/mpido_igatherv.c +++ b/src/mpid/pamid/src/coll/gatherv/mpido_igatherv.c @@ -31,7 +31,7 @@ int MPIDO_Igatherv(const void *sendbuf, const int *displs, MPI_Datatype recvtype, int root, - MPID_Comm * comm_ptr, + MPIR_Comm * comm_ptr, MPID_Request **request) { diff --git a/src/mpid/pamid/src/coll/ired_scat/mpido_ired_scat.c b/src/mpid/pamid/src/coll/ired_scat/mpido_ired_scat.c index d67f2d4..00cd85a 100644 --- a/src/mpid/pamid/src/coll/ired_scat/mpido_ired_scat.c +++ b/src/mpid/pamid/src/coll/ired_scat/mpido_ired_scat.c @@ -28,7 +28,7 @@ int MPIDO_Ireduce_scatter(const void *sendbuf, const int *recvcounts, MPI_Datatype datatype, MPI_Op op, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, MPID_Request **request) { TRACE_ERR("Entering MPIDO_Ireduce_scatter\n"); diff --git a/src/mpid/pamid/src/coll/ired_scat_block/mpido_ired_scat_block.c b/src/mpid/pamid/src/coll/ired_scat_block/mpido_ired_scat_block.c index a0a4fdc..7bd5f41 100644 --- a/src/mpid/pamid/src/coll/ired_scat_block/mpido_ired_scat_block.c +++ b/src/mpid/pamid/src/coll/ired_scat_block/mpido_ired_scat_block.c @@ -28,7 +28,7 @@ int MPIDO_Ireduce_scatter_block(const void *sendbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, MPID_Request **request) { TRACE_ERR("Entering MPIDO_Ireduce_scatter_block\n"); diff --git a/src/mpid/pamid/src/coll/red_scat/mpido_red_scat.c b/src/mpid/pamid/src/coll/red_scat/mpido_red_scat.c index d4740c6..854a20c 100644 --- a/src/mpid/pamid/src/coll/red_scat/mpido_red_scat.c +++ b/src/mpid/pamid/src/coll/red_scat/mpido_red_scat.c @@ -29,7 +29,7 @@ int MPIDO_Reduce_scatter(const void *sendbuf, int *recvcounts, MPI_Datatype datatype, MPI_Op op, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, int *mpierrno) { @@ -109,7 +109,7 @@ int MPIDO_Reduce_scatter_block(const void *sendbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, int *mpierrno) { diff --git a/src/mpid/pamid/src/coll/reduce/mpido_ireduce.c b/src/mpid/pamid/src/coll/reduce/mpido_ireduce.c index 63e178d..ba2fcbf 100644 --- a/src/mpid/pamid/src/coll/reduce/mpido_ireduce.c +++ b/src/mpid/pamid/src/coll/reduce/mpido_ireduce.c @@ -29,7 +29,7 @@ int MPIDO_Ireduce(const void *sendbuf, MPI_Datatype datatype, MPI_Op op, int root, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, MPID_Request **request) { diff --git a/src/mpid/pamid/src/coll/reduce/mpido_reduce.c b/src/mpid/pamid/src/coll/reduce/mpido_reduce.c index bfea33b..b548a63 100644 --- a/src/mpid/pamid/src/coll/reduce/mpido_reduce.c +++ b/src/mpid/pamid/src/coll/reduce/mpido_reduce.c @@ -36,7 +36,7 @@ int MPIDO_Reduce(const void *sendbuf, MPI_Datatype datatype, MPI_Op op, int root, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, int *mpierrno) { @@ -295,7 +295,7 @@ int MPIDO_Reduce_simple(const void *sendbuf, MPI_Datatype datatype, MPI_Op op, int root, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, int *mpierrno) { @@ -398,7 +398,7 @@ MPIDO_CSWrapper_reduce(pami_xfer_t *reduce, void *comm) { int mpierrno = 0; - MPID_Comm *comm_ptr = (MPID_Comm*)comm; + MPIR_Comm *comm_ptr = (MPIR_Comm*)comm; MPI_Datatype type; MPI_Op op; void *sbuf; diff --git a/src/mpid/pamid/src/coll/scan/mpido_scan.c b/src/mpid/pamid/src/coll/scan/mpido_scan.c index 37d1fb7..6de0160 100644 --- a/src/mpid/pamid/src/coll/scan/mpido_scan.c +++ b/src/mpid/pamid/src/coll/scan/mpido_scan.c @@ -31,12 +31,12 @@ static void scan_cb_done(void *ctxt, void *clientdata, pami_result_t err) } int MPIDO_Doscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, MPID_Comm * comm_ptr, int *mpierrno, int exflag); + MPI_Op op, MPIR_Comm * comm_ptr, int *mpierrno, int exflag); int MPIDO_Scan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, MPID_Comm * comm_ptr, int *mpierrno) + MPI_Op op, MPIR_Comm * comm_ptr, int *mpierrno) { return MPIDO_Doscan(sendbuf, recvbuf, count, datatype, op, comm_ptr, mpierrno, 0); @@ -44,7 +44,7 @@ int MPIDO_Scan(const void *sendbuf, void *recvbuf, int MPIDO_Iscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, MPID_Comm * comm_ptr, MPID_Request **request) + MPI_Op op, MPIR_Comm * comm_ptr, MPID_Request **request) { /*if (unlikely((data_size == 0) || (user_selected_type == MPID_COLL_USE_MPICH)))*/ { @@ -86,7 +86,7 @@ int MPIDO_Iscan(const void *sendbuf, void *recvbuf, int MPIDO_Exscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, MPID_Comm * comm_ptr, int *mpierrno) + MPI_Op op, MPIR_Comm * comm_ptr, int *mpierrno) { return MPIDO_Doscan(sendbuf, recvbuf, count, datatype, op, comm_ptr, mpierrno, 1); @@ -94,7 +94,7 @@ int MPIDO_Exscan(const void *sendbuf, void *recvbuf, int MPIDO_Doscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, MPID_Comm * comm_ptr, int *mpierrno, int exflag) + MPI_Op op, MPIR_Comm * comm_ptr, int *mpierrno, int exflag) { #ifndef HAVE_PAMI_IN_PLACE if (sendbuf == MPI_IN_PLACE) @@ -311,7 +311,7 @@ int MPIDO_Doscan(const void *sendbuf, void *recvbuf, int MPIDO_Doscan_simple(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, MPID_Comm * comm_ptr, int *mpierrno, int exflag) + MPI_Op op, MPIR_Comm * comm_ptr, int *mpierrno, int exflag) { #ifndef HAVE_PAMI_IN_PLACE if (sendbuf == MPI_IN_PLACE) @@ -404,7 +404,7 @@ int MPIDO_Doscan_simple(const void *sendbuf, void *recvbuf, int MPIDO_Exscan_simple(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, MPID_Comm * comm_ptr, int *mpierrno) + MPI_Op op, MPIR_Comm * comm_ptr, int *mpierrno) { return MPIDO_Doscan_simple(sendbuf, recvbuf, count, datatype, op, comm_ptr, mpierrno, 1); @@ -412,7 +412,7 @@ int MPIDO_Exscan_simple(const void *sendbuf, void *recvbuf, int MPIDO_Scan_simple(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, MPID_Comm * comm_ptr, int *mpierrno) + MPI_Op op, MPIR_Comm * comm_ptr, int *mpierrno) { return MPIDO_Doscan_simple(sendbuf, recvbuf, count, datatype, op, comm_ptr, mpierrno, 0); @@ -423,7 +423,7 @@ MPIDO_CSWrapper_scan(pami_xfer_t *scan, void *comm) { int mpierrno = 0; - MPID_Comm *comm_ptr = (MPID_Comm*)comm; + MPIR_Comm *comm_ptr = (MPIR_Comm*)comm; MPI_Datatype type; MPI_Op op; void *sbuf; diff --git a/src/mpid/pamid/src/coll/scatter/mpido_iscatter.c b/src/mpid/pamid/src/coll/scatter/mpido_iscatter.c index f13a192..6dd302d 100644 --- a/src/mpid/pamid/src/coll/scatter/mpido_iscatter.c +++ b/src/mpid/pamid/src/coll/scatter/mpido_iscatter.c @@ -31,7 +31,7 @@ int MPIDO_Iscatter(const void *sendbuf, int recvcount, MPI_Datatype recvtype, int root, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, MPID_Request **request) { /*if (unlikely((data_size == 0) || (user_selected_type == MPID_COLL_USE_MPICH)))*/ diff --git a/src/mpid/pamid/src/coll/scatter/mpido_scatter.c b/src/mpid/pamid/src/coll/scatter/mpido_scatter.c index e8f7ebf..038da9f 100644 --- a/src/mpid/pamid/src/coll/scatter/mpido_scatter.c +++ b/src/mpid/pamid/src/coll/scatter/mpido_scatter.c @@ -40,7 +40,7 @@ int MPIDO_Scatter_bcast(void * sendbuf, int recvcount, MPI_Datatype recvtype, int root, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, int *mpierrno) { /* Pretty simple - bcast a temp buffer and copy our little chunk out */ @@ -96,7 +96,7 @@ int MPIDO_Scatter(const void *sendbuf, int recvcount, MPI_Datatype recvtype, int root, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, int *mpierrno) { #ifndef HAVE_PAMI_IN_PLACE @@ -355,7 +355,7 @@ int MPIDO_Scatter_simple(const void *sendbuf, int recvcount, MPI_Datatype recvtype, int root, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, int *mpierrno) { #ifndef HAVE_PAMI_IN_PLACE @@ -536,7 +536,7 @@ MPIDO_CSWrapper_scatter(pami_xfer_t *scatter, void *comm) { int mpierrno = 0; - MPID_Comm *comm_ptr = (MPID_Comm*)comm; + MPIR_Comm *comm_ptr = (MPIR_Comm*)comm; MPI_Datatype sendtype, recvtype; void *rbuf; MPIDI_coll_check_in_place(scatter->cmd.xfer_scatter.rcvbuf, &rbuf); diff --git a/src/mpid/pamid/src/coll/scatterv/mpido_iscatterv.c b/src/mpid/pamid/src/coll/scatterv/mpido_iscatterv.c index 847ac7e..47e3781 100644 --- a/src/mpid/pamid/src/coll/scatterv/mpido_iscatterv.c +++ b/src/mpid/pamid/src/coll/scatterv/mpido_iscatterv.c @@ -30,7 +30,7 @@ int MPIDO_Iscatterv(const void *sendbuf, int recvcount, MPI_Datatype recvtype, int root, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, MPID_Request **request) { /*if (unlikely((data_size == 0) || (user_selected_type == MPID_COLL_USE_MPICH)))*/ diff --git a/src/mpid/pamid/src/coll/scatterv/mpido_scatterv.c b/src/mpid/pamid/src/coll/scatterv/mpido_scatterv.c index 958b20c..75c5186 100644 --- a/src/mpid/pamid/src/coll/scatterv/mpido_scatterv.c +++ b/src/mpid/pamid/src/coll/scatterv/mpido_scatterv.c @@ -33,7 +33,7 @@ int MPIDO_Scatterv_bcast(void *sendbuf, int recvcount, MPI_Datatype recvtype, int root, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, int *mpierrno) { const int rank = comm_ptr->rank; @@ -87,7 +87,7 @@ int MPIDO_Scatterv_alltoallv(void * sendbuf, int recvcount, MPI_Datatype recvtype, int root, - MPID_Comm * comm_ptr, + MPIR_Comm * comm_ptr, int *mpierrno) { const int rank = comm_ptr->rank; @@ -212,7 +212,7 @@ int MPIDO_Scatterv(const void *sendbuf, int recvcount, MPI_Datatype recvtype, int root, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, int *mpierrno) { #ifndef HAVE_PAMI_IN_PLACE @@ -468,7 +468,7 @@ int MPIDO_Scatterv_simple(const void *sendbuf, int recvcount, MPI_Datatype recvtype, int root, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, int *mpierrno) { #ifndef HAVE_PAMI_IN_PLACE @@ -654,7 +654,7 @@ MPIDO_CSWrapper_scatterv(pami_xfer_t *scatterv, void *comm) { int mpierrno = 0, rc = 0; - MPID_Comm *comm_ptr = (MPID_Comm*)comm; + MPIR_Comm *comm_ptr = (MPIR_Comm*)comm; MPI_Datatype sendtype, recvtype; void *rbuf; MPIDI_coll_check_in_place(scatterv->cmd.xfer_scatterv_int.rcvbuf, &rbuf); diff --git a/src/mpid/pamid/src/comm/mpid_comm.c b/src/mpid/pamid/src/comm/mpid_comm.c index 83786b1..1c61fbc 100644 --- a/src/mpid/pamid/src/comm/mpid_comm.c +++ b/src/mpid/pamid/src/comm/mpid_comm.c @@ -23,8 +23,8 @@ /*#define TRACE_ON */ #include <mpidimpl.h> -extern void MPIDI_Comm_coll_query(MPID_Comm *); -extern void MPIDI_Comm_coll_envvars(MPID_Comm *); +extern void MPIDI_Comm_coll_query(MPIR_Comm *); +extern void MPIDI_Comm_coll_envvars(MPIR_Comm *); void geom_create_cb_done(void *ctxt, void *data, pami_result_t err) { @@ -38,13 +38,13 @@ void geom_destroy_cb_done(void *ctxt, void *data, pami_result_t err) (*active)--; } -int MPIDI_Comm_create (MPID_Comm *comm) +int MPIDI_Comm_create (MPIR_Comm *comm) { MPIDI_Coll_comm_create(comm); return MPI_SUCCESS; } -int MPIDI_Comm_destroy (MPID_Comm *comm) +int MPIDI_Comm_destroy (MPIR_Comm *comm) { MPIDI_Coll_comm_destroy(comm); return MPI_SUCCESS; @@ -58,12 +58,12 @@ pami_result_t MPIDI_Comm_create_from_pami_geom(pami_geometry_range_t *task_slic int mpi_errno = MPI_SUCCESS; int num_tasks = 0; int *ranks = NULL; - MPID_Comm *comm_ptr = NULL, *new_comm_ptr = NULL; + MPIR_Comm *comm_ptr = NULL, *new_comm_ptr = NULL; MPID_Group *group_ptr = NULL, *new_group_ptr = NULL; int i = 0, j = 0; /* Get comm_ptr for MPI_COMM_WORLD and get the group_ptr for it */ - MPID_Comm_get_ptr( MPI_COMM_WORLD, comm_ptr ); + MPIR_Comm_get_ptr( MPI_COMM_WORLD, comm_ptr ); mpi_errno = MPIR_Comm_group_impl(comm_ptr, &group_ptr); if (mpi_errno) { @@ -125,7 +125,7 @@ pami_result_t MPIDI_Comm_create_from_pami_geom(pami_geometry_range_t *task_slic pami_result_t MPIDI_Comm_destroy_external(void *comm_ext) { int mpi_errno = 0; - MPID_Comm* comm_ptr = (MPID_Comm*)comm_ext; + MPIR_Comm* comm_ptr = (MPIR_Comm*)comm_ext; mpi_errno = MPIR_Comm_free_impl(comm_ptr); if (mpi_errno) { @@ -217,7 +217,7 @@ static pami_result_t geom_destroy_wrapper(pami_context_t context, void *cookie) -void MPIDI_Coll_comm_create(MPID_Comm *comm) +void MPIDI_Coll_comm_create(MPIR_Comm *comm) { volatile int geom_init = 1; int i; @@ -363,7 +363,7 @@ void MPIDI_Coll_comm_create(MPID_Comm *comm) TRACE_ERR("MPIDI_Coll_comm_create exit\n"); } -void MPIDI_Coll_comm_destroy(MPID_Comm *comm) +void MPIDI_Coll_comm_destroy(MPIR_Comm *comm) { TRACE_ERR("MPIDI_Coll_comm_destroy enter\n"); int i; diff --git a/src/mpid/pamid/src/comm/mpid_optcolls.c b/src/mpid/pamid/src/comm/mpid_optcolls.c index 15b45d4..d64ed04 100644 --- a/src/mpid/pamid/src/comm/mpid_optcolls.c +++ b/src/mpid/pamid/src/comm/mpid_optcolls.c @@ -86,7 +86,7 @@ MPIDI_Coll_comm_check_FCA(char *coll_name, int pami_xfer, int query_type, int proto_num, - MPID_Comm *comm_ptr) + MPIR_Comm *comm_ptr) { int opt_proto = -1; int i; @@ -169,7 +169,7 @@ MPIDI_Coll_comm_check_FCA(char *coll_name, } -void MPIDI_Comm_coll_select(MPID_Comm *comm_ptr) +void MPIDI_Comm_coll_select(MPIR_Comm *comm_ptr) { TRACE_ERR("Entering MPIDI_Comm_coll_select\n"); int opt_proto = -1; diff --git a/src/mpid/pamid/src/comm/mpid_selectcolls.c b/src/mpid/pamid/src/comm/mpid_selectcolls.c index 7c5f247..8e0fa36 100644 --- a/src/mpid/pamid/src/comm/mpid_selectcolls.c +++ b/src/mpid/pamid/src/comm/mpid_selectcolls.c @@ -114,12 +114,12 @@ static char* MPIDI_Coll_type_name(int i) static void MPIDI_Update_coll(pami_algorithm_t coll, int type, int index, - MPID_Comm *comm); + MPIR_Comm *comm); static void MPIDI_Update_coll(pami_algorithm_t coll, int type, /* must query vs always works */ int index, - MPID_Comm *comm) + MPIR_Comm *comm) { comm->mpid.user_selected_type[coll] = type; @@ -160,7 +160,7 @@ static void MPIDI_Update_coll(pami_algorithm_t coll, sizeof(pami_metadata_t)); } -static void MPIDI_Check_preallreduce(char *env, MPID_Comm *comm, char *name, int constant) +static void MPIDI_Check_preallreduce(char *env, MPIR_Comm *comm, char *name, int constant) { /* If a given protocol only requires a check for nonlocal conditions and preallreduce * is turned off, we can consider it a always works protocol instead @@ -176,7 +176,7 @@ static void MPIDI_Check_preallreduce(char *env, MPID_Comm *comm, char *name, int } } } -static int MPIDI_Check_protocols(char *names[], MPID_Comm *comm, char *name, int constant) +static int MPIDI_Check_protocols(char *names[], MPIR_Comm *comm, char *name, int constant) { int i = 0; char *envopts; @@ -239,7 +239,7 @@ static int MPIDI_Check_protocols(char *names[], MPID_Comm *comm, char *name, int return 0; } -void MPIDI_Comm_coll_envvars(MPID_Comm *comm) +void MPIDI_Comm_coll_envvars(MPIR_Comm *comm) { char *envopts; int i; @@ -590,7 +590,7 @@ void MPIDI_Comm_coll_envvars(MPID_Comm *comm) /* Determine how many of each collective type this communicator supports */ -void MPIDI_Comm_coll_query(MPID_Comm *comm) +void MPIDI_Comm_coll_query(MPIR_Comm *comm) { TRACE_ERR("MPIDI_Comm_coll_query enter\n"); int rc = 0, i, j; diff --git a/src/mpid/pamid/src/dyntask/mpid_comm_disconnect.c b/src/mpid/pamid/src/dyntask/mpid_comm_disconnect.c index 4bd2400..0b27700 100644 --- a/src/mpid/pamid/src/dyntask/mpid_comm_disconnect.c +++ b/src/mpid/pamid/src/dyntask/mpid_comm_disconnect.c @@ -45,7 +45,7 @@ typedef struct { extern transactionID_struct *_transactionID_list; -void MPIDI_get_allremote_leaders(int *tid_arr, MPID_Comm *comm_ptr); +void MPIDI_get_allremote_leaders(int *tid_arr, MPIR_Comm *comm_ptr); void MPIDI_send_AM_to_remote_leader_on_disconnect(int taskid, long long comm_cntr, int whichAM) { @@ -196,7 +196,7 @@ static void _qsort_dyntask(int t[],int left,int right) .N Errors .N MPI_SUCCESS @*/ -int MPID_Comm_disconnect(MPID_Comm *comm_ptr) +int MPID_Comm_disconnect(MPIR_Comm *comm_ptr) { int rc, i,j, k, ref_count,mpi_errno=0, probe_flag=0; pami_task_t *local_list; @@ -206,10 +206,10 @@ int MPID_Comm_disconnect(MPID_Comm *comm_ptr) int total_leaders=0, gsize; pami_task_t *leader_tids; int expected_firstAM=0, expected_secondAM=0, expected_lastAM=0; - MPID_Comm *commworld_ptr; + MPIR_Comm *commworld_ptr; MPID_Group *group_ptr = NULL, *new_group_ptr = NULL; MPID_VCR *glist; - MPID_Comm *lcomm; + MPIR_Comm *lcomm; int *ranks; int local_tasks=0, localtasks_in_remglist=0; int jobIdSize=64; @@ -226,7 +226,7 @@ int MPID_Comm_disconnect(MPID_Comm *comm_ptr) /* make commSubWorld */ { - /* MPID_Comm_get_ptr( MPI_COMM_WORLD, commworld_ptr ); */ + /* MPIR_Comm_get_ptr( MPI_COMM_WORLD, commworld_ptr ); */ commworld_ptr = MPIR_Process.comm_world; mpi_errno = MPIR_Comm_group_impl(commworld_ptr, &group_ptr); if (mpi_errno) @@ -462,7 +462,7 @@ int MPIDI_Decrement_ref_count(int wid) { return ref_count; } -void MPIDI_get_allremote_leaders(int *tid_arr, MPID_Comm *comm_ptr) +void MPIDI_get_allremote_leaders(int *tid_arr, MPIR_Comm *comm_ptr) { conn_info *tmp_node; int i,j,k,arr_len,gsize, found=0; diff --git a/src/mpid/pamid/src/dyntask/mpid_comm_spawn_multiple.c b/src/mpid/pamid/src/dyntask/mpid_comm_spawn_multiple.c index b7b7eae..7a25806 100644 --- a/src/mpid/pamid/src/dyntask/mpid_comm_spawn_multiple.c +++ b/src/mpid/pamid/src/dyntask/mpid_comm_spawn_multiple.c @@ -108,7 +108,7 @@ static void MPIDI_free_pmi_keyvals(PMI_keyval_t **kv, int size, int *counts) int MPID_Comm_spawn_multiple(int count, char *array_of_commands[], char ** array_of_argv[], const int array_of_maxprocs[], MPID_Info * array_of_info_ptrs[], int root, - MPID_Comm * comm_ptr, MPID_Comm ** intercomm, + MPIR_Comm * comm_ptr, MPIR_Comm ** intercomm, int array_of_errcodes[]) { int mpi_errno = MPI_SUCCESS; @@ -137,7 +137,7 @@ int MPID_Comm_spawn_multiple(int count, char *array_of_commands[], int MPIDI_Comm_spawn_multiple(int count, char **commands, char ***argvs, int *maxprocs, MPID_Info **info_ptrs, int root, - MPID_Comm *comm_ptr, MPID_Comm + MPIR_Comm *comm_ptr, MPIR_Comm **intercomm, int *errcodes) { char port_name[MPI_MAX_PORT_NAME]; diff --git a/src/mpid/pamid/src/dyntask/mpid_port.c b/src/mpid/pamid/src/dyntask/mpid_port.c index 27d6331..04ae11f 100644 --- a/src/mpid/pamid/src/dyntask/mpid_port.c +++ b/src/mpid/pamid/src/dyntask/mpid_port.c @@ -95,7 +95,7 @@ int MPID_Close_port(const char *port_name) #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) int MPID_Comm_accept(const char * port_name, MPID_Info * info, int root, - MPID_Comm * comm, MPID_Comm ** newcomm_ptr) + MPIR_Comm * comm, MPIR_Comm ** newcomm_ptr) { int mpi_errno = MPI_SUCCESS; @@ -123,7 +123,7 @@ int MPID_Comm_accept(const char * port_name, MPID_Info * info, int root, #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) int MPID_Comm_connect(const char * port_name, MPID_Info * info, int root, - MPID_Comm * comm, MPID_Comm ** newcomm_ptr) + MPIR_Comm * comm, MPIR_Comm ** newcomm_ptr) { int mpi_errno=MPI_SUCCESS; diff --git a/src/mpid/pamid/src/dyntask/mpidi_pg.c b/src/mpid/pamid/src/dyntask/mpidi_pg.c index d1a9768..bbed28c 100644 --- a/src/mpid/pamid/src/dyntask/mpidi_pg.c +++ b/src/mpid/pamid/src/dyntask/mpidi_pg.c @@ -1003,7 +1003,7 @@ void MPIDI_PG_IdToNum( MPIDI_PG_t *pg, int *id ) } -int MPID_PG_ForwardPGInfo( MPID_Comm *peer_ptr, MPID_Comm *comm_ptr, +int MPID_PG_ForwardPGInfo( MPIR_Comm *peer_ptr, MPIR_Comm *comm_ptr, int nPGids, const int gpids[], int root ) { diff --git a/src/mpid/pamid/src/dyntask/mpidi_port.c b/src/mpid/pamid/src/dyntask/mpidi_port.c index db532e4..121eb07 100644 --- a/src/mpid/pamid/src/dyntask/mpidi_port.c +++ b/src/mpid/pamid/src/dyntask/mpidi_port.c @@ -109,16 +109,16 @@ void MPIDI_Recvfrom_remote_world(pami_context_t context, /* These functions help implement the connect/accept algorithm */ -static int MPIDI_ExtractLocalPGInfo( struct MPID_Comm *, pg_translation [], +static int MPIDI_ExtractLocalPGInfo( struct MPIR_Comm *, pg_translation [], pg_node **, int * ); -static int MPIDI_ReceivePGAndDistribute( struct MPID_Comm *, struct MPID_Comm *, int, int *, +static int MPIDI_ReceivePGAndDistribute( struct MPIR_Comm *, struct MPIR_Comm *, int, int *, int, MPIDI_PG_t *[] ); -static int MPIDI_SendPGtoPeerAndFree( struct MPID_Comm *, int *, pg_node * ); -static int MPIDI_SetupNewIntercomm( struct MPID_Comm *comm_ptr, int remote_comm_size, +static int MPIDI_SendPGtoPeerAndFree( struct MPIR_Comm *, int *, pg_node * ); +static int MPIDI_SetupNewIntercomm( struct MPIR_Comm *comm_ptr, int remote_comm_size, pg_translation remote_translation[], int n_remote_pgs, MPIDI_PG_t **remote_pg, - struct MPID_Comm *intercomm ); -static int MPIDI_Initialize_tmp_comm(struct MPID_Comm **comm_pptr, + struct MPIR_Comm *intercomm ); +static int MPIDI_Initialize_tmp_comm(struct MPIR_Comm **comm_pptr, struct MPID_VCR_t *vcr_ptr, int is_low_group, int context_id_offset); @@ -271,11 +271,11 @@ int MPIDI_Connect_to_root(const char * port_name, static int MPIDI_Create_inter_root_communicator_connect(const char *port_name, - struct MPID_Comm **comm_pptr, + struct MPIR_Comm **comm_pptr, MPID_VCR *vc_pptr) { int mpi_errno = MPI_SUCCESS; - struct MPID_Comm *tmp_comm; + struct MPIR_Comm *tmp_comm; struct MPID_VCR_t *connect_vc= NULL; int port_name_tag, taskid_tag; /* Connect to the root on the other side. Create a @@ -316,11 +316,11 @@ static int MPIDI_Create_inter_root_communicator_connect(const char *port_name, process (the root of the other group). It also returns the virtual connection */ static int MPIDI_Create_inter_root_communicator_accept(const char *port_name, - struct MPID_Comm **comm_pptr, + struct MPIR_Comm **comm_pptr, MPID_VCR *vc_pptr) { int mpi_errno = MPI_SUCCESS; - struct MPID_Comm *tmp_comm; + struct MPIR_Comm *tmp_comm; MPID_VCR new_vc; MPID_Progress_state progress_state; @@ -373,13 +373,13 @@ fn_fail: /* This is a utility routine used to initialize temporary communicators used in connect/accept operations, and is only used in the above two routines */ -static int MPIDI_Initialize_tmp_comm(struct MPID_Comm **comm_pptr, +static int MPIDI_Initialize_tmp_comm(struct MPIR_Comm **comm_pptr, struct MPID_VCR_t *vc_ptr, int is_low_group, int context_id_offset) { int mpi_errno = MPI_SUCCESS; - struct MPID_Comm *tmp_comm, *commself_ptr; + struct MPIR_Comm *tmp_comm, *commself_ptr; - MPID_Comm_get_ptr( MPI_COMM_SELF, commself_ptr ); + MPIR_Comm_get_ptr( MPI_COMM_SELF, commself_ptr ); /* WDG-old code allocated a context id that was then discarded */ mpi_errno = MPIR_Comm_create(&tmp_comm); @@ -497,12 +497,12 @@ void MPIDI_add_new_tranid(long long tranid) because there can be multiple process groups on each side. */ int MPIDI_Comm_connect(const char *port_name, MPID_Info *info, int root, - struct MPID_Comm *comm_ptr, struct MPID_Comm **newcomm) + struct MPIR_Comm *comm_ptr, struct MPIR_Comm **newcomm) { int mpi_errno=MPI_SUCCESS; int j, i, rank, recv_ints[3], send_ints[3], context_id; int remote_comm_size=0; - struct MPID_Comm *tmp_comm = NULL; + struct MPIR_Comm *tmp_comm = NULL; MPID_VCR new_vc= NULL; int sendtag=100, recvtag=100, n_remote_pgs; int n_local_pgs=1, local_comm_size; @@ -714,7 +714,7 @@ fn_fail: * all of the process groups that have made up the communicator that * will define the "remote group". */ -static int MPIDI_ExtractLocalPGInfo( struct MPID_Comm *comm_p, +static int MPIDI_ExtractLocalPGInfo( struct MPIR_Comm *comm_p, pg_translation local_translation[], pg_node **pg_list_p, int *n_local_pgs_p ) @@ -805,7 +805,7 @@ static int MPIDI_ExtractLocalPGInfo( struct MPID_Comm *comm_p, process groups and then distributes them to the other processes in comm_ptr. See SendPGToPeer for the routine that sends the descriptions */ -static int MPIDI_ReceivePGAndDistribute( struct MPID_Comm *tmp_comm, struct MPID_Comm *comm_ptr, +static int MPIDI_ReceivePGAndDistribute( struct MPIR_Comm *tmp_comm, struct MPIR_Comm *comm_ptr, int root, int *recvtag_p, int n_remote_pgs, MPIDI_PG_t *remote_pg[] ) { @@ -1082,7 +1082,7 @@ void MPIDI_free_all_tranid_node() /* Sends the process group information to the peer and frees the pg_list */ -static int MPIDI_SendPGtoPeerAndFree( struct MPID_Comm *tmp_comm, int *sendtag_p, +static int MPIDI_SendPGtoPeerAndFree( struct MPIR_Comm *tmp_comm, int *sendtag_p, pg_node *pg_list ) { int mpi_errno = 0; @@ -1137,12 +1137,12 @@ static int MPIDI_SendPGtoPeerAndFree( struct MPID_Comm *tmp_comm, int *sendtag_p */ int MPIDI_Comm_accept(const char *port_name, MPID_Info *info, int root, - struct MPID_Comm *comm_ptr, struct MPID_Comm **newcomm) + struct MPIR_Comm *comm_ptr, struct MPIR_Comm **newcomm) { int mpi_errno=MPI_SUCCESS; int i, j, rank, recv_ints[3], send_ints[3], context_id; int remote_comm_size=0; - struct MPID_Comm *tmp_comm = NULL, *intercomm; + struct MPIR_Comm *tmp_comm = NULL, *intercomm; MPID_VCR new_vc = NULL; int sendtag=100, recvtag=100, local_comm_size; int n_local_pgs=1, n_remote_pgs; @@ -1378,10 +1378,10 @@ fn_fail: Note: This routine performance a barrier over 'comm_ptr'. Why? */ -static int MPIDI_SetupNewIntercomm( struct MPID_Comm *comm_ptr, int remote_comm_size, +static int MPIDI_SetupNewIntercomm( struct MPIR_Comm *comm_ptr, int remote_comm_size, pg_translation remote_translation[], int n_remote_pgs, MPIDI_PG_t **remote_pg, - struct MPID_Comm *intercomm ) + struct MPIR_Comm *intercomm ) { int mpi_errno = MPI_SUCCESS, i, j, index=0; MPIR_Errflag_t errflag = MPIR_ERR_NONE; @@ -1392,7 +1392,7 @@ static int MPIDI_SetupNewIntercomm( struct MPID_Comm *comm_ptr, int remote_comm_ MPID_VCR *worldlist; int worldsize; pami_endpoint_t dest; - MPID_Comm *comm; + MPIR_Comm *comm; pami_task_t leader1=-1, leader2=-1, leader_taskid=-1; long long comm_cntr=0, lcomm_cntr=-1; int jobIdSize=64; @@ -1494,7 +1494,7 @@ static int MPIDI_SetupNewIntercomm( struct MPID_Comm *comm_ptr, int remote_comm_ leader_taskid = comm_ptr->vcr[0]->taskid; - MPID_Comm *comm_world_ptr = MPIR_Process.comm_world; + MPIR_Comm *comm_world_ptr = MPIR_Process.comm_world; worldlist = comm_world_ptr->vcr; worldsize = comm_world_ptr->local_size; comm = intercomm; @@ -1677,7 +1677,7 @@ void MPIDI_delete_conn_record(int wid) { } -int MPID_PG_BCast( MPID_Comm *peercomm_p, MPID_Comm *comm_p, int root ) +int MPID_PG_BCast( MPIR_Comm *peercomm_p, MPIR_Comm *comm_p, int root ) { int n_local_pgs=0, mpi_errno = MPI_SUCCESS; pg_translation *local_translation = 0; diff --git a/src/mpid/pamid/src/misc/mpid_abort.c b/src/mpid/pamid/src/misc/mpid_abort.c index 79842c2..8cc669b 100644 --- a/src/mpid/pamid/src/misc/mpid_abort.c +++ b/src/mpid/pamid/src/misc/mpid_abort.c @@ -37,7 +37,7 @@ * * MPIDI_Abort_core() simply uses the same params from MPID_Abort(). */ -void MPIDI_Abort_core(MPID_Comm * comm, int mpi_errno, int exit_code, const char *user_str) +void MPIDI_Abort_core(MPIR_Comm * comm, int mpi_errno, int exit_code, const char *user_str) { char sys_str[MPI_MAX_ERROR_STRING+5] = ""; char comm_str[MPI_MAX_ERROR_STRING] = ""; @@ -80,7 +80,7 @@ void MPIDI_Abort_core(MPID_Comm * comm, int mpi_errno, int exit_code, const char * * This function MUST NEVER return. */ -int MPID_Abort(MPID_Comm * comm, int mpi_errno, int exit_code, const char *error_msg) +int MPID_Abort(MPIR_Comm * comm, int mpi_errno, int exit_code, const char *error_msg) { MPIDI_Abort_core(comm, mpi_errno, exit_code, error_msg); diff --git a/src/mpid/pamid/src/misc/mpid_unimpl.c b/src/mpid/pamid/src/misc/mpid_unimpl.c index 63c4c7c..f52bd98 100644 --- a/src/mpid/pamid/src/misc/mpid_unimpl.c +++ b/src/mpid/pamid/src/misc/mpid_unimpl.c @@ -37,8 +37,8 @@ int MPID_Open_port(MPID_Info *info_ptr, int MPID_Comm_accept(const char *port_name, MPID_Info *info_ptr, int root, - MPID_Comm *comm_ptr, - MPID_Comm **newcomm) + MPIR_Comm *comm_ptr, + MPIR_Comm **newcomm) { MPID_abort(); return 0; @@ -46,13 +46,13 @@ int MPID_Comm_accept(const char *port_name, int MPID_Comm_connect(const char *port_name, MPID_Info *info_ptr, int root, - MPID_Comm *comm_ptr, - MPID_Comm **newcomm) + MPIR_Comm *comm_ptr, + MPIR_Comm **newcomm) { MPID_abort(); return 0; } -int MPID_Comm_disconnect(MPID_Comm *comm_ptr) +int MPID_Comm_disconnect(MPIR_Comm *comm_ptr) { MPID_abort(); return 0; @@ -63,8 +63,8 @@ int MPID_Comm_spawn_multiple(int count, const int array_of_maxprocs[], MPID_Info *array_of_info[], int root, - MPID_Comm *comm_ptr, - MPID_Comm **intercomm, + MPIR_Comm *comm_ptr, + MPIR_Comm **intercomm, int array_of_errcodes[]) { MPID_abort(); @@ -72,31 +72,31 @@ int MPID_Comm_spawn_multiple(int count, } #endif -int MPID_Comm_failure_ack(MPID_Comm *comm_ptr) +int MPID_Comm_failure_ack(MPIR_Comm *comm_ptr) { MPID_abort(); return 0; } -int MPID_Comm_failure_get_acked(MPID_Comm *comm_ptr, MPID_Group **failed_group_ptr) +int MPID_Comm_failure_get_acked(MPIR_Comm *comm_ptr, MPID_Group **failed_group_ptr) { MPID_abort(); return 0; } -int MPID_Comm_get_all_failed_procs(MPID_Comm *comm_ptr, MPID_Group **failed_group, int tag) +int MPID_Comm_get_all_failed_procs(MPIR_Comm *comm_ptr, MPID_Group **failed_group, int tag) { MPID_abort(); return 0; } -int MPID_Comm_revoke(MPID_Comm *comm_ptr, int is_remote) +int MPID_Comm_revoke(MPIR_Comm *comm_ptr, int is_remote) { MPID_abort(); return 0; } -int MPID_Comm_AS_enabled(MPID_Comm *comm_ptr) +int MPID_Comm_AS_enabled(MPIR_Comm *comm_ptr) { /* This function must return 1 in the default case and should not be ignored * by the implementation. */ diff --git a/src/mpid/pamid/src/mpid_improbe.c b/src/mpid/pamid/src/mpid_improbe.c index dc101fa..34fb6db 100644 --- a/src/mpid/pamid/src/mpid_improbe.c +++ b/src/mpid/pamid/src/mpid_improbe.c @@ -6,7 +6,7 @@ #include "mpidimpl.h" -int MPID_Improbe(int source, int tag, MPID_Comm *comm, int context_offset, +int MPID_Improbe(int source, int tag, MPIR_Comm *comm, int context_offset, int *flag, MPID_Request **message, MPI_Status *status) { const int context = comm->recvcontext_id + context_offset; diff --git a/src/mpid/pamid/src/mpid_init.c b/src/mpid/pamid/src/mpid_init.c index 6b91595..f254b31 100644 --- a/src/mpid/pamid/src/mpid_init.c +++ b/src/mpid/pamid/src/mpid_init.c @@ -335,8 +335,8 @@ static struct #define FUNCNAME split_type #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) -static int split_type(MPID_Comm * comm_ptr, int stype, int key, - MPID_Info *info_ptr, MPID_Comm ** newcomm_ptr) +static int split_type(MPIR_Comm * comm_ptr, int stype, int key, + MPID_Info *info_ptr, MPIR_Comm ** newcomm_ptr) { MPID_Node_id_t id; int nid; @@ -1112,7 +1112,7 @@ MPIDI_VCRT_init(int rank, int size, char *world_tasks, MPIDI_PG_t *pg) #endif { int i, rc; - MPID_Comm * comm; + MPIR_Comm * comm; #ifdef DYNAMIC_TASKING int p, mpi_errno=0; char *world_tasks_save,*cp; @@ -1231,7 +1231,7 @@ int MPID_Init(int * argc, int pg_rank=-1; int pg_size; int appnum,mpi_errno; - MPID_Comm * comm; + MPIR_Comm * comm; int i,j; pami_configuration_t config; int world_size; diff --git a/src/mpid/pamid/src/mpid_iprobe.c b/src/mpid/pamid/src/mpid_iprobe.c index ebdc093..97e9a94 100644 --- a/src/mpid/pamid/src/mpid_iprobe.c +++ b/src/mpid/pamid/src/mpid_iprobe.c @@ -25,7 +25,7 @@ int MPID_Iprobe(int source, int tag, - MPID_Comm * comm, + MPIR_Comm * comm, int context_offset, int *flag, MPI_Status * status) diff --git a/src/mpid/pamid/src/mpid_mprobe.c b/src/mpid/pamid/src/mpid_mprobe.c index 81e0690..02ff710 100644 --- a/src/mpid/pamid/src/mpid_mprobe.c +++ b/src/mpid/pamid/src/mpid_mprobe.c @@ -6,7 +6,7 @@ #include "mpidimpl.h" -int MPID_Mprobe(int source, int tag, MPID_Comm *comm, int context_offset, +int MPID_Mprobe(int source, int tag, MPIR_Comm *comm, int context_offset, MPID_Request **message, MPI_Status *status) { const int context = comm->recvcontext_id + context_offset; diff --git a/src/mpid/pamid/src/mpid_probe.c b/src/mpid/pamid/src/mpid_probe.c index f0f1549..9287fec 100644 --- a/src/mpid/pamid/src/mpid_probe.c +++ b/src/mpid/pamid/src/mpid_probe.c @@ -25,7 +25,7 @@ int MPID_Probe(int source, int tag, - MPID_Comm * comm, + MPIR_Comm * comm, int context_offset, MPI_Status * status) { diff --git a/src/mpid/pamid/src/mpid_vc.c b/src/mpid/pamid/src/mpid_vc.c index 965455a..6f57cf3 100644 --- a/src/mpid/pamid/src/mpid_vc.c +++ b/src/mpid/pamid/src/mpid_vc.c @@ -151,11 +151,11 @@ int MPID_VCRT_Get_ptr(MPID_VCRT vcrt, MPID_VCR **vc_pptr) } #ifdef DYNAMIC_TASKING -int MPID_VCR_CommFromLpids( MPID_Comm *newcomm_ptr, +int MPID_VCR_CommFromLpids( MPIR_Comm *newcomm_ptr, int size, const int lpids[] ) { int mpi_errno = MPI_SUCCESS; - MPID_Comm *commworld_ptr; + MPIR_Comm *commworld_ptr; int i; MPIDI_PG_iterator iter; @@ -306,7 +306,7 @@ int MPID_GPID_ToLpidArray( int size, int gpid[], int lpid[] ) */ /* FIXME: These routines belong in a different place */ -int MPID_GPID_GetAllInComm( MPID_Comm *comm_ptr, int local_size, +int MPID_GPID_GetAllInComm( MPIR_Comm *comm_ptr, int local_size, int local_gpids[], int *singlePG ) { int mpi_errno = MPI_SUCCESS; diff --git a/src/mpid/pamid/src/mpidi_util.c b/src/mpid/pamid/src/mpidi_util.c index 20ce459..4e16ec2 100644 --- a/src/mpid/pamid/src/mpidi_util.c +++ b/src/mpid/pamid/src/mpidi_util.c @@ -430,7 +430,7 @@ void MPIDI_Get_net_param(char *cp, int MPI_only, int my_taskid, int total_task, int MPIDI_Print_mpenv(int rank,int size) { MPI_Comm comm = MPI_COMM_WORLD; - MPID_Comm *comm_ptr; + MPIR_Comm *comm_ptr; MPIDI_printenv_t sender; MPIDI_printenv_t *gatherer = NULL; int mytask; @@ -710,7 +710,7 @@ int MPIDI_Print_mpenv(int rank,int size) mpi_errno = MPI_SUCCESS; - MPID_Comm_get_ptr( comm, comm_ptr ); + MPIR_Comm_get_ptr( comm, comm_ptr ); mpi_errno = MPIR_Gather_impl(&sender, sizeof(MPIDI_printenv_t), MPI_BYTE, gatherer, sizeof(MPIDI_printenv_t),MPI_BYTE, 0,comm_ptr, (int *) &errflag); @@ -2001,7 +2001,7 @@ inline bool MPIDI_cuda_is_device_buf(const void* ptr) #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) static int _g_max_node_id = -1; -int MPID_Get_node_id(MPID_Comm *comm, int rank, MPID_Node_id_t *id_p) +int MPID_Get_node_id(MPIR_Comm *comm, int rank, MPID_Node_id_t *id_p) { int mpi_errno = MPI_SUCCESS; uint32_t node_id; @@ -2030,7 +2030,7 @@ int MPID_Get_node_id(MPID_Comm *comm, int rank, MPID_Node_id_t *id_p) #define FUNCNAME MPID_Get_max_node_id #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) -int MPID_Get_max_node_id(MPID_Comm *comm, MPID_Node_id_t *max_id_p) +int MPID_Get_max_node_id(MPIR_Comm *comm, MPID_Node_id_t *max_id_p) { int mpi_errno = MPI_SUCCESS; uint32_t node_id; diff --git a/src/mpid/pamid/src/mpix/mpix.c b/src/mpid/pamid/src/mpix/mpix.c index 96d1746..22955fd 100644 --- a/src/mpid/pamid/src/mpix/mpix.c +++ b/src/mpid/pamid/src/mpix/mpix.c @@ -138,8 +138,8 @@ MPIX_Comm_rank2global(MPI_Comm comm, int crank, int *grank) if (grank == NULL) return MPI_ERR_ARG; - MPID_Comm *comm_ptr = NULL; - MPID_Comm_get_ptr(comm, comm_ptr); + MPIR_Comm *comm_ptr = NULL; + MPIR_Comm_get_ptr(comm, comm_ptr); if (comm_ptr == NULL) return MPI_ERR_COMM; @@ -463,12 +463,12 @@ MPIX_Comm_update_post(pami_context_t context, void *cookie) int MPIX_Comm_update(MPI_Comm comm, int optimize) { - MPID_Comm * comm_ptr; + MPIR_Comm * comm_ptr; volatile int geom_update = 1; MPIX_Comm_update_data_t data; pami_configuration_t config; - MPID_Comm_get_ptr(comm, comm_ptr); + MPIR_Comm_get_ptr(comm, comm_ptr); if (!comm_ptr || comm == MPI_COMM_NULL) return MPI_ERR_COMM; @@ -508,8 +508,8 @@ MPIX_Comm_update(MPI_Comm comm, int optimize) int MPIX_Get_last_algorithm_name(MPI_Comm comm, char *protocol, int length) { - MPID_Comm *comm_ptr; - MPID_Comm_get_ptr(comm, comm_ptr); + MPIR_Comm *comm_ptr; + MPIR_Comm_get_ptr(comm, comm_ptr); if(!comm_ptr || comm == MPI_COMM_NULL) return MPI_ERR_COMM; @@ -685,7 +685,7 @@ MPIX_Pset_io_node (int *io_node_route_id, int *distance_to_io_node) * * \return MPI status */ -int _MPIX_Pset_same_comm_create (MPID_Comm *parent_comm_ptr, MPID_Comm **pset_comm_ptr) +int _MPIX_Pset_same_comm_create (MPIR_Comm *parent_comm_ptr, MPIR_Comm **pset_comm_ptr) { int color, key; int mpi_errno; @@ -718,7 +718,7 @@ int MPIX_Pset_same_comm_create_from_parent (MPI_Comm parent_comm, MPI_Comm *pset_comm) { int mpi_errno; - MPID_Comm *parent_comm_ptr, *pset_comm_ptr; + MPIR_Comm *parent_comm_ptr, *pset_comm_ptr; *pset_comm = MPI_COMM_NULL; @@ -727,7 +727,7 @@ MPIX_Pset_same_comm_create_from_parent (MPI_Comm parent_comm, MPI_Comm *pset_com * needed by the error handling code. */ parent_comm_ptr = NULL; - MPID_Comm_get_ptr(parent_comm, parent_comm_ptr); + MPIR_Comm_get_ptr(parent_comm, parent_comm_ptr); mpi_errno = MPI_SUCCESS; mpi_errno = _MPIX_Pset_same_comm_create (parent_comm_ptr, &pset_comm_ptr); @@ -762,7 +762,7 @@ MPIX_Pset_same_comm_create (MPI_Comm *pset_comm) int MPIX_Pset_diff_comm_create_from_parent (MPI_Comm parent_comm, MPI_Comm *pset_comm) { - MPID_Comm *parent_comm_ptr, *pset_same_comm_ptr, *pset_diff_comm_ptr; + MPIR_Comm *parent_comm_ptr, *pset_same_comm_ptr, *pset_diff_comm_ptr; int color, key; int mpi_errno; @@ -773,7 +773,7 @@ MPIX_Pset_diff_comm_create_from_parent (MPI_Comm parent_comm, MPI_Comm *pset_com * needed by the error handling code. */ parent_comm_ptr = NULL; - MPID_Comm_get_ptr(parent_comm, parent_comm_ptr); + MPIR_Comm_get_ptr(parent_comm, parent_comm_ptr); /* * Determine the 'color' of this rank to create the new communicator - which diff --git a/src/mpid/pamid/src/onesided/mpid_win_allocate.c b/src/mpid/pamid/src/onesided/mpid_win_allocate.c index aebc0d6..d3e584b 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_allocate.c +++ b/src/mpid/pamid/src/onesided/mpid_win_allocate.c @@ -49,7 +49,7 @@ int MPID_Win_allocate(MPI_Aint size, int disp_unit, MPID_Info * info, - MPID_Comm * comm_ptr, + MPIR_Comm * comm_ptr, void *base_ptr, MPID_Win ** win_ptr) { diff --git a/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c b/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c index 01db84f..6d007bf 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c +++ b/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c @@ -40,7 +40,7 @@ extern int mpidi_dynamic_tasking; #define ALIGN_BOUNDARY 128 /* Align data structures to cache line */ #define PAD_SIZE(s) (ALIGN_BOUNDARY - (sizeof(s) & (ALIGN_BOUNDARY-1))) -int CheckRankOnNode(MPID_Comm * comm_ptr,int *onNode ) { +int CheckRankOnNode(MPIR_Comm * comm_ptr,int *onNode ) { int comm_size, i; int mpi_errno = PAMI_SUCCESS; @@ -301,7 +301,7 @@ fn_fail: int MPID_getSharedSegment(MPI_Aint size, int disp_unit, - MPID_Comm * comm_ptr, + MPIR_Comm * comm_ptr, MPID_Win **win_ptr, MPI_Aint * pSize, int * noncontig) @@ -479,7 +479,7 @@ int MPID_Win_allocate_shared(MPI_Aint size, int disp_unit, MPID_Info * info, - MPID_Comm * comm_ptr, + MPIR_Comm * comm_ptr, void *base_ptr, MPID_Win ** win_ptr) { diff --git a/src/mpid/pamid/src/onesided/mpid_win_create.c b/src/mpid/pamid/src/onesided/mpid_win_create.c index d509671..99f8a3c 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_create.c +++ b/src/mpid/pamid/src/onesided/mpid_win_create.c @@ -33,7 +33,7 @@ MPIDI_Win_init( MPI_Aint length, int disp_unit, MPID_Win **win_ptr, MPID_Info *info, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, int create_flavor, int model) { @@ -108,7 +108,7 @@ MPIDI_Win_allgather( MPI_Aint size, MPID_Win **win_ptr ) MPIR_Errflag_t errflag=MPIR_ERR_NONE; MPID_Win *win; int rank; - MPID_Comm *comm_ptr; + MPIR_Comm *comm_ptr; size_t length_out = 0; pami_result_t rc; MPIDI_Win_info *winfo; @@ -183,7 +183,7 @@ MPID_Win_create(void * base, MPI_Aint size, int disp_unit, MPID_Info * info, - MPID_Comm * comm_ptr, + MPIR_Comm * comm_ptr, MPID_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; diff --git a/src/mpid/pamid/src/onesided/mpid_win_create_dynamic.c b/src/mpid/pamid/src/onesided/mpid_win_create_dynamic.c index a8a50bb..c7293d4 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_create_dynamic.c +++ b/src/mpid/pamid/src/onesided/mpid_win_create_dynamic.c @@ -39,7 +39,7 @@ int MPID_Win_create_dynamic( MPID_Info * info, - MPID_Comm * comm_ptr, + MPIR_Comm * comm_ptr, MPID_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; diff --git a/src/mpid/pamid/src/onesided/mpidi_onesided.h b/src/mpid/pamid/src/onesided/mpidi_onesided.h index c00136e..d159148 100644 --- a/src/mpid/pamid/src/onesided/mpidi_onesided.h +++ b/src/mpid/pamid/src/onesided/mpidi_onesided.h @@ -351,7 +351,7 @@ MPIDI_Win_init( MPI_Aint length, int disp_unit, MPID_Win **win_ptr, MPID_Info *info, - MPID_Comm *comm_ptr, + MPIR_Comm *comm_ptr, int create_flavor, int model); int diff --git a/src/mpid/pamid/src/pt2pt/mpid_irecv.h b/src/mpid/pamid/src/pt2pt/mpid_irecv.h index 1f8d4bc..0517846 100644 --- a/src/mpid/pamid/src/pt2pt/mpid_irecv.h +++ b/src/mpid/pamid/src/pt2pt/mpid_irecv.h @@ -48,7 +48,7 @@ MPID_Irecv_inline(void * buf, MPI_Datatype datatype, int rank, int tag, - MPID_Comm * comm, + MPIR_Comm * comm, int context_offset, MPID_Request ** request) { diff --git a/src/mpid/pamid/src/pt2pt/mpid_isend.h b/src/mpid/pamid/src/pt2pt/mpid_isend.h index 82046be..e618747 100644 --- a/src/mpid/pamid/src/pt2pt/mpid_isend.h +++ b/src/mpid/pamid/src/pt2pt/mpid_isend.h @@ -84,7 +84,7 @@ MPID_Isend_inline(const void * buf, MPI_Datatype datatype, int rank, int tag, - MPID_Comm * comm, + MPIR_Comm * comm, int context_offset, MPID_Request ** request) { diff --git a/src/mpid/pamid/src/pt2pt/mpid_issend.c b/src/mpid/pamid/src/pt2pt/mpid_issend.c index 201e450..b7f1175 100644 --- a/src/mpid/pamid/src/pt2pt/mpid_issend.c +++ b/src/mpid/pamid/src/pt2pt/mpid_issend.c @@ -45,7 +45,7 @@ int MPID_Issend(const void * buf, MPI_Datatype datatype, int rank, int tag, - MPID_Comm * comm, + MPIR_Comm * comm, int context_offset, MPID_Request ** request) { diff --git a/src/mpid/pamid/src/pt2pt/mpid_recv.c b/src/mpid/pamid/src/pt2pt/mpid_recv.c index 4dd15b6..86c86e0 100644 --- a/src/mpid/pamid/src/pt2pt/mpid_recv.c +++ b/src/mpid/pamid/src/pt2pt/mpid_recv.c @@ -42,7 +42,7 @@ int MPID_Recv(void * buf, MPI_Datatype datatype, int rank, int tag, - MPID_Comm * comm, + MPIR_Comm * comm, int context_offset, MPI_Status * status, MPID_Request ** request) diff --git a/src/mpid/pamid/src/pt2pt/mpid_send.h b/src/mpid/pamid/src/pt2pt/mpid_send.h index ce2f8f0..421d2aa 100644 --- a/src/mpid/pamid/src/pt2pt/mpid_send.h +++ b/src/mpid/pamid/src/pt2pt/mpid_send.h @@ -47,7 +47,7 @@ MPID_Send_inline(const void * buf, MPI_Datatype datatype, int rank, int tag, - MPID_Comm * comm, + MPIR_Comm * comm, int context_offset, MPID_Request ** request) { diff --git a/src/mpid/pamid/src/pt2pt/mpid_ssend.c b/src/mpid/pamid/src/pt2pt/mpid_ssend.c index 84fc8e8..87fb36d 100644 --- a/src/mpid/pamid/src/pt2pt/mpid_ssend.c +++ b/src/mpid/pamid/src/pt2pt/mpid_ssend.c @@ -41,7 +41,7 @@ int MPID_Ssend(const void * buf, MPI_Datatype datatype, int rank, int tag, - MPID_Comm * comm, + MPIR_Comm * comm, int context_offset, MPID_Request ** request) { diff --git a/src/mpid/pamid/src/pt2pt/mpidi_recv.h b/src/mpid/pamid/src/pt2pt/mpidi_recv.h index 05098c2..8df22ff 100644 --- a/src/mpid/pamid/src/pt2pt/mpidi_recv.h +++ b/src/mpid/pamid/src/pt2pt/mpidi_recv.h @@ -139,7 +139,7 @@ MPIDI_Recv(void * buf, MPI_Datatype datatype, int rank, int tag, - MPID_Comm * comm, + MPIR_Comm * comm, int context_offset, unsigned is_blocking, MPI_Status * status, diff --git a/src/mpid/pamid/src/pt2pt/mpidi_recvmsg.c b/src/mpid/pamid/src/pt2pt/mpidi_recvmsg.c index c565305..aec6d3a 100644 --- a/src/mpid/pamid/src/pt2pt/mpidi_recvmsg.c +++ b/src/mpid/pamid/src/pt2pt/mpidi_recvmsg.c @@ -137,7 +137,7 @@ MPIDI_RecvMsg_Unexp(MPID_Request * rreq, void -MPIDI_RecvMsg_procnull(MPID_Comm * comm, +MPIDI_RecvMsg_procnull(MPIR_Comm * comm, unsigned is_blocking, MPI_Status * status, MPID_Request ** request) diff --git a/src/mpid/pamid/src/pt2pt/mpidi_send.h b/src/mpid/pamid/src/pt2pt/mpidi_send.h index b7ed74d..147bc2d 100644 --- a/src/mpid/pamid/src/pt2pt/mpidi_send.h +++ b/src/mpid/pamid/src/pt2pt/mpidi_send.h @@ -78,7 +78,7 @@ MPIDI_Send(const void * buf, MPI_Datatype datatype, int rank, int tag, - MPID_Comm * comm, + MPIR_Comm * comm, int context_offset, unsigned is_blocking, unsigned is_sync, diff --git a/src/mpid/pamid/src/pt2pt/persistent/mpid_recv_init.c b/src/mpid/pamid/src/pt2pt/persistent/mpid_recv_init.c index 46c8c91..7fa26eb 100644 --- a/src/mpid/pamid/src/pt2pt/persistent/mpid_recv_init.c +++ b/src/mpid/pamid/src/pt2pt/persistent/mpid_recv_init.c @@ -29,7 +29,7 @@ int MPID_Recv_init(void * buf, MPI_Datatype datatype, int rank, int tag, - MPID_Comm * comm, + MPIR_Comm * comm, int context_offset, MPID_Request ** request) { diff --git a/src/mpid/pamid/src/pt2pt/persistent/mpid_send_init.c b/src/mpid/pamid/src/pt2pt/persistent/mpid_send_init.c index f07e116..cbe6465 100644 --- a/src/mpid/pamid/src/pt2pt/persistent/mpid_send_init.c +++ b/src/mpid/pamid/src/pt2pt/persistent/mpid_send_init.c @@ -35,7 +35,7 @@ MPID_PSendRequest(const void * buf, MPI_Datatype datatype, int rank, int tag, - MPID_Comm * comm, + MPIR_Comm * comm, int context_offset, MPID_Request ** request) { @@ -71,7 +71,7 @@ int MPID_Send_init(const void * buf, MPI_Datatype datatype, int rank, int tag, - MPID_Comm * comm, + MPIR_Comm * comm, int context_offset, MPID_Request ** request) { @@ -100,7 +100,7 @@ int MPID_Ssend_init(const void * buf, MPI_Datatype datatype, int rank, int tag, - MPID_Comm * comm, + MPIR_Comm * comm, int context_offset, MPID_Request ** request) { @@ -129,7 +129,7 @@ int MPID_Bsend_init(const void * buf, MPI_Datatype datatype, int rank, int tag, - MPID_Comm * comm, + MPIR_Comm * comm, int context_offset, MPID_Request ** request) { diff --git a/src/pmi/pmi2/poe/poe2pmi.c b/src/pmi/pmi2/poe/poe2pmi.c index 9f31798..f2824fe 100644 --- a/src/pmi/pmi2/poe/poe2pmi.c +++ b/src/pmi/pmi2/poe/poe2pmi.c @@ -296,7 +296,7 @@ int _mpi_world_exiting_handler(int world_id) int mpi_errno = MPI_SUCCESS; pami_endpoint_t dest; /* struct worldExitReq *req = (struct worldExitReq *)cookie; */ - MPID_Comm *comm = MPIR_Process.comm_world; + MPIR_Comm *comm = MPIR_Process.comm_world; MPID_THREAD_CS_ENTER(GLOBAL, MPIR_THREAD_GLOBAL_ALLFUNC_MUTEX); ref_count = MPIDI_get_refcnt_of_world(world_id); @@ -387,7 +387,7 @@ int _mpi_reduce_for_dyntask(int *sendbuf, int *recvbuf) { int *children, gid, child_rank, parent_rank, rc; int numchildren, parent=0, i, result=0,tag, remaining_child_count; - MPID_Comm *comm_ptr; + MPIR_Comm *comm_ptr; int mpi_errno; MPIR_Errflag_t errflag = MPIR_ERR_NONE; diff --git a/src/util/procmap/local_proc.c b/src/util/procmap/local_proc.c index 3af27aa..3b6b247 100644 --- a/src/util/procmap/local_proc.c +++ b/src/util/procmap/local_proc.c @@ -56,7 +56,7 @@ #define FCNAME MPL_QUOTE(FUNCNAME) #if defined(MPID_USE_NODE_IDS) -int MPIU_Find_local_and_external(MPID_Comm *comm, int *local_size_p, int *local_rank_p, int **local_ranks_p, +int MPIU_Find_local_and_external(MPIR_Comm *comm, int *local_size_p, int *local_rank_p, int **local_ranks_p, int *external_size_p, int *external_rank_p, int **external_ranks_p, int **intranode_table_p, int **internode_table_p) { @@ -204,7 +204,7 @@ int MPIU_Find_local_and_external(MPID_Comm *comm, int *local_size_p, int *local_ } #else /* !defined(MPID_USE_NODE_IDS) */ -int MPIU_Find_local_and_external(MPID_Comm *comm, int *local_size_p, int *local_rank_p, int **local_ranks_p, +int MPIU_Find_local_and_external(MPIR_Comm *comm, int *local_size_p, int *local_rank_p, int **local_ranks_p, int *external_size_p, int *external_rank_p, int **external_ranks_p, int **intranode_table_p, int **internode_table_p) { @@ -229,10 +229,10 @@ fn_fail: #define FUNCNAME MPIU_Get_internode_rank #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIU_Get_internode_rank(MPID_Comm *comm_ptr, int r) +int MPIU_Get_internode_rank(MPIR_Comm *comm_ptr, int r) { int mpi_errno = MPI_SUCCESS; - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); MPIU_Assert(mpi_errno == MPI_SUCCESS); MPIU_Assert(r < comm_ptr->remote_size); MPIU_Assert(comm_ptr->comm_kind == MPID_INTRACOMM); @@ -250,10 +250,10 @@ int MPIU_Get_internode_rank(MPID_Comm *comm_ptr, int r) #define FUNCNAME MPIU_Get_intranode_rank #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIU_Get_intranode_rank(MPID_Comm *comm_ptr, int r) +int MPIU_Get_intranode_rank(MPIR_Comm *comm_ptr, int r) { int mpi_errno = MPI_SUCCESS; - MPID_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); + MPIR_Comm_valid_ptr( comm_ptr, mpi_errno, TRUE ); MPIU_Assert(mpi_errno == MPI_SUCCESS); MPIU_Assert(r < comm_ptr->remote_size); MPIU_Assert(comm_ptr->comm_kind == MPID_INTRACOMM); ----------------------------------------------------------------------- Summary of changes: doc/namepub/namepub.tex | 10 +- doc/notes/coll/collective.txt | 8 +- doc/notes/pt2pt/pt2pt.txt | 10 +- doc/notes/rma/dm-mt.c | 2 +- doc/notes/rma/dm.c | 2 +- doc/notes/rma/mpi.c | 6 +- doc/notes/rma/mpi.txt | 8 +- maint/decode_handle | 34 +- src/binding/fortran/use_mpi/create_f90_util.c | 4 +- src/glue/romio/glue_romio.c | 8 +- src/include/mpi_lang.h | 8 +- src/include/mpibsend.h | 8 +- src/include/mpichconfconst.h | 2 +- src/include/mpierror.h | 12 +- src/include/mpierrs.h | 44 +- src/include/mpihandlemem.h | 46 +- src/include/mpiimpl.h | 1820 ++++++++++---------- src/include/mpiinfo.h | 4 +- src/include/mpir_nbc.h | 16 +- src/include/pmi2.h | 12 +- src/mpi/attr/attr.h | 16 +- src/mpi/attr/attr_delete.c | 12 +- src/mpi/attr/attr_get.c | 6 +- src/mpi/attr/attr_put.c | 8 +- src/mpi/attr/attrutil.c | 56 +- src/mpi/attr/comm_create_keyval.c | 8 +- src/mpi/attr/comm_delete_attr.c | 20 +- src/mpi/attr/comm_free_keyval.c | 14 +- src/mpi/attr/comm_get_attr.c | 10 +- src/mpi/attr/comm_set_attr.c | 42 +- src/mpi/attr/keyval_free.c | 6 +- src/mpi/attr/type_create_keyval.c | 8 +- src/mpi/attr/type_delete_attr.c | 14 +- src/mpi/attr/type_free_keyval.c | 10 +- src/mpi/attr/type_get_attr.c | 8 +- src/mpi/attr/type_set_attr.c | 28 +- src/mpi/attr/win_create_keyval.c | 10 +- src/mpi/attr/win_delete_attr.c | 18 +- src/mpi/attr/win_free_keyval.c | 10 +- src/mpi/attr/win_get_attr.c | 14 +- src/mpi/attr/win_set_attr.c | 30 +- src/mpi/coll/allgather.c | 26 +- src/mpi/coll/allgatherv.c | 30 +- src/mpi/coll/allred_group.c | 14 +- src/mpi/coll/allreduce.c | 34 +- src/mpi/coll/alltoall.c | 30 +- src/mpi/coll/alltoallv.c | 32 +- src/mpi/coll/alltoallw.c | 32 +- src/mpi/coll/barrier.c | 20 +- src/mpi/coll/barrier_group.c | 2 +- src/mpi/coll/bcast.c | 40 +- src/mpi/coll/collutil.h | 6 +- src/mpi/coll/exscan.c | 26 +- src/mpi/coll/gather.c | 32 +- src/mpi/coll/gatherv.c | 36 +- src/mpi/coll/helper_fns.c | 114 +- src/mpi/coll/iallgather.c | 40 +- src/mpi/coll/iallgatherv.c | 32 +- src/mpi/coll/iallreduce.c | 46 +- src/mpi/coll/ialltoall.c | 32 +- src/mpi/coll/ialltoallv.c | 28 +- src/mpi/coll/ialltoallw.c | 18 +- src/mpi/coll/ibarrier.c | 20 +- src/mpi/coll/ibcast.c | 42 +- src/mpi/coll/iexscan.c | 22 +- src/mpi/coll/igather.c | 34 +- src/mpi/coll/igatherv.c | 34 +- src/mpi/coll/ired_scat.c | 36 +- src/mpi/coll/ired_scat_block.c | 36 +- src/mpi/coll/ireduce.c | 44 +- src/mpi/coll/iscan.c | 28 +- src/mpi/coll/iscatter.c | 38 +- src/mpi/coll/iscatterv.c | 34 +- src/mpi/coll/nbcutil.c | 2 +- src/mpi/coll/op_commutative.c | 8 +- src/mpi/coll/op_create.c | 36 +- src/mpi/coll/op_free.c | 10 +- src/mpi/coll/red_scat.c | 38 +- src/mpi/coll/red_scat_block.c | 40 +- src/mpi/coll/reduce.c | 48 +- src/mpi/coll/reduce_local.c | 14 +- src/mpi/coll/scan.c | 28 +- src/mpi/coll/scatter.c | 32 +- src/mpi/coll/scatterv.c | 36 +- src/mpi/comm/comm_agree.c | 16 +- src/mpi/comm/comm_compare.c | 20 +- src/mpi/comm/comm_create.c | 58 +- src/mpi/comm/comm_create_group.c | 24 +- src/mpi/comm/comm_dup.c | 10 +- src/mpi/comm/comm_dup_with_info.c | 14 +- src/mpi/comm/comm_failure_ack.c | 6 +- src/mpi/comm/comm_failure_get_acked.c | 8 +- src/mpi/comm/comm_free.c | 8 +- src/mpi/comm/comm_get_info.c | 10 +- src/mpi/comm/comm_get_name.c | 8 +- src/mpi/comm/comm_group.c | 10 +- src/mpi/comm/comm_idup.c | 16 +- src/mpi/comm/comm_rank.c | 6 +- src/mpi/comm/comm_remote_group.c | 12 +- src/mpi/comm/comm_remote_size.c | 8 +- src/mpi/comm/comm_revoke.c | 6 +- src/mpi/comm/comm_set_info.c | 14 +- src/mpi/comm/comm_set_name.c | 6 +- src/mpi/comm/comm_shrink.c | 14 +- src/mpi/comm/comm_size.c | 6 +- src/mpi/comm/comm_split.c | 24 +- src/mpi/comm/comm_split_type.c | 22 +- src/mpi/comm/comm_test_inter.c | 8 +- src/mpi/comm/commutil.c | 170 +- src/mpi/comm/contextid.c | 72 +- src/mpi/comm/intercomm_create.c | 40 +- src/mpi/comm/intercomm_merge.c | 32 +- src/mpi/comm/mpicomm.h | 2 +- src/mpi/datatype/get_count.c | 4 +- src/mpi/datatype/get_elements.c | 4 +- src/mpi/datatype/get_elements_x.c | 8 +- src/mpi/datatype/pack.c | 12 +- src/mpi/datatype/pack_external.c | 4 +- src/mpi/datatype/pack_external_size.c | 4 +- src/mpi/datatype/pack_size.c | 10 +- src/mpi/datatype/status_set_elements.c | 4 +- src/mpi/datatype/status_set_elements_x.c | 4 +- src/mpi/datatype/type_commit.c | 4 +- src/mpi/datatype/type_contiguous.c | 6 +- src/mpi/datatype/type_create_darray.c | 4 +- src/mpi/datatype/type_create_hindexed.c | 6 +- src/mpi/datatype/type_create_hindexed_block.c | 6 +- src/mpi/datatype/type_create_hvector.c | 6 +- src/mpi/datatype/type_create_indexed_block.c | 6 +- src/mpi/datatype/type_create_resized.c | 6 +- src/mpi/datatype/type_create_struct.c | 6 +- src/mpi/datatype/type_create_subarray.c | 6 +- src/mpi/datatype/type_dup.c | 6 +- src/mpi/datatype/type_extent.c | 4 +- src/mpi/datatype/type_free.c | 6 +- src/mpi/datatype/type_get_contents.c | 4 +- src/mpi/datatype/type_get_envelope.c | 6 +- src/mpi/datatype/type_get_extent.c | 4 +- src/mpi/datatype/type_get_extent_x.c | 6 +- src/mpi/datatype/type_get_name.c | 10 +- src/mpi/datatype/type_get_true_extent.c | 4 +- src/mpi/datatype/type_get_true_extent_x.c | 6 +- src/mpi/datatype/type_hindexed.c | 6 +- src/mpi/datatype/type_hvector.c | 6 +- src/mpi/datatype/type_indexed.c | 6 +- src/mpi/datatype/type_lb.c | 6 +- src/mpi/datatype/type_set_name.c | 4 +- src/mpi/datatype/type_size.c | 4 +- src/mpi/datatype/type_size_x.c | 4 +- src/mpi/datatype/type_struct.c | 6 +- src/mpi/datatype/type_ub.c | 4 +- src/mpi/datatype/type_vector.c | 6 +- src/mpi/datatype/typeutil.c | 48 +- src/mpi/datatype/unpack.c | 12 +- src/mpi/datatype/unpack_external.c | 4 +- src/mpi/debugger/allcommdbg.c | 2 +- src/mpi/debugger/dbginit.c | 24 +- src/mpi/debugger/dbgstub.c | 30 +- src/mpi/debugger/dll_mpich.c | 4 +- src/mpi/debugger/mpich_dll_defs.h | 4 +- src/mpi/errhan/comm_call_errhandler.c | 14 +- src/mpi/errhan/comm_create_errhandler.c | 8 +- src/mpi/errhan/comm_get_errhandler.c | 10 +- src/mpi/errhan/comm_set_errhandler.c | 16 +- src/mpi/errhan/errhandler_free.c | 8 +- src/mpi/errhan/errhandler_get.c | 8 +- src/mpi/errhan/errhandler_set.c | 12 +- src/mpi/errhan/errutil.c | 76 +- src/mpi/errhan/file_call_errhandler.c | 14 +- src/mpi/errhan/file_create_errhandler.c | 8 +- src/mpi/errhan/file_get_errhandler.c | 6 +- src/mpi/errhan/file_set_errhandler.c | 22 +- src/mpi/errhan/win_call_errhandler.c | 14 +- src/mpi/errhan/win_create_errhandler.c | 8 +- src/mpi/errhan/win_get_errhandler.c | 6 +- src/mpi/errhan/win_set_errhandler.c | 16 +- src/mpi/group/group.h | 8 +- src/mpi/group/group_compare.c | 14 +- src/mpi/group/group_difference.c | 18 +- src/mpi/group/group_excl.c | 8 +- src/mpi/group/group_free.c | 8 +- src/mpi/group/group_incl.c | 10 +- src/mpi/group/group_intersection.c | 18 +- src/mpi/group/group_range_excl.c | 10 +- src/mpi/group/group_range_incl.c | 10 +- src/mpi/group/group_rank.c | 6 +- src/mpi/group/group_size.c | 6 +- src/mpi/group/group_translate_ranks.c | 16 +- src/mpi/group/group_union.c | 18 +- src/mpi/group/groupdebug.c | 10 +- src/mpi/group/grouputil.c | 60 +- src/mpi/info/info_create.c | 2 +- src/mpi/info/info_delete.c | 8 +- src/mpi/info/info_dup.c | 10 +- src/mpi/info/info_free.c | 6 +- src/mpi/info/info_get.c | 10 +- src/mpi/info/info_getn.c | 8 +- src/mpi/info/info_getnth.c | 10 +- src/mpi/info/info_getvallen.c | 10 +- src/mpi/info/info_set.c | 10 +- src/mpi/info/infoutil.c | 28 +- src/mpi/init/abort.c | 6 +- src/mpi/init/async.c | 14 +- src/mpi/init/finalize.c | 12 +- src/mpi/init/finalized.c | 6 +- src/mpi/init/init.c | 2 +- src/mpi/init/initialized.c | 6 +- src/mpi/init/initthread.c | 40 +- src/mpi/io/Makefile.mk | 10 - src/mpi/io/fileutil.c | 18 - src/mpi/pt2pt/bsend.c | 12 +- src/mpi/pt2pt/bsend_init.c | 14 +- src/mpi/pt2pt/bsendutil.c | 10 +- src/mpi/pt2pt/bsendutil.h | 6 +- src/mpi/pt2pt/cancel.c | 34 +- src/mpi/pt2pt/greq_complete.c | 12 +- src/mpi/pt2pt/greq_start.c | 78 +- src/mpi/pt2pt/ibsend.c | 18 +- src/mpi/pt2pt/improbe.c | 10 +- src/mpi/pt2pt/imrecv.c | 14 +- src/mpi/pt2pt/iprobe.c | 8 +- src/mpi/pt2pt/irecv.c | 14 +- src/mpi/pt2pt/irsend.c | 14 +- src/mpi/pt2pt/isend.c | 14 +- src/mpi/pt2pt/issend.c | 14 +- src/mpi/pt2pt/mpir_request.c | 223 ++-- src/mpi/pt2pt/mprobe.c | 10 +- src/mpi/pt2pt/mrecv.c | 12 +- src/mpi/pt2pt/probe.c | 8 +- src/mpi/pt2pt/recv.c | 22 +- src/mpi/pt2pt/recv_init.c | 14 +- src/mpi/pt2pt/request_free.c | 30 +- src/mpi/pt2pt/request_get_status.c | 26 +- src/mpi/pt2pt/rsend.c | 20 +- src/mpi/pt2pt/rsend_init.c | 14 +- src/mpi/pt2pt/send.c | 20 +- src/mpi/pt2pt/send_init.c | 14 +- src/mpi/pt2pt/sendrecv.c | 36 +- src/mpi/pt2pt/sendrecv_rep.c | 28 +- src/mpi/pt2pt/ssend.c | 16 +- src/mpi/pt2pt/ssend_init.c | 14 +- src/mpi/pt2pt/start.c | 6 +- src/mpi/pt2pt/startall.c | 18 +- src/mpi/pt2pt/test.c | 20 +- src/mpi/pt2pt/testall.c | 30 +- src/mpi/pt2pt/testany.c | 26 +- src/mpi/pt2pt/testsome.c | 26 +- src/mpi/pt2pt/wait.c | 22 +- src/mpi/pt2pt/waitall.c | 50 +- src/mpi/pt2pt/waitany.c | 24 +- src/mpi/pt2pt/waitsome.c | 22 +- src/mpi/rma/accumulate.c | 16 +- src/mpi/rma/alloc_mem.c | 4 +- src/mpi/rma/compare_and_swap.c | 8 +- src/mpi/rma/fetch_and_op.c | 8 +- src/mpi/rma/get.c | 16 +- src/mpi/rma/get_accumulate.c | 20 +- src/mpi/rma/put.c | 16 +- src/mpi/rma/raccumulate.c | 18 +- src/mpi/rma/rget.c | 18 +- src/mpi/rma/rget_accumulate.c | 22 +- src/mpi/rma/rput.c | 18 +- src/mpi/rma/win_allocate.c | 12 +- src/mpi/rma/win_allocate_shared.c | 12 +- src/mpi/rma/win_attach.c | 6 +- src/mpi/rma/win_complete.c | 6 +- src/mpi/rma/win_create.c | 12 +- src/mpi/rma/win_create_dynamic.c | 12 +- src/mpi/rma/win_detach.c | 6 +- src/mpi/rma/win_fence.c | 6 +- src/mpi/rma/win_flush.c | 8 +- src/mpi/rma/win_flush_all.c | 6 +- src/mpi/rma/win_flush_local.c | 8 +- src/mpi/rma/win_flush_local_all.c | 6 +- src/mpi/rma/win_free.c | 8 +- src/mpi/rma/win_get_group.c | 10 +- src/mpi/rma/win_get_info.c | 8 +- src/mpi/rma/win_get_name.c | 6 +- src/mpi/rma/win_lock.c | 8 +- src/mpi/rma/win_lock_all.c | 6 +- src/mpi/rma/win_post.c | 12 +- src/mpi/rma/win_set_info.c | 12 +- src/mpi/rma/win_set_name.c | 6 +- src/mpi/rma/win_shared_query.c | 8 +- src/mpi/rma/win_start.c | 12 +- src/mpi/rma/win_sync.c | 6 +- src/mpi/rma/win_test.c | 6 +- src/mpi/rma/win_unlock.c | 8 +- src/mpi/rma/win_unlock_all.c | 6 +- src/mpi/rma/win_wait.c | 6 +- src/mpi/rma/winutil.c | 12 +- src/mpi/romio/adio/ad_gpfs/pe/ad_pe_aggrs.c | 6 +- src/mpi/romio/mpi-io/glue/mpich/mpio_err.c | 4 +- src/mpi/spawn/comm_accept.c | 16 +- src/mpi/spawn/comm_connect.c | 16 +- src/mpi/spawn/comm_disconnect.c | 6 +- src/mpi/spawn/comm_join.c | 10 +- src/mpi/spawn/comm_spawn.c | 10 +- src/mpi/spawn/comm_spawn_multiple.c | 14 +- src/mpi/spawn/lookup_name.c | 6 +- src/mpi/spawn/namepub.h | 8 +- src/mpi/spawn/open_port.c | 8 +- src/mpi/spawn/publish_name.c | 6 +- src/mpi/spawn/unpublish_name.c | 6 +- src/mpi/topo/cart_coords.c | 6 +- src/mpi/topo/cart_create.c | 18 +- src/mpi/topo/cart_get.c | 6 +- src/mpi/topo/cart_map.c | 10 +- src/mpi/topo/cart_rank.c | 6 +- src/mpi/topo/cart_shift.c | 8 +- src/mpi/topo/cart_sub.c | 6 +- src/mpi/topo/cartdim_get.c | 6 +- src/mpi/topo/dist_gr_create.c | 12 +- src/mpi/topo/dist_gr_create_adj.c | 8 +- src/mpi/topo/dist_gr_neighb.c | 6 +- src/mpi/topo/dist_gr_neighb_count.c | 8 +- src/mpi/topo/graph_get.c | 6 +- src/mpi/topo/graph_map.c | 10 +- src/mpi/topo/graph_nbr.c | 8 +- src/mpi/topo/graphcreate.c | 14 +- src/mpi/topo/graphdimsget.c | 6 +- src/mpi/topo/graphnbrcnt.c | 8 +- src/mpi/topo/inhb_allgather.c | 20 +- src/mpi/topo/inhb_allgatherv.c | 20 +- src/mpi/topo/inhb_alltoall.c | 20 +- src/mpi/topo/inhb_alltoallv.c | 20 +- src/mpi/topo/inhb_alltoallw.c | 12 +- src/mpi/topo/nhb_allgather.c | 18 +- src/mpi/topo/nhb_allgatherv.c | 18 +- src/mpi/topo/nhb_alltoall.c | 18 +- src/mpi/topo/nhb_alltoallv.c | 18 +- src/mpi/topo/nhb_alltoallw.c | 10 +- src/mpi/topo/topo.h | 16 +- src/mpi/topo/topo_test.c | 6 +- src/mpi/topo/topoutil.c | 8 +- .../ch3/channels/nemesis/include/mpid_nem_impl.h | 38 +- .../ch3/channels/nemesis/include/mpid_nem_nets.h | 6 +- .../ch3/channels/nemesis/include/mpid_nem_post.h | 2 +- .../ch3/channels/nemesis/include/mpidi_ch3_impl.h | 54 +- .../ch3/channels/nemesis/include/mpidi_ch3_post.h | 6 +- .../ch3/channels/nemesis/include/mpidi_ch3_pre.h | 28 +- .../ch3/channels/nemesis/netmod/llc/llc_cancel.c | 2 +- .../ch3/channels/nemesis/netmod/llc/llc_impl.h | 50 +- .../ch3/channels/nemesis/netmod/llc/llc_init.c | 6 +- .../ch3/channels/nemesis/netmod/llc/llc_poll.c | 18 +- .../ch3/channels/nemesis/netmod/llc/llc_probe.c | 16 +- .../ch3/channels/nemesis/netmod/llc/llc_send.c | 46 +- .../ch3/channels/nemesis/netmod/mxm/mxm_cancel.c | 4 +- .../ch3/channels/nemesis/netmod/mxm/mxm_impl.h | 56 +- .../ch3/channels/nemesis/netmod/mxm/mxm_init.c | 8 +- .../ch3/channels/nemesis/netmod/mxm/mxm_poll.c | 20 +- .../ch3/channels/nemesis/netmod/mxm/mxm_probe.c | 20 +- .../ch3/channels/nemesis/netmod/mxm/mxm_send.c | 54 +- src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_cm.c | 18 +- .../ch3/channels/nemesis/netmod/ofi/ofi_impl.h | 97 +- src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_msg.c | 22 +- .../nemesis/netmod/ofi/ofi_probe_template.c | 28 +- .../ch3/channels/nemesis/netmod/ofi/ofi_progress.c | 10 +- .../channels/nemesis/netmod/ofi/ofi_tag_layout.h | 2 +- .../ch3/channels/nemesis/netmod/ofi/ofi_tagged.c | 14 +- .../nemesis/netmod/ofi/ofi_tagged_template.c | 34 +- .../channels/nemesis/netmod/portals4/ptl_impl.h | 54 +- .../ch3/channels/nemesis/netmod/portals4/ptl_lmt.c | 12 +- .../ch3/channels/nemesis/netmod/portals4/ptl_nm.c | 42 +- .../channels/nemesis/netmod/portals4/ptl_poll.c | 2 +- .../channels/nemesis/netmod/portals4/ptl_probe.c | 60 +- .../channels/nemesis/netmod/portals4/ptl_recv.c | 28 +- .../channels/nemesis/netmod/portals4/ptl_send.c | 20 +- src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c | 4 +- .../ch3/channels/nemesis/netmod/tcp/tcp_ckpt.c | 12 +- .../ch3/channels/nemesis/netmod/tcp/tcp_impl.h | 12 +- .../ch3/channels/nemesis/netmod/tcp/tcp_send.c | 32 +- .../ch3/channels/nemesis/netmod/tcp/tcp_utility.c | 2 +- src/mpid/ch3/channels/nemesis/src/ch3_init.c | 8 +- src/mpid/ch3/channels/nemesis/src/ch3_isend.c | 4 +- src/mpid/ch3/channels/nemesis/src/ch3_isendv.c | 4 +- src/mpid/ch3/channels/nemesis/src/ch3_istartmsg.c | 8 +- src/mpid/ch3/channels/nemesis/src/ch3_istartmsgv.c | 12 +- src/mpid/ch3/channels/nemesis/src/ch3_progress.c | 48 +- src/mpid/ch3/channels/nemesis/src/ch3_rma_shm.c | 6 +- src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c | 38 +- src/mpid/ch3/channels/nemesis/src/ch3i_comm.c | 26 +- .../ch3/channels/nemesis/src/ch3i_eagernoncontig.c | 2 +- src/mpid/ch3/channels/nemesis/src/mpid_nem_ckpt.c | 6 +- src/mpid/ch3/channels/nemesis/src/mpid_nem_debug.c | 2 +- src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt.c | 70 +- .../ch3/channels/nemesis/src/mpid_nem_lmt_dma.c | 24 +- .../ch3/channels/nemesis/src/mpid_nem_lmt_shm.c | 28 +- .../channels/nemesis/src/mpid_nem_lmt_vmsplice.c | 26 +- src/mpid/ch3/channels/nemesis/src/mpid_nem_mpich.c | 8 +- .../ch3/channels/sock/include/mpidi_ch3_impl.h | 4 +- src/mpid/ch3/channels/sock/include/mpidi_ch3_pre.h | 8 +- src/mpid/ch3/channels/sock/src/ch3_isend.c | 6 +- src/mpid/ch3/channels/sock/src/ch3_isendv.c | 6 +- src/mpid/ch3/channels/sock/src/ch3_istartmsg.c | 20 +- src/mpid/ch3/channels/sock/src/ch3_istartmsgv.c | 22 +- src/mpid/ch3/channels/sock/src/ch3_progress.c | 14 +- src/mpid/ch3/include/mpid_coll.h | 88 +- src/mpid/ch3/include/mpid_rma_issue.h | 94 +- src/mpid/ch3/include/mpid_rma_lockqueue.h | 4 +- src/mpid/ch3/include/mpid_rma_oplist.h | 34 +- src/mpid/ch3/include/mpid_rma_shm.h | 12 +- src/mpid/ch3/include/mpid_rma_types.h | 6 +- src/mpid/ch3/include/mpidimpl.h | 390 +++--- src/mpid/ch3/include/mpidpost.h | 28 +- src/mpid/ch3/include/mpidpre.h | 47 +- src/mpid/ch3/include/mpidrma.h | 82 +- src/mpid/ch3/src/ch3u_buffer.c | 4 +- src/mpid/ch3/src/ch3u_comm.c | 102 +- src/mpid/ch3/src/ch3u_comm_spawn_multiple.c | 16 +- src/mpid/ch3/src/ch3u_eager.c | 46 +- src/mpid/ch3/src/ch3u_eagersync.c | 36 +- src/mpid/ch3/src/ch3u_handle_connection.c | 32 +- src/mpid/ch3/src/ch3u_handle_op_req.c | 10 +- src/mpid/ch3/src/ch3u_handle_recv_pkt.c | 16 +- src/mpid/ch3/src/ch3u_handle_recv_req.c | 138 +- src/mpid/ch3/src/ch3u_handle_revoke_pkt.c | 4 +- src/mpid/ch3/src/ch3u_handle_send_req.c | 38 +- src/mpid/ch3/src/ch3u_port.c | 56 +- src/mpid/ch3/src/ch3u_recvq.c | 106 +- src/mpid/ch3/src/ch3u_request.c | 191 +-- src/mpid/ch3/src/ch3u_rma_ops.c | 24 +- src/mpid/ch3/src/ch3u_rma_pkthandler.c | 186 +- src/mpid/ch3/src/ch3u_rma_progress.c | 22 +- src/mpid/ch3/src/ch3u_rma_reqops.c | 38 +- src/mpid/ch3/src/ch3u_rma_sync.c | 82 +- src/mpid/ch3/src/ch3u_rndv.c | 48 +- src/mpid/ch3/src/ch3u_win_fns.c | 26 +- src/mpid/ch3/src/mpid_abort.c | 2 +- src/mpid/ch3/src/mpid_cancel_recv.c | 4 +- src/mpid/ch3/src/mpid_cancel_send.c | 38 +- src/mpid/ch3/src/mpid_coll.c | 710 ++++++++ src/mpid/ch3/src/mpid_comm_disconnect.c | 2 +- src/mpid/ch3/src/mpid_comm_failure_ack.c | 16 +- src/mpid/ch3/src/mpid_comm_get_all_failed_procs.c | 20 +- src/mpid/ch3/src/mpid_comm_revoke.c | 6 +- src/mpid/ch3/src/mpid_comm_spawn_multiple.c | 4 +- src/mpid/ch3/src/mpid_improbe.c | 10 +- src/mpid/ch3/src/mpid_imrecv.c | 14 +- src/mpid/ch3/src/mpid_init.c | 10 +- src/mpid/ch3/src/mpid_iprobe.c | 4 +- src/mpid/ch3/src/mpid_irecv.c | 10 +- src/mpid/ch3/src/mpid_irsend.c | 10 +- src/mpid/ch3/src/mpid_isend.c | 10 +- src/mpid/ch3/src/mpid_issend.c | 8 +- src/mpid/ch3/src/mpid_mprobe.c | 6 +- src/mpid/ch3/src/mpid_mrecv.c | 8 +- src/mpid/ch3/src/mpid_port.c | 24 +- src/mpid/ch3/src/mpid_probe.c | 2 +- src/mpid/ch3/src/mpid_recv.c | 12 +- src/mpid/ch3/src/mpid_rma.c | 34 +- src/mpid/ch3/src/mpid_rsend.c | 8 +- src/mpid/ch3/src/mpid_send.c | 8 +- src/mpid/ch3/src/mpid_ssend.c | 8 +- src/mpid/ch3/src/mpid_startall.c | 60 +- src/mpid/ch3/src/mpid_vc.c | 20 +- src/mpid/ch3/src/mpidi_isend_self.c | 20 +- src/mpid/ch3/src/mpidi_rma.c | 6 +- src/mpid/ch3/util/sock/ch3usock.h | 4 +- src/mpid/ch3/util/unordered/unordered.c | 2 +- src/mpid/common/datatype/mpid_datatype_fallback.h | 18 +- src/mpid/common/datatype/mpidu_datatype.h | 8 +- src/mpid/common/hcoll/hcoll.h | 22 +- src/mpid/common/hcoll/hcoll_init.c | 12 +- src/mpid/common/hcoll/hcoll_ops.c | 26 +- src/mpid/common/hcoll/hcoll_rte.c | 65 +- src/mpid/common/hcoll/hcollpre.h | 2 +- src/mpid/common/sched/mpidu_sched.c | 89 +- src/mpid/common/sched/mpidu_sched.h | 22 +- src/mpid/include/mpidu_pre.h | 8 +- src/mpid/pamid/include/mpidi_constants.h | 4 +- src/mpid/pamid/include/mpidi_datatypes.h | 36 +- src/mpid/pamid/include/mpidi_hooks.h | 10 +- src/mpid/pamid/include/mpidi_prototypes.h | 156 +- src/mpid/pamid/include/mpidimpl.h | 22 +- src/mpid/pamid/include/mpidpost.h | 6 +- .../pamid/src/coll/allgather/mpido_allgather.c | 12 +- .../pamid/src/coll/allgather/mpido_iallgather.c | 12 +- .../pamid/src/coll/allgatherv/mpido_allgatherv.c | 12 +- .../pamid/src/coll/allgatherv/mpido_iallgatherv.c | 12 +- .../pamid/src/coll/allreduce/mpido_allreduce.c | 6 +- .../pamid/src/coll/allreduce/mpido_iallreduce.c | 12 +- src/mpid/pamid/src/coll/alltoall/mpido_alltoall.c | 6 +- src/mpid/pamid/src/coll/alltoall/mpido_ialltoall.c | 12 +- .../pamid/src/coll/alltoallv/mpido_alltoallv.c | 6 +- .../pamid/src/coll/alltoallv/mpido_ialltoallv.c | 12 +- .../pamid/src/coll/alltoallw/mpido_ialltoallw.c | 12 +- src/mpid/pamid/src/coll/barrier/mpido_barrier.c | 6 +- src/mpid/pamid/src/coll/barrier/mpido_ibarrier.c | 8 +- src/mpid/pamid/src/coll/bcast/mpido_bcast.c | 6 +- src/mpid/pamid/src/coll/bcast/mpido_ibcast.c | 12 +- src/mpid/pamid/src/coll/exscan/mpido_iexscan.c | 10 +- src/mpid/pamid/src/coll/gather/mpido_gather.c | 8 +- src/mpid/pamid/src/coll/gather/mpido_igather.c | 12 +- src/mpid/pamid/src/coll/gatherv/mpido_gatherv.c | 6 +- src/mpid/pamid/src/coll/gatherv/mpido_igatherv.c | 12 +- .../pamid/src/coll/ired_scat/mpido_ired_scat.c | 12 +- .../coll/ired_scat_block/mpido_ired_scat_block.c | 12 +- src/mpid/pamid/src/coll/red_scat/mpido_red_scat.c | 8 +- src/mpid/pamid/src/coll/reduce/mpido_ireduce.c | 12 +- src/mpid/pamid/src/coll/reduce/mpido_reduce.c | 6 +- src/mpid/pamid/src/coll/scan/mpido_scan.c | 26 +- src/mpid/pamid/src/coll/scatter/mpido_iscatter.c | 12 +- src/mpid/pamid/src/coll/scatter/mpido_scatter.c | 8 +- src/mpid/pamid/src/coll/scatterv/mpido_iscatterv.c | 12 +- src/mpid/pamid/src/coll/scatterv/mpido_scatterv.c | 10 +- src/mpid/pamid/src/comm/mpid_comm.c | 30 +- src/mpid/pamid/src/comm/mpid_optcolls.c | 4 +- src/mpid/pamid/src/comm/mpid_selectcolls.c | 12 +- src/mpid/pamid/src/dyntask/mpid_comm_disconnect.c | 34 +- .../pamid/src/dyntask/mpid_comm_spawn_multiple.c | 28 +- src/mpid/pamid/src/dyntask/mpid_port.c | 16 +- src/mpid/pamid/src/dyntask/mpidi_pg.c | 2 +- src/mpid/pamid/src/dyntask/mpidi_port.c | 60 +- src/mpid/pamid/src/misc/mpid_abort.c | 4 +- src/mpid/pamid/src/misc/mpid_mem.c | 2 +- src/mpid/pamid/src/misc/mpid_unimpl.c | 34 +- src/mpid/pamid/src/mpid_improbe.c | 8 +- src/mpid/pamid/src/mpid_imrecv.c | 10 +- src/mpid/pamid/src/mpid_init.c | 14 +- src/mpid/pamid/src/mpid_iprobe.c | 2 +- src/mpid/pamid/src/mpid_mprobe.c | 8 +- src/mpid/pamid/src/mpid_mrecv.c | 6 +- src/mpid/pamid/src/mpid_probe.c | 2 +- src/mpid/pamid/src/mpid_recvq.c | 68 +- src/mpid/pamid/src/mpid_recvq.h | 34 +- src/mpid/pamid/src/mpid_request.c | 34 +- src/mpid/pamid/src/mpid_request.h | 66 +- src/mpid/pamid/src/mpid_vc.c | 6 +- src/mpid/pamid/src/mpidi_env.c | 4 +- src/mpid/pamid/src/mpidi_util.c | 10 +- src/mpid/pamid/src/mpix/mpix.c | 22 +- src/mpid/pamid/src/onesided/mpid_1s.c | 4 +- src/mpid/pamid/src/onesided/mpid_win_accumulate.c | 2 +- src/mpid/pamid/src/onesided/mpid_win_allocate.c | 10 +- .../pamid/src/onesided/mpid_win_allocate_shared.c | 24 +- src/mpid/pamid/src/onesided/mpid_win_attach.c | 2 +- .../pamid/src/onesided/mpid_win_compare_and_swap.c | 2 +- src/mpid/pamid/src/onesided/mpid_win_create.c | 24 +- .../pamid/src/onesided/mpid_win_create_dynamic.c | 10 +- src/mpid/pamid/src/onesided/mpid_win_detach.c | 2 +- src/mpid/pamid/src/onesided/mpid_win_fence.c | 2 +- .../pamid/src/onesided/mpid_win_fetch_and_op.c | 2 +- src/mpid/pamid/src/onesided/mpid_win_flush.c | 8 +- src/mpid/pamid/src/onesided/mpid_win_free.c | 8 +- src/mpid/pamid/src/onesided/mpid_win_get.c | 6 +- .../pamid/src/onesided/mpid_win_get_accumulate.c | 8 +- src/mpid/pamid/src/onesided/mpid_win_get_info.c | 6 +- src/mpid/pamid/src/onesided/mpid_win_lock.c | 14 +- src/mpid/pamid/src/onesided/mpid_win_lock_all.c | 8 +- src/mpid/pamid/src/onesided/mpid_win_pscw.c | 24 +- src/mpid/pamid/src/onesided/mpid_win_put.c | 6 +- src/mpid/pamid/src/onesided/mpid_win_reqops.c | 32 +- src/mpid/pamid/src/onesided/mpid_win_set_info.c | 6 +- .../pamid/src/onesided/mpid_win_shared_query.c | 2 +- src/mpid/pamid/src/onesided/mpid_win_sync.c | 2 +- src/mpid/pamid/src/onesided/mpidi_onesided.h | 30 +- src/mpid/pamid/src/onesided/mpidi_win_control.c | 4 +- src/mpid/pamid/src/pt2pt/mpid_cancel.c | 8 +- src/mpid/pamid/src/pt2pt/mpid_irecv.h | 4 +- src/mpid/pamid/src/pt2pt/mpid_isend.h | 12 +- src/mpid/pamid/src/pt2pt/mpid_issend.c | 4 +- src/mpid/pamid/src/pt2pt/mpid_recv.c | 4 +- src/mpid/pamid/src/pt2pt/mpid_send.h | 4 +- src/mpid/pamid/src/pt2pt/mpid_ssend.c | 4 +- src/mpid/pamid/src/pt2pt/mpidi_callback_eager.c | 8 +- src/mpid/pamid/src/pt2pt/mpidi_callback_rzv.c | 4 +- src/mpid/pamid/src/pt2pt/mpidi_callback_short.c | 6 +- src/mpid/pamid/src/pt2pt/mpidi_callback_util.c | 12 +- src/mpid/pamid/src/pt2pt/mpidi_control.c | 24 +- src/mpid/pamid/src/pt2pt/mpidi_done.c | 22 +- src/mpid/pamid/src/pt2pt/mpidi_recv.h | 8 +- src/mpid/pamid/src/pt2pt/mpidi_recvmsg.c | 10 +- src/mpid/pamid/src/pt2pt/mpidi_rendezvous.c | 12 +- src/mpid/pamid/src/pt2pt/mpidi_send.h | 10 +- src/mpid/pamid/src/pt2pt/mpidi_sendmsg.c | 30 +- .../pamid/src/pt2pt/persistent/mpid_recv_init.c | 8 +- .../pamid/src/pt2pt/persistent/mpid_send_init.c | 20 +- .../pamid/src/pt2pt/persistent/mpid_startall.c | 4 +- src/nameserv/file/file_nameserv.c | 8 +- src/nameserv/pmi/pmi_nameserv.c | 16 +- src/nameserv/test/testnd.c | 38 +- src/pmi/pmi2/poe/poe2pmi.c | 10 +- src/pmi/pmi2/simple/pmi2compat.h | 2 +- src/pmi/pmi2/simple/simple2pmi.c | 4 +- src/util/mem/handlemem.c | 6 +- src/util/procmap/local_proc.c | 16 +- test/mpi/group/glpid.c | 6 +- 588 files changed, 7171 insertions(+), 6503 deletions(-) delete mode 100644 src/mpi/io/Makefile.mk delete mode 100644 src/mpi/io/fileutil.c create mode 100644 src/mpid/ch3/src/mpid_coll.c hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2-251-ga94a4b4
by noreply＠mpich.org 20 Apr '16

20 Apr '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via a94a4b4596115cb60c94581ec57f824ce0638002 (commit) via 549a0aebed866185f5e77b41ba28c3348da3b464 (commit) via cdd26cf1edaafdcb3a7fd401427b18c9bf274193 (commit) from 8d6c5bafc27599b4ca14f9064cad245ee46e91e4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/a94a4b4596115cb60c94581ec57f824ce… commit a94a4b4596115cb60c94581ec57f824ce0638002 Author: Wesley Bland <wesley.bland(a)intel.com> Date: Mon Feb 8 16:30:48 2016 -0600 coll: Remove the _req funcs from collops Now that the collectives are in the ADI, there is no longer a need to have the MPIR_*_req functions. Remove them from the collops struct and get rid of their usage in the non-blocking collectives. This breaks HCOLL, but the Mellanox developers are working on a separate fix. Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index 11bc349..b33d07f 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -1947,95 +1947,50 @@ typedef struct MPID_Collops { /* MPI-3 nonblocking collectives */ int (*Ibarrier_sched)(MPID_Comm *comm_ptr, MPID_Sched_t s); - int (*Ibarrier_req)(MPID_Comm *comm_ptr, MPID_Request **request); int (*Ibcast_sched)(void *buffer, int count, MPI_Datatype datatype, int root, MPID_Comm *comm_ptr, MPID_Sched_t s); - int (*Ibcast_req)(void *buffer, int count, MPI_Datatype datatype, int root, - MPID_Comm *comm_ptr, MPID_Request **request); int (*Igather_sched)(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPID_Comm *comm_ptr, MPID_Sched_t s); - int (*Igather_req)(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, int root, MPID_Comm *comm_ptr, - MPID_Request **request); int (*Igatherv_sched)(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, int root, MPID_Comm *comm_ptr, MPID_Sched_t s); - int (*Igatherv_req)(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, - const int *recvcounts, const int *displs, MPI_Datatype recvtype, int root, - MPID_Comm *comm_ptr, MPID_Request **request); int (*Iscatter_sched)(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPID_Comm *comm_ptr, MPID_Sched_t s); - int (*Iscatter_req)(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, int root, MPID_Comm *comm_ptr, - MPID_Request **request); int (*Iscatterv_sched)(const void *sendbuf, const int *sendcounts, const int *displs, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPID_Comm *comm_ptr, MPID_Sched_t s); - int (*Iscatterv_req)(const void *sendbuf, const int *sendcounts, const int *displs, - MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPID_Comm *comm_ptr, MPID_Request **request); int (*Iallgather_sched)(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPID_Sched_t s); - int (*Iallgather_req)(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr, - MPID_Request **request); int (*Iallgatherv_sched)(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPID_Sched_t s); - int (*Iallgatherv_req)(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, - const int *recvcounts, const int *displs, MPI_Datatype recvtype, - MPID_Comm *comm_ptr, MPID_Request ** request); int (*Ialltoall_sched)(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPID_Sched_t s); - int (*Ialltoall_req)(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, MPID_Comm *comm_ptr, - MPID_Request **request); int (*Ialltoallv_sched)(const void *sendbuf, const int *sendcounts, const int *sdispls, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *rdispls, MPI_Datatype recvtype, MPID_Comm *comm_ptr, MPID_Sched_t s); - int (*Ialltoallv_req)(const void *sendbuf, const int *sendcounts, const int *sdispls, - MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, - const int *rdispls, MPI_Datatype recvtype, MPID_Comm *comm_ptr, - MPID_Request **request); int (*Ialltoallw_sched)(const void *sendbuf, const int *sendcounts, const int *sdispls, const MPI_Datatype *sendtypes, void *recvbuf, const int *recvcounts, const int *rdispls, const MPI_Datatype *recvtypes, MPID_Comm *comm_ptr, MPID_Sched_t s); - int (*Ialltoallw_req)(const void *sendbuf, const int *sendcounts, const int *sdispls, - const MPI_Datatype *sendtypes, void *recvbuf, const int *recvcounts, - const int *rdispls, const MPI_Datatype *recvtypes, - MPID_Comm *comm_ptr, MPID_Request **request); int (*Ireduce_sched)(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPID_Comm *comm_ptr, MPID_Sched_t s); - int (*Ireduce_req)(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, - int root, MPID_Comm *comm_ptr, MPID_Request **request); int (*Iallreduce_sched)(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPID_Sched_t s); - int (*Iallreduce_req)(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, MPID_Comm *comm_ptr, MPID_Request **request); int (*Ireduce_scatter_sched)(const void *sendbuf, void *recvbuf, const int *recvcounts, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPID_Sched_t s); - int (*Ireduce_scatter_req)(const void *sendbuf, void *recvbuf, const int *recvcounts, - MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPID_Request **request); int (*Ireduce_scatter_block_sched)(const void *sendbuf, void *recvbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPID_Sched_t s); - int (*Ireduce_scatter_block_req)(const void *sendbuf, void *recvbuf, int recvcount, - MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, - MPID_Request **request); int (*Iscan_sched)(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPID_Sched_t s); - int (*Iscan_req)(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, - MPID_Comm *comm_ptr, MPID_Request **request); int (*Iexscan_sched)(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPID_Comm *comm_ptr, MPID_Sched_t s); - int (*Iexscan_req)(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, - MPID_Comm *comm_ptr, MPID_Request **request); struct MPID_Collops *prev_coll_fns; /* when overriding this table, set this to point to the old table */ diff --git a/src/mpi/coll/iallgather.c b/src/mpi/coll/iallgather.c index 6295986..202128c 100644 --- a/src/mpi/coll/iallgather.c +++ b/src/mpi/coll/iallgather.c @@ -600,18 +600,6 @@ int MPIR_Iallgather_impl(const void *sendbuf, int sendcount, MPI_Datatype sendty *request = MPI_REQUEST_NULL; - MPIU_Assert(comm_ptr->coll_fns != NULL); - if (comm_ptr->coll_fns->Iallgather_req != NULL) { - /* --BEGIN USEREXTENSION-- */ - mpi_errno = comm_ptr->coll_fns->Iallgather_req(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype,comm_ptr, &reqp); - if (reqp) { - *request = reqp->handle; - if (mpi_errno) MPIR_ERR_POP(mpi_errno); - goto fn_exit; - } - /* --END USEREXTENSION-- */ - } - mpi_errno = MPID_Sched_next_tag(comm_ptr, &tag); if (mpi_errno) MPIR_ERR_POP(mpi_errno); mpi_errno = MPID_Sched_create(&s); diff --git a/src/mpi/coll/iallgatherv.c b/src/mpi/coll/iallgatherv.c index c3dd807..73050fe 100644 --- a/src/mpi/coll/iallgatherv.c +++ b/src/mpi/coll/iallgatherv.c @@ -701,18 +701,6 @@ int MPIR_Iallgatherv_impl(const void *sendbuf, int sendcount, MPI_Datatype sendt *request = MPI_REQUEST_NULL; - MPIU_Assert(comm_ptr->coll_fns != NULL); - if (comm_ptr->coll_fns->Iallgatherv_req != NULL) { - /* --BEGIN USEREXTENSION-- */ - mpi_errno = comm_ptr->coll_fns->Iallgatherv_req(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, comm_ptr, &reqp); - if (reqp) { - *request = reqp->handle; - if (mpi_errno) MPIR_ERR_POP(mpi_errno); - goto fn_exit; - } - /* --END USEREXTENSION-- */ - } - mpi_errno = MPID_Sched_next_tag(comm_ptr, &tag); if (mpi_errno) MPIR_ERR_POP(mpi_errno); mpi_errno = MPID_Sched_create(&s); diff --git a/src/mpi/coll/iallreduce.c b/src/mpi/coll/iallreduce.c index ff07dfd..6481934 100644 --- a/src/mpi/coll/iallreduce.c +++ b/src/mpi/coll/iallreduce.c @@ -655,18 +655,6 @@ int MPIR_Iallreduce_impl(const void *sendbuf, void *recvbuf, int count, MPI_Data *request = MPI_REQUEST_NULL; - MPIU_Assert(comm_ptr->coll_fns != NULL); - if (comm_ptr->coll_fns->Iallreduce_req != NULL) { - /* --BEGIN USEREXTENSION-- */ - mpi_errno = comm_ptr->coll_fns->Iallreduce_req(sendbuf, recvbuf, count, datatype, op, comm_ptr, &reqp); - if (reqp) { - *request = reqp->handle; - if (mpi_errno) MPIR_ERR_POP(mpi_errno); - goto fn_exit; - } - /* --END USEREXTENSION-- */ - } - mpi_errno = MPID_Sched_next_tag(comm_ptr, &tag); if (mpi_errno) MPIR_ERR_POP(mpi_errno); mpi_errno = MPID_Sched_create(&s); diff --git a/src/mpi/coll/ialltoall.c b/src/mpi/coll/ialltoall.c index 5817105..4c23960 100644 --- a/src/mpi/coll/ialltoall.c +++ b/src/mpi/coll/ialltoall.c @@ -528,18 +528,6 @@ int MPIR_Ialltoall_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtyp *request = MPI_REQUEST_NULL; - MPIU_Assert(comm_ptr->coll_fns != NULL); - if (comm_ptr->coll_fns->Ialltoall_req != NULL) { - /* --BEGIN USEREXTENSION-- */ - mpi_errno = comm_ptr->coll_fns->Ialltoall_req(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm_ptr, &reqp); - if (reqp) { - *request = reqp->handle; - if (mpi_errno) MPIR_ERR_POP(mpi_errno); - goto fn_exit; - } - /* --END USEREXTENSION-- */ - } - mpi_errno = MPID_Sched_next_tag(comm_ptr, &tag); if (mpi_errno) MPIR_ERR_POP(mpi_errno); mpi_errno = MPID_Sched_create(&s); diff --git a/src/mpi/coll/ialltoallv.c b/src/mpi/coll/ialltoallv.c index 413d2fd..a0c95c0 100644 --- a/src/mpi/coll/ialltoallv.c +++ b/src/mpi/coll/ialltoallv.c @@ -257,18 +257,6 @@ int MPIR_Ialltoallv_impl(const void *sendbuf, const int sendcounts[], const int *request = MPI_REQUEST_NULL; - MPIU_Assert(comm_ptr->coll_fns != NULL); - if (comm_ptr->coll_fns->Ialltoallv_req != NULL) { - /* --BEGIN USEREXTENSION-- */ - mpi_errno = comm_ptr->coll_fns->Ialltoallv_req(sendbuf, sendcounts, sdispls, sendtype, recvbuf, recvcounts, rdispls, recvtype, comm_ptr, &reqp); - if (reqp) { - *request = reqp->handle; - if (mpi_errno) MPIR_ERR_POP(mpi_errno); - goto fn_exit; - } - /* --END USEREXTENSION-- */ - } - mpi_errno = MPID_Sched_next_tag(comm_ptr, &tag); if (mpi_errno) MPIR_ERR_POP(mpi_errno); mpi_errno = MPID_Sched_create(&s); diff --git a/src/mpi/coll/ialltoallw.c b/src/mpi/coll/ialltoallw.c index e88142a..555fd62 100644 --- a/src/mpi/coll/ialltoallw.c +++ b/src/mpi/coll/ialltoallw.c @@ -262,18 +262,6 @@ int MPIR_Ialltoallw_impl(const void *sendbuf, const int sendcounts[], const int *request = MPI_REQUEST_NULL; - MPIU_Assert(comm_ptr->coll_fns != NULL); - if (comm_ptr->coll_fns->Ialltoallw_req != NULL) { - /* --BEGIN USEREXTENSION-- */ - mpi_errno = comm_ptr->coll_fns->Ialltoallw_req(sendbuf, sendcounts, sdispls, sendtypes, recvbuf, recvcounts, rdispls, recvtypes, comm_ptr, &reqp); - if (reqp) { - *request = reqp->handle; - if (mpi_errno) MPIR_ERR_POP(mpi_errno); - goto fn_exit; - } - /* --END USEREXTENSION-- */ - } - mpi_errno = MPID_Sched_next_tag(comm_ptr, &tag); if (mpi_errno) MPIR_ERR_POP(mpi_errno); mpi_errno = MPID_Sched_create(&s); diff --git a/src/mpi/coll/ibarrier.c b/src/mpi/coll/ibarrier.c index 6375fe7..7e72dcf 100644 --- a/src/mpi/coll/ibarrier.c +++ b/src/mpi/coll/ibarrier.c @@ -178,18 +178,6 @@ int MPIR_Ibarrier_impl(MPID_Comm *comm_ptr, MPI_Request *request) *request = MPI_REQUEST_NULL; - MPIU_Assert(comm_ptr->coll_fns != NULL); - if (comm_ptr->coll_fns->Ibarrier_req != NULL) { - /* --BEGIN USEREXTENSION-- */ - mpi_errno = comm_ptr->coll_fns->Ibarrier_req(comm_ptr, &reqp); - if (reqp) { - *request = reqp->handle; - if (mpi_errno) MPIR_ERR_POP(mpi_errno); - goto fn_exit; - } - /* --END USEREXTENSION-- */ - } - if (comm_ptr->local_size != 1 || comm_ptr->comm_kind == MPID_INTERCOMM) { mpi_errno = MPID_Sched_next_tag(comm_ptr, &tag); if (mpi_errno) MPIR_ERR_POP(mpi_errno); diff --git a/src/mpi/coll/ibcast.c b/src/mpi/coll/ibcast.c index c40ee36..52dad61 100644 --- a/src/mpi/coll/ibcast.c +++ b/src/mpi/coll/ibcast.c @@ -972,18 +972,6 @@ int MPIR_Ibcast_impl(void *buffer, int count, MPI_Datatype datatype, int root, M *request = MPI_REQUEST_NULL; - MPIU_Assert(comm_ptr->coll_fns != NULL); - if (comm_ptr->coll_fns->Ibcast_req != NULL) { - /* --BEGIN USEREXTENSION-- */ - mpi_errno = comm_ptr->coll_fns->Ibcast_req(buffer, count, datatype, root, comm_ptr, &reqp); - if (reqp) { - *request = reqp->handle; - if (mpi_errno) MPIR_ERR_POP(mpi_errno); - goto fn_exit; - } - /* --END USEREXTENSION-- */ - } - mpi_errno = MPID_Sched_next_tag(comm_ptr, &tag); if (mpi_errno) MPIR_ERR_POP(mpi_errno); mpi_errno = MPID_Sched_create(&s); diff --git a/src/mpi/coll/iexscan.c b/src/mpi/coll/iexscan.c index 94c866e..b2d0b58 100644 --- a/src/mpi/coll/iexscan.c +++ b/src/mpi/coll/iexscan.c @@ -193,18 +193,6 @@ int MPIR_Iexscan_impl(const void *sendbuf, void *recvbuf, int count, MPI_Datatyp *request = MPI_REQUEST_NULL; - MPIU_Assert(comm_ptr->coll_fns != NULL); - if (comm_ptr->coll_fns->Iexscan_req != NULL) { - /* --BEGIN USEREXTENSION-- */ - mpi_errno = comm_ptr->coll_fns->Iexscan_req(sendbuf, recvbuf, count, datatype, op, comm_ptr, &reqp); - if (reqp) { - *request = reqp->handle; - if (mpi_errno) MPIR_ERR_POP(mpi_errno); - goto fn_exit; - } - /* --END USEREXTENSION-- */ - } - mpi_errno = MPID_Sched_next_tag(comm_ptr, &tag); if (mpi_errno) MPIR_ERR_POP(mpi_errno); mpi_errno = MPID_Sched_create(&s); diff --git a/src/mpi/coll/igather.c b/src/mpi/coll/igather.c index 3ff349a..f45f890 100644 --- a/src/mpi/coll/igather.c +++ b/src/mpi/coll/igather.c @@ -531,20 +531,6 @@ int MPIR_Igather_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype, *request = MPI_REQUEST_NULL; - MPIU_Assert(comm_ptr->coll_fns != NULL); - if (comm_ptr->coll_fns->Igather_req != NULL) { - /* --BEGIN USEREXTENSION-- */ - mpi_errno = comm_ptr->coll_fns->Igather_req(sendbuf, sendcount, sendtype, - recvbuf, recvcount, recvtype, - root, comm_ptr, &reqp); - if (reqp) { - *request = reqp->handle; - if (mpi_errno) MPIR_ERR_POP(mpi_errno); - goto fn_exit; - } - /* --END USEREXTENSION-- */ - } - mpi_errno = MPID_Sched_next_tag(comm_ptr, &tag); if (mpi_errno) MPIR_ERR_POP(mpi_errno); mpi_errno = MPID_Sched_create(&s); diff --git a/src/mpi/coll/igatherv.c b/src/mpi/coll/igatherv.c index 0b2bf8d..efdcdbb 100644 --- a/src/mpi/coll/igatherv.c +++ b/src/mpi/coll/igatherv.c @@ -120,20 +120,6 @@ int MPIR_Igatherv_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype *request = MPI_REQUEST_NULL; - MPIU_Assert(comm_ptr->coll_fns != NULL); - if (comm_ptr->coll_fns->Igatherv_req != NULL) { - /* --BEGIN USEREXTENSION-- */ - mpi_errno = comm_ptr->coll_fns->Igatherv_req(sendbuf, sendcount, sendtype, - recvbuf, recvcounts, displs, recvtype, - root, comm_ptr, &reqp); - if (reqp) { - *request = reqp->handle; - if (mpi_errno) MPIR_ERR_POP(mpi_errno); - goto fn_exit; - } - /* --END USEREXTENSION-- */ - } - mpi_errno = MPID_Sched_next_tag(comm_ptr, &tag); if (mpi_errno) MPIR_ERR_POP(mpi_errno); mpi_errno = MPID_Sched_create(&s); diff --git a/src/mpi/coll/ired_scat.c b/src/mpi/coll/ired_scat.c index 93f03b3..d4767ea 100644 --- a/src/mpi/coll/ired_scat.c +++ b/src/mpi/coll/ired_scat.c @@ -1018,20 +1018,6 @@ int MPIR_Ireduce_scatter_impl(const void *sendbuf, void *recvbuf, const int recv *request = MPI_REQUEST_NULL; - MPIU_Assert(comm_ptr->coll_fns != NULL); - if (comm_ptr->coll_fns->Ireduce_scatter_req != NULL) { - /* --BEGIN USEREXTENSION-- */ - mpi_errno = comm_ptr->coll_fns->Ireduce_scatter_req(sendbuf, recvbuf, recvcounts, - datatype, op, - comm_ptr, &reqp); - if (reqp) { - *request = reqp->handle; - if (mpi_errno) MPIR_ERR_POP(mpi_errno); - goto fn_exit; - } - /* --END USEREXTENSION-- */ - } - mpi_errno = MPID_Sched_next_tag(comm_ptr, &tag); if (mpi_errno) MPIR_ERR_POP(mpi_errno); mpi_errno = MPID_Sched_create(&s); diff --git a/src/mpi/coll/ired_scat_block.c b/src/mpi/coll/ired_scat_block.c index b55f3fd..50daeb0 100644 --- a/src/mpi/coll/ired_scat_block.c +++ b/src/mpi/coll/ired_scat_block.c @@ -920,20 +920,6 @@ int MPIR_Ireduce_scatter_block_impl(const void *sendbuf, void *recvbuf, int recv *request = MPI_REQUEST_NULL; - MPIU_Assert(comm_ptr->coll_fns != NULL); - if (comm_ptr->coll_fns->Ireduce_scatter_block_req != NULL) { - /* --BEGIN USEREXTENSION-- */ - mpi_errno = comm_ptr->coll_fns->Ireduce_scatter_block_req(sendbuf, recvbuf, recvcount, - datatype, op, - comm_ptr, &reqp); - if (reqp) { - *request = reqp->handle; - if (mpi_errno) MPIR_ERR_POP(mpi_errno); - goto fn_exit; - } - /* --END USEREXTENSION-- */ - } - mpi_errno = MPID_Sched_next_tag(comm_ptr, &tag); if (mpi_errno) MPIR_ERR_POP(mpi_errno); mpi_errno = MPID_Sched_create(&s); diff --git a/src/mpi/coll/ireduce.c b/src/mpi/coll/ireduce.c index 6b5742c..4df5d54 100644 --- a/src/mpi/coll/ireduce.c +++ b/src/mpi/coll/ireduce.c @@ -776,20 +776,6 @@ int MPIR_Ireduce_impl(const void *sendbuf, void *recvbuf, int count, MPI_Datatyp *request = MPI_REQUEST_NULL; - MPIU_Assert(comm_ptr->coll_fns != NULL); - if (comm_ptr->coll_fns->Ireduce_req != NULL) { - /* --BEGIN USEREXTENSION-- */ - mpi_errno = comm_ptr->coll_fns->Ireduce_req(sendbuf, recvbuf, count, - datatype, op, root, - comm_ptr, &reqp); - if (reqp) { - *request = reqp->handle; - if (mpi_errno) MPIR_ERR_POP(mpi_errno); - goto fn_exit; - } - /* --END USEREXTENSION-- */ - } - mpi_errno = MPID_Sched_next_tag(comm_ptr, &tag); if (mpi_errno) MPIR_ERR_POP(mpi_errno); mpi_errno = MPID_Sched_create(&s); diff --git a/src/mpi/coll/iscan.c b/src/mpi/coll/iscan.c index af26274..53456ac 100644 --- a/src/mpi/coll/iscan.c +++ b/src/mpi/coll/iscan.c @@ -327,20 +327,6 @@ int MPIR_Iscan_impl(const void *sendbuf, void *recvbuf, int count, MPI_Datatype *request = MPI_REQUEST_NULL; - MPIU_Assert(comm_ptr->coll_fns != NULL); - if (comm_ptr->coll_fns->Iscan_req != NULL) { - /* --BEGIN USEREXTENSION-- */ - mpi_errno = comm_ptr->coll_fns->Iscan_req(sendbuf, recvbuf, count, - datatype, op, - comm_ptr, &reqp); - if (reqp) { - *request = reqp->handle; - if (mpi_errno) MPIR_ERR_POP(mpi_errno); - goto fn_exit; - } - /* --END USEREXTENSION-- */ - } - mpi_errno = MPID_Sched_next_tag(comm_ptr, &tag); if (mpi_errno) MPIR_ERR_POP(mpi_errno); mpi_errno = MPID_Sched_create(&s); diff --git a/src/mpi/coll/iscatter.c b/src/mpi/coll/iscatter.c index 8b0efdf..aa8ee1e 100644 --- a/src/mpi/coll/iscatter.c +++ b/src/mpi/coll/iscatter.c @@ -556,20 +556,6 @@ int MPIR_Iscatter_impl(const void *sendbuf, int sendcount, MPI_Datatype sendtype *request = MPI_REQUEST_NULL; - MPIU_Assert(comm_ptr->coll_fns != NULL); - if (comm_ptr->coll_fns->Iscatter_req != NULL) { - /* --BEGIN USEREXTENSION-- */ - mpi_errno = comm_ptr->coll_fns->Iscatter_req(sendbuf, sendcount, sendtype, - recvbuf, recvcount, recvtype, - root, comm_ptr, &reqp); - if (reqp) { - *request = reqp->handle; - if (mpi_errno) MPIR_ERR_POP(mpi_errno); - goto fn_exit; - } - /* --END USEREXTENSION-- */ - } - mpi_errno = MPID_Sched_next_tag(comm_ptr, &tag); if (mpi_errno) MPIR_ERR_POP(mpi_errno); mpi_errno = MPID_Sched_create(&s); diff --git a/src/mpi/coll/iscatterv.c b/src/mpi/coll/iscatterv.c index badfeb0..6eac943 100644 --- a/src/mpi/coll/iscatterv.c +++ b/src/mpi/coll/iscatterv.c @@ -127,20 +127,6 @@ int MPIR_Iscatterv_impl(const void *sendbuf, const int sendcounts[], const int d *request = MPI_REQUEST_NULL; - MPIU_Assert(comm_ptr->coll_fns != NULL); - if (comm_ptr->coll_fns->Iscatterv_req != NULL) { - /* --BEGIN USEREXTENSION-- */ - mpi_errno = comm_ptr->coll_fns->Iscatterv_req(sendbuf, sendcounts, displs, sendtype, - recvbuf, recvcount, recvtype, - root, comm_ptr, &reqp); - if (reqp) { - *request = reqp->handle; - if (mpi_errno) MPIR_ERR_POP(mpi_errno); - goto fn_exit; - } - /* --END USEREXTENSION-- */ - } - mpi_errno = MPID_Sched_next_tag(comm_ptr, &tag); if (mpi_errno) MPIR_ERR_POP(mpi_errno); mpi_errno = MPID_Sched_create(&s); http://git.mpich.org/mpich.git/commitdiff/549a0aebed866185f5e77b41ba28c3348… commit 549a0aebed866185f5e77b41ba28c3348da3b464 Author: Wesley Bland <wesley.bland(a)intel.com> Date: Tue Jan 5 14:03:59 2016 -0800 Add collectives to the ADI and change MPIR_*_impl usage to MPID_* Step one in removing the function pointers for all of the collective functions is to add all of the collective calls to the ADI. When these functions are called, they will just call back up to the MPIR functions in the MPI layer. This gives the device a simple way to override collectives. Just change the MPID_collective function to call an internal device function instead of calling back up to the MPIR_*_impl version. For all uses above the device, change to call MPID_collective instead. This lets the device override the default implementation easily if desired. Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/src/mpi/coll/allgather.c b/src/mpi/coll/allgather.c index b5a6240..db1c37e 100644 --- a/src/mpi/coll/allgather.c +++ b/src/mpi/coll/allgather.c @@ -696,7 +696,7 @@ int MPIR_Allgather_inter ( newcomm_ptr = comm_ptr->local_comm; if (sendcount != 0) { - mpi_errno = MPIR_Gather_impl(sendbuf, sendcount, sendtype, tmp_buf, sendcount, + mpi_errno = MPID_Gather(sendbuf, sendcount, sendtype, tmp_buf, sendcount, sendtype, 0, newcomm_ptr, errflag); if (mpi_errno) { /* for communication errors, just record the error but continue */ @@ -980,9 +980,9 @@ int MPI_Allgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, /* ... body of routine ... */ - mpi_errno = MPIR_Allgather_impl(sendbuf, sendcount, sendtype, - recvbuf, recvcount, recvtype, - comm_ptr, &errflag); + mpi_errno = MPID_Allgather(sendbuf, sendcount, sendtype, + recvbuf, recvcount, recvtype, + comm_ptr, &errflag); if (mpi_errno) goto fn_fail; /* ... end of body of routine ... */ diff --git a/src/mpi/coll/allgatherv.c b/src/mpi/coll/allgatherv.c index 0577c2c..621e08b 100644 --- a/src/mpi/coll/allgatherv.c +++ b/src/mpi/coll/allgatherv.c @@ -792,7 +792,7 @@ int MPIR_Allgatherv_inter ( if (comm_ptr->is_low_group) { /* gatherv from right group */ root = (rank == 0) ? MPI_ROOT : MPI_PROC_NULL; - mpi_errno = MPIR_Gatherv_impl(sendbuf, sendcount, sendtype, recvbuf, + mpi_errno = MPID_Gatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, root, comm_ptr, errflag); if (mpi_errno) { @@ -803,7 +803,7 @@ int MPIR_Allgatherv_inter ( } /* gatherv to right group */ root = 0; - mpi_errno = MPIR_Gatherv_impl(sendbuf, sendcount, sendtype, recvbuf, + mpi_errno = MPID_Gatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, root, comm_ptr, errflag); if (mpi_errno) { @@ -816,7 +816,7 @@ int MPIR_Allgatherv_inter ( else { /* gatherv to left group */ root = 0; - mpi_errno = MPIR_Gatherv_impl(sendbuf, sendcount, sendtype, recvbuf, + mpi_errno = MPID_Gatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, root, comm_ptr, errflag); if (mpi_errno) { @@ -827,7 +827,7 @@ int MPIR_Allgatherv_inter ( } /* gatherv from left group */ root = (rank == 0) ? MPI_ROOT : MPI_PROC_NULL; - mpi_errno = MPIR_Gatherv_impl(sendbuf, sendcount, sendtype, recvbuf, + mpi_errno = MPID_Gatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, root, comm_ptr, errflag); if (mpi_errno) { @@ -1102,7 +1102,7 @@ int MPI_Allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, /* ... body of routine ... */ - mpi_errno = MPIR_Allgatherv_impl(sendbuf, sendcount, sendtype, + mpi_errno = MPID_Allgatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, comm_ptr, &errflag); if (mpi_errno) goto fn_fail; diff --git a/src/mpi/coll/allreduce.c b/src/mpi/coll/allreduce.c index 550066a..83b206c 100644 --- a/src/mpi/coll/allreduce.c +++ b/src/mpi/coll/allreduce.c @@ -223,7 +223,7 @@ int MPIR_Allreduce_intra ( /* IN_PLACE and not root of reduce. Data supplied to this allreduce is in recvbuf. Pass that as the sendbuf to reduce. */ - mpi_errno = MPIR_Reduce_impl(recvbuf, NULL, count, datatype, op, 0, comm_ptr->node_comm, errflag); + mpi_errno = MPID_Reduce(recvbuf, NULL, count, datatype, op, 0, comm_ptr->node_comm, errflag); if (mpi_errno) { /* for communication errors, just record the error but continue */ *errflag = MPIR_ERR_GET_CLASS(mpi_errno); @@ -231,7 +231,7 @@ int MPIR_Allreduce_intra ( MPIR_ERR_ADD(mpi_errno_ret, mpi_errno); } } else { - mpi_errno = MPIR_Reduce_impl(sendbuf, recvbuf, count, datatype, op, 0, comm_ptr->node_comm, errflag); + mpi_errno = MPID_Reduce(sendbuf, recvbuf, count, datatype, op, 0, comm_ptr->node_comm, errflag); if (mpi_errno) { /* for communication errors, just record the error but continue */ *errflag = MPIR_ERR_GET_CLASS(mpi_errno); @@ -261,7 +261,7 @@ int MPIR_Allreduce_intra ( /* now broadcast the result among local processes */ if (comm_ptr->node_comm != NULL) { - mpi_errno = MPIR_Bcast_impl(recvbuf, count, datatype, 0, comm_ptr->node_comm, errflag); + mpi_errno = MPID_Bcast(recvbuf, count, datatype, 0, comm_ptr->node_comm, errflag); if (mpi_errno) { /* for communication errors, just record the error but continue */ *errflag = MPIR_ERR_GET_CLASS(mpi_errno); @@ -284,7 +284,7 @@ int MPIR_Allreduce_intra ( if (!is_homogeneous) { /* heterogeneous. To get the same result on all processes, we do a reduce to 0 and then broadcast. */ - mpi_errno = MPIR_Reduce_impl ( sendbuf, recvbuf, count, datatype, + mpi_errno = MPID_Reduce( sendbuf, recvbuf, count, datatype, op, 0, comm_ptr, errflag ); if (mpi_errno) { /* for communication errors, just record the error but continue */ @@ -293,7 +293,7 @@ int MPIR_Allreduce_intra ( MPIR_ERR_ADD(mpi_errno_ret, mpi_errno); } - mpi_errno = MPIR_Bcast_impl( recvbuf, count, datatype, 0, comm_ptr, errflag ); + mpi_errno = MPID_Bcast( recvbuf, count, datatype, 0, comm_ptr, errflag ); if (mpi_errno) { /* for communication errors, just record the error but continue */ *errflag = MPIR_ERR_GET_CLASS(mpi_errno); @@ -682,7 +682,7 @@ int MPIR_Allreduce_inter ( } /* Do a local broadcast on this intracommunicator */ - mpi_errno = MPIR_Bcast_impl(recvbuf, count, datatype, + mpi_errno = MPID_Bcast(recvbuf, count, datatype, 0, newcomm_ptr, errflag); if (mpi_errno) { /* for communication errors, just record the error but continue */ @@ -889,7 +889,7 @@ int MPI_Allreduce(const void *sendbuf, void *recvbuf, int count, /* ... body of routine ... */ - mpi_errno = MPIR_Allreduce_impl(sendbuf, recvbuf, count, datatype, op, comm_ptr, &errflag); + mpi_errno = MPID_Allreduce(sendbuf, recvbuf, count, datatype, op, comm_ptr, &errflag); if (mpi_errno) goto fn_fail; /* ... end of body of routine ... */ diff --git a/src/mpi/coll/alltoall.c b/src/mpi/coll/alltoall.c index a9a6614..60a0fae 100644 --- a/src/mpi/coll/alltoall.c +++ b/src/mpi/coll/alltoall.c @@ -719,7 +719,7 @@ int MPI_Alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, /* ... body of routine ... */ - mpi_errno = MPIR_Alltoall_impl(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm_ptr, &errflag); + mpi_errno = MPID_Alltoall(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm_ptr, &errflag); if (mpi_errno) goto fn_fail; /* ... end of body of routine ... */ diff --git a/src/mpi/coll/alltoallv.c b/src/mpi/coll/alltoallv.c index 047cef7..e931899 100644 --- a/src/mpi/coll/alltoallv.c +++ b/src/mpi/coll/alltoallv.c @@ -524,7 +524,7 @@ int MPI_Alltoallv(const void *sendbuf, const int *sendcounts, /* ... body of routine ... */ - mpi_errno = MPIR_Alltoallv_impl(sendbuf, sendcounts, sdispls, + mpi_errno = MPID_Alltoallv(sendbuf, sendcounts, sdispls, sendtype, recvbuf, recvcounts, rdispls, recvtype, comm_ptr, &errflag); if (mpi_errno) goto fn_fail; diff --git a/src/mpi/coll/alltoallw.c b/src/mpi/coll/alltoallw.c index b00dd9c..b7fdc7e 100644 --- a/src/mpi/coll/alltoallw.c +++ b/src/mpi/coll/alltoallw.c @@ -529,7 +529,7 @@ int MPI_Alltoallw(const void *sendbuf, const int sendcounts[], /* ... body of routine ... */ - mpi_errno = MPIR_Alltoallw_impl(sendbuf, sendcounts, sdispls, + mpi_errno = MPID_Alltoallw(sendbuf, sendcounts, sdispls, sendtypes, recvbuf, recvcounts, rdispls, recvtypes, comm_ptr, &errflag); if (mpi_errno) goto fn_fail; diff --git a/src/mpi/coll/barrier.c b/src/mpi/coll/barrier.c index fa90b6d..158ab46 100644 --- a/src/mpi/coll/barrier.c +++ b/src/mpi/coll/barrier.c @@ -78,7 +78,7 @@ static int barrier_smp_intra(MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag) /* do the intranode barrier on all nodes */ if (comm_ptr->node_comm != NULL) { - mpi_errno = MPIR_Barrier_impl(comm_ptr->node_comm, errflag); + mpi_errno = MPID_Barrier(comm_ptr->node_comm, errflag); if (mpi_errno) { /* for communication errors, just record the error but continue */ *errflag = MPIR_ERR_GET_CLASS(mpi_errno); @@ -89,7 +89,7 @@ static int barrier_smp_intra(MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag) /* do the barrier across roots of all nodes */ if (comm_ptr->node_roots_comm != NULL) { - mpi_errno = MPIR_Barrier_impl(comm_ptr->node_roots_comm, errflag); + mpi_errno = MPID_Barrier(comm_ptr->node_roots_comm, errflag); if (mpi_errno) { /* for communication errors, just record the error but continue */ *errflag = MPIR_ERR_GET_CLASS(mpi_errno); @@ -104,7 +104,7 @@ static int barrier_smp_intra(MPID_Comm *comm_ptr, MPIR_Errflag_t *errflag) if (comm_ptr->node_comm != NULL) { int i=0; - mpi_errno = MPIR_Bcast_impl(&i, 1, MPI_BYTE, 0, comm_ptr->node_comm, errflag); + mpi_errno = MPID_Bcast(&i, 1, MPI_BYTE, 0, comm_ptr->node_comm, errflag); if (mpi_errno) { /* for communication errors, just record the error but continue */ *errflag = MPIR_ERR_GET_CLASS(mpi_errno); @@ -406,7 +406,7 @@ int MPI_Barrier( MPI_Comm comm ) /* ... body of routine ... */ - mpi_errno = MPIR_Barrier_impl(comm_ptr, &errflag); + mpi_errno = MPID_Barrier(comm_ptr, &errflag); if (mpi_errno) goto fn_fail; /* ... end of body of routine ... */ diff --git a/src/mpi/coll/bcast.c b/src/mpi/coll/bcast.c index 01f65a6..19dcfbd 100644 --- a/src/mpi/coll/bcast.c +++ b/src/mpi/coll/bcast.c @@ -1582,7 +1582,7 @@ int MPI_Bcast( void *buffer, int count, MPI_Datatype datatype, int root, /* ... body of routine ... */ - mpi_errno = MPIR_Bcast_impl( buffer, count, datatype, root, comm_ptr, &errflag ); + mpi_errno = MPID_Bcast( buffer, count, datatype, root, comm_ptr, &errflag ); if (mpi_errno) goto fn_fail; /* ... end of body of routine ... */ diff --git a/src/mpi/coll/exscan.c b/src/mpi/coll/exscan.c index b435ab1..24209c9 100644 --- a/src/mpi/coll/exscan.c +++ b/src/mpi/coll/exscan.c @@ -396,7 +396,7 @@ int MPI_Exscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datat /* ... body of routine ... */ - mpi_errno = MPIR_Exscan_impl(sendbuf, recvbuf, count, datatype, op, comm_ptr, &errflag); + mpi_errno = MPID_Exscan(sendbuf, recvbuf, count, datatype, op, comm_ptr, &errflag); if (mpi_errno) goto fn_fail; /* ... end of body of routine ... */ diff --git a/src/mpi/coll/gather.c b/src/mpi/coll/gather.c index 741ce5b..afe60f4 100644 --- a/src/mpi/coll/gather.c +++ b/src/mpi/coll/gather.c @@ -593,7 +593,7 @@ int MPIR_Gather_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, newcomm_ptr = comm_ptr->local_comm; /* now do the a local gather on this intracommunicator */ - mpi_errno = MPIR_Gather_impl(sendbuf, sendcount, sendtype, + mpi_errno = MPID_Gather(sendbuf, sendcount, sendtype, tmp_buf, sendcount, sendtype, 0, newcomm_ptr, errflag); if (mpi_errno) { @@ -886,7 +886,7 @@ int MPI_Gather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, /* ... body of routine ... */ - mpi_errno = MPIR_Gather_impl(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, comm_ptr, &errflag); + mpi_errno = MPID_Gather(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, comm_ptr, &errflag); if (mpi_errno) goto fn_fail; /* ... end of body of routine ... */ diff --git a/src/mpi/coll/gatherv.c b/src/mpi/coll/gatherv.c index ae6cd29..5648845 100644 --- a/src/mpi/coll/gatherv.c +++ b/src/mpi/coll/gatherv.c @@ -415,7 +415,7 @@ int MPI_Gatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, /* ... body of routine ... */ - mpi_errno = MPIR_Gatherv_impl(sendbuf, sendcount, sendtype, + mpi_errno = MPID_Gatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, root, comm_ptr, &errflag); if (mpi_errno) goto fn_fail; diff --git a/src/mpi/coll/iallgather.c b/src/mpi/coll/iallgather.c index e596d79..6295986 100644 --- a/src/mpi/coll/iallgather.c +++ b/src/mpi/coll/iallgather.c @@ -734,7 +734,7 @@ int MPI_Iallgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, /* ... body of routine ... */ - mpi_errno = MPIR_Iallgather_impl(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm_ptr, request); + mpi_errno = MPID_Iallgather(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm_ptr, request); if (mpi_errno) MPIR_ERR_POP(mpi_errno); /* ... end of body of routine ... */ diff --git a/src/mpi/coll/iallgatherv.c b/src/mpi/coll/iallgatherv.c index cd66a23..c3dd807 100644 --- a/src/mpi/coll/iallgatherv.c +++ b/src/mpi/coll/iallgatherv.c @@ -844,7 +844,7 @@ int MPI_Iallgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, v /* ... body of routine ... */ - mpi_errno = MPIR_Iallgatherv_impl(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, comm_ptr, request); + mpi_errno = MPID_Iallgatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, comm_ptr, request); if (mpi_errno) MPIR_ERR_POP(mpi_errno); /* ... end of body of routine ... */ diff --git a/src/mpi/coll/iallreduce.c b/src/mpi/coll/iallreduce.c index 7b31bd0..ff07dfd 100644 --- a/src/mpi/coll/iallreduce.c +++ b/src/mpi/coll/iallreduce.c @@ -789,7 +789,7 @@ int MPI_Iallreduce(const void *sendbuf, void *recvbuf, int count, /* ... body of routine ... */ - mpi_errno = MPIR_Iallreduce_impl(sendbuf, recvbuf, count, datatype, op, comm_ptr, request); + mpi_errno = MPID_Iallreduce(sendbuf, recvbuf, count, datatype, op, comm_ptr, request); if (mpi_errno) MPIR_ERR_POP(mpi_errno); /* ... end of body of routine ... */ diff --git a/src/mpi/coll/ialltoall.c b/src/mpi/coll/ialltoall.c index b9a3dd4..5817105 100644 --- a/src/mpi/coll/ialltoall.c +++ b/src/mpi/coll/ialltoall.c @@ -663,7 +663,7 @@ int MPI_Ialltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, /* ... body of routine ... */ - mpi_errno = MPIR_Ialltoall_impl(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm_ptr, request); + mpi_errno = MPID_Ialltoall(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm_ptr, request); if (mpi_errno) MPIR_ERR_POP(mpi_errno); /* ... end of body of routine ... */ diff --git a/src/mpi/coll/ialltoallv.c b/src/mpi/coll/ialltoallv.c index 887903f..413d2fd 100644 --- a/src/mpi/coll/ialltoallv.c +++ b/src/mpi/coll/ialltoallv.c @@ -398,7 +398,7 @@ int MPI_Ialltoallv(const void *sendbuf, const int sendcounts[], const int sdispl /* ... body of routine ... */ - mpi_errno = MPIR_Ialltoallv_impl(sendbuf, sendcounts, sdispls, sendtype, recvbuf, recvcounts, rdispls, recvtype, comm_ptr, request); + mpi_errno = MPID_Ialltoallv(sendbuf, sendcounts, sdispls, sendtype, recvbuf, recvcounts, rdispls, recvtype, comm_ptr, request); if (mpi_errno) MPIR_ERR_POP(mpi_errno); /* ... end of body of routine ... */ diff --git a/src/mpi/coll/ialltoallw.c b/src/mpi/coll/ialltoallw.c index 0527332..e88142a 100644 --- a/src/mpi/coll/ialltoallw.c +++ b/src/mpi/coll/ialltoallw.c @@ -386,7 +386,7 @@ int MPI_Ialltoallw(const void *sendbuf, const int sendcounts[], const int sdispl /* ... body of routine ... */ - mpi_errno = MPIR_Ialltoallw_impl(sendbuf, sendcounts, sdispls, sendtypes, recvbuf, recvcounts, rdispls, recvtypes, comm_ptr, request); + mpi_errno = MPID_Ialltoallw(sendbuf, sendcounts, sdispls, sendtypes, recvbuf, recvcounts, rdispls, recvtypes, comm_ptr, request); if (mpi_errno) MPIR_ERR_POP(mpi_errno); /* ... end of body of routine ... */ diff --git a/src/mpi/coll/ibarrier.c b/src/mpi/coll/ibarrier.c index 1d9826d..6375fe7 100644 --- a/src/mpi/coll/ibarrier.c +++ b/src/mpi/coll/ibarrier.c @@ -285,7 +285,7 @@ int MPI_Ibarrier(MPI_Comm comm, MPI_Request *request) /* ... body of routine ... */ - mpi_errno = MPIR_Ibarrier_impl(comm_ptr, request); + mpi_errno = MPID_Ibarrier(comm_ptr, request); if (mpi_errno) MPIR_ERR_POP(mpi_errno); /* ... end of body of routine ... */ diff --git a/src/mpi/coll/ibcast.c b/src/mpi/coll/ibcast.c index 54f7545..c40ee36 100644 --- a/src/mpi/coll/ibcast.c +++ b/src/mpi/coll/ibcast.c @@ -1085,7 +1085,7 @@ int MPI_Ibcast(void *buffer, int count, MPI_Datatype datatype, int root, MPI_Com /* ... body of routine ... */ - mpi_errno = MPIR_Ibcast_impl(buffer, count, datatype, root, comm_ptr, request); + mpi_errno = MPID_Ibcast(buffer, count, datatype, root, comm_ptr, request); if (mpi_errno) MPIR_ERR_POP(mpi_errno); /* ... end of body of routine ... */ diff --git a/src/mpi/coll/iexscan.c b/src/mpi/coll/iexscan.c index 9a5cefe..94c866e 100644 --- a/src/mpi/coll/iexscan.c +++ b/src/mpi/coll/iexscan.c @@ -320,7 +320,7 @@ int MPI_Iexscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype data /* ... body of routine ... */ - mpi_errno = MPIR_Iexscan_impl(sendbuf, recvbuf, count, datatype, op, comm_ptr, request); + mpi_errno = MPID_Iexscan(sendbuf, recvbuf, count, datatype, op, comm_ptr, request); if (mpi_errno) MPIR_ERR_POP(mpi_errno); /* ... end of body of routine ... */ diff --git a/src/mpi/coll/igather.c b/src/mpi/coll/igather.c index 2eb441e..3ff349a 100644 --- a/src/mpi/coll/igather.c +++ b/src/mpi/coll/igather.c @@ -718,7 +718,7 @@ int MPI_Igather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, /* ... body of routine ... */ - mpi_errno = MPIR_Igather_impl(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, comm_ptr, request); + mpi_errno = MPID_Igather(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, comm_ptr, request); if (mpi_errno) MPIR_ERR_POP(mpi_errno); /* ... end of body of routine ... */ diff --git a/src/mpi/coll/igatherv.c b/src/mpi/coll/igatherv.c index 547fcc3..0b2bf8d 100644 --- a/src/mpi/coll/igatherv.c +++ b/src/mpi/coll/igatherv.c @@ -318,7 +318,7 @@ int MPI_Igatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void /* ... body of routine ... */ - mpi_errno = MPIR_Igatherv_impl(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, root, comm_ptr, request); + mpi_errno = MPID_Igatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, root, comm_ptr, request); if (mpi_errno) MPIR_ERR_POP(mpi_errno); /* ... end of body of routine ... */ diff --git a/src/mpi/coll/ired_scat.c b/src/mpi/coll/ired_scat.c index fa1227b..93f03b3 100644 --- a/src/mpi/coll/ired_scat.c +++ b/src/mpi/coll/ired_scat.c @@ -1152,7 +1152,7 @@ int MPI_Ireduce_scatter(const void *sendbuf, void *recvbuf, const int recvcounts /* ... body of routine ... */ - mpi_errno = MPIR_Ireduce_scatter_impl(sendbuf, recvbuf, recvcounts, datatype, op, comm_ptr, request); + mpi_errno = MPID_Ireduce_scatter(sendbuf, recvbuf, recvcounts, datatype, op, comm_ptr, request); if (mpi_errno) MPIR_ERR_POP(mpi_errno); /* ... end of body of routine ... */ diff --git a/src/mpi/coll/ired_scat_block.c b/src/mpi/coll/ired_scat_block.c index 05d4367..b55f3fd 100644 --- a/src/mpi/coll/ired_scat_block.c +++ b/src/mpi/coll/ired_scat_block.c @@ -1049,7 +1049,7 @@ int MPI_Ireduce_scatter_block(const void *sendbuf, void *recvbuf, /* ... body of routine ... */ - mpi_errno = MPIR_Ireduce_scatter_block_impl(sendbuf, recvbuf, recvcount, datatype, op, comm_ptr, request); + mpi_errno = MPID_Ireduce_scatter_block(sendbuf, recvbuf, recvcount, datatype, op, comm_ptr, request); if (mpi_errno) MPIR_ERR_POP(mpi_errno); /* ... end of body of routine ... */ diff --git a/src/mpi/coll/ireduce.c b/src/mpi/coll/ireduce.c index bda2b4b..6b5742c 100644 --- a/src/mpi/coll/ireduce.c +++ b/src/mpi/coll/ireduce.c @@ -921,7 +921,7 @@ int MPI_Ireduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype data /* ... body of routine ... */ - mpi_errno = MPIR_Ireduce_impl(sendbuf, recvbuf, count, datatype, op, root, comm_ptr, request); + mpi_errno = MPID_Ireduce(sendbuf, recvbuf, count, datatype, op, root, comm_ptr, request); if (mpi_errno) MPIR_ERR_POP(mpi_errno); /* ... end of body of routine ... */ diff --git a/src/mpi/coll/iscan.c b/src/mpi/coll/iscan.c index 9b0fbca..af26274 100644 --- a/src/mpi/coll/iscan.c +++ b/src/mpi/coll/iscan.c @@ -457,7 +457,7 @@ int MPI_Iscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype dataty /* ... body of routine ... */ - mpi_errno = MPIR_Iscan_impl(sendbuf, recvbuf, count, datatype, op, comm_ptr, request); + mpi_errno = MPID_Iscan(sendbuf, recvbuf, count, datatype, op, comm_ptr, request); if (mpi_errno) MPIR_ERR_POP(mpi_errno); /* ... end of body of routine ... */ diff --git a/src/mpi/coll/iscatter.c b/src/mpi/coll/iscatter.c index 390f788..8b0efdf 100644 --- a/src/mpi/coll/iscatter.c +++ b/src/mpi/coll/iscatter.c @@ -730,7 +730,7 @@ int MPI_Iscatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, /* ... body of routine ... */ - mpi_errno = MPIR_Iscatter_impl(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, comm_ptr, request); + mpi_errno = MPID_Iscatter(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, comm_ptr, request); if (mpi_errno) MPIR_ERR_POP(mpi_errno); /* ... end of body of routine ... */ diff --git a/src/mpi/coll/iscatterv.c b/src/mpi/coll/iscatterv.c index 549e2f5..badfeb0 100644 --- a/src/mpi/coll/iscatterv.c +++ b/src/mpi/coll/iscatterv.c @@ -332,7 +332,7 @@ int MPI_Iscatterv(const void *sendbuf, const int sendcounts[], const int displs[ /* ... body of routine ... */ - mpi_errno = MPIR_Iscatterv_impl(sendbuf, sendcounts, displs, sendtype, recvbuf, recvcount, recvtype, root, comm_ptr, request); + mpi_errno = MPID_Iscatterv(sendbuf, sendcounts, displs, sendtype, recvbuf, recvcount, recvtype, root, comm_ptr, request); if (mpi_errno) MPIR_ERR_POP(mpi_errno); /* ... end of body of routine ... */ diff --git a/src/mpi/coll/red_scat.c b/src/mpi/coll/red_scat.c index 9e26f0d..83a41ff 100644 --- a/src/mpi/coll/red_scat.c +++ b/src/mpi/coll/red_scat.c @@ -1218,8 +1218,8 @@ int MPI_Reduce_scatter(const void *sendbuf, void *recvbuf, const int recvcounts[ /* ... body of routine ... */ - mpi_errno = MPIR_Reduce_scatter_impl(sendbuf, recvbuf, recvcounts, - datatype, op, comm_ptr, &errflag); + mpi_errno = MPID_Reduce_scatter(sendbuf, recvbuf, recvcounts, + datatype, op, comm_ptr, &errflag); if (mpi_errno) goto fn_fail; /* ... end of body of routine ... */ diff --git a/src/mpi/coll/red_scat_block.c b/src/mpi/coll/red_scat_block.c index 1ca4b8e..6afeea2 100644 --- a/src/mpi/coll/red_scat_block.c +++ b/src/mpi/coll/red_scat_block.c @@ -980,7 +980,7 @@ int MPIR_Reduce_scatter_block_inter ( newcomm_ptr = comm_ptr->local_comm; - mpi_errno = MPIR_Scatter_impl(tmp_buf, recvcount, datatype, recvbuf, + mpi_errno = MPID_Scatter(tmp_buf, recvcount, datatype, recvbuf, recvcount, datatype, 0, newcomm_ptr, errflag); if (mpi_errno) { /* for communication errors, just record the error but continue */ @@ -1185,7 +1185,7 @@ int MPI_Reduce_scatter_block(const void *sendbuf, void *recvbuf, /* ... body of routine ... */ - mpi_errno = MPIR_Reduce_scatter_block_impl(sendbuf, recvbuf, recvcount, + mpi_errno = MPID_Reduce_scatter_block(sendbuf, recvbuf, recvcount, datatype, op, comm_ptr, &errflag); if (mpi_errno) goto fn_fail; diff --git a/src/mpi/coll/reduce.c b/src/mpi/coll/reduce.c index 9e7575a..4c29171 100644 --- a/src/mpi/coll/reduce.c +++ b/src/mpi/coll/reduce.c @@ -781,7 +781,7 @@ int MPIR_Reduce_intra ( /* do the intranode reduce on all nodes other than the root's node */ if (comm_ptr->node_comm != NULL && MPIU_Get_intranode_rank(comm_ptr, root) == -1) { - mpi_errno = MPIR_Reduce_impl(sendbuf, tmp_buf, count, datatype, + mpi_errno = MPID_Reduce(sendbuf, tmp_buf, count, datatype, op, 0, comm_ptr->node_comm, errflag); if (mpi_errno) { /* for communication errors, just record the error but continue */ @@ -797,7 +797,7 @@ int MPIR_Reduce_intra ( /* I am not on root's node. Use tmp_buf if we participated in the first reduce, otherwise use sendbuf */ const void *buf = (comm_ptr->node_comm == NULL ? sendbuf : tmp_buf); - mpi_errno = MPIR_Reduce_impl(buf, NULL, count, datatype, + mpi_errno = MPID_Reduce(buf, NULL, count, datatype, op, MPIU_Get_internode_rank(comm_ptr, root), comm_ptr->node_roots_comm, errflag); if (mpi_errno) { @@ -812,7 +812,7 @@ int MPIR_Reduce_intra ( /* I am not the root though. I don't have a valid recvbuf. Use tmp_buf as recvbuf. */ - mpi_errno = MPIR_Reduce_impl(sendbuf, tmp_buf, count, datatype, + mpi_errno = MPID_Reduce(sendbuf, tmp_buf, count, datatype, op, MPIU_Get_internode_rank(comm_ptr, root), comm_ptr->node_roots_comm, errflag); if (mpi_errno) { @@ -828,7 +828,7 @@ int MPIR_Reduce_intra ( else { /* I am the root. in_place is automatically handled. */ - mpi_errno = MPIR_Reduce_impl(sendbuf, recvbuf, count, datatype, + mpi_errno = MPID_Reduce(sendbuf, recvbuf, count, datatype, op, MPIU_Get_internode_rank(comm_ptr, root), comm_ptr->node_roots_comm, errflag); if (mpi_errno) { @@ -848,7 +848,7 @@ int MPIR_Reduce_intra ( /* do the intranode reduce on the root's node */ if (comm_ptr->node_comm != NULL && MPIU_Get_intranode_rank(comm_ptr, root) != -1) { - mpi_errno = MPIR_Reduce_impl(sendbuf, recvbuf, count, datatype, + mpi_errno = MPID_Reduce(sendbuf, recvbuf, count, datatype, op, MPIU_Get_intranode_rank(comm_ptr, root), comm_ptr->node_comm, errflag); if (mpi_errno) { @@ -1254,7 +1254,7 @@ int MPI_Reduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datat /* ... body of routine ... */ - mpi_errno = MPIR_Reduce_impl(sendbuf, recvbuf, count, datatype, op, root, comm_ptr, &errflag); + mpi_errno = MPID_Reduce(sendbuf, recvbuf, count, datatype, op, root, comm_ptr, &errflag); if (mpi_errno) goto fn_fail; /* ... end of body of routine ... */ diff --git a/src/mpi/coll/scan.c b/src/mpi/coll/scan.c index 4715f6a..c19620c 100644 --- a/src/mpi/coll/scan.c +++ b/src/mpi/coll/scan.c @@ -291,7 +291,7 @@ int MPIR_Scan( one process, just copy the raw data. */ if (comm_ptr->node_comm != NULL) { - mpi_errno = MPIR_Scan_impl(sendbuf, recvbuf, count, datatype, + mpi_errno = MPID_Scan(sendbuf, recvbuf, count, datatype, op, comm_ptr->node_comm, errflag); if (mpi_errno) { /* for communication errors, just record the error but continue */ @@ -347,7 +347,7 @@ int MPIR_Scan( process of node 3. */ if (comm_ptr->node_roots_comm != NULL) { - mpi_errno = MPIR_Scan_impl(localfulldata, prefulldata, count, datatype, + mpi_errno = MPID_Scan(localfulldata, prefulldata, count, datatype, op, comm_ptr->node_roots_comm, errflag); if (mpi_errno) { /* for communication errors, just record the error but continue */ @@ -391,7 +391,7 @@ int MPIR_Scan( reduce it with recvbuf to get final result if nessesary. */ if (comm_ptr->node_comm != NULL) { - mpi_errno = MPIR_Bcast_impl(&noneed, 1, MPI_INT, 0, comm_ptr->node_comm, errflag); + mpi_errno = MPID_Bcast(&noneed, 1, MPI_INT, 0, comm_ptr->node_comm, errflag); if (mpi_errno) { /* for communication errors, just record the error but continue */ *errflag = MPIR_ERR_GET_CLASS(mpi_errno); @@ -402,7 +402,7 @@ int MPIR_Scan( if (noneed == 0) { if (comm_ptr->node_comm != NULL) { - mpi_errno = MPIR_Bcast_impl(tempbuf, count, datatype, 0, + mpi_errno = MPID_Bcast(tempbuf, count, datatype, 0, comm_ptr->node_comm, errflag); if (mpi_errno) { /* for communication errors, just record the error but continue */ @@ -571,7 +571,7 @@ int MPI_Scan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatyp /* ... body of routine ... */ - mpi_errno = MPIR_Scan_impl(sendbuf, recvbuf, count, datatype, op, comm_ptr, &errflag); + mpi_errno = MPID_Scan(sendbuf, recvbuf, count, datatype, op, comm_ptr, &errflag); if (mpi_errno) goto fn_fail; /* ... end of body of routine ... */ diff --git a/src/mpi/coll/scatter.c b/src/mpi/coll/scatter.c index f8068c6..590b26a 100644 --- a/src/mpi/coll/scatter.c +++ b/src/mpi/coll/scatter.c @@ -511,7 +511,7 @@ int MPIR_Scatter_inter(const void *sendbuf, int sendcount, MPI_Datatype sendtype newcomm_ptr = comm_ptr->local_comm; /* now do the usual scatter on this intracommunicator */ - mpi_errno = MPIR_Scatter_impl(tmp_buf, recvcount, recvtype, + mpi_errno = MPID_Scatter(tmp_buf, recvcount, recvtype, recvbuf, recvcount, recvtype, 0, newcomm_ptr, errflag); if (mpi_errno) { @@ -784,7 +784,7 @@ int MPI_Scatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, /* ... body of routine ... */ - mpi_errno = MPIR_Scatter_impl(sendbuf, sendcount, sendtype, + mpi_errno = MPID_Scatter(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, comm_ptr, &errflag); if (mpi_errno) goto fn_fail; diff --git a/src/mpi/coll/scatterv.c b/src/mpi/coll/scatterv.c index 67bf285..3945e50 100644 --- a/src/mpi/coll/scatterv.c +++ b/src/mpi/coll/scatterv.c @@ -366,7 +366,7 @@ int MPI_Scatterv(const void *sendbuf, const int *sendcounts, const int *displs, /* ... body of routine ... */ - mpi_errno = MPIR_Scatterv_impl(sendbuf, sendcounts, displs, sendtype, + mpi_errno = MPID_Scatterv(sendbuf, sendcounts, displs, sendtype, recvbuf, recvcount, recvtype, root, comm_ptr, &errflag); if (mpi_errno) goto fn_fail; diff --git a/src/mpi/comm/comm_create.c b/src/mpi/comm/comm_create.c index eacddd7..033a5a9 100644 --- a/src/mpi/comm/comm_create.c +++ b/src/mpi/comm/comm_create.c @@ -377,10 +377,10 @@ PMPI_LOCAL int MPIR_Comm_create_inter(MPID_Comm *comm_ptr, MPID_Group *group_ptr if (mpi_errno) { MPIR_ERR_POP( mpi_errno ); } /* Broadcast to the other members of the local group */ - mpi_errno = MPIR_Bcast_impl( rinfo, 2, MPI_INT, 0, + mpi_errno = MPID_Bcast( rinfo, 2, MPI_INT, 0, comm_ptr->local_comm, &errflag); if (mpi_errno) MPIR_ERR_POP(mpi_errno); - mpi_errno = MPIR_Bcast_impl( remote_mapping, remote_size, MPI_INT, 0, + mpi_errno = MPID_Bcast( remote_mapping, remote_size, MPI_INT, 0, comm_ptr->local_comm, &errflag); if (mpi_errno) MPIR_ERR_POP(mpi_errno); MPIR_ERR_CHKANDJUMP(errflag, mpi_errno, MPI_ERR_OTHER, "**coll_fail"); @@ -388,7 +388,7 @@ PMPI_LOCAL int MPIR_Comm_create_inter(MPID_Comm *comm_ptr, MPID_Group *group_ptr else { /* The other processes */ /* Broadcast to the other members of the local group */ - mpi_errno = MPIR_Bcast_impl( rinfo, 2, MPI_INT, 0, + mpi_errno = MPID_Bcast( rinfo, 2, MPI_INT, 0, comm_ptr->local_comm, &errflag); if (mpi_errno) MPIR_ERR_POP(mpi_errno); MPIR_ERR_CHKANDJUMP(errflag, mpi_errno, MPI_ERR_OTHER, "**coll_fail"); @@ -399,7 +399,7 @@ PMPI_LOCAL int MPIR_Comm_create_inter(MPID_Comm *comm_ptr, MPID_Group *group_ptr MPIU_CHKLMEM_MALLOC(remote_mapping,int*, remote_size*sizeof(int), mpi_errno,"remote_mapping"); - mpi_errno = MPIR_Bcast_impl( remote_mapping, remote_size, MPI_INT, 0, + mpi_errno = MPID_Bcast( remote_mapping, remote_size, MPI_INT, 0, comm_ptr->local_comm, &errflag); if (mpi_errno) MPIR_ERR_POP(mpi_errno); MPIR_ERR_CHKANDJUMP(errflag, mpi_errno, MPI_ERR_OTHER, "**coll_fail"); diff --git a/src/mpi/comm/comm_split.c b/src/mpi/comm/comm_split.c index 968b4ab..6d22cc1 100644 --- a/src/mpi/comm/comm_split.c +++ b/src/mpi/comm/comm_split.c @@ -163,7 +163,7 @@ int MPIR_Comm_split_impl(MPID_Comm *comm_ptr, int color, int key, MPID_Comm **ne local_comm_ptr = comm_ptr; } /* Gather information on the local group of processes */ - mpi_errno = MPIR_Allgather_impl( MPI_IN_PLACE, 2, MPI_INT, table, 2, MPI_INT, local_comm_ptr, &errflag ); + mpi_errno = MPID_Allgather( MPI_IN_PLACE, 2, MPI_INT, table, 2, MPI_INT, local_comm_ptr, &errflag ); if (mpi_errno) MPIR_ERR_POP(mpi_errno); MPIR_ERR_CHKANDJUMP(errflag, mpi_errno, MPI_ERR_OTHER, "**coll_fail"); @@ -210,7 +210,7 @@ int MPIR_Comm_split_impl(MPID_Comm *comm_ptr, int color, int key, MPID_Comm **ne same color */ mypair.color = color; mypair.key = key; - mpi_errno = MPIR_Allgather_impl( &mypair, 2, MPI_INT, remotetable, 2, MPI_INT, + mpi_errno = MPID_Allgather( &mypair, 2, MPI_INT, remotetable, 2, MPI_INT, comm_ptr, &errflag ); if (mpi_errno) MPIR_ERR_POP(mpi_errno); MPIR_ERR_CHKANDJUMP(errflag, mpi_errno, MPI_ERR_OTHER, "**coll_fail"); @@ -259,13 +259,13 @@ int MPIR_Comm_split_impl(MPID_Comm *comm_ptr, int color, int key, MPID_Comm **ne &remote_context_id, 1, MPIU_CONTEXT_ID_T_DATATYPE, 0, 0, comm_ptr, MPI_STATUS_IGNORE, &errflag ); if (mpi_errno) { MPIR_ERR_POP( mpi_errno ); } - mpi_errno = MPIR_Bcast_impl( &remote_context_id, 1, MPIU_CONTEXT_ID_T_DATATYPE, 0, local_comm_ptr, &errflag ); + mpi_errno = MPID_Bcast( &remote_context_id, 1, MPIU_CONTEXT_ID_T_DATATYPE, 0, local_comm_ptr, &errflag ); if (mpi_errno) MPIR_ERR_POP(mpi_errno); MPIR_ERR_CHKANDJUMP(errflag, mpi_errno, MPI_ERR_OTHER, "**coll_fail"); } else { /* Broadcast to the other members of the local group */ - mpi_errno = MPIR_Bcast_impl( &remote_context_id, 1, MPIU_CONTEXT_ID_T_DATATYPE, 0, local_comm_ptr, &errflag ); + mpi_errno = MPID_Bcast( &remote_context_id, 1, MPIU_CONTEXT_ID_T_DATATYPE, 0, local_comm_ptr, &errflag ); if (mpi_errno) MPIR_ERR_POP(mpi_errno); MPIR_ERR_CHKANDJUMP(errflag, mpi_errno, MPI_ERR_OTHER, "**coll_fail"); } diff --git a/src/mpi/comm/contextid.c b/src/mpi/comm/contextid.c index e4ca2e7..e071b9e 100644 --- a/src/mpi/comm/contextid.c +++ b/src/mpi/comm/contextid.c @@ -493,7 +493,7 @@ int MPIR_Get_contextid_sparse_group(MPID_Comm * comm_ptr, MPID_Group * group_ptr &errflag); } else { - mpi_errno = MPIR_Allreduce_impl(MPI_IN_PLACE, st.local_mask, MPIR_MAX_CONTEXT_MASK + 1, + mpi_errno = MPID_Allreduce(MPI_IN_PLACE, st.local_mask, MPIR_MAX_CONTEXT_MASK + 1, MPI_INT, MPI_BAND, comm_ptr, &errflag); } if (mpi_errno) @@ -599,7 +599,7 @@ int MPIR_Get_contextid_sparse_group(MPID_Comm * comm_ptr, MPID_Group * group_ptr comm_ptr, group_ptr, coll_tag, &errflag); } else { - mpi_errno = MPIR_Allreduce_impl(MPI_IN_PLACE, &minfree, 1, MPI_INT, + mpi_errno = MPID_Allreduce(MPI_IN_PLACE, &minfree, 1, MPI_INT, MPI_MIN, comm_ptr, &errflag); } @@ -781,7 +781,7 @@ static int sched_cb_gcn_allocate_cid(MPID_Comm * comm, int tag, void *state) int minfree; context_mask_stats(&nfree, &ntotal); minfree = nfree; - MPIR_Allreduce_impl(MPI_IN_PLACE, &minfree, 1, MPI_INT, + MPID_Allreduce(MPI_IN_PLACE, &minfree, 1, MPI_INT, MPI_MIN, st->comm_ptr, &errflag); if (minfree > 0) { MPIR_ERR_SETANDJUMP3(mpi_errno, MPI_ERR_OTHER, @@ -1159,7 +1159,7 @@ int MPIR_Get_intercomm_contextid(MPID_Comm * comm_ptr, MPIU_Context_id_t * conte /* Make sure that all of the local processes now have this * id */ - mpi_errno = MPIR_Bcast_impl(&remote_context_id, 1, MPIU_CONTEXT_ID_T_DATATYPE, + mpi_errno = MPID_Bcast(&remote_context_id, 1, MPIU_CONTEXT_ID_T_DATATYPE, 0, comm_ptr->local_comm, &errflag); if (mpi_errno) MPIR_ERR_POP(mpi_errno); diff --git a/src/mpi/comm/intercomm_create.c b/src/mpi/comm/intercomm_create.c index 33867ad..08d2aab 100644 --- a/src/mpi/comm/intercomm_create.c +++ b/src/mpi/comm/intercomm_create.c @@ -259,10 +259,10 @@ int MPIR_Intercomm_create_impl(MPID_Comm *local_comm_ptr, int local_leader, comm_info[1] = final_context_id; comm_info[2] = is_low_group; MPL_DBG_MSG(MPIR_DBG_COMM,VERBOSE,"About to bcast on local_comm"); - mpi_errno = MPIR_Bcast_impl( comm_info, 3, MPI_INT, local_leader, local_comm_ptr, &errflag ); + mpi_errno = MPID_Bcast( comm_info, 3, MPI_INT, local_leader, local_comm_ptr, &errflag ); if (mpi_errno) MPIR_ERR_POP(mpi_errno); MPIR_ERR_CHKANDJUMP(errflag, mpi_errno, MPI_ERR_OTHER, "**coll_fail"); - mpi_errno = MPIR_Bcast_impl( remote_gpids, remote_size*sizeof(MPIR_Gpid), MPI_BYTE, local_leader, + mpi_errno = MPID_Bcast( remote_gpids, remote_size*sizeof(MPIR_Gpid), MPI_BYTE, local_leader, local_comm_ptr, &errflag ); if (mpi_errno) MPIR_ERR_POP(mpi_errno); MPIR_ERR_CHKANDJUMP(errflag, mpi_errno, MPI_ERR_OTHER, "**coll_fail"); @@ -273,13 +273,13 @@ int MPIR_Intercomm_create_impl(MPID_Comm *local_comm_ptr, int local_leader, { /* we're the other processes */ MPL_DBG_MSG(MPIR_DBG_COMM,VERBOSE,"About to receive bcast on local_comm"); - mpi_errno = MPIR_Bcast_impl( comm_info, 3, MPI_INT, local_leader, local_comm_ptr, &errflag ); + mpi_errno = MPID_Bcast( comm_info, 3, MPI_INT, local_leader, local_comm_ptr, &errflag ); if (mpi_errno) MPIR_ERR_POP(mpi_errno); MPIR_ERR_CHKANDJUMP(errflag, mpi_errno, MPI_ERR_OTHER, "**coll_fail"); remote_size = comm_info[0]; MPIU_CHKLMEM_MALLOC(remote_gpids,MPIR_Gpid*,remote_size*sizeof(MPIR_Gpid), mpi_errno,"remote_gpids"); MPIU_CHKLMEM_MALLOC(remote_lpids,int*,remote_size*sizeof(int), mpi_errno,"remote_lpids"); - mpi_errno = MPIR_Bcast_impl( remote_gpids, remote_size*sizeof(MPIR_Gpid), MPI_BYTE, local_leader, + mpi_errno = MPID_Bcast( remote_gpids, remote_size*sizeof(MPIR_Gpid), MPI_BYTE, local_leader, local_comm_ptr, &errflag ); if (mpi_errno) MPIR_ERR_POP(mpi_errno); MPIR_ERR_CHKANDJUMP(errflag, mpi_errno, MPI_ERR_OTHER, "**coll_fail"); diff --git a/src/mpi/romio/mpi-io/get_view.c b/src/mpi/romio/mpi-io/get_view.c index 6919849..946905b 100644 --- a/src/mpi/romio/mpi-io/get_view.c +++ b/src/mpi/romio/mpi-io/get_view.c @@ -75,7 +75,7 @@ int MPI_File_get_view(MPI_File fh, MPI_Offset *disp, MPI_Datatype *etype, else { /* FIXME: It is wrong to use MPI_Type_contiguous; the user could choose to re-implement MPI_Type_contiguous in an unexpected way. Either use - MPIR_Barrier_impl as in MPICH or PMPI_Type_contiguous */ + MPID_Barrier as in MPICH or PMPI_Type_contiguous */ MPI_Type_contiguous(1, adio_fh->etype, &copy_etype); /* FIXME: Ditto for MPI_Type_commit - use NMPI or PMPI */ diff --git a/src/mpi/topo/dist_gr_create.c b/src/mpi/topo/dist_gr_create.c index 1b0eba0..45053b5 100644 --- a/src/mpi/topo/dist_gr_create.c +++ b/src/mpi/topo/dist_gr_create.c @@ -261,7 +261,7 @@ int MPI_Dist_graph_create(MPI_Comm comm_old, int n, const int sources[], } /* compute the number of peers I will recv from */ - mpi_errno = MPIR_Reduce_scatter_block_impl(rs, in_out_peers, 2, MPI_INT, MPI_SUM, comm_ptr, &errflag); + mpi_errno = MPID_Reduce_scatter_block(rs, in_out_peers, 2, MPI_INT, MPI_SUM, comm_ptr, &errflag); if (mpi_errno) MPIR_ERR_POP(mpi_errno); MPIR_ERR_CHKANDJUMP(errflag, mpi_errno, MPI_ERR_OTHER, "**coll_fail"); diff --git a/src/mpi/topo/inhb_allgather.c b/src/mpi/topo/inhb_allgather.c index fa4e83d..91b0d3d 100644 --- a/src/mpi/topo/inhb_allgather.c +++ b/src/mpi/topo/inhb_allgather.c @@ -201,7 +201,7 @@ int MPI_Ineighbor_allgather(const void *sendbuf, int sendcount, MPI_Datatype sen /* ... body of routine ... */ - mpi_errno = MPIR_Ineighbor_allgather_impl(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm_ptr, request); + mpi_errno = MPID_Ineighbor_allgather(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm_ptr, request); if (mpi_errno) MPIR_ERR_POP(mpi_errno); /* ... end of body of routine ... */ diff --git a/src/mpi/topo/inhb_allgatherv.c b/src/mpi/topo/inhb_allgatherv.c index ba73a37..9c58695 100644 --- a/src/mpi/topo/inhb_allgatherv.c +++ b/src/mpi/topo/inhb_allgatherv.c @@ -207,7 +207,7 @@ int MPI_Ineighbor_allgatherv(const void *sendbuf, int sendcount, MPI_Datatype se /* ... body of routine ... */ - mpi_errno = MPIR_Ineighbor_allgatherv_impl(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, comm_ptr, request); + mpi_errno = MPID_Ineighbor_allgatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, comm_ptr, request); if (mpi_errno) MPIR_ERR_POP(mpi_errno); /* ... end of body of routine ... */ diff --git a/src/mpi/topo/inhb_alltoall.c b/src/mpi/topo/inhb_alltoall.c index 3a0590e..109ff7b 100644 --- a/src/mpi/topo/inhb_alltoall.c +++ b/src/mpi/topo/inhb_alltoall.c @@ -207,7 +207,7 @@ int MPI_Ineighbor_alltoall(const void *sendbuf, int sendcount, MPI_Datatype send /* ... body of routine ... */ - mpi_errno = MPIR_Ineighbor_alltoall_impl(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm_ptr, request); + mpi_errno = MPID_Ineighbor_alltoall(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm_ptr, request); if (mpi_errno) MPIR_ERR_POP(mpi_errno); /* ... end of body of routine ... */ diff --git a/src/mpi/topo/inhb_alltoallv.c b/src/mpi/topo/inhb_alltoallv.c index 8e0f91a..93370c0 100644 --- a/src/mpi/topo/inhb_alltoallv.c +++ b/src/mpi/topo/inhb_alltoallv.c @@ -211,7 +211,7 @@ int MPI_Ineighbor_alltoallv(const void *sendbuf, const int sendcounts[], const i /* ... body of routine ... */ - mpi_errno = MPIR_Ineighbor_alltoallv_impl(sendbuf, sendcounts, sdispls, sendtype, recvbuf, recvcounts, rdispls, recvtype, comm_ptr, request); + mpi_errno = MPID_Ineighbor_alltoallv(sendbuf, sendcounts, sdispls, sendtype, recvbuf, recvcounts, rdispls, recvtype, comm_ptr, request); if (mpi_errno) MPIR_ERR_POP(mpi_errno); /* ... end of body of routine ... */ diff --git a/src/mpi/topo/inhb_alltoallw.c b/src/mpi/topo/inhb_alltoallw.c index 8ad41c5..8b3085b 100644 --- a/src/mpi/topo/inhb_alltoallw.c +++ b/src/mpi/topo/inhb_alltoallw.c @@ -184,7 +184,7 @@ int MPI_Ineighbor_alltoallw(const void *sendbuf, const int sendcounts[], const M /* ... body of routine ... */ - mpi_errno = MPIR_Ineighbor_alltoallw_impl(sendbuf, sendcounts, sdispls, sendtypes, recvbuf, recvcounts, rdispls, recvtypes, comm_ptr, request); + mpi_errno = MPID_Ineighbor_alltoallw(sendbuf, sendcounts, sdispls, sendtypes, recvbuf, recvcounts, rdispls, recvtypes, comm_ptr, request); if (mpi_errno) MPIR_ERR_POP(mpi_errno); /* ... end of body of routine ... */ diff --git a/src/mpi/topo/nhb_allgather.c b/src/mpi/topo/nhb_allgather.c index d5d76e8..2af50a2 100644 --- a/src/mpi/topo/nhb_allgather.c +++ b/src/mpi/topo/nhb_allgather.c @@ -38,7 +38,7 @@ int MPIR_Neighbor_allgather_default(const void *sendbuf, int sendcount, MPI_Data MPI_Request req; /* just call the nonblocking version and wait on it */ - mpi_errno = MPIR_Ineighbor_allgather_impl(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm_ptr, &req); + mpi_errno = MPID_Ineighbor_allgather(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm_ptr, &req); if (mpi_errno) MPIR_ERR_POP(mpi_errno); mpi_errno = MPIR_Wait_impl(&req, MPI_STATUS_IGNORE); if (mpi_errno) MPIR_ERR_POP(mpi_errno); @@ -156,7 +156,7 @@ int MPI_Neighbor_allgather(const void *sendbuf, int sendcount, MPI_Datatype send /* ... body of routine ... */ - mpi_errno = MPIR_Neighbor_allgather_impl(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm_ptr); + mpi_errno = MPID_Neighbor_allgather(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm_ptr); if (mpi_errno) MPIR_ERR_POP(mpi_errno); /* ... end of body of routine ... */ diff --git a/src/mpi/topo/nhb_allgatherv.c b/src/mpi/topo/nhb_allgatherv.c index 5b6d803..9288623 100644 --- a/src/mpi/topo/nhb_allgatherv.c +++ b/src/mpi/topo/nhb_allgatherv.c @@ -40,7 +40,7 @@ int MPIR_Neighbor_allgatherv_default(const void *sendbuf, int sendcount, MPI_Dat MPI_Request req; /* just call the nonblocking version and wait on it */ - mpi_errno = MPIR_Ineighbor_allgatherv_impl(sendbuf, sendcount, sendtype, + mpi_errno = MPID_Ineighbor_allgatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, comm_ptr, &req); if (mpi_errno) MPIR_ERR_POP(mpi_errno); @@ -157,7 +157,7 @@ int MPI_Neighbor_allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sen /* ... body of routine ... */ - mpi_errno = MPIR_Neighbor_allgatherv_impl(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, comm_ptr); + mpi_errno = MPID_Neighbor_allgatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, comm_ptr); if (mpi_errno) MPIR_ERR_POP(mpi_errno); /* ... end of body of routine ... */ diff --git a/src/mpi/topo/nhb_alltoall.c b/src/mpi/topo/nhb_alltoall.c index 38507da..0784722 100644 --- a/src/mpi/topo/nhb_alltoall.c +++ b/src/mpi/topo/nhb_alltoall.c @@ -38,7 +38,7 @@ int MPIR_Neighbor_alltoall_default(const void *sendbuf, int sendcount, MPI_Datat MPI_Request req; /* just call the nonblocking version and wait on it */ - mpi_errno = MPIR_Ineighbor_alltoall_impl(sendbuf, sendcount, sendtype, + mpi_errno = MPID_Ineighbor_alltoall(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm_ptr, &req); if (mpi_errno) MPIR_ERR_POP(mpi_errno); @@ -160,7 +160,7 @@ int MPI_Neighbor_alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendt /* ... body of routine ... */ - mpi_errno = MPIR_Neighbor_alltoall_impl(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm_ptr); + mpi_errno = MPID_Neighbor_alltoall(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm_ptr); if (mpi_errno) MPIR_ERR_POP(mpi_errno); /* ... end of body of routine ... */ diff --git a/src/mpi/topo/nhb_alltoallv.c b/src/mpi/topo/nhb_alltoallv.c index 797abe8..5a998ba 100644 --- a/src/mpi/topo/nhb_alltoallv.c +++ b/src/mpi/topo/nhb_alltoallv.c @@ -39,7 +39,7 @@ int MPIR_Neighbor_alltoallv_default(const void *sendbuf, const int sendcounts[], MPI_Request req; /* just call the nonblocking version and wait on it */ - mpi_errno = MPIR_Ineighbor_alltoallv_impl(sendbuf, sendcounts, sdispls, sendtype, recvbuf, recvcounts, rdispls, recvtype, comm_ptr, &req); + mpi_errno = MPID_Ineighbor_alltoallv(sendbuf, sendcounts, sdispls, sendtype, recvbuf, recvcounts, rdispls, recvtype, comm_ptr, &req); if (mpi_errno) MPIR_ERR_POP(mpi_errno); mpi_errno = MPIR_Wait_impl(&req, MPI_STATUS_IGNORE); if (mpi_errno) MPIR_ERR_POP(mpi_errno); @@ -155,7 +155,7 @@ int MPI_Neighbor_alltoallv(const void *sendbuf, const int sendcounts[], const in /* ... body of routine ... */ - mpi_errno = MPIR_Neighbor_alltoallv_impl(sendbuf, sendcounts, sdispls, sendtype, recvbuf, recvcounts, rdispls, recvtype, comm_ptr); + mpi_errno = MPID_Neighbor_alltoallv(sendbuf, sendcounts, sdispls, sendtype, recvbuf, recvcounts, rdispls, recvtype, comm_ptr); if (mpi_errno) MPIR_ERR_POP(mpi_errno); /* ... end of body of routine ... */ diff --git a/src/mpi/topo/nhb_alltoallw.c b/src/mpi/topo/nhb_alltoallw.c index 53a8987..282f637 100644 --- a/src/mpi/topo/nhb_alltoallw.c +++ b/src/mpi/topo/nhb_alltoallw.c @@ -38,7 +38,7 @@ int MPIR_Neighbor_alltoallw_default(const void *sendbuf, const int sendcounts[], MPI_Request req; /* just call the nonblocking version and wait on it */ - mpi_errno = MPIR_Ineighbor_alltoallw_impl(sendbuf, sendcounts, sdispls, sendtypes, recvbuf, recvcounts, rdispls, recvtypes, comm_ptr, &req); + mpi_errno = MPID_Ineighbor_alltoallw(sendbuf, sendcounts, sdispls, sendtypes, recvbuf, recvcounts, rdispls, recvtypes, comm_ptr, &req); if (mpi_errno) MPIR_ERR_POP(mpi_errno); mpi_errno = MPIR_Wait_impl(&req, MPI_STATUS_IGNORE); if (mpi_errno) MPIR_ERR_POP(mpi_errno); @@ -140,7 +140,7 @@ int MPI_Neighbor_alltoallw(const void *sendbuf, const int sendcounts[], const MP /* ... body of routine ... */ - mpi_errno = MPIR_Neighbor_alltoallw_impl(sendbuf, sendcounts, sdispls, sendtypes, recvbuf, recvcounts, rdispls, recvtypes, comm_ptr); + mpi_errno = MPID_Neighbor_alltoallw(sendbuf, sendcounts, sdispls, sendtypes, recvbuf, recvcounts, rdispls, recvtypes, comm_ptr); if (mpi_errno) MPIR_ERR_POP(mpi_errno); /* ... end of body of routine ... */ diff --git a/src/mpid/ch3/Makefile.mk b/src/mpid/ch3/Makefile.mk index 5e16b40..b5503fb 100644 --- a/src/mpid/ch3/Makefile.mk +++ b/src/mpid/ch3/Makefile.mk @@ -22,7 +22,8 @@ noinst_HEADERS += \ src/mpid/ch3/include/mpidpre.h \ src/mpid/ch3/include/mpid_thread.h \ src/mpid/ch3/include/mpidrma.h \ - src/mpid/ch3/include/mpid_sched.h + src/mpid/ch3/include/mpid_sched.h \ + src/mpid/ch3/include/mpid_coll.h include $(top_srcdir)/src/mpid/ch3/src/Makefile.mk include $(top_srcdir)/src/mpid/ch3/util/Makefile.mk diff --git a/src/mpid/ch3/include/mpid_coll.h b/src/mpid/ch3/include/mpid_coll.h new file mode 100644 index 0000000..f9a0498 --- /dev/null +++ b/src/mpid/ch3/include/mpid_coll.h @@ -0,0 +1,720 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + * (C) 2001 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ + +#include "mpidimpl.h" + +#undef FUNCNAME +#define FUNCNAME MPID_Barrier +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline int MPID_Barrier(MPID_Comm * comm, MPIR_Errflag_t * errflag) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Barrier_impl(comm, errflag); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Bcast +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline int MPID_Bcast(void *buffer, int count, MPI_Datatype datatype, int root, + MPID_Comm * comm, MPIR_Errflag_t * errflag) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Bcast_impl(buffer, count, datatype, root, comm, errflag); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Allreduce +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline int MPID_Allreduce(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPID_Comm * comm, + MPIR_Errflag_t * errflag) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Allreduce_impl(sendbuf, recvbuf, count, datatype, op, comm, errflag); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Allgather +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline int MPID_Allgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + MPID_Comm * comm, MPIR_Errflag_t * errflag) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Allgather_impl(sendbuf, sendcount, sendtype, recvbuf, + recvcount, recvtype, comm, errflag); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Allgatherv +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline int MPID_Allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, const int *displs, + MPI_Datatype recvtype, MPID_Comm * comm, MPIR_Errflag_t * errflag) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Allgatherv_impl(sendbuf, sendcount, sendtype, recvbuf, + recvcounts, displs, recvtype, comm, errflag); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Scatter +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline int MPID_Scatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + int root, MPID_Comm * comm, MPIR_Errflag_t * errflag) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Scatter_impl(sendbuf, sendcount, sendtype, recvbuf, recvcount, + recvtype, root, comm, errflag); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Scatterv +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline int MPID_Scatterv(const void *sendbuf, const int *sendcounts, const int *displs, + MPI_Datatype sendtype, void *recvbuf, int recvcount, + MPI_Datatype recvtype, int root, MPID_Comm * comm, + MPIR_Errflag_t * errflag) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Scatterv_impl(sendbuf, sendcounts, displs, sendtype, recvbuf, + recvcount, recvtype, root, comm, errflag); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Gather +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline int MPID_Gather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + int root, MPID_Comm * comm, MPIR_Errflag_t * errflag) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Gather_impl(sendbuf, sendcount, sendtype, recvbuf, recvcount, + recvtype, root, comm, errflag); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Gatherv +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline int MPID_Gatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, const int *displs, + MPI_Datatype recvtype, int root, MPID_Comm * comm, + MPIR_Errflag_t * errflag) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Gatherv_impl(sendbuf, sendcount, sendtype, recvbuf, recvcounts, + displs, recvtype, root, comm, errflag); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Alltoall +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline int MPID_Alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + MPID_Comm * comm, MPIR_Errflag_t * errflag) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Alltoall_impl(sendbuf, sendcount, sendtype, recvbuf, recvcount, + recvtype, comm, errflag); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Alltoallv +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline int MPID_Alltoallv(const void *sendbuf, const int *sendcounts, const int *sdispls, + MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, + const int *rdispls, MPI_Datatype recvtype, MPID_Comm * comm, + MPIR_Errflag_t * errflag) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Alltoallv_impl(sendbuf, sendcounts, sdispls, sendtype, recvbuf, + recvcounts, rdispls, recvtype, comm, errflag); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Alltoallw +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline int MPID_Alltoallw(const void *sendbuf, const int sendcounts[], const int sdispls[], + const MPI_Datatype sendtypes[], void *recvbuf, + const int recvcounts[], const int rdispls[], + const MPI_Datatype recvtypes[], MPID_Comm * comm_ptr, + MPIR_Errflag_t * errflag) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Alltoallw_impl(sendbuf, sendcounts, sdispls, + sendtypes, recvbuf, recvcounts, + rdispls, recvtypes, comm_ptr, errflag); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Reduce +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline int MPID_Reduce(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, int root, + MPID_Comm * comm, MPIR_Errflag_t * errflag) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Reduce_impl(sendbuf, recvbuf, count, datatype, op, root, comm, errflag); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Reduce_scatter +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline int MPID_Reduce_scatter(const void *sendbuf, void *recvbuf, const int recvcounts[], + MPI_Datatype datatype, MPI_Op op, MPID_Comm * comm_ptr, + MPIR_Errflag_t * errflag) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Reduce_scatter_impl(sendbuf, recvbuf, recvcounts, + datatype, op, comm_ptr, errflag); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Reduce_scatter_block +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline int MPID_Reduce_scatter_block(const void *sendbuf, void *recvbuf, + int recvcount, MPI_Datatype datatype, + MPI_Op op, MPID_Comm * comm_ptr, + MPIR_Errflag_t * errflag) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Reduce_scatter_block_impl(sendbuf, recvbuf, recvcount, + datatype, op, comm_ptr, errflag); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Scan +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline int MPID_Scan(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPID_Comm * comm, + MPIR_Errflag_t * errflag) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Scan_impl(sendbuf, recvbuf, count, datatype, op, comm, errflag); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Exscan +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline int MPID_Exscan(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPID_Comm * comm, + MPIR_Errflag_t * errflag) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Exscan_impl(sendbuf, recvbuf, count, datatype, op, comm, errflag); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Neighbor_allgather +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline int MPID_Neighbor_allgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + MPID_Comm * comm) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Neighbor_allgather_impl(sendbuf, sendcount, sendtype, recvbuf, + recvcount, recvtype, comm); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Neighbor_allgatherv +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline int MPID_Neighbor_allgatherv(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int recvcounts[], const int displs[], + MPI_Datatype recvtype, MPID_Comm * comm) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Neighbor_allgatherv_impl(sendbuf, sendcount, sendtype, recvbuf, + recvcounts, displs, recvtype, comm); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Neighbor_alltoallv +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline int MPID_Neighbor_alltoallv(const void *sendbuf, const int sendcounts[], + const int sdispls[], MPI_Datatype sendtype, + void *recvbuf, const int recvcounts[], + const int rdispls[], MPI_Datatype recvtype, + MPID_Comm * comm) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Neighbor_alltoallv_impl(sendbuf, sendcounts, sdispls, sendtype, + recvbuf, recvcounts, rdispls, recvtype, comm); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Neighbor_alltoallw +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline int MPID_Neighbor_alltoallw(const void *sendbuf, const int sendcounts[], + const MPI_Aint sdispls[], const MPI_Datatype sendtypes[], + void *recvbuf, const int recvcounts[], + const MPI_Aint rdispls[], const MPI_Datatype recvtypes[], + MPID_Comm * comm) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Neighbor_alltoallw_impl(sendbuf, sendcounts, sdispls, + sendtypes, recvbuf, recvcounts, rdispls, recvtypes, + comm); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Neighbor_alltoall +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline int MPID_Neighbor_alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + MPID_Comm * comm) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Neighbor_alltoall_impl(sendbuf, sendcount, sendtype, recvbuf, + recvcount, recvtype, comm); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Ineighbor_allgather +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline int MPID_Ineighbor_allgather(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, int recvcount, + MPI_Datatype recvtype, MPID_Comm * comm, + MPI_Request * request) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Ineighbor_allgather_impl(sendbuf, sendcount, sendtype, recvbuf, + recvcount, recvtype, comm, request); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Ineighbor_allgatherv +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline int MPID_Ineighbor_allgatherv(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int recvcounts[], const int displs[], + MPI_Datatype recvtype, MPID_Comm * comm, + MPI_Request * request) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Ineighbor_allgatherv_impl(sendbuf, sendcount, sendtype, + recvbuf, recvcounts, displs, recvtype, comm, + request); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Ineighbor_alltoall +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline int MPID_Ineighbor_alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + MPID_Comm * comm, MPI_Request * request) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Ineighbor_alltoall_impl(sendbuf, sendcount, sendtype, recvbuf, + recvcount, recvtype, comm, request); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Ineighbor_alltoallv +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline int MPID_Ineighbor_alltoallv(const void *sendbuf, const int sendcounts[], + const int sdispls[], MPI_Datatype sendtype, + void *recvbuf, const int recvcounts[], + const int rdispls[], MPI_Datatype recvtype, + MPID_Comm * comm, MPI_Request * request) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Ineighbor_alltoallv_impl(sendbuf, sendcounts, sdispls, + sendtype, recvbuf, recvcounts, rdispls, recvtype, + comm, request); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Ineighbor_alltoallw +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline int MPID_Ineighbor_alltoallw(const void *sendbuf, const int sendcounts[], + const MPI_Aint sdispls[], const MPI_Datatype sendtypes[], + void *recvbuf, const int recvcounts[], + const MPI_Aint rdispls[], const MPI_Datatype recvtypes[], + MPID_Comm * comm, MPI_Request * request) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Ineighbor_alltoallw_impl(sendbuf, sendcounts, sdispls, + sendtypes, recvbuf, recvcounts, rdispls, recvtypes, + comm, request); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Ibarrier +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline int MPID_Ibarrier(MPID_Comm * comm, MPI_Request * request) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Ibarrier_impl(comm, request); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Ibcast +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline int MPID_Ibcast(void *buffer, int count, MPI_Datatype datatype, int root, + MPID_Comm * comm, MPI_Request * request) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Ibcast_impl(buffer, count, datatype, root, comm, request); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Iallgather +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline int MPID_Iallgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + MPID_Comm * comm, MPI_Request * request) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Iallgather_impl(sendbuf, sendcount, sendtype, recvbuf, + recvcount, recvtype, comm, request); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Iallgatherv +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline int MPID_Iallgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, const int *displs, + MPI_Datatype recvtype, MPID_Comm * comm, MPI_Request * request) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Iallgatherv_impl(sendbuf, sendcount, sendtype, recvbuf, + recvcounts, displs, recvtype, comm, request); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Iallreduce +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline int MPID_Iallreduce(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPID_Comm * comm, + MPI_Request * request) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Iallreduce_impl(sendbuf, recvbuf, count, datatype, op, comm, request); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Ialltoall +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline int MPID_Ialltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + MPID_Comm * comm, MPI_Request * request) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Ialltoall_impl(sendbuf, sendcount, sendtype, recvbuf, + recvcount, recvtype, comm, request); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Ialltoallv +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline int MPID_Ialltoallv(const void *sendbuf, const int sendcounts[], + const int sdispls[], MPI_Datatype sendtype, + void *recvbuf, const int recvcounts[], + const int rdispls[], MPI_Datatype recvtype, + MPID_Comm * comm, MPI_Request * request) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Ialltoallv_impl(sendbuf, sendcounts, sdispls, sendtype, + recvbuf, recvcounts, rdispls, recvtype, comm, request); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Ialltoallw +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline int MPID_Ialltoallw(const void *sendbuf, const int sendcounts[], + const int sdispls[], const MPI_Datatype sendtypes[], + void *recvbuf, const int recvcounts[], + const int rdispls[], const MPI_Datatype recvtypes[], + MPID_Comm * comm, MPI_Request * request) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Ialltoallw_impl(sendbuf, sendcounts, sdispls, sendtypes, + recvbuf, recvcounts, rdispls, recvtypes, comm, request); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Iexscan +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline int MPID_Iexscan(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPID_Comm * comm, + MPI_Request * request) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Iexscan_impl(sendbuf, recvbuf, count, datatype, op, comm, request); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Igather +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline int MPID_Igather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + int root, MPID_Comm * comm, MPI_Request * request) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Igather_impl(sendbuf, sendcount, sendtype, recvbuf, recvcount, + recvtype, root, comm, request); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Igatherv +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline int MPID_Igatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, const int *displs, + MPI_Datatype recvtype, int root, MPID_Comm * comm, + MPI_Request * request) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Igatherv_impl(sendbuf, sendcount, sendtype, recvbuf, recvcounts, + displs, recvtype, root, comm, request); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Ireduce_scatter_block +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline int MPID_Ireduce_scatter_block(const void *sendbuf, void *recvbuf, int recvcount, + MPI_Datatype datatype, MPI_Op op, MPID_Comm * comm, + MPI_Request * request) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Ireduce_scatter_block_impl(sendbuf, recvbuf, recvcount, + datatype, op, comm, request); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Ireduce_scatter +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline int MPID_Ireduce_scatter(const void *sendbuf, void *recvbuf, const int recvcounts[], + MPI_Datatype datatype, MPI_Op op, MPID_Comm * comm, + MPI_Request * request) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Ireduce_scatter_impl(sendbuf, recvbuf, recvcounts, datatype, + op, comm, request); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Ireduce +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline int MPID_Ireduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, + MPI_Op op, int root, MPID_Comm * comm, MPI_Request * request) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Ireduce_impl(sendbuf, recvbuf, count, datatype, op, root, comm, request); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Iscan +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline int MPID_Iscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, + MPI_Op op, MPID_Comm * comm, MPI_Request * request) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Iscan_impl(sendbuf, recvbuf, count, datatype, op, comm, request); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Iscatter +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline int MPID_Iscatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + int root, MPID_Comm * comm, MPI_Request * request) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Iscatter_impl(sendbuf, sendcount, sendtype, recvbuf, recvcount, + recvtype, root, comm, request); + + return mpi_errno; +} + +#undef FUNCNAME +#define FUNCNAME MPID_Iscatterv +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline int MPID_Iscatterv(const void *sendbuf, const int *sendcounts, + const int *displs, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + int root, MPID_Comm * comm, MPI_Request * request) +{ + int mpi_errno = MPI_SUCCESS; + + mpi_errno = MPIR_Iscatterv_impl(sendbuf, sendcounts, displs, sendtype, recvbuf, + recvcount, recvtype, root, comm, request); + + return mpi_errno; +} diff --git a/src/mpid/ch3/include/mpidpost.h b/src/mpid/ch3/include/mpidpost.h index 3159e22..dde3f1b 100644 --- a/src/mpid/ch3/include/mpidpost.h +++ b/src/mpid/ch3/include/mpidpost.h @@ -7,6 +7,8 @@ #if !defined(MPICH_MPIDPOST_H_INCLUDED) #define MPICH_MPIDPOST_H_INCLUDED +#include "mpid_coll.h" + /* FIXME: mpidpost.h is included by mpiimpl.h . However, mpiimpl.h should refer only to the ADI3 prototypes and should never include prototypes specific to any particular device. Factor the include files to maintain http://git.mpich.org/mpich.git/commitdiff/cdd26cf1edaafdcb3a7fd401427b18c9b… commit cdd26cf1edaafdcb3a7fd401427b18c9bf274193 Author: Pavan Balaji <balaji(a)anl.gov> Date: Tue Apr 19 17:22:00 2016 -0500 Move mpidpost.h to the end of mpiimpl.h The post header should be able to use everything in the MPIR-level definitions. So it makes most sense to put it at the end of the mpiimpl.h header. Signed-off-by: Wesley Bland <wesley.bland(a)intel.com> diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index 02147ba..11bc349 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -3754,10 +3754,6 @@ int MPID_Comm_get_lpid(MPID_Comm *comm_ptr, int idx, int * lpid_ptr, MPIU_BOOL i * collectives */ #include "mpir_nbc.h" -/* Include definitions from the device which require items defined by this - file (mpiimpl.h). */ -#include "mpidpost.h" - /* tunable cvar values */ #include "mpich_cvars.h" @@ -4451,6 +4447,10 @@ extern const char MPIR_Version_CXX[]; extern const char MPIR_Version_F77[]; extern const char MPIR_Version_FC[]; +/* Include definitions from the device which require items defined by this + file (mpiimpl.h). */ +#include "mpidpost.h" + /* avoid conflicts in source files with old-style "char FCNAME[]" vars */ #undef FUNCNAME #undef FCNAME ----------------------------------------------------------------------- Summary of changes: src/include/mpiimpl.h | 53 +--- src/mpi/coll/allgather.c | 8 +- src/mpi/coll/allgatherv.c | 10 +- src/mpi/coll/allreduce.c | 14 +- src/mpi/coll/alltoall.c | 2 +- src/mpi/coll/alltoallv.c | 2 +- src/mpi/coll/alltoallw.c | 2 +- src/mpi/coll/barrier.c | 8 +- src/mpi/coll/bcast.c | 2 +- src/mpi/coll/exscan.c | 2 +- src/mpi/coll/gather.c | 4 +- src/mpi/coll/gatherv.c | 2 +- src/mpi/coll/iallgather.c | 14 +- src/mpi/coll/iallgatherv.c | 14 +- src/mpi/coll/iallreduce.c | 14 +- src/mpi/coll/ialltoall.c | 14 +- src/mpi/coll/ialltoallv.c | 14 +- src/mpi/coll/ialltoallw.c | 14 +- src/mpi/coll/ibarrier.c | 14 +- src/mpi/coll/ibcast.c | 14 +- src/mpi/coll/iexscan.c | 14 +- src/mpi/coll/igather.c | 16 +- src/mpi/coll/igatherv.c | 16 +- src/mpi/coll/ired_scat.c | 16 +- src/mpi/coll/ired_scat_block.c | 16 +- src/mpi/coll/ireduce.c | 16 +- src/mpi/coll/iscan.c | 16 +- src/mpi/coll/iscatter.c | 16 +- src/mpi/coll/iscatterv.c | 16 +- src/mpi/coll/red_scat.c | 4 +- src/mpi/coll/red_scat_block.c | 4 +- src/mpi/coll/reduce.c | 12 +- src/mpi/coll/scan.c | 10 +- src/mpi/coll/scatter.c | 4 +- src/mpi/coll/scatterv.c | 2 +- src/mpi/comm/comm_create.c | 8 +- src/mpi/comm/comm_split.c | 8 +- src/mpi/comm/contextid.c | 8 +- src/mpi/comm/intercomm_create.c | 8 +- src/mpi/romio/mpi-io/get_view.c | 2 +- src/mpi/topo/dist_gr_create.c | 2 +- src/mpi/topo/inhb_allgather.c | 2 +- src/mpi/topo/inhb_allgatherv.c | 2 +- src/mpi/topo/inhb_alltoall.c | 2 +- src/mpi/topo/inhb_alltoallv.c | 2 +- src/mpi/topo/inhb_alltoallw.c | 2 +- src/mpi/topo/nhb_allgather.c | 4 +- src/mpi/topo/nhb_allgatherv.c | 4 +- src/mpi/topo/nhb_alltoall.c | 4 +- src/mpi/topo/nhb_alltoallv.c | 4 +- src/mpi/topo/nhb_alltoallw.c | 4 +- src/mpid/ch3/Makefile.mk | 3 +- src/mpid/ch3/include/mpid_coll.h | 720 ++++++++++++++++++++++++++++++++++++++ src/mpid/ch3/include/mpidpost.h | 2 + 54 files changed, 824 insertions(+), 366 deletions(-) create mode 100644 src/mpid/ch3/include/mpid_coll.h hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2-248-g8d6c5ba
by noreply＠mpich.org 19 Apr '16

19 Apr '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 8d6c5bafc27599b4ca14f9064cad245ee46e91e4 (commit) from 1aec69b7095116d9ffb453a9b4c2324ed1a7a1b7 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/8d6c5bafc27599b4ca14f9064cad245ee… commit 8d6c5bafc27599b4ca14f9064cad245ee46e91e4 Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Fri Apr 15 09:05:39 2016 -0500 ROMIO/adioi.h: remove swap macro Use explicit variable swap instead in the only instance (ad_gpfs). Signed-off-by: Rob Latham <robl(a)mcs.anl.gov> diff --git a/src/mpi/romio/adio/ad_gpfs/ad_gpfs_wrcoll.c b/src/mpi/romio/adio/ad_gpfs/ad_gpfs_wrcoll.c index f39e4dc..036aad2 100644 --- a/src/mpi/romio/adio/ad_gpfs/ad_gpfs_wrcoll.c +++ b/src/mpi/romio/adio/ad_gpfs/ad_gpfs_wrcoll.c @@ -913,7 +913,8 @@ static void ADIOI_Exch_and_write(ADIO_File fd, const void *buf, MPI_Datatype /* do a little pointer shuffling: background I/O works from one * buffer while two-phase machinery fills up another */ io_thread_args.buf = write_buf; - ADIOI_SWAP(write_buf, write_buf2, char*); + write_buf = write_buf2; + write_buf2 = io_thread_args.buf; io_thread_args.io_kind = ADIOI_WRITE; io_thread_args.size = size; io_thread_args.offset = off; diff --git a/src/mpi/romio/adio/include/adioi.h b/src/mpi/romio/adio/include/adioi.h index 0b9d8b3..9edffb5 100644 --- a/src/mpi/romio/adio/include/adioi.h +++ b/src/mpi/romio/adio/include/adioi.h @@ -215,10 +215,6 @@ struct ADIOI_Fns_struct { #define ADIOI_READ 26 #define ADIOI_WRITE 27 -/* thanks stackoverflow: - * http://stackoverflow.com/questions/3982348/implement-generic-swap-macro-in-c */ -#define ADIOI_SWAP(x, y, T) do { T temp##x##y = x; x = y; y = temp##x##y; } while (0); - #define ADIOI_PREALLOC_BUFSZ 16777216 /* buffer size used to preallocate disk space */ ----------------------------------------------------------------------- Summary of changes: src/mpi/romio/adio/ad_gpfs/ad_gpfs_wrcoll.c | 3 ++- src/mpi/romio/adio/include/adioi.h | 4 ---- 2 files changed, 2 insertions(+), 5 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2-247-g1aec69b
by noreply＠mpich.org 12 Apr '16

12 Apr '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 1aec69b7095116d9ffb453a9b4c2324ed1a7a1b7 (commit) from bdd471a1dfbb0c3aa883e4cad011e2125c602706 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/1aec69b7095116d9ffb453a9b4c2324ed… commit 1aec69b7095116d9ffb453a9b4c2324ed1a7a1b7 Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Mon Apr 11 13:38:13 2016 -0500 mpid/common/sched: use MPID_Datatype abstraction In order to maintain abstractions, MPID_Datatype functionality is exposed by the device layer. This commit fixes a breakage where the sched code directly called into another MPIDU component, instead of using what the device exposes. Signed-off-by: Lena Oden <loden(a)anl.gov> diff --git a/src/mpid/common/sched/mpidu_sched.c b/src/mpid/common/sched/mpidu_sched.c index f95d1c7..5af6535 100644 --- a/src/mpid/common/sched/mpidu_sched.c +++ b/src/mpid/common/sched/mpidu_sched.c @@ -26,9 +26,9 @@ if ((datatype_) != MPI_DATATYPE_NULL && \ HANDLE_GET_KIND((datatype_)) != HANDLE_KIND_BUILTIN) \ { \ - MPIDU_Datatype *dtp_ = NULL; \ - MPIDU_Datatype_get_ptr((datatype_), dtp_); \ - MPIDU_Datatype_add_ref(dtp_); \ + MPID_Datatype *dtp_ = NULL; \ + MPID_Datatype_get_ptr((datatype_), dtp_); \ + MPID_Datatype_add_ref(dtp_); \ } \ } while (0) #define dtype_release_if_not_builtin(datatype_) \ @@ -36,9 +36,9 @@ if ((datatype_) != MPI_DATATYPE_NULL && \ HANDLE_GET_KIND((datatype_)) != HANDLE_KIND_BUILTIN) \ { \ - MPIDU_Datatype *dtp_ = NULL; \ - MPIDU_Datatype_get_ptr((datatype_), dtp_); \ - MPIDU_Datatype_release(dtp_); \ + MPID_Datatype *dtp_ = NULL; \ + MPID_Datatype_get_ptr((datatype_), dtp_); \ + MPID_Datatype_release(dtp_); \ } \ } while (0) @@ -763,8 +763,8 @@ int MPIDU_Sched_copy(const void *inbuf, MPI_Aint incount, MPI_Datatype intype, #if defined(HAVE_ERROR_CHECKING) && !defined(NDEBUG) { MPI_Aint intype_size, outtype_size; - MPIDU_Datatype_get_size_macro(intype, intype_size); - MPIDU_Datatype_get_size_macro(outtype, outtype_size); + MPID_Datatype_get_size_macro(intype, intype_size); + MPID_Datatype_get_size_macro(outtype, outtype_size); if (incount * intype_size > outcount * outtype_size) { MPL_error_printf("truncation: intype=%#x, intype_size=" MPI_AINT_FMT_DEC_SPEC ", incount=" MPI_AINT_FMT_DEC_SPEC ", outtype=%#x, outtype_size=" MPI_AINT_FMT_DEC_SPEC " outcount=" MPI_AINT_FMT_DEC_SPEC "\n", intype, intype_size, ----------------------------------------------------------------------- Summary of changes: src/mpid/common/sched/mpidu_sched.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2-246-gbdd471a
by noreply＠mpich.org 01 Apr '16

01 Apr '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via bdd471a1dfbb0c3aa883e4cad011e2125c602706 (commit) via fb8a302c5211be326be7b624e1a496c6af682747 (commit) via c604e6baf7d465937682f2e3d72f4455c3ce97ab (commit) via 74bb0bd8a05d6b5a440af3225da456a4699e5af9 (commit) via 40bdb8429f3dc61c2849fe1ac93e3103483d7735 (commit) from 54f737a842003d9838c5c48742c410c0befffe14 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/bdd471a1dfbb0c3aa883e4cad011e2125… commit bdd471a1dfbb0c3aa883e4cad011e2125c602706 Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Wed Mar 30 09:01:20 2016 -0500 mpid/common/datatype: provide fallback header Instead of hardcoding the namespace shift in mpidu_datatype.h, provide a "fallback" header than can be included by devices. This adds flexibility for devices that may want to selectively include parts of the implementation. Signed-off-by: Yanfei Guo <yguo(a)anl.gov> diff --git a/src/mpid/ch3/include/mpidpre.h b/src/mpid/ch3/include/mpidpre.h index d7703fa..95a2838 100644 --- a/src/mpid/ch3/include/mpidpre.h +++ b/src/mpid/ch3/include/mpidpre.h @@ -17,7 +17,7 @@ struct MPID_Request; #include <sys/types.h> #endif -#include "mpidu_dataloop.h" +#include "mpid_datatype_fallback.h" /* FIXME: Include here? */ #include "opa_primitives.h" diff --git a/src/mpid/common/datatype/Makefile.mk b/src/mpid/common/datatype/Makefile.mk index 745d9ac..893a628 100644 --- a/src/mpid/common/datatype/Makefile.mk +++ b/src/mpid/common/datatype/Makefile.mk @@ -38,7 +38,8 @@ noinst_HEADERS += \ src/mpid/common/datatype/mpidu_dataloop.h \ src/mpid/common/datatype/mpidu_datatype.h \ src/mpid/common/datatype/mpidu_ext32_segment.h \ - src/mpid/common/datatype/segment_states.h + src/mpid/common/datatype/segment_states.h \ + src/mpid/common/datatype/mpid_datatype_fallback.h endif BUILD_MPID_COMMON_DATATYPE diff --git a/src/mpid/common/datatype/mpid_datatype_fallback.h b/src/mpid/common/datatype/mpid_datatype_fallback.h new file mode 100644 index 0000000..7731b49 --- /dev/null +++ b/src/mpid/common/datatype/mpid_datatype_fallback.h @@ -0,0 +1,75 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + * (C) 2016 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ +#ifndef MPID_DATATYPE_FALLBACK_H_INCLUDED +#define MPID_DATATYPE_FALLBACK_H_INCLUDED + +#include "mpidu_datatype.h" + +/* Variables */ +#define MPID_Datatype_direct MPIDU_Datatype_direct +#define MPID_Datatype_builtin MPIDU_Datatype_builtin +#define MPID_Datatype_mem MPIDU_Datatype_mem + +/* Macros */ +#define MPID_DATATYPE_N_BUILTIN MPIDU_DATATYPE_N_BUILTIN +#define MPID_DTYPE_BEGINNING MPIDU_DTYPE_BEGINNING +#define MPID_DTYPE_END MPIDU_DTYPE_END + +typedef MPIDU_Datatype MPID_Datatype; +typedef MPIDU_Datatype_contents MPID_Datatype_contents; + +#define MPID_Datatype_add_ref MPIDU_Datatype_add_ref +#define MPID_Datatype_committed_ptr MPIDU_Datatype_committed_ptr +#define MPID_Datatype_get_basic_size MPIDU_Datatype_get_basic_size +#define MPID_Datatype_get_basic_type MPIDU_Datatype_get_basic_type + +#define MPID_Datatype_get_ptr MPIDU_Datatype_get_ptr +#define MPID_Datatype_get_size_macro MPIDU_Datatype_get_size_macro +#define MPID_Datatype_get_extent_macro MPIDU_Datatype_get_extent_macro +#define MPID_Datatype_is_contig MPIDU_Datatype_is_contig +#define MPID_Datatype_release MPIDU_Datatype_release +#define MPID_Datatype_valid_ptr MPIDU_Datatype_valid_ptr + +#define MPID_Datatype_get_loopdepth_macro MPIDU_Datatype_get_loopdepth_macro +#define MPID_Datatype_get_loopptr_macro MPIDU_Datatype_get_loopptr_macro +#define MPID_Datatype_get_loopsize_macro MPIDU_Datatype_get_loopsize_macro +#define MPID_Datatype_set_loopdepth_macro MPIDU_Datatype_set_loopdepth_macro +#define MPID_Datatype_set_loopptr_macro MPIDU_Datatype_set_loopptr_macro +#define MPID_Datatype_set_loopsize_macro MPIDU_Datatype_set_loopsize_macro + +#define MPID_Datatype_free MPIDU_Datatype_free +#define MPID_Datatype_free_contents MPIDU_Datatype_free_contents +#define MPID_Datatype_set_contents MPIDU_Datatype_set_contents +#define MPID_Datatype_size_external32 MPIDU_Datatype_size_external32 + +/* MPID_Segment */ +typedef struct DLOOP_Segment MPID_Segment; /* MPIDU_Segment */ + +#define MPID_Segment_init MPIDU_Segment_init +#define MPID_Segment_alloc MPIDU_Segment_alloc +#define MPID_Segment_free MPIDU_Segment_free +#define MPID_Segment_pack MPIDU_Segment_pack +#define MPID_Segment_unpack MPIDU_Segment_unpack +#define MPID_Segment_pack_external32 MPIDU_Segment_pack_external32 +#define MPID_Segment_unpack_external32 MPIDU_Segment_unpack_external32 + +/* MPID_Type */ +#define MPID_Type_access_contents MPIDU_Type_access_contents +#define MPID_Type_blockindexed MPIDU_Type_blockindexed +#define MPID_Type_commit MPIDU_Type_commit +#define MPID_Type_contiguous MPIDU_Type_contiguous +#define MPID_Type_create_pairtype MPIDU_Type_create_pairtype +#define MPID_Type_create_resized MPIDU_Type_create_resized +#define MPID_Type_dup MPIDU_Type_dup +#define MPID_Type_get_contents MPIDU_Type_get_contents +#define MPID_Type_get_envelope MPIDU_Type_get_envelope +#define MPID_Type_indexed MPIDU_Type_indexed +#define MPID_Type_release_contents MPIDU_Type_release_contents +#define MPID_Type_struct MPIDU_Type_struct +#define MPID_Type_vector MPIDU_Type_vector +#define MPID_Type_zerolen MPIDU_Type_zerolen + +#endif /* MPiD_DATATYPE_FALLBACK_H_INCLUDED */ diff --git a/src/mpid/common/datatype/mpidu_datatype.h b/src/mpid/common/datatype/mpidu_datatype.h index 8a98ba0..1b65896 100644 --- a/src/mpid/common/datatype/mpidu_datatype.h +++ b/src/mpid/common/datatype/mpidu_datatype.h @@ -753,72 +753,5 @@ void MPIDU_Type_release_contents(MPI_Datatype type, MPI_Aint **aints_p, MPI_Datatype **types_p); -/* FIXME:Temorary coversion for compatibility in MPI layer - * These should be eventially put in mpid/include/mpid.h - */ -/* Variables */ -#define MPID_Datatype_direct MPIDU_Datatype_direct -#define MPID_Datatype_builtin MPIDU_Datatype_builtin -#define MPID_Datatype_mem MPIDU_Datatype_mem - -/* Macros */ -#define MPID_DATATYPE_N_BUILTIN MPIDU_DATATYPE_N_BUILTIN -#define MPID_DTYPE_BEGINNING MPIDU_DTYPE_BEGINNING -#define MPID_DTYPE_END MPIDU_DTYPE_END - -typedef MPIDU_Datatype MPID_Datatype; -typedef MPIDU_Datatype_contents MPID_Datatype_contents; - -#define MPID_Datatype_add_ref MPIDU_Datatype_add_ref -#define MPID_Datatype_committed_ptr MPIDU_Datatype_committed_ptr -#define MPID_Datatype_get_basic_size MPIDU_Datatype_get_basic_size -#define MPID_Datatype_get_basic_type MPIDU_Datatype_get_basic_type - -#define MPID_Datatype_get_ptr MPIDU_Datatype_get_ptr -#define MPID_Datatype_get_size_macro MPIDU_Datatype_get_size_macro -#define MPID_Datatype_get_extent_macro MPIDU_Datatype_get_extent_macro -#define MPID_Datatype_is_contig MPIDU_Datatype_is_contig -#define MPID_Datatype_release MPIDU_Datatype_release -#define MPID_Datatype_valid_ptr MPIDU_Datatype_valid_ptr - -#define MPID_Datatype_get_loopdepth_macro MPIDU_Datatype_get_loopdepth_macro -#define MPID_Datatype_get_loopptr_macro MPIDU_Datatype_get_loopptr_macro -#define MPID_Datatype_get_loopsize_macro MPIDU_Datatype_get_loopsize_macro -#define MPID_Datatype_set_loopdepth_macro MPIDU_Datatype_set_loopdepth_macro -#define MPID_Datatype_set_loopptr_macro MPIDU_Datatype_set_loopptr_macro -#define MPID_Datatype_set_loopsize_macro MPIDU_Datatype_set_loopsize_macro - -#define MPID_Datatype_free MPIDU_Datatype_free -#define MPID_Datatype_free_contents MPIDU_Datatype_free_contents -#define MPID_Datatype_set_contents MPIDU_Datatype_set_contents -#define MPID_Datatype_size_external32 MPIDU_Datatype_size_external32 - -/* MPID_Segment */ -typedef struct DLOOP_Segment MPID_Segment; /* MPIDU_Segment */ - -#define MPID_Segment_init MPIDU_Segment_init -#define MPID_Segment_alloc MPIDU_Segment_alloc -#define MPID_Segment_free MPIDU_Segment_free -#define MPID_Segment_pack MPIDU_Segment_pack -#define MPID_Segment_unpack MPIDU_Segment_unpack -#define MPID_Segment_pack_external32 MPIDU_Segment_pack_external32 -#define MPID_Segment_unpack_external32 MPIDU_Segment_unpack_external32 - -/* MPID_Type */ -#define MPID_Type_access_contents MPIDU_Type_access_contents -#define MPID_Type_blockindexed MPIDU_Type_blockindexed -#define MPID_Type_commit MPIDU_Type_commit -#define MPID_Type_contiguous MPIDU_Type_contiguous -#define MPID_Type_create_pairtype MPIDU_Type_create_pairtype -#define MPID_Type_create_resized MPIDU_Type_create_resized -#define MPID_Type_dup MPIDU_Type_dup -#define MPID_Type_get_contents MPIDU_Type_get_contents -#define MPID_Type_get_envelope MPIDU_Type_get_envelope -#define MPID_Type_indexed MPIDU_Type_indexed -#define MPID_Type_release_contents MPIDU_Type_release_contents -#define MPID_Type_struct MPIDU_Type_struct -#define MPID_Type_vector MPIDU_Type_vector -#define MPID_Type_zerolen MPIDU_Type_zerolen - /* end of file */ #endif diff --git a/src/mpid/pamid/include/mpidpre.h b/src/mpid/pamid/include/mpidpre.h index e6ab858..6df54a6 100644 --- a/src/mpid/pamid/include/mpidpre.h +++ b/src/mpid/pamid/include/mpidpre.h @@ -34,7 +34,7 @@ #include <unistd.h> #include "mpiimpl.h" -#include "mpidu_dataloop.h" +#include "mpid_datatype_fallback.h" #include <pami.h> /* provides "pre" typedefs and such for NBC scheduling mechanism */ http://git.mpich.org/mpich.git/commitdiff/fb8a302c5211be326be7b624e1a496c6a… commit fb8a302c5211be326be7b624e1a496c6af682747 Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Wed Mar 30 08:59:19 2016 -0500 mpid/common/datatype: explicitly include mpiimpl.h mpidu_contents_support.c uses some MPIR functionality exposed in mpiimpl.h. Explicity include that header to avoid build issues. Signed-off-by: Yanfei Guo <yguo(a)anl.gov> diff --git a/src/mpid/common/datatype/mpidu_contents_support.c b/src/mpid/common/datatype/mpidu_contents_support.c index ffe977f..aded1d3 100644 --- a/src/mpid/common/datatype/mpidu_contents_support.c +++ b/src/mpid/common/datatype/mpidu_contents_support.c @@ -6,6 +6,7 @@ */ #include <mpi.h> +#include <mpiimpl.h> #include <mpidu_datatype.h> void MPIDU_Type_access_contents(MPI_Datatype type, http://git.mpich.org/mpich.git/commitdiff/c604e6baf7d465937682f2e3d72f4455c… commit c604e6baf7d465937682f2e3d72f4455c3ce97ab Author: Yanfei Guo <yguo(a)anl.gov> Date: Mon Dec 21 14:37:47 2015 -0600 mpid/common/datatype: Rename mpid_ files to have mpidu_ prefix All the references to the renamed files are updated. This include codes, configure.ac, Makefile.mk, and .gitignore. Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/.gitignore b/.gitignore index 97a978d..53606ff 100644 --- a/.gitignore +++ b/.gitignore @@ -480,8 +480,8 @@ Makefile.am-stamp /src/include/mpif.h #/src/include/mpe_thread.h /src/include/mpimod.pcl -/src/include/mpid_datatype.h -/src/include/mpid_dataloop.h +/src/include/mpidu_datatype.h +/src/include/mpidu_dataloop.h /src/include/gen_dataloop.h /src/include/mpich2info.h /src/include/mpio.h diff --git a/configure.ac b/configure.ac index 0c2a789..be61b85 100644 --- a/configure.ac +++ b/configure.ac @@ -3108,7 +3108,7 @@ system; this program outputs an appropriate file for the --with-cross option]) # # Take len and turn it into two hex digits (there are 8 bits available # in the built-in datatype handle for the length; see - # src/mpid/common/datatype/mpid_datatype.h) + # src/mpid/common/datatype/mpidu_datatype.h) if test "$len" -gt 255 ; then AC_MSG_ERROR([Type sizes greater than 255 bytes are not supported (type $type is $len bytes)]) fi @@ -3510,7 +3510,7 @@ if test "$enable_f77" = yes ; then # # Take len and turn it into two hex digits (there are 8 bits available # in the built-in datatype handle for the length; see - # src/mpid/common/datatype/mpid_datatype.h). This code is taken + # src/mpid/common/datatype/mpidu_datatype.h). This code is taken # from the code in mpich/configure.ac if test "$len" -gt 255 ; then AC_MSG_ERROR([Type sizes greater than 255 bytes are not supported (type INTEGER is $len bytes)]) @@ -3557,7 +3557,7 @@ if test "$enable_f77" = yes ; then # # Take len and turn it into two hex digits (there are 8 bits available # in the built-in datatype handle for the length; see - # src/mpid/common/datatype/mpid_datatype.h). This code is taken + # src/mpid/common/datatype/mpidu_datatype.h). This code is taken # from the code in mpich/configure.ac if test "$len" -gt 255 ; then AC_MSG_ERROR([Type sizes greater than 255 bytes are not supported (type DOUBLE is $len bytes)]) @@ -3695,7 +3695,7 @@ dnl len=$len_doublecplx dnl # dnl # Take len and turn it into two hex digits (there are 8 bits available dnl # in the built-in datatype handle for the length; see -dnl # src/mpid/common/datatype/mpid_datatype.h). This code is taken +dnl # src/mpid/common/datatype/mpidu_datatype.h). This code is taken dnl # from the code in mpich/configure.ac dnl if test "$len" -gt 255 ; then dnl AC_MSG_ERROR([Type sizes greater than 255 bytes are not supported (type DOUBLE COMPLEX is $len bytes)]) diff --git a/src/mpid/ch3/include/mpidpost.h b/src/mpid/ch3/include/mpidpost.h index 5e97ecf..3159e22 100644 --- a/src/mpid/ch3/include/mpidpost.h +++ b/src/mpid/ch3/include/mpidpost.h @@ -138,7 +138,7 @@ int MPIDI_CH3_Comm_connect(char * port_name, int root, MPID_Comm * comm_ptr, (mpiimpl.h). */ #include "mpidi_ch3_post.h" -#include "mpid_datatype.h" +#include "mpidu_datatype.h" /* * Request utility macros (public - can be used in MPID macros) diff --git a/src/mpid/ch3/include/mpidpre.h b/src/mpid/ch3/include/mpidpre.h index 8870cfd..d7703fa 100644 --- a/src/mpid/ch3/include/mpidpre.h +++ b/src/mpid/ch3/include/mpidpre.h @@ -17,7 +17,7 @@ struct MPID_Request; #include <sys/types.h> #endif -#include "mpid_dataloop.h" +#include "mpidu_dataloop.h" /* FIXME: Include here? */ #include "opa_primitives.h" diff --git a/src/mpid/common/datatype/Makefile.mk b/src/mpid/common/datatype/Makefile.mk index fd61cc1..745d9ac 100644 --- a/src/mpid/common/datatype/Makefile.mk +++ b/src/mpid/common/datatype/Makefile.mk @@ -10,34 +10,34 @@ if BUILD_MPID_COMMON_DATATYPE include $(top_srcdir)/src/mpid/common/datatype/dataloop/Makefile.mk mpi_core_sources += \ - src/mpid/common/datatype/mpid_contents_support.c \ - src/mpid/common/datatype/mpid_datatype_contents.c \ - src/mpid/common/datatype/mpid_datatype_free.c \ - src/mpid/common/datatype/mpid_ext32_datatype.c \ - src/mpid/common/datatype/mpid_ext32_segment.c \ - src/mpid/common/datatype/mpid_segment.c \ - src/mpid/common/datatype/mpid_type_blockindexed.c \ - src/mpid/common/datatype/mpid_type_commit.c \ - src/mpid/common/datatype/mpid_type_contiguous.c \ - src/mpid/common/datatype/mpid_type_create_pairtype.c \ - src/mpid/common/datatype/mpid_type_create_resized.c \ - src/mpid/common/datatype/mpid_type_debug.c \ - src/mpid/common/datatype/mpid_type_dup.c \ - src/mpid/common/datatype/mpid_type_get_contents.c \ - src/mpid/common/datatype/mpid_type_get_envelope.c \ - src/mpid/common/datatype/mpid_type_indexed.c \ - src/mpid/common/datatype/mpid_type_struct.c \ - src/mpid/common/datatype/mpid_type_vector.c \ - src/mpid/common/datatype/mpid_type_zerolen.c \ + src/mpid/common/datatype/mpidu_contents_support.c \ + src/mpid/common/datatype/mpidu_datatype_contents.c \ + src/mpid/common/datatype/mpidu_datatype_free.c \ + src/mpid/common/datatype/mpidu_ext32_datatype.c \ + src/mpid/common/datatype/mpidu_ext32_segment.c \ + src/mpid/common/datatype/mpidu_segment.c \ + src/mpid/common/datatype/mpidu_type_blockindexed.c \ + src/mpid/common/datatype/mpidu_type_commit.c \ + src/mpid/common/datatype/mpidu_type_contiguous.c \ + src/mpid/common/datatype/mpidu_type_create_pairtype.c \ + src/mpid/common/datatype/mpidu_type_create_resized.c \ + src/mpid/common/datatype/mpidu_type_debug.c \ + src/mpid/common/datatype/mpidu_type_dup.c \ + src/mpid/common/datatype/mpidu_type_get_contents.c \ + src/mpid/common/datatype/mpidu_type_get_envelope.c \ + src/mpid/common/datatype/mpidu_type_indexed.c \ + src/mpid/common/datatype/mpidu_type_struct.c \ + src/mpid/common/datatype/mpidu_type_vector.c \ + src/mpid/common/datatype/mpidu_type_zerolen.c \ src/mpid/common/datatype/mpir_type_flatten.c # there are no AC_OUTPUT_FILES headers, so builddir is unnecessary AM_CPPFLAGS += -I$(top_srcdir)/src/mpid/common/datatype noinst_HEADERS += \ - src/mpid/common/datatype/mpid_dataloop.h \ - src/mpid/common/datatype/mpid_datatype.h \ - src/mpid/common/datatype/mpid_ext32_segment.h \ + src/mpid/common/datatype/mpidu_dataloop.h \ + src/mpid/common/datatype/mpidu_datatype.h \ + src/mpid/common/datatype/mpidu_ext32_segment.h \ src/mpid/common/datatype/segment_states.h endif BUILD_MPID_COMMON_DATATYPE diff --git a/src/mpid/common/datatype/dataloop/dataloop.c b/src/mpid/common/datatype/dataloop/dataloop.c index 420c0f5..f18257d 100644 --- a/src/mpid/common/datatype/dataloop/dataloop.c +++ b/src/mpid/common/datatype/dataloop/dataloop.c @@ -24,8 +24,8 @@ * makes it somewhat easier to copy these subtrees around. Keep this in mind * when looking at the functions below. * - * The structures used in this file are defined in mpid_datatype.h. There is - * no separate mpid_dataloop.h at this time. + * The structures used in this file are defined in mpidu_datatype.h. There is + * no separate mpidu_dataloop.h at this time. * * OPTIMIZATIONS: * diff --git a/src/mpid/common/datatype/dataloop/dataloop.h b/src/mpid/common/datatype/dataloop/dataloop.h index 2a16e96..cdfd5fd 100644 --- a/src/mpid/common/datatype/dataloop/dataloop.h +++ b/src/mpid/common/datatype/dataloop/dataloop.h @@ -13,7 +13,7 @@ #define DATALOOP_H /* This is specific to MPICH */ -#include "mpid_dataloop.h" +#include "mpidu_dataloop.h" #include "mpiimpl.h" #endif diff --git a/src/mpid/common/datatype/mpid_contents_support.c b/src/mpid/common/datatype/mpidu_contents_support.c similarity index 98% rename from src/mpid/common/datatype/mpid_contents_support.c rename to src/mpid/common/datatype/mpidu_contents_support.c index 7a85542..ffe977f 100644 --- a/src/mpid/common/datatype/mpid_contents_support.c +++ b/src/mpid/common/datatype/mpidu_contents_support.c @@ -6,7 +6,7 @@ */ #include <mpi.h> -#include <mpid_datatype.h> +#include <mpidu_datatype.h> void MPIDU_Type_access_contents(MPI_Datatype type, int **ints_p, diff --git a/src/mpid/common/datatype/mpid_dataloop.h b/src/mpid/common/datatype/mpidu_dataloop.h similarity index 98% rename from src/mpid/common/datatype/mpid_dataloop.h rename to src/mpid/common/datatype/mpidu_dataloop.h index f3f0a63..1d68e49 100644 --- a/src/mpid/common/datatype/mpid_dataloop.h +++ b/src/mpid/common/datatype/mpidu_dataloop.h @@ -5,8 +5,8 @@ * See COPYRIGHT in top-level directory. */ -#ifndef MPID_DATALOOP_H -#define MPID_DATALOOP_H +#ifndef MPIDU_DATALOOP_H +#define MPIDU_DATALOOP_H #include <mpi.h> diff --git a/src/mpid/common/datatype/mpid_datatype.h b/src/mpid/common/datatype/mpidu_datatype.h similarity index 99% rename from src/mpid/common/datatype/mpid_datatype.h rename to src/mpid/common/datatype/mpidu_datatype.h index b648bb2..8a98ba0 100644 --- a/src/mpid/common/datatype/mpid_datatype.h +++ b/src/mpid/common/datatype/mpidu_datatype.h @@ -3,16 +3,16 @@ * (C) 2001 by Argonne National Laboratory. * See COPYRIGHT in top-level directory. */ -#ifndef MPID_DATATYPE_H -#define MPID_DATATYPE_H +#ifndef MPIDU_DATATYPE_H +#define MPIDU_DATATYPE_H #include "mpiimpl.h" -#include "mpid_dataloop.h" +#include "mpidu_dataloop.h" #include "mpihandlemem.h" /* NOTE: * - struct MPIDU_Dataloop and MPIDU_Segment are defined in - * src/mpid/common/datatype/mpid_dataloop.h (and gen_dataloop.h). + * src/mpid/common/datatype/mpidu_dataloop.h (and gen_dataloop.h). * - MPIU_Object_alloc_t is defined in src/include/mpihandle.h */ diff --git a/src/mpid/common/datatype/mpid_datatype_contents.c b/src/mpid/common/datatype/mpidu_datatype_contents.c similarity index 99% rename from src/mpid/common/datatype/mpid_datatype_contents.c rename to src/mpid/common/datatype/mpidu_datatype_contents.c index 2625b88..8aacd83 100644 --- a/src/mpid/common/datatype/mpid_datatype_contents.c +++ b/src/mpid/common/datatype/mpidu_datatype_contents.c @@ -6,7 +6,7 @@ */ #include <mpiimpl.h> -#include <mpid_dataloop.h> +#include <mpidu_dataloop.h> #include <stdlib.h> #include <limits.h> diff --git a/src/mpid/common/datatype/mpid_datatype_free.c b/src/mpid/common/datatype/mpidu_datatype_free.c similarity index 98% rename from src/mpid/common/datatype/mpid_datatype_free.c rename to src/mpid/common/datatype/mpidu_datatype_free.c index 293a4c9..2aa72c0 100644 --- a/src/mpid/common/datatype/mpid_datatype_free.c +++ b/src/mpid/common/datatype/mpidu_datatype_free.c @@ -5,7 +5,7 @@ * See COPYRIGHT in top-level directory. */ #include <mpiimpl.h> -#include <mpid_dataloop.h> +#include <mpidu_dataloop.h> #include <stdlib.h> #include <limits.h> diff --git a/src/mpid/common/datatype/mpid_ext32_datatype.c b/src/mpid/common/datatype/mpidu_ext32_datatype.c similarity index 98% rename from src/mpid/common/datatype/mpid_ext32_datatype.c rename to src/mpid/common/datatype/mpidu_ext32_datatype.c index 0311917..155410d 100644 --- a/src/mpid/common/datatype/mpid_ext32_datatype.c +++ b/src/mpid/common/datatype/mpidu_ext32_datatype.c @@ -10,7 +10,7 @@ #include <mpichconf.h> #include <mpiimpl.h> -#include <mpid_dataloop.h> +#include <mpidu_dataloop.h> typedef struct external32_basic_size diff --git a/src/mpid/common/datatype/mpid_ext32_segment.c b/src/mpid/common/datatype/mpidu_ext32_segment.c similarity index 99% rename from src/mpid/common/datatype/mpid_ext32_segment.c rename to src/mpid/common/datatype/mpidu_ext32_segment.c index 2101dda..be87991 100644 --- a/src/mpid/common/datatype/mpid_ext32_segment.c +++ b/src/mpid/common/datatype/mpidu_ext32_segment.c @@ -10,12 +10,12 @@ #include <mpichconf.h> #include <mpiimpl.h> -#include <mpid_dataloop.h> +#include <mpidu_dataloop.h> #undef MPID_SP_VERBOSE #undef MPID_SU_VERBOSE -#include "mpid_ext32_segment.h" +#include "mpidu_ext32_segment.h" /* MPIDU_Segment_piece_params * diff --git a/src/mpid/common/datatype/mpid_ext32_segment.h b/src/mpid/common/datatype/mpidu_ext32_segment.h similarity index 99% rename from src/mpid/common/datatype/mpid_ext32_segment.h rename to src/mpid/common/datatype/mpidu_ext32_segment.h index f643e3f..b4e853f 100644 --- a/src/mpid/common/datatype/mpid_ext32_segment.h +++ b/src/mpid/common/datatype/mpidu_ext32_segment.h @@ -4,8 +4,8 @@ * See COPYRIGHT in top-level directory. */ -#ifndef MPIDEXT32SEGMENT_H -#define MPIDEXT32SEGMENT_H +#ifndef MPIDUEXT32SEGMENT_H +#define MPIDUEXT32SEGMENT_H #include "mpichconf.h" diff --git a/src/mpid/common/datatype/mpid_segment.c b/src/mpid/common/datatype/mpidu_segment.c similarity index 99% rename from src/mpid/common/datatype/mpid_segment.c rename to src/mpid/common/datatype/mpidu_segment.c index 8cf4d85..783db7e 100644 --- a/src/mpid/common/datatype/mpid_segment.c +++ b/src/mpid/common/datatype/mpidu_segment.c @@ -9,7 +9,7 @@ #include <stdlib.h> #include <mpiimpl.h> -#include <mpid_dataloop.h> +#include <mpidu_dataloop.h> /* * Define these two names to enable debugging output. diff --git a/src/mpid/common/datatype/mpid_type_blockindexed.c b/src/mpid/common/datatype/mpidu_type_blockindexed.c similarity index 99% rename from src/mpid/common/datatype/mpid_type_blockindexed.c rename to src/mpid/common/datatype/mpidu_type_blockindexed.c index 274db4d..89f8d58 100644 --- a/src/mpid/common/datatype/mpid_type_blockindexed.c +++ b/src/mpid/common/datatype/mpidu_type_blockindexed.c @@ -6,7 +6,7 @@ */ #include <mpiimpl.h> -#include <mpid_dataloop.h> +#include <mpidu_dataloop.h> #include <stdlib.h> #undef MPID_TYPE_ALLOC_DEBUG diff --git a/src/mpid/common/datatype/mpid_type_commit.c b/src/mpid/common/datatype/mpidu_type_commit.c similarity index 98% rename from src/mpid/common/datatype/mpid_type_commit.c rename to src/mpid/common/datatype/mpidu_type_commit.c index 1764ef4..f78bd08 100644 --- a/src/mpid/common/datatype/mpid_type_commit.c +++ b/src/mpid/common/datatype/mpidu_type_commit.c @@ -5,7 +5,7 @@ * See COPYRIGHT in top-level directory. */ -#include <mpid_dataloop.h> +#include <mpidu_dataloop.h> #include <stdlib.h> /*@ diff --git a/src/mpid/common/datatype/mpid_type_contiguous.c b/src/mpid/common/datatype/mpidu_type_contiguous.c similarity index 99% rename from src/mpid/common/datatype/mpid_type_contiguous.c rename to src/mpid/common/datatype/mpidu_type_contiguous.c index fb0b481..64f663d 100644 --- a/src/mpid/common/datatype/mpid_type_contiguous.c +++ b/src/mpid/common/datatype/mpidu_type_contiguous.c @@ -6,7 +6,7 @@ */ #include <mpiimpl.h> -#include <mpid_dataloop.h> +#include <mpidu_dataloop.h> #include <stdlib.h> /* #define MPID_TYPE_ALLOC_DEBUG */ diff --git a/src/mpid/common/datatype/mpid_type_create_pairtype.c b/src/mpid/common/datatype/mpidu_type_create_pairtype.c similarity index 99% rename from src/mpid/common/datatype/mpid_type_create_pairtype.c rename to src/mpid/common/datatype/mpidu_type_create_pairtype.c index ef83d0e..7b57e6c 100644 --- a/src/mpid/common/datatype/mpid_type_create_pairtype.c +++ b/src/mpid/common/datatype/mpidu_type_create_pairtype.c @@ -6,7 +6,7 @@ */ #include <mpiimpl.h> -#include <mpid_dataloop.h> +#include <mpidu_dataloop.h> #include <stdlib.h> #include <limits.h> diff --git a/src/mpid/common/datatype/mpid_type_create_resized.c b/src/mpid/common/datatype/mpidu_type_create_resized.c similarity index 99% rename from src/mpid/common/datatype/mpid_type_create_resized.c rename to src/mpid/common/datatype/mpidu_type_create_resized.c index 16a4545..6ca3c06 100644 --- a/src/mpid/common/datatype/mpid_type_create_resized.c +++ b/src/mpid/common/datatype/mpidu_type_create_resized.c @@ -6,7 +6,7 @@ */ #include <mpiimpl.h> -#include <mpid_dataloop.h> +#include <mpidu_dataloop.h> #include <stdlib.h> /* #define MPID_TYPE_ALLOC_DEBUG */ diff --git a/src/mpid/common/datatype/mpid_type_debug.c b/src/mpid/common/datatype/mpidu_type_debug.c similarity index 99% rename from src/mpid/common/datatype/mpid_type_debug.c rename to src/mpid/common/datatype/mpidu_type_debug.c index 31872b3..21cd000 100644 --- a/src/mpid/common/datatype/mpid_type_debug.c +++ b/src/mpid/common/datatype/mpidu_type_debug.c @@ -6,7 +6,7 @@ */ #include "mpiimpl.h" -#include "mpid_dataloop.h" +#include "mpidu_dataloop.h" #include <stdlib.h> #include <limits.h> diff --git a/src/mpid/common/datatype/mpid_type_dup.c b/src/mpid/common/datatype/mpidu_type_dup.c similarity index 99% rename from src/mpid/common/datatype/mpid_type_dup.c rename to src/mpid/common/datatype/mpidu_type_dup.c index 13349ac..2a6f3cb 100644 --- a/src/mpid/common/datatype/mpid_type_dup.c +++ b/src/mpid/common/datatype/mpidu_type_dup.c @@ -6,7 +6,7 @@ */ #include <mpiimpl.h> -#include <mpid_dataloop.h> +#include <mpidu_dataloop.h> #include <stdlib.h> #undef FCNAME diff --git a/src/mpid/common/datatype/mpid_type_get_contents.c b/src/mpid/common/datatype/mpidu_type_get_contents.c similarity index 97% rename from src/mpid/common/datatype/mpid_type_get_contents.c rename to src/mpid/common/datatype/mpidu_type_get_contents.c index 5592cb4..84ded31 100644 --- a/src/mpid/common/datatype/mpid_type_get_contents.c +++ b/src/mpid/common/datatype/mpidu_type_get_contents.c @@ -7,8 +7,8 @@ #include <mpi.h> #include <mpiimpl.h> -#include <mpid_datatype.h> -#include <mpid_dataloop.h> +#include <mpidu_datatype.h> +#include <mpidu_dataloop.h> /*@ MPIDU_Type_get_contents - get content information from datatype diff --git a/src/mpid/common/datatype/mpid_type_get_envelope.c b/src/mpid/common/datatype/mpidu_type_get_envelope.c similarity index 95% rename from src/mpid/common/datatype/mpid_type_get_envelope.c rename to src/mpid/common/datatype/mpidu_type_get_envelope.c index 4485ee1..15adf6d 100644 --- a/src/mpid/common/datatype/mpid_type_get_envelope.c +++ b/src/mpid/common/datatype/mpidu_type_get_envelope.c @@ -7,8 +7,8 @@ #include <mpi.h> #include <mpiimpl.h> -#include <mpid_datatype.h> -#include <mpid_dataloop.h> +#include <mpidu_datatype.h> +#include <mpidu_dataloop.h> /*@ MPIDU_Type_get_envelope - get envelope information from datatype diff --git a/src/mpid/common/datatype/mpid_type_indexed.c b/src/mpid/common/datatype/mpidu_type_indexed.c similarity index 99% rename from src/mpid/common/datatype/mpid_type_indexed.c rename to src/mpid/common/datatype/mpidu_type_indexed.c index ecb44e7..ed46c7e 100644 --- a/src/mpid/common/datatype/mpid_type_indexed.c +++ b/src/mpid/common/datatype/mpidu_type_indexed.c @@ -6,7 +6,7 @@ */ #include <mpiimpl.h> -#include <mpid_dataloop.h> +#include <mpidu_dataloop.h> #include <stdlib.h> #undef MPID_TYPE_ALLOC_DEBUG diff --git a/src/mpid/common/datatype/mpid_type_struct.c b/src/mpid/common/datatype/mpidu_type_struct.c similarity index 99% rename from src/mpid/common/datatype/mpid_type_struct.c rename to src/mpid/common/datatype/mpidu_type_struct.c index 2d79c1b..51f480a 100644 --- a/src/mpid/common/datatype/mpid_type_struct.c +++ b/src/mpid/common/datatype/mpidu_type_struct.c @@ -6,7 +6,7 @@ */ #include <mpiimpl.h> -#include <mpid_dataloop.h> +#include <mpidu_dataloop.h> #include <stdlib.h> #include <limits.h> diff --git a/src/mpid/common/datatype/mpid_type_vector.c b/src/mpid/common/datatype/mpidu_type_vector.c similarity index 99% rename from src/mpid/common/datatype/mpid_type_vector.c rename to src/mpid/common/datatype/mpidu_type_vector.c index 14c988e..b926978 100644 --- a/src/mpid/common/datatype/mpid_type_vector.c +++ b/src/mpid/common/datatype/mpidu_type_vector.c @@ -6,7 +6,7 @@ */ #include <mpiimpl.h> -#include <mpid_dataloop.h> +#include <mpidu_dataloop.h> #include <stdlib.h> /* #define MPID_TYPE_ALLOC_DEBUG */ diff --git a/src/mpid/common/datatype/mpid_type_zerolen.c b/src/mpid/common/datatype/mpidu_type_zerolen.c similarity index 98% rename from src/mpid/common/datatype/mpid_type_zerolen.c rename to src/mpid/common/datatype/mpidu_type_zerolen.c index ef12577..5059efd 100644 --- a/src/mpid/common/datatype/mpid_type_zerolen.c +++ b/src/mpid/common/datatype/mpidu_type_zerolen.c @@ -6,7 +6,7 @@ */ #include <mpiimpl.h> -#include <mpid_dataloop.h> +#include <mpidu_dataloop.h> #include <stdlib.h> /* #define MPID_TYPE_ALLOC_DEBUG */ diff --git a/src/mpid/common/datatype/mpir_type_flatten.c b/src/mpid/common/datatype/mpir_type_flatten.c index 8886692..e12d880 100644 --- a/src/mpid/common/datatype/mpir_type_flatten.c +++ b/src/mpid/common/datatype/mpir_type_flatten.c @@ -6,7 +6,7 @@ */ #include <mpiimpl.h> -#include <mpid_dataloop.h> +#include <mpidu_dataloop.h> #include <stdlib.h> /*@ diff --git a/src/mpid/pamid/include/mpidpost.h b/src/mpid/pamid/include/mpidpost.h index b0fdbfe..601c56b 100644 --- a/src/mpid/pamid/include/mpidpost.h +++ b/src/mpid/pamid/include/mpidpost.h @@ -26,7 +26,7 @@ #ifndef __include_mpidpost_h__ #define __include_mpidpost_h__ -#include <mpid_datatype.h> +#include <mpidu_datatype.h> #include "mpidi_prototypes.h" #include "mpidi_macros.h" diff --git a/src/mpid/pamid/include/mpidpre.h b/src/mpid/pamid/include/mpidpre.h index e308cfd..e6ab858 100644 --- a/src/mpid/pamid/include/mpidpre.h +++ b/src/mpid/pamid/include/mpidpre.h @@ -34,7 +34,7 @@ #include <unistd.h> #include "mpiimpl.h" -#include "mpid_dataloop.h" +#include "mpidu_dataloop.h" #include <pami.h> /* provides "pre" typedefs and such for NBC scheduling mechanism */ diff --git a/src/mpid/pamid/src/mpid_request.h b/src/mpid/pamid/src/mpid_request.h index 4b16b96..b907ef9 100644 --- a/src/mpid/pamid/src/mpid_request.h +++ b/src/mpid/pamid/src/mpid_request.h @@ -23,7 +23,7 @@ #ifndef __src_mpid_request_h__ #define __src_mpid_request_h__ -#include "mpid_datatype.h" +#include "mpidu_datatype.h" /** * \addtogroup MPID_REQUEST diff --git a/src/mpid/pamid/src/pt2pt/mpidi_recv.h b/src/mpid/pamid/src/pt2pt/mpidi_recv.h index 7b518fd..05098c2 100644 --- a/src/mpid/pamid/src/pt2pt/mpidi_recv.h +++ b/src/mpid/pamid/src/pt2pt/mpidi_recv.h @@ -25,7 +25,7 @@ #include <mpidimpl.h> #include "../mpid_recvq.h" -#include "mpid_datatype.h" +#include "mpidu_datatype.h" /*#ifdef MPIDI_STATISTICS #include "../../include/mpidi_datatypes.h" #endif*/ http://git.mpich.org/mpich.git/commitdiff/74bb0bd8a05d6b5a440af3225da456a46… commit 74bb0bd8a05d6b5a440af3225da456a4699e5af9 Author: Yanfei Guo <yguo(a)anl.gov> Date: Thu Dec 17 10:35:30 2015 -0600 mpid/common/datatype: Move from MPID_ namespace MPIDU_ Struct definitions, function prototypes, global variables and macros are moved to MPIDU_ namespace to match the name conversion. All references (in CH3 and pamid) within the MPID layer is updated to the new names. The mpid/common/datatype/mpid_datatype.h contains a set of temporary conversions for upper layer (MPI layer) compatibility. Therefore, the MPI layer still uses these functions and variables by their old MPID_ names. The macros that are related to the configure process are not changed (require no changes to configure files). Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/mpid/ch3/channels/nemesis/include/mpid_nem_inline.h b/src/mpid/ch3/channels/nemesis/include/mpid_nem_inline.h index 6d38028..cdeb1b2 100644 --- a/src/mpid/ch3/channels/nemesis/include/mpid_nem_inline.h +++ b/src/mpid/ch3/channels/nemesis/include/mpid_nem_inline.h @@ -27,10 +27,10 @@ static inline int MPID_nem_mpich_test_recv (MPID_nem_cell_ptr_t *cell, int *in_f static inline int MPID_nem_mpich_blocking_recv (MPID_nem_cell_ptr_t *cell, int *in_fbox, int completions); static inline int MPID_nem_mpich_test_recv_wait (MPID_nem_cell_ptr_t *cell, int *in_fbox, int timeout); static inline int MPID_nem_mpich_release_cell (MPID_nem_cell_ptr_t cell, MPIDI_VC_t *vc); -static inline void MPID_nem_mpich_send_seg_header (MPID_Segment *segment, intptr_t *segment_first, +static inline void MPID_nem_mpich_send_seg_header (MPIDU_Segment *segment, intptr_t *segment_first, intptr_t segment_size, void *header, intptr_t header_sz, void *ext_header, intptr_t ext_header_sz, MPIDI_VC_t *vc, int *again); -static inline void MPID_nem_mpich_send_seg (MPID_Segment *segment, intptr_t *segment_first, intptr_t segment_size, +static inline void MPID_nem_mpich_send_seg (MPIDU_Segment *segment, intptr_t *segment_first, intptr_t segment_size, MPIDI_VC_t *vc, int *again); @@ -484,7 +484,7 @@ MPID_nem_mpich_sendv_header (MPL_IOV **iov, int *n_iov, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) static inline void -MPID_nem_mpich_send_seg_header (MPID_Segment *segment, intptr_t *segment_first, intptr_t segment_size, +MPID_nem_mpich_send_seg_header (MPIDU_Segment *segment, intptr_t *segment_first, intptr_t segment_size, void *header, intptr_t header_sz, void *ext_header, intptr_t ext_header_sz, MPIDI_VC_t *vc, int *again) { @@ -532,7 +532,7 @@ MPID_nem_mpich_send_seg_header (MPID_Segment *segment, intptr_t *segment_first, /* copy data */ last = segment_size; - MPID_Segment_pack(segment, *segment_first, &last, (char *)pbox->cell.pkt.p.payload + sizeof(MPIDI_CH3_Pkt_t)); + MPIDU_Segment_pack(segment, *segment_first, &last, (char *)pbox->cell.pkt.p.payload + sizeof(MPIDI_CH3_Pkt_t)); MPIU_Assert(last == segment_size); OPA_store_release_int(&pbox->flag.value, 1); @@ -590,7 +590,7 @@ MPID_nem_mpich_send_seg_header (MPID_Segment *segment, intptr_t *segment_first, else last = *segment_first + MPID_NEM_MPICH_DATA_LEN - buf_offset; - MPID_Segment_pack(segment, *segment_first, &last, (char *)el->pkt.p.payload + buf_offset); + MPIDU_Segment_pack(segment, *segment_first, &last, (char *)el->pkt.p.payload + buf_offset); datalen = buf_offset + last - *segment_first; *segment_first = last; @@ -630,7 +630,7 @@ MPID_nem_mpich_send_seg_header (MPID_Segment *segment, intptr_t *segment_first, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) static inline void -MPID_nem_mpich_send_seg (MPID_Segment *segment, intptr_t *segment_first, intptr_t segment_size, MPIDI_VC_t *vc, int *again) +MPID_nem_mpich_send_seg (MPIDU_Segment *segment, intptr_t *segment_first, intptr_t segment_size, MPIDI_VC_t *vc, int *again) { MPID_nem_cell_ptr_t el; intptr_t datalen; @@ -673,7 +673,7 @@ MPID_nem_mpich_send_seg (MPID_Segment *segment, intptr_t *segment_first, intptr_ else last = *segment_first + MPID_NEM_MPICH_DATA_LEN; - MPID_Segment_pack(segment, *segment_first, &last, (char *)el->pkt.p.payload); + MPIDU_Segment_pack(segment, *segment_first, &last, (char *)el->pkt.p.payload); datalen = last - *segment_first; *segment_first = last; diff --git a/src/mpid/ch3/channels/nemesis/include/mpid_nem_post.h b/src/mpid/ch3/channels/nemesis/include/mpid_nem_post.h index 22d64a7..926a242 100644 --- a/src/mpid/ch3/channels/nemesis/include/mpid_nem_post.h +++ b/src/mpid/ch3/channels/nemesis/include/mpid_nem_post.h @@ -97,8 +97,8 @@ int MPID_nem_mpich_send_header(void* buf, int size, struct MPIDI_VC *vc, int *ag int MPID_nem_mpich_sendv(MPL_IOV **iov, int *n_iov, struct MPIDI_VC *vc, int *again); int MPID_nem_mpich_sendv_header(MPL_IOV **iov, int *n_iov, void *ext_header, intptr_t ext_header_sz, struct MPIDI_VC *vc, int *again); -void MPID_nem_mpich_send_seg(MPID_Segment segment, intptr_t *segment_first, intptr_t segment_sz, struct MPIDI_VC *vc, int *again); -void MPID_nem_mpich_send_seg_header(MPID_Segment segment, intptr_t *segment_first, intptr_t segment_size, +void MPID_nem_mpich_send_seg(MPIDU_Segment segment, intptr_t *segment_first, intptr_t segment_sz, struct MPIDI_VC *vc, int *again); +void MPID_nem_mpich_send_seg_header(MPIDU_Segment segment, intptr_t *segment_first, intptr_t segment_size, void *header, intptr_t header_sz, void *ext_header, intptr_t ext_header_sz, struct MPIDI_VC *vc, int *again); int MPID_nem_mpich_test_recv(MPID_nem_cell_ptr_t *cell, int *in_fbox, int in_blocking_progress); diff --git a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_poll.c b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_poll.c index 93c4545..c929207 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_poll.c +++ b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_poll.c @@ -107,7 +107,7 @@ static void MPID_nem_llc_send_handler(void *cba, uint64_t * p_reqid) * Note that RMA messages should be included. * Exclude eager-short by requiring req->comm != 0. */ int is_contig; - MPID_Datatype_is_contig(sreq->dev.datatype, &is_contig); + MPIDU_Datatype_is_contig(sreq->dev.datatype, &is_contig); if (!is_contig && REQ_FIELD(sreq, pack_buf)) { dprintf("llc_send_handler,non-contiguous,free pack_buf\n"); MPL_free(REQ_FIELD(sreq, pack_buf)); @@ -236,7 +236,7 @@ int MPID_nem_llc_recv_posted(struct MPIDI_VC *vc, struct MPID_Request *req) int mpi_errno = MPI_SUCCESS, llc_errno; int dt_contig; intptr_t data_sz; - MPID_Datatype *dt_ptr; + MPIDU_Datatype*dt_ptr; MPI_Aint dt_true_lb; int i; diff --git a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_send.c b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_send.c index 2188f6b..895ae2d 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_send.c +++ b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_send.c @@ -27,7 +27,7 @@ int MPID_nem_llc_isend(struct MPIDI_VC *vc, const void *buf, int count, MPI_Data int mpi_errno = MPI_SUCCESS, llc_errno; int dt_contig; intptr_t data_sz; - MPID_Datatype *dt_ptr; + MPIDU_Datatype*dt_ptr; MPI_Aint dt_true_lb; int i; @@ -116,7 +116,7 @@ int MPID_nem_llc_isend(struct MPIDI_VC *vc, const void *buf, int count, MPI_Data } else { /* See MPIDI_CH3_EagerNoncontigSend (in ch3u_eager.c) */ - struct MPID_Segment *segment_ptr = MPID_Segment_alloc(); + struct MPIDU_Segment *segment_ptr = MPIDU_Segment_alloc(); MPIR_ERR_CHKANDJUMP(!segment_ptr, mpi_errno, MPI_ERR_OTHER, "**outofmemory"); #ifndef notdef_leak_0001_hack /* See also MPIDI_CH3_Request_create and _destory() */ @@ -124,14 +124,14 @@ int MPID_nem_llc_isend(struct MPIDI_VC *vc, const void *buf, int count, MPI_Data sreq->dev.segment_ptr = segment_ptr; #endif /* notdef_leak_0001_hack */ - MPID_Segment_init(buf, count, datatype, segment_ptr, 0); + MPIDU_Segment_init(buf, count, datatype, segment_ptr, 0); intptr_t segment_first = 0; intptr_t segment_size = data_sz; intptr_t last = segment_size; MPIU_Assert(last > 0); REQ_FIELD(sreq, pack_buf) = MPL_malloc((size_t) data_sz); MPIR_ERR_CHKANDJUMP(!REQ_FIELD(sreq, pack_buf), mpi_errno, MPI_ERR_OTHER, "**outofmemory"); - MPID_Segment_pack(segment_ptr, segment_first, &last, (char *) (REQ_FIELD(sreq, pack_buf))); + MPIDU_Segment_pack(segment_ptr, segment_first, &last, (char *) (REQ_FIELD(sreq, pack_buf))); MPIU_Assert(last == data_sz); write_from_buf = REQ_FIELD(sreq, pack_buf); } @@ -365,7 +365,7 @@ int MPID_nem_llc_SendNoncontig(MPIDI_VC_t * vc, MPID_Request * sreq, void *hdr, if (data_sz > 0) { REQ_FIELD(sreq, rma_buf) = MPL_malloc((size_t) sreq->dev.segment_size); MPIR_ERR_CHKANDJUMP(!REQ_FIELD(sreq, rma_buf), mpi_errno, MPI_ERR_OTHER, "**outofmemory"); - MPID_Segment_pack(sreq->dev.segment_ptr, sreq->dev.segment_first, &data_sz, + MPIDU_Segment_pack(sreq->dev.segment_ptr, sreq->dev.segment_first, &data_sz, (char *) REQ_FIELD(sreq, rma_buf)); sreq->dev.iov[1].MPL_IOV_BUF = REQ_FIELD(sreq, rma_buf); @@ -817,7 +817,7 @@ int llc_poll(int in_blocking_poll, llc_send_f sfnc, llc_recv_f rfnc) if (req->kind != MPID_REQUEST_MPROBE) { /* Unpack non-contiguous dt */ int is_contig; - MPID_Datatype_is_contig(req->dev.datatype, &is_contig); + MPIDU_Datatype_is_contig(req->dev.datatype, &is_contig); if (!is_contig) { dprintf("llc_poll,unpack noncontiguous data to user buffer\n"); @@ -828,14 +828,14 @@ int llc_poll(int in_blocking_poll, llc_send_f sfnc, llc_recv_f rfnc) * pkt->data_sz is sender's request size. */ intptr_t unpack_sz = events[0].side.initiator.length; - MPID_Segment seg; + MPIDU_Segment seg; MPI_Aint last; /* user_buf etc. are set in MPID_irecv --> MPIDI_CH3U_Recvq_FDU_or_AEP */ - MPID_Segment_init(req->dev.user_buf, req->dev.user_count, req->dev.datatype, + MPIDU_Segment_init(req->dev.user_buf, req->dev.user_count, req->dev.datatype, &seg, 0); last = unpack_sz; - MPID_Segment_unpack(&seg, 0, &last, REQ_FIELD(req, pack_buf)); + MPIDU_Segment_unpack(&seg, 0, &last, REQ_FIELD(req, pack_buf)); if (last != unpack_sz) { /* --BEGIN ERROR HANDLING-- */ /* received data was not entirely consumed by unpack() @@ -960,7 +960,7 @@ int MPID_nem_llc_issend(struct MPIDI_VC *vc, const void *buf, int count, MPI_Dat int mpi_errno = MPI_SUCCESS, llc_errno; int dt_contig; intptr_t data_sz; - MPID_Datatype *dt_ptr; + MPIDU_Datatype*dt_ptr; MPI_Aint dt_true_lb; int i; @@ -1039,20 +1039,20 @@ int MPID_nem_llc_issend(struct MPIDI_VC *vc, const void *buf, int count, MPI_Dat } else { /* See MPIDI_CH3_EagerNoncontigSend (in ch3u_eager.c) */ - struct MPID_Segment *segment_ptr = MPID_Segment_alloc(); + struct MPIDU_Segment *segment_ptr = MPIDU_Segment_alloc(); MPIR_ERR_CHKANDJUMP(!segment_ptr, mpi_errno, MPI_ERR_OTHER, "**outofmemory"); /* See also MPIDI_CH3_Request_create and _destory() */ /* in src/mpid/ch3/src/ch3u_request.c */ sreq->dev.segment_ptr = segment_ptr; - MPID_Segment_init(buf, count, datatype, segment_ptr, 0); + MPIDU_Segment_init(buf, count, datatype, segment_ptr, 0); intptr_t segment_first = 0; intptr_t segment_size = data_sz; intptr_t last = segment_size; MPIU_Assert(last > 0); REQ_FIELD(sreq, pack_buf) = MPL_malloc((size_t) data_sz); MPIR_ERR_CHKANDJUMP(!REQ_FIELD(sreq, pack_buf), mpi_errno, MPI_ERR_OTHER, "**outofmemory"); - MPID_Segment_pack(segment_ptr, segment_first, &last, (char *) (REQ_FIELD(sreq, pack_buf))); + MPIDU_Segment_pack(segment_ptr, segment_first, &last, (char *) (REQ_FIELD(sreq, pack_buf))); MPIU_Assert(last == data_sz); write_from_buf = REQ_FIELD(sreq, pack_buf); } diff --git a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_poll.c b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_poll.c index 41dcd62..35b6391 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_poll.c +++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_poll.c @@ -18,7 +18,7 @@ static void _mxm_recv_completion_cb(void *context); static int _mxm_irecv(MPID_nem_mxm_ep_t * ep, MPID_nem_mxm_req_area * req, int id, mxm_mq_h mxm_mq, mxm_tag_t mxm_tag); static int _mxm_process_rdtype(MPID_Request ** rreq_p, MPI_Datatype datatype, - MPID_Datatype * dt_ptr, intptr_t data_sz, const void *buf, + MPIDU_Datatype* dt_ptr, intptr_t data_sz, const void *buf, int count, mxm_req_buffer_t ** iov_buf, int *iov_count); #undef FUNCNAME @@ -158,7 +158,7 @@ int MPID_nem_mxm_recv(MPIDI_VC_t * vc, MPID_Request * rreq) intptr_t data_sz; int dt_contig; MPI_Aint dt_true_lb; - MPID_Datatype *dt_ptr; + MPIDU_Datatype*dt_ptr; MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_MXM_RECV); MPIDI_FUNC_ENTER(MPID_STATE_MPID_NEM_MXM_RECV); @@ -234,7 +234,7 @@ static int _mxm_handle_rreq(MPID_Request * req) int dt_contig; MPI_Aint dt_true_lb ATTRIBUTE((unused)); intptr_t userbuf_sz; - MPID_Datatype *dt_ptr; + MPIDU_Datatype*dt_ptr; intptr_t data_sz; MPID_nem_mxm_vc_area *vc_area ATTRIBUTE((unused)) = NULL; MPID_nem_mxm_req_area *req_area = NULL; @@ -290,7 +290,7 @@ static int _mxm_handle_rreq(MPID_Request * req) if (req->dev.tmpbuf != NULL) { last = req->dev.recv_data_sz; - MPID_Segment_unpack(req->dev.segment_ptr, 0, &last, req->dev.tmpbuf); + MPIDU_Segment_unpack(req->dev.segment_ptr, 0, &last, req->dev.tmpbuf); tmp_buf = req->dev.tmpbuf; } else { @@ -311,7 +311,7 @@ static int _mxm_handle_rreq(MPID_Request * req) iov[index].MPL_IOV_LEN = iov_buf[index].length; } - MPID_Segment_unpack_vector(req->dev.segment_ptr, req->dev.segment_first, &last, iov, + MPIDU_Segment_unpack_vector(req->dev.segment_ptr, req->dev.segment_first, &last, iov, &n_iov); MPL_free(iov); } @@ -437,7 +437,7 @@ static int _mxm_irecv(MPID_nem_mxm_ep_t * ep, MPID_nem_mxm_req_area * req, int i static int _mxm_process_rdtype(MPID_Request ** rreq_p, MPI_Datatype datatype, - MPID_Datatype * dt_ptr, intptr_t data_sz, const void *buf, + MPIDU_Datatype* dt_ptr, intptr_t data_sz, const void *buf, int count, mxm_req_buffer_t ** iov_buf, int *iov_count) { int mpi_errno = MPI_SUCCESS; @@ -448,23 +448,23 @@ static int _mxm_process_rdtype(MPID_Request ** rreq_p, MPI_Datatype datatype, int index; if (rreq->dev.segment_ptr == NULL) { - rreq->dev.segment_ptr = MPID_Segment_alloc(); + rreq->dev.segment_ptr = MPIDU_Segment_alloc(); MPIR_ERR_CHKANDJUMP1((rreq->dev.segment_ptr == NULL), mpi_errno, MPI_ERR_OTHER, "**nomem", - "**nomem %s", "MPID_Segment_alloc"); + "**nomem %s", "MPIDU_Segment_alloc"); } - MPID_Segment_init(buf, count, datatype, rreq->dev.segment_ptr, 0); + MPIDU_Segment_init(buf, count, datatype, rreq->dev.segment_ptr, 0); rreq->dev.segment_first = 0; rreq->dev.segment_size = data_sz; last = rreq->dev.segment_size; - MPID_Segment_count_contig_blocks(rreq->dev.segment_ptr, rreq->dev.segment_first, &last, + MPIDU_Segment_count_contig_blocks(rreq->dev.segment_ptr, rreq->dev.segment_first, &last, (MPI_Aint *) & n_iov); MPIU_Assert(n_iov > 0); iov = MPL_malloc(n_iov * sizeof(*iov)); MPIU_Assert(iov); last = rreq->dev.segment_size; - MPID_Segment_unpack_vector(rreq->dev.segment_ptr, rreq->dev.segment_first, &last, iov, &n_iov); + MPIDU_Segment_unpack_vector(rreq->dev.segment_ptr, rreq->dev.segment_first, &last, iov, &n_iov); MPIU_Assert(last == rreq->dev.segment_size); #if defined(MXM_DEBUG) && (MXM_DEBUG > 0) diff --git a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c index 01ecd7a..e2e3cac 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c +++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c @@ -24,7 +24,7 @@ static int _mxm_isend(MPID_nem_mxm_ep_t * ep, MPID_nem_mxm_req_area * req, int type, mxm_mq_h mxm_mq, int mxm_rank, int id, mxm_tag_t tag, int block); #if 0 /* Consider using this function in case non contiguous data */ static int _mxm_process_sdtype(MPID_Request ** rreq_p, MPI_Datatype datatype, - MPID_Datatype * dt_ptr, intptr_t data_sz, const void *buf, + MPIDU_Datatype* dt_ptr, intptr_t data_sz, const void *buf, int count, mxm_req_buffer_t ** iov_buf, int *iov_count); #endif @@ -211,7 +211,7 @@ int MPID_nem_mxm_SendNoncontig(MPIDI_VC_t * vc, MPID_Request * sreq, void *hdr, if (last > 0) { sreq->dev.tmpbuf = MPL_malloc((size_t) (sreq->dev.segment_size - sreq->dev.segment_first)); MPIU_Assert(sreq->dev.tmpbuf); - MPID_Segment_pack(sreq->dev.segment_ptr, sreq->dev.segment_first, &last, sreq->dev.tmpbuf); + MPIDU_Segment_pack(sreq->dev.segment_ptr, sreq->dev.segment_first, &last, sreq->dev.tmpbuf); MPIU_Assert(last == sreq->dev.segment_size); req_area->iov_buf[req_area->iov_count].ptr = sreq->dev.tmpbuf; @@ -246,7 +246,7 @@ int MPID_nem_mxm_send(MPIDI_VC_t * vc, const void *buf, MPI_Aint count, MPI_Data { int mpi_errno = MPI_SUCCESS; MPID_Request *sreq = NULL; - MPID_Datatype *dt_ptr; + MPIDU_Datatype*dt_ptr; int dt_contig; intptr_t data_sz; MPI_Aint dt_true_lb; @@ -267,8 +267,8 @@ int MPID_nem_mxm_send(MPIDI_VC_t * vc, const void *buf, MPI_Aint count, MPI_Data MPIDI_VC_FAI_send_seqnum(vc, seqnum); MPIDI_Request_set_seqnum(sreq, seqnum); if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype_get_ptr(datatype, sreq->dev.datatype_ptr); - MPID_Datatype_add_ref(sreq->dev.datatype_ptr); + MPIDU_Datatype_get_ptr(datatype, sreq->dev.datatype_ptr); + MPIDU_Datatype_add_ref(sreq->dev.datatype_ptr); } sreq->partner_request = NULL; sreq->dev.OnDataAvail = NULL; @@ -299,17 +299,17 @@ int MPID_nem_mxm_send(MPIDI_VC_t * vc, const void *buf, MPI_Aint count, MPI_Data intptr_t last; MPI_Aint packsize = 0; - sreq->dev.segment_ptr = MPID_Segment_alloc(); + sreq->dev.segment_ptr = MPIDU_Segment_alloc(); MPIR_ERR_CHKANDJUMP1((sreq->dev.segment_ptr == NULL), mpi_errno, MPI_ERR_OTHER, - "**nomem", "**nomem %s", "MPID_Segment_alloc"); + "**nomem", "**nomem %s", "MPIDU_Segment_alloc"); MPIR_Pack_size_impl(count, datatype, &packsize); last = data_sz; if (packsize > 0) { sreq->dev.tmpbuf = MPL_malloc((size_t) packsize); MPIU_Assert(sreq->dev.tmpbuf); - MPID_Segment_init(buf, count, datatype, sreq->dev.segment_ptr, 0); - MPID_Segment_pack(sreq->dev.segment_ptr, 0, &last, sreq->dev.tmpbuf); + MPIDU_Segment_init(buf, count, datatype, sreq->dev.segment_ptr, 0); + MPIDU_Segment_pack(sreq->dev.segment_ptr, 0, &last, sreq->dev.tmpbuf); req_area->iov_count = 1; req_area->iov_buf[0].ptr = sreq->dev.tmpbuf; @@ -349,7 +349,7 @@ int MPID_nem_mxm_ssend(MPIDI_VC_t * vc, const void *buf, MPI_Aint count, MPI_Dat { int mpi_errno = MPI_SUCCESS; MPID_Request *sreq = NULL; - MPID_Datatype *dt_ptr; + MPIDU_Datatype*dt_ptr; int dt_contig; intptr_t data_sz; MPI_Aint dt_true_lb; @@ -370,8 +370,8 @@ int MPID_nem_mxm_ssend(MPIDI_VC_t * vc, const void *buf, MPI_Aint count, MPI_Dat MPIDI_VC_FAI_send_seqnum(vc, seqnum); MPIDI_Request_set_seqnum(sreq, seqnum); if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype_get_ptr(datatype, sreq->dev.datatype_ptr); - MPID_Datatype_add_ref(sreq->dev.datatype_ptr); + MPIDU_Datatype_get_ptr(datatype, sreq->dev.datatype_ptr); + MPIDU_Datatype_add_ref(sreq->dev.datatype_ptr); } sreq->partner_request = NULL; sreq->dev.OnDataAvail = NULL; @@ -402,17 +402,17 @@ int MPID_nem_mxm_ssend(MPIDI_VC_t * vc, const void *buf, MPI_Aint count, MPI_Dat intptr_t last; MPI_Aint packsize = 0; - sreq->dev.segment_ptr = MPID_Segment_alloc(); + sreq->dev.segment_ptr = MPIDU_Segment_alloc(); MPIR_ERR_CHKANDJUMP1((sreq->dev.segment_ptr == NULL), mpi_errno, MPI_ERR_OTHER, - "**nomem", "**nomem %s", "MPID_Segment_alloc"); + "**nomem", "**nomem %s", "MPIDU_Segment_alloc"); MPIR_Pack_size_impl(count, datatype, &packsize); last = data_sz; if (packsize > 0) { sreq->dev.tmpbuf = MPL_malloc((size_t) packsize); MPIU_Assert(sreq->dev.tmpbuf); - MPID_Segment_init(buf, count, datatype, sreq->dev.segment_ptr, 0); - MPID_Segment_pack(sreq->dev.segment_ptr, 0, &last, sreq->dev.tmpbuf); + MPIDU_Segment_init(buf, count, datatype, sreq->dev.segment_ptr, 0); + MPIDU_Segment_pack(sreq->dev.segment_ptr, 0, &last, sreq->dev.tmpbuf); req_area->iov_count = 1; req_area->iov_buf[0].ptr = sreq->dev.tmpbuf; @@ -452,7 +452,7 @@ int MPID_nem_mxm_isend(MPIDI_VC_t * vc, const void *buf, MPI_Aint count, MPI_Dat { int mpi_errno = MPI_SUCCESS; MPID_Request *sreq = NULL; - MPID_Datatype *dt_ptr; + MPIDU_Datatype*dt_ptr; int dt_contig; intptr_t data_sz; MPI_Aint dt_true_lb; @@ -473,8 +473,8 @@ int MPID_nem_mxm_isend(MPIDI_VC_t * vc, const void *buf, MPI_Aint count, MPI_Dat MPIDI_VC_FAI_send_seqnum(vc, seqnum); MPIDI_Request_set_seqnum(sreq, seqnum); if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype_get_ptr(datatype, sreq->dev.datatype_ptr); - MPID_Datatype_add_ref(sreq->dev.datatype_ptr); + MPIDU_Datatype_get_ptr(datatype, sreq->dev.datatype_ptr); + MPIDU_Datatype_add_ref(sreq->dev.datatype_ptr); } sreq->partner_request = NULL; sreq->dev.OnDataAvail = NULL; @@ -505,17 +505,17 @@ int MPID_nem_mxm_isend(MPIDI_VC_t * vc, const void *buf, MPI_Aint count, MPI_Dat intptr_t last; MPI_Aint packsize = 0; - sreq->dev.segment_ptr = MPID_Segment_alloc(); + sreq->dev.segment_ptr = MPIDU_Segment_alloc(); MPIR_ERR_CHKANDJUMP1((sreq->dev.segment_ptr == NULL), mpi_errno, MPI_ERR_OTHER, - "**nomem", "**nomem %s", "MPID_Segment_alloc"); + "**nomem", "**nomem %s", "MPIDU_Segment_alloc"); MPIR_Pack_size_impl(count, datatype, &packsize); last = data_sz; if (packsize > 0) { sreq->dev.tmpbuf = MPL_malloc((size_t) packsize); MPIU_Assert(sreq->dev.tmpbuf); - MPID_Segment_init(buf, count, datatype, sreq->dev.segment_ptr, 0); - MPID_Segment_pack(sreq->dev.segment_ptr, 0, &last, sreq->dev.tmpbuf); + MPIDU_Segment_init(buf, count, datatype, sreq->dev.segment_ptr, 0); + MPIDU_Segment_pack(sreq->dev.segment_ptr, 0, &last, sreq->dev.tmpbuf); req_area->iov_count = 1; req_area->iov_buf[0].ptr = sreq->dev.tmpbuf; @@ -555,7 +555,7 @@ int MPID_nem_mxm_issend(MPIDI_VC_t * vc, const void *buf, MPI_Aint count, MPI_Da { int mpi_errno = MPI_SUCCESS; MPID_Request *sreq = NULL; - MPID_Datatype *dt_ptr; + MPIDU_Datatype*dt_ptr; int dt_contig; intptr_t data_sz; MPI_Aint dt_true_lb; @@ -576,8 +576,8 @@ int MPID_nem_mxm_issend(MPIDI_VC_t * vc, const void *buf, MPI_Aint count, MPI_Da MPIDI_VC_FAI_send_seqnum(vc, seqnum); MPIDI_Request_set_seqnum(sreq, seqnum); if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype_get_ptr(datatype, sreq->dev.datatype_ptr); - MPID_Datatype_add_ref(sreq->dev.datatype_ptr); + MPIDU_Datatype_get_ptr(datatype, sreq->dev.datatype_ptr); + MPIDU_Datatype_add_ref(sreq->dev.datatype_ptr); } sreq->partner_request = NULL; sreq->dev.OnDataAvail = NULL; @@ -609,17 +609,17 @@ int MPID_nem_mxm_issend(MPIDI_VC_t * vc, const void *buf, MPI_Aint count, MPI_Da MPI_Aint packsize = 0; sreq->ch.noncontig = TRUE; - sreq->dev.segment_ptr = MPID_Segment_alloc(); + sreq->dev.segment_ptr = MPIDU_Segment_alloc(); MPIR_ERR_CHKANDJUMP1((sreq->dev.segment_ptr == NULL), mpi_errno, MPI_ERR_OTHER, - "**nomem", "**nomem %s", "MPID_Segment_alloc"); + "**nomem", "**nomem %s", "MPIDU_Segment_alloc"); MPIR_Pack_size_impl(count, datatype, &packsize); last = data_sz; if (packsize > 0) { sreq->dev.tmpbuf = MPL_malloc((size_t) packsize); MPIU_Assert(sreq->dev.tmpbuf); - MPID_Segment_init(buf, count, datatype, sreq->dev.segment_ptr, 0); - MPID_Segment_pack(sreq->dev.segment_ptr, 0, &last, sreq->dev.tmpbuf); + MPIDU_Segment_init(buf, count, datatype, sreq->dev.segment_ptr, 0); + MPIDU_Segment_pack(sreq->dev.segment_ptr, 0, &last, sreq->dev.tmpbuf); req_area->iov_count = 1; req_area->iov_buf[0].ptr = sreq->dev.tmpbuf; @@ -787,7 +787,7 @@ static int _mxm_isend(MPID_nem_mxm_ep_t * ep, MPID_nem_mxm_req_area * req, #if 0 /* Consider using this function in case non contiguous data */ static int _mxm_process_sdtype(MPID_Request ** sreq_p, MPI_Datatype datatype, - MPID_Datatype * dt_ptr, intptr_t data_sz, const void *buf, + MPIDU_Datatype* dt_ptr, intptr_t data_sz, const void *buf, int count, mxm_req_buffer_t ** iov_buf, int *iov_count) { int mpi_errno = MPI_SUCCESS; @@ -798,23 +798,23 @@ static int _mxm_process_sdtype(MPID_Request ** sreq_p, MPI_Datatype datatype, int index; int size_to_copy = 0; - sreq->dev.segment_ptr = MPID_Segment_alloc(); + sreq->dev.segment_ptr = MPIDU_Segment_alloc(); MPIR_ERR_CHKANDJUMP1((sreq->dev.segment_ptr == NULL), mpi_errno, MPI_ERR_OTHER, "**nomem", - "**nomem %s", "MPID_Segment_alloc"); + "**nomem %s", "MPIDU_Segment_alloc"); - MPID_Segment_init(buf, count, datatype, sreq->dev.segment_ptr, 0); + MPIDU_Segment_init(buf, count, datatype, sreq->dev.segment_ptr, 0); sreq->dev.segment_first = 0; sreq->dev.segment_size = data_sz; last = sreq->dev.segment_size; - MPID_Segment_count_contig_blocks(sreq->dev.segment_ptr, sreq->dev.segment_first, &last, + MPIDU_Segment_count_contig_blocks(sreq->dev.segment_ptr, sreq->dev.segment_first, &last, (MPI_Aint *) & n_iov); MPIU_Assert(n_iov > 0); iov = MPL_malloc(n_iov * sizeof(*iov)); MPIU_Assert(iov); last = sreq->dev.segment_size; - MPID_Segment_pack_vector(sreq->dev.segment_ptr, sreq->dev.segment_first, &last, iov, &n_iov); + MPIDU_Segment_pack_vector(sreq->dev.segment_ptr, sreq->dev.segment_first, &last, iov, &n_iov); MPIU_Assert(last == sreq->dev.segment_size); #if defined(MXM_DEBUG) && (MXM_DEBUG > 0) diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_msg.c b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_msg.c index c66191e..659ebe5 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_msg.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_msg.c @@ -299,7 +299,7 @@ int MPID_nem_ofi_SendNoncontig(MPIDI_VC_t * vc, MPIU_Memcpy(pack_buffer + buf_offset, sreq->dev.ext_hdr_ptr, sreq->dev.ext_hdr_sz); buf_offset += sreq->dev.ext_hdr_sz; } - MPID_Segment_pack(sreq->dev.segment_ptr, first, &last, pack_buffer + buf_offset); + MPIDU_Segment_pack(sreq->dev.segment_ptr, first, &last, pack_buffer + buf_offset); START_COMM(); MPID_nem_ofi_poll(MPID_NONBLOCKING_POLL); END_FUNC_RC(FCNAME); diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_tagged_template.c b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_tagged_template.c index 0875ee7..6b54306 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_tagged_template.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_tagged_template.c @@ -382,7 +382,7 @@ int ADD_SUFFIX(MPID_nem_ofi_recv_posted)(struct MPIDI_VC *vc, struct MPID_Reques fi_addr_t remote_proc = 0; intptr_t data_sz; MPI_Aint dt_true_lb; - MPID_Datatype *dt_ptr; + MPIDU_Datatype*dt_ptr; MPIU_Context_id_t context_id; char *recv_buffer; BEGIN_FUNC(FCNAME); diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c index bd2e22e..ca2562f 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c @@ -290,7 +290,7 @@ static int send_noncontig_pkt(MPIDI_VC_t *vc, MPID_Request *sreq, void *hdr_p) if (data_sz) { intptr_t first = sreq->dev.segment_first; intptr_t last = sreq->dev.segment_first + sent_sz; - MPID_Segment_pack(sreq->dev.segment_ptr, first, &last, sendbuf_ptr); + MPIDU_Segment_pack(sreq->dev.segment_ptr, first, &last, sendbuf_ptr); sendbuf_ptr += sent_sz; if (remaining) { /* Post MEs for the remote gets */ @@ -299,7 +299,7 @@ static int send_noncontig_pkt(MPIDI_VC_t *vc, MPID_Request *sreq, void *hdr_p) *offset = (ptl_size_t)TMPBUF(sreq); first = last; last = sreq->dev.segment_size; - MPID_Segment_pack(sreq->dev.segment_ptr, first, &last, TMPBUF(sreq)); + MPIDU_Segment_pack(sreq->dev.segment_ptr, first, &last, TMPBUF(sreq)); MPIU_Assert(last == sreq->dev.segment_size); REQ_PTL(sreq)->num_gets = remaining / MPIDI_nem_ptl_ni_limits.max_msg_size; diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_recv.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_recv.c index b300af9..aa3ea1b 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_recv.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_recv.c @@ -31,7 +31,7 @@ static void dequeue_req(const ptl_event_t *e) rreq->status.MPI_SOURCE = NPTL_MATCH_GET_RANK(e->match_bits); rreq->status.MPI_TAG = NPTL_MATCH_GET_TAG(e->match_bits); - MPID_Datatype_get_size_macro(rreq->dev.datatype, r_len); + MPIDU_Datatype_get_size_macro(rreq->dev.datatype, r_len); r_len *= rreq->dev.user_count; s_len = NPTL_HEADER_GET_LENGTH(e->hdr_data); @@ -94,7 +94,7 @@ static int handler_recv_dequeue_complete(const ptl_event_t *e) MPI_Aint last; MPI_Aint dt_true_lb; intptr_t data_sz; - MPID_Datatype *dt_ptr ATTRIBUTE((unused)); + MPIDU_Datatype*dt_ptr ATTRIBUTE((unused)); MPIDI_STATE_DECL(MPID_STATE_HANDLER_RECV_DEQUEUE_COMPLETE); @@ -114,7 +114,7 @@ static int handler_recv_dequeue_complete(const ptl_event_t *e) MPIU_Memcpy((char *)rreq->dev.user_buf + dt_true_lb, e->start, e->mlength); } else { last = e->mlength; - MPID_Segment_unpack(rreq->dev.segment_ptr, rreq->dev.segment_first, &last, e->start); + MPIDU_Segment_unpack(rreq->dev.segment_ptr, rreq->dev.segment_first, &last, e->start); if (last != e->mlength) MPIR_ERR_SET(rreq->status.MPI_ERROR, MPI_ERR_TYPE, "**dtypemismatch"); } @@ -124,8 +124,8 @@ static int handler_recv_dequeue_complete(const ptl_event_t *e) are a multiple of a single basic element. Currently, we do not detect mismatches with datatypes constructed of more than one basic type */ MPI_Datatype dt_basic_type; - MPID_Datatype_get_basic_type(rreq->dev.datatype, dt_basic_type); - if (dt_basic_type != MPI_DATATYPE_NULL && (e->mlength % MPID_Datatype_get_basic_size(dt_basic_type)) != 0) + MPIDU_Datatype_get_basic_type(rreq->dev.datatype, dt_basic_type); + if (dt_basic_type != MPI_DATATYPE_NULL && (e->mlength % MPIDU_Datatype_get_basic_size(dt_basic_type)) != 0) MPIR_ERR_SET(rreq->status.MPI_ERROR, MPI_ERR_TYPE, "**dtypemismatch"); } @@ -160,7 +160,7 @@ static int handler_recv_big_get(const ptl_event_t *e) /* if we used a temporary buffer, unpack the data */ if (REQ_PTL(rreq)->chunk_buffer[0]) { last = rreq->dev.segment_size; - MPID_Segment_unpack(rreq->dev.segment_ptr, rreq->dev.segment_first, &last, REQ_PTL(rreq)->chunk_buffer[0]); + MPIDU_Segment_unpack(rreq->dev.segment_ptr, rreq->dev.segment_first, &last, REQ_PTL(rreq)->chunk_buffer[0]); MPIU_Assert(last == rreq->dev.segment_size); } mpi_errno = handler_recv_complete(e); @@ -230,7 +230,7 @@ static int handler_recv_unpack_complete(const ptl_event_t *e) buf = REQ_PTL(rreq)->chunk_buffer[0]; last = rreq->dev.segment_first + e->mlength; - MPID_Segment_unpack(rreq->dev.segment_ptr, rreq->dev.segment_first, &last, buf); + MPIDU_Segment_unpack(rreq->dev.segment_ptr, rreq->dev.segment_first, &last, buf); MPIU_Assert(last == rreq->dev.segment_first + e->mlength); mpi_errno = handler_recv_complete(e); @@ -279,7 +279,7 @@ static int handler_recv_dequeue_large(const ptl_event_t *e) int ret; int dt_contig; intptr_t data_sz; - MPID_Datatype *dt_ptr; + MPIDU_Datatype*dt_ptr; MPI_Aint dt_true_lb; MPI_Aint last; MPIU_CHKPMEM_DECL(1); @@ -302,7 +302,7 @@ static int handler_recv_dequeue_large(const ptl_event_t *e) MPIU_Memcpy((char *)rreq->dev.user_buf + dt_true_lb, e->start, e->mlength); } else { last = e->mlength; - MPID_Segment_unpack(rreq->dev.segment_ptr, 0, &last, e->start); + MPIDU_Segment_unpack(rreq->dev.segment_ptr, 0, &last, e->start); MPIU_Assert(last == e->mlength); rreq->dev.segment_first = e->mlength; } @@ -328,7 +328,7 @@ static int handler_recv_dequeue_large(const ptl_event_t *e) last = rreq->dev.segment_size; rreq->dev.iov_count = MPL_IOV_LIMIT; - MPID_Segment_pack_vector(rreq->dev.segment_ptr, rreq->dev.segment_first, &last, rreq->dev.iov, &rreq->dev.iov_count); + MPIDU_Segment_pack_vector(rreq->dev.segment_ptr, rreq->dev.segment_first, &last, rreq->dev.iov, &rreq->dev.iov_count); if (last == rreq->dev.segment_size && rreq->dev.segment_size <= MPIDI_nem_ptl_ni_limits.max_msg_size + PTL_LARGE_THRESHOLD) { /* Rest of message fits in one IOV */ @@ -401,7 +401,7 @@ static int handler_recv_dequeue_unpack_large(const ptl_event_t *e) MPIU_Assert(e->mlength == PTL_LARGE_THRESHOLD); last = PTL_LARGE_THRESHOLD; - MPID_Segment_unpack(rreq->dev.segment_ptr, rreq->dev.segment_first, &last, buf); + MPIDU_Segment_unpack(rreq->dev.segment_ptr, rreq->dev.segment_first, &last, buf); MPIU_Assert(last == PTL_LARGE_THRESHOLD); rreq->dev.segment_first += PTL_LARGE_THRESHOLD; MPL_free(REQ_PTL(rreq)->chunk_buffer[0]); @@ -431,7 +431,7 @@ int MPID_nem_ptl_recv_posted(MPIDI_VC_t *vc, MPID_Request *rreq) ptl_me_t me; int dt_contig; intptr_t data_sz; - MPID_Datatype *dt_ptr; + MPIDU_Datatype*dt_ptr; MPI_Aint dt_true_lb; MPI_Aint last; ptl_process_t id_any; @@ -488,15 +488,15 @@ int MPID_nem_ptl_recv_posted(MPIDI_VC_t *vc, MPID_Request *rreq) } else { /* small noncontig */ MPL_DBG_MSG(MPIDI_CH3_DBG_CHANNEL, VERBOSE, "Small noncontig message"); - rreq->dev.segment_ptr = MPID_Segment_alloc(); - MPIR_ERR_CHKANDJUMP1(rreq->dev.segment_ptr == NULL, mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", "MPID_Segment_alloc"); - MPID_Segment_init(rreq->dev.user_buf, rreq->dev.user_count, rreq->dev.datatype, rreq->dev.segment_ptr, 0); + rreq->dev.segment_ptr = MPIDU_Segment_alloc(); + MPIR_ERR_CHKANDJUMP1(rreq->dev.segment_ptr == NULL, mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", "MPIDU_Segment_alloc"); + MPIDU_Segment_init(rreq->dev.user_buf, rreq->dev.user_count, rreq->dev.datatype, rreq->dev.segment_ptr, 0); rreq->dev.segment_first = 0; rreq->dev.segment_size = data_sz; last = rreq->dev.segment_size; rreq->dev.iov_count = MPL_IOV_LIMIT; - MPID_Segment_pack_vector(rreq->dev.segment_ptr, rreq->dev.segment_first, &last, rreq->dev.iov, &rreq->dev.iov_count); + MPIDU_Segment_pack_vector(rreq->dev.segment_ptr, rreq->dev.segment_first, &last, rreq->dev.iov, &rreq->dev.iov_count); if (last == rreq->dev.segment_size) { /* entire message fits in IOV */ @@ -526,15 +526,15 @@ int MPID_nem_ptl_recv_posted(MPIDI_VC_t *vc, MPID_Request *rreq) } else { /* large noncontig */ MPL_DBG_MSG(MPIDI_CH3_DBG_CHANNEL, VERBOSE, "Large noncontig message"); - rreq->dev.segment_ptr = MPID_Segment_alloc(); - MPIR_ERR_CHKANDJUMP1(rreq->dev.segment_ptr == NULL, mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", "MPID_Segment_alloc"); - MPID_Segment_init(rreq->dev.user_buf, rreq->dev.user_count, rreq->dev.datatype, rreq->dev.segment_ptr, 0); + rreq->dev.segment_ptr = MPIDU_Segment_alloc(); + MPIR_ERR_CHKANDJUMP1(rreq->dev.segment_ptr == NULL, mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", "MPIDU_Segment_alloc"); + MPIDU_Segment_init(rreq->dev.user_buf, rreq->dev.user_count, rreq->dev.datatype, rreq->dev.segment_ptr, 0); rreq->dev.segment_first = 0; rreq->dev.segment_size = data_sz; last = PTL_LARGE_THRESHOLD; rreq->dev.iov_count = MPL_IOV_LIMIT; - MPID_Segment_pack_vector(rreq->dev.segment_ptr, rreq->dev.segment_first, &last, rreq->dev.iov, &rreq->dev.iov_count); + MPIDU_Segment_pack_vector(rreq->dev.segment_ptr, rreq->dev.segment_first, &last, rreq->dev.iov, &rreq->dev.iov_count); if (last == PTL_LARGE_THRESHOLD) { /* first chunk fits in IOV */ @@ -694,7 +694,7 @@ int MPID_nem_ptl_lmt_start_recv(MPIDI_VC_t *vc, MPID_Request *rreq, MPL_IOV s_c int mpi_errno = MPI_SUCCESS; int dt_contig; intptr_t data_sz; - MPID_Datatype *dt_ptr; + MPIDU_Datatype*dt_ptr; MPI_Aint dt_true_lb; ptl_match_bits_t match_bits; int was_incomplete; @@ -728,20 +728,20 @@ int MPID_nem_ptl_lmt_start_recv(MPIDI_VC_t *vc, MPID_Request *rreq, MPL_IOV s_c else { MPI_Aint last; - rreq->dev.segment_ptr = MPID_Segment_alloc(); + rreq->dev.segment_ptr = MPIDU_Segment_alloc(); MPIR_ERR_CHKANDJUMP1(rreq->dev.segment_ptr == NULL, mpi_errno, MPI_ERR_OTHER, "**nomem", - "**nomem %s", "MPID_Segment_alloc"); - MPID_Segment_init(rreq->dev.user_buf, rreq->dev.user_count, rreq->dev.datatype, + "**nomem %s", "MPIDU_Segment_alloc"); + MPIDU_Segment_init(rreq->dev.user_buf, rreq->dev.user_count, rreq->dev.datatype, rreq->dev.segment_ptr, 0); rreq->dev.segment_first = 0; rreq->dev.segment_size = data_sz; last = PTL_LARGE_THRESHOLD; - MPID_Segment_unpack(rreq->dev.segment_ptr, rreq->dev.segment_first, &last, rreq->dev.tmpbuf); + MPIDU_Segment_unpack(rreq->dev.segment_ptr, rreq->dev.segment_first, &last, rreq->dev.tmpbuf); MPIU_Assert(last == PTL_LARGE_THRESHOLD); rreq->dev.segment_first = PTL_LARGE_THRESHOLD; last = rreq->dev.segment_size; rreq->dev.iov_count = MPL_IOV_LIMIT; - MPID_Segment_pack_vector(rreq->dev.segment_ptr, rreq->dev.segment_first, &last, rreq->dev.iov, + MPIDU_Segment_pack_vector(rreq->dev.segment_ptr, rreq->dev.segment_first, &last, rreq->dev.iov, &rreq->dev.iov_count); if (last == rreq->dev.segment_size && last <= MPIDI_nem_ptl_ni_limits.max_msg_size + PTL_LARGE_THRESHOLD) { /* Rest of message fits in one IOV */ diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c index b49a22c..be3ec5f 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c @@ -109,7 +109,7 @@ static int send_msg(ptl_hdr_data_t ssend_flag, struct MPIDI_VC *vc, const void * intptr_t data_sz; int dt_contig; MPI_Aint dt_true_lb; - MPID_Datatype *dt_ptr; + MPIDU_Datatype*dt_ptr; MPID_Request *sreq = NULL; ptl_me_t me; int initial_iov_count, remaining_iov_count; @@ -161,15 +161,15 @@ static int send_msg(ptl_hdr_data_t ssend_flag, struct MPIDI_VC *vc, const void * /* noncontig data */ MPL_DBG_MSG(MPIDI_CH3_DBG_CHANNEL, VERBOSE, "Small noncontig message"); - sreq->dev.segment_ptr = MPID_Segment_alloc(); - MPIR_ERR_CHKANDJUMP1(sreq->dev.segment_ptr == NULL, mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", "MPID_Segment_alloc"); - MPID_Segment_init(buf, count, datatype, sreq->dev.segment_ptr, 0); + sreq->dev.segment_ptr = MPIDU_Segment_alloc(); + MPIR_ERR_CHKANDJUMP1(sreq->dev.segment_ptr == NULL, mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", "MPIDU_Segment_alloc"); + MPIDU_Segment_init(buf, count, datatype, sreq->dev.segment_ptr, 0); sreq->dev.segment_first = 0; sreq->dev.segment_size = data_sz; last = sreq->dev.segment_size; sreq->dev.iov_count = MPL_IOV_LIMIT; - MPID_Segment_pack_vector(sreq->dev.segment_ptr, sreq->dev.segment_first, &last, sreq->dev.iov, &sreq->dev.iov_count); + MPIDU_Segment_pack_vector(sreq->dev.segment_ptr, sreq->dev.segment_first, &last, sreq->dev.iov, &sreq->dev.iov_count); if (last == sreq->dev.segment_size) { /* IOV is able to describe entire message */ @@ -194,10 +194,10 @@ static int send_msg(ptl_hdr_data_t ssend_flag, struct MPIDI_VC *vc, const void * /* IOV is not long enough to describe entire message */ MPL_DBG_MSG(MPIDI_CH3_DBG_CHANNEL, VERBOSE, " IOV too long: using bounce buffer"); MPIU_CHKPMEM_MALLOC(REQ_PTL(sreq)->chunk_buffer[0], void *, data_sz, mpi_errno, "chunk_buffer"); - MPID_Segment_init(buf, count, datatype, sreq->dev.segment_ptr, 0); + MPIDU_Segment_init(buf, count, datatype, sreq->dev.segment_ptr, 0); sreq->dev.segment_first = 0; last = data_sz; - MPID_Segment_pack(sreq->dev.segment_ptr, sreq->dev.segment_first, &last, REQ_PTL(sreq)->chunk_buffer[0]); + MPIDU_Segment_pack(sreq->dev.segment_ptr, sreq->dev.segment_first, &last, REQ_PTL(sreq)->chunk_buffer[0]); MPIU_Assert(last == sreq->dev.segment_size); REQ_PTL(sreq)->event_handler = handler_send; ret = MPID_nem_ptl_rptl_put(MPIDI_nem_ptl_global_md, (ptl_size_t)REQ_PTL(sreq)->chunk_buffer[0], data_sz, PTL_NO_ACK_REQ, @@ -226,15 +226,15 @@ static int send_msg(ptl_hdr_data_t ssend_flag, struct MPIDI_VC *vc, const void * /* Large noncontig data */ MPL_DBG_MSG(MPIDI_CH3_DBG_CHANNEL, VERBOSE, "Large noncontig message"); - sreq->dev.segment_ptr = MPID_Segment_alloc(); - MPIR_ERR_CHKANDJUMP1(sreq->dev.segment_ptr == NULL, mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", "MPID_Segment_alloc"); - MPID_Segment_init(buf, count, datatype, sreq->dev.segment_ptr, 0); + sreq->dev.segment_ptr = MPIDU_Segment_alloc(); + MPIR_ERR_CHKANDJUMP1(sreq->dev.segment_ptr == NULL, mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", "MPIDU_Segment_alloc"); + MPIDU_Segment_init(buf, count, datatype, sreq->dev.segment_ptr, 0); sreq->dev.segment_first = 0; sreq->dev.segment_size = data_sz; last = PTL_LARGE_THRESHOLD; sreq->dev.iov_count = MPL_IOV_LIMIT; - MPID_Segment_pack_vector(sreq->dev.segment_ptr, sreq->dev.segment_first, &last, sreq->dev.iov, &sreq->dev.iov_count); + MPIDU_Segment_pack_vector(sreq->dev.segment_ptr, sreq->dev.segment_first, &last, sreq->dev.iov, &sreq->dev.iov_count); initial_iov_count = sreq->dev.iov_count; sreq->dev.segment_first = last; @@ -247,7 +247,7 @@ static int send_msg(ptl_hdr_data_t ssend_flag, struct MPIDI_VC *vc, const void * sreq->dev.iov_count = MPL_IOV_LIMIT - sreq->dev.iov_count; last = sreq->dev.segment_size; - MPID_Segment_pack_vector(sreq->dev.segment_ptr, sreq->dev.segment_first, &last, + MPIDU_Segment_pack_vector(sreq->dev.segment_ptr, sreq->dev.segment_first, &last, &sreq->dev.iov[initial_iov_count], &sreq->dev.iov_count); remaining_iov_count = sreq->dev.iov_count; @@ -304,7 +304,7 @@ static int send_msg(ptl_hdr_data_t ssend_flag, struct MPIDI_VC *vc, const void * MPIU_CHKPMEM_MALLOC(REQ_PTL(sreq)->chunk_buffer[0], void *, data_sz, mpi_errno, "tmpbuf"); last = data_sz; - MPID_Segment_pack(sreq->dev.segment_ptr, 0, &last, REQ_PTL(sreq)->chunk_buffer[0]); + MPIDU_Segment_pack(sreq->dev.segment_ptr, 0, &last, REQ_PTL(sreq)->chunk_buffer[0]); MPIU_Assert(last == data_sz); big_meappend((char *)REQ_PTL(sreq)->chunk_buffer[0] + PTL_LARGE_THRESHOLD, data_sz - PTL_LARGE_THRESHOLD, vc, diff --git a/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt.c b/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt.c index 8f13cee..7370a35 100644 --- a/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt.c +++ b/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt.c @@ -538,7 +538,7 @@ static int do_cts(MPIDI_VC_t *vc, MPID_Request *rreq, int *complete) intptr_t data_sz; int dt_contig ATTRIBUTE((unused)); MPI_Aint dt_true_lb ATTRIBUTE((unused)); - MPID_Datatype * dt_ptr; + MPIDU_Datatype* dt_ptr; MPL_IOV s_cookie; MPIDI_STATE_DECL(MPID_STATE_DO_CTS); diff --git a/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt_dma.c b/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt_dma.c index 4f8f3bc..f0d39e2 100644 --- a/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt_dma.c +++ b/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt_dma.c @@ -234,7 +234,7 @@ static int send_sreq_data(MPIDI_VC_t *vc, MPID_Request *sreq, knem_cookie_t *s_c int dt_contig; MPI_Aint dt_true_lb; intptr_t data_sz; - MPID_Datatype * dt_ptr; + MPIDU_Datatype* dt_ptr; /* MT: this code assumes only one thread can be at this point at a time */ if (knem_fd < 0) { @@ -261,11 +261,11 @@ static int send_sreq_data(MPIDI_VC_t *vc, MPID_Request *sreq, knem_cookie_t *s_c /* segment_ptr may be non-null when this is a continuation of a many-part message that we couldn't fit in one single flight of iovs. */ - sreq->dev.segment_ptr = MPID_Segment_alloc(); + sreq->dev.segment_ptr = MPIDU_Segment_alloc(); MPIR_ERR_CHKANDJUMP1((sreq->dev.segment_ptr == NULL), mpi_errno, MPI_ERR_OTHER, "**nomem", - "**nomem %s", "MPID_Segment_alloc"); - MPID_Segment_init(sreq->dev.user_buf, sreq->dev.user_count, + "**nomem %s", "MPIDU_Segment_alloc"); + MPIDU_Segment_init(sreq->dev.user_buf, sreq->dev.user_count, sreq->dev.datatype, sreq->dev.segment_ptr, 0); sreq->dev.segment_first = 0; sreq->dev.segment_size = data_sz; @@ -358,7 +358,7 @@ int MPID_nem_lmt_dma_start_recv(MPIDI_VC_t *vc, MPID_Request *rreq, MPL_IOV s_co int dt_contig; MPI_Aint dt_true_lb; intptr_t data_sz; - MPID_Datatype * dt_ptr; + MPIDU_Datatype* dt_ptr; volatile knem_status_t *status; knem_status_t current_status; struct lmt_dma_node *node = NULL; @@ -390,11 +390,11 @@ int MPID_nem_lmt_dma_start_recv(MPIDI_VC_t *vc, MPID_Request *rreq, MPL_IOV s_co many-part message that we couldn't fit in one single flight of iovs. */ MPIU_Assert(rreq->dev.segment_ptr == NULL); - rreq->dev.segment_ptr = MPID_Segment_alloc(); + rreq->dev.segment_ptr = MPIDU_Segment_alloc(); MPIR_ERR_CHKANDJUMP1((rreq->dev.segment_ptr == NULL), mpi_errno, MPI_ERR_OTHER, "**nomem", - "**nomem %s", "MPID_Segment_alloc"); - MPID_Segment_init(rreq->dev.user_buf, rreq->dev.user_count, + "**nomem %s", "MPIDU_Segment_alloc"); + MPIDU_Segment_init(rreq->dev.user_buf, rreq->dev.user_count, rreq->dev.datatype, rreq->dev.segment_ptr, 0); rreq->dev.segment_first = 0; rreq->dev.segment_size = data_sz; diff --git a/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt_shm.c b/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt_shm.c index e3091ad..6661cce 100644 --- a/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt_shm.c +++ b/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt_shm.c @@ -126,7 +126,7 @@ int MPID_nem_lmt_shm_initiate_lmt(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, MPID_Req intptr_t data_sz; int dt_contig ATTRIBUTE((unused)); MPI_Aint dt_true_lb ATTRIBUTE((unused)); - MPID_Datatype * dt_ptr; + MPIDU_Datatype* dt_ptr; MPID_nem_pkt_lmt_rts_t * const rts_pkt = (MPID_nem_pkt_lmt_rts_t *)pkt; MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_LMT_SHM_INITIATE_LMT); @@ -414,9 +414,9 @@ static int get_next_req(MPIDI_VC_t *vc) /* Check to see if we've already allocated a seg for this req. This can happen if both sides allocated copy buffers, and we decided to use the remote side's buffer. */ - req->dev.segment_ptr = MPID_Segment_alloc(); - MPIR_ERR_CHKANDJUMP1((req->dev.segment_ptr == NULL), mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", "MPID_Segment_alloc"); - MPID_Segment_init(req->dev.user_buf, req->dev.user_count, req->dev.datatype, req->dev.segment_ptr, 0); + req->dev.segment_ptr = MPIDU_Segment_alloc(); + MPIR_ERR_CHKANDJUMP1((req->dev.segment_ptr == NULL), mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", "MPIDU_Segment_alloc"); + MPIDU_Segment_init(req->dev.user_buf, req->dev.user_count, req->dev.datatype, req->dev.segment_ptr, 0); req->dev.segment_first = 0; } vc_ch->lmt_buf_num = 0; @@ -493,7 +493,7 @@ static int lmt_shm_send_progress(MPIDI_VC_t *vc, MPID_Request *req, int *done) else copy_limit = MPID_NEM_COPY_BUF_LEN; last = (data_sz - first <= copy_limit) ? data_sz : first + copy_limit; - MPID_Segment_pack(req->dev.segment_ptr, first, &last, (void *)copy_buf->buf[buf_num]); /* cast away volatile */ + MPIDU_Segment_pack(req->dev.segment_ptr, first, &last, (void *)copy_buf->buf[buf_num]); /* cast away volatile */ OPA_write_barrier(); MPIU_Assign_trunc(copy_buf->len[buf_num].val, (last - first), volatile int); @@ -585,7 +585,7 @@ static int lmt_shm_recv_progress(MPIDI_VC_t *vc, MPID_Request *req, int *done) src_buf = ((char *)copy_buf->buf[buf_num]) - surfeit; /* cast away volatile */ last = expected_last = (data_sz - first <= surfeit + len) ? data_sz : first + surfeit + len; - MPID_Segment_unpack(req->dev.segment_ptr, first, &last, src_buf); + MPIDU_Segment_unpack(req->dev.segment_ptr, first, &last, src_buf); MPL_DBG_MSG_FMT(MPIDI_CH3_DBG_CHANNEL, VERBOSE, (MPL_DBG_FDEST, "recvd data. last=%" PRIdPTR " data_sz=%" PRIdPTR, last, data_sz)); diff --git a/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt_vmsplice.c b/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt_vmsplice.c index dea4739..d8f1909 100644 --- a/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt_vmsplice.c +++ b/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt_vmsplice.c @@ -93,7 +93,7 @@ static int populate_iov_from_req(MPID_Request *req) int dt_contig; MPI_Aint dt_true_lb; intptr_t data_sz; - MPID_Datatype * dt_ptr; + MPIDU_Datatype* dt_ptr; /* find out contig/noncontig, size, and lb for the datatype */ MPIDI_Datatype_get_info(req->dev.user_count, req->dev.datatype, @@ -113,11 +113,11 @@ static int populate_iov_from_req(MPID_Request *req) req->dev.iov_offset = 0; /* XXX DJG FIXME where is this segment freed? */ - req->dev.segment_ptr = MPID_Segment_alloc(); + req->dev.segment_ptr = MPIDU_Segment_alloc(); MPIR_ERR_CHKANDJUMP1((req->dev.segment_ptr == NULL), mpi_errno, MPI_ERR_OTHER, "**nomem", - "**nomem %s", "MPID_Segment_alloc"); - MPID_Segment_init(req->dev.user_buf, req->dev.user_count, + "**nomem %s", "MPIDU_Segment_alloc"); + MPIDU_Segment_init(req->dev.user_buf, req->dev.user_count, req->dev.datatype, req->dev.segment_ptr, 0); req->dev.segment_first = 0; req->dev.segment_size = data_sz; diff --git a/src/mpid/ch3/include/mpid_rma_issue.h b/src/mpid/ch3/include/mpid_rma_issue.h index a852550..eb27220 100644 --- a/src/mpid/ch3/include/mpid_rma_issue.h +++ b/src/mpid/ch3/include/mpid_rma_issue.h @@ -64,7 +64,7 @@ static inline int immed_copy(void *src, void *dest, size_t len) #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) static inline void fill_in_derived_dtp_info(MPIDI_RMA_dtype_info * dtype_info, void *dataloop, - MPID_Datatype * dtp) + MPIDU_Datatype* dtp) { MPIDI_STATE_DECL(MPID_STATE_FILL_IN_DERIVED_DTP_INFO); MPIDI_FUNC_ENTER(MPID_STATE_FILL_IN_DERIVED_DTP_INFO); @@ -100,7 +100,7 @@ static inline void fill_in_derived_dtp_info(MPIDI_RMA_dtype_info * dtype_info, v #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) static int init_accum_ext_pkt(MPIDI_CH3_Pkt_flags_t flags, - MPID_Datatype * target_dtp, intptr_t stream_offset, + MPIDU_Datatype* target_dtp, intptr_t stream_offset, void **ext_hdr_ptr, MPI_Aint * ext_hdr_sz) { MPI_Aint _ext_hdr_sz = 0, _total_sz = 0; @@ -186,7 +186,7 @@ static int init_accum_ext_pkt(MPIDI_CH3_Pkt_flags_t flags, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) static int init_get_accum_ext_pkt(MPIDI_CH3_Pkt_flags_t flags, - MPID_Datatype * target_dtp, intptr_t stream_offset, + MPIDU_Datatype* target_dtp, intptr_t stream_offset, void **ext_hdr_ptr, MPI_Aint * ext_hdr_sz) { int mpi_errno = MPI_SUCCESS; @@ -224,7 +224,7 @@ static int issue_from_origin_buffer(MPIDI_RMA_Op_t * rma_op, MPIDI_VC_t * vc, MPID_Request ** req_ptr) { MPI_Datatype target_datatype; - MPID_Datatype *target_dtp = NULL, *origin_dtp = NULL; + MPIDU_Datatype*target_dtp = NULL, *origin_dtp = NULL; int is_origin_contig; MPL_IOV iov[MPL_IOV_LIMIT]; int iovcnt = 0; @@ -249,7 +249,7 @@ static int issue_from_origin_buffer(MPIDI_RMA_Op_t * rma_op, MPIDI_VC_t * vc, /* Judge if target datatype is derived datatype. */ MPIDI_CH3_PKT_RMA_GET_TARGET_DATATYPE(rma_op->pkt, target_datatype, mpi_errno); if (!MPIR_DATATYPE_IS_PREDEFINED(target_datatype)) { - MPID_Datatype_get_ptr(target_datatype, target_dtp); + MPIDU_Datatype_get_ptr(target_datatype, target_dtp); /* Set dataloop size in pkt header */ MPIDI_CH3_PKT_RMA_SET_DATALOOP_SIZE(rma_op->pkt, target_dtp->dataloop_size, mpi_errno); @@ -258,12 +258,12 @@ static int issue_from_origin_buffer(MPIDI_RMA_Op_t * rma_op, MPIDI_VC_t * vc, if (is_empty_origin == FALSE) { /* Judge if origin datatype is derived datatype. */ if (!MPIR_DATATYPE_IS_PREDEFINED(rma_op->origin_datatype)) { - MPID_Datatype_get_ptr(rma_op->origin_datatype, origin_dtp); + MPIDU_Datatype_get_ptr(rma_op->origin_datatype, origin_dtp); } /* check if origin data is contiguous and get true lb */ - MPID_Datatype_is_contig(rma_op->origin_datatype, &is_origin_contig); - MPID_Datatype_get_true_lb(rma_op->origin_datatype, &dt_true_lb); + MPIDU_Datatype_is_contig(rma_op->origin_datatype, &is_origin_contig); + MPIDU_Datatype_get_true_lb(rma_op->origin_datatype, &dt_true_lb); } else { /* origin buffer is empty, mark origin data as contig and true_lb as 0. */ @@ -298,7 +298,7 @@ static int issue_from_origin_buffer(MPIDI_RMA_Op_t * rma_op, MPIDI_VC_t * vc, if (origin_dtp != NULL) { if (req == NULL) { - MPID_Datatype_release(origin_dtp); + MPIDU_Datatype_release(origin_dtp); } else { /* this will cause the datatype to be freed when the request @@ -349,11 +349,11 @@ static int issue_from_origin_buffer(MPIDI_RMA_Op_t * rma_op, MPIDI_VC_t * vc, } else { /* origin data is non-contiguous */ - req->dev.segment_ptr = MPID_Segment_alloc(); + req->dev.segment_ptr = MPIDU_Segment_alloc(); MPIR_ERR_CHKANDJUMP1(req->dev.segment_ptr == NULL, mpi_errno, - MPI_ERR_OTHER, "**nomem", "**nomem %s", "MPID_Segment_alloc"); + MPI_ERR_OTHER, "**nomem", "**nomem %s", "MPIDU_Segment_alloc"); - MPID_Segment_init(rma_op->origin_addr, rma_op->origin_count, + MPIDU_Segment_init(rma_op->origin_addr, rma_op->origin_count, rma_op->origin_datatype, req->dev.segment_ptr, 0); req->dev.segment_first = stream_offset; req->dev.segment_size = stream_offset + stream_size; @@ -370,7 +370,7 @@ static int issue_from_origin_buffer(MPIDI_RMA_Op_t * rma_op, MPIDI_VC_t * vc, fn_exit: /* release the target datatype */ if (target_dtp) - MPID_Datatype_release(target_dtp); + MPIDU_Datatype_release(target_dtp); (*req_ptr) = req; MPIDI_FUNC_EXIT(MPID_STATE_ISSUE_FROM_ORIGIN_BUFFER); @@ -378,7 +378,7 @@ static int issue_from_origin_buffer(MPIDI_RMA_Op_t * rma_op, MPIDI_VC_t * vc, fn_fail: if (req) { if (req->dev.datatype_ptr) - MPID_Datatype_release(req->dev.datatype_ptr); + MPIDU_Datatype_release(req->dev.datatype_ptr); if (req->dev.ext_hdr_ptr) MPL_free(req->dev.ext_hdr_ptr); MPID_Request_release(req); @@ -402,7 +402,7 @@ static int issue_put_op(MPIDI_RMA_Op_t * rma_op, MPID_Win * win_ptr, MPIDI_CH3_Pkt_put_t *put_pkt = &rma_op->pkt.put; MPID_Request *curr_req = NULL; MPI_Datatype target_datatype; - MPID_Datatype *target_dtp_ptr = NULL; + MPIDU_Datatype*target_dtp_ptr = NULL; MPIDI_CH3_Ext_pkt_put_derived_t *ext_hdr_ptr = NULL; MPI_Aint ext_hdr_sz = 0; int mpi_errno = MPI_SUCCESS; @@ -423,12 +423,12 @@ static int issue_put_op(MPIDI_RMA_Op_t * rma_op, MPID_Win * win_ptr, } else { MPI_Aint origin_type_size; - MPID_Datatype_get_size_macro(rma_op->origin_datatype, origin_type_size); + MPIDU_Datatype_get_size_macro(rma_op->origin_datatype, origin_type_size); /* If derived datatype on target, add extended packet header. */ MPIDI_CH3_PKT_RMA_GET_TARGET_DATATYPE(rma_op->pkt, target_datatype, mpi_errno); if (!MPIR_DATATYPE_IS_PREDEFINED(target_datatype)) { - MPID_Datatype_get_ptr(target_datatype, target_dtp_ptr); + MPIDU_Datatype_get_ptr(target_datatype, target_dtp_ptr); void *dataloop_ptr = NULL; @@ -488,8 +488,8 @@ static int issue_acc_op(MPIDI_RMA_Op_t * rma_op, MPID_Win * win_ptr, MPI_Aint predefined_dtp_size, predefined_dtp_extent, predefined_dtp_count; MPI_Aint total_len, rest_len; MPI_Aint origin_dtp_size; - MPID_Datatype *origin_dtp_ptr = NULL; - MPID_Datatype *target_dtp_ptr = NULL; + MPIDU_Datatype*origin_dtp_ptr = NULL; + MPIDU_Datatype*target_dtp_ptr = NULL; void *ext_hdr_ptr = NULL; MPI_Aint ext_hdr_sz = 0; int mpi_errno = MPI_SUCCESS; @@ -520,21 +520,21 @@ static int issue_acc_op(MPIDI_RMA_Op_t * rma_op, MPID_Win * win_ptr, } /* Get total length of origin data */ - MPID_Datatype_get_size_macro(rma_op->origin_datatype, origin_dtp_size); + MPIDU_Datatype_get_size_macro(rma_op->origin_datatype, origin_dtp_size); total_len = origin_dtp_size * rma_op->origin_count; /* Get size and count for predefined datatype elements */ if (MPIR_DATATYPE_IS_PREDEFINED(rma_op->origin_datatype)) { predefined_dtp_size = origin_dtp_size; predefined_dtp_count = rma_op->origin_count; - MPID_Datatype_get_extent_macro(rma_op->origin_datatype, predefined_dtp_extent); + MPIDU_Datatype_get_extent_macro(rma_op->origin_datatype, predefined_dtp_extent); } else { - MPID_Datatype_get_ptr(rma_op->origin_datatype, origin_dtp_ptr); + MPIDU_Datatype_get_ptr(rma_op->origin_datatype, origin_dtp_ptr); MPIU_Assert(origin_dtp_ptr != NULL && origin_dtp_ptr->basic_type != MPI_DATATYPE_NULL); - MPID_Datatype_get_size_macro(origin_dtp_ptr->basic_type, predefined_dtp_size); + MPIDU_Datatype_get_size_macro(origin_dtp_ptr->basic_type, predefined_dtp_size); predefined_dtp_count = total_len / predefined_dtp_size; - MPID_Datatype_get_extent_macro(origin_dtp_ptr->basic_type, predefined_dtp_extent); + MPIDU_Datatype_get_extent_macro(origin_dtp_ptr->basic_type, predefined_dtp_extent); } MPIU_Assert(predefined_dtp_count > 0 && predefined_dtp_size > 0 && predefined_dtp_extent > 0); @@ -551,7 +551,7 @@ static int issue_acc_op(MPIDI_RMA_Op_t * rma_op, MPID_Win * win_ptr, /* Get target datatype */ if (!MPIR_DATATYPE_IS_PREDEFINED(accum_pkt->datatype)) - MPID_Datatype_get_ptr(accum_pkt->datatype, target_dtp_ptr); + MPIDU_Datatype_get_ptr(accum_pkt->datatype, target_dtp_ptr); rest_len = total_len; MPIU_Assert(rma_op->issued_stream_count >= 0); @@ -655,7 +655,7 @@ static int issue_get_acc_op(MPIDI_RMA_Op_t * rma_op, MPID_Win * win_ptr, MPI_Aint predefined_dtp_size, predefined_dtp_count, predefined_dtp_extent; MPI_Aint total_len, rest_len; MPI_Aint target_dtp_size; - MPID_Datatype *target_dtp_ptr = NULL; + MPIDU_Datatype*target_dtp_ptr = NULL; void *ext_hdr_ptr = NULL; MPI_Aint ext_hdr_sz = 0; int mpi_errno = MPI_SUCCESS; @@ -706,21 +706,21 @@ static int issue_get_acc_op(MPIDI_RMA_Op_t * rma_op, MPID_Win * win_ptr, } /* Get total length of target data */ - MPID_Datatype_get_size_macro(get_accum_pkt->datatype, target_dtp_size); + MPIDU_Datatype_get_size_macro(get_accum_pkt->datatype, target_dtp_size); total_len = target_dtp_size * get_accum_pkt->count; /* Get size and count for predefined datatype elements */ if (MPIR_DATATYPE_IS_PREDEFINED(get_accum_pkt->datatype)) { predefined_dtp_size = target_dtp_size; predefined_dtp_count = get_accum_pkt->count; - MPID_Datatype_get_extent_macro(get_accum_pkt->datatype, predefined_dtp_extent); + MPIDU_Datatype_get_extent_macro(get_accum_pkt->datatype, predefined_dtp_extent); } else { - MPID_Datatype_get_ptr(get_accum_pkt->datatype, target_dtp_ptr); + MPIDU_Datatype_get_ptr(get_accum_pkt->datatype, target_dtp_ptr); MPIU_Assert(target_dtp_ptr != NULL && target_dtp_ptr->basic_type != MPI_DATATYPE_NULL); - MPID_Datatype_get_size_macro(target_dtp_ptr->basic_type, predefined_dtp_size); + MPIDU_Datatype_get_size_macro(target_dtp_ptr->basic_type, predefined_dtp_size); predefined_dtp_count = total_len / predefined_dtp_size; - MPID_Datatype_get_extent_macro(target_dtp_ptr->basic_type, predefined_dtp_extent); + MPIDU_Datatype_get_extent_macro(target_dtp_ptr->basic_type, predefined_dtp_extent); } MPIU_Assert(predefined_dtp_count > 0 && predefined_dtp_size > 0 && predefined_dtp_extent > 0); @@ -784,8 +784,8 @@ static int issue_get_acc_op(MPIDI_RMA_Op_t * rma_op, MPID_Win * win_ptr, resp_req->dev.flags = flags; if (!MPIR_DATATYPE_IS_PREDEFINED(resp_req->dev.datatype)) { - MPID_Datatype *result_dtp = NULL; - MPID_Datatype_get_ptr(resp_req->dev.datatype, result_dtp); + MPIDU_Datatype*result_dtp = NULL; + MPIDU_Datatype_get_ptr(resp_req->dev.datatype, result_dtp); resp_req->dev.datatype_ptr = result_dtp; /* this will cause the datatype to be freed when the * request is freed. */ @@ -882,7 +882,7 @@ static int issue_get_op(MPIDI_RMA_Op_t * rma_op, MPID_Win * win_ptr, int mpi_errno = MPI_SUCCESS; MPIDI_VC_t *vc; MPID_Comm *comm_ptr; - MPID_Datatype *dtp; + MPIDU_Datatype*dtp; MPI_Datatype target_datatype; MPID_Request *req = NULL; MPID_Request *curr_req = NULL; @@ -912,7 +912,7 @@ static int issue_get_op(MPIDI_RMA_Op_t * rma_op, MPID_Win * win_ptr, curr_req->dev.target_win_handle = MPI_WIN_NULL; curr_req->dev.source_win_handle = win_ptr->handle; if (!MPIR_DATATYPE_IS_PREDEFINED(curr_req->dev.datatype)) { - MPID_Datatype_get_ptr(curr_req->dev.datatype, dtp); + MPIDU_Datatype_get_ptr(curr_req->dev.datatype, dtp); curr_req->dev.datatype_ptr = dtp; /* this will cause the datatype to be freed when the * request is freed. */ @@ -934,7 +934,7 @@ static int issue_get_op(MPIDI_RMA_Op_t * rma_op, MPID_Win * win_ptr, } else { /* derived datatype on target. */ - MPID_Datatype_get_ptr(target_datatype, dtp); + MPIDU_Datatype_get_ptr(target_datatype, dtp); void *dataloop_ptr = NULL; /* set extended packet header. @@ -964,7 +964,7 @@ static int issue_get_op(MPIDI_RMA_Op_t * rma_op, MPID_Win * win_ptr, MPID_THREAD_CS_EXIT(POBJ, vc->pobj_mutex); /* release the target datatype */ - MPID_Datatype_release(dtp); + MPIDU_Datatype_release(dtp); /* If send is finished, we free extended header immediately. * Otherwise, store its pointer in request thus it can be freed when request is freed.*/ @@ -1110,7 +1110,7 @@ static int issue_fop_op(MPIDI_RMA_Op_t * rma_op, } else { MPI_Aint origin_dtp_size; - MPID_Datatype_get_size_macro(rma_op->origin_datatype, origin_dtp_size); + MPIDU_Datatype_get_size_macro(rma_op->origin_datatype, origin_dtp_size); mpi_errno = issue_from_origin_buffer(rma_op, vc, NULL, 0, /*ext_hdr_ptr, ext_hdr_sz */ 0, 1 * origin_dtp_size, &curr_req); if (mpi_errno != MPI_SUCCESS) diff --git a/src/mpid/ch3/include/mpid_rma_shm.h b/src/mpid/ch3/include/mpid_rma_shm.h index d6dfab2..eea930b 100644 --- a/src/mpid/ch3/include/mpid_rma_shm.h +++ b/src/mpid/ch3/include/mpid_rma_shm.h @@ -308,7 +308,7 @@ static inline int MPIDI_CH3I_Shm_acc_op(const void *origin_addr, int origin_coun MPI_Aint predefined_dtp_size, predefined_dtp_extent, predefined_dtp_count; MPI_Aint total_len, rest_len; MPI_Aint origin_dtp_size; - MPID_Datatype *origin_dtp_ptr = NULL; + MPIDU_Datatype*origin_dtp_ptr = NULL; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3I_SHM_ACC_OP); MPIDI_RMA_FUNC_ENTER(MPID_STATE_MPIDI_CH3I_SHM_ACC_OP); @@ -343,15 +343,15 @@ static inline int MPIDI_CH3I_Shm_acc_op(const void *origin_addr, int origin_coun } /* Get total length of origin data */ - MPID_Datatype_get_size_macro(origin_datatype, origin_dtp_size); + MPIDU_Datatype_get_size_macro(origin_datatype, origin_dtp_size); total_len = origin_dtp_size * origin_count; - MPID_Datatype_get_ptr(origin_datatype, origin_dtp_ptr); + MPIDU_Datatype_get_ptr(origin_datatype, origin_dtp_ptr); MPIU_Assert(origin_dtp_ptr != NULL && origin_dtp_ptr->basic_type != MPI_DATATYPE_NULL); basic_type = origin_dtp_ptr->basic_type; - MPID_Datatype_get_size_macro(basic_type, predefined_dtp_size); + MPIDU_Datatype_get_size_macro(basic_type, predefined_dtp_size); predefined_dtp_count = total_len / predefined_dtp_size; - MPID_Datatype_get_extent_macro(basic_type, predefined_dtp_extent); + MPIDU_Datatype_get_extent_macro(basic_type, predefined_dtp_extent); MPIU_Assert(predefined_dtp_count > 0 && predefined_dtp_size > 0 && predefined_dtp_extent > 0); stream_elem_count = MPIDI_CH3U_Acc_stream_size / predefined_dtp_extent; @@ -360,7 +360,7 @@ static inline int MPIDI_CH3I_Shm_acc_op(const void *origin_addr, int origin_coun rest_len = total_len; for (i = 0; i < stream_unit_count; i++) { - MPID_Segment *seg = NULL; + MPIDU_Segment *seg = NULL; void *packed_buf = NULL; MPI_Aint first, last; int is_predef_contig; @@ -376,14 +376,14 @@ static inline int MPIDI_CH3I_Shm_acc_op(const void *origin_addr, int origin_coun packed_buf = MPL_malloc(stream_size); - seg = MPID_Segment_alloc(); + seg = MPIDU_Segment_alloc(); MPIR_ERR_CHKANDJUMP1(seg == NULL, mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", - "MPID_Segment"); - MPID_Segment_init(origin_addr, origin_count, origin_datatype, seg, 0); - MPID_Segment_pack(seg, first, &last, packed_buf); - MPID_Segment_free(seg); + "MPIDU_Segment"); + MPIDU_Segment_init(origin_addr, origin_count, origin_datatype, seg, 0); + MPIDU_Segment_pack(seg, first, &last, packed_buf); + MPIDU_Segment_free(seg); - MPID_Datatype_is_contig(basic_type, &is_predef_contig); + MPIDU_Datatype_is_contig(basic_type, &is_predef_contig); if (!is_predef_contig) { void *tmpbuf = MPL_malloc(stream_count * predefined_dtp_extent); @@ -443,7 +443,7 @@ static inline int MPIDI_CH3I_Shm_get_acc_op(const void *origin_addr, int origin_ MPI_Aint predefined_dtp_size, predefined_dtp_extent, predefined_dtp_count; MPI_Aint total_len, rest_len; MPI_Aint origin_dtp_size; - MPID_Datatype *origin_dtp_ptr = NULL; + MPIDU_Datatype*origin_dtp_ptr = NULL; int is_empty_origin = FALSE; int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3I_SHM_GET_ACC_OP); @@ -490,15 +490,15 @@ static inline int MPIDI_CH3I_Shm_get_acc_op(const void *origin_addr, int origin_ } /* Get total length of origin data */ - MPID_Datatype_get_size_macro(origin_datatype, origin_dtp_size); + MPIDU_Datatype_get_size_macro(origin_datatype, origin_dtp_size); total_len = origin_dtp_size * origin_count; - MPID_Datatype_get_ptr(origin_datatype, origin_dtp_ptr); + MPIDU_Datatype_get_ptr(origin_datatype, origin_dtp_ptr); MPIU_Assert(origin_dtp_ptr != NULL && origin_dtp_ptr->basic_type != MPI_DATATYPE_NULL); basic_type = origin_dtp_ptr->basic_type; - MPID_Datatype_get_size_macro(basic_type, predefined_dtp_size); + MPIDU_Datatype_get_size_macro(basic_type, predefined_dtp_size); predefined_dtp_count = total_len / predefined_dtp_size; - MPID_Datatype_get_extent_macro(basic_type, predefined_dtp_extent); + MPIDU_Datatype_get_extent_macro(basic_type, predefined_dtp_extent); MPIU_Assert(predefined_dtp_count > 0 && predefined_dtp_size > 0 && predefined_dtp_extent > 0); stream_elem_count = MPIDI_CH3U_Acc_stream_size / predefined_dtp_extent; @@ -507,7 +507,7 @@ static inline int MPIDI_CH3I_Shm_get_acc_op(const void *origin_addr, int origin_ rest_len = total_len; for (i = 0; i < stream_unit_count; i++) { - MPID_Segment *seg = NULL; + MPIDU_Segment *seg = NULL; void *packed_buf = NULL; MPI_Aint first, last; int is_predef_contig; @@ -523,14 +523,14 @@ static inline int MPIDI_CH3I_Shm_get_acc_op(const void *origin_addr, int origin_ packed_buf = MPL_malloc(stream_size); - seg = MPID_Segment_alloc(); + seg = MPIDU_Segment_alloc(); MPIR_ERR_CHKANDJUMP1(seg == NULL, mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", - "MPID_Segment"); - MPID_Segment_init(origin_addr, origin_count, origin_datatype, seg, 0); - MPID_Segment_pack(seg, first, &last, packed_buf); - MPID_Segment_free(seg); + "MPIDU_Segment"); + MPIDU_Segment_init(origin_addr, origin_count, origin_datatype, seg, 0); + MPIDU_Segment_pack(seg, first, &last, packed_buf); + MPIDU_Segment_free(seg); - MPID_Datatype_is_contig(basic_type, &is_predef_contig); + MPIDU_Datatype_is_contig(basic_type, &is_predef_contig); if (!is_predef_contig) { void *tmpbuf = MPL_malloc(stream_count * predefined_dtp_extent); @@ -647,7 +647,7 @@ static inline int MPIDI_CH3I_Shm_cas_op(const void *origin_addr, const void *com dest_addr = (char *) base + disp_unit * target_disp; - MPID_Datatype_get_size_macro(datatype, len); + MPIDU_Datatype_get_size_macro(datatype, len); MPIU_Memcpy(result_addr, dest_addr, len); if (MPIR_Compare_equal(compare_addr, dest_addr, datatype)) { @@ -706,7 +706,7 @@ static inline int MPIDI_CH3I_Shm_fop_op(const void *origin_addr, void *result_ad dest_addr = (char *) base + disp_unit * target_disp; - MPID_Datatype_get_size_macro(datatype, len); + MPIDU_Datatype_get_size_macro(datatype, len); MPIU_Memcpy(result_addr, dest_addr, len); uop = MPIR_OP_HDL_TO_FN(op); diff --git a/src/mpid/ch3/include/mpidimpl.h b/src/mpid/ch3/include/mpidimpl.h index 994ce4f..35687cd 100644 --- a/src/mpid/ch3/include/mpidimpl.h +++ b/src/mpid/ch3/include/mpidimpl.h @@ -169,13 +169,13 @@ extern MPIDI_Process_t MPIDI_Process; (dt_ptr_) = NULL; \ (dt_contig_out_) = TRUE; \ (dt_true_lb_) = 0; \ - (data_sz_out_) = (intptr_t) (count_) * MPID_Datatype_get_basic_size(datatype_); \ + (data_sz_out_) = (intptr_t) (count_) * MPIDU_Datatype_get_basic_size(datatype_); \ MPL_DBG_MSG_FMT(MPIDI_CH3_DBG_OTHER, TERSE, (MPL_DBG_FDEST,"basic datatype: dt_contig=%d, dt_sz=%d, data_sz=%" PRIdPTR, \ - (dt_contig_out_), MPID_Datatype_get_basic_size(datatype_), (data_sz_out_)));\ + (dt_contig_out_), MPIDU_Datatype_get_basic_size(datatype_), (data_sz_out_)));\ } \ else \ { \ - MPID_Datatype_get_ptr((datatype_), (dt_ptr_)); \ + MPIDU_Datatype_get_ptr((datatype_), (dt_ptr_)); \ (dt_contig_out_) = (dt_ptr_)->is_contig; \ (data_sz_out_) = (intptr_t) (count_) * (dt_ptr_)->size; \ (dt_true_lb_) = (dt_ptr_)->true_lb; \ diff --git a/src/mpid/ch3/include/mpidpre.h b/src/mpid/ch3/include/mpidpre.h index 2c0a2d3..8870cfd 100644 --- a/src/mpid/ch3/include/mpidpre.h +++ b/src/mpid/ch3/include/mpidpre.h @@ -380,13 +380,13 @@ typedef struct MPIDI_Request { /* segment, segment_first, and segment_size are used when processing non-contiguous datatypes */ - /* MPID_Segment segment; */ - struct MPID_Segment *segment_ptr; + /* MPIDU_Segment segment; */ + struct MPIDU_Segment *segment_ptr; intptr_t segment_first; intptr_t segment_size; /* Pointer to datatype for reference counting purposes */ - struct MPID_Datatype * datatype_ptr; + struct MPIDU_Datatype* datatype_ptr; /* iov and iov_count define the data to be transferred/received. iov_offset points to the current head element in the IOV */ diff --git a/src/mpid/ch3/include/mpidrma.h b/src/mpid/ch3/include/mpidrma.h index 69a8aa3..c8ed544 100644 --- a/src/mpid/ch3/include/mpidrma.h +++ b/src/mpid/ch3/include/mpidrma.h @@ -371,8 +371,8 @@ static inline int enqueue_lock_origin(MPID_Win * win_ptr, MPIDI_VC_t * vc, MPIDI_CH3_PKT_RMA_GET_TARGET_COUNT((*pkt), target_count, mpi_errno); MPIDI_CH3_PKT_RMA_GET_FLAGS((*pkt), flags, mpi_errno); - MPID_Datatype_get_extent_macro(target_dtp, type_extent); - MPID_Datatype_get_size_macro(target_dtp, type_size); + MPIDU_Datatype_get_extent_macro(target_dtp, type_extent); + MPIDU_Datatype_get_size_macro(target_dtp, type_size); if (pkt->type == MPIDI_CH3_PKT_PUT) { recv_data_sz = type_size * target_count; @@ -903,8 +903,8 @@ static inline int do_accumulate_op(void *source_buf, int source_count, MPI_Datat if (is_empty_source == FALSE) { MPIU_Assert(MPIR_DATATYPE_IS_PREDEFINED(source_dtp)); - MPID_Datatype_get_size_macro(source_dtp, source_dtp_size); - MPID_Datatype_get_extent_macro(source_dtp, source_dtp_extent); + MPIDU_Datatype_get_size_macro(source_dtp, source_dtp_size); + MPIDU_Datatype_get_extent_macro(source_dtp, source_dtp_extent); } if (HANDLE_GET_KIND(acc_op) == HANDLE_KIND_BUILTIN) { @@ -939,18 +939,18 @@ static inline int do_accumulate_op(void *source_buf, int source_count, MPI_Datat } else { /* derived datatype */ - MPID_Segment *segp; + MPIDU_Segment *segp; DLOOP_VECTOR *dloop_vec; MPI_Aint first, last; int vec_len, i, count; MPI_Aint type_extent, type_size; MPI_Datatype type; - MPID_Datatype *dtp; + MPIDU_Datatype*dtp; MPI_Aint curr_len; void *curr_loc; int accumulated_count; - segp = MPID_Segment_alloc(); + segp = MPIDU_Segment_alloc(); /* --BEGIN ERROR HANDLING-- */ if (!segp) { mpi_errno = @@ -960,11 +960,11 @@ static inline int do_accumulate_op(void *source_buf, int source_count, MPI_Datat return mpi_errno; } /* --END ERROR HANDLING-- */ - MPID_Segment_init(NULL, target_count, target_dtp, segp, 0); + MPIDU_Segment_init(NULL, target_count, target_dtp, segp, 0); first = stream_offset; last = first + source_count * source_dtp_size; - MPID_Datatype_get_ptr(target_dtp, dtp); + MPIDU_Datatype_get_ptr(target_dtp, dtp); vec_len = dtp->max_contig_blocks * target_count + 1; /* +1 needed because Rob says so */ dloop_vec = (DLOOP_VECTOR *) @@ -979,7 +979,7 @@ static inline int do_accumulate_op(void *source_buf, int source_count, MPI_Datat } /* --END ERROR HANDLING-- */ - MPID_Segment_pack_vector(segp, first, &last, dloop_vec, &vec_len); + MPIDU_Segment_pack_vector(segp, first, &last, dloop_vec, &vec_len); type = dtp->basic_type; MPIU_Assert(type != MPI_DATATYPE_NULL); @@ -1020,7 +1020,7 @@ static inline int do_accumulate_op(void *source_buf, int source_count, MPI_Datat accumulated_count += count; } - MPID_Segment_free(segp); + MPIDU_Segment_free(segp); MPL_free(dloop_vec); } diff --git a/src/mpid/ch3/src/ch3u_buffer.c b/src/mpid/ch3/src/ch3u_buffer.c index 9b586bc..1df0d2c 100644 --- a/src/mpid/ch3/src/ch3u_buffer.c +++ b/src/mpid/ch3/src/ch3u_buffer.c @@ -42,8 +42,8 @@ void MPIDI_CH3U_Buffer_copy( MPI_Aint sdt_true_lb, rdt_true_lb; intptr_t sdata_sz; intptr_t rdata_sz; - MPID_Datatype * sdt_ptr; - MPID_Datatype * rdt_ptr; + MPIDU_Datatype* sdt_ptr; + MPIDU_Datatype* rdt_ptr; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3U_BUFFER_COPY); MPIDI_STATE_DECL(MPID_STATE_MEMCPY); @@ -80,14 +80,14 @@ void MPIDI_CH3U_Buffer_copy( } else if (sdt_contig) { - MPID_Segment seg; + MPIDU_Segment seg; MPI_Aint last; - MPID_Segment_init(rbuf, rcount, rdt, &seg, 0); + MPIDU_Segment_init(rbuf, rcount, rdt, &seg, 0); last = sdata_sz; MPL_DBG_MSG_FMT(MPIDI_CH3_DBG_OTHER,VERBOSE,(MPL_DBG_FDEST, "pre-unpack last=%" PRIdPTR, last )); - MPID_Segment_unpack(&seg, 0, &last, (char*)sbuf + sdt_true_lb); + MPIDU_Segment_unpack(&seg, 0, &last, (char*)sbuf + sdt_true_lb); MPL_DBG_MSG_FMT(MPIDI_CH3_DBG_OTHER,VERBOSE,(MPL_DBG_FDEST, "pre-unpack last=%" PRIdPTR, last )); /* --BEGIN ERROR HANDLING-- */ @@ -101,14 +101,14 @@ void MPIDI_CH3U_Buffer_copy( } else if (rdt_contig) { - MPID_Segment seg; + MPIDU_Segment seg; MPI_Aint last; - MPID_Segment_init(sbuf, scount, sdt, &seg, 0); + MPIDU_Segment_init(sbuf, scount, sdt, &seg, 0); last = sdata_sz; MPL_DBG_MSG_FMT(MPIDI_CH3_DBG_OTHER,VERBOSE,(MPL_DBG_FDEST, "pre-pack last=%" PRIdPTR, last )); - MPID_Segment_pack(&seg, 0, &last, (char*)rbuf + rdt_true_lb); + MPIDU_Segment_pack(&seg, 0, &last, (char*)rbuf + rdt_true_lb); MPL_DBG_MSG_FMT(MPIDI_CH3_DBG_OTHER,VERBOSE,(MPL_DBG_FDEST, "post-pack last=%" PRIdPTR, last )); /* --BEGIN ERROR HANDLING-- */ @@ -124,9 +124,9 @@ void MPIDI_CH3U_Buffer_copy( { char * buf; intptr_t buf_off; - MPID_Segment sseg; + MPIDU_Segment sseg; intptr_t sfirst; - MPID_Segment rseg; + MPIDU_Segment rseg; intptr_t rfirst; buf = MPL_malloc(MPIDI_COPY_BUFFER_SZ); @@ -141,8 +141,8 @@ void MPIDI_CH3U_Buffer_copy( } /* --END ERROR HANDLING-- */ - MPID_Segment_init(sbuf, scount, sdt, &sseg, 0); - MPID_Segment_init(rbuf, rcount, rdt, &rseg, 0); + MPIDU_Segment_init(sbuf, scount, sdt, &sseg, 0); + MPIDU_Segment_init(rbuf, rcount, rdt, &rseg, 0); sfirst = 0; rfirst = 0; @@ -165,7 +165,7 @@ void MPIDI_CH3U_Buffer_copy( MPL_DBG_MSG_FMT(MPIDI_CH3_DBG_OTHER,VERBOSE,(MPL_DBG_FDEST, "pre-pack first=%" PRIdPTR ", last=%" PRIdPTR, sfirst, last )); - MPID_Segment_pack(&sseg, sfirst, &last, buf + buf_off); + MPIDU_Segment_pack(&sseg, sfirst, &last, buf + buf_off); MPL_DBG_MSG_FMT(MPIDI_CH3_DBG_OTHER,VERBOSE,(MPL_DBG_FDEST, "post-pack first=%" PRIdPTR ", last=%" PRIdPTR, sfirst, last )); @@ -179,7 +179,7 @@ void MPIDI_CH3U_Buffer_copy( MPL_DBG_MSG_FMT(MPIDI_CH3_DBG_OTHER,VERBOSE,(MPL_DBG_FDEST, "pre-unpack first=%" PRIdPTR ", last=%" PRIdPTR, rfirst, last )); - MPID_Segment_unpack(&rseg, rfirst, &last, buf); + MPIDU_Segment_unpack(&rseg, rfirst, &last, buf); MPL_DBG_MSG_FMT(MPIDI_CH3_DBG_OTHER,VERBOSE,(MPL_DBG_FDEST, "post-unpack first=%" PRIdPTR ", last=%" PRIdPTR, rfirst, last )); diff --git a/src/mpid/ch3/src/ch3u_eager.c b/src/mpid/ch3/src/ch3u_eager.c index aa880a5..f493910 100644 --- a/src/mpid/ch3/src/ch3u_eager.c +++ b/src/mpid/ch3/src/ch3u_eager.c @@ -121,10 +121,10 @@ int MPIDI_CH3_EagerNoncontigSend( MPID_Request **sreq_p, MPL_DBG_MSGPKT(vc,tag,eager_pkt->match.parts.context_id,rank,data_sz, "Eager"); - sreq->dev.segment_ptr = MPID_Segment_alloc( ); - MPIR_ERR_CHKANDJUMP1((sreq->dev.segment_ptr == NULL), mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", "MPID_Segment_alloc"); + sreq->dev.segment_ptr = MPIDU_Segment_alloc( ); + MPIR_ERR_CHKANDJUMP1((sreq->dev.segment_ptr == NULL), mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", "MPIDU_Segment_alloc"); - MPID_Segment_init(buf, count, datatype, sreq->dev.segment_ptr, 0); + MPIDU_Segment_init(buf, count, datatype, sreq->dev.segment_ptr, 0); sreq->dev.segment_first = 0; sreq->dev.segment_size = data_sz; @@ -341,7 +341,7 @@ int MPIDI_CH3_PktHandler_EagerShortSend( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, int dt_contig; MPI_Aint dt_true_lb; intptr_t userbuf_sz; - MPID_Datatype *dt_ptr; + MPIDU_Datatype *dt_ptr; intptr_t data_sz; /* Make sure that we handle the general (non-contiguous) @@ -403,15 +403,15 @@ int MPIDI_CH3_PktHandler_EagerShortSend( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, exceptional cases */ /* FIXME: The MPICH tests do not exercise this branch */ /* printf( "Surprise!\n" ); fflush(stdout);*/ - rreq->dev.segment_ptr = MPID_Segment_alloc( ); - MPIR_ERR_CHKANDJUMP1((rreq->dev.segment_ptr == NULL), mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", "MPID_Segment_alloc"); + rreq->dev.segment_ptr = MPIDU_Segment_alloc( ); + MPIR_ERR_CHKANDJUMP1((rreq->dev.segment_ptr == NULL), mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", "MPIDU_Segment_alloc"); - MPID_Segment_init(rreq->dev.user_buf, rreq->dev.user_count, + MPIDU_Segment_init(rreq->dev.user_buf, rreq->dev.user_count, rreq->dev.datatype, rreq->dev.segment_ptr, 0); recv_data_sz = rreq->dev.recv_data_sz; last = recv_data_sz; - MPID_Segment_unpack( rreq->dev.segment_ptr, 0, + MPIDU_Segment_unpack( rreq->dev.segment_ptr, 0, &last, eagershort_pkt->data ); if (last != recv_data_sz) { /* --BEGIN ERROR HANDLING-- */ diff --git a/src/mpid/ch3/src/ch3u_eagersync.c b/src/mpid/ch3/src/ch3u_eagersync.c index 29157e2..73af293 100644 --- a/src/mpid/ch3/src/ch3u_eagersync.c +++ b/src/mpid/ch3/src/ch3u_eagersync.c @@ -93,10 +93,10 @@ int MPIDI_CH3_EagerSyncNoncontigSend( MPID_Request **sreq_p, "sending non-contiguous sync eager message, data_sz=%" PRIdPTR, data_sz); - sreq->dev.segment_ptr = MPID_Segment_alloc( ); - MPIR_ERR_CHKANDJUMP1((sreq->dev.segment_ptr == NULL), mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", "MPID_Segment_alloc"); + sreq->dev.segment_ptr = MPIDU_Segment_alloc( ); + MPIR_ERR_CHKANDJUMP1((sreq->dev.segment_ptr == NULL), mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", "MPIDU_Segment_alloc"); - MPID_Segment_init(buf, count, datatype, sreq->dev.segment_ptr, 0); + MPIDU_Segment_init(buf, count, datatype, sreq->dev.segment_ptr, 0); sreq->dev.segment_first = 0; sreq->dev.segment_size = data_sz; diff --git a/src/mpid/ch3/src/ch3u_handle_recv_pkt.c b/src/mpid/ch3/src/ch3u_handle_recv_pkt.c index 316bf73..d27c067 100644 --- a/src/mpid/ch3/src/ch3u_handle_recv_pkt.c +++ b/src/mpid/ch3/src/ch3u_handle_recv_pkt.c @@ -107,7 +107,7 @@ int MPIDI_CH3U_Receive_data_found(MPID_Request *rreq, char *buf, intptr_t *bufle int dt_contig; MPI_Aint dt_true_lb; intptr_t userbuf_sz; - MPID_Datatype * dt_ptr = NULL; + MPIDU_Datatype * dt_ptr = NULL; intptr_t data_sz; int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3U_RECEIVE_DATA_FOUND); @@ -173,10 +173,10 @@ int MPIDI_CH3U_Receive_data_found(MPID_Request *rreq, char *buf, intptr_t *bufle /* user buffer is not contiguous or is too small to hold the entire message */ - rreq->dev.segment_ptr = MPID_Segment_alloc( ); - MPIR_ERR_CHKANDJUMP1((rreq->dev.segment_ptr == NULL), mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", "MPID_Segment_alloc"); + rreq->dev.segment_ptr = MPIDU_Segment_alloc( ); + MPIR_ERR_CHKANDJUMP1((rreq->dev.segment_ptr == NULL), mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", "MPIDU_Segment_alloc"); - MPID_Segment_init(rreq->dev.user_buf, rreq->dev.user_count, + MPIDU_Segment_init(rreq->dev.user_buf, rreq->dev.user_count, rreq->dev.datatype, rreq->dev.segment_ptr, 0); rreq->dev.segment_first = 0; rreq->dev.segment_size = data_sz; @@ -189,7 +189,7 @@ int MPIDI_CH3U_Receive_data_found(MPID_Request *rreq, char *buf, intptr_t *bufle intptr_t last; MPL_DBG_MSG(MPIDI_CH3_DBG_OTHER,VERBOSE,"Copying noncontiguous data to user buffer"); last = data_sz; - MPID_Segment_unpack(rreq->dev.segment_ptr, rreq->dev.segment_first, + MPIDU_Segment_unpack(rreq->dev.segment_ptr, rreq->dev.segment_first, &last, buf); /* --BEGIN ERROR HANDLING-- */ if (last != data_sz) @@ -299,7 +299,7 @@ int MPIDI_CH3U_Post_data_receive_found(MPID_Request * rreq) int dt_contig; MPI_Aint dt_true_lb; intptr_t userbuf_sz; - MPID_Datatype * dt_ptr = NULL; + MPIDU_Datatype * dt_ptr = NULL; intptr_t data_sz; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3U_POST_DATA_RECEIVE_FOUND); @@ -346,9 +346,9 @@ int MPIDI_CH3U_Post_data_receive_found(MPID_Request * rreq) /* user buffer is not contiguous or is too small to hold the entire message */ MPL_DBG_MSG(MPIDI_CH3_DBG_OTHER,VERBOSE,"IOV loaded for non-contiguous read"); - rreq->dev.segment_ptr = MPID_Segment_alloc( ); - MPIR_ERR_CHKANDJUMP1((rreq->dev.segment_ptr == NULL), mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", "MPID_Segment_alloc"); - MPID_Segment_init(rreq->dev.user_buf, rreq->dev.user_count, + rreq->dev.segment_ptr = MPIDU_Segment_alloc( ); + MPIR_ERR_CHKANDJUMP1((rreq->dev.segment_ptr == NULL), mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", "MPIDU_Segment_alloc"); + MPIDU_Segment_init(rreq->dev.user_buf, rreq->dev.user_count, rreq->dev.datatype, rreq->dev.segment_ptr, 0); rreq->dev.segment_first = 0; rreq->dev.segment_size = data_sz; diff --git a/src/mpid/ch3/src/ch3u_handle_recv_req.c b/src/mpid/ch3/src/ch3u_handle_recv_req.c index c2c7ec2..e67bcdd 100644 --- a/src/mpid/ch3/src/ch3u_handle_recv_req.c +++ b/src/mpid/ch3/src/ch3u_handle_recv_req.c @@ -8,7 +8,7 @@ #include "mpidrma.h" static int create_derived_datatype(MPID_Request * req, MPIDI_RMA_dtype_info * dtype_info, - MPID_Datatype ** dtp); + MPIDU_Datatype** dtp); #undef FUNCNAME #define FUNCNAME MPIDI_CH3U_Handle_recv_req @@ -194,7 +194,7 @@ int MPIDI_CH3_ReqHandler_AccumRecvComplete(MPIDI_VC_t * vc, MPID_Request * rreq, } MPIU_Assert(basic_type != MPI_DATATYPE_NULL); - MPID_Datatype_get_size_macro(basic_type, predef_dtp_size); + MPIDU_Datatype_get_size_macro(basic_type, predef_dtp_size); predef_count = rreq->dev.recv_data_sz / predef_dtp_size; MPIU_Assert(predef_count > 0); @@ -293,10 +293,10 @@ int MPIDI_CH3_ReqHandler_GaccumRecvComplete(MPIDI_VC_t * vc, MPID_Request * rreq rreq->dev.ext_hdr_ptr, &stream_offset); /* Use target data to calculate current stream unit size */ - MPID_Datatype_get_size_macro(rreq->dev.datatype, type_size); + MPIDU_Datatype_get_size_macro(rreq->dev.datatype, type_size); total_len = type_size * rreq->dev.user_count; - MPID_Datatype_get_size_macro(basic_type, predef_dtp_size); - MPID_Datatype_get_extent_macro(basic_type, extent); + MPIDU_Datatype_get_size_macro(basic_type, predef_dtp_size); + MPIDU_Datatype_get_extent_macro(basic_type, extent); stream_data_len = MPL_MIN(total_len - (stream_offset / extent) * predef_dtp_size, (MPIDI_CH3U_SRBuf_size / extent) * predef_dtp_size); @@ -315,8 +315,8 @@ int MPIDI_CH3_ReqHandler_GaccumRecvComplete(MPIDI_VC_t * vc, MPID_Request * rreq get_accum_resp_pkt->flags |= MPIDI_CH3_PKT_FLAG_RMA_ACK; /* check if data is contiguous and get true lb */ - MPID_Datatype_is_contig(rreq->dev.datatype, &is_contig); - MPID_Datatype_get_true_lb(rreq->dev.datatype, &dt_true_lb); + MPIDU_Datatype_is_contig(rreq->dev.datatype, &is_contig); + MPIDU_Datatype_get_true_lb(rreq->dev.datatype, &dt_true_lb); resp_req = MPID_Request_create(); MPIR_ERR_CHKANDJUMP(resp_req == NULL, mpi_errno, MPI_ERR_OTHER, "**nomemreq"); @@ -339,7 +339,7 @@ int MPIDI_CH3_ReqHandler_GaccumRecvComplete(MPIDI_VC_t * vc, MPID_Request * rreq stream_offset), stream_data_len); } else { - MPID_Segment *seg = MPID_Segment_alloc(); + MPIDU_Segment *seg = MPIDU_Segment_alloc(); MPI_Aint first = stream_offset; MPI_Aint last = first + stream_data_len; @@ -348,11 +348,11 @@ int MPIDI_CH3_ReqHandler_GaccumRecvComplete(MPIDI_VC_t * vc, MPID_Request * rreq MPIDI_CH3I_SHM_MUTEX_UNLOCK(win_ptr); } MPIR_ERR_CHKANDJUMP1(seg == NULL, mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", - "MPID_Segment"); - MPID_Segment_init(rreq->dev.real_user_buf, rreq->dev.user_count, rreq->dev.datatype, seg, + "MPIDU_Segment"); + MPIDU_Segment_init(rreq->dev.real_user_buf, rreq->dev.user_count, rreq->dev.datatype, seg, 0); - MPID_Segment_pack(seg, first, &last, resp_req->dev.user_buf); - MPID_Segment_free(seg); + MPIDU_Segment_pack(seg, first, &last, resp_req->dev.user_buf); + MPIDU_Segment_free(seg); } /* accumulate data from tmp_buf into user_buf */ @@ -450,9 +450,9 @@ int MPIDI_CH3_ReqHandler_FOPRecvComplete(MPIDI_VC_t * vc, MPID_Request * rreq, i MPID_Win_get_ptr(rreq->dev.target_win_handle, win_ptr); - MPID_Datatype_get_size_macro(rreq->dev.datatype, type_size); + MPIDU_Datatype_get_size_macro(rreq->dev.datatype, type_size); - MPID_Datatype_is_contig(rreq->dev.datatype, &is_contig); + MPIDU_Datatype_is_contig(rreq->dev.datatype, &is_contig); /* Create response request */ resp_req = MPID_Request_create(); @@ -480,7 +480,7 @@ int MPIDI_CH3_ReqHandler_FOPRecvComplete(MPIDI_VC_t * vc, MPID_Request * rreq, i MPIU_Memcpy(resp_req->dev.user_buf, rreq->dev.real_user_buf, type_size); } else { - MPID_Segment *seg = MPID_Segment_alloc(); + MPIDU_Segment *seg = MPIDU_Segment_alloc(); MPI_Aint last = type_size; if (seg == NULL) { @@ -488,10 +488,10 @@ int MPIDI_CH3_ReqHandler_FOPRecvComplete(MPIDI_VC_t * vc, MPID_Request * rreq, i MPIDI_CH3I_SHM_MUTEX_UNLOCK(win_ptr); } MPIR_ERR_CHKANDJUMP1(seg == NULL, mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", - "MPID_Segment"); - MPID_Segment_init(rreq->dev.real_user_buf, 1, rreq->dev.datatype, seg, 0); - MPID_Segment_pack(seg, 0, &last, resp_req->dev.user_buf); - MPID_Segment_free(seg); + "MPIDU_Segment"); + MPIDU_Segment_init(rreq->dev.real_user_buf, 1, rreq->dev.datatype, seg, 0); + MPIDU_Segment_pack(seg, 0, &last, resp_req->dev.user_buf); + MPIDU_Segment_free(seg); } /* Perform accumulate computation */ @@ -563,7 +563,7 @@ int MPIDI_CH3_ReqHandler_PutDerivedDTRecvComplete(MPIDI_VC_t * vc ATTRIBUTE((unu MPID_Request * rreq, int *complete) { int mpi_errno = MPI_SUCCESS; - MPID_Datatype *new_dtp = NULL; + MPIDU_Datatype*new_dtp = NULL; MPIDI_RMA_dtype_info *dtype_info = NULL; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3_REQHANDLER_PUTDERIVEDDTRECVCOMPLETE); @@ -581,11 +581,11 @@ int MPIDI_CH3_ReqHandler_PutDerivedDTRecvComplete(MPIDI_VC_t * vc ATTRIBUTE((unu rreq->dev.datatype_ptr = new_dtp; - rreq->dev.segment_ptr = MPID_Segment_alloc(); + rreq->dev.segment_ptr = MPIDU_Segment_alloc(); MPIR_ERR_CHKANDJUMP1((rreq->dev.segment_ptr == NULL), mpi_errno, MPI_ERR_OTHER, "**nomem", - "**nomem %s", "MPID_Segment_alloc"); + "**nomem %s", "MPIDU_Segment_alloc"); - MPID_Segment_init(rreq->dev.user_buf, + MPIDU_Segment_init(rreq->dev.user_buf, rreq->dev.user_count, rreq->dev.datatype, rreq->dev.segment_ptr, 0); rreq->dev.segment_first = 0; rreq->dev.segment_size = rreq->dev.recv_data_sz; @@ -611,7 +611,7 @@ int MPIDI_CH3_ReqHandler_AccumMetadataRecvComplete(MPIDI_VC_t * vc ATTRIBUTE((un MPID_Request * rreq, int *complete) { int mpi_errno = MPI_SUCCESS; - MPID_Datatype *new_dtp = NULL; + MPIDU_Datatype*new_dtp = NULL; MPIDI_RMA_dtype_info *dtype_info = NULL; MPI_Aint basic_type_extent, basic_type_size; MPI_Aint total_len, rest_len, stream_elem_count; @@ -664,13 +664,13 @@ int MPIDI_CH3_ReqHandler_AccumMetadataRecvComplete(MPIDI_VC_t * vc ATTRIBUTE((un stream_offset = ext_hdr->stream_offset; } - MPID_Datatype_get_size_macro(rreq->dev.datatype, type_size); + MPIDU_Datatype_get_size_macro(rreq->dev.datatype, type_size); basic_dtp = rreq->dev.datatype; } - MPID_Datatype_get_size_macro(basic_dtp, basic_type_size); - MPID_Datatype_get_extent_macro(basic_dtp, basic_type_extent); + MPIDU_Datatype_get_size_macro(basic_dtp, basic_type_size); + MPIDU_Datatype_get_extent_macro(basic_dtp, basic_type_extent); MPIU_Assert(!MPIDI_Request_get_srbuf_flag(rreq)); /* allocate a SRBuf for receiving stream unit */ @@ -694,11 +694,11 @@ int MPIDI_CH3_ReqHandler_AccumMetadataRecvComplete(MPIDI_VC_t * vc ATTRIBUTE((un rreq->dev.recv_data_sz = MPL_MIN(rest_len, stream_elem_count * basic_type_size); - rreq->dev.segment_ptr = MPID_Segment_alloc(); + rreq->dev.segment_ptr = MPIDU_Segment_alloc(); MPIR_ERR_CHKANDJUMP1((rreq->dev.segment_ptr == NULL), mpi_errno, MPI_ERR_OTHER, "**nomem", - "**nomem %s", "MPID_Segment_alloc"); + "**nomem %s", "MPIDU_Segment_alloc"); - MPID_Segment_init(rreq->dev.user_buf, + MPIDU_Segment_init(rreq->dev.user_buf, (rreq->dev.recv_data_sz / basic_type_size), basic_dtp, rreq->dev.segment_ptr, 0); rreq->dev.segment_first = 0; @@ -726,7 +726,7 @@ int MPIDI_CH3_ReqHandler_GaccumMetadataRecvComplete(MPIDI_VC_t * vc, MPID_Request * rreq, int *complete) { int mpi_errno = MPI_SUCCESS; - MPID_Datatype *new_dtp = NULL; + MPIDU_Datatype*new_dtp = NULL; MPIDI_RMA_dtype_info *dtype_info = NULL; MPI_Aint basic_type_extent, basic_type_size; MPI_Aint total_len, rest_len, stream_elem_count; @@ -785,7 +785,7 @@ int MPIDI_CH3_ReqHandler_GaccumMetadataRecvComplete(MPIDI_VC_t * vc, stream_offset = ext_hdr->stream_offset; } - MPID_Datatype_get_size_macro(rreq->dev.datatype, type_size); + MPIDU_Datatype_get_size_macro(rreq->dev.datatype, type_size); basic_dtp = rreq->dev.datatype; } @@ -799,8 +799,8 @@ int MPIDI_CH3_ReqHandler_GaccumMetadataRecvComplete(MPIDI_VC_t * vc, MPIR_ERR_POP(mpi_errno); } else { - MPID_Datatype_get_size_macro(basic_dtp, basic_type_size); - MPID_Datatype_get_extent_macro(basic_dtp, basic_type_extent); + MPIDU_Datatype_get_size_macro(basic_dtp, basic_type_size); + MPIDU_Datatype_get_extent_macro(basic_dtp, basic_type_extent); MPIU_Assert(!MPIDI_Request_get_srbuf_flag(rreq)); /* allocate a SRBuf for receiving stream unit */ @@ -824,11 +824,11 @@ int MPIDI_CH3_ReqHandler_GaccumMetadataRecvComplete(MPIDI_VC_t * vc, rreq->dev.recv_data_sz = MPL_MIN(rest_len, stream_elem_count * basic_type_size); - rreq->dev.segment_ptr = MPID_Segment_alloc(); + rreq->dev.segment_ptr = MPIDU_Segment_alloc(); MPIR_ERR_CHKANDJUMP1((rreq->dev.segment_ptr == NULL), mpi_errno, MPI_ERR_OTHER, "**nomem", - "**nomem %s", "MPID_Segment_alloc"); + "**nomem %s", "MPIDU_Segment_alloc"); - MPID_Segment_init(rreq->dev.user_buf, + MPIDU_Segment_init(rreq->dev.user_buf, (rreq->dev.recv_data_sz / basic_type_size), basic_dtp, rreq->dev.segment_ptr, 0); rreq->dev.segment_first = 0; @@ -859,7 +859,7 @@ int MPIDI_CH3_ReqHandler_GetDerivedDTRecvComplete(MPIDI_VC_t * vc, MPID_Request * rreq, int *complete) { int mpi_errno = MPI_SUCCESS; - MPID_Datatype *new_dtp = NULL; + MPIDU_Datatype*new_dtp = NULL; MPIDI_RMA_dtype_info *dtype_info = NULL; MPIDI_CH3_Pkt_t upkt; MPIDI_CH3_Pkt_get_resp_t *get_resp_pkt = &upkt.get_resp; @@ -904,11 +904,11 @@ int MPIDI_CH3_ReqHandler_GetDerivedDTRecvComplete(MPIDI_VC_t * vc, (rreq->dev.flags & MPIDI_CH3_PKT_FLAG_RMA_UNLOCK)) get_resp_pkt->flags |= MPIDI_CH3_PKT_FLAG_RMA_ACK; - sreq->dev.segment_ptr = MPID_Segment_alloc(); + sreq->dev.segment_ptr = MPIDU_Segment_alloc(); MPIR_ERR_CHKANDJUMP1((sreq->dev.segment_ptr == NULL), mpi_errno, MPI_ERR_OTHER, "**nomem", - "**nomem %s", "MPID_Segment_alloc"); + "**nomem %s", "MPIDU_Segment_alloc"); - MPID_Segment_init(sreq->dev.user_buf, + MPIDU_Segment_init(sreq->dev.user_buf, sreq->dev.user_count, sreq->dev.datatype, sreq->dev.segment_ptr, 0); sreq->dev.segment_first = 0; sreq->dev.segment_size = new_dtp->size * sreq->dev.user_count; @@ -1078,9 +1078,9 @@ int MPIDI_CH3_ReqHandler_ReloadIOV(MPIDI_VC_t * vc ATTRIBUTE((unused)), #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) static int create_derived_datatype(MPID_Request * req, MPIDI_RMA_dtype_info * dtype_info, - MPID_Datatype ** dtp) + MPIDU_Datatype** dtp) { - MPID_Datatype *new_dtp; + MPIDU_Datatype*new_dtp; int mpi_errno = MPI_SUCCESS; MPI_Aint ptrdiff; MPIDI_STATE_DECL(MPID_STATE_CREATE_DERIVED_DATATYPE); @@ -1088,10 +1088,10 @@ static int create_derived_datatype(MPID_Request * req, MPIDI_RMA_dtype_info * dt MPIDI_FUNC_ENTER(MPID_STATE_CREATE_DERIVED_DATATYPE); /* allocate new datatype object and handle */ - new_dtp = (MPID_Datatype *) MPIU_Handle_obj_alloc(&MPID_Datatype_mem); + new_dtp = (MPIDU_Datatype*) MPIU_Handle_obj_alloc(&MPIDU_Datatype_mem); if (!new_dtp) { MPIR_ERR_SETANDJUMP1(mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", - "MPID_Datatype_mem"); + "MPIDU_Datatype_mem"); } *dtp = new_dtp; @@ -1126,7 +1126,7 @@ static int create_derived_datatype(MPID_Request * req, MPIDI_RMA_dtype_info * dt /* FIXME: Temp to avoid SEGV when memory tracing */ new_dtp->hetero_dloop = 0; - MPID_Dataloop_update(new_dtp->dataloop, ptrdiff); + MPIDU_Dataloop_update(new_dtp->dataloop, ptrdiff); new_dtp->contents = NULL; @@ -1233,10 +1233,10 @@ static inline int perform_get_in_lock_queue(MPID_Win * win_ptr, get_resp_pkt->target_rank = win_ptr->comm_ptr->rank; /* length of target data */ - MPID_Datatype_get_size_macro(get_pkt->datatype, type_size); + MPIDU_Datatype_get_size_macro(get_pkt->datatype, type_size); MPIU_Assign_trunc(len, get_pkt->count * type_size, size_t); - MPID_Datatype_is_contig(get_pkt->datatype, &is_contig); + MPIDU_Datatype_is_contig(get_pkt->datatype, &is_contig); if (get_pkt->flags & MPIDI_CH3_PKT_FLAG_RMA_IMMED_RESP) { void *src = (void *) (get_pkt->addr), *dest = (void *) (get_resp_pkt->info.data); @@ -1272,11 +1272,11 @@ static inline int perform_get_in_lock_queue(MPID_Win * win_ptr, iov[0].MPL_IOV_BUF = (MPL_IOV_BUF_CAST) get_resp_pkt; iov[0].MPL_IOV_LEN = sizeof(*get_resp_pkt); - sreq->dev.segment_ptr = MPID_Segment_alloc(); + sreq->dev.segment_ptr = MPIDU_Segment_alloc(); MPIR_ERR_CHKANDJUMP1(sreq->dev.segment_ptr == NULL, mpi_errno, - MPI_ERR_OTHER, "**nomem", "**nomem %s", "MPID_Segment_alloc"); + MPI_ERR_OTHER, "**nomem", "**nomem %s", "MPIDU_Segment_alloc"); - MPID_Segment_init(get_pkt->addr, get_pkt->count, + MPIDU_Segment_init(get_pkt->addr, get_pkt->count, get_pkt->datatype, sreq->dev.segment_ptr, 0); sreq->dev.segment_first = 0; sreq->dev.segment_size = get_pkt->count * type_size; @@ -1318,8 +1318,8 @@ static inline int perform_acc_in_lock_queue(MPID_Win * win_ptr, MPI_Aint type_size, type_extent; MPI_Aint total_len, recv_count; - MPID_Datatype_get_size_macro(acc_pkt->datatype, type_size); - MPID_Datatype_get_extent_macro(acc_pkt->datatype, type_extent); + MPIDU_Datatype_get_size_macro(acc_pkt->datatype, type_size); + MPIDU_Datatype_get_extent_macro(acc_pkt->datatype, type_extent); total_len = type_size * acc_pkt->count; recv_count = MPL_MIN((total_len / type_size), (MPIDI_CH3U_SRBuf_size / type_extent)); @@ -1389,7 +1389,7 @@ static inline int perform_get_acc_in_lock_queue(MPID_Win * win_ptr, sreq->dev.flags = get_accum_pkt->flags; /* Copy data into a temporary buffer */ - MPID_Datatype_get_size_macro(get_accum_pkt->datatype, type_size); + MPIDU_Datatype_get_size_macro(get_accum_pkt->datatype, type_size); /* length of target data */ MPIU_Assign_trunc(len, get_accum_pkt->count * type_size, size_t); @@ -1457,7 +1457,7 @@ static inline int perform_get_acc_in_lock_queue(MPID_Win * win_ptr, MPIU_Assert(get_accum_pkt->type == MPIDI_CH3_PKT_GET_ACCUM); - MPID_Datatype_get_extent_macro(get_accum_pkt->datatype, type_extent); + MPIDU_Datatype_get_extent_macro(get_accum_pkt->datatype, type_extent); total_len = type_size * get_accum_pkt->count; recv_count = MPL_MIN((total_len / type_size), (MPIDI_CH3U_SRBuf_size / type_extent)); @@ -1465,7 +1465,7 @@ static inline int perform_get_acc_in_lock_queue(MPID_Win * win_ptr, sreq->dev.user_buf = (void *) MPL_malloc(recv_count * type_size); - MPID_Datatype_is_contig(get_accum_pkt->datatype, &is_contig); + MPIDU_Datatype_is_contig(get_accum_pkt->datatype, &is_contig); /* NOTE: 'copy data + ACC' needs to be atomic */ @@ -1481,7 +1481,7 @@ static inline int perform_get_acc_in_lock_queue(MPID_Win * win_ptr, MPIU_Memcpy(sreq->dev.user_buf, get_accum_pkt->addr, recv_count * type_size); } else { - MPID_Segment *seg = MPID_Segment_alloc(); + MPIDU_Segment *seg = MPIDU_Segment_alloc(); MPI_Aint first = 0; MPI_Aint last = first + type_size * recv_count; @@ -1490,11 +1490,11 @@ static inline int perform_get_acc_in_lock_queue(MPID_Win * win_ptr, MPIDI_CH3I_SHM_MUTEX_UNLOCK(win_ptr); } MPIR_ERR_CHKANDJUMP1(seg == NULL, mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", - "MPID_Segment"); - MPID_Segment_init(get_accum_pkt->addr, get_accum_pkt->count, get_accum_pkt->datatype, seg, + "MPIDU_Segment"); + MPIDU_Segment_init(get_accum_pkt->addr, get_accum_pkt->count, get_accum_pkt->datatype, seg, 0); - MPID_Segment_pack(seg, first, &last, sreq->dev.user_buf); - MPID_Segment_free(seg); + MPIDU_Segment_pack(seg, first, &last, sreq->dev.user_buf); + MPIDU_Segment_free(seg); } /* Perform ACCUMULATE OP */ @@ -1566,9 +1566,9 @@ static inline int perform_fop_in_lock_queue(MPID_Win * win_ptr, /* FIXME: this function is same with PktHandler_FOP(), should * do code refactoring on both of them. */ - MPID_Datatype_get_size_macro(fop_pkt->datatype, type_size); + MPIDU_Datatype_get_size_macro(fop_pkt->datatype, type_size); - MPID_Datatype_is_contig(fop_pkt->datatype, &is_contig); + MPIDU_Datatype_is_contig(fop_pkt->datatype, &is_contig); if (fop_pkt->type == MPIDI_CH3_PKT_FOP_IMMED) { MPIDI_Pkt_init(fop_resp_pkt, MPIDI_CH3_PKT_FOP_RESP_IMMED); @@ -1628,7 +1628,7 @@ static inline int perform_fop_in_lock_queue(MPID_Win * win_ptr, MPIU_Memcpy(resp_req->dev.user_buf, fop_pkt->addr, type_size); } else { - MPID_Segment *seg = MPID_Segment_alloc(); + MPIDU_Segment *seg = MPIDU_Segment_alloc(); MPI_Aint last = type_size; if (seg == NULL) { @@ -1636,10 +1636,10 @@ static inline int perform_fop_in_lock_queue(MPID_Win * win_ptr, MPIDI_CH3I_SHM_MUTEX_UNLOCK(win_ptr); } MPIR_ERR_CHKANDJUMP1(seg == NULL, mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", - "MPID_Segment"); - MPID_Segment_init(fop_pkt->addr, 1, fop_pkt->datatype, seg, 0); - MPID_Segment_pack(seg, 0, &last, resp_req->dev.user_buf); - MPID_Segment_free(seg); + "MPIDU_Segment"); + MPIDU_Segment_init(fop_pkt->addr, 1, fop_pkt->datatype, seg, 0); + MPIDU_Segment_pack(seg, 0, &last, resp_req->dev.user_buf); + MPIDU_Segment_free(seg); } /* Apply the op */ @@ -1743,7 +1743,7 @@ static inline int perform_cas_in_lock_queue(MPID_Win * win_ptr, cas_resp_pkt->flags |= MPIDI_CH3_PKT_FLAG_RMA_ACK; /* Copy old value into the response packet */ - MPID_Datatype_get_size_macro(cas_pkt->datatype, len); + MPIDU_Datatype_get_size_macro(cas_pkt->datatype, len); MPIU_Assert(len <= sizeof(MPIDI_CH3_CAS_Immed_u)); if (win_ptr->shm_allocated == TRUE) diff --git a/src/mpid/ch3/src/ch3u_request.c b/src/mpid/ch3/src/ch3u_request.c index 17ac413..bf965ab 100644 --- a/src/mpid/ch3/src/ch3u_request.c +++ b/src/mpid/ch3/src/ch3u_request.c @@ -153,7 +153,7 @@ int MPIDI_CH3U_Request_load_send_iov(MPID_Request * const sreq, MPIU_Assert(sreq->dev.segment_first < last); MPIU_Assert(last > 0); MPIU_Assert(*iov_n > 0 && *iov_n <= MPL_IOV_LIMIT); - MPID_Segment_pack_vector(sreq->dev.segment_ptr, sreq->dev.segment_first, + MPIDU_Segment_pack_vector(sreq->dev.segment_ptr, sreq->dev.segment_first, &last, iov, iov_n); MPL_DBG_MSG_FMT(MPIDI_CH3_DBG_CHANNEL,VERBOSE,(MPL_DBG_FDEST, "post-pv: first=%" PRIdPTR ", last=%" PRIdPTR ", iov_n=%d", @@ -209,7 +209,7 @@ int MPIDI_CH3U_Request_load_send_iov(MPID_Request * const sreq, MPL_DBG_MSG_FMT(MPIDI_CH3_DBG_CHANNEL,VERBOSE,(MPL_DBG_FDEST, "pre-pack: first=%" PRIdPTR ", last=%" PRIdPTR, sreq->dev.segment_first, last)); - MPID_Segment_pack(sreq->dev.segment_ptr, sreq->dev.segment_first, + MPIDU_Segment_pack(sreq->dev.segment_ptr, sreq->dev.segment_first, &last, (char*) sreq->dev.tmpbuf + iov_data_copied); MPL_DBG_MSG_FMT(MPIDI_CH3_DBG_CHANNEL,VERBOSE,(MPL_DBG_FDEST, "post-pack: first=%" PRIdPTR ", last=%" PRIdPTR, @@ -321,7 +321,7 @@ int MPIDI_CH3U_Request_load_recv_iov(MPID_Request * const rreq) rreq->dev.segment_first, last, rreq->dev.iov_count)); MPIU_Assert(rreq->dev.segment_first < last); MPIU_Assert(last > 0); - MPID_Segment_unpack_vector(rreq->dev.segment_ptr, + MPIDU_Segment_unpack_vector(rreq->dev.segment_ptr, rreq->dev.segment_first, &last, &rreq->dev.iov[0], &rreq->dev.iov_count); MPL_DBG_MSG_FMT(MPIDI_CH3_DBG_CHANNEL,VERBOSE,(MPL_DBG_FDEST, @@ -473,7 +473,7 @@ int MPIDI_CH3U_Request_unpack_srbuf(MPID_Request * rreq) tmpbuf_last = (int)rreq->dev.segment_size; } last = tmpbuf_last; - MPID_Segment_unpack(rreq->dev.segment_ptr, rreq->dev.segment_first, + MPIDU_Segment_unpack(rreq->dev.segment_ptr, rreq->dev.segment_first, &last, rreq->dev.tmpbuf); if (last == 0 || last == rreq->dev.segment_first) { @@ -540,7 +540,7 @@ int MPIDI_CH3U_Request_unpack_uebuf(MPID_Request * rreq) int dt_contig; MPI_Aint dt_true_lb; intptr_t userbuf_sz; - MPID_Datatype * dt_ptr; + MPIDU_Datatype * dt_ptr; intptr_t unpack_sz; int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3U_REQUEST_UNPACK_UEBUF); @@ -586,13 +586,13 @@ int MPIDI_CH3U_Request_unpack_uebuf(MPID_Request * rreq) } else { - MPID_Segment seg; + MPIDU_Segment seg; MPI_Aint last; - MPID_Segment_init(rreq->dev.user_buf, rreq->dev.user_count, + MPIDU_Segment_init(rreq->dev.user_buf, rreq->dev.user_count, rreq->dev.datatype, &seg, 0); last = unpack_sz; - MPID_Segment_unpack(&seg, 0, &last, rreq->dev.tmpbuf); + MPIDU_Segment_unpack(&seg, 0, &last, rreq->dev.tmpbuf); if (last != unpack_sz) { /* --BEGIN ERROR HANDLING-- */ @@ -685,11 +685,11 @@ void MPID_Request_release(MPID_Request *req) } if (req->dev.datatype_ptr != NULL) { - MPID_Datatype_release(req->dev.datatype_ptr); + MPIDU_Datatype_release(req->dev.datatype_ptr); } if (req->dev.segment_ptr != NULL) { - MPID_Segment_free(req->dev.segment_ptr); + MPIDU_Segment_free(req->dev.segment_ptr); } if (MPIDI_Request_get_srbuf_flag(req)) { diff --git a/src/mpid/ch3/src/ch3u_rma_ops.c b/src/mpid/ch3/src/ch3u_rma_ops.c index a989988..2d80b11 100644 --- a/src/mpid/ch3/src/ch3u_rma_ops.c +++ b/src/mpid/ch3/src/ch3u_rma_ops.c @@ -45,7 +45,7 @@ int MPIDI_CH3I_Put(const void *origin_addr, int origin_count, MPI_Datatype { int mpi_errno = MPI_SUCCESS; int dt_contig ATTRIBUTE((unused)), rank; - MPID_Datatype *dtp; + MPIDU_Datatype*dtp; MPI_Aint dt_true_lb ATTRIBUTE((unused)); intptr_t data_sz; MPIDI_VC_t *orig_vc = NULL, *target_vc = NULL; @@ -127,16 +127,16 @@ int MPIDI_CH3I_Put(const void *origin_addr, int origin_count, MPI_Datatype /* if source or target datatypes are derived, increment their * reference counts */ if (!MPIR_DATATYPE_IS_PREDEFINED(origin_datatype)) { - MPID_Datatype_get_ptr(origin_datatype, dtp); - MPID_Datatype_add_ref(dtp); + MPIDU_Datatype_get_ptr(origin_datatype, dtp); + MPIDU_Datatype_add_ref(dtp); } if (!MPIR_DATATYPE_IS_PREDEFINED(target_datatype)) { - MPID_Datatype_get_ptr(target_datatype, dtp); - MPID_Datatype_add_ref(dtp); + MPIDU_Datatype_get_ptr(target_datatype, dtp); + MPIDU_Datatype_add_ref(dtp); } - MPID_Datatype_is_contig(origin_datatype, &is_origin_contig); - MPID_Datatype_is_contig(target_datatype, &is_target_contig); + MPIDU_Datatype_is_contig(origin_datatype, &is_origin_contig); + MPIDU_Datatype_is_contig(target_datatype, &is_target_contig); /* Judge if we can use IMMED data packet */ if (MPIR_DATATYPE_IS_PREDEFINED(origin_datatype) && @@ -224,7 +224,7 @@ int MPIDI_CH3I_Get(void *origin_addr, int origin_count, MPI_Datatype intptr_t orig_data_sz, target_data_sz; int dt_contig ATTRIBUTE((unused)), rank; MPI_Aint dt_true_lb ATTRIBUTE((unused)); - MPID_Datatype *dtp; + MPIDU_Datatype*dtp; MPIDI_VC_t *orig_vc = NULL, *target_vc = NULL; int made_progress = 0; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3I_GET); @@ -306,18 +306,18 @@ int MPIDI_CH3I_Get(void *origin_addr, int origin_count, MPI_Datatype /* if source or target datatypes are derived, increment their * reference counts */ if (!MPIR_DATATYPE_IS_PREDEFINED(origin_datatype)) { - MPID_Datatype_get_ptr(origin_datatype, dtp); - MPID_Datatype_add_ref(dtp); + MPIDU_Datatype_get_ptr(origin_datatype, dtp); + MPIDU_Datatype_add_ref(dtp); } if (!MPIR_DATATYPE_IS_PREDEFINED(target_datatype)) { - MPID_Datatype_get_ptr(target_datatype, dtp); - MPID_Datatype_add_ref(dtp); + MPIDU_Datatype_get_ptr(target_datatype, dtp); + MPIDU_Datatype_add_ref(dtp); } - MPID_Datatype_is_contig(origin_datatype, &is_origin_contig); - MPID_Datatype_is_contig(target_datatype, &is_target_contig); + MPIDU_Datatype_is_contig(origin_datatype, &is_origin_contig); + MPIDU_Datatype_is_contig(target_datatype, &is_target_contig); - MPID_Datatype_get_size_macro(target_datatype, target_type_size); + MPIDU_Datatype_get_size_macro(target_datatype, target_type_size); MPIU_Assign_trunc(target_data_sz, target_count * target_type_size, intptr_t); /* Judge if we can use IMMED data response packet */ @@ -394,7 +394,7 @@ int MPIDI_CH3I_Accumulate(const void *origin_addr, int origin_count, MPI_Datatyp intptr_t data_sz; int dt_contig ATTRIBUTE((unused)), rank; MPI_Aint dt_true_lb ATTRIBUTE((unused)); - MPID_Datatype *dtp; + MPIDU_Datatype*dtp; MPIDI_VC_t *orig_vc = NULL, *target_vc = NULL; int made_progress = 0; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3I_ACCUMULATE); @@ -455,7 +455,7 @@ int MPIDI_CH3I_Accumulate(const void *origin_addr, int origin_count, MPI_Datatyp int is_origin_contig, is_target_contig; MPI_Aint stream_elem_count, stream_unit_count; MPI_Aint predefined_dtp_size, predefined_dtp_count, predefined_dtp_extent; - MPID_Datatype *origin_dtp = NULL, *target_dtp = NULL; + MPIDU_Datatype*origin_dtp = NULL, *target_dtp = NULL; int i; /* queue it up */ @@ -478,23 +478,23 @@ int MPIDI_CH3I_Accumulate(const void *origin_addr, int origin_count, MPI_Datatyp /* if source or target datatypes are derived, increment their * reference counts */ if (!MPIR_DATATYPE_IS_PREDEFINED(origin_datatype)) { - MPID_Datatype_get_ptr(origin_datatype, origin_dtp); + MPIDU_Datatype_get_ptr(origin_datatype, origin_dtp); } if (!MPIR_DATATYPE_IS_PREDEFINED(target_datatype)) { - MPID_Datatype_get_ptr(target_datatype, target_dtp); + MPIDU_Datatype_get_ptr(target_datatype, target_dtp); } /* Get size and count for predefined datatype elements */ if (MPIR_DATATYPE_IS_PREDEFINED(origin_datatype)) { - MPID_Datatype_get_size_macro(origin_datatype, predefined_dtp_size); + MPIDU_Datatype_get_size_macro(origin_datatype, predefined_dtp_size); predefined_dtp_count = origin_count; - MPID_Datatype_get_extent_macro(origin_datatype, predefined_dtp_extent); + MPIDU_Datatype_get_extent_macro(origin_datatype, predefined_dtp_extent); } else { MPIU_Assert(origin_dtp->basic_type != MPI_DATATYPE_NULL); - MPID_Datatype_get_size_macro(origin_dtp->basic_type, predefined_dtp_size); + MPIDU_Datatype_get_size_macro(origin_dtp->basic_type, predefined_dtp_size); predefined_dtp_count = data_sz / predefined_dtp_size; - MPID_Datatype_get_extent_macro(origin_dtp->basic_type, predefined_dtp_extent); + MPIDU_Datatype_get_extent_macro(origin_dtp->basic_type, predefined_dtp_extent); } MPIU_Assert(predefined_dtp_count > 0 && predefined_dtp_size > 0 && predefined_dtp_extent > 0); @@ -507,15 +507,15 @@ int MPIDI_CH3I_Accumulate(const void *origin_addr, int origin_count, MPI_Datatyp for (i = 0; i < stream_unit_count; i++) { if (origin_dtp != NULL) { - MPID_Datatype_add_ref(origin_dtp); + MPIDU_Datatype_add_ref(origin_dtp); } if (target_dtp != NULL) { - MPID_Datatype_add_ref(target_dtp); + MPIDU_Datatype_add_ref(target_dtp); } } - MPID_Datatype_is_contig(origin_datatype, &is_origin_contig); - MPID_Datatype_is_contig(target_datatype, &is_target_contig); + MPIDU_Datatype_is_contig(origin_datatype, &is_origin_contig); + MPIDU_Datatype_is_contig(target_datatype, &is_target_contig); /* Judge if we can use IMMED data packet */ if (MPIR_DATATYPE_IS_PREDEFINED(origin_datatype) && @@ -607,7 +607,7 @@ int MPIDI_CH3I_Get_accumulate(const void *origin_addr, int origin_count, int rank; int dt_contig ATTRIBUTE((unused)); MPI_Aint dt_true_lb ATTRIBUTE((unused)); - MPID_Datatype *dtp; + MPIDU_Datatype*dtp; MPIDI_VC_t *orig_vc = NULL, *target_vc = NULL; int made_progress = 0; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3I_GET_ACCUMULATE); @@ -672,7 +672,7 @@ int MPIDI_CH3I_Get_accumulate(const void *origin_addr, int origin_count, int is_origin_contig, is_target_contig, is_result_contig; MPI_Aint stream_elem_count, stream_unit_count; MPI_Aint predefined_dtp_size, predefined_dtp_count, predefined_dtp_extent; - MPID_Datatype *origin_dtp = NULL, *target_dtp = NULL, *result_dtp = NULL; + MPIDU_Datatype*origin_dtp = NULL, *target_dtp = NULL, *result_dtp = NULL; int is_empty_origin = FALSE; /* Judge if origin buffer is empty */ @@ -704,17 +704,17 @@ int MPIDI_CH3I_Get_accumulate(const void *origin_addr, int origin_count, /* if source or target datatypes are derived, increment their * reference counts */ if (is_empty_origin == FALSE && !MPIR_DATATYPE_IS_PREDEFINED(origin_datatype)) { - MPID_Datatype_get_ptr(origin_datatype, origin_dtp); + MPIDU_Datatype_get_ptr(origin_datatype, origin_dtp); } if (!MPIR_DATATYPE_IS_PREDEFINED(result_datatype)) { - MPID_Datatype_get_ptr(result_datatype, result_dtp); + MPIDU_Datatype_get_ptr(result_datatype, result_dtp); } if (!MPIR_DATATYPE_IS_PREDEFINED(target_datatype)) { - MPID_Datatype_get_ptr(target_datatype, target_dtp); + MPIDU_Datatype_get_ptr(target_datatype, target_dtp); } if (is_empty_origin == FALSE) { - MPID_Datatype_get_size_macro(origin_datatype, origin_type_size); + MPIDU_Datatype_get_size_macro(origin_datatype, origin_type_size); MPIU_Assign_trunc(orig_data_sz, origin_count * origin_type_size, intptr_t); } else { @@ -722,19 +722,19 @@ int MPIDI_CH3I_Get_accumulate(const void *origin_addr, int origin_count, orig_data_sz = 0; } - MPID_Datatype_get_size_macro(target_datatype, target_type_size); + MPIDU_Datatype_get_size_macro(target_datatype, target_type_size); /* Get size and count for predefined datatype elements */ if (MPIR_DATATYPE_IS_PREDEFINED(target_datatype)) { predefined_dtp_size = target_type_size; predefined_dtp_count = target_count; - MPID_Datatype_get_extent_macro(target_datatype, predefined_dtp_extent); + MPIDU_Datatype_get_extent_macro(target_datatype, predefined_dtp_extent); } else { MPIU_Assert(target_dtp->basic_type != MPI_DATATYPE_NULL); - MPID_Datatype_get_size_macro(target_dtp->basic_type, predefined_dtp_size); + MPIDU_Datatype_get_size_macro(target_dtp->basic_type, predefined_dtp_size); predefined_dtp_count = target_data_sz / predefined_dtp_size; - MPID_Datatype_get_extent_macro(target_dtp->basic_type, predefined_dtp_extent); + MPIDU_Datatype_get_extent_macro(target_dtp->basic_type, predefined_dtp_extent); } MPIU_Assert(predefined_dtp_count > 0 && predefined_dtp_size > 0 && predefined_dtp_extent > 0); @@ -747,25 +747,25 @@ int MPIDI_CH3I_Get_accumulate(const void *origin_addr, int origin_count, for (i = 0; i < stream_unit_count; i++) { if (origin_dtp != NULL) { - MPID_Datatype_add_ref(origin_dtp); + MPIDU_Datatype_add_ref(origin_dtp); } if (target_dtp != NULL) { - MPID_Datatype_add_ref(target_dtp); + MPIDU_Datatype_add_ref(target_dtp); } if (result_dtp != NULL) { - MPID_Datatype_add_ref(result_dtp); + MPIDU_Datatype_add_ref(result_dtp); } } if (is_empty_origin == FALSE) { - MPID_Datatype_is_contig(origin_datatype, &is_origin_contig); + MPIDU_Datatype_is_contig(origin_datatype, &is_origin_contig); } else { /* If origin buffer is empty, mark origin data as contig data */ is_origin_contig = 1; } - MPID_Datatype_is_contig(target_datatype, &is_target_contig); - MPID_Datatype_is_contig(result_datatype, &is_result_contig); + MPIDU_Datatype_is_contig(target_datatype, &is_target_contig); + MPIDU_Datatype_is_contig(result_datatype, &is_result_contig); /* Judge if we can use IMMED data packet */ if ((is_empty_origin == TRUE || MPIR_DATATYPE_IS_PREDEFINED(origin_datatype)) && @@ -1047,7 +1047,7 @@ int MPID_Compare_and_swap(const void *origin_addr, const void *compare_addr, /* REQUIRE: All datatype arguments must be of the same, builtin * type and counts must be 1. */ - MPID_Datatype_get_size_macro(datatype, type_size); + MPIDU_Datatype_get_size_macro(datatype, type_size); MPIU_Assert(type_size <= sizeof(MPIDI_CH3_CAS_Immed_u)); src = (void *) origin_addr, dest = (void *) (&(cas_pkt->origin_data)); @@ -1169,10 +1169,10 @@ int MPID_Fetch_and_op(const void *origin_addr, void *result_addr, /************** Setting packet struct areas in operation ****************/ - MPID_Datatype_get_size_macro(datatype, type_size); + MPIDU_Datatype_get_size_macro(datatype, type_size); MPIU_Assert(type_size <= sizeof(MPIDI_CH3_FOP_Immed_u)); - MPID_Datatype_is_contig(datatype, &is_contig); + MPIDU_Datatype_is_contig(datatype, &is_contig); if (is_contig) { /* Judge if we can use IMMED data packet */ diff --git a/src/mpid/ch3/src/ch3u_rma_pkthandler.c b/src/mpid/ch3/src/ch3u_rma_pkthandler.c index 7aed6dc..d9da632 100644 --- a/src/mpid/ch3/src/ch3u_rma_pkthandler.c +++ b/src/mpid/ch3/src/ch3u_rma_pkthandler.c @@ -294,7 +294,7 @@ int MPIDI_CH3_PktHandler_Put(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, /* Immed packet type is used when target datatype is predefined datatype. */ MPIU_Assert(MPIR_DATATYPE_IS_PREDEFINED(put_pkt->datatype)); - MPID_Datatype_get_size_macro(put_pkt->datatype, type_size); + MPIDU_Datatype_get_size_macro(put_pkt->datatype, type_size); /* copy data from packet header to target buffer */ MPIU_Memcpy(put_pkt->addr, put_pkt->info.data, put_pkt->count * type_size); @@ -331,7 +331,7 @@ int MPIDI_CH3_PktHandler_Put(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, MPIDI_Request_set_type(req, MPIDI_REQUEST_TYPE_PUT_RECV); req->dev.datatype = put_pkt->datatype; - MPID_Datatype_get_size_macro(put_pkt->datatype, type_size); + MPIDU_Datatype_get_size_macro(put_pkt->datatype, type_size); req->dev.recv_data_sz = type_size * put_pkt->count; MPIU_Assert(req->dev.recv_data_sz > 0); @@ -510,9 +510,9 @@ int MPIDI_CH3_PktHandler_Get(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, get_resp_pkt->target_rank = win_ptr->comm_ptr->rank; /* length of target data */ - MPID_Datatype_get_size_macro(get_pkt->datatype, type_size); + MPIDU_Datatype_get_size_macro(get_pkt->datatype, type_size); - MPID_Datatype_is_contig(get_pkt->datatype, &is_contig); + MPIDU_Datatype_is_contig(get_pkt->datatype, &is_contig); if (get_pkt->flags & MPIDI_CH3_PKT_FLAG_RMA_IMMED_RESP) { MPIU_Assign_trunc(len, get_pkt->count * type_size, size_t); @@ -556,11 +556,11 @@ int MPIDI_CH3_PktHandler_Get(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, iov[0].MPL_IOV_BUF = (MPL_IOV_BUF_CAST) get_resp_pkt; iov[0].MPL_IOV_LEN = sizeof(*get_resp_pkt); - req->dev.segment_ptr = MPID_Segment_alloc(); + req->dev.segment_ptr = MPIDU_Segment_alloc(); MPIR_ERR_CHKANDJUMP1(req->dev.segment_ptr == NULL, mpi_errno, - MPI_ERR_OTHER, "**nomem", "**nomem %s", "MPID_Segment_alloc"); + MPI_ERR_OTHER, "**nomem", "**nomem %s", "MPIDU_Segment_alloc"); - MPID_Segment_init(get_pkt->addr, get_pkt->count, + MPIDU_Segment_init(get_pkt->addr, get_pkt->count, get_pkt->datatype, req->dev.segment_ptr, 0); req->dev.segment_first = 0; req->dev.segment_size = get_pkt->count * type_size; @@ -748,7 +748,7 @@ int MPIDI_CH3_PktHandler_Accumulate(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, else { req->dev.OnFinal = MPIDI_CH3_ReqHandler_AccumRecvComplete; - MPID_Datatype_get_extent_macro(accum_pkt->datatype, extent); + MPIDU_Datatype_get_extent_macro(accum_pkt->datatype, extent); MPIU_Assert(!MPIDI_Request_get_srbuf_flag(req)); /* allocate a SRBuf for receiving stream unit */ @@ -766,7 +766,7 @@ int MPIDI_CH3_PktHandler_Accumulate(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, req->dev.user_buf = req->dev.tmpbuf; - MPID_Datatype_get_size_macro(accum_pkt->datatype, type_size); + MPIDU_Datatype_get_size_macro(accum_pkt->datatype, type_size); total_len = type_size * accum_pkt->count; stream_elem_count = MPIDI_CH3U_SRBuf_size / extent; @@ -919,7 +919,7 @@ int MPIDI_CH3_PktHandler_GetAccumulate(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, win_ptr->at_completion_counter++; /* Calculate the length of reponse data, ensure that it fits into immed packet. */ - MPID_Datatype_get_size_macro(get_accum_pkt->datatype, type_size); + MPIDU_Datatype_get_size_macro(get_accum_pkt->datatype, type_size); MPIU_Assign_trunc(len, get_accum_pkt->count * type_size, size_t); MPIDI_Pkt_init(get_accum_resp_pkt, MPIDI_CH3_PKT_GET_ACCUM_RESP_IMMED); @@ -1035,7 +1035,7 @@ int MPIDI_CH3_PktHandler_GetAccumulate(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, complete = 1; } else { - MPID_Datatype_get_extent_macro(get_accum_pkt->datatype, extent); + MPIDU_Datatype_get_extent_macro(get_accum_pkt->datatype, extent); MPIU_Assert(!MPIDI_Request_get_srbuf_flag(req)); /* allocate a SRBuf for receiving stream unit */ @@ -1053,7 +1053,7 @@ int MPIDI_CH3_PktHandler_GetAccumulate(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, req->dev.user_buf = req->dev.tmpbuf; - MPID_Datatype_get_size_macro(get_accum_pkt->datatype, type_size); + MPIDU_Datatype_get_size_macro(get_accum_pkt->datatype, type_size); total_len = type_size * get_accum_pkt->count; stream_elem_count = MPIDI_CH3U_SRBuf_size / extent; @@ -1195,7 +1195,7 @@ int MPIDI_CH3_PktHandler_CAS(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, cas_resp_pkt->flags |= MPIDI_CH3_PKT_FLAG_RMA_ACK; /* Copy old value into the response packet */ - MPID_Datatype_get_size_macro(cas_pkt->datatype, len); + MPIDU_Datatype_get_size_macro(cas_pkt->datatype, len); MPIU_Assert(len <= sizeof(MPIDI_CH3_CAS_Immed_u)); if (win_ptr->shm_allocated == TRUE) @@ -1293,7 +1293,7 @@ int MPIDI_CH3_PktHandler_CASResp(MPIDI_VC_t * vc ATTRIBUTE((unused)), MPIR_ERR_POP(mpi_errno); } - MPID_Datatype_get_size_macro(req->dev.datatype, len); + MPIDU_Datatype_get_size_macro(req->dev.datatype, len); MPIU_Memcpy(req->dev.user_buf, (void *) &cas_resp_pkt->info.data, len); @@ -1352,7 +1352,7 @@ int MPIDI_CH3_PktHandler_FOP(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, (*buflen) = sizeof(MPIDI_CH3_Pkt_t); (*rreqp) = NULL; - MPID_Datatype_get_size_macro(fop_pkt->datatype, type_size); + MPIDU_Datatype_get_size_macro(fop_pkt->datatype, type_size); if (pkt->type == MPIDI_CH3_PKT_FOP_IMMED) { @@ -1462,7 +1462,7 @@ int MPIDI_CH3_PktHandler_FOP(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, data_len = *buflen - sizeof(MPIDI_CH3_Pkt_t); data_buf = (char *) pkt + sizeof(MPIDI_CH3_Pkt_t); - MPID_Datatype_get_extent_macro(fop_pkt->datatype, extent); + MPIDU_Datatype_get_extent_macro(fop_pkt->datatype, extent); req->dev.user_buf = MPL_malloc(extent); if (!req->dev.user_buf) { @@ -1549,7 +1549,7 @@ int MPIDI_CH3_PktHandler_FOPResp(MPIDI_VC_t * vc ATTRIBUTE((unused)), data_len = *buflen - sizeof(MPIDI_CH3_Pkt_t); data_buf = (char *) pkt + sizeof(MPIDI_CH3_Pkt_t); - MPID_Datatype_get_size_macro(req->dev.datatype, type_size); + MPIDU_Datatype_get_size_macro(req->dev.datatype, type_size); req->dev.recv_data_sz = type_size; req->dev.user_count = 1; @@ -1637,7 +1637,7 @@ int MPIDI_CH3_PktHandler_Get_AccumResp(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, data_len = *buflen - sizeof(MPIDI_CH3_Pkt_t); data_buf = (char *) pkt + sizeof(MPIDI_CH3_Pkt_t); - MPID_Datatype_get_size_macro(req->dev.datatype, type_size); + MPIDU_Datatype_get_size_macro(req->dev.datatype, type_size); *rreqp = req; @@ -1667,8 +1667,8 @@ int MPIDI_CH3_PktHandler_Get_AccumResp(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, basic_type = req->dev.datatype_ptr->basic_type; } - MPID_Datatype_get_extent_macro(basic_type, basic_type_extent); - MPID_Datatype_get_size_macro(basic_type, basic_type_size); + MPIDU_Datatype_get_extent_macro(basic_type, basic_type_extent); + MPIDU_Datatype_get_size_macro(basic_type, basic_type_size); /* Note: here we get the stream_offset from the extended packet header * in the response request, which is set in issue_get_acc_op() funcion. @@ -1697,8 +1697,8 @@ int MPIDI_CH3_PktHandler_Get_AccumResp(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, else { *buflen = sizeof(MPIDI_CH3_Pkt_t); - req->dev.segment_ptr = MPID_Segment_alloc(); - MPID_Segment_init(req->dev.user_buf, req->dev.user_count, req->dev.datatype, + req->dev.segment_ptr = MPIDU_Segment_alloc(); + MPIDU_Segment_init(req->dev.user_buf, req->dev.user_count, req->dev.datatype, req->dev.segment_ptr, 0); req->dev.segment_first = contig_stream_offset; req->dev.segment_size = contig_stream_offset + req->dev.recv_data_sz; @@ -1832,7 +1832,7 @@ int MPIDI_CH3_PktHandler_GetResp(MPIDI_VC_t * vc ATTRIBUTE((unused)), data_len = *buflen - sizeof(MPIDI_CH3_Pkt_t); data_buf = (char *) pkt + sizeof(MPIDI_CH3_Pkt_t); - MPID_Datatype_get_size_macro(req->dev.datatype, type_size); + MPIDU_Datatype_get_size_macro(req->dev.datatype, type_size); req->dev.recv_data_sz = type_size * req->dev.user_count; *rreqp = req; diff --git a/src/mpid/ch3/src/ch3u_rma_reqops.c b/src/mpid/ch3/src/ch3u_rma_reqops.c index 4882a48..ec871fd 100644 --- a/src/mpid/ch3/src/ch3u_rma_reqops.c +++ b/src/mpid/ch3/src/ch3u_rma_reqops.c @@ -19,7 +19,7 @@ int MPID_Rput(const void *origin_addr, int origin_count, { int mpi_errno = MPI_SUCCESS; int dt_contig ATTRIBUTE((unused)); - MPID_Datatype *dtp; + MPIDU_Datatype*dtp; MPI_Aint dt_true_lb ATTRIBUTE((unused)); intptr_t data_sz; MPID_Request *ureq; @@ -82,7 +82,7 @@ int MPID_Rget(void *origin_addr, int origin_count, { int mpi_errno = MPI_SUCCESS; int dt_contig ATTRIBUTE((unused)); - MPID_Datatype *dtp; + MPIDU_Datatype*dtp; MPI_Aint dt_true_lb ATTRIBUTE((unused)); intptr_t data_sz; MPID_Request *ureq; @@ -145,7 +145,7 @@ int MPID_Raccumulate(const void *origin_addr, int origin_count, { int mpi_errno = MPI_SUCCESS; int dt_contig ATTRIBUTE((unused)); - MPID_Datatype *dtp; + MPIDU_Datatype*dtp; MPI_Aint dt_true_lb ATTRIBUTE((unused)); intptr_t data_sz; MPID_Request *ureq; @@ -209,7 +209,7 @@ int MPID_Rget_accumulate(const void *origin_addr, int origin_count, { int mpi_errno = MPI_SUCCESS; int dt_contig ATTRIBUTE((unused)); - MPID_Datatype *dtp; + MPIDU_Datatype*dtp; MPI_Aint dt_true_lb ATTRIBUTE((unused)); intptr_t data_sz, trg_data_sz; MPID_Request *ureq; diff --git a/src/mpid/ch3/src/ch3u_rndv.c b/src/mpid/ch3/src/ch3u_rndv.c index 96aa8c5..1787628 100644 --- a/src/mpid/ch3/src/ch3u_rndv.c +++ b/src/mpid/ch3/src/ch3u_rndv.c @@ -206,7 +206,7 @@ int MPIDI_CH3_PktHandler_RndvClrToSend( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, int dt_contig; MPI_Aint dt_true_lb; intptr_t data_sz; - MPID_Datatype * dt_ptr; + MPIDU_Datatype* dt_ptr; int mpi_errno = MPI_SUCCESS; MPL_DBG_MSG(MPIDI_CH3_DBG_OTHER,VERBOSE,"received rndv CTS pkt"); @@ -258,9 +258,9 @@ int MPIDI_CH3_PktHandler_RndvClrToSend( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, } else { - sreq->dev.segment_ptr = MPID_Segment_alloc( ); - MPIR_ERR_CHKANDJUMP1((sreq->dev.segment_ptr == NULL), mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", "MPID_Segment_alloc"); - MPID_Segment_init(sreq->dev.user_buf, sreq->dev.user_count, + sreq->dev.segment_ptr = MPIDU_Segment_alloc( ); + MPIR_ERR_CHKANDJUMP1((sreq->dev.segment_ptr == NULL), mpi_errno, MPI_ERR_OTHER, "**nomem", "**nomem %s", "MPIDU_Segment_alloc"); + MPIDU_Segment_init(sreq->dev.user_buf, sreq->dev.user_count, sreq->dev.datatype, sreq->dev.segment_ptr, 0); sreq->dev.segment_first = 0; sreq->dev.segment_size = data_sz; diff --git a/src/mpid/ch3/src/mpid_imrecv.c b/src/mpid/ch3/src/mpid_imrecv.c index c9f3a98..8b46e1e 100644 --- a/src/mpid/ch3/src/mpid_imrecv.c +++ b/src/mpid/ch3/src/mpid_imrecv.c @@ -99,8 +99,8 @@ int MPID_Imrecv(void *buf, int count, MPI_Datatype datatype, entire message has arrived. */ if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype_get_ptr(datatype, rreq->dev.datatype_ptr); - MPID_Datatype_add_ref(rreq->dev.datatype_ptr); + MPIDU_Datatype_get_ptr(datatype, rreq->dev.datatype_ptr); + MPIDU_Datatype_add_ref(rreq->dev.datatype_ptr); } } @@ -113,8 +113,8 @@ int MPID_Imrecv(void *buf, int count, MPI_Datatype datatype, if (mpi_errno) MPIR_ERR_POP(mpi_errno); if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype_get_ptr(datatype, rreq->dev.datatype_ptr); - MPID_Datatype_add_ref(rreq->dev.datatype_ptr); + MPIDU_Datatype_get_ptr(datatype, rreq->dev.datatype_ptr); + MPIDU_Datatype_add_ref(rreq->dev.datatype_ptr); } } else if (MPIDI_Request_get_msg_type(rreq) == MPIDI_REQUEST_SELF_MSG) diff --git a/src/mpid/ch3/src/mpid_irecv.c b/src/mpid/ch3/src/mpid_irecv.c index 8338b2c..3261621 100644 --- a/src/mpid/ch3/src/mpid_irecv.c +++ b/src/mpid/ch3/src/mpid_irecv.c @@ -106,8 +106,8 @@ int MPID_Irecv(void * buf, MPI_Aint count, MPI_Datatype datatype, int rank, int entire message has arrived. */ if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype_get_ptr(datatype, rreq->dev.datatype_ptr); - MPID_Datatype_add_ref(rreq->dev.datatype_ptr); + MPIDU_Datatype_get_ptr(datatype, rreq->dev.datatype_ptr); + MPIDU_Datatype_add_ref(rreq->dev.datatype_ptr); } } @@ -120,8 +120,8 @@ int MPID_Irecv(void * buf, MPI_Aint count, MPI_Datatype datatype, int rank, int if (mpi_errno) MPIR_ERR_POP( mpi_errno ); if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype_get_ptr(datatype, rreq->dev.datatype_ptr); - MPID_Datatype_add_ref(rreq->dev.datatype_ptr); + MPIDU_Datatype_get_ptr(datatype, rreq->dev.datatype_ptr); + MPIDU_Datatype_add_ref(rreq->dev.datatype_ptr); } } else if (MPIDI_Request_get_msg_type(rreq) == MPIDI_REQUEST_SELF_MSG) @@ -151,8 +151,8 @@ int MPID_Irecv(void * buf, MPI_Aint count, MPI_Datatype datatype, int rank, int if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype_get_ptr(datatype, rreq->dev.datatype_ptr); - MPID_Datatype_add_ref(rreq->dev.datatype_ptr); + MPIDU_Datatype_get_ptr(datatype, rreq->dev.datatype_ptr); + MPIDU_Datatype_add_ref(rreq->dev.datatype_ptr); } rreq->dev.recv_pending_count = 1; diff --git a/src/mpid/ch3/src/mpid_irsend.c b/src/mpid/ch3/src/mpid_irsend.c index b11bb1b..bc3b78d 100644 --- a/src/mpid/ch3/src/mpid_irsend.c +++ b/src/mpid/ch3/src/mpid_irsend.c @@ -23,7 +23,7 @@ int MPID_Irsend(const void * buf, int count, MPI_Datatype datatype, int rank, in intptr_t data_sz; int dt_contig; MPI_Aint dt_true_lb; - MPID_Datatype * dt_ptr; + MPIDU_Datatype* dt_ptr; MPID_Request * sreq; MPIDI_VC_t * vc; #if defined(MPID_USE_SEQUENCE_NUMBERS) @@ -127,7 +127,7 @@ int MPID_Irsend(const void * buf, int count, MPI_Datatype datatype, int rank, in /* If we're not complete, then add a reference to the datatype */ if (sreq && sreq->dev.OnDataAvail) { sreq->dev.datatype_ptr = dt_ptr; - MPID_Datatype_add_ref(dt_ptr); + MPIDU_Datatype_add_ref(dt_ptr); } } } else { @@ -140,7 +140,7 @@ int MPID_Irsend(const void * buf, int count, MPI_Datatype datatype, int rank, in context_offset ); if (sreq && dt_ptr != NULL) { sreq->dev.datatype_ptr = dt_ptr; - MPID_Datatype_add_ref(dt_ptr); + MPIDU_Datatype_add_ref(dt_ptr); } } diff --git a/src/mpid/ch3/src/mpid_isend.c b/src/mpid/ch3/src/mpid_isend.c index f823d62..7e774be 100644 --- a/src/mpid/ch3/src/mpid_isend.c +++ b/src/mpid/ch3/src/mpid_isend.c @@ -34,7 +34,7 @@ int MPID_Isend(const void * buf, MPI_Aint count, MPI_Datatype datatype, int rank intptr_t data_sz; int dt_contig; MPI_Aint dt_true_lb; - MPID_Datatype * dt_ptr; + MPIDU_Datatype* dt_ptr; MPID_Request * sreq; MPIDI_VC_t * vc=0; #if defined(MPID_USE_SEQUENCE_NUMBERS) @@ -151,7 +151,7 @@ int MPID_Isend(const void * buf, MPI_Aint count, MPI_Datatype datatype, int rank /* If we're not complete, then add a reference to the datatype */ if (sreq && sreq->dev.OnDataAvail) { sreq->dev.datatype_ptr = dt_ptr; - MPID_Datatype_add_ref(dt_ptr); + MPIDU_Datatype_add_ref(dt_ptr); } } } @@ -171,7 +171,7 @@ int MPID_Isend(const void * buf, MPI_Aint count, MPI_Datatype datatype, int rank if (sreq && dt_ptr != NULL) { sreq->dev.datatype_ptr = dt_ptr; - MPID_Datatype_add_ref(dt_ptr); + MPIDU_Datatype_add_ref(dt_ptr); } } diff --git a/src/mpid/ch3/src/mpid_issend.c b/src/mpid/ch3/src/mpid_issend.c index 1d71357..1ee104b 100644 --- a/src/mpid/ch3/src/mpid_issend.c +++ b/src/mpid/ch3/src/mpid_issend.c @@ -21,7 +21,7 @@ int MPID_Issend(const void * buf, int count, MPI_Datatype datatype, int rank, in intptr_t data_sz; int dt_contig; MPI_Aint dt_true_lb; - MPID_Datatype * dt_ptr; + MPIDU_Datatype* dt_ptr; MPID_Request * sreq; MPIDI_VC_t * vc=0; #if defined(MPID_USE_SEQUENCE_NUMBERS) @@ -95,7 +95,7 @@ int MPID_Issend(const void * buf, int count, MPI_Datatype datatype, int rank, in /* If we're not complete, then add a reference to the datatype */ if (sreq && sreq->dev.OnDataAvail) { sreq->dev.datatype_ptr = dt_ptr; - MPID_Datatype_add_ref(dt_ptr); + MPIDU_Datatype_add_ref(dt_ptr); } } else @@ -115,7 +115,7 @@ int MPID_Issend(const void * buf, int count, MPI_Datatype datatype, int rank, in if (sreq && dt_ptr != NULL) { sreq->dev.datatype_ptr = dt_ptr; - MPID_Datatype_add_ref(dt_ptr); + MPIDU_Datatype_add_ref(dt_ptr); } } diff --git a/src/mpid/ch3/src/mpid_recv.c b/src/mpid/ch3/src/mpid_recv.c index 6b3b45f..9dc5f3d 100644 --- a/src/mpid/ch3/src/mpid_recv.c +++ b/src/mpid/ch3/src/mpid_recv.c @@ -119,8 +119,8 @@ int MPID_Recv(void * buf, MPI_Aint count, MPI_Datatype datatype, int rank, int t entire message has arrived. */ if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype_get_ptr(datatype, rreq->dev.datatype_ptr); - MPID_Datatype_add_ref(rreq->dev.datatype_ptr); + MPIDU_Datatype_get_ptr(datatype, rreq->dev.datatype_ptr); + MPIDU_Datatype_add_ref(rreq->dev.datatype_ptr); } } } @@ -132,8 +132,8 @@ int MPID_Recv(void * buf, MPI_Aint count, MPI_Datatype datatype, int rank, int t if (mpi_errno) MPIR_ERR_POP(mpi_errno); if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype_get_ptr(datatype, rreq->dev.datatype_ptr); - MPID_Datatype_add_ref(rreq->dev.datatype_ptr); + MPIDU_Datatype_get_ptr(datatype, rreq->dev.datatype_ptr); + MPIDU_Datatype_add_ref(rreq->dev.datatype_ptr); } } else if (MPIDI_Request_get_msg_type(rreq) == MPIDI_REQUEST_SELF_MSG) @@ -172,8 +172,8 @@ int MPID_Recv(void * buf, MPI_Aint count, MPI_Datatype datatype, int rank, int t decremented, and are freed if the refs are zero) */ if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype_get_ptr(datatype, rreq->dev.datatype_ptr); - MPID_Datatype_add_ref(rreq->dev.datatype_ptr); + MPIDU_Datatype_get_ptr(datatype, rreq->dev.datatype_ptr); + MPIDU_Datatype_add_ref(rreq->dev.datatype_ptr); } rreq->dev.recv_pending_count = 1; diff --git a/src/mpid/ch3/src/mpid_rsend.c b/src/mpid/ch3/src/mpid_rsend.c index 2b321fc..960aac9 100644 --- a/src/mpid/ch3/src/mpid_rsend.c +++ b/src/mpid/ch3/src/mpid_rsend.c @@ -25,7 +25,7 @@ int MPID_Rsend(const void * buf, int count, MPI_Datatype datatype, int rank, int intptr_t data_sz; int dt_contig; MPI_Aint dt_true_lb; - MPID_Datatype * dt_ptr; + MPIDU_Datatype* dt_ptr; MPID_Request * sreq = NULL; MPIDI_VC_t * vc; #if defined(MPID_USE_SEQUENCE_NUMBERS) diff --git a/src/mpid/ch3/src/mpid_send.c b/src/mpid/ch3/src/mpid_send.c index 81f2416..2f1b477 100644 --- a/src/mpid/ch3/src/mpid_send.c +++ b/src/mpid/ch3/src/mpid_send.c @@ -22,7 +22,7 @@ int MPID_Send(const void * buf, MPI_Aint count, MPI_Datatype datatype, int rank, intptr_t data_sz; int dt_contig; MPI_Aint dt_true_lb; - MPID_Datatype * dt_ptr; + MPIDU_Datatype* dt_ptr; MPID_Request * sreq = NULL; MPIDI_VC_t * vc; #if defined(MPID_USE_SEQUENCE_NUMBERS) diff --git a/src/mpid/ch3/src/mpid_ssend.c b/src/mpid/ch3/src/mpid_ssend.c index 31957b3..f1db29d 100644 --- a/src/mpid/ch3/src/mpid_ssend.c +++ b/src/mpid/ch3/src/mpid_ssend.c @@ -21,7 +21,7 @@ int MPID_Ssend(const void * buf, MPI_Aint count, MPI_Datatype datatype, int rank intptr_t data_sz; int dt_contig; MPI_Aint dt_true_lb; - MPID_Datatype * dt_ptr; + MPIDU_Datatype * dt_ptr; MPID_Request * sreq = NULL; MPIDI_VC_t * vc; #if defined(MPID_USE_SEQUENCE_NUMBERS) diff --git a/src/mpid/ch3/src/mpid_startall.c b/src/mpid/ch3/src/mpid_startall.c index b726f6d..f288dfb 100644 --- a/src/mpid/ch3/src/mpid_startall.c +++ b/src/mpid/ch3/src/mpid_startall.c @@ -175,8 +175,8 @@ int MPID_Send_init(const void * buf, int count, MPI_Datatype datatype, int rank, MPIDI_Request_set_type(sreq, MPIDI_REQUEST_TYPE_SEND); if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype_get_ptr(datatype, sreq->dev.datatype_ptr); - MPID_Datatype_add_ref(sreq->dev.datatype_ptr); + MPIDU_Datatype_get_ptr(datatype, sreq->dev.datatype_ptr); + MPIDU_Datatype_add_ref(sreq->dev.datatype_ptr); } *request = sreq; @@ -205,8 +205,8 @@ int MPID_Ssend_init(const void * buf, int count, MPI_Datatype datatype, int rank MPIDI_Request_set_type(sreq, MPIDI_REQUEST_TYPE_SSEND); if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype_get_ptr(datatype, sreq->dev.datatype_ptr); - MPID_Datatype_add_ref(sreq->dev.datatype_ptr); + MPIDU_Datatype_get_ptr(datatype, sreq->dev.datatype_ptr); + MPIDU_Datatype_add_ref(sreq->dev.datatype_ptr); } *request = sreq; @@ -235,8 +235,8 @@ int MPID_Rsend_init(const void * buf, int count, MPI_Datatype datatype, int rank MPIDI_Request_set_type(sreq, MPIDI_REQUEST_TYPE_RSEND); if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype_get_ptr(datatype, sreq->dev.datatype_ptr); - MPID_Datatype_add_ref(sreq->dev.datatype_ptr); + MPIDU_Datatype_get_ptr(datatype, sreq->dev.datatype_ptr); + MPIDU_Datatype_add_ref(sreq->dev.datatype_ptr); } *request = sreq; @@ -265,8 +265,8 @@ int MPID_Bsend_init(const void * buf, int count, MPI_Datatype datatype, int rank MPIDI_Request_set_type(sreq, MPIDI_REQUEST_TYPE_BSEND); if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype_get_ptr(datatype, sreq->dev.datatype_ptr); - MPID_Datatype_add_ref(sreq->dev.datatype_ptr); + MPIDU_Datatype_get_ptr(datatype, sreq->dev.datatype_ptr); + MPIDU_Datatype_add_ref(sreq->dev.datatype_ptr); } *request = sreq; @@ -323,8 +323,8 @@ int MPID_Recv_init(void * buf, int count, MPI_Datatype datatype, int rank, int t MPIDI_Request_set_type(rreq, MPIDI_REQUEST_TYPE_RECV); if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype_get_ptr(datatype, rreq->dev.datatype_ptr); - MPID_Datatype_add_ref(rreq->dev.datatype_ptr); + MPIDU_Datatype_get_ptr(datatype, rreq->dev.datatype_ptr); + MPIDU_Datatype_add_ref(rreq->dev.datatype_ptr); } *request = rreq; diff --git a/src/mpid/ch3/src/mpidi_isend_self.c b/src/mpid/ch3/src/mpidi_isend_self.c index 75e5d22..412dd66 100644 --- a/src/mpid/ch3/src/mpidi_isend_self.c +++ b/src/mpid/ch3/src/mpidi_isend_self.c @@ -115,12 +115,12 @@ int MPIDI_Isend_self(const void * buf, MPI_Aint count, MPI_Datatype datatype, in "added receive request to unexpected queue; attaching send request"); if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype_get_ptr(datatype, sreq->dev.datatype_ptr); - MPID_Datatype_add_ref(sreq->dev.datatype_ptr); + MPIDU_Datatype_get_ptr(datatype, sreq->dev.datatype_ptr); + MPIDU_Datatype_add_ref(sreq->dev.datatype_ptr); } rreq->partner_request = sreq; rreq->dev.sender_req_id = sreq->handle; - MPID_Datatype_get_size_macro(datatype, dt_sz); + MPIDU_Datatype_get_size_macro(datatype, dt_sz); MPIR_STATUS_SET_COUNT(rreq->status, count * dt_sz); } else diff --git a/src/mpid/common/datatype/dataloop/dataloop_parts.h b/src/mpid/common/datatype/dataloop/dataloop_parts.h index 56d6bd5..47c77f9 100644 --- a/src/mpid/common/datatype/dataloop/dataloop_parts.h +++ b/src/mpid/common/datatype/dataloop/dataloop_parts.h @@ -52,7 +52,7 @@ * optimizations may be applied. They are also passed in at Segment_init * time to specify which dataloop to use. * - * Note: The flag to MPID_Segment_init() was originally simply "hetero" + * Note: The flag to MPIDU_Segment_init() was originally simply "hetero" * and was a boolean value (0 meaning homogeneous). Some MPICH code * may still rely on HOMOGENEOUS being "0" and HETEROGENEOUS being "1". */ diff --git a/src/mpid/common/datatype/dataloop/segment_flatten.c b/src/mpid/common/datatype/dataloop/segment_flatten.c index e38ca97..5b6015a 100644 --- a/src/mpid/common/datatype/dataloop/segment_flatten.c +++ b/src/mpid/common/datatype/dataloop/segment_flatten.c @@ -52,7 +52,7 @@ struct PREPEND_PREFIX(mpi_flatten_params) { MPI_Aint *disps; }; -/* MPID_Segment_mpi_flatten - flatten a type into a representation +/* MPIDU_Segment_mpi_flatten - flatten a type into a representation * appropriate for passing to hindexed create. * * NOTE: blocks will be in units of bytes when returned. @@ -96,7 +96,7 @@ void PREPEND_PREFIX(Segment_mpi_flatten)(DLOOP_Segment *segp, NULL, &params); - /* last value already handled by MPID_Segment_manipulate */ + /* last value already handled by MPIDU_Segment_manipulate */ *lengthp = params.index; return; } diff --git a/src/mpid/common/datatype/dataloop/segment_packunpack.c b/src/mpid/common/datatype/dataloop/segment_packunpack.c index 86f9f00..26a491f 100644 --- a/src/mpid/common/datatype/dataloop/segment_packunpack.c +++ b/src/mpid/common/datatype/dataloop/segment_packunpack.c @@ -303,7 +303,7 @@ int PREPEND_PREFIX(Segment_vector_m2m)(DLOOP_Offset *blocks_p, return 0; } -/* MPID_Segment_blkidx_m2m +/* MPIDU_Segment_blkidx_m2m */ int PREPEND_PREFIX(Segment_blkidx_m2m)(DLOOP_Offset *blocks_p, DLOOP_Count count, @@ -383,7 +383,7 @@ int PREPEND_PREFIX(Segment_blkidx_m2m)(DLOOP_Offset *blocks_p, return 0; } -/* MPID_Segment_index_m2m +/* MPIDU_Segment_index_m2m */ int PREPEND_PREFIX(Segment_index_m2m)(DLOOP_Offset *blocks_p, DLOOP_Count count, diff --git a/src/mpid/common/datatype/mpid_contents_support.c b/src/mpid/common/datatype/mpid_contents_support.c index 3294a73..7a85542 100644 --- a/src/mpid/common/datatype/mpid_contents_support.c +++ b/src/mpid/common/datatype/mpid_contents_support.c @@ -8,20 +8,20 @@ #include <mpi.h> #include <mpid_datatype.h> -void MPID_Type_access_contents(MPI_Datatype type, +void MPIDU_Type_access_contents(MPI_Datatype type, int **ints_p, MPI_Aint **aints_p, MPI_Datatype **types_p) { int nr_ints, nr_aints, nr_types, combiner; int types_sz, struct_sz, ints_sz, epsilon, align_sz = 8; - MPID_Datatype *dtp; - MPID_Datatype_contents *cp; + MPIDU_Datatype *dtp; + MPIDU_Datatype_contents *cp; MPIR_Type_get_envelope_impl(type, &nr_ints, &nr_aints, &nr_types, &combiner); /* hardcoded handling of MPICH contents format... */ - MPID_Datatype_get_ptr(type, dtp); + MPIDU_Datatype_get_ptr(type, dtp); DLOOP_Assert(dtp != NULL); cp = dtp->contents; @@ -33,7 +33,7 @@ void MPID_Type_access_contents(MPI_Datatype type, } #endif - struct_sz = sizeof(MPID_Datatype_contents); + struct_sz = sizeof(MPIDU_Datatype_contents); types_sz = nr_types * sizeof(MPI_Datatype); ints_sz = nr_ints * sizeof(int); @@ -57,7 +57,7 @@ void MPID_Type_access_contents(MPI_Datatype type, /* FIXME: Is this routine complete? Why is it needed? If it is needed, it must have a comment that describes why it is needed and the arguments must have ATTRIBUTE((unused)) */ -void MPID_Type_release_contents(MPI_Datatype type, +void MPIDU_Type_release_contents(MPI_Datatype type, int **ints_p, MPI_Aint **aints_p, MPI_Datatype **types_p) diff --git a/src/mpid/common/datatype/mpid_dataloop.h b/src/mpid/common/datatype/mpid_dataloop.h index dd1e5ea..f3f0a63 100644 --- a/src/mpid/common/datatype/mpid_dataloop.h +++ b/src/mpid/common/datatype/mpid_dataloop.h @@ -13,7 +13,7 @@ /* Note: this is where you define the prefix that will be prepended on * all externally visible generic dataloop and segment functions. */ -#define PREPEND_PREFIX(fn) MPID_ ## fn +#define PREPEND_PREFIX(fn) MPIDU_ ## fn /* These following dataloop-specific types will be used throughout the DLOOP * instance: @@ -44,31 +44,31 @@ * as we see that we need them elsewhere. */ #define DLOOP_Handle_get_loopdepth_macro(handle_,depth_,flag_) \ - MPID_Datatype_get_loopdepth_macro(handle_,depth_,flag_) + MPIDU_Datatype_get_loopdepth_macro(handle_,depth_,flag_) #define DLOOP_Handle_get_loopsize_macro(handle_,size_,flag_) \ - MPID_Datatype_get_loopsize_macro(handle_,size_,flag_) + MPIDU_Datatype_get_loopsize_macro(handle_,size_,flag_) #define DLOOP_Handle_set_loopptr_macro(handle_,lptr_,flag_) \ - MPID_Datatype_set_loopptr_macro(handle_,lptr_,flag_) + MPIDU_Datatype_set_loopptr_macro(handle_,lptr_,flag_) #define DLOOP_Handle_set_loopdepth_macro(handle_,depth_,flag_) \ - MPID_Datatype_set_loopdepth_macro(handle_,depth_,flag_) + MPIDU_Datatype_set_loopdepth_macro(handle_,depth_,flag_) #define DLOOP_Handle_set_loopsize_macro(handle_,size_,flag_) \ - MPID_Datatype_set_loopsize_macro(handle_,size_,flag_) + MPIDU_Datatype_set_loopsize_macro(handle_,size_,flag_) #define DLOOP_Handle_get_loopptr_macro(handle_,lptr_,flag_) \ - MPID_Datatype_get_loopptr_macro(handle_,lptr_,flag_) + MPIDU_Datatype_get_loopptr_macro(handle_,lptr_,flag_) #define DLOOP_Handle_get_size_macro(handle_,size_) \ - MPID_Datatype_get_size_macro(handle_,size_) + MPIDU_Datatype_get_size_macro(handle_,size_) #define DLOOP_Handle_get_basic_type_macro(handle_,basic_type_) \ - MPID_Datatype_get_basic_type(handle_, basic_type_) + MPIDU_Datatype_get_basic_type(handle_, basic_type_) #define DLOOP_Handle_get_extent_macro(handle_,extent_) \ - MPID_Datatype_get_extent_macro(handle_,extent_) + MPIDU_Datatype_get_extent_macro(handle_,extent_) #define DLOOP_Handle_hasloop_macro(handle_) \ ((HANDLE_GET_KIND(handle_) == HANDLE_KIND_BUILTIN) ? 0 : 1) @@ -106,9 +106,9 @@ * Note: DLOOP_DATALOOP_ALL_BYTES is used only when the device * defines MPID_NEEDS_DLOOP_ALL_BYTES. */ -#define MPID_DATALOOP_HETEROGENEOUS DLOOP_DATALOOP_HETEROGENEOUS -#define MPID_DATALOOP_HOMOGENEOUS DLOOP_DATALOOP_HOMOGENEOUS -#define MPID_DATALOOP_ALL_BYTES DLOOP_DATALOOP_ALL_BYTES +#define MPIDU_DATALOOP_HETEROGENEOUS DLOOP_DATALOOP_HETEROGENEOUS +#define MPIDU_DATALOOP_HOMOGENEOUS DLOOP_DATALOOP_HOMOGENEOUS +#define MPIDU_DATALOOP_ALL_BYTES DLOOP_DATALOOP_ALL_BYTES #include <mpiimpl.h> diff --git a/src/mpid/common/datatype/mpid_datatype.h b/src/mpid/common/datatype/mpid_datatype.h index 4761f67..b648bb2 100644 --- a/src/mpid/common/datatype/mpid_datatype.h +++ b/src/mpid/common/datatype/mpid_datatype.h @@ -11,30 +11,30 @@ #include "mpihandlemem.h" /* NOTE: - * - struct MPID_Dataloop and MPID_Segment are defined in + * - struct MPIDU_Dataloop and MPIDU_Segment are defined in * src/mpid/common/datatype/mpid_dataloop.h (and gen_dataloop.h). * - MPIU_Object_alloc_t is defined in src/include/mpihandle.h */ -#define MPID_Datatype_get_ptr(a,ptr) MPID_Getb_ptr(Datatype,a,0x000000ff,ptr) -/* MPID_Datatype_get_basic_id() is useful for creating and indexing into arrays +#define MPIDU_Datatype_get_ptr(a,ptr) MPID_Getb_ptr(Datatype,a,0x000000ff,ptr) +/* MPIDU_Datatype_get_basic_id() is useful for creating and indexing into arrays that store data on a per-basic type basis */ -#define MPID_Datatype_get_basic_id(a) ((a)&0x000000ff) -#define MPID_Datatype_get_basic_size(a) (((a)&0x0000ff00)>>8) +#define MPIDU_Datatype_get_basic_id(a) ((a)&0x000000ff) +#define MPIDU_Datatype_get_basic_size(a) (((a)&0x0000ff00)>>8) -#define MPID_Datatype_add_ref(datatype_ptr) MPIU_Object_add_ref((datatype_ptr)) +#define MPIDU_Datatype_add_ref(datatype_ptr) MPIU_Object_add_ref((datatype_ptr)) -#define MPID_Datatype_get_basic_type(a,basic_type_) do { \ +#define MPIDU_Datatype_get_basic_type(a,basic_type_) do { \ void *ptr; \ switch (HANDLE_GET_KIND(a)) { \ case HANDLE_KIND_DIRECT: \ - ptr = MPID_Datatype_direct+HANDLE_INDEX(a); \ - basic_type_ = ((MPID_Datatype *) ptr)->basic_type; \ + ptr = MPIDU_Datatype_direct+HANDLE_INDEX(a); \ + basic_type_ = ((MPIDU_Datatype *) ptr)->basic_type; \ break; \ case HANDLE_KIND_INDIRECT: \ - ptr = ((MPID_Datatype *) \ - MPIU_Handle_get_ptr_indirect(a,&MPID_Datatype_mem)); \ - basic_type_ = ((MPID_Datatype *) ptr)->basic_type; \ + ptr = ((MPIDU_Datatype *) \ + MPIU_Handle_get_ptr_indirect(a,&MPIDU_Datatype_mem)); \ + basic_type_ = ((MPIDU_Datatype *) ptr)->basic_type; \ break; \ case HANDLE_KIND_BUILTIN: \ basic_type_ = a; \ @@ -53,11 +53,11 @@ basic_type_ = MPI_DATATYPE_NULL; \ } while(0) -/* MPID_Datatype_release decrements the reference count on the MPID_Datatype - * and, if the refct is then zero, frees the MPID_Datatype and associated +/* MPIDU_Datatype_release decrements the reference count on the MPID_Datatype + * and, if the refct is then zero, frees the MPIDU_Datatype and associated * structures. */ -#define MPID_Datatype_release(datatype_ptr) do { \ +#define MPIDU_Datatype_release(datatype_ptr) do { \ int inuse_; \ \ MPIU_Object_release_ref((datatype_ptr),&inuse_); \ @@ -76,27 +76,27 @@ } \ } */ \ if (lmpi_errno == MPI_SUCCESS) { \ - MPID_Datatype_free(datatype_ptr); \ + MPIDU_Datatype_free(datatype_ptr); \ } \ } \ } while(0) /* Note: Probably there is some clever way to build all of these from a macro. */ -#define MPID_Datatype_get_size_macro(a,size_) do { \ +#define MPIDU_Datatype_get_size_macro(a,size_) do { \ void *ptr; \ switch (HANDLE_GET_KIND(a)) { \ case HANDLE_KIND_DIRECT: \ - ptr = MPID_Datatype_direct+HANDLE_INDEX(a); \ - size_ = ((MPID_Datatype *) ptr)->size; \ + ptr = MPIDU_Datatype_direct+HANDLE_INDEX(a); \ + size_ = ((MPIDU_Datatype *) ptr)->size; \ break; \ case HANDLE_KIND_INDIRECT: \ - ptr = ((MPID_Datatype *) \ - MPIU_Handle_get_ptr_indirect(a,&MPID_Datatype_mem)); \ - size_ = ((MPID_Datatype *) ptr)->size; \ + ptr = ((MPIDU_Datatype *) \ + MPIU_Handle_get_ptr_indirect(a,&MPIDU_Datatype_mem)); \ + size_ = ((MPIDU_Datatype *) ptr)->size; \ break; \ case HANDLE_KIND_BUILTIN: \ - size_ = MPID_Datatype_get_basic_size(a); \ + size_ = MPIDU_Datatype_get_basic_size(a); \ break; \ case HANDLE_KIND_INVALID: \ default: \ @@ -109,44 +109,44 @@ /* * The following macro allows us to reference either the regular or * hetero value for the 3 fields (NULL,_size,_depth) in the - * MPID_Datatype structure. This is used in the many + * MPIDU_Datatype structure. This is used in the many * macros that access fields of the datatype. We need this macro * to simplify the definition of the other macros in the case where * MPID_HAS_HETERO is *not* defined. */ #if defined(MPID_HAS_HETERO) || 1 -#define MPID_GET_FIELD(hetero_,value_,fieldname_) do { \ - if (hetero_ != MPID_DATALOOP_HETEROGENEOUS) \ - value_ = ((MPID_Datatype *)ptr)->dataloop##fieldname_; \ - else value_ = ((MPID_Datatype *) ptr)->hetero_dloop##fieldname_; \ +#define MPIDU_GET_FIELD(hetero_,value_,fieldname_) do { \ + if (hetero_ != MPIDU_DATALOOP_HETEROGENEOUS) \ + value_ = ((MPIDU_Datatype *)ptr)->dataloop##fieldname_; \ + else value_ = ((MPIDU_Datatype *) ptr)->hetero_dloop##fieldname_; \ } while(0) #else -#define MPID_GET_FIELD(hetero_,value_,fieldname_) \ - value_ = ((MPID_Datatype *)ptr)->dataloop##fieldname_ +#define MPIDU_GET_FIELD(hetero_,value_,fieldname_) \ + value_ = ((MPIDU_Datatype *)ptr)->dataloop##fieldname_ #endif #if defined(MPID_HAS_HETERO) || 1 -#define MPID_SET_FIELD(hetero_,value_,fieldname_) do { \ - if (hetero_ != MPID_DATALOOP_HETEROGENEOUS) \ - ((MPID_Datatype *)ptr)->dataloop##fieldname_ = value_; \ - else ((MPID_Datatype *) ptr)->hetero_dloop##fieldname_ = value_; \ +#define MPIDU_SET_FIELD(hetero_,value_,fieldname_) do { \ + if (hetero_ != MPIDU_DATALOOP_HETEROGENEOUS) \ + ((MPIDU_Datatype *)ptr)->dataloop##fieldname_ = value_; \ + else ((MPIDU_Datatype *) ptr)->hetero_dloop##fieldname_ = value_; \ } while(0) #else -#define MPID_SET_FIELD(hetero_,value_,fieldname_) \ - ((MPID_Datatype *)ptr)->dataloop##fieldname_ = value_ +#define MPIDU_SET_FIELD(hetero_,value_,fieldname_) \ + ((MPIDU_Datatype *)ptr)->dataloop##fieldname_ = value_ #endif -#define MPID_Datatype_get_loopdepth_macro(a,depth_,hetero_) do { \ +#define MPIDU_Datatype_get_loopdepth_macro(a,depth_,hetero_) do { \ void *ptr; \ switch (HANDLE_GET_KIND(a)) { \ case HANDLE_KIND_DIRECT: \ - ptr = MPID_Datatype_direct+HANDLE_INDEX(a); \ - MPID_GET_FIELD(hetero_,depth_,_depth); \ + ptr = MPIDU_Datatype_direct+HANDLE_INDEX(a); \ + MPIDU_GET_FIELD(hetero_,depth_,_depth); \ break; \ case HANDLE_KIND_INDIRECT: \ - ptr = ((MPID_Datatype *) \ - MPIU_Handle_get_ptr_indirect(a,&MPID_Datatype_mem)); \ - MPID_GET_FIELD(hetero_,depth_,_depth); \ + ptr = ((MPIDU_Datatype *) \ + MPIU_Handle_get_ptr_indirect(a,&MPIDU_Datatype_mem)); \ + MPIDU_GET_FIELD(hetero_,depth_,_depth); \ break; \ case HANDLE_KIND_INVALID: \ case HANDLE_KIND_BUILTIN: \ @@ -156,17 +156,17 @@ } \ } while(0) -#define MPID_Datatype_get_loopsize_macro(a,depth_,hetero_) do { \ +#define MPIDU_Datatype_get_loopsize_macro(a,depth_,hetero_) do { \ void *ptr; \ switch (HANDLE_GET_KIND(a)) { \ case HANDLE_KIND_DIRECT: \ - ptr = MPID_Datatype_direct+HANDLE_INDEX(a); \ - MPID_GET_FIELD(hetero_,depth_,_size); \ + ptr = MPIDU_Datatype_direct+HANDLE_INDEX(a); \ + MPIDU_GET_FIELD(hetero_,depth_,_size); \ break; \ case HANDLE_KIND_INDIRECT: \ - ptr = ((MPID_Datatype *) \ - MPIU_Handle_get_ptr_indirect(a,&MPID_Datatype_mem)); \ - MPID_GET_FIELD(hetero_,depth_,_size); \ + ptr = ((MPIDU_Datatype *) \ + MPIU_Handle_get_ptr_indirect(a,&MPIDU_Datatype_mem)); \ + MPIDU_GET_FIELD(hetero_,depth_,_size); \ break; \ case HANDLE_KIND_INVALID: \ case HANDLE_KIND_BUILTIN: \ @@ -176,17 +176,17 @@ } \ } while(0) -#define MPID_Datatype_get_loopptr_macro(a,lptr_,hetero_) do { \ +#define MPIDU_Datatype_get_loopptr_macro(a,lptr_,hetero_) do { \ void *ptr; \ switch (HANDLE_GET_KIND(a)) { \ case HANDLE_KIND_DIRECT: \ - ptr = MPID_Datatype_direct+HANDLE_INDEX(a); \ - MPID_GET_FIELD(hetero_,lptr_,); \ + ptr = MPIDU_Datatype_direct+HANDLE_INDEX(a); \ + MPIDU_GET_FIELD(hetero_,lptr_,); \ break; \ case HANDLE_KIND_INDIRECT: \ - ptr = ((MPID_Datatype *) \ - MPIU_Handle_get_ptr_indirect(a,&MPID_Datatype_mem)); \ - MPID_GET_FIELD(hetero_,lptr_,); \ + ptr = ((MPIDU_Datatype *) \ + MPIU_Handle_get_ptr_indirect(a,&MPIDU_Datatype_mem)); \ + MPIDU_GET_FIELD(hetero_,lptr_,); \ break; \ case HANDLE_KIND_INVALID: \ case HANDLE_KIND_BUILTIN: \ @@ -195,17 +195,17 @@ break; \ } \ } while(0) -#define MPID_Datatype_set_loopdepth_macro(a,depth_,hetero_) do { \ +#define MPIDU_Datatype_set_loopdepth_macro(a,depth_,hetero_) do { \ void *ptr; \ switch (HANDLE_GET_KIND(a)) { \ case HANDLE_KIND_DIRECT: \ - ptr = MPID_Datatype_direct+HANDLE_INDEX(a); \ - MPID_SET_FIELD(hetero_,depth_,_depth); \ + ptr = MPIDU_Datatype_direct+HANDLE_INDEX(a); \ + MPIDU_SET_FIELD(hetero_,depth_,_depth); \ break; \ case HANDLE_KIND_INDIRECT: \ - ptr = ((MPID_Datatype *) \ - MPIU_Handle_get_ptr_indirect(a,&MPID_Datatype_mem)); \ - MPID_SET_FIELD(hetero_,depth_,_depth); \ + ptr = ((MPIDU_Datatype *) \ + MPIU_Handle_get_ptr_indirect(a,&MPIDU_Datatype_mem)); \ + MPIDU_SET_FIELD(hetero_,depth_,_depth); \ break; \ case HANDLE_KIND_INVALID: \ case HANDLE_KIND_BUILTIN: \ @@ -215,17 +215,17 @@ } \ } while(0) -#define MPID_Datatype_set_loopsize_macro(a,depth_,hetero_) do { \ +#define MPIDU_Datatype_set_loopsize_macro(a,depth_,hetero_) do { \ void *ptr; \ switch (HANDLE_GET_KIND(a)) { \ case HANDLE_KIND_DIRECT: \ - ptr = MPID_Datatype_direct+HANDLE_INDEX(a); \ - MPID_SET_FIELD(hetero_,depth_,_size); \ + ptr = MPIDU_Datatype_direct+HANDLE_INDEX(a); \ + MPIDU_SET_FIELD(hetero_,depth_,_size); \ break; \ case HANDLE_KIND_INDIRECT: \ - ptr = ((MPID_Datatype *) \ - MPIU_Handle_get_ptr_indirect(a,&MPID_Datatype_mem)); \ - MPID_SET_FIELD(hetero_,depth_,_size); \ + ptr = ((MPIDU_Datatype *) \ + MPIU_Handle_get_ptr_indirect(a,&MPIDU_Datatype_mem)); \ + MPIDU_SET_FIELD(hetero_,depth_,_size); \ break; \ case HANDLE_KIND_INVALID: \ case HANDLE_KIND_BUILTIN: \ @@ -235,17 +235,17 @@ } \ } while(0) -#define MPID_Datatype_set_loopptr_macro(a,lptr_,hetero_) do { \ +#define MPIDU_Datatype_set_loopptr_macro(a,lptr_,hetero_) do { \ void *ptr; \ switch (HANDLE_GET_KIND(a)) { \ case HANDLE_KIND_DIRECT: \ - ptr = MPID_Datatype_direct+HANDLE_INDEX(a); \ - MPID_SET_FIELD(hetero_,lptr_,); \ + ptr = MPIDU_Datatype_direct+HANDLE_INDEX(a); \ + MPIDU_SET_FIELD(hetero_,lptr_,); \ break; \ case HANDLE_KIND_INDIRECT: \ - ptr = ((MPID_Datatype *) \ - MPIU_Handle_get_ptr_indirect(a,&MPID_Datatype_mem)); \ - MPID_SET_FIELD(hetero_,lptr_,); \ + ptr = ((MPIDU_Datatype *) \ + MPIU_Handle_get_ptr_indirect(a,&MPIDU_Datatype_mem)); \ + MPIDU_SET_FIELD(hetero_,lptr_,); \ break; \ case HANDLE_KIND_INVALID: \ case HANDLE_KIND_BUILTIN: \ @@ -255,33 +255,33 @@ } \ } while(0) -#define MPID_Datatype_get_extent_macro(a,extent_) do { \ +#define MPIDU_Datatype_get_extent_macro(a,extent_) do { \ void *ptr; \ switch (HANDLE_GET_KIND(a)) { \ case HANDLE_KIND_DIRECT: \ - ptr = MPID_Datatype_direct+HANDLE_INDEX(a); \ - extent_ = ((MPID_Datatype *) ptr)->extent; \ + ptr = MPIDU_Datatype_direct+HANDLE_INDEX(a); \ + extent_ = ((MPIDU_Datatype *) ptr)->extent; \ break; \ case HANDLE_KIND_INDIRECT: \ - ptr = ((MPID_Datatype *) \ - MPIU_Handle_get_ptr_indirect(a,&MPID_Datatype_mem)); \ - extent_ = ((MPID_Datatype *) ptr)->extent; \ + ptr = ((MPIDU_Datatype *) \ + MPIU_Handle_get_ptr_indirect(a,&MPIDU_Datatype_mem)); \ + extent_ = ((MPIDU_Datatype *) ptr)->extent; \ break; \ case HANDLE_KIND_INVALID: \ case HANDLE_KIND_BUILTIN: \ default: \ - extent_ = MPID_Datatype_get_basic_size(a); /* same as size */ \ + extent_ = MPIDU_Datatype_get_basic_size(a); /* same as size */ \ break; \ } \ } while(0) -#define MPID_Datatype_valid_ptr(ptr,err) MPID_Valid_ptr_class(Datatype,ptr,MPI_ERR_TYPE,err) +#define MPIDU_Datatype_valid_ptr(ptr,err) MPID_Valid_ptr_class(Datatype,ptr,MPI_ERR_TYPE,err) -/* to be used only after MPID_Datatype_valid_ptr(); the check on +/* to be used only after MPIDU_Datatype_valid_ptr(); the check on * err == MPI_SUCCESS ensures that we won't try to dereference the * pointer if something has already been detected as wrong. */ -#define MPID_Datatype_committed_ptr(ptr,err) do { \ +#define MPIDU_Datatype_committed_ptr(ptr,err) do { \ if ((err == MPI_SUCCESS) && !((ptr)->is_committed)) \ err = MPIR_Err_create_code(MPI_SUCCESS, \ MPIR_ERR_RECOVERABLE, \ @@ -293,7 +293,7 @@ } while(0) /*S - MPID_Datatype_contents - Holds envelope and contents data for a given + MPIDU_Datatype_contents - Holds envelope and contents data for a given datatype Notes: @@ -301,7 +301,7 @@ arrays of types, ints, and aints, in that order. S*/ -typedef struct MPID_Datatype_contents { +typedef struct MPIDU_Datatype_contents { int combiner; int nr_ints; int nr_aints; @@ -309,11 +309,11 @@ typedef struct MPID_Datatype_contents { /* space allocated beyond structure used to store the types[], * ints[], and aints[], in that order. */ -} MPID_Datatype_contents; +} MPIDU_Datatype_contents; /* Datatype Structure */ /*S - MPID_Datatype - Description of the MPID Datatype structure + MPIDU_Datatype - Description of the MPID Datatype structure Notes: The 'ref_count' is needed for nonblocking operations such as @@ -359,7 +359,7 @@ typedef struct MPID_Datatype_contents { 'MPIU_Object_release_ref', to increment and decrement the reference count. S*/ -typedef struct MPID_Datatype { +typedef struct MPIDU_Datatype { /* handle and ref_count are filled in by MPIU_Handle_obj_alloc() */ MPIU_OBJECT_HEADER; /* adds handle and ref_count fields */ @@ -400,16 +400,16 @@ typedef struct MPID_Datatype { MPI_Aint max_contig_blocks; /* pointer to contents and envelope data for the datatype */ - MPID_Datatype_contents *contents; + MPIDU_Datatype_contents *contents; /* dataloop members, including a pointer to the loop, the size in bytes, * and a depth used to verify that we can process it (limited stack depth */ - struct MPID_Dataloop *dataloop; /* might be optimized for homogenous */ + struct MPIDU_Dataloop *dataloop; /* might be optimized for homogenous */ MPI_Aint dataloop_size; int dataloop_depth; #if defined(MPID_HAS_HETERO) || 1 - struct MPID_Dataloop *hetero_dloop; /* heterogeneous dataloop */ + struct MPIDU_Dataloop *hetero_dloop; /* heterogeneous dataloop */ MPI_Aint hetero_dloop_size; int hetero_dloop_depth; #endif /* MPID_HAS_HETERO */ @@ -423,15 +423,15 @@ typedef struct MPID_Datatype { int32_t cache_id; /* MPID_Lpidmask mask; */ - /* int (*free_fn)( struct MPID_Datatype * ); */ /* Function to free this datatype */ + /* int (*free_fn)( struct MPIDU_Datatype * ); */ /* Function to free this datatype */ /* Other, device-specific information */ #ifdef MPID_DEV_DATATYPE_DECL MPID_DEV_DATATYPE_DECL #endif -} MPID_Datatype; +} MPIDU_Datatype; -extern MPIU_Object_alloc_t MPID_Datatype_mem; +extern MPIU_Object_alloc_t MPIDU_Datatype_mem; /* Preallocated datatype objects */ /* This value should be set to greatest value used as the type index suffix in @@ -442,25 +442,25 @@ extern MPIU_Object_alloc_t MPID_Datatype_mem; * automatic and less error prone */ /* FIXME: Given that this is relatively static, an adequate alternative is to provide a check that this value is valid. */ -#define MPID_DATATYPE_N_BUILTIN 69 -extern MPID_Datatype MPID_Datatype_builtin[MPID_DATATYPE_N_BUILTIN + 1]; -extern MPID_Datatype MPID_Datatype_direct[]; +#define MPIDU_DATATYPE_N_BUILTIN 69 +extern MPIDU_Datatype MPIDU_Datatype_builtin[MPIDU_DATATYPE_N_BUILTIN + 1]; +extern MPIDU_Datatype MPIDU_Datatype_direct[]; -#define MPID_DTYPE_BEGINNING 0 -#define MPID_DTYPE_END -1 +#define MPIDU_DTYPE_BEGINNING 0 +#define MPIDU_DTYPE_END -1 /* LB/UB calculation helper macros */ -/* MPID_DATATYPE_CONTIG_LB_UB() +/* MPIDU_DATATYPE_CONTIG_LB_UB() * * Determines the new LB and UB for a block of old types given the * old type's LB, UB, and extent, and a count of these types in the * block. * - * Note: if the displacement is non-zero, the MPID_DATATYPE_BLOCK_LB_UB() + * Note: if the displacement is non-zero, the MPIDU_DATATYPE_BLOCK_LB_UB() * should be used instead (see below). */ -#define MPID_DATATYPE_CONTIG_LB_UB(cnt_, \ +#define MPIDU_DATATYPE_CONTIG_LB_UB(cnt_, \ old_lb_, \ old_ub_, \ old_extent_, \ @@ -481,13 +481,13 @@ do { \ } \ } while(0) -/* MPID_DATATYPE_VECTOR_LB_UB() +/* MPIDU_DATATYPE_VECTOR_LB_UB() * * Determines the new LB and UB for a vector of blocks of old types * given the old type's LB, UB, and extent, and a count, stride, and * blocklen describing the vectorization. */ -#define MPID_DATATYPE_VECTOR_LB_UB(cnt_, \ +#define MPIDU_DATATYPE_VECTOR_LB_UB(cnt_, \ stride_, \ blklen_, \ old_lb_, \ @@ -520,7 +520,7 @@ do { \ } \ } while(0) -/* MPID_DATATYPE_BLOCK_LB_UB() +/* MPIDU_DATATYPE_BLOCK_LB_UB() * * Determines the new LB and UB for a block of old types given the LB, * UB, and extent of the old type as well as a new displacement and count @@ -529,7 +529,7 @@ do { \ * Note: we need the extent here in addition to the lb and ub because the * extent might have some padding in it that we need to take into account. */ -#define MPID_DATATYPE_BLOCK_LB_UB(cnt_, \ +#define MPIDU_DATATYPE_BLOCK_LB_UB(cnt_, \ disp_, \ old_lb_, \ old_ub_, \ @@ -553,83 +553,83 @@ do { \ /* helper macro: takes an MPI_Datatype handle value and returns TRUE in * (*is_config_) if the type is contiguous */ -#define MPID_Datatype_is_contig(dtype_, is_contig_) \ +#define MPIDU_Datatype_is_contig(dtype_, is_contig_) \ do { \ if (HANDLE_GET_KIND(dtype_) == HANDLE_KIND_BUILTIN) { \ *(is_contig_) = TRUE; \ } \ else { \ - MPID_Datatype *dtp_ = NULL; \ - MPID_Datatype_get_ptr((dtype_), dtp_); \ + MPIDU_Datatype *dtp_ = NULL; \ + MPIDU_Datatype_get_ptr((dtype_), dtp_); \ *(is_contig_) = dtp_->is_contig; \ } \ } while (0) /* helper macro: takes an MPI_Datatype handle value and returns true_lb in * (*true_lb_) */ -#define MPID_Datatype_get_true_lb(dtype_, true_lb_) \ +#define MPIDU_Datatype_get_true_lb(dtype_, true_lb_) \ do { \ if (HANDLE_GET_KIND(dtype_) == HANDLE_KIND_BUILTIN) { \ *(true_lb_) = 0; \ } \ else { \ - MPID_Datatype *dtp_ = NULL; \ - MPID_Datatype_get_ptr((dtype_), dtp_); \ + MPIDU_Datatype *dtp_ = NULL; \ + MPIDU_Datatype_get_ptr((dtype_), dtp_); \ *(true_lb_) = dtp_->true_lb; \ } \ } while (0) /* Datatype functions */ -int MPID_Type_commit(MPI_Datatype *type); +int MPIDU_Type_commit(MPI_Datatype *type); -int MPID_Type_dup(MPI_Datatype oldtype, +int MPIDU_Type_dup(MPI_Datatype oldtype, MPI_Datatype *newtype); -int MPID_Type_struct(int count, +int MPIDU_Type_struct(int count, const int *blocklength_array, const MPI_Aint *displacement_array, const MPI_Datatype *oldtype_array, MPI_Datatype *newtype); -int MPID_Type_indexed(int count, +int MPIDU_Type_indexed(int count, const int *blocklength_array, const void *displacement_array, int dispinbytes, MPI_Datatype oldtype, MPI_Datatype *newtype); -int MPID_Type_blockindexed(int count, +int MPIDU_Type_blockindexed(int count, int blocklength, const void *displacement_array, int dispinbytes, MPI_Datatype oldtype, MPI_Datatype *newtype); -int MPID_Type_vector(int count, +int MPIDU_Type_vector(int count, int blocklength, MPI_Aint stride, int strideinbytes, MPI_Datatype oldtype, MPI_Datatype *newtype); -int MPID_Type_contiguous(int count, +int MPIDU_Type_contiguous(int count, MPI_Datatype oldtype, MPI_Datatype *newtype); -int MPID_Type_zerolen(MPI_Datatype *newtype); +int MPIDU_Type_zerolen(MPI_Datatype *newtype); -int MPID_Type_create_resized(MPI_Datatype oldtype, +int MPIDU_Type_create_resized(MPI_Datatype oldtype, MPI_Aint lb, MPI_Aint extent, MPI_Datatype *newtype); -int MPID_Type_get_envelope(MPI_Datatype datatype, +int MPIDU_Type_get_envelope(MPI_Datatype datatype, int *num_integers, int *num_addresses, int *num_datatypes, int *combiner); -int MPID_Type_get_contents(MPI_Datatype datatype, +int MPIDU_Type_get_contents(MPI_Datatype datatype, int max_integers, int max_addresses, int max_datatypes, @@ -637,8 +637,8 @@ int MPID_Type_get_contents(MPI_Datatype datatype, MPI_Aint array_of_addresses[], MPI_Datatype array_of_datatypes[]); -int MPID_Type_create_pairtype(MPI_Datatype datatype, - MPID_Datatype *new_dtp); +int MPIDU_Type_create_pairtype(MPI_Datatype datatype, + MPIDU_Datatype *new_dtp); /* internal debugging functions */ void MPIDI_Datatype_printf(MPI_Datatype type, @@ -648,49 +648,49 @@ void MPIDI_Datatype_printf(MPI_Datatype type, int header); /* Dataloop functions */ -void MPID_Dataloop_copy(void *dest, +void MPIDU_Dataloop_copy(void *dest, void *src, MPI_Aint size); -void MPID_Dataloop_print(struct MPID_Dataloop *dataloop, +void MPIDU_Dataloop_print(struct MPIDU_Dataloop *dataloop, int depth); -void MPID_Dataloop_alloc(int kind, +void MPIDU_Dataloop_alloc(int kind, MPI_Aint count, DLOOP_Dataloop **new_loop_p, MPI_Aint *new_loop_sz_p); -void MPID_Dataloop_alloc_and_copy(int kind, +void MPIDU_Dataloop_alloc_and_copy(int kind, MPI_Aint count, struct DLOOP_Dataloop *old_loop, MPI_Aint old_loop_sz, struct DLOOP_Dataloop **new_loop_p, MPI_Aint *new_loop_sz_p); -void MPID_Dataloop_struct_alloc(MPI_Aint count, +void MPIDU_Dataloop_struct_alloc(MPI_Aint count, MPI_Aint old_loop_sz, int basic_ct, DLOOP_Dataloop **old_loop_p, DLOOP_Dataloop **new_loop_p, MPI_Aint *new_loop_sz_p); -void MPID_Dataloop_dup(DLOOP_Dataloop *old_loop, +void MPIDU_Dataloop_dup(DLOOP_Dataloop *old_loop, MPI_Aint old_loop_sz, DLOOP_Dataloop **new_loop_p); -void MPID_Dataloop_free(struct MPID_Dataloop **dataloop); +void MPIDU_Dataloop_free(struct MPIDU_Dataloop **dataloop); /* Segment functions specific to MPICH */ -void MPID_Segment_pack_vector(struct DLOOP_Segment *segp, +void MPIDU_Segment_pack_vector(struct DLOOP_Segment *segp, DLOOP_Offset first, DLOOP_Offset *lastp, DLOOP_VECTOR *vector, int *lengthp); -void MPID_Segment_unpack_vector(struct DLOOP_Segment *segp, +void MPIDU_Segment_unpack_vector(struct DLOOP_Segment *segp, DLOOP_Offset first, DLOOP_Offset *lastp, DLOOP_VECTOR *vector, int *lengthp); -void MPID_Segment_flatten(struct DLOOP_Segment *segp, +void MPIDU_Segment_flatten(struct DLOOP_Segment *segp, DLOOP_Offset first, DLOOP_Offset *lastp, DLOOP_Offset *offp, @@ -698,7 +698,7 @@ void MPID_Segment_flatten(struct DLOOP_Segment *segp, DLOOP_Offset *lengthp); /* misc */ -int MPID_Datatype_set_contents(struct MPID_Datatype *ptr, +int MPIDU_Datatype_set_contents(struct MPIDU_Datatype *ptr, int combiner, int nr_ints, int nr_aints, @@ -707,17 +707,17 @@ int MPID_Datatype_set_contents(struct MPID_Datatype *ptr, const MPI_Aint *aints, const MPI_Datatype *types); -void MPID_Datatype_free_contents(struct MPID_Datatype *ptr); -void MPIDI_Datatype_get_contents_aints(MPID_Datatype_contents *cp, +void MPIDU_Datatype_free_contents(struct MPIDU_Datatype *ptr); +void MPIDI_Datatype_get_contents_aints(MPIDU_Datatype_contents *cp, MPI_Aint *user_aints); -void MPIDI_Datatype_get_contents_types(MPID_Datatype_contents *cp, +void MPIDI_Datatype_get_contents_types(MPIDU_Datatype_contents *cp, MPI_Datatype *user_types); -void MPIDI_Datatype_get_contents_ints(MPID_Datatype_contents *cp, +void MPIDI_Datatype_get_contents_ints(MPIDU_Datatype_contents *cp, int *user_ints); -void MPID_Datatype_free(struct MPID_Datatype *ptr); +void MPIDU_Datatype_free(struct MPIDU_Datatype *ptr); -void MPID_Dataloop_update(struct DLOOP_Dataloop *dataloop, +void MPIDU_Dataloop_update(struct DLOOP_Dataloop *dataloop, MPI_Aint ptrdiff); int MPIR_Type_flatten(MPI_Datatype type, @@ -725,17 +725,17 @@ int MPIR_Type_flatten(MPI_Datatype type, DLOOP_Size *size_array, MPI_Aint *array_len_p); -void MPID_Segment_pack_external32(struct DLOOP_Segment *segp, +void MPIDU_Segment_pack_external32(struct DLOOP_Segment *segp, DLOOP_Offset first, DLOOP_Offset *lastp, void *pack_buffer); -void MPID_Segment_unpack_external32(struct DLOOP_Segment *segp, +void MPIDU_Segment_unpack_external32(struct DLOOP_Segment *segp, DLOOP_Offset first, DLOOP_Offset *lastp, DLOOP_Buffer unpack_buffer); -MPI_Aint MPID_Datatype_size_external32(MPI_Datatype type); +MPI_Aint MPIDU_Datatype_size_external32(MPI_Datatype type); MPI_Aint MPIDI_Datatype_get_basic_size_external32(MPI_Datatype el_type); /* debugging helper functions */ @@ -744,14 +744,81 @@ char *MPIDU_Datatype_combiner_to_string(int combiner); void MPIDU_Datatype_debug(MPI_Datatype type, int array_ct); /* contents accessor functions */ -void MPID_Type_access_contents(MPI_Datatype type, +void MPIDU_Type_access_contents(MPI_Datatype type, int **ints_p, MPI_Aint **aints_p, MPI_Datatype **types_p); -void MPID_Type_release_contents(MPI_Datatype type, +void MPIDU_Type_release_contents(MPI_Datatype type, int **ints_p, MPI_Aint **aints_p, MPI_Datatype **types_p); +/* FIXME:Temorary coversion for compatibility in MPI layer + * These should be eventially put in mpid/include/mpid.h + */ +/* Variables */ +#define MPID_Datatype_direct MPIDU_Datatype_direct +#define MPID_Datatype_builtin MPIDU_Datatype_builtin +#define MPID_Datatype_mem MPIDU_Datatype_mem + +/* Macros */ +#define MPID_DATATYPE_N_BUILTIN MPIDU_DATATYPE_N_BUILTIN +#define MPID_DTYPE_BEGINNING MPIDU_DTYPE_BEGINNING +#define MPID_DTYPE_END MPIDU_DTYPE_END + +typedef MPIDU_Datatype MPID_Datatype; +typedef MPIDU_Datatype_contents MPID_Datatype_contents; + +#define MPID_Datatype_add_ref MPIDU_Datatype_add_ref +#define MPID_Datatype_committed_ptr MPIDU_Datatype_committed_ptr +#define MPID_Datatype_get_basic_size MPIDU_Datatype_get_basic_size +#define MPID_Datatype_get_basic_type MPIDU_Datatype_get_basic_type + +#define MPID_Datatype_get_ptr MPIDU_Datatype_get_ptr +#define MPID_Datatype_get_size_macro MPIDU_Datatype_get_size_macro +#define MPID_Datatype_get_extent_macro MPIDU_Datatype_get_extent_macro +#define MPID_Datatype_is_contig MPIDU_Datatype_is_contig +#define MPID_Datatype_release MPIDU_Datatype_release +#define MPID_Datatype_valid_ptr MPIDU_Datatype_valid_ptr + +#define MPID_Datatype_get_loopdepth_macro MPIDU_Datatype_get_loopdepth_macro +#define MPID_Datatype_get_loopptr_macro MPIDU_Datatype_get_loopptr_macro +#define MPID_Datatype_get_loopsize_macro MPIDU_Datatype_get_loopsize_macro +#define MPID_Datatype_set_loopdepth_macro MPIDU_Datatype_set_loopdepth_macro +#define MPID_Datatype_set_loopptr_macro MPIDU_Datatype_set_loopptr_macro +#define MPID_Datatype_set_loopsize_macro MPIDU_Datatype_set_loopsize_macro + +#define MPID_Datatype_free MPIDU_Datatype_free +#define MPID_Datatype_free_contents MPIDU_Datatype_free_contents +#define MPID_Datatype_set_contents MPIDU_Datatype_set_contents +#define MPID_Datatype_size_external32 MPIDU_Datatype_size_external32 + +/* MPID_Segment */ +typedef struct DLOOP_Segment MPID_Segment; /* MPIDU_Segment */ + +#define MPID_Segment_init MPIDU_Segment_init +#define MPID_Segment_alloc MPIDU_Segment_alloc +#define MPID_Segment_free MPIDU_Segment_free +#define MPID_Segment_pack MPIDU_Segment_pack +#define MPID_Segment_unpack MPIDU_Segment_unpack +#define MPID_Segment_pack_external32 MPIDU_Segment_pack_external32 +#define MPID_Segment_unpack_external32 MPIDU_Segment_unpack_external32 + +/* MPID_Type */ +#define MPID_Type_access_contents MPIDU_Type_access_contents +#define MPID_Type_blockindexed MPIDU_Type_blockindexed +#define MPID_Type_commit MPIDU_Type_commit +#define MPID_Type_contiguous MPIDU_Type_contiguous +#define MPID_Type_create_pairtype MPIDU_Type_create_pairtype +#define MPID_Type_create_resized MPIDU_Type_create_resized +#define MPID_Type_dup MPIDU_Type_dup +#define MPID_Type_get_contents MPIDU_Type_get_contents +#define MPID_Type_get_envelope MPIDU_Type_get_envelope +#define MPID_Type_indexed MPIDU_Type_indexed +#define MPID_Type_release_contents MPIDU_Type_release_contents +#define MPID_Type_struct MPIDU_Type_struct +#define MPID_Type_vector MPIDU_Type_vector +#define MPID_Type_zerolen MPIDU_Type_zerolen + /* end of file */ #endif diff --git a/src/mpid/common/datatype/mpid_datatype_contents.c b/src/mpid/common/datatype/mpid_datatype_contents.c index 6b82950..2625b88 100644 --- a/src/mpid/common/datatype/mpid_datatype_contents.c +++ b/src/mpid/common/datatype/mpid_datatype_contents.c @@ -11,12 +11,12 @@ #include <limits.h> /*@ - MPID_Datatype_set_contents - store contents information for use in + MPIDU_Datatype_set_contents - store contents information for use in MPI_Type_get_contents. Returns MPI_SUCCESS on success, MPI error code on error. @*/ -int MPID_Datatype_set_contents(MPID_Datatype *new_dtp, +int MPIDU_Datatype_set_contents(MPIDU_Datatype *new_dtp, int combiner, int nr_ints, int nr_aints, @@ -27,8 +27,8 @@ int MPID_Datatype_set_contents(MPID_Datatype *new_dtp, { int i, contents_size, align_sz = 8, epsilon, mpi_errno; int struct_sz, ints_sz, aints_sz, types_sz; - MPID_Datatype_contents *cp; - MPID_Datatype *old_dtp; + MPIDU_Datatype_contents *cp; + MPIDU_Datatype *old_dtp; char *ptr; #ifdef HAVE_MAX_STRUCT_ALIGNMENT @@ -37,7 +37,7 @@ int MPID_Datatype_set_contents(MPID_Datatype *new_dtp, } #endif - struct_sz = sizeof(MPID_Datatype_contents); + struct_sz = sizeof(MPIDU_Datatype_contents); types_sz = nr_types * sizeof(MPI_Datatype); ints_sz = nr_ints * sizeof(int); aints_sz = nr_aints * sizeof(MPI_Aint); @@ -59,12 +59,12 @@ int MPID_Datatype_set_contents(MPID_Datatype *new_dtp, contents_size = struct_sz + types_sz + ints_sz + aints_sz; - cp = (MPID_Datatype_contents *) MPL_malloc(contents_size); + cp = (MPIDU_Datatype_contents *) MPL_malloc(contents_size); /* --BEGIN ERROR HANDLING-- */ if (cp == NULL) { mpi_errno = MPIR_Err_create_code(MPI_SUCCESS, MPIR_ERR_RECOVERABLE, - "MPID_Datatype_set_contents", + "MPIDU_Datatype_set_contents", __LINE__, MPI_ERR_OTHER, "**nomem", @@ -101,19 +101,19 @@ int MPID_Datatype_set_contents(MPID_Datatype *new_dtp, /* increment reference counts on all the derived types used here */ for (i=0; i < nr_types; i++) { if (HANDLE_GET_KIND(array_of_types[i]) != HANDLE_KIND_BUILTIN) { - MPID_Datatype_get_ptr(array_of_types[i], old_dtp); - MPID_Datatype_add_ref(old_dtp); + MPIDU_Datatype_get_ptr(array_of_types[i], old_dtp); + MPIDU_Datatype_add_ref(old_dtp); } } return MPI_SUCCESS; } -void MPID_Datatype_free_contents(MPID_Datatype *dtp) +void MPIDU_Datatype_free_contents(MPIDU_Datatype *dtp) { - int i, struct_sz = sizeof(MPID_Datatype_contents); + int i, struct_sz = sizeof(MPIDU_Datatype_contents); int align_sz = 8, epsilon; - MPID_Datatype *old_dtp; + MPIDU_Datatype *old_dtp; MPI_Datatype *array_of_types; if ((epsilon = struct_sz % align_sz)) { @@ -125,8 +125,8 @@ void MPID_Datatype_free_contents(MPID_Datatype *dtp) for (i=0; i < dtp->contents->nr_types; i++) { if (HANDLE_GET_KIND(array_of_types[i]) != HANDLE_KIND_BUILTIN) { - MPID_Datatype_get_ptr(array_of_types[i], old_dtp); - MPID_Datatype_release(old_dtp); + MPIDU_Datatype_get_ptr(array_of_types[i], old_dtp); + MPIDU_Datatype_release(old_dtp); } } @@ -134,7 +134,7 @@ void MPID_Datatype_free_contents(MPID_Datatype *dtp) dtp->contents = NULL; } -void MPIDI_Datatype_get_contents_ints(MPID_Datatype_contents *cp, +void MPIDI_Datatype_get_contents_ints(MPIDU_Datatype_contents *cp, int *user_ints) { char *ptr; @@ -147,7 +147,7 @@ void MPIDI_Datatype_get_contents_ints(MPID_Datatype_contents *cp, } #endif - struct_sz = sizeof(MPID_Datatype_contents); + struct_sz = sizeof(MPIDU_Datatype_contents); types_sz = cp->nr_types * sizeof(MPI_Datatype); /* pad the struct, types, and ints before we allocate. @@ -168,7 +168,7 @@ void MPIDI_Datatype_get_contents_ints(MPID_Datatype_contents *cp, return; } -void MPIDI_Datatype_get_contents_aints(MPID_Datatype_contents *cp, +void MPIDI_Datatype_get_contents_aints(MPIDU_Datatype_contents *cp, MPI_Aint *user_aints) { char *ptr; @@ -181,7 +181,7 @@ void MPIDI_Datatype_get_contents_aints(MPID_Datatype_contents *cp, } #endif - struct_sz = sizeof(MPID_Datatype_contents); + struct_sz = sizeof(MPIDU_Datatype_contents); types_sz = cp->nr_types * sizeof(MPI_Datatype); ints_sz = cp->nr_ints * sizeof(int); @@ -206,7 +206,7 @@ void MPIDI_Datatype_get_contents_aints(MPID_Datatype_contents *cp, return; } -void MPIDI_Datatype_get_contents_types(MPID_Datatype_contents *cp, +void MPIDI_Datatype_get_contents_types(MPIDU_Datatype_contents *cp, MPI_Datatype *user_types) { char *ptr; @@ -219,7 +219,7 @@ void MPIDI_Datatype_get_contents_types(MPID_Datatype_contents *cp, } #endif - struct_sz = sizeof(MPID_Datatype_contents); + struct_sz = sizeof(MPIDU_Datatype_contents); /* pad the struct, types, and ints before we allocate. * diff --git a/src/mpid/common/datatype/mpid_datatype_free.c b/src/mpid/common/datatype/mpid_datatype_free.c index 2d8e585..293a4c9 100644 --- a/src/mpid/common/datatype/mpid_datatype_free.c +++ b/src/mpid/common/datatype/mpid_datatype_free.c @@ -13,10 +13,10 @@ /*@ - MPID_Datatype_free + MPIDU_Datatype_free Input Parameters: -. MPID_Datatype ptr - pointer to MPID datatype structure that is no longer +. MPIDU_Datatype ptr - pointer to MPID datatype structure that is no longer referenced Output Parameters: @@ -26,34 +26,34 @@ Output Parameters: none This function handles freeing dynamically allocated memory associated with - the datatype. In the process MPID_Datatype_free_contents() is also called, + the datatype. In the process MPIDU_Datatype_free_contents() is also called, which handles decrementing reference counts to constituent types (in addition to freeing the space used for contents information). - MPID_Datatype_free_contents() will call MPID_Datatype_free() on constituent + MPIDU_Datatype_free_contents() will call MPIDU_Datatype_free() on constituent types that are no longer referenced as well. @*/ -void MPID_Datatype_free(MPID_Datatype *ptr) +void MPIDU_Datatype_free(MPIDU_Datatype *ptr) { MPL_DBG_MSG_P(MPIR_DBG_DATATYPE,VERBOSE,"type %x freed.", ptr->handle); -#ifdef MPID_Dev_datatype_destroy_hook - MPID_Dev_datatype_destroy_hook(ptr); -#endif /* MPID_Dev_datatype_destroy_hook */ +#ifdef MPIDU_Dev_datatype_destroy_hook + MPIDU_Dev_datatype_destroy_hook(ptr); +#endif /* MPIDU_Dev_datatype_destroy_hook */ /* before freeing the contents, check whether the pointer is not null because it is null in the case of a datatype shipped to the target for RMA ops */ if (ptr->contents) { - MPID_Datatype_free_contents(ptr); + MPIDU_Datatype_free_contents(ptr); } if (ptr->dataloop) { - MPID_Dataloop_free(&(ptr->dataloop)); + MPIDU_Dataloop_free(&(ptr->dataloop)); } #if defined(MPID_HAS_HETERO) || 1 if (ptr->hetero_dloop) { - MPID_Dataloop_free(&(ptr->hetero_dloop)); + MPIDU_Dataloop_free(&(ptr->hetero_dloop)); } #endif /* MPID_HAS_HETERO */ - MPIU_Handle_obj_free(&MPID_Datatype_mem, ptr); + MPIU_Handle_obj_free(&MPIDU_Datatype_mem, ptr); } diff --git a/src/mpid/common/datatype/mpid_ext32_datatype.c b/src/mpid/common/datatype/mpid_ext32_datatype.c index e8f8a84..0311917 100644 --- a/src/mpid/common/datatype/mpid_ext32_datatype.c +++ b/src/mpid/common/datatype/mpid_ext32_datatype.c @@ -101,17 +101,17 @@ MPI_Aint MPIDI_Datatype_get_basic_size_external32(MPI_Datatype el_type) return ret; } -MPI_Aint MPID_Datatype_size_external32(MPI_Datatype type) +MPI_Aint MPIDU_Datatype_size_external32(MPI_Datatype type) { if (HANDLE_GET_KIND(type) == HANDLE_KIND_BUILTIN) { return MPIDI_Datatype_get_basic_size_external32(type); } else { - MPID_Dataloop *dlp = NULL; + MPIDU_Dataloop *dlp = NULL; - MPID_Datatype_get_loopptr_macro(type, dlp, MPID_DATALOOP_HETEROGENEOUS); + MPIDU_Datatype_get_loopptr_macro(type, dlp, MPIDU_DATALOOP_HETEROGENEOUS); - return MPID_Dataloop_stream_size(dlp, + return MPIDU_Dataloop_stream_size(dlp, MPIDI_Datatype_get_basic_size_external32); } } diff --git a/src/mpid/common/datatype/mpid_ext32_segment.c b/src/mpid/common/datatype/mpid_ext32_segment.c index 120aaef..2101dda 100644 --- a/src/mpid/common/datatype/mpid_ext32_segment.c +++ b/src/mpid/common/datatype/mpid_ext32_segment.c @@ -17,13 +17,13 @@ #include "mpid_ext32_segment.h" -/* MPID_Segment_piece_params +/* MPIDU_Segment_piece_params * * This structure is used to pass function-specific parameters into our * segment processing function. This allows us to get additional parameters * to the functions it calls without changing the prototype. */ -struct MPID_Segment_piece_params { +struct MPIDU_Segment_piece_params { union { struct { char *pack_buffer; @@ -169,22 +169,22 @@ static int external32_float_convert(char *dest_buf, } #undef FUNCNAME -#define FUNCNAME MPID_Segment_contig_pack_external32_to_buf +#define FUNCNAME MPIDU_Segment_contig_pack_external32_to_buf #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int MPID_Segment_contig_pack_external32_to_buf(DLOOP_Offset *blocks_p, +static int MPIDU_Segment_contig_pack_external32_to_buf(DLOOP_Offset *blocks_p, DLOOP_Type el_type, DLOOP_Offset rel_off, void *bufp, void *v_paramp) { int src_el_size, dest_el_size; - struct MPID_Segment_piece_params *paramp = v_paramp; + struct MPIDU_Segment_piece_params *paramp = v_paramp; MPIDI_STATE_DECL(MPID_STATE_MPID_SEGMENT_CONTIG_PACK_EXTERNAL32_TO_BUF); MPIDI_FUNC_ENTER(MPID_STATE_MPID_SEGMENT_CONTIG_PACK_EXTERNAL32_TO_BUF); - src_el_size = MPID_Datatype_get_basic_size(el_type); + src_el_size = MPIDU_Datatype_get_basic_size(el_type); dest_el_size = MPIDI_Datatype_get_basic_size_external32(el_type); MPIU_Assert(dest_el_size); @@ -232,22 +232,22 @@ static int MPID_Segment_contig_pack_external32_to_buf(DLOOP_Offset *blocks_p, } #undef FUNCNAME -#define FUNCNAME MPID_Segment_contig_unpack_external32_to_buf +#define FUNCNAME MPIDU_Segment_contig_unpack_external32_to_buf #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static int MPID_Segment_contig_unpack_external32_to_buf(DLOOP_Offset *blocks_p, +static int MPIDU_Segment_contig_unpack_external32_to_buf(DLOOP_Offset *blocks_p, DLOOP_Type el_type, DLOOP_Offset rel_off, void *bufp, void *v_paramp) { int src_el_size, dest_el_size; - struct MPID_Segment_piece_params *paramp = v_paramp; + struct MPIDU_Segment_piece_params *paramp = v_paramp; MPIDI_STATE_DECL(MPID_STATE_MPID_SEGMENT_CONTIG_UNPACK_EXTERNAL32_TO_BUF); MPIDI_FUNC_ENTER(MPID_STATE_MPID_SEGMENT_CONTIG_UNPACK_EXTERNAL32_TO_BUF); - src_el_size = MPID_Datatype_get_basic_size(el_type); + src_el_size = MPIDU_Datatype_get_basic_size(el_type); dest_el_size = MPIDI_Datatype_get_basic_size_external32(el_type); MPIU_Assert(dest_el_size); @@ -295,27 +295,27 @@ static int MPID_Segment_contig_unpack_external32_to_buf(DLOOP_Offset *blocks_p, } #undef FUNCNAME -#define FUNCNAME MPID_Segment_pack_external32 +#define FUNCNAME MPIDU_Segment_pack_external32 #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -void MPID_Segment_pack_external32(struct DLOOP_Segment *segp, +void MPIDU_Segment_pack_external32(struct DLOOP_Segment *segp, DLOOP_Offset first, DLOOP_Offset *lastp, void *pack_buffer) { - struct MPID_Segment_piece_params pack_params; + struct MPIDU_Segment_piece_params pack_params; MPIDI_STATE_DECL(MPID_STATE_MPID_SEGMENT_PACK_EXTERNAL); MPIDI_FUNC_ENTER(MPID_STATE_MPID_SEGMENT_PACK_EXTERNAL); pack_params.u.pack.pack_buffer = (DLOOP_Buffer)pack_buffer; - MPID_Segment_manipulate(segp, + MPIDU_Segment_manipulate(segp, first, lastp, - MPID_Segment_contig_pack_external32_to_buf, - NULL, /* MPID_Segment_vector_pack_external32_to_buf, */ + MPIDU_Segment_contig_pack_external32_to_buf, + NULL, /* MPIDU_Segment_vector_pack_external32_to_buf, */ NULL, /* blkidx */ - NULL, /* MPID_Segment_index_pack_external32_to_buf, */ + NULL, /* MPIDU_Segment_index_pack_external32_to_buf, */ MPIDI_Datatype_get_basic_size_external32, &pack_params); @@ -324,27 +324,27 @@ void MPID_Segment_pack_external32(struct DLOOP_Segment *segp, } #undef FUNCNAME -#define FUNCNAME MPID_Segment_unpack_external32 +#define FUNCNAME MPIDU_Segment_unpack_external32 #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -void MPID_Segment_unpack_external32(struct DLOOP_Segment *segp, +void MPIDU_Segment_unpack_external32(struct DLOOP_Segment *segp, DLOOP_Offset first, DLOOP_Offset *lastp, DLOOP_Buffer unpack_buffer) { - struct MPID_Segment_piece_params pack_params; + struct MPIDU_Segment_piece_params pack_params; MPIDI_STATE_DECL(MPID_STATE_MPID_SEGMENT_UNPACK_EXTERNAL32); MPIDI_FUNC_ENTER(MPID_STATE_MPID_SEGMENT_UNPACK_EXTERNAL32); pack_params.u.unpack.unpack_buffer = unpack_buffer; - MPID_Segment_manipulate(segp, + MPIDU_Segment_manipulate(segp, first, lastp, - MPID_Segment_contig_unpack_external32_to_buf, - NULL, /* MPID_Segment_vector_unpack_external32_to_buf, */ + MPIDU_Segment_contig_unpack_external32_to_buf, + NULL, /* MPIDU_Segment_vector_unpack_external32_to_buf, */ NULL, /* blkidx */ - NULL, /* MPID_Segment_index_unpack_external32_to_buf, */ + NULL, /* MPIDU_Segment_index_unpack_external32_to_buf, */ MPIDI_Datatype_get_basic_size_external32, &pack_params); diff --git a/src/mpid/common/datatype/mpid_segment.c b/src/mpid/common/datatype/mpid_segment.c index 810940a..8cf4d85 100644 --- a/src/mpid/common/datatype/mpid_segment.c +++ b/src/mpid/common/datatype/mpid_segment.c @@ -17,13 +17,13 @@ #undef MPID_SP_VERBOSE #undef MPID_SU_VERBOSE -/* MPID_Segment_piece_params +/* MPIDU_Segment_piece_params * * This structure is used to pass function-specific parameters into our * segment processing function. This allows us to get additional parameters * to the functions it calls without changing the prototype. */ -struct MPID_Segment_piece_params { +struct MPIDU_Segment_piece_params { union { struct { char *pack_buffer; @@ -53,7 +53,7 @@ struct MPID_Segment_piece_params { }; /* prototypes of internal functions */ -static int MPID_Segment_vector_pack_to_iov(DLOOP_Offset *blocks_p, +static int MPIDU_Segment_vector_pack_to_iov(DLOOP_Offset *blocks_p, DLOOP_Count count, DLOOP_Size blksz, DLOOP_Offset stride, @@ -62,19 +62,19 @@ static int MPID_Segment_vector_pack_to_iov(DLOOP_Offset *blocks_p, void *bufp, void *v_paramp); -static int MPID_Segment_contig_pack_to_iov(DLOOP_Offset *blocks_p, +static int MPIDU_Segment_contig_pack_to_iov(DLOOP_Offset *blocks_p, DLOOP_Type el_type, DLOOP_Offset rel_off, void *bufp, void *v_paramp); -static int MPID_Segment_contig_flatten(DLOOP_Offset *blocks_p, +static int MPIDU_Segment_contig_flatten(DLOOP_Offset *blocks_p, DLOOP_Type el_type, DLOOP_Offset rel_off, void *bufp, void *v_paramp); -static int MPID_Segment_vector_flatten(DLOOP_Offset *blocks_p, +static int MPIDU_Segment_vector_flatten(DLOOP_Offset *blocks_p, DLOOP_Count count, DLOOP_Size blksz, DLOOP_Offset stride, @@ -86,10 +86,10 @@ static int MPID_Segment_vector_flatten(DLOOP_Offset *blocks_p, /********** EXTERNALLY VISIBLE FUNCTIONS FOR TYPE MANIPULATION **********/ #undef FUNCNAME -#define FUNCNAME MPID_Segment_pack_vector +#define FUNCNAME MPIDU_Segment_pack_vector #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -/* MPID_Segment_pack_vector +/* MPIDU_Segment_pack_vector * * Parameters: * segp - pointer to segment structure @@ -101,13 +101,13 @@ static int MPID_Segment_vector_flatten(DLOOP_Offset *blocks_p, * lengthp - in/out parameter describing length of array (and afterwards * the amount of the array that has actual data) */ -void MPID_Segment_pack_vector(struct DLOOP_Segment *segp, +void MPIDU_Segment_pack_vector(struct DLOOP_Segment *segp, DLOOP_Offset first, DLOOP_Offset *lastp, DLOOP_VECTOR *vectorp, int *lengthp) { -struct MPID_Segment_piece_params packvec_params; +struct MPIDU_Segment_piece_params packvec_params; MPIDI_STATE_DECL(MPID_STATE_MPID_SEGMENT_PACK_VECTOR); MPIDI_FUNC_ENTER(MPID_STATE_MPID_SEGMENT_PACK_VECTOR); @@ -118,31 +118,31 @@ packvec_params.u.pack_vector.length = *lengthp; MPIU_Assert(*lengthp > 0); -MPID_Segment_manipulate(segp, +MPIDU_Segment_manipulate(segp, first, lastp, - MPID_Segment_contig_pack_to_iov, - MPID_Segment_vector_pack_to_iov, + MPIDU_Segment_contig_pack_to_iov, + MPIDU_Segment_vector_pack_to_iov, NULL, /* blkidx fn */ NULL, /* index fn */ NULL, &packvec_params); -/* last value already handled by MPID_Segment_manipulate */ +/* last value already handled by MPIDU_Segment_manipulate */ *lengthp = packvec_params.u.pack_vector.index; MPIDI_FUNC_EXIT(MPID_STATE_MPID_SEGMENT_PACK_VECTOR); return; } -/* MPID_Segment_unpack_vector +/* MPIDU_Segment_unpack_vector * * Q: Should this be any different from pack vector? */ #undef FUNCNAME -#define FUNCNAME MPID_Segment_unpack_vector +#define FUNCNAME MPIDU_Segment_unpack_vector #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -void MPID_Segment_unpack_vector(struct DLOOP_Segment *segp, +void MPIDU_Segment_unpack_vector(struct DLOOP_Segment *segp, DLOOP_Offset first, DLOOP_Offset *lastp, DLOOP_VECTOR *vectorp, @@ -150,16 +150,16 @@ void MPID_Segment_unpack_vector(struct DLOOP_Segment *segp, { MPIDI_STATE_DECL(MPID_STATE_MPID_SEGMENT_UNPACK_VECTOR); MPIDI_FUNC_ENTER(MPID_STATE_MPID_SEGMENT_UNPACK_VECTOR); -MPID_Segment_pack_vector(segp, first, lastp, vectorp, lengthp); +MPIDU_Segment_pack_vector(segp, first, lastp, vectorp, lengthp); MPIDI_FUNC_EXIT(MPID_STATE_MPID_SEGMENT_UNPACK_VECTOR); return; } #undef FUNCNAME -#define FUNCNAME MPID_Segment_flatten +#define FUNCNAME MPIDU_Segment_flatten #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -/* MPID_Segment_flatten +/* MPIDU_Segment_flatten * * offp - pointer to array to fill in with offsets * sizep - pointer to array to fill in with sizes @@ -169,14 +169,14 @@ return; * * TODO: MAKE SIZES Aints IN ROMIO, CHANGE THIS TO USE INTS TOO. */ -void MPID_Segment_flatten(struct DLOOP_Segment *segp, +void MPIDU_Segment_flatten(struct DLOOP_Segment *segp, DLOOP_Offset first, DLOOP_Offset *lastp, DLOOP_Offset *offp, DLOOP_Size *sizep, DLOOP_Offset *lengthp) { -struct MPID_Segment_piece_params packvec_params; +struct MPIDU_Segment_piece_params packvec_params; MPIDI_STATE_DECL(MPID_STATE_MPID_SEGMENT_FLATTEN); MPIDI_FUNC_ENTER(MPID_STATE_MPID_SEGMENT_FLATTEN); @@ -188,17 +188,17 @@ packvec_params.u.flatten.length = *lengthp; MPIU_Assert(*lengthp > 0); -MPID_Segment_manipulate(segp, +MPIDU_Segment_manipulate(segp, first, lastp, - MPID_Segment_contig_flatten, - MPID_Segment_vector_flatten, + MPIDU_Segment_contig_flatten, + MPIDU_Segment_vector_flatten, NULL, /* blkidx fn */ NULL, NULL, &packvec_params); -/* last value already handled by MPID_Segment_manipulate */ +/* last value already handled by MPIDU_Segment_manipulate */ *lengthp = packvec_params.u.flatten.index; MPIDI_FUNC_EXIT(MPID_STATE_MPID_SEGMENT_FLATTEN); return; @@ -212,12 +212,12 @@ return; /********** FUNCTIONS FOR CREATING AN IOV DESCRIBING BUFFER **********/ #undef FUNCNAME -#define FUNCNAME MPID_Segment_contig_pack_to_iov +#define FUNCNAME MPIDU_Segment_contig_pack_to_iov #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -/* MPID_Segment_contig_pack_to_iov +/* MPIDU_Segment_contig_pack_to_iov */ -static int MPID_Segment_contig_pack_to_iov(DLOOP_Offset *blocks_p, +static int MPIDU_Segment_contig_pack_to_iov(DLOOP_Offset *blocks_p, DLOOP_Type el_type, DLOOP_Offset rel_off, void *bufp, @@ -226,12 +226,12 @@ static int MPID_Segment_contig_pack_to_iov(DLOOP_Offset *blocks_p, int el_size, last_idx; DLOOP_Offset size; char *last_end = NULL; - struct MPID_Segment_piece_params *paramp = v_paramp; + struct MPIDU_Segment_piece_params *paramp = v_paramp; MPIDI_STATE_DECL(MPID_STATE_MPID_SEGMENT_CONTIG_PACK_TO_IOV); MPIDI_FUNC_ENTER(MPID_STATE_MPID_SEGMENT_CONTIG_PACK_TO_IOV); - el_size = MPID_Datatype_get_basic_size(el_type); + el_size = MPIDU_Datatype_get_basic_size(el_type); size = *blocks_p * (DLOOP_Offset) el_size; MPL_DBG_MSG_FMT(MPIR_DBG_DATATYPE,VERBOSE,(MPL_DBG_FDEST, @@ -275,10 +275,10 @@ static int MPID_Segment_contig_pack_to_iov(DLOOP_Offset *blocks_p, } #undef FUNCNAME -#define FUNCNAME MPID_Segment_vector_pack_to_iov +#define FUNCNAME MPIDU_Segment_vector_pack_to_iov #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -/* MPID_Segment_vector_pack_to_iov +/* MPIDU_Segment_vector_pack_to_iov * * Input Parameters: * blocks_p - [inout] pointer to a count of blocks (total, for all noncontiguous pieces) @@ -291,7 +291,7 @@ static int MPID_Segment_contig_pack_to_iov(DLOOP_Offset *blocks_p, * Note: this is only called when the starting position is at the beginning * of a whole block in a vector type. */ -static int MPID_Segment_vector_pack_to_iov(DLOOP_Offset *blocks_p, +static int MPIDU_Segment_vector_pack_to_iov(DLOOP_Offset *blocks_p, DLOOP_Count count, DLOOP_Size blksz, DLOOP_Offset stride, @@ -302,12 +302,12 @@ static int MPID_Segment_vector_pack_to_iov(DLOOP_Offset *blocks_p, { int i; DLOOP_Offset size, blocks_left, basic_size; - struct MPID_Segment_piece_params *paramp = v_paramp; + struct MPIDU_Segment_piece_params *paramp = v_paramp; MPIDI_STATE_DECL(MPID_STATE_MPID_SEGMENT_VECTOR_PACK_TO_IOV); MPIDI_FUNC_ENTER(MPID_STATE_MPID_SEGMENT_VECTOR_PACK_TO_IOV); - basic_size = (DLOOP_Offset) MPID_Datatype_get_basic_size(el_type); + basic_size = (DLOOP_Offset) MPIDU_Datatype_get_basic_size(el_type); blocks_left = *blocks_p; MPL_DBG_MSG_FMT(MPIR_DBG_DATATYPE,VERBOSE,(MPL_DBG_FDEST, @@ -397,12 +397,12 @@ static int MPID_Segment_vector_pack_to_iov(DLOOP_Offset *blocks_p, /********** FUNCTIONS FOR FLATTENING A TYPE **********/ #undef FUNCNAME -#define FUNCNAME MPID_Segment_contig_flatten +#define FUNCNAME MPIDU_Segment_contig_flatten #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -/* MPID_Segment_contig_flatten +/* MPIDU_Segment_contig_flatten */ -static int MPID_Segment_contig_flatten(DLOOP_Offset *blocks_p, +static int MPIDU_Segment_contig_flatten(DLOOP_Offset *blocks_p, DLOOP_Type el_type, DLOOP_Offset rel_off, void *bufp, @@ -410,12 +410,12 @@ static int MPID_Segment_contig_flatten(DLOOP_Offset *blocks_p, { int idx, el_size; DLOOP_Offset size; - struct MPID_Segment_piece_params *paramp = v_paramp; + struct MPIDU_Segment_piece_params *paramp = v_paramp; MPIDI_STATE_DECL(MPID_STATE_MPID_SEGMENT_CONTIG_FLATTEN); MPIDI_FUNC_ENTER(MPID_STATE_MPID_SEGMENT_CONTIG_FLATTEN); - el_size = MPID_Datatype_get_basic_size(el_type); + el_size = MPIDU_Datatype_get_basic_size(el_type); size = *blocks_p * (DLOOP_Offset) el_size; idx = paramp->u.flatten.index; @@ -454,20 +454,20 @@ static int MPID_Segment_contig_flatten(DLOOP_Offset *blocks_p, } #undef FUNCNAME -#define FUNCNAME MPID_Segment_vector_flatten +#define FUNCNAME MPIDU_Segment_vector_flatten #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -/* MPID_Segment_vector_flatten +/* MPIDU_Segment_vector_flatten * * Notes: * - this is only called when the starting position is at the beginning * of a whole block in a vector type. - * - this was a virtual copy of MPID_Segment_pack_to_iov; now it has improvements - * that MPID_Segment_pack_to_iov needs. + * - this was a virtual copy of MPIDU_Segment_pack_to_iov; now it has improvements + * that MPIDU_Segment_pack_to_iov needs. * - we return the number of blocks that we did process in region pointed to by * blocks_p. */ -static int MPID_Segment_vector_flatten(DLOOP_Offset *blocks_p, +static int MPIDU_Segment_vector_flatten(DLOOP_Offset *blocks_p, DLOOP_Count count, DLOOP_Size blksz, DLOOP_Offset stride, @@ -478,12 +478,12 @@ static int MPID_Segment_vector_flatten(DLOOP_Offset *blocks_p, { int i; DLOOP_Offset size, blocks_left, basic_size; - struct MPID_Segment_piece_params *paramp = v_paramp; + struct MPIDU_Segment_piece_params *paramp = v_paramp; MPIDI_STATE_DECL(MPID_STATE_MPID_SEGMENT_VECTOR_FLATTEN); MPIDI_FUNC_ENTER(MPID_STATE_MPID_SEGMENT_VECTOR_FLATTEN); - basic_size = (DLOOP_Offset) MPID_Datatype_get_basic_size(el_type); + basic_size = (DLOOP_Offset) MPIDU_Datatype_get_basic_size(el_type); blocks_left = *blocks_p; for (i=0; i < count && blocks_left > 0; i++) { diff --git a/src/mpid/common/datatype/mpid_type_blockindexed.c b/src/mpid/common/datatype/mpid_type_blockindexed.c index a3caf24..274db4d 100644 --- a/src/mpid/common/datatype/mpid_type_blockindexed.c +++ b/src/mpid/common/datatype/mpid_type_blockindexed.c @@ -12,7 +12,7 @@ #undef MPID_TYPE_ALLOC_DEBUG /*@ - MPID_Type_blockindexed - create a block indexed datatype + MPIDU_Type_blockindexed - create a block indexed datatype Input Parameters: + count - number of blocks in type @@ -30,7 +30,7 @@ Output Parameters: MPI_SUCCESS on success, MPI error on failure. @*/ -int MPID_Type_blockindexed(int count, +int MPIDU_Type_blockindexed(int count, int blocklength, const void *displacement_array, int dispinbytes, @@ -45,17 +45,17 @@ int MPID_Type_blockindexed(int count, MPI_Aint old_lb, old_ub, old_extent, old_true_lb, old_true_ub; MPI_Aint min_lb = 0, max_ub = 0, eff_disp; - MPID_Datatype *new_dtp; + MPIDU_Datatype *new_dtp; - if (count == 0) return MPID_Type_zerolen(newtype); + if (count == 0) return MPIDU_Type_zerolen(newtype); /* allocate new datatype object and handle */ - new_dtp = (MPID_Datatype *) MPIU_Handle_obj_alloc(&MPID_Datatype_mem); + new_dtp = (MPIDU_Datatype *) MPIU_Handle_obj_alloc(&MPIDU_Datatype_mem); /* --BEGIN ERROR HANDLING-- */ if (!new_dtp) { mpi_errno = MPIR_Err_create_code(MPI_SUCCESS, MPIR_ERR_RECOVERABLE, - "MPID_Type_vector", __LINE__, + "MPIDU_Type_vector", __LINE__, MPI_ERR_OTHER, "**nomem", 0); return mpi_errno; } @@ -81,7 +81,7 @@ int MPID_Type_blockindexed(int count, if (is_builtin) { - el_sz = (MPI_Aint) MPID_Datatype_get_basic_size(oldtype); + el_sz = (MPI_Aint) MPIDU_Datatype_get_basic_size(oldtype); el_type = oldtype; old_lb = 0; @@ -106,9 +106,9 @@ int MPID_Type_blockindexed(int count, else { /* user-defined base type (oldtype) */ - MPID_Datatype *old_dtp; + MPIDU_Datatype *old_dtp; - MPID_Datatype_get_ptr(oldtype, old_dtp); + MPIDU_Datatype_get_ptr(oldtype, old_dtp); el_sz = old_dtp->builtin_element_size; el_type = old_dtp->basic_type; @@ -136,7 +136,7 @@ int MPID_Type_blockindexed(int count, /* priming for loop */ eff_disp = (dispinbytes) ? ((MPI_Aint *) displacement_array)[0] : (((MPI_Aint) ((int *) displacement_array)[0]) * old_extent); - MPID_DATATYPE_BLOCK_LB_UB((MPI_Aint) blocklength, + MPIDU_DATATYPE_BLOCK_LB_UB((MPI_Aint) blocklength, eff_disp, old_lb, old_ub, @@ -151,7 +151,7 @@ int MPID_Type_blockindexed(int count, eff_disp = (dispinbytes) ? ((MPI_Aint *) displacement_array)[i] : (((MPI_Aint) ((int *) displacement_array)[i]) * old_extent); - MPID_DATATYPE_BLOCK_LB_UB((MPI_Aint) blocklength, + MPIDU_DATATYPE_BLOCK_LB_UB((MPI_Aint) blocklength, eff_disp, old_lb, old_ub, @@ -176,7 +176,7 @@ int MPID_Type_blockindexed(int count, new_dtp->is_contig = 0; if (old_is_contig) { - contig_count = MPID_Type_blockindexed_count_contig(count, + contig_count = MPIDU_Type_blockindexed_count_contig(count, blocklength, displacement_array, dispinbytes, diff --git a/src/mpid/common/datatype/mpid_type_commit.c b/src/mpid/common/datatype/mpid_type_commit.c index 08dc22e..1764ef4 100644 --- a/src/mpid/common/datatype/mpid_type_commit.c +++ b/src/mpid/common/datatype/mpid_type_commit.c @@ -9,7 +9,7 @@ #include <stdlib.h> /*@ - MPID_Type_commit + MPIDU_Type_commit Input Parameters: . datatype_p - pointer to MPI datatype @@ -20,14 +20,14 @@ Output Parameters: 0 on success, -1 on failure. @*/ -int MPID_Type_commit(MPI_Datatype *datatype_p) +int MPIDU_Type_commit(MPI_Datatype *datatype_p) { int mpi_errno=MPI_SUCCESS; - MPID_Datatype *datatype_ptr; + MPIDU_Datatype *datatype_ptr; MPIU_Assert(HANDLE_GET_KIND(*datatype_p) != HANDLE_KIND_BUILTIN); - MPID_Datatype_get_ptr(*datatype_p, datatype_ptr); + MPIDU_Datatype_get_ptr(*datatype_p, datatype_ptr); if (datatype_ptr->is_committed == 0) { datatype_ptr->is_committed = 1; @@ -35,25 +35,25 @@ int MPID_Type_commit(MPI_Datatype *datatype_p) #ifdef MPID_NEEDS_DLOOP_ALL_BYTES /* If MPID implementation needs use to reduce everything to a byte stream, do that. */ - MPID_Dataloop_create(*datatype_p, + MPIDU_Dataloop_create(*datatype_p, &datatype_ptr->dataloop, &datatype_ptr->dataloop_size, &datatype_ptr->dataloop_depth, - MPID_DATALOOP_ALL_BYTES); + MPIDU_DATALOOP_ALL_BYTES); #else - MPID_Dataloop_create(*datatype_p, + MPIDU_Dataloop_create(*datatype_p, &datatype_ptr->dataloop, &datatype_ptr->dataloop_size, &datatype_ptr->dataloop_depth, - MPID_DATALOOP_HOMOGENEOUS); + MPIDU_DATALOOP_HOMOGENEOUS); #endif /* create heterogeneous dataloop */ - MPID_Dataloop_create(*datatype_p, + MPIDU_Dataloop_create(*datatype_p, &datatype_ptr->hetero_dloop, &datatype_ptr->hetero_dloop_size, &datatype_ptr->hetero_dloop_depth, - MPID_DATALOOP_HETEROGENEOUS); + MPIDU_DATALOOP_HETEROGENEOUS); MPL_DBG_MSG_D(MPIR_DBG_DATATYPE,TERSE,"# contig blocks = %d\n", (int) datatype_ptr->max_contig_blocks); @@ -62,9 +62,9 @@ int MPID_Type_commit(MPI_Datatype *datatype_p) MPIDI_Dataloop_dot_printf(datatype_ptr->dataloop, 0, 1); #endif -#ifdef MPID_Dev_datatype_commit_hook - MPID_Dev_datatype_commit_hook(datatype_p); -#endif /* MPID_Dev_datatype_commit_hook */ +#ifdef MPIDU_Dev_datatype_commit_hook + MPIDU_Dev_datatype_commit_hook(datatype_p); +#endif /* MPIDU_Dev_datatype_commit_hook */ } return mpi_errno; diff --git a/src/mpid/common/datatype/mpid_type_contiguous.c b/src/mpid/common/datatype/mpid_type_contiguous.c index 6b0d901..fb0b481 100644 --- a/src/mpid/common/datatype/mpid_type_contiguous.c +++ b/src/mpid/common/datatype/mpid_type_contiguous.c @@ -12,7 +12,7 @@ /* #define MPID_TYPE_ALLOC_DEBUG */ /*@ - MPID_Type_contiguous - create a contiguous datatype + MPIDU_Type_contiguous - create a contiguous datatype Input Parameters: + count - number of elements in the contiguous block @@ -24,7 +24,7 @@ Output Parameters: Return Value: MPI_SUCCESS on success, MPI error code on failure. @*/ -int MPID_Type_contiguous(int count, +int MPIDU_Type_contiguous(int count, MPI_Datatype oldtype, MPI_Datatype *newtype) { @@ -32,17 +32,17 @@ int MPID_Type_contiguous(int count, int is_builtin; MPI_Aint el_sz; MPI_Datatype el_type; - MPID_Datatype *new_dtp; + MPIDU_Datatype *new_dtp; - if (count == 0) return MPID_Type_zerolen(newtype); + if (count == 0) return MPIDU_Type_zerolen(newtype); /* allocate new datatype object and handle */ - new_dtp = (MPID_Datatype *) MPIU_Handle_obj_alloc(&MPID_Datatype_mem); + new_dtp = (MPIDU_Datatype *) MPIU_Handle_obj_alloc(&MPIDU_Datatype_mem); /* --BEGIN ERROR HANDLING-- */ if (!new_dtp) { mpi_errno = MPIR_Err_create_code(MPI_SUCCESS, MPIR_ERR_RECOVERABLE, - "MPID_Type_contiguous", + "MPIDU_Type_contiguous", __LINE__, MPI_ERR_OTHER, "**nomem", 0); return mpi_errno; @@ -69,7 +69,7 @@ int MPID_Type_contiguous(int count, if (is_builtin) { - el_sz = MPID_Datatype_get_basic_size(oldtype); + el_sz = MPIDU_Datatype_get_basic_size(oldtype); el_type = oldtype; new_dtp->size = count * el_sz; @@ -92,9 +92,9 @@ int MPID_Type_contiguous(int count, else { /* user-defined base type (oldtype) */ - MPID_Datatype *old_dtp; + MPIDU_Datatype *old_dtp; - MPID_Datatype_get_ptr(oldtype, old_dtp); + MPIDU_Datatype_get_ptr(oldtype, old_dtp); el_sz = old_dtp->builtin_element_size; el_type = old_dtp->basic_type; @@ -102,7 +102,7 @@ int MPID_Type_contiguous(int count, new_dtp->has_sticky_ub = old_dtp->has_sticky_ub; new_dtp->has_sticky_lb = old_dtp->has_sticky_lb; - MPID_DATATYPE_CONTIG_LB_UB((MPI_Aint) count, + MPIDU_DATATYPE_CONTIG_LB_UB((MPI_Aint) count, old_dtp->lb, old_dtp->ub, old_dtp->extent, diff --git a/src/mpid/common/datatype/mpid_type_create_pairtype.c b/src/mpid/common/datatype/mpid_type_create_pairtype.c index e0de9ce..ef83d0e 100644 --- a/src/mpid/common/datatype/mpid_type_create_pairtype.c +++ b/src/mpid/common/datatype/mpid_type_create_pairtype.c @@ -23,17 +23,17 @@ true_ub_ = (MPIU_VOID_PTR_CAST_TO_MPI_AINT ((char *) &foo.b - \ (char *) &foo.a)) + \ (MPI_Aint) sizeof(foo.b); \ - alignsize_ = MPL_MAX(MPID_Datatype_get_basic_size(mt1_), \ - MPID_Datatype_get_basic_size(mt2_)); \ + alignsize_ = MPL_MAX(MPIDU_Datatype_get_basic_size(mt1_), \ + MPIDU_Datatype_get_basic_size(mt2_)); \ } /*@ - MPID_Type_create_pairtype - create necessary data structures for certain + MPIDU_Type_create_pairtype - create necessary data structures for certain pair types (all but MPI_2INT etc., which never have the size != extent issue). - This function is different from the other MPID_Type_create functions in that - it fills in an already- allocated MPID_Datatype. This is important for + This function is different from the other MPIDU_Type_create functions in that + it fills in an already- allocated MPIDU_Datatype. This is important for allowing configure-time determination of the MPI type values (these types are stored in the "direct" space, for those familiar with how MPICH deals with type allocation). @@ -63,8 +63,8 @@ Input Parameters: Thus in our implementation we have chosen to instead use the actual difference in starting locations of the two types in an actual struct. @*/ -int MPID_Type_create_pairtype(MPI_Datatype type, - MPID_Datatype *new_dtp) +int MPIDU_Type_create_pairtype(MPI_Datatype type, + MPIDU_Datatype *new_dtp) { int err, mpi_errno = MPI_SUCCESS; int type_size, alignsize; @@ -111,7 +111,7 @@ int MPID_Type_create_pairtype(MPI_Datatype type, /* --BEGIN ERROR HANDLING-- */ mpi_errno = MPIR_Err_create_code(MPI_SUCCESS, MPIR_ERR_RECOVERABLE, - "MPID_Type_create_pairtype", + "MPIDU_Type_create_pairtype", __LINE__, MPI_ERR_OTHER, "**dtype", 0); @@ -186,32 +186,32 @@ int MPID_Type_create_pairtype(MPI_Datatype type, #ifdef MPID_NEEDS_DLOOP_ALL_BYTES /* If MPID implementation needs use to reduce everything to a byte stream, do that. */ - err = MPID_Dataloop_create_pairtype(type, + err = MPIDU_Dataloop_create_pairtype(type, &(new_dtp->dataloop), &(new_dtp->dataloop_size), &(new_dtp->dataloop_depth), - MPID_DATALOOP_ALL_BYTES); + MPIDU_DATALOOP_ALL_BYTES); #else - err = MPID_Dataloop_create_pairtype(type, + err = MPIDU_Dataloop_create_pairtype(type, &(new_dtp->dataloop), &(new_dtp->dataloop_size), &(new_dtp->dataloop_depth), - MPID_DATALOOP_HOMOGENEOUS); + MPIDU_DATALOOP_HOMOGENEOUS); #endif if (!err) { - err = MPID_Dataloop_create_pairtype(type, + err = MPIDU_Dataloop_create_pairtype(type, &(new_dtp->hetero_dloop), &(new_dtp->hetero_dloop_size), &(new_dtp->hetero_dloop_depth), - MPID_DATALOOP_HETEROGENEOUS); + MPIDU_DATALOOP_HETEROGENEOUS); } /* --BEGIN ERROR HANDLING-- */ if (err) { mpi_errno = MPIR_Err_create_code(MPI_SUCCESS, MPIR_ERR_RECOVERABLE, - "MPID_Dataloop_create_pairtype", + "MPIDU_Dataloop_create_pairtype", __LINE__, MPI_ERR_OTHER, "**nomem", diff --git a/src/mpid/common/datatype/mpid_type_create_resized.c b/src/mpid/common/datatype/mpid_type_create_resized.c index 7e89257..16a4545 100644 --- a/src/mpid/common/datatype/mpid_type_create_resized.c +++ b/src/mpid/common/datatype/mpid_type_create_resized.c @@ -13,14 +13,14 @@ static int MPIDI_Type_create_resized_memory_error(void); -int MPID_Type_create_resized(MPI_Datatype oldtype, +int MPIDU_Type_create_resized(MPI_Datatype oldtype, MPI_Aint lb, MPI_Aint extent, MPI_Datatype *newtype_p) { - MPID_Datatype *new_dtp; + MPIDU_Datatype *new_dtp; - new_dtp = (MPID_Datatype *) MPIU_Handle_obj_alloc(&MPID_Datatype_mem); + new_dtp = (MPIDU_Datatype *) MPIU_Handle_obj_alloc(&MPIDU_Datatype_mem); /* --BEGIN ERROR HANDLING-- */ if (!new_dtp) return MPIDI_Type_create_resized_memory_error(); /* --END ERROR HANDLING-- */ @@ -44,7 +44,7 @@ int MPID_Type_create_resized(MPI_Datatype oldtype, /* if oldtype is a basic, we build a contiguous dataloop of count = 1 */ if (HANDLE_GET_KIND(oldtype) == HANDLE_KIND_BUILTIN) { - int oldsize = MPID_Datatype_get_basic_size(oldtype); + int oldsize = MPIDU_Datatype_get_basic_size(oldtype); new_dtp->size = oldsize; new_dtp->has_sticky_ub = 0; @@ -65,9 +65,9 @@ int MPID_Type_create_resized(MPI_Datatype oldtype, else { /* user-defined base type */ - MPID_Datatype *old_dtp; + MPIDU_Datatype *old_dtp; - MPID_Datatype_get_ptr(oldtype, old_dtp); + MPIDU_Datatype_get_ptr(oldtype, old_dtp); new_dtp->size = old_dtp->size; new_dtp->has_sticky_ub = 0; @@ -103,7 +103,7 @@ static int MPIDI_Type_create_resized_memory_error(void) mpi_errno = MPIR_Err_create_code(MPI_SUCCESS, MPIR_ERR_RECOVERABLE, - "MPID_Type_create_resized", + "MPIDU_Type_create_resized", __LINE__, MPI_ERR_OTHER, "**nomem", diff --git a/src/mpid/common/datatype/mpid_type_debug.c b/src/mpid/common/datatype/mpid_type_debug.c index 586bec4..31872b3 100644 --- a/src/mpid/common/datatype/mpid_type_debug.c +++ b/src/mpid/common/datatype/mpid_type_debug.c @@ -22,7 +22,7 @@ void MPIDI_Datatype_dot_printf(MPI_Datatype type, int depth, int header); -void MPIDI_Dataloop_dot_printf(MPID_Dataloop *loop_p, int depth, int header); +void MPIDI_Dataloop_dot_printf(MPIDU_Dataloop *loop_p, int depth, int header); void MPIDI_Datatype_contents_printf(MPI_Datatype type, int depth, int acount); static char *MPIDI_Datatype_depth_spacing(int depth) ATTRIBUTE((unused)); @@ -44,10 +44,10 @@ void MPIDI_Datatype_dot_printf(MPI_Datatype type, return; } else { - MPID_Datatype *dt_p; - MPID_Dataloop *loop_p; + MPIDU_Datatype *dt_p; + MPIDU_Dataloop *loop_p; - MPID_Datatype_get_ptr(type, dt_p); + MPIDU_Datatype_get_ptr(type, dt_p); loop_p = dt_p->dataloop; MPIDI_Dataloop_dot_printf(loop_p, depth, header); @@ -55,7 +55,7 @@ void MPIDI_Datatype_dot_printf(MPI_Datatype type, } } -void MPIDI_Dataloop_dot_printf(MPID_Dataloop *loop_p, +void MPIDI_Dataloop_dot_printf(MPIDU_Dataloop *loop_p, int depth, int header) { @@ -248,9 +248,9 @@ void MPIDI_Datatype_printf(MPI_Datatype type, else sticky_ub = 0; } else { - MPID_Datatype *type_ptr; + MPIDU_Datatype *type_ptr; - MPID_Datatype_get_ptr(type, type_ptr); + MPIDU_Datatype_get_ptr(type, type_ptr); string = MPIDU_Datatype_combiner_to_string(type_ptr->contents->combiner); sticky_lb = type_ptr->has_sticky_lb; sticky_ub = type_ptr->has_sticky_ub; @@ -441,7 +441,7 @@ void MPIDU_Datatype_debug(MPI_Datatype type, int array_ct) { int is_builtin; - MPID_Datatype *dtp ATTRIBUTE((unused)); + MPIDU_Datatype *dtp ATTRIBUTE((unused)); is_builtin = (HANDLE_GET_KIND(type) == HANDLE_KIND_BUILTIN); @@ -462,7 +462,7 @@ void MPIDU_Datatype_debug(MPI_Datatype type, if (is_builtin) return; - MPID_Datatype_get_ptr(type, dtp); + MPIDU_Datatype_get_ptr(type, dtp); MPIU_Assert(dtp != NULL); MPL_DBG_OUT_FMT(MPIR_DBG_DATATYPE,(MPL_DBG_FDEST, @@ -516,8 +516,8 @@ void MPIDI_Datatype_contents_printf(MPI_Datatype type, int acount) { int i; - MPID_Datatype *dtp; - MPID_Datatype_contents *cp; + MPIDU_Datatype *dtp; + MPIDU_Datatype_contents *cp; MPI_Aint *aints = NULL; MPI_Datatype *types = NULL; @@ -530,7 +530,7 @@ void MPIDI_Datatype_contents_printf(MPI_Datatype type, return; } - MPID_Datatype_get_ptr(type, dtp); + MPIDU_Datatype_get_ptr(type, dtp); cp = dtp->contents; if (cp == NULL) { diff --git a/src/mpid/common/datatype/mpid_type_dup.c b/src/mpid/common/datatype/mpid_type_dup.c index d6328fd..13349ac 100644 --- a/src/mpid/common/datatype/mpid_type_dup.c +++ b/src/mpid/common/datatype/mpid_type_dup.c @@ -10,12 +10,12 @@ #include <stdlib.h> #undef FCNAME -#define FCNAME "MPID_Type_dup" +#define FCNAME "MPIDU_Type_dup" /* #define MPID_TYPE_ALLOC_DEBUG */ /*@ - MPID_Type_dup - create a copy of a datatype + MPIDU_Type_dup - create a copy of a datatype Input Parameters: - oldtype - handle of original datatype @@ -26,30 +26,30 @@ Output Parameters: Return Value: 0 on success, MPI error code on failure. @*/ -int MPID_Type_dup(MPI_Datatype oldtype, +int MPIDU_Type_dup(MPI_Datatype oldtype, MPI_Datatype *newtype) { int mpi_errno = MPI_SUCCESS; - MPID_Datatype *new_dtp = 0, *old_dtp; + MPIDU_Datatype *new_dtp = 0, *old_dtp; if (HANDLE_GET_KIND(oldtype) == HANDLE_KIND_BUILTIN) { /* create a new type and commit it. */ - mpi_errno = MPID_Type_contiguous(1, oldtype, newtype); + mpi_errno = MPIDU_Type_contiguous(1, oldtype, newtype); if (mpi_errno) { MPIR_ERR_POP(mpi_errno); } } else { /* allocate new datatype object and handle */ - new_dtp = (MPID_Datatype *) MPIU_Handle_obj_alloc(&MPID_Datatype_mem); + new_dtp = (MPIDU_Datatype *) MPIU_Handle_obj_alloc(&MPIDU_Datatype_mem); if (!new_dtp) { /* --BEGIN ERROR HANDLING-- */ mpi_errno = MPIR_Err_create_code(MPI_SUCCESS, MPIR_ERR_RECOVERABLE, - "MPID_Type_dup", __LINE__, MPI_ERR_OTHER, + "MPIDU_Type_dup", __LINE__, MPI_ERR_OTHER, "**nomem", 0); goto fn_fail; /* --END ERROR HANDLING-- */ } - MPID_Datatype_get_ptr(oldtype, old_dtp); + MPIDU_Datatype_get_ptr(oldtype, old_dtp); /* fill in datatype */ MPIU_Object_set_ref(new_dtp, 1); @@ -86,21 +86,21 @@ int MPID_Type_dup(MPI_Datatype oldtype, if (old_dtp->is_committed) { MPIU_Assert(old_dtp->dataloop != NULL); - MPID_Dataloop_dup(old_dtp->dataloop, + MPIDU_Dataloop_dup(old_dtp->dataloop, old_dtp->dataloop_size, &new_dtp->dataloop); if (old_dtp->hetero_dloop != NULL) { /* at this time MPI_COMPLEX doesn't have this loop... * -- RBR, 02/01/2007 */ - MPID_Dataloop_dup(old_dtp->hetero_dloop, + MPIDU_Dataloop_dup(old_dtp->hetero_dloop, old_dtp->hetero_dloop_size, &new_dtp->hetero_dloop); } -#ifdef MPID_Dev_datatype_commit_hook - MPID_Dev_datatype_dup_hook(new_dtp); -#endif /* MPID_Dev_datatype_commit_hook */ +#ifdef MPIDU_Dev_datatype_commit_hook + MPIDU_Dev_datatype_dup_hook(new_dtp); +#endif /* MPIDU_Dev_datatype_commit_hook */ } } diff --git a/src/mpid/common/datatype/mpid_type_get_contents.c b/src/mpid/common/datatype/mpid_type_get_contents.c index 60aadba..5592cb4 100644 --- a/src/mpid/common/datatype/mpid_type_get_contents.c +++ b/src/mpid/common/datatype/mpid_type_get_contents.c @@ -11,7 +11,7 @@ #include <mpid_dataloop.h> /*@ - MPID_Type_get_contents - get content information from datatype + MPIDU_Type_get_contents - get content information from datatype Input Parameters: + datatype - MPI datatype @@ -25,7 +25,7 @@ Output Parameters: - array_of_datatypes - MPI_Datatypes used in creating type @*/ -int MPID_Type_get_contents(MPI_Datatype datatype, +int MPIDU_Type_get_contents(MPI_Datatype datatype, int max_integers, int max_addresses, int max_datatypes, @@ -34,8 +34,8 @@ int MPID_Type_get_contents(MPI_Datatype datatype, MPI_Datatype array_of_datatypes[]) { int i, mpi_errno; - MPID_Datatype *dtp; - MPID_Datatype_contents *cp; + MPIDU_Datatype *dtp; + MPIDU_Datatype_contents *cp; /* --BEGIN ERROR HANDLING-- */ /* these are checked at the MPI layer, so I feel that asserts @@ -49,7 +49,7 @@ int MPID_Type_get_contents(MPI_Datatype datatype, datatype != MPI_LONG_DOUBLE_INT); /* --END ERROR HANDLING-- */ - MPID_Datatype_get_ptr(datatype, dtp); + MPIDU_Datatype_get_ptr(datatype, dtp); cp = dtp->contents; MPIU_Assert(cp != NULL); @@ -59,7 +59,7 @@ int MPID_Type_get_contents(MPI_Datatype datatype, max_datatypes < cp->nr_types) { mpi_errno = MPIR_Err_create_code(MPI_SUCCESS, MPIR_ERR_RECOVERABLE, - "MPID_Type_get_contents", __LINE__, + "MPIDU_Type_get_contents", __LINE__, MPI_ERR_OTHER, "**dtype", 0); return mpi_errno; } @@ -82,8 +82,8 @@ int MPID_Type_get_contents(MPI_Datatype datatype, { if (HANDLE_GET_KIND(array_of_datatypes[i]) != HANDLE_KIND_BUILTIN) { - MPID_Datatype_get_ptr(array_of_datatypes[i], dtp); - MPID_Datatype_add_ref(dtp); + MPIDU_Datatype_get_ptr(array_of_datatypes[i], dtp); + MPIDU_Datatype_add_ref(dtp); } } diff --git a/src/mpid/common/datatype/mpid_type_get_envelope.c b/src/mpid/common/datatype/mpid_type_get_envelope.c index 665c6b9..4485ee1 100644 --- a/src/mpid/common/datatype/mpid_type_get_envelope.c +++ b/src/mpid/common/datatype/mpid_type_get_envelope.c @@ -11,7 +11,7 @@ #include <mpid_dataloop.h> /*@ - MPID_Type_get_envelope - get envelope information from datatype + MPIDU_Type_get_envelope - get envelope information from datatype Input Parameters: . datatype - MPI datatype @@ -23,7 +23,7 @@ Output Parameters: - combiner - function type used to create datatype @*/ -int MPID_Type_get_envelope(MPI_Datatype datatype, +int MPIDU_Type_get_envelope(MPI_Datatype datatype, int *num_integers, int *num_addresses, int *num_datatypes, @@ -42,9 +42,9 @@ int MPID_Type_get_envelope(MPI_Datatype datatype, *num_datatypes = 0; } else { - MPID_Datatype *dtp; + MPIDU_Datatype *dtp; - MPID_Datatype_get_ptr(datatype, dtp); + MPIDU_Datatype_get_ptr(datatype, dtp); *combiner = dtp->contents->combiner; *num_integers = dtp->contents->nr_ints; diff --git a/src/mpid/common/datatype/mpid_type_indexed.c b/src/mpid/common/datatype/mpid_type_indexed.c index 6ec22c3..ecb44e7 100644 --- a/src/mpid/common/datatype/mpid_type_indexed.c +++ b/src/mpid/common/datatype/mpid_type_indexed.c @@ -12,7 +12,7 @@ #undef MPID_TYPE_ALLOC_DEBUG /*@ - MPID_Type_indexed - create an indexed datatype + MPIDU_Type_indexed - create an indexed datatype Input Parameters: + count - number of blocks in type @@ -31,7 +31,7 @@ Output Parameters: 0 on success, -1 on failure. @*/ -int MPID_Type_indexed(int count, +int MPIDU_Type_indexed(int count, const int *blocklength_array, const void *displacement_array, int dispinbytes, @@ -47,9 +47,9 @@ int MPID_Type_indexed(int count, MPI_Aint min_lb = 0, max_ub = 0, eff_disp; MPI_Datatype el_type; - MPID_Datatype *new_dtp; + MPIDU_Datatype *new_dtp; - if (count == 0) return MPID_Type_zerolen(newtype); + if (count == 0) return MPIDU_Type_zerolen(newtype); /* sanity check that blocklens are all non-negative */ for (i = 0; i < count; ++i) { @@ -57,13 +57,13 @@ int MPID_Type_indexed(int count, } /* allocate new datatype object and handle */ - new_dtp = (MPID_Datatype *) MPIU_Handle_obj_alloc(&MPID_Datatype_mem); + new_dtp = (MPIDU_Datatype *) MPIU_Handle_obj_alloc(&MPIDU_Datatype_mem); /* --BEGIN ERROR HANDLING-- */ if (!new_dtp) { mpi_errno = MPIR_Err_create_code(MPI_SUCCESS, MPIR_ERR_RECOVERABLE, - "MPID_Type_indexed", + "MPIDU_Type_indexed", __LINE__, MPI_ERR_OTHER, "**nomem", @@ -95,7 +95,7 @@ int MPID_Type_indexed(int count, /* builtins are handled differently than user-defined types because * they have no associated dataloop or datatype structure. */ - el_sz = MPID_Datatype_get_basic_size(oldtype); + el_sz = MPIDU_Datatype_get_basic_size(oldtype); old_sz = el_sz; el_ct = 1; el_type = oldtype; @@ -119,9 +119,9 @@ int MPID_Type_indexed(int count, else { /* user-defined base type (oldtype) */ - MPID_Datatype *old_dtp; + MPIDU_Datatype *old_dtp; - MPID_Datatype_get_ptr(oldtype, old_dtp); + MPIDU_Datatype_get_ptr(oldtype, old_dtp); /* Ensure that "builtin_element_size" fits into an int datatype. */ MPIU_Ensure_Aint_fits_in_int(old_dtp->builtin_element_size); @@ -155,8 +155,8 @@ int MPID_Type_indexed(int count, while (i < count && blocklength_array[i] == 0) i++; if (i == count) { - MPIU_Handle_obj_free(&MPID_Datatype_mem, new_dtp); - return MPID_Type_zerolen(newtype); + MPIU_Handle_obj_free(&MPIDU_Datatype_mem, new_dtp); + return MPIDU_Type_zerolen(newtype); } /* priming for loop */ @@ -164,7 +164,7 @@ int MPID_Type_indexed(int count, eff_disp = (dispinbytes) ? ((MPI_Aint *) displacement_array)[i] : (((MPI_Aint) ((int *) displacement_array)[i]) * old_extent); - MPID_DATATYPE_BLOCK_LB_UB((MPI_Aint) blocklength_array[i], + MPIDU_DATATYPE_BLOCK_LB_UB((MPI_Aint) blocklength_array[i], eff_disp, old_lb, old_ub, @@ -186,7 +186,7 @@ int MPID_Type_indexed(int count, (((MPI_Aint) ((int *) displacement_array)[i]) * old_extent); /* calculate ub and lb for this block */ - MPID_DATATYPE_BLOCK_LB_UB((MPI_Aint)(blocklength_array[i]), + MPIDU_DATATYPE_BLOCK_LB_UB((MPI_Aint)(blocklength_array[i]), eff_disp, old_lb, old_ub, @@ -219,7 +219,7 @@ int MPID_Type_indexed(int count, MPI_Aint *blklens = MPL_malloc(count *sizeof(MPI_Aint)); for (i=0; i<count; i++) blklens[i] = blocklength_array[i]; - contig_count = MPID_Type_indexed_count_contig(count, + contig_count = MPIDU_Type_indexed_count_contig(count, blklens, displacement_array, dispinbytes, diff --git a/src/mpid/common/datatype/mpid_type_struct.c b/src/mpid/common/datatype/mpid_type_struct.c index cabd164..2d79c1b 100644 --- a/src/mpid/common/datatype/mpid_type_struct.c +++ b/src/mpid/common/datatype/mpid_type_struct.c @@ -13,11 +13,11 @@ #undef MPID_STRUCT_FLATTEN_DEBUG #undef MPID_STRUCT_DEBUG -static MPI_Aint MPID_Type_struct_alignsize(int count, +static MPI_Aint MPIDU_Type_struct_alignsize(int count, const MPI_Datatype *oldtype_array, const MPI_Aint *displacement_array); -/* MPID_Type_struct_alignsize +/* MPIDU_Type_struct_alignsize * * This function guesses at how the C compiler would align a structure * with the given components. @@ -39,7 +39,7 @@ static MPI_Aint MPID_Type_struct_alignsize(int count, * have different natural alignments). Linux on X86, however, does not have * different rules for this case. */ -static MPI_Aint MPID_Type_struct_alignsize(int count, +static MPI_Aint MPIDU_Type_struct_alignsize(int count, const MPI_Datatype *oldtype_array, const MPI_Aint *displacement_array) { @@ -52,7 +52,7 @@ static MPI_Aint MPID_Type_struct_alignsize(int count, if (oldtype_array[i] == MPI_LB || oldtype_array[i] == MPI_UB) continue; else if (HANDLE_GET_KIND(oldtype_array[i]) == HANDLE_KIND_BUILTIN) { - tmp_alignsize = MPID_Datatype_get_basic_size(oldtype_array[i]); + tmp_alignsize = MPIDU_Datatype_get_basic_size(oldtype_array[i]); #ifdef HAVE_DOUBLE_ALIGNMENT_EXCEPTION if (oldtype_array[i] == MPI_DOUBLE) { @@ -112,9 +112,9 @@ static MPI_Aint MPID_Type_struct_alignsize(int count, } else { - MPID_Datatype *dtp; + MPIDU_Datatype *dtp; - MPID_Datatype_get_ptr(oldtype_array[i], dtp); + MPIDU_Datatype_get_ptr(oldtype_array[i], dtp); tmp_alignsize = dtp->alignsize; if (derived_alignsize < tmp_alignsize) derived_alignsize = tmp_alignsize; @@ -128,7 +128,7 @@ static MPI_Aint MPID_Type_struct_alignsize(int count, /*@ - MPID_Type_struct - create a struct datatype + MPIDU_Type_struct - create a struct datatype Input Parameters: + count - number of blocks in vector @@ -142,7 +142,7 @@ Output Parameters: Return Value: MPI_SUCCESS on success, MPI errno on failure. @*/ -int MPID_Type_struct(int count, +int MPIDU_Type_struct(int count, const int *blocklength_array, const MPI_Aint *displacement_array, const MPI_Datatype *oldtype_array, @@ -158,9 +158,9 @@ int MPID_Type_struct(int count, MPI_Aint true_lb_disp = 0, true_ub_disp = 0, sticky_lb_disp = 0, sticky_ub_disp = 0, lb_disp = 0, ub_disp = 0; - MPID_Datatype *new_dtp; + MPIDU_Datatype *new_dtp; - if (count == 0) return MPID_Type_zerolen(newtype); + if (count == 0) return MPIDU_Type_zerolen(newtype); #ifdef MPID_STRUCT_DEBUG MPIDI_Datatype_printf(oldtype_array[0], 1, displacement_array[0], @@ -173,12 +173,12 @@ int MPID_Type_struct(int count, #endif /* allocate new datatype object and handle */ - new_dtp = (MPID_Datatype *) MPIU_Handle_obj_alloc(&MPID_Datatype_mem); + new_dtp = (MPIDU_Datatype *) MPIU_Handle_obj_alloc(&MPIDU_Datatype_mem); /* --BEGIN ERROR HANDLING-- */ if (!new_dtp) { mpi_errno = MPIR_Err_create_code(MPI_SUCCESS, MPIR_ERR_RECOVERABLE, - "MPID_Type_struct", + "MPIDU_Type_struct", __LINE__, MPI_ERR_OTHER, "**nomem", 0); return mpi_errno; @@ -206,8 +206,8 @@ int MPID_Type_struct(int count, if (i == count) { - MPIU_Handle_obj_free(&MPID_Datatype_mem, new_dtp); - return MPID_Type_zerolen(newtype); + MPIU_Handle_obj_free(&MPIDU_Datatype_mem, new_dtp); + return MPIDU_Type_zerolen(newtype); } new_dtp->max_contig_blocks = 0; @@ -218,7 +218,7 @@ int MPID_Type_struct(int count, MPI_Aint tmp_lb, tmp_ub, tmp_true_lb, tmp_true_ub; MPI_Aint tmp_el_sz; MPI_Datatype tmp_el_type; - MPID_Datatype *old_dtp = NULL; + MPIDU_Datatype *old_dtp = NULL; /* Interpreting typemap to not include 0 blklen things, including * MPI_LB and MPI_UB. -- Rob Ross, 10/31/2005 @@ -227,10 +227,10 @@ int MPID_Type_struct(int count, if (is_builtin) { - tmp_el_sz = MPID_Datatype_get_basic_size(oldtype_array[i]); + tmp_el_sz = MPIDU_Datatype_get_basic_size(oldtype_array[i]); tmp_el_type = oldtype_array[i]; - MPID_DATATYPE_BLOCK_LB_UB((MPI_Aint)(blocklength_array[i]), + MPIDU_DATATYPE_BLOCK_LB_UB((MPI_Aint)(blocklength_array[i]), displacement_array[i], 0, tmp_el_sz, @@ -246,7 +246,7 @@ int MPID_Type_struct(int count, } else { - MPID_Datatype_get_ptr(oldtype_array[i], old_dtp); + MPIDU_Datatype_get_ptr(oldtype_array[i], old_dtp); /* Ensure that "builtin_element_size" fits into an int datatype. */ MPIU_Ensure_Aint_fits_in_int(old_dtp->builtin_element_size); @@ -254,7 +254,7 @@ int MPID_Type_struct(int count, tmp_el_sz = old_dtp->builtin_element_size; tmp_el_type = old_dtp->basic_type; - MPID_DATATYPE_BLOCK_LB_UB((MPI_Aint) blocklength_array[i], + MPIDU_DATATYPE_BLOCK_LB_UB((MPI_Aint) blocklength_array[i], displacement_array[i], old_dtp->lb, old_dtp->ub, @@ -398,7 +398,7 @@ int MPID_Type_struct(int count, new_dtp->true_ub = true_ub_disp; new_dtp->ub = (found_sticky_ub) ? sticky_ub_disp : ub_disp; - new_dtp->alignsize = MPID_Type_struct_alignsize(count, + new_dtp->alignsize = MPIDU_Type_struct_alignsize(count, oldtype_array, displacement_array); diff --git a/src/mpid/common/datatype/mpid_type_vector.c b/src/mpid/common/datatype/mpid_type_vector.c index 390db33..14c988e 100644 --- a/src/mpid/common/datatype/mpid_type_vector.c +++ b/src/mpid/common/datatype/mpid_type_vector.c @@ -12,7 +12,7 @@ /* #define MPID_TYPE_ALLOC_DEBUG */ /*@ - MPID_Type_vector - create a vector datatype + MPIDU_Type_vector - create a vector datatype Input Parameters: + count - number of blocks in vector @@ -29,7 +29,7 @@ Output Parameters: Return Value: 0 on success, MPI error code on failure. @*/ -int MPID_Type_vector(int count, +int MPIDU_Type_vector(int count, int blocklength, MPI_Aint stride, int strideinbytes, @@ -42,16 +42,16 @@ int MPID_Type_vector(int count, MPI_Datatype el_type; MPI_Aint old_lb, old_ub, old_extent, old_true_lb, old_true_ub, eff_stride; - MPID_Datatype *new_dtp; + MPIDU_Datatype *new_dtp; - if (count == 0) return MPID_Type_zerolen(newtype); + if (count == 0) return MPIDU_Type_zerolen(newtype); /* allocate new datatype object and handle */ - new_dtp = (MPID_Datatype *) MPIU_Handle_obj_alloc(&MPID_Datatype_mem); + new_dtp = (MPIDU_Datatype *) MPIU_Handle_obj_alloc(&MPIDU_Datatype_mem); if (!new_dtp) { /* --BEGIN ERROR HANDLING-- */ mpi_errno = MPIR_Err_create_code(MPI_SUCCESS, MPIR_ERR_RECOVERABLE, - "MPID_Type_vector", __LINE__, + "MPIDU_Type_vector", __LINE__, MPI_ERR_OTHER, "**nomem", 0); return mpi_errno; /* --END ERROR HANDLING-- */ @@ -76,7 +76,7 @@ int MPID_Type_vector(int count, is_builtin = (HANDLE_GET_KIND(oldtype) == HANDLE_KIND_BUILTIN); if (is_builtin) { - el_sz = (MPI_Aint) MPID_Datatype_get_basic_size(oldtype); + el_sz = (MPI_Aint) MPIDU_Datatype_get_basic_size(oldtype); el_type = oldtype; old_lb = 0; @@ -102,9 +102,9 @@ int MPID_Type_vector(int count, eff_stride = (strideinbytes) ? stride : (stride * el_sz); } else /* user-defined base type (oldtype) */ { - MPID_Datatype *old_dtp; + MPIDU_Datatype *old_dtp; - MPID_Datatype_get_ptr(oldtype, old_dtp); + MPIDU_Datatype_get_ptr(oldtype, old_dtp); el_sz = old_dtp->builtin_element_size; el_type = old_dtp->basic_type; @@ -130,7 +130,7 @@ int MPID_Type_vector(int count, eff_stride = (strideinbytes) ? stride : (stride * old_dtp->extent); } - MPID_DATATYPE_VECTOR_LB_UB((MPI_Aint) count, + MPIDU_DATATYPE_VECTOR_LB_UB((MPI_Aint) count, eff_stride, (MPI_Aint) blocklength, old_lb, diff --git a/src/mpid/common/datatype/mpid_type_zerolen.c b/src/mpid/common/datatype/mpid_type_zerolen.c index 630eb46..ef12577 100644 --- a/src/mpid/common/datatype/mpid_type_zerolen.c +++ b/src/mpid/common/datatype/mpid_type_zerolen.c @@ -12,7 +12,7 @@ /* #define MPID_TYPE_ALLOC_DEBUG */ /*@ - MPID_Type_zerolen - create an empty datatype + MPIDU_Type_zerolen - create an empty datatype Input Parameters: . none @@ -24,18 +24,18 @@ Output Parameters: MPI_SUCCESS on success, MPI error code on failure. @*/ -int MPID_Type_zerolen(MPI_Datatype *newtype) +int MPIDU_Type_zerolen(MPI_Datatype *newtype) { int mpi_errno; - MPID_Datatype *new_dtp; + MPIDU_Datatype *new_dtp; /* allocate new datatype object and handle */ - new_dtp = (MPID_Datatype *) MPIU_Handle_obj_alloc(&MPID_Datatype_mem); + new_dtp = (MPIDU_Datatype *) MPIU_Handle_obj_alloc(&MPIDU_Datatype_mem); /* --BEGIN ERROR HANDLING-- */ if (!new_dtp) { mpi_errno = MPIR_Err_create_code(MPI_SUCCESS, MPIR_ERR_RECOVERABLE, - "MPID_Type_zerolen", + "MPIDU_Type_zerolen", __LINE__, MPI_ERR_OTHER, "**nomem", 0); return mpi_errno; diff --git a/src/mpid/common/datatype/mpir_type_flatten.c b/src/mpid/common/datatype/mpir_type_flatten.c index 10cdab6..8886692 100644 --- a/src/mpid/common/datatype/mpir_type_flatten.c +++ b/src/mpid/common/datatype/mpir_type_flatten.c @@ -30,22 +30,22 @@ int MPIR_Type_flatten(MPI_Datatype type, { int err; MPI_Aint first, last; - MPID_Datatype *datatype_ptr ATTRIBUTE((unused)); - MPID_Segment *segp; + MPIDU_Datatype *datatype_ptr ATTRIBUTE((unused)); + MPIDU_Segment *segp; if (HANDLE_GET_KIND(type) == HANDLE_KIND_BUILTIN) { off_array[0] = 0; - MPID_Datatype_get_size_macro(type, size_array[0]); + MPIDU_Datatype_get_size_macro(type, size_array[0]); *array_len_p = 1; return 0; } - MPID_Datatype_get_ptr(type, datatype_ptr); + MPIDU_Datatype_get_ptr(type, datatype_ptr); MPIU_Assert(datatype_ptr->is_committed); MPIU_Assert(*array_len_p >= datatype_ptr->max_contig_blocks); - segp = MPID_Segment_alloc(); - err = MPID_Segment_init(0, 1, type, segp, 0); /* first 0 is bufptr, + segp = MPIDU_Segment_alloc(); + err = MPIDU_Segment_init(0, 1, type, segp, 0); /* first 0 is bufptr, * 1 is count * last 0 is homogeneous */ @@ -54,14 +54,14 @@ int MPIR_Type_flatten(MPI_Datatype type, first = 0; last = SEGMENT_IGNORE_LAST; - MPID_Segment_flatten(segp, + MPIDU_Segment_flatten(segp, first, &last, off_array, size_array, array_len_p); - MPID_Segment_free(segp); + MPIDU_Segment_free(segp); return 0; } diff --git a/src/mpid/common/sched/mpidu_sched.c b/src/mpid/common/sched/mpidu_sched.c index 5af6535..f95d1c7 100644 --- a/src/mpid/common/sched/mpidu_sched.c +++ b/src/mpid/common/sched/mpidu_sched.c @@ -26,9 +26,9 @@ if ((datatype_) != MPI_DATATYPE_NULL && \ HANDLE_GET_KIND((datatype_)) != HANDLE_KIND_BUILTIN) \ { \ - MPID_Datatype *dtp_ = NULL; \ - MPID_Datatype_get_ptr((datatype_), dtp_); \ - MPID_Datatype_add_ref(dtp_); \ + MPIDU_Datatype *dtp_ = NULL; \ + MPIDU_Datatype_get_ptr((datatype_), dtp_); \ + MPIDU_Datatype_add_ref(dtp_); \ } \ } while (0) #define dtype_release_if_not_builtin(datatype_) \ @@ -36,9 +36,9 @@ if ((datatype_) != MPI_DATATYPE_NULL && \ HANDLE_GET_KIND((datatype_)) != HANDLE_KIND_BUILTIN) \ { \ - MPID_Datatype *dtp_ = NULL; \ - MPID_Datatype_get_ptr((datatype_), dtp_); \ - MPID_Datatype_release(dtp_); \ + MPIDU_Datatype *dtp_ = NULL; \ + MPIDU_Datatype_get_ptr((datatype_), dtp_); \ + MPIDU_Datatype_release(dtp_); \ } \ } while (0) @@ -763,8 +763,8 @@ int MPIDU_Sched_copy(const void *inbuf, MPI_Aint incount, MPI_Datatype intype, #if defined(HAVE_ERROR_CHECKING) && !defined(NDEBUG) { MPI_Aint intype_size, outtype_size; - MPID_Datatype_get_size_macro(intype, intype_size); - MPID_Datatype_get_size_macro(outtype, outtype_size); + MPIDU_Datatype_get_size_macro(intype, intype_size); + MPIDU_Datatype_get_size_macro(outtype, outtype_size); if (incount * intype_size > outcount * outtype_size) { MPL_error_printf("truncation: intype=%#x, intype_size=" MPI_AINT_FMT_DEC_SPEC ", incount=" MPI_AINT_FMT_DEC_SPEC ", outtype=%#x, outtype_size=" MPI_AINT_FMT_DEC_SPEC " outcount=" MPI_AINT_FMT_DEC_SPEC "\n", intype, intype_size, diff --git a/src/mpid/pamid/include/mpidi_datatypes.h b/src/mpid/pamid/include/mpidi_datatypes.h index 11c07e2..53083b9 100644 --- a/src/mpid/pamid/include/mpidi_datatypes.h +++ b/src/mpid/pamid/include/mpidi_datatypes.h @@ -272,7 +272,7 @@ typedef struct struct MPIDI_Request { struct MPID_Request *next; /**< Link to next req. in queue */ - struct MPID_Datatype *datatype_ptr; /**< Info about the datatype */ + struct MPIDU_Datatype*datatype_ptr; /**< Info about the datatype */ pami_work_t post_request; /**< */ MPIDI_MsgEnvelope envelope; diff --git a/src/mpid/pamid/include/mpidi_macros.h b/src/mpid/pamid/include/mpidi_macros.h index 8c79b3b..d1a62c9 100644 --- a/src/mpid/pamid/include/mpidi_macros.h +++ b/src/mpid/pamid/include/mpidi_macros.h @@ -66,11 +66,11 @@ _dt_contig_out, _data_sz_out, _dt_ptr, _dt_true_lb) \ (_dt_contig_out) = TRUE; \ (_dt_true_lb) = 0; \ (_data_sz_out) = (_count) * \ - MPID_Datatype_get_basic_size(_datatype); \ + MPIDU_Datatype_get_basic_size(_datatype); \ } \ else \ { \ - MPID_Datatype_get_ptr((_datatype), (_dt_ptr)); \ + MPIDU_Datatype_get_ptr((_datatype), (_dt_ptr)); \ (_dt_contig_out) = (_dt_ptr)->is_contig; \ (_dt_true_lb) = (_dt_ptr)->true_lb; \ (_data_sz_out) = (_count) * (_dt_ptr)->size; \ @@ -86,12 +86,12 @@ _data_sz_out) \ if (HANDLE_GET_KIND(_datatype) == HANDLE_KIND_BUILTIN) \ { \ (_data_sz_out) = (_count) * \ - MPID_Datatype_get_basic_size(_datatype); \ + MPIDU_Datatype_get_basic_size(_datatype); \ } \ else \ { \ - MPID_Datatype *_dt_ptr; \ - MPID_Datatype_get_ptr((_datatype), (_dt_ptr)); \ + MPIDU_Datatype*_dt_ptr; \ + MPIDU_Datatype_get_ptr((_datatype), (_dt_ptr)); \ (_data_sz_out) = (_count) * (_dt_ptr)->size; \ } \ }) diff --git a/src/mpid/pamid/include/mpidpre.h b/src/mpid/pamid/include/mpidpre.h index 2ca50d2..e308cfd 100644 --- a/src/mpid/pamid/include/mpidpre.h +++ b/src/mpid/pamid/include/mpidpre.h @@ -87,8 +87,8 @@ int MPID_Wtime_init(void); #else #define MPID_DEV_DATATYPE_DECL void *device_datatype; #endif -#define MPID_Dev_datatype_commit_hook(ptr) MPIDI_PAMI_datatype_commit_hook(ptr) -#define MPID_Dev_datatype_destroy_hook(ptr) MPIDI_PAMI_datatype_destroy_hook(ptr) -#define MPID_Dev_datatype_dup_hook(ptr) MPIDI_PAMI_datatype_dup_hook(ptr) +#define MPIDU_Dev_datatype_commit_hook(ptr) MPIDI_PAMI_datatype_commit_hook(ptr) +#define MPIDU_Dev_datatype_destroy_hook(ptr) MPIDI_PAMI_datatype_destroy_hook(ptr) +#define MPIDU_Dev_datatype_dup_hook(ptr) MPIDI_PAMI_datatype_dup_hook(ptr) #endif diff --git a/src/mpid/pamid/src/coll/allgather/mpido_allgather.c b/src/mpid/pamid/src/coll/allgather/mpido_allgather.c index f09c068..2d4d8a3 100644 --- a/src/mpid/pamid/src/coll/allgather/mpido_allgather.c +++ b/src/mpid/pamid/src/coll/allgather/mpido_allgather.c @@ -172,7 +172,7 @@ int MPIDO_Allgather_bcast(const void *sendbuf, const int rank = comm_ptr->rank; np = comm_ptr ->local_size; - MPID_Datatype_get_extent_macro(recvtype, extent); + MPIDU_Datatype_get_extent_macro(recvtype, extent); MPIU_Ensure_Aint_fits_in_pointer ((MPIU_VOID_PTR_CAST_TO_MPI_AINT recvbuf + np * recvcount * extent)); @@ -302,7 +302,7 @@ MPIDO_Allgather(const void *sendbuf, */ const struct MPIDI_Comm* const mpid = &(comm_ptr->mpid); int config[6], i; - MPID_Datatype * dt_null = NULL; + MPIDU_Datatype* dt_null = NULL; MPI_Aint send_true_lb = 0; MPI_Aint recv_true_lb = 0; int comm_size = comm_ptr->local_size; @@ -360,8 +360,8 @@ MPIDO_Allgather(const void *sendbuf, if(MPIDI_Process.cuda_aware_support_on) { MPI_Aint sdt_extent,rdt_extent; - MPID_Datatype_get_extent_macro(sendtype, sdt_extent); - MPID_Datatype_get_extent_macro(recvtype, rdt_extent); + MPIDU_Datatype_get_extent_macro(sendtype, sdt_extent); + MPIDU_Datatype_get_extent_macro(recvtype, rdt_extent); char *scbuf = NULL; char *rcbuf = NULL; int is_send_dev_buf = MPIDI_cuda_is_device_buf(sendbuf); @@ -646,14 +646,14 @@ MPIDO_Allgather_simple(const void *sendbuf, * ********************************* */ const struct MPIDI_Comm* const mpid = &(comm_ptr->mpid); - MPID_Datatype * dt_null = NULL; + MPIDU_Datatype* dt_null = NULL; void *snd_noncontig_buff = NULL, *rcv_noncontig_buff = NULL; MPI_Aint send_true_lb = 0; MPI_Aint recv_true_lb = 0; int snd_data_contig = 1, rcv_data_contig = 1; size_t send_size = 0; size_t recv_size = 0; - MPID_Segment segment; + MPIDU_Segment segment; volatile unsigned allgather_active = 1; const int rank = comm_ptr->rank; const int size = comm_ptr->local_size; @@ -720,7 +720,7 @@ MPIDO_Allgather_simple(const void *sendbuf, { sbuf = PAMI_IN_PLACE; size_t extent; - MPID_Datatype_get_extent_macro(recvtype,extent); + MPIDU_Datatype_get_extent_macro(recvtype,extent); MPIR_Localcopy(recvbuf + (rank*recvcount*extent), recvcount, recvtype, rcv_noncontig_buff + (rank*recv_size), recv_size,MPI_CHAR); } @@ -747,8 +747,8 @@ MPIDO_Allgather_simple(const void *sendbuf, "Fatal: Cannot allocate pack buffer"); } DLOOP_Offset last = send_size; - MPID_Segment_init(sendbuf, sendcount, sendtype, &segment, 0); - MPID_Segment_pack(&segment, 0, &last, snd_noncontig_buff); + MPIDU_Segment_init(sendbuf, sendcount, sendtype, &segment, 0); + MPIDU_Segment_pack(&segment, 0, &last, snd_noncontig_buff); } } else diff --git a/src/mpid/pamid/src/coll/allgatherv/mpido_allgatherv.c b/src/mpid/pamid/src/coll/allgatherv/mpido_allgatherv.c index 6ae680f..8bc3523 100644 --- a/src/mpid/pamid/src/coll/allgatherv/mpido_allgatherv.c +++ b/src/mpid/pamid/src/coll/allgatherv/mpido_allgatherv.c @@ -178,7 +178,7 @@ int MPIDO_Allgatherv_bcast(const void *sendbuf, TRACE_ERR("Entering MPIDO_Allgatherv_bcast\n"); int i, rc=MPI_ERR_INTERN; MPI_Aint extent; - MPID_Datatype_get_extent_macro(recvtype, extent); + MPIDU_Datatype_get_extent_macro(recvtype, extent); if (sendbuf != MPI_IN_PLACE) { @@ -307,7 +307,7 @@ MPIDO_Allgatherv(const void *sendbuf, /* function pointer to be used to point to approperiate algorithm */ /* Check the nature of the buffers */ - MPID_Datatype *dt_null = NULL; + MPIDU_Datatype*dt_null = NULL; MPI_Aint send_true_lb = 0; MPI_Aint recv_true_lb = 0; size_t send_size = 0; @@ -374,8 +374,8 @@ MPIDO_Allgatherv(const void *sendbuf, if(MPIDI_Process.cuda_aware_support_on) { MPI_Aint sdt_extent,rdt_extent; - MPID_Datatype_get_extent_macro(sendtype, sdt_extent); - MPID_Datatype_get_extent_macro(recvtype, rdt_extent); + MPIDU_Datatype_get_extent_macro(sendtype, sdt_extent); + MPIDU_Datatype_get_extent_macro(recvtype, rdt_extent); char *scbuf = NULL; char *rcbuf = NULL; int is_send_dev_buf = MPIDI_cuda_is_device_buf(sendbuf); @@ -552,7 +552,7 @@ MPIDO_Allgatherv(const void *sendbuf, if(my_md->check_correct.values.rangeminmax) { MPI_Aint data_true_lb; - MPID_Datatype *data_ptr; + MPIDU_Datatype*data_ptr; int data_size, data_contig; MPIDI_Datatype_get_info(sendcount, sendtype, data_contig, data_size, data_ptr, data_true_lb); if((my_md->range_lo <= data_size) && @@ -690,7 +690,7 @@ MPIDO_Allgatherv_simple(const void *sendbuf, TRACE_ERR("Entering MPIDO_Allgatherv_optimized\n"); /* function pointer to be used to point to approperiate algorithm */ /* Check the nature of the buffers */ - MPID_Datatype *dt_null = NULL; + MPIDU_Datatype*dt_null = NULL; MPI_Aint send_true_lb = 0; MPI_Aint recv_true_lb = 0; size_t send_size = 0; @@ -818,7 +818,7 @@ MPIDO_Allgatherv_simple(const void *sendbuf, if(inplace) { size_t extent; - MPID_Datatype_get_extent_macro(recvtype,extent); + MPIDU_Datatype_get_extent_macro(recvtype,extent); MPIR_Localcopy(recvbuf + displs[rank]*extent, recvcounts[rank], recvtype, rcv_noncontig_buff + precvdispls[rank], precvcounts[rank],MPI_CHAR); scount = precvcounts[rank]; @@ -862,7 +862,7 @@ MPIDO_Allgatherv_simple(const void *sendbuf, { size_t extent; int i; - MPID_Datatype_get_extent_macro(recvtype,extent); + MPIDU_Datatype_get_extent_macro(recvtype,extent); for(i=0; i<size; ++i) { char* scbuf = (char*)rcv_noncontig_buff+ precvdispls[i]; diff --git a/src/mpid/pamid/src/coll/allreduce/mpido_allreduce.c b/src/mpid/pamid/src/coll/allreduce/mpido_allreduce.c index aba15ef..58f8dff 100644 --- a/src/mpid/pamid/src/coll/allreduce/mpido_allreduce.c +++ b/src/mpid/pamid/src/coll/allreduce/mpido_allreduce.c @@ -121,7 +121,7 @@ int MPIDO_Allreduce(const void *sendbuf, if(MPIDI_Process.cuda_aware_support_on) { MPI_Aint dt_extent; - MPID_Datatype_get_extent_macro(dt, dt_extent); + MPIDU_Datatype_get_extent_macro(dt, dt_extent); char *scbuf = NULL; char *rcbuf = NULL; int is_send_dev_buf = MPIDI_cuda_is_device_buf(sendbuf); @@ -467,7 +467,7 @@ int MPIDO_Allreduce_simple(const void *sendbuf, pami_xfer_t allred; const pami_metadata_t *my_allred_md = (pami_metadata_t *)NULL; const struct MPIDI_Comm* const mpid = &(comm_ptr->mpid); - MPID_Datatype *data_ptr; + MPIDU_Datatype*data_ptr; MPI_Aint data_true_lb = 0; int data_size, data_contig; diff --git a/src/mpid/pamid/src/coll/alltoall/mpido_alltoall.c b/src/mpid/pamid/src/coll/alltoall/mpido_alltoall.c index 84f5500..66dc8ac 100644 --- a/src/mpid/pamid/src/coll/alltoall/mpido_alltoall.c +++ b/src/mpid/pamid/src/coll/alltoall/mpido_alltoall.c @@ -51,7 +51,7 @@ int MPIDO_Alltoall(const void *sendbuf, #endif TRACE_ERR("Entering MPIDO_Alltoall\n"); volatile unsigned active = 1; - MPID_Datatype *sdt, *rdt; + MPIDU_Datatype*sdt, *rdt; pami_type_t stype, rtype; MPI_Aint sdt_true_lb=0, rdt_true_lb; MPIDI_Post_coll_t alltoall_post; @@ -95,8 +95,8 @@ int MPIDO_Alltoall(const void *sendbuf, if(MPIDI_Process.cuda_aware_support_on) { MPI_Aint sdt_extent,rdt_extent; - MPID_Datatype_get_extent_macro(sendtype, sdt_extent); - MPID_Datatype_get_extent_macro(recvtype, rdt_extent); + MPIDU_Datatype_get_extent_macro(sendtype, sdt_extent); + MPIDU_Datatype_get_extent_macro(recvtype, rdt_extent); char *scbuf = NULL; char *rcbuf = NULL; int is_send_dev_buf = MPIDI_cuda_is_device_buf(sendbuf); @@ -200,7 +200,7 @@ int MPIDO_Alltoall(const void *sendbuf, if(my_md->check_correct.values.rangeminmax) { MPI_Aint data_true_lb ATTRIBUTE((unused)); - MPID_Datatype *data_ptr; + MPIDU_Datatype*data_ptr; int data_size, data_contig ATTRIBUTE((unused)); MPIDI_Datatype_get_info(sendcount, sendtype, data_contig, data_size, data_ptr, data_true_lb); if((my_md->range_lo <= data_size) && @@ -288,8 +288,8 @@ int MPIDO_Alltoall_simple(const void *sendbuf, void *sbuf = NULL, *rbuf = NULL; size_t send_size = 0; size_t recv_size = 0; - MPID_Segment segment; - MPID_Datatype *sdt, *rdt; + MPIDU_Segment segment; + MPIDU_Datatype*sdt, *rdt; MPI_Aint sdt_true_lb=0, rdt_true_lb; MPIDI_Post_coll_t alltoall_post; int sndlen, rcvlen, snd_contig = 1, rcv_contig = 1; @@ -346,8 +346,8 @@ int MPIDO_Alltoall_simple(const void *sendbuf, "Fatal: Cannot allocate pack buffer"); } DLOOP_Offset last = send_size*size; - MPID_Segment_init(sendbuf, sendcount*size, sendtype, &segment, 0); - MPID_Segment_pack(&segment, 0, &last, snd_noncontig_buff); + MPIDU_Segment_init(sendbuf, sendcount*size, sendtype, &segment, 0); + MPIDU_Segment_pack(&segment, 0, &last, snd_noncontig_buff); } } @@ -364,7 +364,7 @@ int MPIDO_Alltoall_simple(const void *sendbuf, if(sendbuf == MPI_IN_PLACE) { size_t extent; - MPID_Datatype_get_extent_macro(recvtype,extent); + MPIDU_Datatype_get_extent_macro(recvtype,extent); MPIR_Localcopy(recvbuf + (rank*recvcount*extent), recvcount, recvtype, rcv_noncontig_buff + (rank*recv_size), recv_size,MPI_CHAR); } diff --git a/src/mpid/pamid/src/coll/alltoallv/mpido_alltoallv.c b/src/mpid/pamid/src/coll/alltoallv/mpido_alltoallv.c index bbd3a4e..4a6215f 100644 --- a/src/mpid/pamid/src/coll/alltoallv/mpido_alltoallv.c +++ b/src/mpid/pamid/src/coll/alltoallv/mpido_alltoallv.c @@ -56,7 +56,7 @@ int MPIDO_Alltoallv(const void *sendbuf, void *sbuf = NULL, *rbuf = NULL; int recvok=PAMI_SUCCESS, sendok=PAMI_SUCCESS; int sndtypelen, rcvtypelen, snd_contig=0, rcv_contig=0; - MPID_Datatype *sdt, *rdt; + MPIDU_Datatype*sdt, *rdt; pami_type_t stype, rtype; MPI_Aint sdt_true_lb, rdt_true_lb; MPIDI_Post_coll_t alltoallv_post; @@ -133,7 +133,7 @@ int MPIDO_Alltoallv(const void *sendbuf, else { size_t extent; - MPID_Datatype_get_extent_macro(sendtype,extent); + MPIDU_Datatype_get_extent_macro(sendtype,extent); for(i=0; i<size; ++i) { char* scbuf = (char*)sendbuf + senddispls[i]*extent; @@ -217,7 +217,7 @@ int MPIDO_Alltoallv(const void *sendbuf, else { size_t extent; - MPID_Datatype_get_extent_macro(recvtype,extent); + MPIDU_Datatype_get_extent_macro(recvtype,extent); for(i=0; i<size; ++i) { char* scbuf = (char*)recvbuf + recvdispls[i]*extent; @@ -296,7 +296,7 @@ int MPIDO_Alltoallv(const void *sendbuf, if(my_md->check_correct.values.rangeminmax) { MPI_Aint data_true_lb; - MPID_Datatype *data_ptr; + MPIDU_Datatype*data_ptr; int data_size, data_contig; MPIDI_Datatype_get_info(??, sendtype, data_contig, data_size, data_ptr, data_true_lb); if((my_md->range_lo <= data_size) && @@ -369,7 +369,7 @@ int MPIDO_Alltoallv(const void *sendbuf, { size_t extent; int i; - MPID_Datatype_get_extent_macro(recvtype,extent); + MPIDU_Datatype_get_extent_macro(recvtype,extent); for(i=0; i<size; ++i) { char* scbuf = (char*)rcv_noncontig_buff+ precvdispls[i]; @@ -418,7 +418,7 @@ int MPIDO_Alltoallv_simple(const void *sendbuf, TRACE_ERR("Entering MPIDO_Alltoallv_optimized\n"); volatile unsigned active = 1; int sndtypelen, rcvtypelen, snd_contig = 1, rcv_contig = 1; - MPID_Datatype *sdt, *rdt; + MPIDU_Datatype*sdt, *rdt; pami_type_t stype = NULL, rtype; MPI_Aint sdt_true_lb = 0, rdt_true_lb; MPIDI_Post_coll_t alltoallv_post; @@ -525,7 +525,7 @@ int MPIDO_Alltoallv_simple(const void *sendbuf, else { size_t extent; - MPID_Datatype_get_extent_macro(sendtype,extent); + MPIDU_Datatype_get_extent_macro(sendtype,extent); for(i=0; i<size; ++i) { char* scbuf = (char*)sendbuf + senddispls[i]*extent; @@ -609,7 +609,7 @@ int MPIDO_Alltoallv_simple(const void *sendbuf, else { size_t extent; - MPID_Datatype_get_extent_macro(recvtype,extent); + MPIDU_Datatype_get_extent_macro(recvtype,extent); for(i=0; i<size; ++i) { char* scbuf = (char*)recvbuf + recvdispls[i]*extent; @@ -670,7 +670,7 @@ int MPIDO_Alltoallv_simple(const void *sendbuf, { size_t extent; int i; - MPID_Datatype_get_extent_macro(recvtype,extent); + MPIDU_Datatype_get_extent_macro(recvtype,extent); for(i=0; i<size; ++i) { char* scbuf = (char*)rcv_noncontig_buff+ precvdispls[i]; diff --git a/src/mpid/pamid/src/coll/bcast/mpido_bcast.c b/src/mpid/pamid/src/coll/bcast/mpido_bcast.c index 404fec6..f6be944 100644 --- a/src/mpid/pamid/src/coll/bcast/mpido_bcast.c +++ b/src/mpid/pamid/src/coll/bcast/mpido_bcast.c @@ -46,8 +46,8 @@ int MPIDO_Bcast(void *buffer, *noncontig_buff = NULL; volatile unsigned active = 1; MPI_Aint data_true_lb = 0; - MPID_Datatype *data_ptr; - MPID_Segment segment; + MPIDU_Datatype*data_ptr; + MPIDU_Segment segment; MPIDI_Post_coll_t bcast_post; const struct MPIDI_Comm* const mpid = &(comm_ptr->mpid); const int rank = comm_ptr->rank; @@ -122,8 +122,8 @@ int MPIDO_Bcast(void *buffer, if(rank == root) { DLOOP_Offset last = data_size; - MPID_Segment_init(buffer, count, datatype, &segment, 0); - MPID_Segment_pack(&segment, 0, &last, noncontig_buff); + MPIDU_Segment_init(buffer, count, datatype, &segment, 0); + MPIDU_Segment_pack(&segment, 0, &last, noncontig_buff); } } @@ -282,8 +282,8 @@ int MPIDO_Bcast_simple(void *buffer, *noncontig_buff = NULL; volatile unsigned active = 1; MPI_Aint data_true_lb = 0; - MPID_Datatype *data_ptr; - MPID_Segment segment; + MPIDU_Datatype*data_ptr; + MPIDU_Segment segment; MPIDI_Post_coll_t bcast_post; const struct MPIDI_Comm* const mpid = &(comm_ptr->mpid); const int rank = comm_ptr->rank; @@ -335,8 +335,8 @@ int MPIDO_Bcast_simple(void *buffer, if(rank == root) { DLOOP_Offset last = data_size; - MPID_Segment_init(buffer, count, datatype, &segment, 0); - MPID_Segment_pack(&segment, 0, &last, noncontig_buff); + MPIDU_Segment_init(buffer, count, datatype, &segment, 0); + MPIDU_Segment_pack(&segment, 0, &last, noncontig_buff); } } diff --git a/src/mpid/pamid/src/coll/gather/mpido_gather.c b/src/mpid/pamid/src/coll/gather/mpido_gather.c index 117f7ee..75df3ee 100644 --- a/src/mpid/pamid/src/coll/gather/mpido_gather.c +++ b/src/mpid/pamid/src/coll/gather/mpido_gather.c @@ -47,7 +47,7 @@ int MPIDO_Gather_reduce(void * sendbuf, MPID_Comm * comm_ptr, int *mpierrno) { - MPID_Datatype * data_ptr; + MPIDU_Datatype* data_ptr; MPI_Aint true_lb ATTRIBUTE((unused)); const int rank = comm_ptr->rank; const int size = comm_ptr->local_size; @@ -138,7 +138,7 @@ int MPIDO_Gather(const void *sendbuf, return -1; } #endif - MPID_Datatype * data_ptr; + MPIDU_Datatype* data_ptr; MPI_Aint true_lb ATTRIBUTE((unused)); pami_xfer_t gather; MPIDI_Post_coll_t gather_post; @@ -195,8 +195,8 @@ int MPIDO_Gather(const void *sendbuf, if(MPIDI_Process.cuda_aware_support_on) { MPI_Aint sdt_extent,rdt_extent; - MPID_Datatype_get_extent_macro(sendtype, sdt_extent); - MPID_Datatype_get_extent_macro(recvtype, rdt_extent); + MPIDU_Datatype_get_extent_macro(sendtype, sdt_extent); + MPIDU_Datatype_get_extent_macro(recvtype, rdt_extent); char *scbuf = NULL; char *rcbuf = NULL; int is_send_dev_buf = MPIDI_cuda_is_device_buf(sendbuf); @@ -436,7 +436,7 @@ int MPIDO_Gather_simple(const void *sendbuf, return -1; } #endif - MPID_Datatype * data_ptr; + MPIDU_Datatype* data_ptr; MPI_Aint true_lb = 0; pami_xfer_t gather; MPIDI_Post_coll_t gather_post; @@ -445,7 +445,7 @@ int MPIDO_Gather_simple(const void *sendbuf, void *sbuf = NULL, *rbuf = NULL; int send_size = 0; int recv_size = 0; - MPID_Segment segment; + MPIDU_Segment segment; const int rank = comm_ptr->rank; const int size = comm_ptr->local_size; const struct MPIDI_Comm* const mpid = &(comm_ptr->mpid); @@ -494,8 +494,8 @@ int MPIDO_Gather_simple(const void *sendbuf, "Fatal: Cannot allocate pack buffer"); } DLOOP_Offset last = send_size; - MPID_Segment_init(sendbuf, sendcount, sendtype, &segment, 0); - MPID_Segment_pack(&segment, 0, &last, snd_noncontig_buff); + MPIDU_Segment_init(sendbuf, sendcount, sendtype, &segment, 0); + MPIDU_Segment_pack(&segment, 0, &last, snd_noncontig_buff); } } else @@ -547,7 +547,7 @@ int MPIDO_Gather_simple(const void *sendbuf, if(sendbuf == MPI_IN_PLACE) { size_t extent; - MPID_Datatype_get_extent_macro(recvtype,extent); + MPIDU_Datatype_get_extent_macro(recvtype,extent); MPIR_Localcopy(recvbuf + (rank*recvcount*extent), recvcount, recvtype, rcv_noncontig_buff + (rank*recv_size), recv_size,MPI_CHAR); } diff --git a/src/mpid/pamid/src/coll/gatherv/mpido_gatherv.c b/src/mpid/pamid/src/coll/gatherv/mpido_gatherv.c index 7975b83..d675318 100644 --- a/src/mpid/pamid/src/coll/gatherv/mpido_gatherv.c +++ b/src/mpid/pamid/src/coll/gatherv/mpido_gatherv.c @@ -53,7 +53,7 @@ int MPIDO_Gatherv(const void *sendbuf, int i; int contig ATTRIBUTE((unused)), rsize ATTRIBUTE((unused)), ssize ATTRIBUTE((unused)); int pamidt = 1; - MPID_Datatype *dt_ptr = NULL; + MPIDU_Datatype*dt_ptr = NULL; MPI_Aint send_true_lb, recv_true_lb; char *sbuf, *rbuf; pami_type_t stype, rtype; @@ -88,8 +88,8 @@ int MPIDO_Gatherv(const void *sendbuf, if(MPIDI_Process.cuda_aware_support_on) { MPI_Aint sdt_extent,rdt_extent; - MPID_Datatype_get_extent_macro(sendtype, sdt_extent); - MPID_Datatype_get_extent_macro(recvtype, rdt_extent); + MPIDU_Datatype_get_extent_macro(sendtype, sdt_extent); + MPIDU_Datatype_get_extent_macro(recvtype, rdt_extent); char *scbuf = NULL; char *rcbuf = NULL; int is_send_dev_buf = MPIDI_cuda_is_device_buf(sendbuf); @@ -223,7 +223,7 @@ int MPIDO_Gatherv(const void *sendbuf, if(my_md->check_correct.values.rangeminmax) { MPI_Aint data_true_lb; - MPID_Datatype *data_ptr; + MPIDU_Datatype*data_ptr; int data_size, data_contig; MPIDI_Datatype_get_info(sendcount, sendtype, data_contig, data_size, data_ptr, data_true_lb); if((my_md->range_lo <= data_size) && @@ -323,8 +323,8 @@ int MPIDO_Gatherv_simple(const void *sendbuf, int rcvlen = 0; int totalrecvcount = 0; pami_type_t rtype = PAMI_TYPE_NULL; - MPID_Segment segment; - MPID_Datatype *data_ptr = NULL; + MPIDU_Segment segment; + MPIDU_Datatype*data_ptr = NULL; int send_true_lb, recv_true_lb = 0; int i, tmp; volatile unsigned gatherv_active = 1; @@ -378,8 +378,8 @@ int MPIDO_Gatherv_simple(const void *sendbuf, "Fatal: Cannot allocate pack buffer"); } DLOOP_Offset last = send_size; - MPID_Segment_init(sendbuf, sendcount, sendtype, &segment, 0); - MPID_Segment_pack(&segment, 0, &last, snd_noncontig_buff); + MPIDU_Segment_init(sendbuf, sendcount, sendtype, &segment, 0); + MPIDU_Segment_pack(&segment, 0, &last, snd_noncontig_buff); } } else @@ -447,7 +447,7 @@ int MPIDO_Gatherv_simple(const void *sendbuf, if(sendbuf == MPI_IN_PLACE) { size_t extent; - MPID_Datatype_get_extent_macro(recvtype,extent); + MPIDU_Datatype_get_extent_macro(recvtype,extent); MPIR_Localcopy(recvbuf + displs[rank]*extent, recvcounts[rank], recvtype, rcv_noncontig_buff + rdispls[rank], rcounts[rank],MPI_CHAR); } @@ -507,7 +507,7 @@ int MPIDO_Gatherv_simple(const void *sendbuf, else { size_t extent; - MPID_Datatype_get_extent_macro(recvtype,extent); + MPIDU_Datatype_get_extent_macro(recvtype,extent); for(i=0; i<size; ++i) { char* scbuf = (char*)rcv_noncontig_buff+ rdispls[i]; diff --git a/src/mpid/pamid/src/coll/red_scat/mpido_red_scat.c b/src/mpid/pamid/src/coll/red_scat/mpido_red_scat.c index b3fd99d..d4740c6 100644 --- a/src/mpid/pamid/src/coll/red_scat/mpido_red_scat.c +++ b/src/mpid/pamid/src/coll/red_scat/mpido_red_scat.c @@ -48,7 +48,7 @@ int MPIDO_Reduce_scatter(const void *sendbuf, if(MPIDI_Process.cuda_aware_support_on) { MPI_Aint dt_extent; - MPID_Datatype_get_extent_macro(datatype, dt_extent); + MPIDU_Datatype_get_extent_macro(datatype, dt_extent); char *scbuf = NULL; char *rcbuf = NULL; int is_send_dev_buf = MPIDI_cuda_is_device_buf(sendbuf); @@ -127,7 +127,7 @@ int MPIDO_Reduce_scatter_block(const void *sendbuf, if(MPIDI_Process.cuda_aware_support_on) { MPI_Aint dt_extent; - MPID_Datatype_get_extent_macro(datatype, dt_extent); + MPIDU_Datatype_get_extent_macro(datatype, dt_extent); char *scbuf = NULL; char *rcbuf = NULL; int is_send_dev_buf = MPIDI_cuda_is_device_buf(sendbuf); diff --git a/src/mpid/pamid/src/coll/reduce/mpido_reduce.c b/src/mpid/pamid/src/coll/reduce/mpido_reduce.c index e5ff16b..bfea33b 100644 --- a/src/mpid/pamid/src/coll/reduce/mpido_reduce.c +++ b/src/mpid/pamid/src/coll/reduce/mpido_reduce.c @@ -47,7 +47,7 @@ int MPIDO_Reduce(const void *sendbuf, return -1; } #endif - MPID_Datatype *dt_null = NULL; + MPIDU_Datatype*dt_null = NULL; MPI_Aint true_lb = 0; int dt_contig ATTRIBUTE((unused)), tsize; int mu; @@ -121,7 +121,7 @@ int MPIDO_Reduce(const void *sendbuf, if(MPIDI_Process.cuda_aware_support_on) { MPI_Aint dt_extent; - MPID_Datatype_get_extent_macro(datatype, dt_extent); + MPIDU_Datatype_get_extent_macro(datatype, dt_extent); char *scbuf = NULL; char *rcbuf = NULL; int is_send_dev_buf = MPIDI_cuda_is_device_buf(sendbuf); @@ -212,7 +212,7 @@ int MPIDO_Reduce(const void *sendbuf, if(my_md->check_correct.values.rangeminmax) { MPI_Aint data_true_lb ATTRIBUTE((unused)); - MPID_Datatype *data_ptr; + MPIDU_Datatype*data_ptr; int data_size, data_contig ATTRIBUTE((unused)); MPIDI_Datatype_get_info(count, datatype, data_contig, data_size, data_ptr, data_true_lb); if((my_md->range_lo <= data_size) && @@ -306,7 +306,7 @@ int MPIDO_Reduce_simple(const void *sendbuf, return -1; } #endif - MPID_Datatype *dt_null = NULL; + MPIDU_Datatype*dt_null = NULL; MPI_Aint true_lb = 0; int dt_contig, tsize; int mu; diff --git a/src/mpid/pamid/src/coll/scan/mpido_scan.c b/src/mpid/pamid/src/coll/scan/mpido_scan.c index 9c2c29a..37d1fb7 100644 --- a/src/mpid/pamid/src/coll/scan/mpido_scan.c +++ b/src/mpid/pamid/src/coll/scan/mpido_scan.c @@ -103,7 +103,7 @@ int MPIDO_Doscan(const void *sendbuf, void *recvbuf, return -1; } #endif - MPID_Datatype *dt_null = NULL; + MPIDU_Datatype*dt_null = NULL; MPI_Aint true_lb = 0; int dt_contig ATTRIBUTE((unused)), tsize ATTRIBUTE((unused)); int mu; @@ -139,7 +139,7 @@ int MPIDO_Doscan(const void *sendbuf, void *recvbuf, if(MPIDI_Process.cuda_aware_support_on) { MPI_Aint dt_extent; - MPID_Datatype_get_extent_macro(datatype, dt_extent); + MPIDU_Datatype_get_extent_macro(datatype, dt_extent); char *scbuf = NULL; char *rcbuf = NULL; int is_send_dev_buf = MPIDI_cuda_is_device_buf(sendbuf); @@ -242,7 +242,7 @@ int MPIDO_Doscan(const void *sendbuf, void *recvbuf, if(my_md->check_correct.values.rangeminmax) { MPI_Aint data_true_lb ATTRIBUTE((unused)); - MPID_Datatype *data_ptr; + MPIDU_Datatype*data_ptr; int data_size ATTRIBUTE((unused)), data_contig ATTRIBUTE((unused)); MPIDI_Datatype_get_info(count, datatype, data_contig, data_size, data_ptr, data_true_lb); if((my_md->range_lo <= data_size) && @@ -320,7 +320,7 @@ int MPIDO_Doscan_simple(const void *sendbuf, void *recvbuf, return -1; } #endif - MPID_Datatype *dt_null = NULL; + MPIDU_Datatype*dt_null = NULL; MPI_Aint true_lb = 0; int dt_contig, tsize; int mu; diff --git a/src/mpid/pamid/src/coll/scatter/mpido_scatter.c b/src/mpid/pamid/src/coll/scatter/mpido_scatter.c index 8262c51..e8f7ebf 100644 --- a/src/mpid/pamid/src/coll/scatter/mpido_scatter.c +++ b/src/mpid/pamid/src/coll/scatter/mpido_scatter.c @@ -106,7 +106,7 @@ int MPIDO_Scatter(const void *sendbuf, return -1; } #endif - MPID_Datatype * data_ptr; + MPIDU_Datatype* data_ptr; MPI_Aint true_lb ATTRIBUTE((unused)); int contig, nbytes ATTRIBUTE((unused)); const int rank = comm_ptr->rank; @@ -143,8 +143,8 @@ int MPIDO_Scatter(const void *sendbuf, if(MPIDI_Process.cuda_aware_support_on) { MPI_Aint sdt_extent,rdt_extent; - MPID_Datatype_get_extent_macro(sendtype, sdt_extent); - MPID_Datatype_get_extent_macro(recvtype, rdt_extent); + MPIDU_Datatype_get_extent_macro(sendtype, sdt_extent); + MPIDU_Datatype_get_extent_macro(recvtype, rdt_extent); char *scbuf = NULL; char *rcbuf = NULL; int is_send_dev_buf = (rank == root) ? MPIDI_cuda_is_device_buf(sendbuf) : 0; @@ -365,14 +365,14 @@ int MPIDO_Scatter_simple(const void *sendbuf, return -1; } #endif - MPID_Datatype * data_ptr; + MPIDU_Datatype* data_ptr; const int rank = comm_ptr->rank; int success = 1, snd_contig = 1, rcv_contig = 1; void *snd_noncontig_buff = NULL, *rcv_noncontig_buff = NULL; void *sbuf = NULL, *rbuf = NULL; size_t send_size = 0, recv_size = 0, data_size = 0; MPI_Aint snd_true_lb = 0, rcv_true_lb = 0; - MPID_Segment segment; + MPIDU_Segment segment; const struct MPIDI_Comm* const mpid = &(comm_ptr->mpid); const int size = comm_ptr->local_size; advisor_algorithm_t advisor_algorithms[1]; @@ -427,8 +427,8 @@ int MPIDO_Scatter_simple(const void *sendbuf, "Fatal: Cannot allocate pack buffer"); } DLOOP_Offset last = send_size * size; - MPID_Segment_init(sendbuf, sendcount * size, sendtype, &segment, 0); - MPID_Segment_pack(&segment, 0, &last, snd_noncontig_buff); + MPIDU_Segment_init(sendbuf, sendcount * size, sendtype, &segment, 0); + MPIDU_Segment_pack(&segment, 0, &last, snd_noncontig_buff); } } else diff --git a/src/mpid/pamid/src/coll/scatterv/mpido_scatterv.c b/src/mpid/pamid/src/coll/scatterv/mpido_scatterv.c index c479870..958b20c 100644 --- a/src/mpid/pamid/src/coll/scatterv/mpido_scatterv.c +++ b/src/mpid/pamid/src/coll/scatterv/mpido_scatterv.c @@ -226,7 +226,7 @@ int MPIDO_Scatterv(const void *sendbuf, int contig ATTRIBUTE((unused)); int ssize ATTRIBUTE((unused)); int rsize ATTRIBUTE((unused)); - MPID_Datatype *dt_ptr = NULL; + MPIDU_Datatype*dt_ptr = NULL; MPI_Aint send_true_lb=0, recv_true_lb; char *sbuf, *rbuf; pami_type_t stype, rtype; @@ -250,8 +250,8 @@ int MPIDO_Scatterv(const void *sendbuf, if(MPIDI_Process.cuda_aware_support_on) { MPI_Aint sdt_extent,rdt_extent; - MPID_Datatype_get_extent_macro(sendtype, sdt_extent); - MPID_Datatype_get_extent_macro(recvtype, rdt_extent); + MPIDU_Datatype_get_extent_macro(sendtype, sdt_extent); + MPIDU_Datatype_get_extent_macro(recvtype, rdt_extent); char *scbuf = NULL; char *rcbuf = NULL; int is_send_dev_buf = (rank == root) ? MPIDI_cuda_is_device_buf(sendbuf) : 0; @@ -392,7 +392,7 @@ int MPIDO_Scatterv(const void *sendbuf, if(my_md->check_correct.values.rangeminmax) { MPI_Aint data_true_lb; - MPID_Datatype *data_ptr; + MPIDU_Datatype*data_ptr; int data_size, data_contig; MPIDI_Datatype_get_info(recvcount, recvtype, data_contig, data_size, data_ptr, data_true_lb); if((my_md->range_lo <= data_size) && @@ -482,13 +482,13 @@ int MPIDO_Scatterv_simple(const void *sendbuf, int rcv_contig = 1; int send_size = 0, recv_size = 0; int ssize = 0; - MPID_Datatype *dt_ptr = NULL; + MPIDU_Datatype*dt_ptr = NULL; MPI_Aint send_true_lb=0, recv_true_lb=0; void *snd_noncontig_buff = NULL, *rcv_noncontig_buff = NULL; void *sbuf = NULL, *rbuf = NULL; int *sdispls = NULL, *scounts = NULL; int sndcount = 0; - MPID_Segment segment; + MPIDU_Segment segment; int tmp, i; pami_type_t stype = PAMI_TYPE_NULL; const int rank = comm_ptr->rank; @@ -580,8 +580,8 @@ int MPIDO_Scatterv_simple(const void *sendbuf, "Fatal: Cannot allocate pack buffer"); } DLOOP_Offset last = send_size; - MPID_Segment_init(sendbuf, sndcount, sendtype, &segment, 0); - MPID_Segment_pack(&segment, 0, &last, snd_noncontig_buff); + MPIDU_Segment_init(sendbuf, sndcount, sendtype, &segment, 0); + MPIDU_Segment_pack(&segment, 0, &last, snd_noncontig_buff); } } if(recvbuf == MPI_IN_PLACE) diff --git a/src/mpid/pamid/src/mpid_buffer.c b/src/mpid/pamid/src/mpid_buffer.c index 6e21dea..5129d37 100644 --- a/src/mpid/pamid/src/mpid_buffer.c +++ b/src/mpid/pamid/src/mpid_buffer.c @@ -54,8 +54,8 @@ void MPIDI_Buffer_copy( MPI_Aint sdt_true_lb, rdt_true_lb; intptr_t sdata_sz; intptr_t rdata_sz; - MPID_Datatype * sdt_ptr; - MPID_Datatype * rdt_ptr; + MPIDU_Datatype* sdt_ptr; + MPIDU_Datatype* rdt_ptr; MPI_Aint sdt_extent; MPI_Aint rdt_extent; @@ -103,15 +103,15 @@ void MPIDI_Buffer_copy( // 2 - Copy unpacked data into user buffer from temp buffer. if(MPIDI_Process.cuda_aware_support_on && MPIDI_cuda_is_device_buf(rbuf)) { - MPID_Datatype_get_extent_macro(rdt, rdt_extent); + MPIDU_Datatype_get_extent_macro(rdt, rdt_extent); char *buf = MPL_malloc(rdt_extent * rcount); memset(buf, 0, rdt_extent * rcount); - MPID_Segment seg; + MPIDU_Segment seg; DLOOP_Offset last; - MPID_Segment_init(buf, rcount, rdt, &seg, 0); + MPIDU_Segment_init(buf, rcount, rdt, &seg, 0); last = sdata_sz; - MPID_Segment_unpack(&seg, 0, &last, (char*)sbuf + sdt_true_lb); + MPIDU_Segment_unpack(&seg, 0, &last, (char*)sbuf + sdt_true_lb); /* --BEGIN ERROR HANDLING-- */ if (last != sdata_sz) { @@ -131,12 +131,12 @@ void MPIDI_Buffer_copy( } #endif - MPID_Segment seg; + MPIDU_Segment seg; DLOOP_Offset last; - MPID_Segment_init(rbuf, rcount, rdt, &seg, 0); + MPIDU_Segment_init(rbuf, rcount, rdt, &seg, 0); last = sdata_sz; - MPID_Segment_unpack(&seg, 0, &last, (char*)sbuf + sdt_true_lb); + MPIDU_Segment_unpack(&seg, 0, &last, (char*)sbuf + sdt_true_lb); /* --BEGIN ERROR HANDLING-- */ if (last != sdata_sz) { @@ -148,12 +148,12 @@ void MPIDI_Buffer_copy( } else if (rdt_contig) { - MPID_Segment seg; + MPIDU_Segment seg; DLOOP_Offset last; - MPID_Segment_init(sbuf, scount, sdt, &seg, 0); + MPIDU_Segment_init(sbuf, scount, sdt, &seg, 0); last = sdata_sz; - MPID_Segment_pack(&seg, 0, &last, (char*)rbuf + rdt_true_lb); + MPIDU_Segment_pack(&seg, 0, &last, (char*)rbuf + rdt_true_lb); /* --BEGIN ERROR HANDLING-- */ if (last != sdata_sz) { @@ -167,9 +167,9 @@ void MPIDI_Buffer_copy( { char * buf; intptr_t buf_off; - MPID_Segment sseg; + MPIDU_Segment sseg; intptr_t sfirst; - MPID_Segment rseg; + MPIDU_Segment rseg; intptr_t rfirst; buf = MPL_malloc(MPIDI_COPY_BUFFER_SZ); @@ -183,8 +183,8 @@ void MPIDI_Buffer_copy( } /* --END ERROR HANDLING-- */ - MPID_Segment_init(sbuf, scount, sdt, &sseg, 0); - MPID_Segment_init(rbuf, rcount, rdt, &rseg, 0); + MPIDU_Segment_init(sbuf, scount, sdt, &sseg, 0); + MPIDU_Segment_init(rbuf, rcount, rdt, &rseg, 0); sfirst = 0; rfirst = 0; @@ -204,7 +204,7 @@ void MPIDI_Buffer_copy( last = sdata_sz; } - MPID_Segment_pack(&sseg, sfirst, &last, buf + buf_off); + MPIDU_Segment_pack(&sseg, sfirst, &last, buf + buf_off); /* --BEGIN ERROR HANDLING-- */ MPID_assert(last > sfirst); /* --END ERROR HANDLING-- */ @@ -212,7 +212,7 @@ void MPIDI_Buffer_copy( buf_end = buf + buf_off + (last - sfirst); sfirst = last; - MPID_Segment_unpack(&rseg, rfirst, &last, buf); + MPIDU_Segment_unpack(&rseg, rfirst, &last, buf); /* --BEGIN ERROR HANDLING-- */ MPID_assert(last > rfirst); /* --END ERROR HANDLING-- */ diff --git a/src/mpid/pamid/src/mpid_imrecv.c b/src/mpid/pamid/src/mpid_imrecv.c index 7bbb7ab..9fda5ad 100644 --- a/src/mpid/pamid/src/mpid_imrecv.c +++ b/src/mpid/pamid/src/mpid_imrecv.c @@ -47,7 +47,7 @@ int MPID_Imrecv(void *buf, int count, MPI_Datatype datatype, #ifdef MPIDI_TRACE { size_t ll; - ll = count * MPID_Datatype_get_basic_size(datatype); + ll = count * MPIDU_Datatype_get_basic_size(datatype); /*MPIDI_SET_PR_REC(rreq,buf,count,ll,datatype,pami_source,rank,tag,comm,is_blocking); */ } #endif diff --git a/src/mpid/pamid/src/mpid_request.h b/src/mpid/pamid/src/mpid_request.h index f25ae00..4b16b96 100644 --- a/src/mpid/pamid/src/mpid_request.h +++ b/src/mpid/pamid/src/mpid_request.h @@ -282,7 +282,7 @@ MPID_Request_release_inline(MPID_Request *req) if (req->comm) MPIR_Comm_release(req->comm, 0); if (req->greq_fns) MPL_free(req->greq_fns); - if (req->mpid.datatype_ptr) MPID_Datatype_release(req->mpid.datatype_ptr); + if (req->mpid.datatype_ptr) MPIDU_Datatype_release(req->mpid.datatype_ptr); if (req->mpid.uebuf_malloc== mpiuMalloc) { MPL_free(req->mpid.uebuf); } diff --git a/src/mpid/pamid/src/mpidi_pami_datatype.c b/src/mpid/pamid/src/mpidi_pami_datatype.c index 395f613..0296dd6 100644 --- a/src/mpid/pamid/src/mpidi_pami_datatype.c +++ b/src/mpid/pamid/src/mpidi_pami_datatype.c @@ -38,8 +38,8 @@ void MPIDI_PAMI_datatype_commit_hook (MPI_Datatype *ptr) */ if (MPIDI_Process.typed_onesided == 1) { - MPID_Datatype *datatype_ptr; - MPID_Datatype_get_ptr(*ptr, datatype_ptr); + MPIDU_Datatype*datatype_ptr; + MPIDU_Datatype_get_ptr(*ptr, datatype_ptr); pami_result_t pami_dtop_result; datatype_ptr->device_datatype = (pami_type_t *) MPL_malloc(sizeof(pami_type_t)); @@ -83,10 +83,10 @@ void MPIDI_PAMI_datatype_commit_hook (MPI_Datatype *ptr) * \brief Destroy PAMI datatype representation of MPI Datatype. * */ -void MPIDI_PAMI_datatype_destroy_hook (MPID_Datatype *ptr) +void MPIDI_PAMI_datatype_destroy_hook (MPIDU_Datatype*ptr) { /* If a PAMI datatype was created, destroy it if this is the - * last reference to the MPID_Datatype ptr. + * last reference to the MPIDU_Datatypeptr. */ if ((MPIDI_Process.typed_onesided == 1) && (ptr->is_committed)) { if (ptr->device_datatype) { @@ -113,8 +113,8 @@ void MPIDI_PAMI_datatype_dup_hook (MPI_Datatype *ptr) */ if (MPIDI_Process.typed_onesided == 1) { - MPID_Datatype *datatype_ptr; - MPID_Datatype_get_ptr(*ptr, datatype_ptr); + MPIDU_Datatype*datatype_ptr; + MPIDU_Datatype_get_ptr(*ptr, datatype_ptr); pami_result_t pami_dtop_result; datatype_ptr->device_datatype = (pami_type_t *) MPL_malloc(sizeof(pami_type_t)); diff --git a/src/mpid/pamid/src/onesided/mpid_1s.c b/src/mpid/pamid/src/onesided/mpid_1s.c index 7d3db88..65131f6 100644 --- a/src/mpid/pamid/src/onesided/mpid_1s.c +++ b/src/mpid/pamid/src/onesided/mpid_1s.c @@ -43,7 +43,7 @@ MPIDI_Win_DoneCB(pami_context_t context, req->origin.count, req->origin.datatype); MPID_assert(mpi_errno == MPI_SUCCESS); - MPID_Datatype_release(req->origin.dt.pointer); + MPIDU_Datatype_release(req->origin.dt.pointer); MPL_free(req->buffer); MPL_free(req->user_buffer); req->buffer_free = 0; @@ -84,12 +84,12 @@ MPIDI_Win_DoneCB(pami_context_t context, } if ((MPIDI_Process.typed_onesided == 1) && (!req->target.dt.contig || !req->origin.dt.contig)) { /* We used the PAMI_Rput/Rget_typed call and added a ref so any MPI_Type_free before the context - * executes the put/get would not free the MPID_Datatype, which would also free the associated PAMI datatype + * executes the put/get would not free the MPIDU_Datatype, which would also free the associated PAMI datatype * which was still needed for communication -- that communication has completed, so now release the ref - * in the callback to allow the MPID_Datatype to be freed. + * in the callback to allow the MPIDU_Datatypeto be freed. */ - MPID_Datatype_release(req->origin.dt.pointer); - MPID_Datatype_release(req->target.dt.pointer); + MPIDU_Datatype_release(req->origin.dt.pointer); + MPIDU_Datatype_release(req->target.dt.pointer); } MPIDI_Progress_signal(); } @@ -129,9 +129,9 @@ MPIDI_Win_datatype_map(MPIDI_Datatype * dt) MPID_assert(dt->map != NULL); DLOOP_Offset last = dt->pointer->size*dt->count; - MPID_Segment seg; - MPID_Segment_init(NULL, dt->count, dt->type, &seg, 0); - MPID_Segment_pack_vector(&seg, 0, &last, dt->map, &dt->num_contig); + MPIDU_Segment seg; + MPIDU_Segment_init(NULL, dt->count, dt->type, &seg, 0); + MPIDU_Segment_pack_vector(&seg, 0, &last, dt->map, &dt->num_contig); MPID_assert((unsigned)dt->num_contig <= map_size); #ifdef TRACE_ON TRACE_ERR("dt->pointer->size=%d num_contig: orig=%u new=%d\n", dt->pointer->size, map_size, dt->num_contig); diff --git a/src/mpid/pamid/src/onesided/mpid_win_accumulate.c b/src/mpid/pamid/src/onesided/mpid_win_accumulate.c index 39ecead..30170ca 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_accumulate.c +++ b/src/mpid/pamid/src/onesided/mpid_win_accumulate.c @@ -302,7 +302,7 @@ MPID_Accumulate(const void *origin_addr, disp_unit = win->mpid.info[target_rank].disp_unit; dest_addr = (char *) base + disp_unit * target_disp; - MPID_Datatype_get_size_macro(origin_datatype, len); + MPIDU_Datatype_get_size_macro(origin_datatype, len); uop = MPIR_OP_HDL_TO_FN(op); one = 1; @@ -317,8 +317,8 @@ MPID_Accumulate(const void *origin_addr, { win->mpid.sync.total += req->target.dt.num_contig; MPI_Datatype basic_type = MPI_DATATYPE_NULL; - MPID_Datatype_get_basic_type(origin_datatype, basic_type); - /* MPID_Datatype_get_basic_type() doesn't handle the struct types */ + MPIDU_Datatype_get_basic_type(origin_datatype, basic_type); + /* MPIDU_Datatype_get_basic_type() doesn't handle the struct types */ if ((origin_datatype == MPI_FLOAT_INT) || (origin_datatype == MPI_DOUBLE_INT) || (origin_datatype == MPI_LONG_INT) || diff --git a/src/mpid/pamid/src/onesided/mpid_win_compare_and_swap.c b/src/mpid/pamid/src/onesided/mpid_win_compare_and_swap.c index f20410e..3e06145 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_compare_and_swap.c +++ b/src/mpid/pamid/src/onesided/mpid_win_compare_and_swap.c @@ -129,7 +129,7 @@ int MPID_Compare_and_swap(const void *origin_addr, const void *compare_addr, win->mpid.sync.total += 1; MPI_Datatype basic_type = MPI_DATATYPE_NULL; - MPID_Datatype_get_basic_type(datatype, basic_type); + MPIDU_Datatype_get_basic_type(datatype, basic_type); MPID_assert(basic_type != MPI_DATATYPE_NULL); req->origin.datatype=basic_type; diff --git a/src/mpid/pamid/src/onesided/mpid_win_fetch_and_op.c b/src/mpid/pamid/src/onesided/mpid_win_fetch_and_op.c index 5cf1508..07a5dfb 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_fetch_and_op.c +++ b/src/mpid/pamid/src/onesided/mpid_win_fetch_and_op.c @@ -66,7 +66,7 @@ MPIDI_WinAtomicCB(pami_context_t context, void *dest_addr = ahdr->remote_addr; int len; - len = MPID_Datatype_get_basic_size (ahdr->datatype); + len = MPIDU_Datatype_get_basic_size (ahdr->datatype); if (ahdr->atomic_type == MPIDI_WIN_REQUEST_COMPARE_AND_SWAP) { @@ -125,7 +125,7 @@ MPIDI_WinAtomicAckCB(pami_context_t context, MPIDI_AtomicHeader_t *ahdr = (MPIDI_AtomicHeader_t *) _hdr; //We have a valid result addr if (ahdr->result_addr != NULL) { - len = MPID_Datatype_get_basic_size (ahdr->datatype); + len = MPIDU_Datatype_get_basic_size (ahdr->datatype); MPIU_Memcpy(ahdr->result_addr, ahdr->buf, len); } @@ -142,7 +142,7 @@ MPIDI_Atomic (pami_context_t context, MPIDI_AtomicHeader_t atomic_hdr; int len; - len = MPID_Datatype_get_basic_size (req->origin.datatype); + len = MPIDU_Datatype_get_basic_size (req->origin.datatype); assert(len <= MAX_ATOMIC_TYPE_SIZE); if (req->buffer) MPIU_Memcpy(atomic_hdr.buf, req->buffer, len); @@ -211,7 +211,7 @@ int MPID_Fetch_and_op(const void *origin_addr, void *result_addr, return MPI_SUCCESS; MPI_Datatype basic_type = MPI_DATATYPE_NULL; - MPID_Datatype_get_basic_type(datatype, basic_type); + MPIDU_Datatype_get_basic_type(datatype, basic_type); if ((datatype == MPI_FLOAT_INT) || (datatype == MPI_DOUBLE_INT) || (datatype == MPI_LONG_INT) || diff --git a/src/mpid/pamid/src/onesided/mpid_win_get.c b/src/mpid/pamid/src/onesided/mpid_win_get.c index 835888c..04ffbd3 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_get.c +++ b/src/mpid/pamid/src/onesided/mpid_win_get.c @@ -345,7 +345,7 @@ MPID_Get(void *origin_addr, req->buffer = MPL_malloc(req->origin.dt.size); MPID_assert(req->buffer != NULL); - MPID_Datatype_add_ref(req->origin.dt.pointer); + MPIDU_Datatype_add_ref(req->origin.dt.pointer); req->origin.addr = origin_addr; req->origin.count = origin_count; req->origin.datatype = origin_datatype; @@ -408,12 +408,12 @@ MPID_Get(void *origin_addr, if ((MPIDI_Process.typed_onesided == 1) && (!req->target.dt.contig || !req->origin.dt.contig)) { /* We will use the PAMI_Rget_typed call so we need to make sure any MPI_Type_free before the context - * executes the get does not free the MPID_Datatype, which would also free the associated PAMI datatype which + * executes the get does not free the MPIDU_Datatype, which would also free the associated PAMI datatype which * is still needed for communication -- decrement the ref in the callback to allow the MPID_Datatype * to be freed once the PAMI communication has completed. */ - MPID_Datatype_add_ref(req->origin.dt.pointer); - MPID_Datatype_add_ref(req->target.dt.pointer); + MPIDU_Datatype_add_ref(req->origin.dt.pointer); + MPIDU_Datatype_add_ref(req->target.dt.pointer); } /* The pamid one-sided design requires context post in order to handle the * case where the number of pending rma operation exceeds the diff --git a/src/mpid/pamid/src/onesided/mpid_win_get_accumulate.c b/src/mpid/pamid/src/onesided/mpid_win_get_accumulate.c index 07b402f..415567a 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_get_accumulate.c +++ b/src/mpid/pamid/src/onesided/mpid_win_get_accumulate.c @@ -44,7 +44,7 @@ MPIDI_Fetch_data_op(const void * origin_addr, disp_unit = win->mpid.info[target_rank].disp_unit; dest_addr = (char *) base + disp_unit * target_disp; - MPID_Datatype_get_size_macro(origin_datatype, len); + MPIDU_Datatype_get_size_macro(origin_datatype, len); MPIU_Memcpy(result_addr, dest_addr, len); if (op != MPI_NO_OP) { uop = MPIR_OP_HDL_TO_FN(op); @@ -535,8 +535,8 @@ MPID_Get_accumulate(const void * origin_addr, win->mpid.sync.total += (1 + req->target.dt.num_contig); { MPI_Datatype basic_type = MPI_DATATYPE_NULL; - MPID_Datatype_get_basic_type(origin_datatype, basic_type); - /* MPID_Datatype_get_basic_type() doesn't handle the struct types */ + MPIDU_Datatype_get_basic_type(origin_datatype, basic_type); + /* MPIDU_Datatype_get_basic_type() doesn't handle the struct types */ if ((origin_datatype == MPI_FLOAT_INT) || (origin_datatype == MPI_DOUBLE_INT) || (origin_datatype == MPI_LONG_INT) || diff --git a/src/mpid/pamid/src/onesided/mpid_win_put.c b/src/mpid/pamid/src/onesided/mpid_win_put.c index 2d7b8e3..c049b28 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_put.c +++ b/src/mpid/pamid/src/onesided/mpid_win_put.c @@ -408,12 +408,12 @@ MPID_Put(const void *origin_addr, } if ((MPIDI_Process.typed_onesided == 1) && (!req->target.dt.contig || !req->origin.dt.contig)) { /* We will use the PAMI_Rput_typed call so we need to make sure any MPI_Type_free before the context - * executes the put does not free the MPID_Datatype, which would also free the associated PAMI datatype which + * executes the put does not free the MPIDU_Datatype, which would also free the associated PAMI datatype which * is still needed for communication -- decrement the ref in the callback to allow the MPID_Datatype * to be freed once the PAMI communication has completed. */ - MPID_Datatype_add_ref(req->origin.dt.pointer); - MPID_Datatype_add_ref(req->target.dt.pointer); + MPIDU_Datatype_add_ref(req->origin.dt.pointer); + MPIDU_Datatype_add_ref(req->target.dt.pointer); } /* The pamid one-sided design requires context post in order to handle the * case where the number of pending rma operation exceeds the diff --git a/src/mpid/pamid/src/onesided/mpidi_onesided.h b/src/mpid/pamid/src/onesided/mpidi_onesided.h index e669d31..c00136e 100644 --- a/src/mpid/pamid/src/onesided/mpidi_onesided.h +++ b/src/mpid/pamid/src/onesided/mpidi_onesided.h @@ -183,7 +183,7 @@ typedef struct MPIDI_WinLock_info typedef struct { - MPID_Datatype * pointer; + MPIDU_Datatype* pointer; MPI_Datatype type; int count; int contig; diff --git a/src/mpid/pamid/src/pt2pt/mpidi_callback_eager.c b/src/mpid/pamid/src/pt2pt/mpidi_callback_eager.c index e5f0fc4..583474f 100644 --- a/src/mpid/pamid/src/pt2pt/mpidi_callback_eager.c +++ b/src/mpid/pamid/src/pt2pt/mpidi_callback_eager.c @@ -224,7 +224,7 @@ MPIDI_RecvCB(pami_context_t context, /* Calculate message length for reception. */ /* ----------------------------------------- */ unsigned dt_contig, dt_size; - MPID_Datatype *dt_ptr; + MPIDU_Datatype*dt_ptr; MPI_Aint dt_true_lb; MPIDI_Datatype_get_info(rreq->mpid.userbufcount, rreq->mpid.datatype, diff --git a/src/mpid/pamid/src/pt2pt/mpidi_callback_short.c b/src/mpid/pamid/src/pt2pt/mpidi_callback_short.c index 946a9cd..3f9914a 100644 --- a/src/mpid/pamid/src/pt2pt/mpidi_callback_short.c +++ b/src/mpid/pamid/src/pt2pt/mpidi_callback_short.c @@ -175,7 +175,7 @@ MPIDI_RecvShortCB(pami_context_t context, goto fn_exit_short; } - size_t dt_size = rreq->mpid.userbufcount * MPID_Datatype_get_basic_size(rreq->mpid.datatype); + size_t dt_size = rreq->mpid.userbufcount * MPIDU_Datatype_get_basic_size(rreq->mpid.datatype); /* ----------------------------- */ /* Test for truncated message. */ diff --git a/src/mpid/pamid/src/pt2pt/mpidi_callback_util.c b/src/mpid/pamid/src/pt2pt/mpidi_callback_util.c index 8a439aa..834e93a 100644 --- a/src/mpid/pamid/src/pt2pt/mpidi_callback_util.c +++ b/src/mpid/pamid/src/pt2pt/mpidi_callback_util.c @@ -144,7 +144,7 @@ MPIDI_Callback_process_userdefined_dt(pami_context_t context, MPID_Request * rreq) { unsigned dt_contig, dt_size; - MPID_Datatype *dt_ptr; + MPIDU_Datatype*dt_ptr; MPI_Aint dt_true_lb; MPIDI_Datatype_get_info(rreq->mpid.userbufcount, rreq->mpid.datatype, diff --git a/src/mpid/pamid/src/pt2pt/mpidi_done.c b/src/mpid/pamid/src/pt2pt/mpidi_done.c index 91ad3de..edb6d3e 100644 --- a/src/mpid/pamid/src/pt2pt/mpidi_done.c +++ b/src/mpid/pamid/src/pt2pt/mpidi_done.c @@ -182,7 +182,7 @@ void MPIDI_Recvq_process_out_of_order_msgs(pami_task_t src, pami_context_t conte /* Calculate message length for reception. */ /* ----------------------------------------- */ unsigned dt_contig, dt_size; - MPID_Datatype *dt_ptr; + MPIDU_Datatype*dt_ptr; MPI_Aint dt_true_lb; MPIDI_Datatype_get_info(rreq->mpid.userbufcount, rreq->mpid.datatype, @@ -206,8 +206,8 @@ void MPIDI_Recvq_process_out_of_order_msgs(pami_task_t src, pami_context_t conte ooreq->mpid.datatype = rreq->mpid.datatype; if (HANDLE_GET_KIND(ooreq->mpid.datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype_get_ptr(ooreq->mpid.datatype, ooreq->mpid.datatype_ptr); - MPID_Datatype_add_ref(ooreq->mpid.datatype_ptr); + MPIDU_Datatype_get_ptr(ooreq->mpid.datatype, ooreq->mpid.datatype_ptr); + MPIDU_Datatype_add_ref(ooreq->mpid.datatype_ptr); } #ifdef QUEUE_BINARY_SEARCH_SUPPORT if(MPIDI_Process.queue_binary_search_support_on) diff --git a/src/mpid/pamid/src/pt2pt/mpidi_recv.h b/src/mpid/pamid/src/pt2pt/mpidi_recv.h index f63cd87..7b518fd 100644 --- a/src/mpid/pamid/src/pt2pt/mpidi_recv.h +++ b/src/mpid/pamid/src/pt2pt/mpidi_recv.h @@ -234,8 +234,8 @@ MPIDI_Recv(void * buf, /* ----------------------------------------------------------- */ if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype_get_ptr(datatype, rreq->mpid.datatype_ptr); - MPID_Datatype_add_ref(rreq->mpid.datatype_ptr); + MPIDU_Datatype_get_ptr(datatype, rreq->mpid.datatype_ptr); + MPIDU_Datatype_add_ref(rreq->mpid.datatype_ptr); } MPIU_THREAD_CS_EXIT(MSGQUEUE,0); } diff --git a/src/mpid/pamid/src/pt2pt/mpidi_recvmsg.c b/src/mpid/pamid/src/pt2pt/mpidi_recvmsg.c index 05543bb..c565305 100644 --- a/src/mpid/pamid/src/pt2pt/mpidi_recvmsg.c +++ b/src/mpid/pamid/src/pt2pt/mpidi_recvmsg.c @@ -49,8 +49,8 @@ MPIDI_RecvMsg_Unexp(MPID_Request * rreq, /* -------------------------------------------------------- */ if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype_get_ptr(datatype, rreq->mpid.datatype_ptr); - MPID_Datatype_add_ref(rreq->mpid.datatype_ptr); + MPIDU_Datatype_get_ptr(datatype, rreq->mpid.datatype_ptr); + MPIDU_Datatype_add_ref(rreq->mpid.datatype_ptr); } if (likely((is_sync+is_zero) == 0)) @@ -127,8 +127,8 @@ MPIDI_RecvMsg_Unexp(MPID_Request * rreq, } if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype_get_ptr(datatype, rreq->mpid.datatype_ptr); - MPID_Datatype_add_ref(rreq->mpid.datatype_ptr); + MPIDU_Datatype_get_ptr(datatype, rreq->mpid.datatype_ptr); + MPIDU_Datatype_add_ref(rreq->mpid.datatype_ptr); } } } diff --git a/src/mpid/pamid/src/pt2pt/mpidi_rendezvous.c b/src/mpid/pamid/src/pt2pt/mpidi_rendezvous.c index cf3e65e..f8c77ad 100644 --- a/src/mpid/pamid/src/pt2pt/mpidi_rendezvous.c +++ b/src/mpid/pamid/src/pt2pt/mpidi_rendezvous.c @@ -51,7 +51,7 @@ MPIDI_RendezvousTransfer(pami_context_t context, /* -------------------------------------- */ unsigned dt_contig; size_t dt_size; - MPID_Datatype *dt_ptr; + MPIDU_Datatype*dt_ptr; MPI_Aint dt_true_lb; MPIDI_Datatype_get_info(rreq->mpid.userbufcount, rreq->mpid.datatype, diff --git a/src/mpid/pamid/src/pt2pt/mpidi_sendmsg.c b/src/mpid/pamid/src/pt2pt/mpidi_sendmsg.c index c9263fc..71f5ec5 100644 --- a/src/mpid/pamid/src/pt2pt/mpidi_sendmsg.c +++ b/src/mpid/pamid/src/pt2pt/mpidi_sendmsg.c @@ -316,7 +316,7 @@ MPIDI_SendMsg_process_userdefined_dt(MPID_Request * sreq, size_t data_sz; int dt_contig; MPI_Aint dt_true_lb; - MPID_Datatype * dt_ptr; + MPIDU_Datatype* dt_ptr; void * sndbuf; /* @@ -354,7 +354,7 @@ MPIDI_SendMsg_process_userdefined_dt(MPID_Request * sreq, if(MPIDI_Process.cuda_aware_support_on && on_device) { MPI_Aint dt_extent; - MPID_Datatype_get_extent_macro(sreq->mpid.datatype, dt_extent); + MPIDU_Datatype_get_extent_macro(sreq->mpid.datatype, dt_extent); buf = MPL_malloc(dt_extent * sreq->mpid.userbufcount); cudaError_t cudaerr = CudaMemcpy(buf, sreq->mpid.userbuf, dt_extent * sreq->mpid.userbufcount, cudaMemcpyDeviceToHost); @@ -365,7 +365,7 @@ MPIDI_SendMsg_process_userdefined_dt(MPID_Request * sreq, } #endif - MPID_Segment segment; + MPIDU_Segment segment; if(data_sz != 0) { sreq->mpid.uebuf = sndbuf = MPL_malloc(data_sz); @@ -387,12 +387,12 @@ MPIDI_SendMsg_process_userdefined_dt(MPID_Request * sreq, #endif MPID_assert(buf != NULL); - MPID_Segment_init(buf, + MPIDU_Segment_init(buf, sreq->mpid.userbufcount, sreq->mpid.datatype, &segment, 0); - MPID_Segment_pack(&segment, 0, &last, sndbuf); + MPIDU_Segment_pack(&segment, 0, &last, sndbuf); MPID_assert(last == data_sz); #if CUDA_AWARE_SUPPORT if(MPIDI_Process.cuda_aware_support_on && on_device) @@ -458,7 +458,7 @@ if (!TOKEN_FLOW_CONTROL_ON) { if (likely(HANDLE_GET_KIND(sreq->mpid.datatype) == HANDLE_KIND_BUILTIN)) { sndbuf = sreq->mpid.userbuf; - data_sz = sreq->mpid.userbufcount * MPID_Datatype_get_basic_size(sreq->mpid.datatype); + data_sz = sreq->mpid.userbufcount * MPIDU_Datatype_get_basic_size(sreq->mpid.datatype); } else { @@ -561,7 +561,7 @@ if (!TOKEN_FLOW_CONTROL_ON) { if (likely(HANDLE_GET_KIND(sreq->mpid.datatype) == HANDLE_KIND_BUILTIN)) { sndbuf = sreq->mpid.userbuf; - data_sz = sreq->mpid.userbufcount * MPID_Datatype_get_basic_size(sreq->mpid.datatype); + data_sz = sreq->mpid.userbufcount * MPIDU_Datatype_get_basic_size(sreq->mpid.datatype); } else { diff --git a/src/mpid/pamid/src/pt2pt/persistent/mpid_recv_init.c b/src/mpid/pamid/src/pt2pt/persistent/mpid_recv_init.c index e3acd41..46c8c91 100644 --- a/src/mpid/pamid/src/pt2pt/persistent/mpid_recv_init.c +++ b/src/mpid/pamid/src/pt2pt/persistent/mpid_recv_init.c @@ -48,8 +48,8 @@ int MPID_Recv_init(void * buf, MPIDI_Request_setPType(rreq, MPIDI_REQUEST_PTYPE_RECV); if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype_get_ptr(datatype, rreq->mpid.datatype_ptr); - MPID_Datatype_add_ref(rreq->mpid.datatype_ptr); + MPIDU_Datatype_get_ptr(datatype, rreq->mpid.datatype_ptr); + MPIDU_Datatype_add_ref(rreq->mpid.datatype_ptr); } return MPI_SUCCESS; diff --git a/src/mpid/pamid/src/pt2pt/persistent/mpid_send_init.c b/src/mpid/pamid/src/pt2pt/persistent/mpid_send_init.c index 5bf50f2..f07e116 100644 --- a/src/mpid/pamid/src/pt2pt/persistent/mpid_send_init.c +++ b/src/mpid/pamid/src/pt2pt/persistent/mpid_send_init.c @@ -53,8 +53,8 @@ MPID_PSendRequest(const void * buf, if (HANDLE_GET_KIND(datatype) != HANDLE_KIND_BUILTIN) { - MPID_Datatype_get_ptr(datatype, sreq->mpid.datatype_ptr); - MPID_Datatype_add_ref(sreq->mpid.datatype_ptr); + MPIDU_Datatype_get_ptr(datatype, sreq->mpid.datatype_ptr); + MPIDU_Datatype_add_ref(sreq->mpid.datatype_ptr); } return MPI_SUCCESS; http://git.mpich.org/mpich.git/commitdiff/40bdb8429f3dc61c2849fe1ac93e31034… commit 40bdb8429f3dc61c2849fe1ac93e3103483d7735 Author: Yanfei Guo <yguo(a)anl.gov> Date: Thu Dec 17 09:44:26 2015 -0600 mpid/common/datatype: remove unused function prototype The MPIR_Type_get_contig_blocks is not used anywhere in the code. Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/mpid/common/datatype/mpid_datatype.h b/src/mpid/common/datatype/mpid_datatype.h index 073fd32..4761f67 100644 --- a/src/mpid/common/datatype/mpid_datatype.h +++ b/src/mpid/common/datatype/mpid_datatype.h @@ -720,9 +720,6 @@ void MPID_Datatype_free(struct MPID_Datatype *ptr); void MPID_Dataloop_update(struct DLOOP_Dataloop *dataloop, MPI_Aint ptrdiff); -MPI_Count MPIR_Type_get_contig_blocks(MPI_Datatype type, - MPI_Count *nr_blocks_p); - int MPIR_Type_flatten(MPI_Datatype type, MPI_Aint *off_array, DLOOP_Size *size_array, ----------------------------------------------------------------------- Summary of changes: .gitignore | 4 +- configure.ac | 8 +- .../ch3/channels/nemesis/include/mpid_nem_inline.h | 14 +- .../ch3/channels/nemesis/include/mpid_nem_post.h | 4 +- .../ch3/channels/nemesis/netmod/llc/llc_poll.c | 4 +- .../ch3/channels/nemesis/netmod/llc/llc_send.c | 26 +- .../ch3/channels/nemesis/netmod/mxm/mxm_poll.c | 22 +- .../ch3/channels/nemesis/netmod/mxm/mxm_send.c | 72 +- src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_msg.c | 2 +- .../nemesis/netmod/ofi/ofi_tagged_template.c | 2 +- .../ch3/channels/nemesis/netmod/portals4/ptl_nm.c | 4 +- .../channels/nemesis/netmod/portals4/ptl_recv.c | 52 +- .../channels/nemesis/netmod/portals4/ptl_send.c | 26 +- src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt.c | 2 +- .../ch3/channels/nemesis/src/mpid_nem_lmt_dma.c | 16 +- .../ch3/channels/nemesis/src/mpid_nem_lmt_shm.c | 12 +- .../channels/nemesis/src/mpid_nem_lmt_vmsplice.c | 8 +- src/mpid/ch3/include/mpid_rma_issue.h | 76 +- src/mpid/ch3/include/mpid_rma_shm.h | 52 +- src/mpid/ch3/include/mpidimpl.h | 6 +- src/mpid/ch3/include/mpidpost.h | 2 +- src/mpid/ch3/include/mpidpre.h | 8 +- src/mpid/ch3/include/mpidrma.h | 22 +- src/mpid/ch3/src/ch3u_buffer.c | 28 +- src/mpid/ch3/src/ch3u_eager.c | 16 +- src/mpid/ch3/src/ch3u_eagersync.c | 6 +- src/mpid/ch3/src/ch3u_handle_recv_pkt.c | 18 +- src/mpid/ch3/src/ch3u_handle_recv_req.c | 138 ++-- src/mpid/ch3/src/ch3u_request.c | 20 +- src/mpid/ch3/src/ch3u_rma_ops.c | 92 ++-- src/mpid/ch3/src/ch3u_rma_pkthandler.c | 46 +- src/mpid/ch3/src/ch3u_rma_reqops.c | 8 +- src/mpid/ch3/src/ch3u_rndv.c | 8 +- src/mpid/ch3/src/mpid_imrecv.c | 8 +- src/mpid/ch3/src/mpid_irecv.c | 12 +- src/mpid/ch3/src/mpid_irsend.c | 6 +- src/mpid/ch3/src/mpid_isend.c | 6 +- src/mpid/ch3/src/mpid_issend.c | 6 +- src/mpid/ch3/src/mpid_recv.c | 12 +- src/mpid/ch3/src/mpid_rsend.c | 2 +- src/mpid/ch3/src/mpid_send.c | 2 +- src/mpid/ch3/src/mpid_ssend.c | 2 +- src/mpid/ch3/src/mpid_startall.c | 20 +- src/mpid/ch3/src/mpidi_isend_self.c | 6 +- src/mpid/common/datatype/Makefile.mk | 47 +- src/mpid/common/datatype/dataloop/dataloop.c | 4 +- src/mpid/common/datatype/dataloop/dataloop.h | 2 +- src/mpid/common/datatype/dataloop/dataloop_parts.h | 2 +- .../common/datatype/dataloop/segment_flatten.c | 4 +- .../common/datatype/dataloop/segment_packunpack.c | 4 +- src/mpid/common/datatype/mpid_contents_support.c | 67 -- src/mpid/common/datatype/mpid_dataloop.h | 115 --- src/mpid/common/datatype/mpid_datatype.h | 760 -------------------- src/mpid/common/datatype/mpid_datatype_contents.c | 237 ------ src/mpid/common/datatype/mpid_datatype_fallback.h | 75 ++ src/mpid/common/datatype/mpid_datatype_free.c | 59 -- src/mpid/common/datatype/mpid_ext32_datatype.c | 118 --- src/mpid/common/datatype/mpid_ext32_segment.c | 353 --------- src/mpid/common/datatype/mpid_ext32_segment.h | 417 ----------- src/mpid/common/datatype/mpid_segment.c | 528 -------------- src/mpid/common/datatype/mpid_type_blockindexed.c | 194 ----- src/mpid/common/datatype/mpid_type_commit.c | 72 -- src/mpid/common/datatype/mpid_type_contiguous.c | 138 ---- .../common/datatype/mpid_type_create_pairtype.c | 225 ------ .../common/datatype/mpid_type_create_resized.c | 113 --- src/mpid/common/datatype/mpid_type_debug.c | 670 ----------------- src/mpid/common/datatype/mpid_type_dup.c | 111 --- src/mpid/common/datatype/mpid_type_get_contents.c | 91 --- src/mpid/common/datatype/mpid_type_get_envelope.c | 56 -- src/mpid/common/datatype/mpid_type_indexed.c | 238 ------ src/mpid/common/datatype/mpid_type_struct.c | 439 ----------- src/mpid/common/datatype/mpid_type_vector.c | 166 ----- src/mpid/common/datatype/mpid_type_zerolen.c | 78 -- src/mpid/common/datatype/mpidu_contents_support.c | 68 ++ src/mpid/common/datatype/mpidu_dataloop.h | 115 +++ src/mpid/common/datatype/mpidu_datatype.h | 757 +++++++++++++++++++ src/mpid/common/datatype/mpidu_datatype_contents.c | 237 ++++++ src/mpid/common/datatype/mpidu_datatype_free.c | 59 ++ src/mpid/common/datatype/mpidu_ext32_datatype.c | 118 +++ src/mpid/common/datatype/mpidu_ext32_segment.c | 353 +++++++++ src/mpid/common/datatype/mpidu_ext32_segment.h | 417 +++++++++++ src/mpid/common/datatype/mpidu_segment.c | 528 ++++++++++++++ src/mpid/common/datatype/mpidu_type_blockindexed.c | 194 +++++ src/mpid/common/datatype/mpidu_type_commit.c | 72 ++ src/mpid/common/datatype/mpidu_type_contiguous.c | 138 ++++ .../common/datatype/mpidu_type_create_pairtype.c | 225 ++++++ .../common/datatype/mpidu_type_create_resized.c | 113 +++ src/mpid/common/datatype/mpidu_type_debug.c | 670 +++++++++++++++++ src/mpid/common/datatype/mpidu_type_dup.c | 111 +++ src/mpid/common/datatype/mpidu_type_get_contents.c | 91 +++ src/mpid/common/datatype/mpidu_type_get_envelope.c | 56 ++ src/mpid/common/datatype/mpidu_type_indexed.c | 238 ++++++ src/mpid/common/datatype/mpidu_type_struct.c | 439 +++++++++++ src/mpid/common/datatype/mpidu_type_vector.c | 166 +++++ src/mpid/common/datatype/mpidu_type_zerolen.c | 78 ++ src/mpid/common/datatype/mpir_type_flatten.c | 18 +- src/mpid/common/sched/mpidu_sched.c | 16 +- src/mpid/pamid/include/mpidi_datatypes.h | 2 +- src/mpid/pamid/include/mpidi_macros.h | 10 +- src/mpid/pamid/include/mpidpost.h | 2 +- src/mpid/pamid/include/mpidpre.h | 8 +- .../pamid/src/coll/allgather/mpido_allgather.c | 18 +- .../pamid/src/coll/allgatherv/mpido_allgatherv.c | 16 +- .../pamid/src/coll/allreduce/mpido_allreduce.c | 4 +- src/mpid/pamid/src/coll/alltoall/mpido_alltoall.c | 18 +- .../pamid/src/coll/alltoallv/mpido_alltoallv.c | 18 +- src/mpid/pamid/src/coll/bcast/mpido_bcast.c | 16 +- src/mpid/pamid/src/coll/gather/mpido_gather.c | 18 +- src/mpid/pamid/src/coll/gatherv/mpido_gatherv.c | 20 +- src/mpid/pamid/src/coll/red_scat/mpido_red_scat.c | 4 +- src/mpid/pamid/src/coll/reduce/mpido_reduce.c | 8 +- src/mpid/pamid/src/coll/scan/mpido_scan.c | 8 +- src/mpid/pamid/src/coll/scatter/mpido_scatter.c | 14 +- src/mpid/pamid/src/coll/scatterv/mpido_scatterv.c | 16 +- src/mpid/pamid/src/mpid_buffer.c | 36 +- src/mpid/pamid/src/mpid_imrecv.c | 2 +- src/mpid/pamid/src/mpid_request.h | 4 +- src/mpid/pamid/src/mpidi_pami_datatype.c | 12 +- src/mpid/pamid/src/onesided/mpid_1s.c | 16 +- src/mpid/pamid/src/onesided/mpid_win_accumulate.c | 6 +- .../pamid/src/onesided/mpid_win_compare_and_swap.c | 2 +- .../pamid/src/onesided/mpid_win_fetch_and_op.c | 8 +- src/mpid/pamid/src/onesided/mpid_win_get.c | 8 +- .../pamid/src/onesided/mpid_win_get_accumulate.c | 6 +- src/mpid/pamid/src/onesided/mpid_win_put.c | 6 +- src/mpid/pamid/src/onesided/mpidi_onesided.h | 2 +- src/mpid/pamid/src/pt2pt/mpidi_callback_eager.c | 2 +- src/mpid/pamid/src/pt2pt/mpidi_callback_short.c | 2 +- src/mpid/pamid/src/pt2pt/mpidi_callback_util.c | 2 +- src/mpid/pamid/src/pt2pt/mpidi_done.c | 6 +- src/mpid/pamid/src/pt2pt/mpidi_recv.h | 6 +- src/mpid/pamid/src/pt2pt/mpidi_recvmsg.c | 8 +- src/mpid/pamid/src/pt2pt/mpidi_rendezvous.c | 2 +- src/mpid/pamid/src/pt2pt/mpidi_sendmsg.c | 14 +- .../pamid/src/pt2pt/persistent/mpid_recv_init.c | 4 +- .../pamid/src/pt2pt/persistent/mpid_send_init.c | 4 +- 136 files changed, 5999 insertions(+), 5925 deletions(-) delete mode 100644 src/mpid/common/datatype/mpid_contents_support.c delete mode 100644 src/mpid/common/datatype/mpid_dataloop.h delete mode 100644 src/mpid/common/datatype/mpid_datatype.h delete mode 100644 src/mpid/common/datatype/mpid_datatype_contents.c create mode 100644 src/mpid/common/datatype/mpid_datatype_fallback.h delete mode 100644 src/mpid/common/datatype/mpid_datatype_free.c delete mode 100644 src/mpid/common/datatype/mpid_ext32_datatype.c delete mode 100644 src/mpid/common/datatype/mpid_ext32_segment.c delete mode 100644 src/mpid/common/datatype/mpid_ext32_segment.h delete mode 100644 src/mpid/common/datatype/mpid_segment.c delete mode 100644 src/mpid/common/datatype/mpid_type_blockindexed.c delete mode 100644 src/mpid/common/datatype/mpid_type_commit.c delete mode 100644 src/mpid/common/datatype/mpid_type_contiguous.c delete mode 100644 src/mpid/common/datatype/mpid_type_create_pairtype.c delete mode 100644 src/mpid/common/datatype/mpid_type_create_resized.c delete mode 100644 src/mpid/common/datatype/mpid_type_debug.c delete mode 100644 src/mpid/common/datatype/mpid_type_dup.c delete mode 100644 src/mpid/common/datatype/mpid_type_get_contents.c delete mode 100644 src/mpid/common/datatype/mpid_type_get_envelope.c delete mode 100644 src/mpid/common/datatype/mpid_type_indexed.c delete mode 100644 src/mpid/common/datatype/mpid_type_struct.c delete mode 100644 src/mpid/common/datatype/mpid_type_vector.c delete mode 100644 src/mpid/common/datatype/mpid_type_zerolen.c create mode 100644 src/mpid/common/datatype/mpidu_contents_support.c create mode 100644 src/mpid/common/datatype/mpidu_dataloop.h create mode 100644 src/mpid/common/datatype/mpidu_datatype.h create mode 100644 src/mpid/common/datatype/mpidu_datatype_contents.c create mode 100644 src/mpid/common/datatype/mpidu_datatype_free.c create mode 100644 src/mpid/common/datatype/mpidu_ext32_datatype.c create mode 100644 src/mpid/common/datatype/mpidu_ext32_segment.c create mode 100644 src/mpid/common/datatype/mpidu_ext32_segment.h create mode 100644 src/mpid/common/datatype/mpidu_segment.c create mode 100644 src/mpid/common/datatype/mpidu_type_blockindexed.c create mode 100644 src/mpid/common/datatype/mpidu_type_commit.c create mode 100644 src/mpid/common/datatype/mpidu_type_contiguous.c create mode 100644 src/mpid/common/datatype/mpidu_type_create_pairtype.c create mode 100644 src/mpid/common/datatype/mpidu_type_create_resized.c create mode 100644 src/mpid/common/datatype/mpidu_type_debug.c create mode 100644 src/mpid/common/datatype/mpidu_type_dup.c create mode 100644 src/mpid/common/datatype/mpidu_type_get_contents.c create mode 100644 src/mpid/common/datatype/mpidu_type_get_envelope.c create mode 100644 src/mpid/common/datatype/mpidu_type_indexed.c create mode 100644 src/mpid/common/datatype/mpidu_type_struct.c create mode 100644 src/mpid/common/datatype/mpidu_type_vector.c create mode 100644 src/mpid/common/datatype/mpidu_type_zerolen.c hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2-241-g54f737a
by noreply＠mpich.org 01 Apr '16

01 Apr '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 54f737a842003d9838c5c48742c410c0befffe14 (commit) from d677b7d4009a9e9a3f9605863d3edf96d78aab70 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/54f737a842003d9838c5c48742c410c0b… commit 54f737a842003d9838c5c48742c410c0befffe14 Author: Mikhail Shiryaev <mikhail.shiryaev(a)intel.com> Date: Mon Mar 28 18:32:56 2016 +0300 OFI-netmod: fix mprobe/mrecv functionality Change-Id: I931d718a4df83b43d6d9dda23d164983ecad192b diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h index 0cb92dc..8b3c34f 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h @@ -234,6 +234,7 @@ fn_fail: \ #define PEEK_INIT 0 #define PEEK_FOUND 1 +#define PEEK_NOT_FOUND 2 #define MEM_TAG_FORMAT (0xFFFF00000000LLU) /* ******************************** */ diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_probe_template.c b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_probe_template.c index afe97b1..4de25f0 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_probe_template.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_probe_template.c @@ -51,7 +51,9 @@ int ADD_SUFFIX(MPID_nem_ofi_iprobe_impl)(struct MPIDI_VC *vc, BEGIN_FUNC(FCNAME); if (rreq_ptr) { - MPIDI_Request_create_rreq(rreq, mpi_errno, goto fn_exit); + MPIDI_CH3I_NM_OFI_RC(MPID_nem_ofi_create_req(&rreq, 1)); + rreq->kind = MPID_REQUEST_RECV; + *rreq_ptr = rreq; rreq->comm = comm; rreq->dev.match.parts.rank = source; @@ -63,6 +65,8 @@ int ADD_SUFFIX(MPID_nem_ofi_iprobe_impl)(struct MPIDI_VC *vc, rreq = &rreq_s; rreq->dev.OnDataAvail = NULL; } + + REQ_OFI(rreq)->pack_buffer = NULL; REQ_OFI(rreq)->event_callback = ADD_SUFFIX(peek_callback); REQ_OFI(rreq)->match_state = PEEK_INIT; OFI_ADDR_INIT(source, vc, remote_proc); @@ -108,7 +112,21 @@ int ADD_SUFFIX(MPID_nem_ofi_iprobe_impl)(struct MPIDI_VC *vc, while (PEEK_INIT == REQ_OFI(rreq)->match_state) MPID_nem_ofi_poll(MPID_BLOCKING_POLL); - *status = rreq->status; + + if (PEEK_NOT_FOUND == REQ_OFI(rreq)->match_state) { + if (rreq_ptr) { + MPID_Request_release(rreq); + *rreq_ptr = NULL; + *flag = 0; + } + MPID_nem_ofi_poll(MPID_NONBLOCKING_POLL); + goto fn_exit; + } + + if (status != MPI_STATUS_IGNORE) + *status = rreq->status; + + MPIR_Request_add_ref(rreq); *flag = 1; END_FUNC_RC(FCNAME); } @@ -142,7 +160,7 @@ int ADD_SUFFIX(MPID_nem_ofi_improbe)(struct MPIDI_VC *vc, int old_error = status->MPI_ERROR; int s; BEGIN_FUNC(FCNAME); - *flag = NORMAL_PEEK; + *flag = CLAIM_PEEK; s = ADD_SUFFIX(MPID_nem_ofi_iprobe_impl)(vc, source, tag, comm, context_offset, flag, status, message); if (*flag) { diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_progress.c b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_progress.c index 73627a7..f48e021 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_progress.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_progress.c @@ -110,6 +110,10 @@ int MPID_nem_ofi_poll(int in_blocking_poll) req = context_to_req(error.op_context); MPIR_STATUS_SET_CANCEL_BIT(req->status, TRUE); } + else if (error.err == FI_ENOMSG) { + req = context_to_req(error.op_context); + REQ_OFI(req)->match_state = PEEK_NOT_FOUND; + } else { mpi_errno = MPI_ERR_OTHER; } diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_tagged_template.c b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_tagged_template.c index f57ceee..0875ee7 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_tagged_template.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_tagged_template.c @@ -390,7 +390,9 @@ int ADD_SUFFIX(MPID_nem_ofi_recv_posted)(struct MPIDI_VC *vc, struct MPID_Reques /* ------------------------ */ /* Initialize the request */ /* ------------------------ */ - MPID_nem_ofi_init_req(rreq); + if (REQ_OFI(rreq)->match_state != PEEK_FOUND) + MPID_nem_ofi_init_req(rreq); + REQ_OFI(rreq)->event_callback = ADD_SUFFIX(MPID_nem_ofi_recv_callback); REQ_OFI(rreq)->vc = vc; @@ -427,10 +429,12 @@ int ADD_SUFFIX(MPID_nem_ofi_recv_posted)(struct MPIDI_VC *vc, struct MPID_Reques msg_tagged_t msg; iov.iov_base = recv_buffer; iov.iov_len = data_sz; - if(REQ_OFI(rreq)->match_state == PEEK_FOUND) - msgflags = FI_CLAIM; + if (REQ_OFI(rreq)->match_state == PEEK_FOUND) { + msgflags = FI_CLAIM; + REQ_OFI(rreq)->match_state = PEEK_INIT; + } else - msgflags = 0ULL; + msgflags = 0ULL; msg.msg_iov = &iov; msg.desc = NULL; ----------------------------------------------------------------------- Summary of changes: .../ch3/channels/nemesis/netmod/ofi/ofi_impl.h | 1 + .../nemesis/netmod/ofi/ofi_probe_template.c | 24 +++++++++++++++++-- .../ch3/channels/nemesis/netmod/ofi/ofi_progress.c | 4 +++ .../nemesis/netmod/ofi/ofi_tagged_template.c | 12 ++++++--- 4 files changed, 34 insertions(+), 7 deletions(-) hooks/post-receive -- MPICH primary repository

1 0