[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2b3-216-gaf3a6e0
Service Account
noreply at mpich.org
Sun Jul 12 13:30:17 CDT 2015
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 af3a6e0cc4a28a8748233dddad923c0427970cff (commit)
via a7b53a383dd5a834756424066b73c64014c73352 (commit)
via efb3befc92251e285229302667135bf41a7fa28d (commit)
via 1023f288880960d249ba0b762d4d93fdf601279c (commit)
via 6699a2bf9a2a6ccd6159c380eea7b9e2cda2403d (commit)
via 088d74b5ce167d33e9d53dc2bfb2666b7f13ea54 (commit)
via e089052743eafde37cf84d3fc5ca23ca136e288b (commit)
from 88ba1a79d96fcf2b6e0cf40254969ba2878cac56 (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/af3a6e0cc4a28a8748233dddad923c0427970cff
commit af3a6e0cc4a28a8748233dddad923c0427970cff
Author: Antonio J. Pena <apenya at mcs.anl.gov>
Date: Thu Jul 9 13:20:32 2015 -0500
Moved MPIU_RMA_CALL to MPIR_RMA_CALL
Signed-off-by: Pavan Balaji <balaji at anl.gov>
diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h
index 1f2bc1c..7cd95f9 100644
--- a/src/include/mpiimpl.h
+++ b/src/include/mpiimpl.h
@@ -1601,11 +1601,11 @@ MPID_Progress_state;
/* We need to export this header file (at least the struct) to the
device, so that it can implement the init routine. */
#ifdef USE_MPID_RMA_TABLE
-#define MPIU_RMA_CALL(winptr,funccall) (winptr)->RMAFns.funccall
+#define MPIR_RMA_CALL(winptr,funccall) (winptr)->RMAFns.funccall
#else
/* Just use the MPID_<fcn> version of the function */
-#define MPIU_RMA_CALL(winptr,funccall) MPID_##funccall
+#define MPIR_RMA_CALL(winptr,funccall) MPID_##funccall
#endif /* USE_MPID_RMA_TABLE */
diff --git a/src/mpi/rma/accumulate.c b/src/mpi/rma/accumulate.c
index 93ff2f9..d9c9033 100644
--- a/src/mpi/rma/accumulate.c
+++ b/src/mpi/rma/accumulate.c
@@ -145,7 +145,7 @@ int MPI_Accumulate(const void *origin_addr, int origin_count, MPI_Datatype
/* ... body of routine ... */
- mpi_errno = MPIU_RMA_CALL(win_ptr,Accumulate(origin_addr, origin_count,
+ mpi_errno = MPIR_RMA_CALL(win_ptr,Accumulate(origin_addr, origin_count,
origin_datatype,
target_rank, target_disp, target_count,
target_datatype, op, win_ptr));
diff --git a/src/mpi/rma/compare_and_swap.c b/src/mpi/rma/compare_and_swap.c
index 3dbc92f..ba0b1d2 100644
--- a/src/mpi/rma/compare_and_swap.c
+++ b/src/mpi/rma/compare_and_swap.c
@@ -133,7 +133,7 @@ int MPI_Compare_and_swap(const void *origin_addr, const void *compare_addr,
/* ... body of routine ... */
- mpi_errno = MPIU_RMA_CALL(win_ptr,Compare_and_swap(origin_addr,
+ mpi_errno = MPIR_RMA_CALL(win_ptr,Compare_and_swap(origin_addr,
compare_addr, result_addr,
datatype, target_rank,
target_disp, win_ptr));
diff --git a/src/mpi/rma/fetch_and_op.c b/src/mpi/rma/fetch_and_op.c
index 6001418..3f51b6c 100644
--- a/src/mpi/rma/fetch_and_op.c
+++ b/src/mpi/rma/fetch_and_op.c
@@ -149,7 +149,7 @@ int MPI_Fetch_and_op(const void *origin_addr, void *result_addr,
/* ... body of routine ... */
- mpi_errno = MPIU_RMA_CALL(win_ptr,Fetch_and_op(origin_addr,
+ mpi_errno = MPIR_RMA_CALL(win_ptr,Fetch_and_op(origin_addr,
result_addr, datatype,
target_rank, target_disp,
op, win_ptr));
diff --git a/src/mpi/rma/get.c b/src/mpi/rma/get.c
index e8ba531..9b0f96e 100644
--- a/src/mpi/rma/get.c
+++ b/src/mpi/rma/get.c
@@ -139,7 +139,7 @@ int MPI_Get(void *origin_addr, int origin_count, MPI_Datatype
/* ... body of routine ... */
- mpi_errno = MPIU_RMA_CALL(win_ptr,
+ mpi_errno = MPIR_RMA_CALL(win_ptr,
Get(origin_addr, origin_count, origin_datatype,
target_rank, target_disp, target_count,
target_datatype, win_ptr));
diff --git a/src/mpi/rma/get_accumulate.c b/src/mpi/rma/get_accumulate.c
index a9ed4fe..b7d0ec0 100644
--- a/src/mpi/rma/get_accumulate.c
+++ b/src/mpi/rma/get_accumulate.c
@@ -197,7 +197,7 @@ int MPI_Get_accumulate(const void *origin_addr, int origin_count,
/* ... body of routine ... */
- mpi_errno = MPIU_RMA_CALL(win_ptr,Get_accumulate(origin_addr, origin_count,
+ mpi_errno = MPIR_RMA_CALL(win_ptr,Get_accumulate(origin_addr, origin_count,
origin_datatype,
result_addr, result_count,
result_datatype,
diff --git a/src/mpi/rma/put.c b/src/mpi/rma/put.c
index 1d4dc75..959f879 100644
--- a/src/mpi/rma/put.c
+++ b/src/mpi/rma/put.c
@@ -139,7 +139,7 @@ int MPI_Put(const void *origin_addr, int origin_count, MPI_Datatype
/* ... body of routine ... */
- mpi_errno = MPIU_RMA_CALL(win_ptr,
+ mpi_errno = MPIR_RMA_CALL(win_ptr,
Put(origin_addr, origin_count, origin_datatype,
target_rank, target_disp, target_count,
target_datatype, win_ptr));
diff --git a/src/mpi/rma/raccumulate.c b/src/mpi/rma/raccumulate.c
index 6f5f5da..f330715 100644
--- a/src/mpi/rma/raccumulate.c
+++ b/src/mpi/rma/raccumulate.c
@@ -160,7 +160,7 @@ int MPI_Raccumulate(const void *origin_addr, int origin_count, MPI_Datatype
/* ... body of routine ... */
- mpi_errno = MPIU_RMA_CALL(win_ptr,Raccumulate(origin_addr, origin_count,
+ mpi_errno = MPIR_RMA_CALL(win_ptr,Raccumulate(origin_addr, origin_count,
origin_datatype,
target_rank, target_disp, target_count,
target_datatype, op, win_ptr, &request_ptr));
diff --git a/src/mpi/rma/rget.c b/src/mpi/rma/rget.c
index 3536d1b..182c957 100644
--- a/src/mpi/rma/rget.c
+++ b/src/mpi/rma/rget.c
@@ -154,7 +154,7 @@ int MPI_Rget(void *origin_addr, int origin_count, MPI_Datatype
/* ... body of routine ... */
- mpi_errno = MPIU_RMA_CALL(win_ptr,
+ mpi_errno = MPIR_RMA_CALL(win_ptr,
Rget(origin_addr, origin_count, origin_datatype,
target_rank, target_disp, target_count,
target_datatype, win_ptr, &request_ptr));
diff --git a/src/mpi/rma/rget_accumulate.c b/src/mpi/rma/rget_accumulate.c
index 55196ba..7a8f1e2 100644
--- a/src/mpi/rma/rget_accumulate.c
+++ b/src/mpi/rma/rget_accumulate.c
@@ -186,7 +186,7 @@ int MPI_Rget_accumulate(const void *origin_addr, int origin_count,
/* ... body of routine ... */
- mpi_errno = MPIU_RMA_CALL(win_ptr,Rget_accumulate(origin_addr, origin_count,
+ mpi_errno = MPIR_RMA_CALL(win_ptr,Rget_accumulate(origin_addr, origin_count,
origin_datatype,
result_addr, result_count,
result_datatype,
diff --git a/src/mpi/rma/rput.c b/src/mpi/rma/rput.c
index a6f79aa..fe2164b 100644
--- a/src/mpi/rma/rput.c
+++ b/src/mpi/rma/rput.c
@@ -156,7 +156,7 @@ int MPI_Rput(const void *origin_addr, int origin_count, MPI_Datatype
/* ... body of routine ... */
- mpi_errno = MPIU_RMA_CALL(win_ptr,
+ mpi_errno = MPIR_RMA_CALL(win_ptr,
Rput(origin_addr, origin_count, origin_datatype,
target_rank, target_disp, target_count,
target_datatype, win_ptr, &request_ptr));
diff --git a/src/mpi/rma/win_attach.c b/src/mpi/rma/win_attach.c
index 06164cc..789b8c0 100644
--- a/src/mpi/rma/win_attach.c
+++ b/src/mpi/rma/win_attach.c
@@ -120,7 +120,7 @@ int MPI_Win_attach(MPI_Win win, void *base, MPI_Aint size)
if (size == 0) goto fn_exit;
- mpi_errno = MPIU_RMA_CALL(win_ptr,
+ mpi_errno = MPIR_RMA_CALL(win_ptr,
Win_attach(win_ptr, base, size));
if (mpi_errno != MPI_SUCCESS) goto fn_fail;
diff --git a/src/mpi/rma/win_complete.c b/src/mpi/rma/win_complete.c
index 0787e64..fbd9a4d 100644
--- a/src/mpi/rma/win_complete.c
+++ b/src/mpi/rma/win_complete.c
@@ -87,7 +87,7 @@ int MPI_Win_complete(MPI_Win win)
/* ... body of routine ... */
- mpi_errno = MPIU_RMA_CALL(win_ptr,Win_complete(win_ptr));
+ mpi_errno = MPIR_RMA_CALL(win_ptr,Win_complete(win_ptr));
if (mpi_errno != MPI_SUCCESS) goto fn_fail;
/* ... end of body of routine ... */
diff --git a/src/mpi/rma/win_detach.c b/src/mpi/rma/win_detach.c
index 13812ce..773329a 100644
--- a/src/mpi/rma/win_detach.c
+++ b/src/mpi/rma/win_detach.c
@@ -102,7 +102,7 @@ int MPI_Win_detach(MPI_Win win, const void *base)
if (base == NULL) goto fn_exit;
- mpi_errno = MPIU_RMA_CALL(win_ptr,
+ mpi_errno = MPIR_RMA_CALL(win_ptr,
Win_detach(win_ptr, base));
if (mpi_errno != MPI_SUCCESS) goto fn_fail;
diff --git a/src/mpi/rma/win_fence.c b/src/mpi/rma/win_fence.c
index 5314ee5..9625dff 100644
--- a/src/mpi/rma/win_fence.c
+++ b/src/mpi/rma/win_fence.c
@@ -108,7 +108,7 @@ int MPI_Win_fence(int assert, MPI_Win win)
/* ... body of routine ... */
- mpi_errno = MPIU_RMA_CALL(win_ptr,Win_fence(assert, win_ptr));
+ mpi_errno = MPIR_RMA_CALL(win_ptr,Win_fence(assert, win_ptr));
if (mpi_errno != MPI_SUCCESS) goto fn_fail;
/* ... end of body of routine ... */
diff --git a/src/mpi/rma/win_flush.c b/src/mpi/rma/win_flush.c
index 2a58fbc..2b19292 100644
--- a/src/mpi/rma/win_flush.c
+++ b/src/mpi/rma/win_flush.c
@@ -103,7 +103,7 @@ int MPI_Win_flush(int rank, MPI_Win win)
/* ... body of routine ... */
- mpi_errno = MPIU_RMA_CALL(win_ptr,Win_flush(rank, win_ptr));
+ mpi_errno = MPIR_RMA_CALL(win_ptr,Win_flush(rank, win_ptr));
if (mpi_errno != MPI_SUCCESS) goto fn_fail;
/* ... end of body of routine ... */
diff --git a/src/mpi/rma/win_flush_all.c b/src/mpi/rma/win_flush_all.c
index 60da14d..06275d5 100644
--- a/src/mpi/rma/win_flush_all.c
+++ b/src/mpi/rma/win_flush_all.c
@@ -97,7 +97,7 @@ int MPI_Win_flush_all(MPI_Win win)
/* ... body of routine ... */
- mpi_errno = MPIU_RMA_CALL(win_ptr,Win_flush_all(win_ptr));
+ mpi_errno = MPIR_RMA_CALL(win_ptr,Win_flush_all(win_ptr));
if (mpi_errno != MPI_SUCCESS) goto fn_fail;
/* ... end of body of routine ... */
diff --git a/src/mpi/rma/win_flush_local.c b/src/mpi/rma/win_flush_local.c
index 68c7370..bde4a50 100644
--- a/src/mpi/rma/win_flush_local.c
+++ b/src/mpi/rma/win_flush_local.c
@@ -105,7 +105,7 @@ int MPI_Win_flush_local(int rank, MPI_Win win)
/* ... body of routine ... */
- mpi_errno = MPIU_RMA_CALL(win_ptr,Win_flush_local(rank, win_ptr));
+ mpi_errno = MPIR_RMA_CALL(win_ptr,Win_flush_local(rank, win_ptr));
if (mpi_errno != MPI_SUCCESS) goto fn_fail;
/* ... end of body of routine ... */
diff --git a/src/mpi/rma/win_flush_local_all.c b/src/mpi/rma/win_flush_local_all.c
index 3ef129e..5780952 100644
--- a/src/mpi/rma/win_flush_local_all.c
+++ b/src/mpi/rma/win_flush_local_all.c
@@ -95,7 +95,7 @@ int MPI_Win_flush_local_all(MPI_Win win)
/* ... body of routine ... */
- mpi_errno = MPIU_RMA_CALL(win_ptr,Win_flush_local_all(win_ptr));
+ mpi_errno = MPIR_RMA_CALL(win_ptr,Win_flush_local_all(win_ptr));
if (mpi_errno != MPI_SUCCESS) goto fn_fail;
/* ... end of body of routine ... */
diff --git a/src/mpi/rma/win_free.c b/src/mpi/rma/win_free.c
index bb36778..3772364 100644
--- a/src/mpi/rma/win_free.c
+++ b/src/mpi/rma/win_free.c
@@ -117,7 +117,7 @@ int MPI_Win_free(MPI_Win *win)
}
}
- mpi_errno = MPIU_RMA_CALL(win_ptr,Win_free(&win_ptr));
+ mpi_errno = MPIR_RMA_CALL(win_ptr,Win_free(&win_ptr));
if (mpi_errno) goto fn_fail;
*win = MPI_WIN_NULL;
diff --git a/src/mpi/rma/win_lock.c b/src/mpi/rma/win_lock.c
index c1cc4e1..af8556b 100644
--- a/src/mpi/rma/win_lock.c
+++ b/src/mpi/rma/win_lock.c
@@ -136,7 +136,7 @@ int MPI_Win_lock(int lock_type, int rank, int assert, MPI_Win win)
/* ... body of routine ... */
- mpi_errno = MPIU_RMA_CALL(win_ptr,
+ mpi_errno = MPIR_RMA_CALL(win_ptr,
Win_lock(lock_type, rank, assert, win_ptr));
if (mpi_errno != MPI_SUCCESS) goto fn_fail;
diff --git a/src/mpi/rma/win_lock_all.c b/src/mpi/rma/win_lock_all.c
index 4175330..f1a7bd0 100644
--- a/src/mpi/rma/win_lock_all.c
+++ b/src/mpi/rma/win_lock_all.c
@@ -130,7 +130,7 @@ int MPI_Win_lock_all(int assert, MPI_Win win)
/* ... body of routine ... */
- mpi_errno = MPIU_RMA_CALL(win_ptr,
+ mpi_errno = MPIR_RMA_CALL(win_ptr,
Win_lock_all(assert, win_ptr));
if (mpi_errno != MPI_SUCCESS) goto fn_fail;
diff --git a/src/mpi/rma/win_post.c b/src/mpi/rma/win_post.c
index cdc8593..ca6534c 100644
--- a/src/mpi/rma/win_post.c
+++ b/src/mpi/rma/win_post.c
@@ -111,7 +111,7 @@ int MPI_Win_post(MPI_Group group, int assert, MPI_Win win)
/* ... body of routine ... */
- mpi_errno = MPIU_RMA_CALL(win_ptr,Win_post(group_ptr, assert, win_ptr));
+ mpi_errno = MPIR_RMA_CALL(win_ptr,Win_post(group_ptr, assert, win_ptr));
if (mpi_errno != MPI_SUCCESS) goto fn_fail;
/* ... end of body of routine ... */
diff --git a/src/mpi/rma/win_shared_query.c b/src/mpi/rma/win_shared_query.c
index e699dd6..800c432 100644
--- a/src/mpi/rma/win_shared_query.c
+++ b/src/mpi/rma/win_shared_query.c
@@ -122,7 +122,7 @@ int MPI_Win_shared_query(MPI_Win win, int rank, MPI_Aint *size, int *disp_unit,
/* ... body of routine ... */
- mpi_errno = MPIU_RMA_CALL(win_ptr,
+ mpi_errno = MPIR_RMA_CALL(win_ptr,
Win_shared_query(win_ptr, rank, size, disp_unit, baseptr));
if (mpi_errno != MPI_SUCCESS) goto fn_fail;
diff --git a/src/mpi/rma/win_start.c b/src/mpi/rma/win_start.c
index 9c54e57..c73a915 100644
--- a/src/mpi/rma/win_start.c
+++ b/src/mpi/rma/win_start.c
@@ -112,7 +112,7 @@ int MPI_Win_start(MPI_Group group, int assert, MPI_Win win)
/* ... body of routine ... */
- mpi_errno = MPIU_RMA_CALL(win_ptr,Win_start(group_ptr, assert, win_ptr));
+ mpi_errno = MPIR_RMA_CALL(win_ptr,Win_start(group_ptr, assert, win_ptr));
if (mpi_errno != MPI_SUCCESS) goto fn_fail;
/* ... end of body of routine ... */
diff --git a/src/mpi/rma/win_sync.c b/src/mpi/rma/win_sync.c
index 624fd04..b7e660e 100644
--- a/src/mpi/rma/win_sync.c
+++ b/src/mpi/rma/win_sync.c
@@ -97,7 +97,7 @@ int MPI_Win_sync(MPI_Win win)
/* ... body of routine ... */
- mpi_errno = MPIU_RMA_CALL(win_ptr,Win_sync(win_ptr));
+ mpi_errno = MPIR_RMA_CALL(win_ptr,Win_sync(win_ptr));
if (mpi_errno != MPI_SUCCESS) goto fn_fail;
/* ... end of body of routine ... */
diff --git a/src/mpi/rma/win_test.c b/src/mpi/rma/win_test.c
index a89d903..2983379 100644
--- a/src/mpi/rma/win_test.c
+++ b/src/mpi/rma/win_test.c
@@ -98,7 +98,7 @@ int MPI_Win_test(MPI_Win win, int *flag)
/* ... body of routine ... */
- mpi_errno = MPIU_RMA_CALL(win_ptr,Win_test(win_ptr, flag));
+ mpi_errno = MPIR_RMA_CALL(win_ptr,Win_test(win_ptr, flag));
if (mpi_errno != MPI_SUCCESS) goto fn_fail;
/* ... end of body of routine ... */
diff --git a/src/mpi/rma/win_unlock.c b/src/mpi/rma/win_unlock.c
index cb5ed14..db59daa 100644
--- a/src/mpi/rma/win_unlock.c
+++ b/src/mpi/rma/win_unlock.c
@@ -98,7 +98,7 @@ int MPI_Win_unlock(int rank, MPI_Win win)
/* ... body of routine ... */
- mpi_errno = MPIU_RMA_CALL(win_ptr,Win_unlock(rank, win_ptr));
+ mpi_errno = MPIR_RMA_CALL(win_ptr,Win_unlock(rank, win_ptr));
if (mpi_errno != MPI_SUCCESS) goto fn_fail;
/* ... end of body of routine ... */
diff --git a/src/mpi/rma/win_unlock_all.c b/src/mpi/rma/win_unlock_all.c
index c7577c5..89b0b74 100644
--- a/src/mpi/rma/win_unlock_all.c
+++ b/src/mpi/rma/win_unlock_all.c
@@ -100,7 +100,7 @@ int MPI_Win_unlock_all(MPI_Win win)
/* ... body of routine ... */
- mpi_errno = MPIU_RMA_CALL(win_ptr,Win_unlock_all(win_ptr));
+ mpi_errno = MPIR_RMA_CALL(win_ptr,Win_unlock_all(win_ptr));
if (mpi_errno != MPI_SUCCESS) goto fn_fail;
/* ... end of body of routine ... */
diff --git a/src/mpi/rma/win_wait.c b/src/mpi/rma/win_wait.c
index 0b5b0e2..bfb59d1 100644
--- a/src/mpi/rma/win_wait.c
+++ b/src/mpi/rma/win_wait.c
@@ -88,7 +88,7 @@ int MPI_Win_wait(MPI_Win win)
/* ... body of routine ... */
- mpi_errno = MPIU_RMA_CALL(win_ptr,Win_wait(win_ptr));
+ mpi_errno = MPIR_RMA_CALL(win_ptr,Win_wait(win_ptr));
if (mpi_errno != MPI_SUCCESS) goto fn_fail;
/* ... end of body of routine ... */
http://git.mpich.org/mpich.git/commitdiff/a7b53a383dd5a834756424066b73c64014c73352
commit a7b53a383dd5a834756424066b73c64014c73352
Author: Antonio J. Pena <apenya at mcs.anl.gov>
Date: Thu Jul 9 12:08:45 2015 -0500
Moved MPIDI_QUOTE to MPIU_QUOTE
Signed-off-by: Pavan Balaji <balaji at anl.gov>
diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h
index 417026d..1f2bc1c 100644
--- a/src/include/mpiimpl.h
+++ b/src/include/mpiimpl.h
@@ -139,13 +139,6 @@ int usleep(useconds_t usec);
/* Include some basic (and easily shared) definitions */
#include "mpibase.h"
-/* FIXME: The code base should not define two of these */
-/* This is used to quote a name in a definition (see FUNCNAME/FCNAME below) */
-#ifndef MPIDI_QUOTE
-#define MPIDI_QUOTE(A) MPIDI_QUOTE2(A)
-#define MPIDI_QUOTE2(A) #A
-#endif
-
/*
Include the implementation definitions (e.g., error reporting, thread
portability)
diff --git a/src/mpi/comm/intercomm_merge.c b/src/mpi/comm/intercomm_merge.c
index 0b0a941..4f85628 100644
--- a/src/mpi/comm/intercomm_merge.c
+++ b/src/mpi/comm/intercomm_merge.c
@@ -34,7 +34,7 @@ int MPI_Intercomm_merge(MPI_Comm intercomm, int high, MPI_Comm *newintracomm) __
#undef FUNCNAME
#define FUNCNAME create_and_map_vcrt
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int create_and_map_vcrt(MPID_Comm *comm_ptr, int local_high, MPID_Comm *new_intracomm_ptr)
{
int mpi_errno = MPI_SUCCESS;
diff --git a/src/mpi/errhan/errhandler_set.c b/src/mpi/errhan/errhandler_set.c
index 1b95e2c..f2947ef 100644
--- a/src/mpi/errhan/errhandler_set.c
+++ b/src/mpi/errhan/errhandler_set.c
@@ -30,7 +30,7 @@ int MPI_Errhandler_set(MPI_Comm comm, MPI_Errhandler errhandler) __attribute__((
#undef FUNCNAME
#define FUNCNAME MPI_Errhandler_set
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
/*@
MPI_Errhandler_set - Sets the error handler for a communicator
diff --git a/src/mpi/info/info_set.c b/src/mpi/info/info_set.c
index 18adebd..da1f033 100644
--- a/src/mpi/info/info_set.c
+++ b/src/mpi/info/info_set.c
@@ -129,7 +129,7 @@ int MPI_Info_set( MPI_Info info, const char *key, const char *value )
#undef FUNCNAME
#define FUNCNAME MPIR_Info_set_impl
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIR_Info_set_impl(MPID_Info *info_ptr, const char *key, const char *value)
{
int mpi_errno = MPI_SUCCESS;
diff --git a/src/mpi/pt2pt/bsendutil.c b/src/mpi/pt2pt/bsendutil.c
index 55ba130..7d8c06f 100644
--- a/src/mpi/pt2pt/bsendutil.c
+++ b/src/mpi/pt2pt/bsendutil.c
@@ -90,7 +90,7 @@ static void MPIR_Bsend_free_segment( MPIR_Bsend_data_t * );
#undef FUNCNAME
#define FUNCNAME MPIR_Bsend_attach
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIR_Bsend_attach( void *buffer, int buffer_size )
{
MPIR_Bsend_data_t *p;
@@ -165,7 +165,7 @@ int MPIR_Bsend_attach( void *buffer, int buffer_size )
#undef FUNCNAME
#define FUNCNAME MPIR_Bsend_detach
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIR_Bsend_detach( void *bufferp, int *size )
{
if (BsendBuffer.pending) {
@@ -206,7 +206,7 @@ int MPIR_Bsend_detach( void *bufferp, int *size )
#undef FUNCNAME
#define FUNCNAME MPIR_Bsend_isend
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIR_Bsend_isend(const void *buf, int count, MPI_Datatype dtype,
int dest, int tag, MPID_Comm *comm_ptr,
MPIR_Bsend_kind_t kind, MPID_Request **request )
@@ -325,7 +325,7 @@ int MPIR_Bsend_isend(const void *buf, int count, MPI_Datatype dtype,
#undef FUNCNAME
#define FUNCNAME MPIR_Bsend_free_seg
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIR_Bsend_free_req_seg( MPID_Request* req )
{
int mpi_errno = MPI_ERR_INTERN;
@@ -363,7 +363,7 @@ int MPIR_Bsend_free_req_seg( MPID_Request* req )
#undef FUNCNAME
#define FUNCNAME MPIR_Bsend_free_segment
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static void MPIR_Bsend_free_segment( MPIR_Bsend_data_t *p )
{
MPIR_Bsend_data_t *prev = p->prev, *avail = BsendBuffer.avail, *avail_prev;
@@ -457,7 +457,7 @@ static void MPIR_Bsend_free_segment( MPIR_Bsend_data_t *p )
#undef FUNCNAME
#define FUNCNAME MPIR_Bsend_check_active
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int MPIR_Bsend_check_active( void )
{
int mpi_errno = MPI_SUCCESS;
diff --git a/src/mpi/pt2pt/mpir_request.c b/src/mpi/pt2pt/mpir_request.c
index 1a34ef0..89bb891 100644
--- a/src/mpi/pt2pt/mpir_request.c
+++ b/src/mpi/pt2pt/mpir_request.c
@@ -599,7 +599,7 @@ fn_fail:
#undef FUNCNAME
#define FUNCNAME MPIR_Grequest_waitall
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIR_Grequest_waitall(int count, MPID_Request * const * request_ptrs)
{
void ** state_ptrs;
diff --git a/src/mpi/timer/mpidtime.c b/src/mpi/timer/mpidtime.c
index 2d8090f..cdf6c06 100644
--- a/src/mpi/timer/mpidtime.c
+++ b/src/mpi/timer/mpidtime.c
@@ -388,7 +388,7 @@ double MPID_Wtick( void )
#undef FUNCNAME
#define FUNCNAME MPID_Wtick
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
double MPID_Wtick( void )
{
MPIU_THREADSAFE_INIT_DECL(initTick);
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 272622d..ea80607 100644
--- a/src/mpid/ch3/channels/nemesis/include/mpid_nem_impl.h
+++ b/src/mpid/ch3/channels/nemesis/include/mpid_nem_impl.h
@@ -204,7 +204,7 @@ typedef union MPIDI_CH3_nem_pkt
#undef FUNCNAME
#define FUNCNAME MPID_nem_lmt_send_COOKIE
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline int MPID_nem_lmt_send_COOKIE(MPIDI_VC_t *vc, MPID_Request *req,
void *cookie_buf, MPI_Aint cookie_len)
{
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 a4f0109..726a010 100644
--- a/src/mpid/ch3/channels/nemesis/include/mpid_nem_inline.h
+++ b/src/mpid/ch3/channels/nemesis/include/mpid_nem_inline.h
@@ -46,7 +46,7 @@ static inline void MPID_nem_mpich_send_seg (MPID_Segment *segment, MPIDI_msg_sz_
#undef FUNCNAME
#define FUNCNAME MPID_nem_mpich_send_header
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline int
MPID_nem_mpich_send_header (void* buf, int size, MPIDI_VC_t *vc, int *again)
{
@@ -170,7 +170,7 @@ MPID_nem_mpich_send_header (void* buf, int size, MPIDI_VC_t *vc, int *again)
#undef FUNCNAME
#define FUNCNAME MPID_nem_mpich_sendv
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline int
MPID_nem_mpich_sendv (MPID_IOV **iov, int *n_iov, MPIDI_VC_t *vc, int *again)
{
@@ -272,7 +272,7 @@ MPID_nem_mpich_sendv (MPID_IOV **iov, int *n_iov, MPIDI_VC_t *vc, int *again)
#undef FUNCNAME
#define FUNCNAME MPID_nem_mpich_sendv_header
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline int
MPID_nem_mpich_sendv_header (MPID_IOV **iov, int *n_iov,
void *ext_hdr_ptr, MPIDI_msg_sz_t ext_hdr_sz,
@@ -433,7 +433,7 @@ MPID_nem_mpich_sendv_header (MPID_IOV **iov, int *n_iov,
#undef FUNCNAME
#define FUNCNAME MPID_nem_mpich_send_seg_header
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline void
MPID_nem_mpich_send_seg_header (MPID_Segment *segment, MPIDI_msg_sz_t *segment_first, MPIDI_msg_sz_t segment_size,
void *header, MPIDI_msg_sz_t header_sz, void *ext_header, MPIDI_msg_sz_t ext_header_sz,
@@ -579,7 +579,7 @@ MPID_nem_mpich_send_seg_header (MPID_Segment *segment, MPIDI_msg_sz_t *segment_f
#undef FUNCNAME
#define FUNCNAME MPID_nem_mpich_send_seg
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline void
MPID_nem_mpich_send_seg (MPID_Segment *segment, MPIDI_msg_sz_t *segment_first, MPIDI_msg_sz_t segment_size, MPIDI_VC_t *vc, int *again)
{
@@ -666,7 +666,7 @@ MPID_nem_mpich_send_seg (MPID_Segment *segment, MPIDI_msg_sz_t *segment_first, M
#undef FUNCNAME
#define FUNCNAME MPID_nem_mpich_dequeue_fastbox
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline void MPID_nem_mpich_dequeue_fastbox(int local_rank)
{
MPID_nem_fboxq_elem_t *el;
@@ -710,7 +710,7 @@ static inline void MPID_nem_mpich_dequeue_fastbox(int local_rank)
#undef FUNCNAME
#define FUNCNAME MPID_nem_mpich_dequeue_fastbox
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline void MPID_nem_mpich_enqueue_fastbox(int local_rank)
{
MPID_nem_fboxq_elem_t *el;
@@ -751,7 +751,7 @@ static inline void MPID_nem_mpich_enqueue_fastbox(int local_rank)
#undef FUNCNAME
#define FUNCNAME MPID_nem_recv_seqno_matches
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline int
MPID_nem_recv_seqno_matches (MPID_nem_queue_ptr_t qhead)
{
@@ -772,7 +772,7 @@ MPID_nem_recv_seqno_matches (MPID_nem_queue_ptr_t qhead)
#undef FUNCNAME
#define FUNCNAME MPID_nem_mpich_test_recv
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline int
MPID_nem_mpich_test_recv(MPID_nem_cell_ptr_t *cell, int *in_fbox, int in_blocking_progress)
{
@@ -846,7 +846,7 @@ MPID_nem_mpich_test_recv(MPID_nem_cell_ptr_t *cell, int *in_fbox, int in_blockin
#undef FUNCNAME
#define FUNCNAME MPID_nem_mpich_test_recv_wait
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline int
MPID_nem_mpich_test_recv_wait (MPID_nem_cell_ptr_t *cell, int *in_fbox, int timeout)
{
@@ -904,7 +904,7 @@ MPID_nem_mpich_test_recv_wait (MPID_nem_cell_ptr_t *cell, int *in_fbox, int time
#undef FUNCNAME
#define FUNCNAME MPID_nem_mpich_blocking_recv
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline int
MPID_nem_mpich_blocking_recv(MPID_nem_cell_ptr_t *cell, int *in_fbox, int completions)
{
@@ -989,7 +989,7 @@ MPID_nem_mpich_blocking_recv(MPID_nem_cell_ptr_t *cell, int *in_fbox, int comple
#undef FUNCNAME
#define FUNCNAME MPID_nem_mpich_release_cell
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline int
MPID_nem_mpich_release_cell (MPID_nem_cell_ptr_t cell, MPIDI_VC_t *vc)
{
diff --git a/src/mpid/ch3/channels/nemesis/include/mpid_nem_queue.h b/src/mpid/ch3/channels/nemesis/include/mpid_nem_queue.h
index 62ed0a5..a01d917 100644
--- a/src/mpid/ch3/channels/nemesis/include/mpid_nem_queue.h
+++ b/src/mpid/ch3/channels/nemesis/include/mpid_nem_queue.h
@@ -36,7 +36,7 @@ int MPID_nem_network_poll(int in_blocking_progress);
#undef FUNCNAME
#define FUNCNAME MPID_nem_cell_init
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline void MPID_nem_cell_init(MPID_nem_cell_ptr_t cell)
{
MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_CELL_INIT);
@@ -54,7 +54,7 @@ static inline void MPID_nem_cell_init(MPID_nem_cell_ptr_t cell)
#undef FUNCNAME
#define FUNCNAME MPID_nem_queue_init
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline void MPID_nem_queue_init(MPID_nem_queue_ptr_t qhead)
{
MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_QUEUE_INIT);
@@ -242,7 +242,7 @@ MPID_nem_queue_dequeue (MPID_nem_queue_ptr_t qhead, MPID_nem_cell_ptr_t *e)
#undef FUNCNAME
#define FUNCNAME MPID_nem_queue_init
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline void MPID_nem_queue_init(MPID_nem_queue_ptr_t qhead)
{
MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_QUEUE_INIT);
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 ae4132a..c00133e 100644
--- a/src/mpid/ch3/channels/nemesis/include/mpidi_ch3_impl.h
+++ b/src/mpid/ch3/channels/nemesis/include/mpidi_ch3_impl.h
@@ -206,7 +206,7 @@ extern MPIDI_SHM_Wins_list_t shm_wins_list;
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_SHM_Wins_append
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline int MPIDI_CH3I_SHM_Wins_append(MPIDI_SHM_Wins_list_t * list, MPID_Win * win)
{
int mpi_errno = MPI_SUCCESS;
@@ -238,7 +238,7 @@ static inline int MPIDI_CH3I_SHM_Wins_append(MPIDI_SHM_Wins_list_t * list, MPID_
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_SHM_Wins_unlink
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline void MPIDI_CH3I_SHM_Wins_unlink(MPIDI_SHM_Wins_list_t * list, MPID_Win * shm_win)
{
MPIDI_SHM_Win_t *elem = NULL;
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 0f20681..190f508 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_cancel.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_cancel.c
@@ -19,7 +19,7 @@
#undef FUNCNAME
#define FUNCNAME MPID_nem_llc_cancel_recv
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
/* returns zero in case request is canceled */
int MPID_nem_llc_cancel_recv(struct MPIDI_VC *vc, struct MPID_Request *req)
{
diff --git a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_fini.c b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_fini.c
index c737e19..9f46294 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_fini.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_fini.c
@@ -13,7 +13,7 @@
#undef FUNCNAME
#define FUNCNAME MPID_nem_llc_finalize
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_llc_finalize(void)
{
int mpi_errno = MPI_SUCCESS;
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 11acfbd..4887aea 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_init.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_init.c
@@ -44,7 +44,7 @@ int MPID_nem_llc_my_llc_rank;
#undef FUNCNAME
#define FUNCNAME MPID_nem_llc_kvs_put_binary
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_llc_kvs_put_binary(int from, const char *postfix, const uint8_t * buf, int length)
{
int mpi_errno = MPI_SUCCESS;
@@ -80,7 +80,7 @@ int MPID_nem_llc_kvs_put_binary(int from, const char *postfix, const uint8_t * b
#undef FUNCNAME
#define FUNCNAME MPID_nem_llc_kvs_get_binary
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_llc_kvs_get_binary(int from, const char *postfix, char *buf, int length)
{
int mpi_errno = MPI_SUCCESS;
@@ -121,7 +121,7 @@ int MPID_nem_llc_kvs_get_binary(int from, const char *postfix, char *buf, int le
#undef FUNCNAME
#define FUNCNAME MPID_nem_llc_init
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_llc_init(MPIDI_PG_t * pg_p, int pg_rank, char **bc_val_p, int *val_max_sz_p)
{
int mpi_errno = MPI_SUCCESS, pmi_errno, llc_errno;
@@ -164,7 +164,7 @@ int MPID_nem_llc_init(MPIDI_PG_t * pg_p, int pg_rank, char **bc_val_p, int *val_
#undef FUNCNAME
#define FUNCNAME MPID_nem_llc_get_business_card
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_llc_get_business_card(int my_rank, char **bc_val_p, int *val_max_sz_p)
{
int mpi_errno = MPI_SUCCESS;
@@ -182,7 +182,7 @@ int MPID_nem_llc_get_business_card(int my_rank, char **bc_val_p, int *val_max_sz
#undef FUNCNAME
#define FUNCNAME MPID_nem_llc_connect_to_root
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_llc_connect_to_root(const char *business_card, MPIDI_VC_t * new_vc)
{
int mpi_errno = MPI_SUCCESS;
@@ -226,7 +226,7 @@ int MPID_nem_llc_anysource_improbe(int tag, MPID_Comm * comm, int context_offset
#undef FUNCNAME
#define FUNCNAME MPID_nem_llc_get_ordering
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_llc_get_ordering(int *ordering)
{
(*ordering) = 1;
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 44d419e..f14d22d 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_poll.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_poll.c
@@ -24,7 +24,7 @@ static void MPID_nem_llc_recv_handler(void *vp_vc, uint64_t raddr, void *buf, si
#undef FUNCNAME
#define FUNCNAME MPID_nem_llc_poll
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_llc_poll(int in_blocking_progress)
{
int mpi_errno = MPI_SUCCESS;
@@ -51,7 +51,7 @@ int MPID_nem_llc_poll(int in_blocking_progress)
#undef FUNCNAME
#define FUNCNAME MPID_nem_llc_send_handler
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static void MPID_nem_llc_send_handler(void *cba, uint64_t * p_reqid)
{
/* int mpi_errno = 0; */
@@ -173,7 +173,7 @@ static void MPID_nem_llc_send_handler(void *cba, uint64_t * p_reqid)
#undef FUNCNAME
#define FUNCNAME MPID_nem_llc_recv_handler
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static void MPID_nem_llc_recv_handler(void *vp_vc, uint64_t raddr, void *buf, size_t bsz)
{
int mpi_errno = 0;
@@ -227,7 +227,7 @@ static void MPID_nem_llc_recv_handler(void *vp_vc, uint64_t raddr, void *buf, si
#undef FUNCNAME
#define FUNCNAME MPID_nem_llc_recv_posted
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_llc_recv_posted(struct MPIDI_VC *vc, struct MPID_Request *req)
{
int mpi_errno = MPI_SUCCESS, llc_errno;
@@ -342,7 +342,7 @@ int MPID_nem_llc_recv_posted(struct MPIDI_VC *vc, struct MPID_Request *req)
#undef FUNCNAME
#define FUNCNAME MPID_nem_llc_anysource_posted
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
void MPID_nem_llc_anysource_posted(MPID_Request * req)
{
int mpi_errno = MPI_SUCCESS;
@@ -358,7 +358,7 @@ void MPID_nem_llc_anysource_posted(MPID_Request * req)
#undef FUNCNAME
#define FUNCNAME MPID_nem_llc_anysource_matched
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_llc_anysource_matched(MPID_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 eaf151c..a060353 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_probe.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_probe.c
@@ -20,7 +20,7 @@
#undef FUNCNAME
#define FUNCNAME MPID_nem_llc_probe
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_llc_probe(MPIDI_VC_t * vc, int source, int tag, MPID_Comm * comm, int context_offset,
MPI_Status * status)
{
@@ -41,7 +41,7 @@ int MPID_nem_llc_probe(MPIDI_VC_t * vc, int source, int tag, MPID_Comm * comm, i
#undef FUNCNAME
#define FUNCNAME MPID_nem_llc_iprobe
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_llc_iprobe(MPIDI_VC_t * vc, int source, int tag, MPID_Comm * comm, int context_offset,
int *flag, MPI_Status * status)
{
@@ -111,7 +111,7 @@ int MPID_nem_llc_iprobe(MPIDI_VC_t * vc, int source, int tag, MPID_Comm * comm,
#undef FUNCNAME
#define FUNCNAME MPID_nem_llc_improbe
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_llc_improbe(MPIDI_VC_t * vc, int source, int tag, MPID_Comm * comm, int context_offset,
int *flag, MPID_Request ** message, MPI_Status * status)
{
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 1c77ea2..e0e0c04 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_send.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_send.c
@@ -19,7 +19,7 @@
#undef FUNCNAME
#define FUNCNAME MPID_nem_llc_isend
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_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,
struct MPID_Request **req_out)
@@ -161,7 +161,7 @@ int MPID_nem_llc_isend(struct MPIDI_VC *vc, const void *buf, int count, MPI_Data
#undef FUNCNAME
#define FUNCNAME MPID_nem_llc_iStartContigMsg
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_llc_iStartContigMsg(MPIDI_VC_t * vc, void *hdr, MPIDI_msg_sz_t hdr_sz, void *data,
MPIDI_msg_sz_t data_sz, MPID_Request ** sreq_ptr)
{
@@ -253,7 +253,7 @@ int MPID_nem_llc_iStartContigMsg(MPIDI_VC_t * vc, void *hdr, MPIDI_msg_sz_t hdr_
#undef FUNCNAME
#define FUNCNAME MPID_nem_llc_iSendContig
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_llc_iSendContig(MPIDI_VC_t * vc, MPID_Request * sreq, void *hdr, MPIDI_msg_sz_t hdr_sz,
void *data, MPIDI_msg_sz_t data_sz)
{
@@ -337,7 +337,7 @@ int MPID_nem_llc_iSendContig(MPIDI_VC_t * vc, MPID_Request * sreq, void *hdr, MP
#undef FUNCNAME
#define FUNCNAME MPID_nem_llc_SendNoncontig
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_llc_SendNoncontig(MPIDI_VC_t * vc, MPID_Request * sreq, void *hdr,
MPIDI_msg_sz_t hdr_sz)
{
@@ -413,7 +413,7 @@ int MPID_nem_llc_SendNoncontig(MPIDI_VC_t * vc, MPID_Request * sreq, void *hdr,
#undef FUNCNAME
#define FUNCNAME MPID_nem_llc_send_queued
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_llc_send_queued(MPIDI_VC_t * vc, rque_t * send_queue)
{
int mpi_errno = MPI_SUCCESS;
@@ -471,7 +471,7 @@ int MPID_nem_llc_send_queued(MPIDI_VC_t * vc, rque_t * send_queue)
#undef FUNCNAME
#define FUNCNAME MPIDI_nem_llc_Rqst_iov_update
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_nem_llc_Rqst_iov_update(MPID_Request * mreq, MPIDI_msg_sz_t consume)
{
int ret = TRUE;
@@ -952,7 +952,7 @@ int llc_poll(int in_blocking_poll, llc_send_f sfnc, llc_recv_f rfnc)
#undef FUNCNAME
#define FUNCNAME MPID_nem_llc_issend
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_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,
struct MPID_Request **request)
diff --git a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_vc.c b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_vc.c
index 2ef3139..ad28278 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_vc.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_vc.c
@@ -46,7 +46,7 @@ static MPIDI_Comm_ops_t comm_ops = {
#undef FUNCNAME
#define FUNCNAME MPID_nem_llc_vc_init
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_llc_vc_init(MPIDI_VC_t * vc)
{
int mpi_errno = MPI_SUCCESS;
@@ -68,7 +68,7 @@ int MPID_nem_llc_vc_init(MPIDI_VC_t * vc)
#undef FUNCNAME
#define FUNCNAME MPID_nem_llc_vc_destroy
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_llc_vc_destroy(MPIDI_VC_t * vc)
{
int mpi_errno = MPI_SUCCESS;
@@ -98,7 +98,7 @@ int MPID_nem_llc_vc_destroy(MPIDI_VC_t * vc)
#undef FUNCNAME
#define FUNCNAME MPID_nem_llc_vc_terminate
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_llc_vc_terminate(MPIDI_VC_t * vc)
{
int mpi_errno = MPI_SUCCESS;
@@ -122,7 +122,7 @@ int MPID_nem_llc_vc_terminate(MPIDI_VC_t * vc)
#undef FUNCNAME
#define FUNCNAME llc_vc_init
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int llc_vc_init(MPIDI_VC_t * vc)
{
int mpi_errno = MPI_SUCCESS;
@@ -187,7 +187,7 @@ static int llc_vc_init(MPIDI_VC_t * vc)
#undef FUNCNAME
#define FUNCNAME MPID_nem_llc_vc_prnt
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int MPID_nem_llc_vc_prnt(MPIDI_VC_t * vc)
{
int mpi_errno = MPI_SUCCESS;
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 ec96b7f..6628ffe 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_cancel.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_cancel.c
@@ -12,7 +12,7 @@
#undef FUNCNAME
#define FUNCNAME MPID_nem_mxm_cancel_send
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_mxm_cancel_send(MPIDI_VC_t * vc, MPID_Request * req)
{
int mpi_errno = MPI_SUCCESS;
@@ -47,7 +47,7 @@ int MPID_nem_mxm_cancel_send(MPIDI_VC_t * vc, MPID_Request * req)
#undef FUNCNAME
#define FUNCNAME MPID_nem_mxm_cancel_recv
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_mxm_cancel_recv(MPIDI_VC_t * vc, MPID_Request * req)
{
int mpi_errno ATTRIBUTE((unused)) = MPI_SUCCESS;
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 1964a34..bf08f40 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_init.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_init.c
@@ -117,7 +117,7 @@ static int _mxm_conf(void);
#undef FUNCNAME
#define FUNCNAME MPID_nem_mxm_init
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_mxm_init(MPIDI_PG_t * pg_p, int pg_rank, char **bc_val_p, int *val_max_sz_p)
{
int r;
@@ -191,7 +191,7 @@ int MPID_nem_mxm_init(MPIDI_PG_t * pg_p, int pg_rank, char **bc_val_p, int *val_
#undef FUNCNAME
#define FUNCNAME MPID_nem_mxm_finalize
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_mxm_finalize(void)
{
int mpi_errno = MPI_SUCCESS;
@@ -215,7 +215,7 @@ int MPID_nem_mxm_finalize(void)
#undef FUNCNAME
#define FUNCNAME MPID_nem_mxm_get_business_card
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_mxm_get_business_card(int my_rank, char **bc_val_p, int *val_max_sz_p)
{
int mpi_errno = MPI_SUCCESS;
@@ -241,7 +241,7 @@ int MPID_nem_mxm_get_business_card(int my_rank, char **bc_val_p, int *val_max_sz
#undef FUNCNAME
#define FUNCNAME MPID_nem_mxm_connect_to_root
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_mxm_connect_to_root(const char *business_card, MPIDI_VC_t * new_vc)
{
int mpi_errno = MPI_SUCCESS;
@@ -261,7 +261,7 @@ int MPID_nem_mxm_connect_to_root(const char *business_card, MPIDI_VC_t * new_vc)
#undef FUNCNAME
#define FUNCNAME MPID_nem_mxm_vc_init
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_mxm_vc_init(MPIDI_VC_t * vc)
{
int mpi_errno = MPI_SUCCESS;
@@ -327,7 +327,7 @@ int MPID_nem_mxm_vc_init(MPIDI_VC_t * vc)
#undef FUNCNAME
#define FUNCNAME MPID_nem_mxm_vc_destroy
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_mxm_vc_destroy(MPIDI_VC_t * vc)
{
int mpi_errno = MPI_SUCCESS;
@@ -358,7 +358,7 @@ int MPID_nem_mxm_vc_destroy(MPIDI_VC_t * vc)
#undef FUNCNAME
#define FUNCNAME MPID_nem_mxm_vc_terminate
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_mxm_vc_terminate(MPIDI_VC_t * vc)
{
int mpi_errno = MPI_SUCCESS;
@@ -392,7 +392,7 @@ int MPID_nem_mxm_vc_terminate(MPIDI_VC_t * vc)
#undef FUNCNAME
#define FUNCNAME MPID_nem_mxm_get_ordering
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_mxm_get_ordering(int *ordering)
{
(*ordering) = 1;
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 e044f6c..0a94e16 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_poll.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_poll.c
@@ -20,7 +20,7 @@ static int _mxm_process_rdtype(MPID_Request ** rreq_p, MPI_Datatype datatype,
#undef FUNCNAME
#define FUNCNAME MPID_nem_mxm_poll
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_mxm_poll(int in_blocking_progress)
{
int mpi_errno = MPI_SUCCESS;
@@ -67,7 +67,7 @@ static int _mxm_poll(void)
#undef FUNCNAME
#define FUNCNAME MPID_nem_mxm_get_adi_msg
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
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)
{
@@ -87,7 +87,7 @@ void MPID_nem_mxm_get_adi_msg(mxm_conn_h conn, mxm_imm_t imm, void *data,
#undef FUNCNAME
#define FUNCNAME MPID_nem_mxm_anysource_posted
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
void MPID_nem_mxm_anysource_posted(MPID_Request * req)
{
int mpi_errno = MPI_SUCCESS;
@@ -109,7 +109,7 @@ void MPID_nem_mxm_anysource_posted(MPID_Request * req)
#undef FUNCNAME
#define FUNCNAME MPID_nem_mxm_anysource_matched
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_mxm_anysource_matched(MPID_Request * req)
{
mxm_error_t ret = MXM_OK;
@@ -147,7 +147,7 @@ int MPID_nem_mxm_anysource_matched(MPID_Request * req)
#undef FUNCNAME
#define FUNCNAME MPID_nem_mxm_recv
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_mxm_recv(MPIDI_VC_t * vc, MPID_Request * rreq)
{
int mpi_errno = MPI_SUCCESS;
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 0d7cf24..602373d 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_probe.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_probe.c
@@ -12,7 +12,7 @@
#undef FUNCNAME
#define FUNCNAME MPID_nem_mxm_probe
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_mxm_probe(MPIDI_VC_t * vc, int source, int tag, MPID_Comm * comm, int context_offset,
MPI_Status * status)
{
@@ -57,7 +57,7 @@ int MPID_nem_mxm_probe(MPIDI_VC_t * vc, int source, int tag, MPID_Comm * comm, i
#undef FUNCNAME
#define FUNCNAME MPID_nem_mxm_iprobe
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_mxm_iprobe(MPIDI_VC_t * vc, int source, int tag, MPID_Comm * comm, int context_offset,
int *flag, MPI_Status * status)
{
@@ -102,7 +102,7 @@ int MPID_nem_mxm_iprobe(MPIDI_VC_t * vc, int source, int tag, MPID_Comm * comm,
#undef FUNCNAME
#define FUNCNAME MPID_nem_mxm_improbe
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_mxm_improbe(MPIDI_VC_t * vc, int source, int tag, MPID_Comm * comm, int context_offset,
int *flag, MPID_Request ** message, MPI_Status * 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 338083b..841a878 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_send.c
@@ -27,7 +27,7 @@ static int _mxm_process_sdtype(MPID_Request ** rreq_p, MPI_Datatype datatype,
#undef FUNCNAME
#define FUNCNAME MPID_nem_mxm_iSendContig
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_mxm_iSendContig(MPIDI_VC_t * vc, MPID_Request * sreq, void *hdr, MPIDI_msg_sz_t hdr_sz,
void *data, MPIDI_msg_sz_t data_sz)
{
@@ -92,7 +92,7 @@ int MPID_nem_mxm_iSendContig(MPIDI_VC_t * vc, MPID_Request * sreq, void *hdr, MP
#undef FUNCNAME
#define FUNCNAME MPID_nem_mxm_iStartContigMsg
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_mxm_iStartContigMsg(MPIDI_VC_t * vc, void *hdr, MPIDI_msg_sz_t hdr_sz, void *data,
MPIDI_msg_sz_t data_sz, MPID_Request ** sreq_ptr)
{
@@ -157,7 +157,7 @@ int MPID_nem_mxm_iStartContigMsg(MPIDI_VC_t * vc, void *hdr, MPIDI_msg_sz_t hdr_
#undef FUNCNAME
#define FUNCNAME MPID_nem_mxm_SendNoncontig
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_mxm_SendNoncontig(MPIDI_VC_t * vc, MPID_Request * sreq, void *hdr,
MPIDI_msg_sz_t hdr_sz)
{
@@ -235,7 +235,7 @@ int MPID_nem_mxm_SendNoncontig(MPIDI_VC_t * vc, MPID_Request * sreq, void *hdr,
#undef FUNCNAME
#define FUNCNAME MPID_nem_mxm_send
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_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, MPID_Request ** sreq_ptr)
{
@@ -338,7 +338,7 @@ int MPID_nem_mxm_send(MPIDI_VC_t * vc, const void *buf, MPI_Aint count, MPI_Data
#undef FUNCNAME
#define FUNCNAME MPID_nem_mxm_ssend
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_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, MPID_Request ** sreq_ptr)
{
@@ -441,7 +441,7 @@ int MPID_nem_mxm_ssend(MPIDI_VC_t * vc, const void *buf, MPI_Aint count, MPI_Dat
#undef FUNCNAME
#define FUNCNAME MPID_nem_mxm_isend
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_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, MPID_Request ** sreq_ptr)
{
@@ -544,7 +544,7 @@ int MPID_nem_mxm_isend(MPIDI_VC_t * vc, const void *buf, MPI_Aint count, MPI_Dat
#undef FUNCNAME
#define FUNCNAME MPID_nem_mxm_issend
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_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,
MPID_Request ** sreq_ptr)
diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_init.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_init.c
index a26cf3e..f4fa90b 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_init.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_init.c
@@ -94,7 +94,7 @@ static MPIDI_CH3_PktHandler_Fcn *MPID_nem_ptl_pkt_handlers[2]; /* for CANCEL_SEN
#undef FUNCNAME
#define FUNCNAME get_target_info
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int get_target_info(int rank, ptl_process_t *id, ptl_pt_index_t local_data_pt, ptl_pt_index_t *target_data_pt,
ptl_pt_index_t *target_control_pt)
{
@@ -142,7 +142,7 @@ static int get_target_info(int rank, ptl_process_t *id, ptl_pt_index_t local_dat
#undef FUNCNAME
#define FUNCNAME ptl_init
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int ptl_init(MPIDI_PG_t *pg_p, int pg_rank, char **bc_val_p, int *val_max_sz_p)
{
int mpi_errno = MPI_SUCCESS;
@@ -362,7 +362,7 @@ static int ptl_finalize(void)
#undef FUNCNAME
#define FUNCNAME get_business_card
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int get_business_card(int my_rank, char **bc_val_p, int *val_max_sz_p)
{
int mpi_errno = MPI_SUCCESS;
@@ -434,7 +434,7 @@ static int get_business_card(int my_rank, char **bc_val_p, int *val_max_sz_p)
#undef FUNCNAME
#define FUNCNAME connect_to_root
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int connect_to_root(const char *business_card, MPIDI_VC_t *new_vc)
{
int mpi_errno = MPI_SUCCESS;
@@ -455,7 +455,7 @@ static int connect_to_root(const char *business_card, MPIDI_VC_t *new_vc)
#undef FUNCNAME
#define FUNCNAME vc_init
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int vc_init(MPIDI_VC_t *vc)
{
int mpi_errno = MPI_SUCCESS;
@@ -500,7 +500,7 @@ static int vc_init(MPIDI_VC_t *vc)
#undef FUNCNAME
#define FUNCNAME vc_destroy
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int vc_destroy(MPIDI_VC_t *vc)
{
int mpi_errno = MPI_SUCCESS;
@@ -594,7 +594,7 @@ int vc_terminate(MPIDI_VC_t *vc)
#undef FUNCNAME
#define FUNCNAME MPID_nem_ptl_vc_terminated
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_ptl_vc_terminated(MPIDI_VC_t *vc)
{
/* This is called when the VC is to be terminated once all queued
@@ -656,7 +656,7 @@ int MPID_nem_ptl_init_id(MPIDI_VC_t *vc)
#undef FUNCNAME
#define FUNCNAME MPID_nem_ptl_get_ordering
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_ptl_get_ordering(int *ordering)
{
(*ordering) = 1;
diff --git a/src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c b/src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c
index 3aad34a..1e6bc28 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c
@@ -149,7 +149,7 @@ static inline int is_same_connection(sockconn_t *sc1, sockconn_t *sc2)
#undef FUNCNAME
#define FUNCNAME alloc_sc_plfd_tbls
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int alloc_sc_plfd_tbls (void)
{
int i, mpi_errno = MPI_SUCCESS, idx = -1;
@@ -196,7 +196,7 @@ static int alloc_sc_plfd_tbls (void)
#undef FUNCNAME
#define FUNCNAME free_sc_plfd_tbls
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int free_sc_plfd_tbls (void)
{
int mpi_errno = MPI_SUCCESS;
@@ -216,7 +216,7 @@ static int free_sc_plfd_tbls (void)
#undef FUNCNAME
#define FUNCNAME expand_sc_plfd_tbls
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int expand_sc_plfd_tbls (void)
{
int mpi_errno = MPI_SUCCESS;
@@ -303,7 +303,7 @@ static int expand_sc_plfd_tbls (void)
#undef FUNCNAME
#define FUNCNAME find_free_entry
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int find_free_entry(int *idx)
{
int mpi_errno = MPI_SUCCESS;
@@ -345,7 +345,7 @@ static int find_free_entry(int *idx)
#undef FUNCNAME
#define FUNCNAME found_better_sc
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int found_better_sc(sockconn_t *sc, sockconn_t **fnd_sc)
{
int i, found = FALSE;
@@ -429,7 +429,7 @@ fn_exit:
#undef FUNCNAME
#define FUNCNAME vc_is_in_shutdown
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int vc_is_in_shutdown(MPIDI_VC_t *vc)
{
int retval = FALSE;
@@ -452,7 +452,7 @@ static int vc_is_in_shutdown(MPIDI_VC_t *vc)
#undef FUNCNAME
#define FUNCNAME send_id_info
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int send_id_info(const sockconn_t *const sc)
{
int mpi_errno = MPI_SUCCESS;
@@ -513,7 +513,7 @@ static int send_id_info(const sockconn_t *const sc)
#undef FUNCNAME
#define FUNCNAME send_tmpvc_info
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int send_tmpvc_info(const sockconn_t *const sc)
{
int mpi_errno = MPI_SUCCESS;
@@ -562,7 +562,7 @@ static int send_tmpvc_info(const sockconn_t *const sc)
#undef FUNCNAME
#define FUNCNAME recv_id_or_tmpvc_info
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int recv_id_or_tmpvc_info(sockconn_t *const sc, int *got_sc_eof)
{
int mpi_errno = MPI_SUCCESS;
@@ -697,7 +697,7 @@ static int recv_id_or_tmpvc_info(sockconn_t *const sc, int *got_sc_eof)
#undef FUNCNAME
#define FUNCNAME send_cmd_pkt
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int send_cmd_pkt(int fd, MPIDI_nem_tcp_socksm_pkt_type_t pkt_type)
{
int mpi_errno = MPI_SUCCESS;
@@ -732,7 +732,7 @@ static int send_cmd_pkt(int fd, MPIDI_nem_tcp_socksm_pkt_type_t pkt_type)
#undef FUNCNAME
#define FUNCNAME recv_cmd_pkt
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int recv_cmd_pkt(int fd, MPIDI_nem_tcp_socksm_pkt_type_t *pkt_type)
{
int mpi_errno = MPI_SUCCESS;
@@ -769,7 +769,7 @@ static int recv_cmd_pkt(int fd, MPIDI_nem_tcp_socksm_pkt_type_t *pkt_type)
#undef FUNCNAME
#define FUNCNAME MPID_nem_tcp_connect
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_tcp_connect(struct MPIDI_VC *const vc)
{
MPID_nem_tcp_vc_area *const vc_tcp = VC_TCP(vc);
@@ -926,7 +926,7 @@ int MPID_nem_tcp_connect(struct MPIDI_VC *const vc)
#undef FUNCNAME
#define FUNCNAME cleanup_and_free_sc_plfd
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int cleanup_and_free_sc_plfd(sockconn_t *const sc)
{
int mpi_errno = MPI_SUCCESS;
@@ -1019,7 +1019,7 @@ int close_cleanup_and_free_sc_plfd(sockconn_t *const sc)
#undef FUNCNAME
#define FUNCNAME MPID_nem_tcp_cleanup
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_tcp_cleanup (struct MPIDI_VC *const vc)
{
int mpi_errno = MPI_SUCCESS, i;
@@ -1104,7 +1104,7 @@ int MPID_nem_tcp_ckpt_cleanup(void)
#undef FUNCNAME
#define FUNCNAME state_tc_c_cnting_handler
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int state_tc_c_cnting_handler(struct pollfd *const plfd, sockconn_t *const sc)
{
int mpi_errno = MPI_SUCCESS;
@@ -1142,7 +1142,7 @@ static int state_tc_c_cnting_handler(struct pollfd *const plfd, sockconn_t *cons
#undef FUNCNAME
#define FUNCNAME state_tc_c_cntd_handler
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int state_tc_c_cntd_handler(struct pollfd *const plfd, sockconn_t *const sc)
{
int mpi_errno = MPI_SUCCESS;
@@ -1191,7 +1191,7 @@ static int state_tc_c_cntd_handler(struct pollfd *const plfd, sockconn_t *const
#undef FUNCNAME
#define FUNCNAME state_c_ranksent_handler
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int state_c_ranksent_handler(struct pollfd *const plfd, sockconn_t *const sc)
{
MPIDI_VC_t *const sc_vc = sc->vc;
@@ -1247,7 +1247,7 @@ fn_fail:
#undef FUNCNAME
#define FUNCNAME state_c_tmpvcsent_handler
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int state_c_tmpvcsent_handler(struct pollfd *const plfd, sockconn_t *const sc)
{
MPIDI_VC_t *const sc_vc = sc->vc;
@@ -1298,7 +1298,7 @@ static int state_c_tmpvcsent_handler(struct pollfd *const plfd, sockconn_t *cons
#undef FUNCNAME
#define FUNCNAME state_l_cntd_handler
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int state_l_cntd_handler(struct pollfd *const plfd, sockconn_t *const sc)
{
int mpi_errno = MPI_SUCCESS;
@@ -1357,7 +1357,7 @@ static int state_l_cntd_handler(struct pollfd *const plfd, sockconn_t *const sc)
#undef FUNCNAME
#define FUNCNAME do_i_win
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int do_i_win(sockconn_t *rmt_sc)
{
int win = FALSE;
@@ -1388,7 +1388,7 @@ static int do_i_win(sockconn_t *rmt_sc)
#undef FUNCNAME
#define FUNCNAME state_l_rankrcvd_handler
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int state_l_rankrcvd_handler(struct pollfd *const plfd, sockconn_t *const sc)
{
MPIDI_VC_t *const sc_vc = sc->vc;
@@ -1459,7 +1459,7 @@ fn_fail:
#undef FUNCNAME
#define FUNCNAME state_l_tmpvcrcvd_handler
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int state_l_tmpvcrcvd_handler(struct pollfd *const plfd, sockconn_t *const sc)
{
MPIDI_VC_t *const sc_vc = sc->vc;
@@ -1507,7 +1507,7 @@ fn_exit:
#undef FUNCNAME
#define FUNCNAME MPID_nem_tcp_recv_handler
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int MPID_nem_tcp_recv_handler(sockconn_t *const sc)
{
/* as a result of handling a message, the sc table might get
@@ -1662,7 +1662,7 @@ fn_noncomm_fail: /* NON-comm related failures jump here */
#undef FUNCNAME
#define FUNCNAME state_commrdy_handler
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int state_commrdy_handler(struct pollfd *const plfd, sockconn_t *const sc)
{
int mpi_errno = MPI_SUCCESS;
@@ -1703,7 +1703,7 @@ static int state_commrdy_handler(struct pollfd *const plfd, sockconn_t *const sc
#undef FUNCNAME
#define FUNCNAME MPID_nem_tcp_sm_init
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_tcp_sm_init(void)
{
int mpi_errno = MPI_SUCCESS;
@@ -1750,7 +1750,7 @@ int MPID_nem_tcp_sm_init(void)
#undef FUNCNAME
#define FUNCNAME MPID_nem_tcp_sm_finalize
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_tcp_sm_finalize(void)
{
freenode_t *node;
@@ -1778,7 +1778,7 @@ Evaluate the need for it by testing and then do it, if needed.
#undef FUNCNAME
#define FUNCNAME MPID_nem_tcp_connpoll
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_tcp_connpoll(int in_blocking_poll)
{
int mpi_errno = MPI_SUCCESS, n, i;
@@ -1884,7 +1884,7 @@ int MPID_nem_tcp_connpoll(int in_blocking_poll)
#undef FUNCNAME
#define FUNCNAME state_listening_handler
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_tcp_state_listening_handler(struct pollfd *const unused_1, sockconn_t *const unused_2)
/* listener fd poll struct and sockconn structure */
{
@@ -1946,7 +1946,7 @@ int MPID_nem_tcp_state_listening_handler(struct pollfd *const unused_1, sockconn
#undef FUNCNAME
#define FUNCNAME error_closed
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int error_closed(struct MPIDI_VC *const vc, int req_errno)
{
int mpi_errno = MPI_SUCCESS;
@@ -1976,7 +1976,7 @@ static int error_closed(struct MPIDI_VC *const vc, int req_errno)
#undef FUNCNAME
#define FUNCNAME MPID_nem_tcp_cleanup_on_error
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_tcp_cleanup_on_error(MPIDI_VC_t *const vc, int req_errno)
{
int mpi_errno = MPI_SUCCESS;
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 05957ce..cad5758 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_ckpt.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_ckpt.c
@@ -14,7 +14,7 @@ MPIU_SUPPRESS_OSX_HAS_NO_SYMBOLS_WARNING;
#undef FUNCNAME
#define FUNCNAME MPID_nem_tcp_ckpt_pause_send_vc
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_tcp_ckpt_pause_send_vc(MPIDI_VC_t *vc)
{
int mpi_errno = MPI_SUCCESS;
@@ -36,7 +36,7 @@ fn_fail:
#undef FUNCNAME
#define FUNCNAME MPID_nem_tcp_ckpt_unpause_handler
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_tcp_pkt_unpause_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, MPIDI_msg_sz_t *buflen, MPID_Request **rreqp)
{
int mpi_errno = MPI_SUCCESS;
@@ -71,7 +71,7 @@ fn_fail:
#undef FUNCNAME
#define FUNCNAME MPID_nem_tcp_ckpt_continue_vc
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_tcp_ckpt_continue_vc(MPIDI_VC_t *vc)
{
int mpi_errno = MPI_SUCCESS;
@@ -105,7 +105,7 @@ fn_fail:
#undef FUNCNAME
#define FUNCNAME MPID_nem_tcp_ckpt_restart_vc
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_tcp_ckpt_restart_vc(MPIDI_VC_t *vc)
{
int mpi_errno = MPI_SUCCESS;
diff --git a/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_finalize.c b/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_finalize.c
index e80d33b..0b41683 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_finalize.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_finalize.c
@@ -9,7 +9,7 @@
#undef FUNCNAME
#define FUNCNAME MPID_nem_tcp_finalize
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_tcp_finalize(void)
{
int mpi_errno = MPI_SUCCESS;
diff --git a/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_getip.c b/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_getip.c
index db70f92..9354ae9 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_getip.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_getip.c
@@ -57,7 +57,7 @@ static int dbg_ifname = 0;
#undef FUNCNAME
#define FUNCNAME MPIDI_GetIPInterface
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_GetIPInterface( MPIDU_Sock_ifaddr_t *ifaddr, int *found )
{
int mpi_errno = MPI_SUCCESS;
diff --git a/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_init.c b/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_init.c
index dda2a01..9cbcf5b 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_init.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_init.c
@@ -116,7 +116,7 @@ static MPIDI_CH3_PktHandler_Fcn *pkt_handlers[MPIDI_NEM_TCP_PKT_NUM_TYPES ? MPID
#undef FUNCNAME
#define FUNCNAME set_up_listener
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int set_up_listener(void)
{
int mpi_errno = MPI_SUCCESS;
@@ -151,7 +151,7 @@ fn_fail:
#undef FUNCNAME
#define FUNCNAME MPID_nem_tcp_init
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_tcp_init (MPIDI_PG_t *pg_p, int pg_rank, char **bc_val_p, int *val_max_sz_p)
{
int mpi_errno = MPI_SUCCESS;
@@ -210,7 +210,7 @@ int MPID_nem_tcp_init (MPIDI_PG_t *pg_p, int pg_rank, char **bc_val_p, int *val_
#undef FUNCNAME
#define FUNCNAME ckpt_restart
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int ckpt_restart(void)
{
int mpi_errno = MPI_SUCCESS;
@@ -402,7 +402,7 @@ fn_fail:
#undef FUNCNAME
#define FUNCNAME MPID_nem_tcp_get_business_card
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_tcp_get_business_card (int my_rank, char **bc_val_p, int *val_max_sz_p)
{
int mpi_errno = MPI_SUCCESS;
@@ -463,7 +463,7 @@ int MPID_nem_tcp_get_business_card (int my_rank, char **bc_val_p, int *val_max_s
#undef FUNCNAME
#define FUNCNAME MPID_nem_tcp_connect_to_root
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_tcp_connect_to_root (const char *business_card, MPIDI_VC_t *new_vc)
{
int mpi_errno = MPI_SUCCESS;
@@ -495,7 +495,7 @@ int MPID_nem_tcp_connect_to_root (const char *business_card, MPIDI_VC_t *new_vc)
#undef FUNCNAME
#define FUNCNAME MPID_nem_tcp_vc_init
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_tcp_vc_init (MPIDI_VC_t *vc)
{
int mpi_errno = MPI_SUCCESS;
@@ -544,7 +544,7 @@ int MPID_nem_tcp_vc_init (MPIDI_VC_t *vc)
#undef FUNCNAME
#define FUNCNAME MPID_nem_tcp_vc_destroy
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_tcp_vc_destroy(MPIDI_VC_t *vc)
{
int mpi_errno = MPI_SUCCESS;
@@ -563,7 +563,7 @@ int MPID_nem_tcp_vc_destroy(MPIDI_VC_t *vc)
#undef FUNCNAME
#define FUNCNAME MPID_nem_tcp_get_addr_port_from_bc
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_tcp_get_addr_port_from_bc(const char *business_card, struct in_addr *addr, in_port_t *port)
{
int mpi_errno = MPI_SUCCESS;
@@ -613,7 +613,7 @@ int MPID_nem_tcp_get_addr_port_from_bc(const char *business_card, struct in_addr
#undef FUNCNAME
#define FUNCNAME MPID_nem_tcp_bind
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_tcp_bind (int sockfd)
{
int mpi_errno = MPI_SUCCESS;
@@ -704,7 +704,7 @@ int MPID_nem_tcp_vc_terminate(MPIDI_VC_t *vc)
#undef FUNCNAME
#define FUNCNAME MPID_nem_tcp_vc_terminated
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_tcp_vc_terminated(MPIDI_VC_t *vc)
{
/* This is called when the VC is to be terminated once all queued
@@ -731,7 +731,7 @@ int MPID_nem_tcp_vc_terminated(MPIDI_VC_t *vc)
#undef FUNCNAME
#define FUNCNAME MPID_nem_tcp_get_ordering
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_tcp_get_ordering(int *ordering)
{
(*ordering) = 1;
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 cc40a12..e140c01 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_send.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_send.c
@@ -39,7 +39,7 @@ static struct {MPID_nem_tcp_send_q_element_t *top;} free_buffers = {0};
#undef FUNCNAME
#define FUNCNAME MPID_nem_tcp_send_init
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_tcp_send_init(void)
{
int mpi_errno = MPI_SUCCESS;
@@ -66,7 +66,7 @@ int MPID_nem_tcp_send_init(void)
#undef FUNCNAME
#define FUNCNAME MPID_nem_tcp_send_queued
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_tcp_send_queued(MPIDI_VC_t *vc, MPIDI_nem_tcp_request_queue_t *send_queue)
{
int mpi_errno = MPI_SUCCESS;
@@ -182,7 +182,7 @@ fn_fail:
#undef FUNCNAME
#define FUNCNAME MPID_nem_tcp_send_finalize
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_tcp_send_finalize(void)
{
int mpi_errno = MPI_SUCCESS;
@@ -201,7 +201,7 @@ int MPID_nem_tcp_send_finalize(void)
#undef FUNCNAME
#define FUNCNAME MPID_nem_tcp_conn_est
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_tcp_conn_est (MPIDI_VC_t *vc)
{
int mpi_errno = MPI_SUCCESS;
@@ -227,7 +227,7 @@ int MPID_nem_tcp_conn_est (MPIDI_VC_t *vc)
#undef FUNCNAME
#define FUNCNAME MPID_nem_tcp_iStartContigMsg
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_tcp_iStartContigMsg(MPIDI_VC_t *vc, void *hdr, MPIDI_msg_sz_t hdr_sz, void *data, MPIDI_msg_sz_t data_sz,
MPID_Request **sreq_ptr)
{
@@ -367,7 +367,7 @@ fn_fail:
#undef FUNCNAME
#define FUNCNAME MPID_nem_tcp_iStartContigMsg_paused
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_tcp_iStartContigMsg_paused(MPIDI_VC_t *vc, void *hdr, MPIDI_msg_sz_t hdr_sz, void *data, MPIDI_msg_sz_t data_sz,
MPID_Request **sreq_ptr)
{
@@ -501,7 +501,7 @@ fn_fail:
#undef FUNCNAME
#define FUNCNAME MPID_nem_tcp_iSendContig
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_tcp_iSendContig(MPIDI_VC_t *vc, MPID_Request *sreq, void *hdr, MPIDI_msg_sz_t hdr_sz,
void *data, MPIDI_msg_sz_t data_sz)
{
@@ -688,7 +688,7 @@ fn_fail:
#undef FUNCNAME
#define FUNCNAME MPID_nem_tcp_SendNoncontig
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_tcp_SendNoncontig(MPIDI_VC_t *vc, MPID_Request *sreq, void *header, MPIDI_msg_sz_t hdr_sz)
{
int mpi_errno = MPI_SUCCESS;
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 fbc9d2c..0eb9372 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_utility.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_utility.c
@@ -14,7 +14,7 @@
#undef FUNCNAME
#define FUNCNAME MPID_nem_tcp_get_conninfo
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_tcp_get_conninfo (struct MPIDI_VC *vc, struct sockaddr_in *addr, char **pg_id, int *pg_rank)
{
int mpi_errno = MPI_SUCCESS;
@@ -32,7 +32,7 @@ int MPID_nem_tcp_get_conninfo (struct MPIDI_VC *vc, struct sockaddr_in *addr, ch
#undef FUNCNAME
#define FUNCNAME MPID_nem_tcp_get_vc_from_conninfo
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_tcp_get_vc_from_conninfo (char *pg_id, int pg_rank, struct MPIDI_VC **vc)
{
int mpi_errno = MPI_SUCCESS;
@@ -61,7 +61,7 @@ int MPID_nem_tcp_get_vc_from_conninfo (char *pg_id, int pg_rank, struct MPIDI_VC
#undef FUNCNAME
#define FUNCNAME set_sockopts
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_tcp_set_sockopts (int fd)
{
int mpi_errno = MPI_SUCCESS;
@@ -139,7 +139,7 @@ actually done now in this function.
#undef FUNCNAME
#define FUNCNAME MPID_nem_tcp_check_sock_status
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
MPID_NEM_TCP_SOCK_STATUS_t
MPID_nem_tcp_check_sock_status(const struct pollfd *const plfd)
{
@@ -174,7 +174,7 @@ MPID_nem_tcp_check_sock_status(const struct pollfd *const plfd)
#undef FUNCNAME
#define FUNCNAME MPID_nem_tcp_is_sock_connected
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_tcp_is_sock_connected(int fd)
{
int rc = FALSE;
@@ -205,7 +205,7 @@ int MPID_nem_tcp_is_sock_connected(int fd)
#undef FUNCNAME
#define FUNCNAME MPID_nem_dbg_print_all_sendq
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
void MPID_nem_tcp_vc_dbg_print_sendq(FILE *stream, MPIDI_VC_t *vc)
{
int i;
diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_finalize.c b/src/mpid/ch3/channels/nemesis/src/ch3_finalize.c
index cdfbe23..eb410bd 100644
--- a/src/mpid/ch3/channels/nemesis/src/ch3_finalize.c
+++ b/src/mpid/ch3/channels/nemesis/src/ch3_finalize.c
@@ -9,7 +9,7 @@
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_Finalize
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_Finalize(void)
{
int mpi_errno = MPI_SUCCESS;
diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_init.c b/src/mpid/ch3/channels/nemesis/src/ch3_init.c
index 221a23a..99f7bc6 100644
--- a/src/mpid/ch3/channels/nemesis/src/ch3_init.c
+++ b/src/mpid/ch3/channels/nemesis/src/ch3_init.c
@@ -22,7 +22,7 @@ static int nemesis_initialized = 0;
#undef FUNCNAME
#define FUNCNAME split_type
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#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)
{
@@ -73,7 +73,7 @@ static MPID_CommOps comm_fns = {
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_Init
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_Init(int has_parent, MPIDI_PG_t *pg_p, int pg_rank)
{
int mpi_errno = MPI_SUCCESS;
@@ -129,7 +129,7 @@ int MPIDI_CH3_PortFnsInit( MPIDI_PortFns *portFns )
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_Get_business_card
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_Get_business_card(int myRank, char *value, int length)
{
int mpi_errno = MPI_SUCCESS;
@@ -151,7 +151,7 @@ fn_fail:
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_VC_Init
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_VC_Init( MPIDI_VC_t *vc )
{
int mpi_errno = MPI_SUCCESS;
@@ -197,7 +197,7 @@ int MPIDI_CH3_VC_Init( MPIDI_VC_t *vc )
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_VC_Destroy
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_VC_Destroy(MPIDI_VC_t *vc )
{
int mpi_errno = MPI_SUCCESS;
@@ -223,7 +223,7 @@ fn_exit:
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_Connect_to_root
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_Connect_to_root (const char *port_name, MPIDI_VC_t **new_vc)
{
int mpi_errno = MPI_SUCCESS;
@@ -315,7 +315,7 @@ static struct {initcomp_cb_t *top;} initcomp_cb_stack = {0};
#undef FUNCNAME
#define FUNCNAME MPID_nem_register_initcomp_cb
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_register_initcomp_cb(int (* callback)(void))
{
int mpi_errno = MPI_SUCCESS;
@@ -341,7 +341,7 @@ int MPID_nem_register_initcomp_cb(int (* callback)(void))
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_InitCompleted
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_InitCompleted(void)
{
int mpi_errno = MPI_SUCCESS;
diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_isend.c b/src/mpid/ch3/channels/nemesis/src/ch3_isend.c
index 234fc4d..91594e0 100644
--- a/src/mpid/ch3/channels/nemesis/src/ch3_isend.c
+++ b/src/mpid/ch3/channels/nemesis/src/ch3_isend.c
@@ -14,7 +14,7 @@
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_iSend
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_iSend (MPIDI_VC_t *vc, MPID_Request *sreq, void * hdr, MPIDI_msg_sz_t hdr_sz)
{
int mpi_errno = MPI_SUCCESS;
diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_isendv.c b/src/mpid/ch3/channels/nemesis/src/ch3_isendv.c
index 50cb7af..b98455e 100644
--- a/src/mpid/ch3/channels/nemesis/src/ch3_isendv.c
+++ b/src/mpid/ch3/channels/nemesis/src/ch3_isendv.c
@@ -16,7 +16,7 @@ extern void *MPIDI_CH3_packet_buffer;
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_iSendv
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_iSendv (MPIDI_VC_t *vc, MPID_Request *sreq, MPID_IOV *iov, int n_iov)
{
int mpi_errno = MPI_SUCCESS;
diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_istartmsg.c b/src/mpid/ch3/channels/nemesis/src/ch3_istartmsg.c
index db1df84..3bb91aa 100644
--- a/src/mpid/ch3/channels/nemesis/src/ch3_istartmsg.c
+++ b/src/mpid/ch3/channels/nemesis/src/ch3_istartmsg.c
@@ -23,7 +23,7 @@
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_iStartMsg
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_iStartMsg (MPIDI_VC_t *vc, void *hdr, MPIDI_msg_sz_t hdr_sz, MPID_Request **sreq_ptr)
{
int mpi_errno = MPI_SUCCESS;
diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_istartmsgv.c b/src/mpid/ch3/channels/nemesis/src/ch3_istartmsgv.c
index 09e3c34..54835c2 100644
--- a/src/mpid/ch3/channels/nemesis/src/ch3_istartmsgv.c
+++ b/src/mpid/ch3/channels/nemesis/src/ch3_istartmsgv.c
@@ -29,7 +29,7 @@
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_iStartMsgv
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_iStartMsgv (MPIDI_VC_t *vc, MPID_IOV *iov, int n_iov, MPID_Request **sreq_ptr)
{
MPID_Request * sreq = *sreq_ptr = NULL;
diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_progress.c b/src/mpid/ch3/channels/nemesis/src/ch3_progress.c
index 2e855f1..367bf40 100644
--- a/src/mpid/ch3/channels/nemesis/src/ch3_progress.c
+++ b/src/mpid/ch3/channels/nemesis/src/ch3_progress.c
@@ -287,7 +287,7 @@ int MPIDI_CH3I_Shm_send_progress(void)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Progress_register_hook
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3I_Progress_register_hook(int (*progress_fn)(int*))
{
int mpi_errno = MPI_SUCCESS;
@@ -322,7 +322,7 @@ int MPIDI_CH3I_Progress_register_hook(int (*progress_fn)(int*))
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Progress_deregister_hook
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3I_Progress_deregister_hook(int (*progress_fn)(int*))
{
int mpi_errno = MPI_SUCCESS;
@@ -354,7 +354,7 @@ int MPIDI_CH3I_Progress_deregister_hook(int (*progress_fn)(int*))
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Progress
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3I_Progress (MPID_Progress_state *progress_state, int is_blocking)
{
int mpi_errno = MPI_SUCCESS;
@@ -607,7 +607,7 @@ int MPIDI_CH3I_Progress (MPID_Progress_state *progress_state, int is_blocking)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Progress_delay
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int MPIDI_CH3I_Progress_delay(unsigned int completion_count)
{
int mpi_errno = MPI_SUCCESS;
@@ -630,7 +630,7 @@ static int MPIDI_CH3I_Progress_delay(unsigned int completion_count)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Progress_continue
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int MPIDI_CH3I_Progress_continue(unsigned int completion_count/*unused*/)
{
int mpi_errno = MPI_SUCCESS;
@@ -654,7 +654,7 @@ static int MPIDI_CH3I_Progress_continue(unsigned int completion_count/*unused*/)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Progress_wakeup
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
void MPIDI_CH3I_Progress_wakeup(void)
{
MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3I_PROGRESS_WAKEUP);
@@ -670,7 +670,7 @@ void MPIDI_CH3I_Progress_wakeup(void)
#undef FUNCNAME
#define FUNCNAME MPID_nem_handle_pkt
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_handle_pkt(MPIDI_VC_t *vc, char *buf, MPIDI_msg_sz_t buflen)
{
int mpi_errno = MPI_SUCCESS;
@@ -873,7 +873,7 @@ int MPID_nem_handle_pkt(MPIDI_VC_t *vc, char *buf, MPIDI_msg_sz_t buflen)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Progress_init
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3I_Progress_init(void)
{
int mpi_errno = MPI_SUCCESS;
@@ -934,7 +934,7 @@ int MPIDI_CH3I_Progress_init(void)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Progress_finalize
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3I_Progress_finalize(void)
{
int mpi_errno = MPI_SUCCESS;
@@ -993,7 +993,7 @@ static int shm_connection_terminated(MPIDI_VC_t * vc)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_Connection_terminate
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_Connection_terminate(MPIDI_VC_t * vc)
{
int mpi_errno = MPI_SUCCESS;
@@ -1115,7 +1115,7 @@ int MPIDI_CH3I_Complete_sendq_with_error(MPIDI_VC_t * vc)
#undef FUNCNAME
#define FUNCNAME pkt_NETMOD_handler
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int pkt_NETMOD_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, MPIDI_msg_sz_t *buflen, MPID_Request **rreqp)
{
int mpi_errno = MPI_SUCCESS;
@@ -1138,7 +1138,7 @@ fn_exit:
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Register_anysource_notification
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3I_Register_anysource_notification(void (*enqueue_fn)(MPID_Request *rreq), int (*dequeue_fn)(MPID_Request *rreq))
{
int mpi_errno = MPI_SUCCESS;
@@ -1163,7 +1163,7 @@ int MPIDI_CH3I_Register_anysource_notification(void (*enqueue_fn)(MPID_Request *
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Anysource_posted
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static void anysource_posted(MPID_Request *rreq)
{
qn_ent_t *ent = qn_head;
@@ -1182,7 +1182,7 @@ static void anysource_posted(MPID_Request *rreq)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Anysource_matched
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int anysource_matched(MPID_Request *rreq)
{
int matched = FALSE;
@@ -1212,7 +1212,7 @@ static int anysource_matched(MPID_Request *rreq)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Posted_recv_enqueued
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
void MPIDI_CH3I_Posted_recv_enqueued(MPID_Request *rreq)
{
MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3I_POSTED_RECV_ENQUEUED);
@@ -1278,7 +1278,7 @@ void MPIDI_CH3I_Posted_recv_enqueued(MPID_Request *rreq)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Posted_recv_dequeued
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3I_Posted_recv_dequeued(MPID_Request *rreq)
{
int local_rank = -1;
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 a71ab58..2b1a1a8 100644
--- a/src/mpid/ch3/channels/nemesis/src/ch3_rma_shm.c
+++ b/src/mpid/ch3/channels/nemesis/src/ch3_rma_shm.c
@@ -11,7 +11,7 @@
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_Win_shared_query
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_SHM_Win_shared_query(MPID_Win * win_ptr, int target_rank, MPI_Aint * size,
int *disp_unit, void *baseptr)
{
@@ -66,7 +66,7 @@ int MPIDI_CH3_SHM_Win_shared_query(MPID_Win * win_ptr, int target_rank, MPI_Aint
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_SHM_Win_free
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_SHM_Win_free(MPID_Win ** win_ptr)
{
int mpi_errno = MPI_SUCCESS;
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 eadd59d..e901c7d 100644
--- a/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c
+++ b/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c
@@ -32,7 +32,7 @@ static int MPIDI_CH3I_Win_gather_info(void *base, MPI_Aint size, int disp_unit,
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_Win_fns_init
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_Win_fns_init(MPIDI_CH3U_Win_fns_t * win_fns)
{
int mpi_errno = MPI_SUCCESS;
@@ -54,7 +54,7 @@ int MPIDI_CH3_Win_fns_init(MPIDI_CH3U_Win_fns_t * win_fns)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_Win_hooks_init
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_Win_hooks_init(MPIDI_CH3U_Win_hooks_t * win_hooks)
{
int mpi_errno = MPI_SUCCESS;
@@ -76,7 +76,7 @@ int MPIDI_CH3_Win_hooks_init(MPIDI_CH3U_Win_hooks_t * win_hooks)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_Win_pkt_orderings_init
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_Win_pkt_orderings_init(MPIDI_CH3U_Win_pkt_ordering_t * win_pkt_orderings)
{
int mpi_errno = MPI_SUCCESS;
@@ -111,7 +111,7 @@ int MPIDI_CH3_Win_pkt_orderings_init(MPIDI_CH3U_Win_pkt_ordering_t * win_pkt_ord
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_Win_init
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_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)
{
@@ -142,7 +142,7 @@ static int MPIDI_CH3I_Win_init(MPI_Aint size, int disp_unit, int create_flavor,
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_SHM_Wins_match
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int MPIDI_CH3I_SHM_Wins_match(MPID_Win ** win_ptr, MPID_Win ** matched_win,
MPI_Aint ** base_shm_offs_ptr)
{
@@ -284,7 +284,7 @@ static int MPIDI_CH3I_SHM_Wins_match(MPID_Win ** win_ptr, MPID_Win ** matched_wi
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Win_detect_shm
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int MPIDI_CH3I_Win_detect_shm(MPID_Win ** win_ptr)
{
int mpi_errno = MPI_SUCCESS;
@@ -345,7 +345,7 @@ static int MPIDI_CH3I_Win_detect_shm(MPID_Win ** win_ptr)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Win_gather_info
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_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)
{
@@ -488,7 +488,7 @@ static int MPIDI_CH3I_Win_gather_info(void *base, MPI_Aint size, int disp_unit,
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Win_allocate_shm
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_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)
{
diff --git a/src/mpid/ch3/channels/nemesis/src/ch3i_comm.c b/src/mpid/ch3/channels/nemesis/src/ch3i_comm.c
index 01f43c2..4ff26cd 100644
--- a/src/mpid/ch3/channels/nemesis/src/ch3i_comm.c
+++ b/src/mpid/ch3/channels/nemesis/src/ch3i_comm.c
@@ -19,7 +19,7 @@ UT_array *coll_fns_array = NULL;
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_comm_create
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3I_comm_create(MPID_Comm *comm, void *param)
{
int mpi_errno = MPI_SUCCESS;
@@ -85,7 +85,7 @@ int MPIDI_CH3I_comm_create(MPID_Comm *comm, void *param)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_comm_destroy
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3I_comm_destroy(MPID_Comm *comm, void *param)
{
int mpi_errno = MPI_SUCCESS;
@@ -123,7 +123,7 @@ int MPIDI_CH3I_comm_destroy(MPID_Comm *comm, void *param)
#undef FUNCNAME
#define FUNCNAME alloc_barrier_vars
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int alloc_barrier_vars (MPID_Comm *comm, MPID_nem_barrier_vars_t **vars)
{
int mpi_errno = MPI_SUCCESS;
@@ -160,7 +160,7 @@ static int alloc_barrier_vars (MPID_Comm *comm, MPID_nem_barrier_vars_t **vars)
#undef FUNCNAME
#define FUNCNAME barrier
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int barrier(MPID_Comm *comm_ptr, mpir_errflag_t *errflag)
{
int mpi_errno = MPI_SUCCESS;
@@ -230,7 +230,7 @@ static int barrier(MPID_Comm *comm_ptr, mpir_errflag_t *errflag)
#undef FUNCNAME
#define FUNCNAME MPID_nem_barrier_vars_init
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_barrier_vars_init (MPID_nem_barrier_vars_t *barrier_region)
{
int mpi_errno = MPI_SUCCESS;
@@ -276,7 +276,7 @@ static int nem_coll_finalize(void *param ATTRIBUTE((unused)))
#undef FUNCNAME
#define FUNCNAME MPID_nem_coll_init
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_coll_init(void)
{
int mpi_errno = MPI_SUCCESS;
diff --git a/src/mpid/ch3/channels/nemesis/src/ch3i_eagernoncontig.c b/src/mpid/ch3/channels/nemesis/src/ch3i_eagernoncontig.c
index b7770fb..76814d5 100644
--- a/src/mpid/ch3/channels/nemesis/src/ch3i_eagernoncontig.c
+++ b/src/mpid/ch3/channels/nemesis/src/ch3i_eagernoncontig.c
@@ -14,7 +14,7 @@
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_SendNoncontig
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
/* 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. */
diff --git a/src/mpid/ch3/channels/nemesis/src/mpid_nem_alloc.c b/src/mpid/ch3/channels/nemesis/src/mpid_nem_alloc.c
index f9fad4a..0494bf3 100644
--- a/src/mpid/ch3/channels/nemesis/src/mpid_nem_alloc.c
+++ b/src/mpid/ch3/channels/nemesis/src/mpid_nem_alloc.c
@@ -69,7 +69,7 @@ static asym_check_region* asym_check_region_p = NULL;
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Seg_alloc
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3I_Seg_alloc(size_t len, void **ptr_p)
{
int mpi_errno = MPI_SUCCESS;
@@ -122,7 +122,7 @@ int MPIDI_CH3I_Seg_alloc(size_t len, void **ptr_p)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Seg_commit
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3I_Seg_commit(MPID_nem_seg_ptr_t memory, int num_local, int local_rank)
{
int mpi_errno = MPI_SUCCESS;
@@ -446,7 +446,7 @@ int MPIDI_CH3I_Seg_commit(MPID_nem_seg_ptr_t memory, int num_local, int local_ra
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Seg_destroy
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3I_Seg_destroy(void)
{
int mpi_errno = MPI_SUCCESS;
@@ -477,7 +477,7 @@ int MPIDI_CH3I_Seg_destroy(void)
#undef FUNCNAME
#define FUNCNAME check_alloc
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int check_alloc(int num_local, int local_rank)
{
int mpi_errno = MPI_SUCCESS;
diff --git a/src/mpid/ch3/channels/nemesis/src/mpid_nem_barrier.c b/src/mpid/ch3/channels/nemesis/src/mpid_nem_barrier.c
index b355a38..f2f170d 100644
--- a/src/mpid/ch3/channels/nemesis/src/mpid_nem_barrier.c
+++ b/src/mpid/ch3/channels/nemesis/src/mpid_nem_barrier.c
@@ -13,7 +13,7 @@ static int barrier_init = 0;
#undef FUNCNAME
#define FUNCNAME MPID_nem_barrier_init
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_barrier_init(MPID_nem_barrier_t *barrier_region, int init_values)
{
MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_BARRIER_INIT);
@@ -37,7 +37,7 @@ int MPID_nem_barrier_init(MPID_nem_barrier_t *barrier_region, int init_values)
#undef FUNCNAME
#define FUNCNAME MPID_nem_barrier
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
/* FIXME: this is not a scalable algorithm because everyone is polling on the same cacheline */
int MPID_nem_barrier(void)
{
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 ac29029..3438287 100644
--- a/src/mpid/ch3/channels/nemesis/src/mpid_nem_ckpt.c
+++ b/src/mpid/ch3/channels/nemesis/src/mpid_nem_ckpt.c
@@ -152,7 +152,7 @@ static int ckpt_cb(void *arg)
#undef FUNCNAME
#define FUNCNAME MPIDI_nem_ckpt_init
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_nem_ckpt_init(void)
{
int mpi_errno = MPI_SUCCESS;
@@ -190,7 +190,7 @@ int MPIDI_nem_ckpt_init(void)
#undef FUNCNAME
#define FUNCNAME MPIDI_nem_ckpt_finalize
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_nem_ckpt_finalize(void)
{
int mpi_errno = MPI_SUCCESS;
@@ -214,7 +214,7 @@ int MPIDI_nem_ckpt_finalize(void)
#undef FUNCNAME
#define FUNCNAME reinit_pmi
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int reinit_pmi(void)
{
int ret;
@@ -272,7 +272,7 @@ static int reinit_pmi(void)
#undef FUNCNAME
#define FUNCNAME restore_env
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int restore_env(pid_t parent_pid, int rank)
{
FILE *f;
@@ -316,7 +316,7 @@ typedef struct sock_ident {
#undef FUNCNAME
#define FUNCNAME open_io_socket
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int open_io_socket(socktype_t socktype, int rank, int dupfd)
{
int fd;
@@ -379,7 +379,7 @@ fn_exit:
#undef FUNCNAME
#define FUNCNAME restore_stdinouterr
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int restore_stdinouterr(int rank)
{
int ret;
@@ -404,7 +404,7 @@ static int restore_stdinouterr(int rank)
#undef FUNCNAME
#define FUNCNAME MPIDI_nem_ckpt_start
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_nem_ckpt_start(void)
{
int mpi_errno = MPI_SUCCESS;
@@ -466,7 +466,7 @@ fn_fail:
#undef FUNCNAME
#define FUNCNAME MPIDI_nem_ckpt_finish
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_nem_ckpt_finish(void)
{
int mpi_errno = MPI_SUCCESS;
@@ -527,7 +527,7 @@ fn_fail:
#undef FUNCNAME
#define FUNCNAME pkt_ckpt_marker_handler
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int pkt_ckpt_marker_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, MPIDI_msg_sz_t *buflen, MPID_Request **req)
{
int mpi_errno = MPI_SUCCESS;
@@ -570,7 +570,7 @@ fn_fail:
#undef FUNCNAME
#define FUNCNAME MPID_nem_ckpt_pkthandler_init
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_nem_ckpt_pkthandler_init(MPIDI_CH3_PktHandler_Fcn *pktArray[], int arraySize)
{
int mpi_errno = MPI_SUCCESS;
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 44dfd0b..d27417e 100644
--- a/src/mpid/ch3/channels/nemesis/src/mpid_nem_debug.c
+++ b/src/mpid/ch3/channels/nemesis/src/mpid_nem_debug.c
@@ -11,7 +11,7 @@
#undef FUNCNAME
#define FUNCNAME MPID_nem_dbg_dump_cell
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
void MPID_nem_dbg_dump_cell (volatile struct MPID_nem_cell *cell)
{
MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_DBG_DUMP_CELL);
@@ -56,7 +56,7 @@ void MPID_nem_dbg_print_vc_sendq(FILE *stream, MPIDI_VC_t *vc);
#undef FUNCNAME
#define FUNCNAME MPID_nem_dbg_print_all_sendq
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
void MPID_nem_dbg_print_vc_sendq(FILE *stream, MPIDI_VC_t *vc)
{
MPID_Request * sreq;
@@ -104,7 +104,7 @@ void MPID_nem_dbg_print_all_sendq(FILE *stream);
#undef FUNCNAME
#define FUNCNAME MPID_nem_dbg_print_all_sendq
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
void MPID_nem_dbg_print_all_sendq(FILE *stream)
{
int i;
diff --git a/src/mpid/ch3/channels/nemesis/src/mpid_nem_finalize.c b/src/mpid/ch3/channels/nemesis/src/mpid_nem_finalize.c
index 272ac50..d81833d 100644
--- a/src/mpid/ch3/channels/nemesis/src/mpid_nem_finalize.c
+++ b/src/mpid/ch3/channels/nemesis/src/mpid_nem_finalize.c
@@ -15,7 +15,7 @@
#undef FUNCNAME
#define FUNCNAME MPID_nem_finalize
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_finalize(void)
{
int mpi_errno = MPI_SUCCESS;
diff --git a/src/mpid/ch3/channels/nemesis/src/mpid_nem_init.c b/src/mpid/ch3/channels/nemesis/src/mpid_nem_init.c
index a92c763..29ba22c 100644
--- a/src/mpid/ch3/channels/nemesis/src/mpid_nem_init.c
+++ b/src/mpid/ch3/channels/nemesis/src/mpid_nem_init.c
@@ -82,7 +82,7 @@ unsigned long long *MPID_nem_fbox_fall_back_to_queue_count = NULL;
#undef FUNCNAME
#define FUNCNAME MPID_nem_init_stats
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int MPID_nem_init_stats(int n_local_ranks)
{
int mpi_errno = MPI_SUCCESS;
@@ -114,7 +114,7 @@ fn_fail:
#undef FUNCNAME
#define FUNCNAME MPID_nem_init
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int
MPID_nem_init(int pg_rank, MPIDI_PG_t *pg_p, int has_parent ATTRIBUTE((unused)))
{
@@ -434,7 +434,7 @@ MPID_nem_init(int pg_rank, MPIDI_PG_t *pg_p, int has_parent ATTRIBUTE((unused)))
#undef FUNCNAME
#define FUNCNAME MPID_nem_vc_init
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int
MPID_nem_vc_init (MPIDI_VC_t *vc)
{
@@ -618,7 +618,7 @@ MPID_nem_vc_init (MPIDI_VC_t *vc)
#undef FUNCNAME
#define FUNCNAME MPID_nem_vc_destroy
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int
MPID_nem_vc_destroy(MPIDI_VC_t *vc)
{
@@ -665,7 +665,7 @@ int MPID_nem_connect_to_root (const char *business_card, MPIDI_VC_t *new_vc)
#undef FUNCNAME
#define FUNCNAME get_local_procs
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int get_local_procs(MPIDI_PG_t *pg, int our_pg_rank, int *num_local_p,
int **local_procs_p, int *local_rank_p)
{
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 987f340..6fe1bd7 100644
--- a/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt.c
+++ b/src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt.c
@@ -52,7 +52,7 @@ static int pkt_COOKIE_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, MPIDI_msg_sz
#undef FUNCNAME
#define FUNCNAME MPID_nem_lmt_pkthandler_init
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_lmt_pkthandler_init(MPIDI_CH3_PktHandler_Fcn *pktArray[], int arraySize)
{
int mpi_errno = MPI_SUCCESS;
@@ -81,7 +81,7 @@ int MPID_nem_lmt_pkthandler_init(MPIDI_CH3_PktHandler_Fcn *pktArray[], int array
#undef FUNCNAME
#define FUNCNAME MPID_nem_lmt_RndvSend
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_lmt_RndvSend(MPID_Request **sreq_p, const void * buf, MPI_Aint count,
MPI_Datatype datatype, int dt_contig ATTRIBUTE((unused)),
MPIDI_msg_sz_t data_sz, MPI_Aint dt_true_lb ATTRIBUTE((unused)),
@@ -145,7 +145,7 @@ int MPID_nem_lmt_RndvSend(MPID_Request **sreq_p, const void * buf, MPI_Aint coun
#undef FUNCNAME
#define FUNCNAME MPID_nem_lmt_RndvRecv
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_lmt_RndvRecv(MPIDI_VC_t *vc, MPID_Request *rreq)
{
int mpi_errno = MPI_SUCCESS;
@@ -179,7 +179,7 @@ int MPID_nem_lmt_RndvRecv(MPIDI_VC_t *vc, MPID_Request *rreq)
#undef FUNCNAME
#define FUNCNAME pkt_RTS_handler
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int pkt_RTS_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, MPIDI_msg_sz_t *buflen, MPID_Request **rreqp)
{
int mpi_errno = MPI_SUCCESS;
@@ -300,7 +300,7 @@ static int pkt_RTS_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, MPIDI_msg_sz_t
#undef FUNCNAME
#define FUNCNAME pkt_CTS_handler
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int pkt_CTS_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, MPIDI_msg_sz_t *buflen, MPID_Request **rreqp)
{
MPID_nem_pkt_lmt_cts_t * const cts_pkt = (MPID_nem_pkt_lmt_cts_t *)pkt;
@@ -398,7 +398,7 @@ static int pkt_CTS_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, MPIDI_msg_sz_t
#undef FUNCNAME
#define FUNCNAME pkt_DONE_handler
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int pkt_DONE_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, MPIDI_msg_sz_t *buflen, MPID_Request **rreqp)
{
int mpi_errno = MPI_SUCCESS;
@@ -444,7 +444,7 @@ static int pkt_DONE_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, MPIDI_msg_sz_t
#undef FUNCNAME
#define FUNCNAME pkt_COOKIE_handler
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int pkt_COOKIE_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, MPIDI_msg_sz_t *buflen, MPID_Request **rreqp)
{
int mpi_errno = MPI_SUCCESS;
@@ -531,7 +531,7 @@ static int pkt_COOKIE_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, MPIDI_msg_sz
#undef FUNCNAME
#define FUNCNAME do_cts
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int do_cts(MPIDI_VC_t *vc, MPID_Request *rreq, int *complete)
{
int mpi_errno = MPI_SUCCESS;
@@ -580,7 +580,7 @@ static int do_cts(MPIDI_VC_t *vc, MPID_Request *rreq, int *complete)
#undef FUNCNAME
#define FUNCNAME do_send
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int do_send(MPIDI_VC_t *vc, MPID_Request *rreq, int *complete)
{
int mpi_errno = MPI_SUCCESS;
@@ -613,7 +613,7 @@ static int do_send(MPIDI_VC_t *vc, MPID_Request *rreq, int *complete)
#undef FUNCNAME
#define FUNCNAME do_cookie
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int do_cookie(MPIDI_VC_t *vc, MPID_Request *rreq, int *complete)
{
int mpi_errno = MPI_SUCCESS;
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 db2bf1f..4b98c1a 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
@@ -77,7 +77,7 @@ static void free_status_index(int index)
#undef FUNCNAME
#define FUNCNAME open_knem_dev
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int open_knem_dev(void)
{
int mpi_errno = MPI_SUCCESS;
@@ -112,7 +112,7 @@ fn_fail:
#undef FUNCNAME
#define FUNCNAME do_dma_send
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int do_dma_send(MPIDI_VC_t *vc, MPID_Request *sreq, int send_iov_n,
MPID_IOV send_iov[], knem_cookie_t *s_cookiep)
{
@@ -163,7 +163,7 @@ fn_exit:
#undef FUNCNAME
#define FUNCNAME do_dma_recv
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int do_dma_recv(int iov_n, MPID_IOV iov[], knem_cookie_t s_cookie, int nodma, volatile knem_status_t **status_p_p, knem_status_t *current_status_p)
{
int mpi_errno = MPI_SUCCESS;
@@ -227,7 +227,7 @@ fn_fail:
#undef FUNCNAME
#define FUNCNAME send_sreq_data
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int send_sreq_data(MPIDI_VC_t *vc, MPID_Request *sreq, knem_cookie_t *s_cookiep)
{
int mpi_errno = MPI_SUCCESS;
@@ -292,7 +292,7 @@ fn_fail:
#undef FUNCNAME
#define FUNCNAME check_req_complete
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline int check_req_complete(MPIDI_VC_t *vc, MPID_Request *req, int *complete)
{
int mpi_errno = MPI_SUCCESS;
@@ -316,7 +316,7 @@ fn_fail:
#undef FUNCNAME
#define FUNCNAME MPID_nem_lmt_dma_initiate_lmt
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_lmt_dma_initiate_lmt(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, MPID_Request *sreq)
{
int mpi_errno = MPI_SUCCESS;
@@ -347,7 +347,7 @@ fn_fail:
#undef FUNCNAME
#define FUNCNAME MPID_nem_lmt_dma_start_recv
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_lmt_dma_start_recv(MPIDI_VC_t *vc, MPID_Request *rreq, MPID_IOV s_cookie)
{
int mpi_errno = MPI_SUCCESS;
@@ -458,7 +458,7 @@ fn_fail:
#undef FUNCNAME
#define FUNCNAME MPID_nem_lmt_dma_done_send
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_lmt_dma_done_send(MPIDI_VC_t *vc, MPID_Request *sreq)
{
int mpi_errno = MPI_SUCCESS;
@@ -508,7 +508,7 @@ fn_fail:
#undef FUNCNAME
#define FUNCNAME MPID_nem_lmt_dma_handle_cookie
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_lmt_dma_handle_cookie(MPIDI_VC_t *vc, MPID_Request *req, MPID_IOV cookie)
{
int mpi_errno = MPI_SUCCESS;
@@ -550,7 +550,7 @@ fn_fail:
#undef FUNCNAME
#define FUNCNAME MPID_nem_lmt_dma_progress
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_lmt_dma_progress(void)
{
int mpi_errno = MPI_SUCCESS;
@@ -679,7 +679,7 @@ int MPID_nem_lmt_dma_vc_terminated(MPIDI_VC_t *vc)
#undef FUNCNAME
#define FUNCNAME MPID_nem_lmt_dma_start_send
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_lmt_dma_start_send(MPIDI_VC_t *vc, MPID_Request *req, MPID_IOV r_cookie)
{
int mpi_errno = MPI_SUCCESS;
@@ -695,7 +695,7 @@ int MPID_nem_lmt_dma_start_send(MPIDI_VC_t *vc, MPID_Request *req, MPID_IOV r_co
#undef FUNCNAME
#define FUNCNAME MPID_nem_lmt_dma_done_recv
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_lmt_dma_done_recv(MPIDI_VC_t *vc, MPID_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 b491936..84e77bc 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
@@ -118,7 +118,7 @@ static int MPID_nem_delete_shm_region(MPID_nem_copy_buf_t **buf, MPIU_SHMW_Hnd_t
#undef FUNCNAME
#define FUNCNAME MPID_nem_lmt_shm_initiate_lmt
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_lmt_shm_initiate_lmt(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, MPID_Request *req)
{
int mpi_errno = MPI_SUCCESS;
@@ -159,7 +159,7 @@ int MPID_nem_lmt_shm_initiate_lmt(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, MPID_Req
#undef FUNCNAME
#define FUNCNAME MPID_nem_lmt_shm_start_recv
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_lmt_shm_start_recv(MPIDI_VC_t *vc, MPID_Request *req, MPID_IOV s_cookie)
{
int mpi_errno = MPI_SUCCESS;
@@ -239,7 +239,7 @@ int MPID_nem_lmt_shm_start_recv(MPIDI_VC_t *vc, MPID_Request *req, MPID_IOV s_co
#undef FUNCNAME
#define FUNCNAME MPID_nem_lmt_shm_start_send
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_lmt_shm_start_send(MPIDI_VC_t *vc, MPID_Request *req, MPID_IOV r_cookie)
{
int mpi_errno = MPI_SUCCESS;
@@ -330,7 +330,7 @@ int MPID_nem_lmt_shm_start_send(MPIDI_VC_t *vc, MPID_Request *req, MPID_IOV r_co
#undef FUNCNAME
#define FUNCNAME get_next_req
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int get_next_req(MPIDI_VC_t *vc)
{
int mpi_errno = MPI_SUCCESS;
@@ -438,7 +438,7 @@ static int get_next_req(MPIDI_VC_t *vc)
#undef FUNCNAME
#define FUNCNAME lmt_shm_send_progress
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int lmt_shm_send_progress(MPIDI_VC_t *vc, MPID_Request *req, int *done)
{
int mpi_errno = MPI_SUCCESS;
@@ -525,7 +525,7 @@ static int lmt_shm_send_progress(MPIDI_VC_t *vc, MPID_Request *req, int *done)
#undef FUNCNAME
#define FUNCNAME lmt_shm_recv_progress
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int lmt_shm_recv_progress(MPIDI_VC_t *vc, MPID_Request *req, int *done)
{
int mpi_errno = MPI_SUCCESS;
@@ -654,7 +654,7 @@ static int lmt_shm_recv_progress(MPIDI_VC_t *vc, MPID_Request *req, int *done)
#undef FUNCNAME
#define FUNCNAME MPID_nem_lmt_shm_handle_cookie
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_lmt_shm_handle_cookie(MPIDI_VC_t *vc, MPID_Request *req, MPID_IOV cookie)
{
MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_LMT_SHM_HANDLE_COOKIE);
@@ -668,7 +668,7 @@ int MPID_nem_lmt_shm_handle_cookie(MPIDI_VC_t *vc, MPID_Request *req, MPID_IOV c
#undef FUNCNAME
#define FUNCNAME MPID_nem_lmt_shm_done_send
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_lmt_shm_done_send(MPIDI_VC_t *vc, MPID_Request *req)
{
MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_LMT_SHM_DONE_SEND);
@@ -682,7 +682,7 @@ int MPID_nem_lmt_shm_done_send(MPIDI_VC_t *vc, MPID_Request *req)
#undef FUNCNAME
#define FUNCNAME MPID_nem_lmt_shm_done_recv
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_lmt_shm_done_recv(MPIDI_VC_t *vc, MPID_Request *req)
{
MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_LMT_SHM_DONE_RECV);
@@ -696,7 +696,7 @@ int MPID_nem_lmt_shm_done_recv(MPIDI_VC_t *vc, MPID_Request *req)
#undef FUNCNAME
#define FUNCNAME MPID_nem_lmt_shm_progress_vc
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline int lmt_shm_progress_vc(MPIDI_VC_t *vc, int *done)
{
int mpi_errno = MPI_SUCCESS;
@@ -748,7 +748,7 @@ static inline int lmt_shm_progress_vc(MPIDI_VC_t *vc, int *done)
#undef FUNCNAME
#define FUNCNAME MPID_nem_lmt_shm_progress
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_lmt_shm_progress(void)
{
int mpi_errno = MPI_SUCCESS;
@@ -857,7 +857,7 @@ int MPID_nem_lmt_shm_vc_terminated(MPIDI_VC_t *vc)
#undef FUNCNAME
#define FUNCNAME MPID_nem_allocate_shm_region
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int MPID_nem_allocate_shm_region(MPID_nem_copy_buf_t **buf_p, MPIU_SHMW_Hnd_t handle)
{
int mpi_errno = MPI_SUCCESS;
@@ -884,7 +884,7 @@ static int MPID_nem_allocate_shm_region(MPID_nem_copy_buf_t **buf_p, MPIU_SHMW_H
#undef FUNCNAME
#define FUNCNAME MPID_nem_attach_shm_region
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int MPID_nem_attach_shm_region(MPID_nem_copy_buf_t **buf_p, MPIU_SHMW_Hnd_t handle)
{
int mpi_errno = MPI_SUCCESS;
@@ -914,7 +914,7 @@ static int MPID_nem_attach_shm_region(MPID_nem_copy_buf_t **buf_p, MPIU_SHMW_Hnd
#undef FUNCNAME
#define FUNCNAME MPID_nem_detach_shm_region
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int MPID_nem_detach_shm_region(MPID_nem_copy_buf_t **buf_p, MPIU_SHMW_Hnd_t handle)
{
int mpi_errno = MPI_SUCCESS;
@@ -935,7 +935,7 @@ static int MPID_nem_detach_shm_region(MPID_nem_copy_buf_t **buf_p, MPIU_SHMW_Hnd
#undef FUNCNAME
#define FUNCNAME MPID_nem_delete_shm_region
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int MPID_nem_delete_shm_region(MPID_nem_copy_buf_t **buf_p, MPIU_SHMW_Hnd_t *handle_p)
{
int mpi_errno = MPI_SUCCESS;
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 56431ec..96155fb 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
@@ -171,7 +171,7 @@ fn_exit:
#undef FUNCNAME
#define FUNCNAME MPID_nem_lmt_vmsplice_initiate_lmt
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_lmt_vmsplice_initiate_lmt(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, MPID_Request *sreq)
{
int mpi_errno = MPI_SUCCESS;
@@ -251,7 +251,7 @@ fn_exit:
#undef FUNCNAME
#define FUNCNAME MPID_nem_lmt_vmsplice_start_recv
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_lmt_vmsplice_start_recv(MPIDI_VC_t *vc, MPID_Request *rreq, MPID_IOV s_cookie)
{
int mpi_errno = MPI_SUCCESS;
@@ -373,7 +373,7 @@ fn_fail:
#undef FUNCNAME
#define FUNCNAME MPID_nem_lmt_vmsplice_start_send
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_lmt_vmsplice_start_send(MPIDI_VC_t *vc, MPID_Request *sreq, MPID_IOV r_cookie)
{
int mpi_errno = MPI_SUCCESS;
@@ -451,7 +451,7 @@ int MPIDI_CH3_MPID_nem_lmt_vmsplice_vc_terminated(MPIDI_VC_t *vc)
#undef FUNCNAME
#define FUNCNAME MPID_nem_lmt_vmsplice_done_recv
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_lmt_vmsplice_done_recv(MPIDI_VC_t *vc, MPID_Request *rreq)
{
MPIDI_STATE_DECL(MPID_STATE_MPID_NEM_LMT_VMSPLICE_DONE_RECV);
@@ -467,7 +467,7 @@ int MPID_nem_lmt_vmsplice_done_recv(MPIDI_VC_t *vc, MPID_Request *rreq)
#undef FUNCNAME
#define FUNCNAME MPID_nem_lmt_vmsplice_done_send
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_lmt_vmsplice_done_send(MPIDI_VC_t *vc, MPID_Request *sreq)
{
int mpi_errno = MPI_SUCCESS;
@@ -485,7 +485,7 @@ int MPID_nem_lmt_vmsplice_done_send(MPIDI_VC_t *vc, MPID_Request *sreq)
#undef FUNCNAME
#define FUNCNAME MPID_nem_lmt_vmsplice_handle_cookie
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_lmt_vmsplice_handle_cookie(MPIDI_VC_t *vc, MPID_Request *req, MPID_IOV cookie)
{
int mpi_errno = MPI_SUCCESS;
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 4bdaefb..35e56e6 100644
--- a/src/mpid/ch3/channels/nemesis/src/mpid_nem_mpich.c
+++ b/src/mpid/ch3/channels/nemesis/src/mpid_nem_mpich.c
@@ -26,7 +26,7 @@ unsigned short *MPID_nem_recv_seqno = 0;
#undef FUNCNAME
#define FUNCNAME MPID_nem_mpich_init
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int
MPID_nem_mpich_init(void)
{
@@ -78,7 +78,7 @@ fn_fail:
#undef FUNCNAME
#define FUNCNAME MPID_nem_send_iov
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_send_iov(MPIDI_VC_t *vc, MPID_Request **sreq_ptr, MPID_IOV *iov, int n_iov)
{
int mpi_errno = MPI_SUCCESS;
diff --git a/src/mpid/ch3/channels/nemesis/src/mpid_nem_mpich_rma.c b/src/mpid/ch3/channels/nemesis/src/mpid_nem_mpich_rma.c
index d13f7a7..8fb96c1 100644
--- a/src/mpid/ch3/channels/nemesis/src/mpid_nem_mpich_rma.c
+++ b/src/mpid/ch3/channels/nemesis/src/mpid_nem_mpich_rma.c
@@ -14,7 +14,7 @@
#undef FUNCNAME
#define FUNCNAME MPID_nem_mpich_alloc_win
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int
MPID_nem_mpich_alloc_win (void **buf, int len, MPID_nem_mpich_win_t **win)
{
@@ -46,7 +46,7 @@ MPID_nem_mpich_alloc_win (void **buf, int len, MPID_nem_mpich_win_t **win)
#undef FUNCNAME
#define FUNCNAME MPID_nem_mpich_free_win
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int
MPID_nem_mpich_free_win (MPID_nem_mpich_win_t *win)
{
@@ -76,7 +76,7 @@ MPID_nem_mpich_free_win (MPID_nem_mpich_win_t *win)
#undef FUNCNAME
#define FUNCNAME MPID_nem_mpich_attach_win
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int
MPID_nem_mpich_attach_win (void **buf, MPID_nem_mpich_win_t *remote_win)
{
@@ -108,7 +108,7 @@ MPID_nem_mpich_attach_win (void **buf, MPID_nem_mpich_win_t *remote_win)
#undef FUNCNAME
#define FUNCNAME MPID_nem_mpich_detach_win
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int
MPID_nem_mpich_detach_win (MPID_nem_mpich_win_t *remote_win)
{
@@ -134,7 +134,7 @@ MPID_nem_mpich_detach_win (MPID_nem_mpich_win_t *remote_win)
#undef FUNCNAME
#define FUNCNAME MPID_nem_mpich_win_put
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int
MPID_nem_mpich_win_put (void *s_buf, void *d_buf, int len, MPID_nem_mpich_win_t *remote_win)
{
@@ -161,7 +161,7 @@ MPID_nem_mpich_win_put (void *s_buf, void *d_buf, int len, MPID_nem_mpich_win_t
#undef FUNCNAME
#define FUNCNAME MPID_nem_mpich_win_putv
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int
MPID_nem_mpich_win_putv (struct iovec **s_iov, int *s_niov, struct iovec **d_iov, int *d_niov, MPID_nem_mpich_win_t *remote_win)
{
@@ -231,7 +231,7 @@ MPID_nem_mpich_win_putv (struct iovec **s_iov, int *s_niov, struct iovec **d_iov
#undef FUNCNAME
#define FUNCNAME MPID_nem_mpich_win_get
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int
MPID_nem_mpich_win_get (void *s_buf, void *d_buf, int len, MPID_nem_mpich_win_t *remote_win)
{
@@ -258,7 +258,7 @@ MPID_nem_mpich_win_get (void *s_buf, void *d_buf, int len, MPID_nem_mpich_win_t
#undef FUNCNAME
#define FUNCNAME MPID_nem_mpich_win_getv
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int
MPID_nem_mpich_win_getv (struct iovec **s_iov, int *s_niov, struct iovec **d_iov, int *d_niov, MPID_nem_mpich_win_t *remote_win)
{
@@ -334,7 +334,7 @@ MPID_nem_mpich_win_getv (struct iovec **s_iov, int *s_niov, struct iovec **d_iov
#undef FUNCNAME
#define FUNCNAME MPID_nem_mpich_serialize_win
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int
MPID_nem_mpich_serialize_win (void *buf, int buf_len, MPID_nem_mpich_win_t *win, int *len)
{
@@ -376,7 +376,7 @@ MPID_nem_mpich_serialize_win (void *buf, int buf_len, MPID_nem_mpich_win_t *win,
#undef FUNCNAME
#define FUNCNAME MPID_nem_mpich_serialize_win
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int
MPID_nem_mpich_deserialize_win (void *buf, int buf_len, MPID_nem_mpich_win_t **win)
{
@@ -424,7 +424,7 @@ MPID_nem_mpich_deserialize_win (void *buf, int buf_len, MPID_nem_mpich_win_t **w
#undef FUNCNAME
#define FUNCNAME MPID_nem_mpich_register_memory
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int
MPID_nem_mpich_register_memory (void *buf, int len)
{
@@ -445,7 +445,7 @@ MPID_nem_mpich_register_memory (void *buf, int len)
#undef FUNCNAME
#define FUNCNAME MPID_nem_mpich_deregister_memory
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int
MPID_nem_mpich_deregister_memory (void *buf, int len)
{
@@ -466,7 +466,7 @@ MPID_nem_mpich_deregister_memory (void *buf, int len)
#undef FUNCNAME
#define FUNCNAME MPID_nem_mpich_put
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int
MPID_nem_mpich_put (void *s_buf, void *d_buf, int len, int proc, int *completion_ctr)
{
@@ -504,7 +504,7 @@ MPID_nem_mpich_put (void *s_buf, void *d_buf, int len, int proc, int *completion
#undef FUNCNAME
#define FUNCNAME MPID_nem_mpich_putv
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int
MPID_nem_mpich_putv (struct iovec **s_iov, int *s_niov, struct iovec **d_iov, int *d_niov, int proc,
int *completion_ctr)
@@ -581,7 +581,7 @@ MPID_nem_mpich_putv (struct iovec **s_iov, int *s_niov, struct iovec **d_iov, in
#undef FUNCNAME
#define FUNCNAME MPID_nem_mpich_get
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int
MPID_nem_mpich_get (void *s_buf, void *d_buf, int len, int proc, int *completion_ctr)
{
@@ -619,7 +619,7 @@ MPID_nem_mpich_get (void *s_buf, void *d_buf, int len, int proc, int *completion
#undef FUNCNAME
#define FUNCNAME MPID_nem_mpich_getv
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int
MPID_nem_mpich_getv (struct iovec **s_iov, int *s_niov, struct iovec **d_iov, int *d_niov, int proc,
int *completion_ctr)
diff --git a/src/mpid/ch3/channels/nemesis/src/mpid_nem_network.c b/src/mpid/ch3/channels/nemesis/src/mpid_nem_network.c
index 468e58f..4dd5d50 100644
--- a/src/mpid/ch3/channels/nemesis/src/mpid_nem_network.c
+++ b/src/mpid/ch3/channels/nemesis/src/mpid_nem_network.c
@@ -36,7 +36,7 @@ MPID_nem_net_module_vc_dbg_print_sendq_t MPID_nem_net_module_vc_dbg_print_sendq
#undef FUNCNAME
#define FUNCNAME MPID_nem_choose_netmod
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_choose_netmod(void)
{
int mpi_errno = MPI_SUCCESS;
diff --git a/src/mpid/ch3/channels/nemesis/src/mpid_nem_network_poll.c b/src/mpid/ch3/channels/nemesis/src/mpid_nem_network_poll.c
index 00066a7..d2a8945 100644
--- a/src/mpid/ch3/channels/nemesis/src/mpid_nem_network_poll.c
+++ b/src/mpid/ch3/channels/nemesis/src/mpid_nem_network_poll.c
@@ -10,7 +10,7 @@
#undef FUNCNAME
#define FUNCNAME MPID_nem_network_poll
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_nem_network_poll(int in_blocking_progress)
{
return MPID_nem_netmod_func->poll(in_blocking_progress);
diff --git a/src/mpid/ch3/channels/sock/src/ch3_finalize.c b/src/mpid/ch3/channels/sock/src/ch3_finalize.c
index 27dfe72..1f1beee 100644
--- a/src/mpid/ch3/channels/sock/src/ch3_finalize.c
+++ b/src/mpid/ch3/channels/sock/src/ch3_finalize.c
@@ -10,7 +10,7 @@
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_Finalize
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_Finalize( void )
{
int mpi_errno = MPI_SUCCESS;
diff --git a/src/mpid/ch3/channels/sock/src/ch3_init.c b/src/mpid/ch3/channels/sock/src/ch3_init.c
index f777e37..f7367a9 100644
--- a/src/mpid/ch3/channels/sock/src/ch3_init.c
+++ b/src/mpid/ch3/channels/sock/src/ch3_init.c
@@ -20,7 +20,7 @@ char MPIDI_CH3_ABIVersion[] = "1.1";
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_Init
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_Init(int has_parent, MPIDI_PG_t * pg_p, int pg_rank )
{
int mpi_errno = MPI_SUCCESS;
diff --git a/src/mpid/ch3/channels/sock/src/ch3_isend.c b/src/mpid/ch3/channels/sock/src/ch3_isend.c
index f4f3a56..ae9340f 100644
--- a/src/mpid/ch3/channels/sock/src/ch3_isend.c
+++ b/src/mpid/ch3/channels/sock/src/ch3_isend.c
@@ -9,7 +9,7 @@
#undef FUNCNAME
#define FUNCNAME update_request
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static void update_request(MPID_Request * sreq, void * hdr,
MPIDI_msg_sz_t hdr_sz, MPIU_Size_t nb)
{
@@ -27,7 +27,7 @@ static void update_request(MPID_Request * sreq, void * hdr,
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_iSend
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_iSend(MPIDI_VC_t * vc, MPID_Request * sreq, void * hdr,
MPIDI_msg_sz_t hdr_sz)
{
diff --git a/src/mpid/ch3/channels/sock/src/ch3_isendv.c b/src/mpid/ch3/channels/sock/src/ch3_isendv.c
index c66fede..302060c 100644
--- a/src/mpid/ch3/channels/sock/src/ch3_isendv.c
+++ b/src/mpid/ch3/channels/sock/src/ch3_isendv.c
@@ -9,7 +9,7 @@
#undef FUNCNAME
#define FUNCNAME update_request
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static void update_request(MPID_Request * sreq, MPID_IOV * iov, int iov_count,
int iov_offset, MPIU_Size_t nb)
{
@@ -39,7 +39,7 @@ static void update_request(MPID_Request * sreq, MPID_IOV * iov, int iov_count,
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_iSendv
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_iSendv(MPIDI_VC_t * vc, MPID_Request * sreq,
MPID_IOV * iov, int n_iov)
{
diff --git a/src/mpid/ch3/channels/sock/src/ch3_istartmsg.c b/src/mpid/ch3/channels/sock/src/ch3_istartmsg.c
index 7f31cd8..88bfd0d 100644
--- a/src/mpid/ch3/channels/sock/src/ch3_istartmsg.c
+++ b/src/mpid/ch3/channels/sock/src/ch3_istartmsg.c
@@ -9,7 +9,7 @@
#undef FUNCNAME
#define FUNCNAME create_request
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static MPID_Request * create_request(void * hdr, MPIDI_msg_sz_t hdr_sz,
MPIU_Size_t nb)
{
@@ -48,7 +48,7 @@ static MPID_Request * create_request(void * hdr, MPIDI_msg_sz_t hdr_sz,
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_iStartMsg
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_iStartMsg(MPIDI_VC_t * vc, void * hdr, MPIDI_msg_sz_t hdr_sz,
MPID_Request ** sreq_ptr)
{
diff --git a/src/mpid/ch3/channels/sock/src/ch3_istartmsgv.c b/src/mpid/ch3/channels/sock/src/ch3_istartmsgv.c
index 0b9d402..eda2c53 100644
--- a/src/mpid/ch3/channels/sock/src/ch3_istartmsgv.c
+++ b/src/mpid/ch3/channels/sock/src/ch3_istartmsgv.c
@@ -9,7 +9,7 @@
#undef FUNCNAME
#define FUNCNAME create_request
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static MPID_Request * create_request(MPID_IOV * iov, int iov_count,
int iov_offset, MPIU_Size_t nb)
{
@@ -72,7 +72,7 @@ static MPID_Request * create_request(MPID_IOV * iov, int iov_count,
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_iStartMsgv
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_iStartMsgv(MPIDI_VC_t * vc, MPID_IOV * iov, int n_iov,
MPID_Request ** sreq_ptr)
{
diff --git a/src/mpid/ch3/channels/sock/src/ch3_progress.c b/src/mpid/ch3/channels/sock/src/ch3_progress.c
index f6adc49..88bb493 100644
--- a/src/mpid/ch3/channels/sock/src/ch3_progress.c
+++ b/src/mpid/ch3/channels/sock/src/ch3_progress.c
@@ -53,7 +53,7 @@ static progress_func_ptr_t progress_hooks[MAX_PROGRESS_HOOKS] = { NULL };
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3i_Progress_test
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int MPIDI_CH3i_Progress_test(void)
{
MPIDU_Sock_event_t event;
@@ -129,7 +129,7 @@ static int MPIDI_CH3i_Progress_test(void)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3i_Progress_wait
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int MPIDI_CH3i_Progress_wait(MPID_Progress_state * progress_state)
{
MPIDU_Sock_event_t event;
@@ -272,7 +272,7 @@ static int MPIDI_CH3i_Progress_wait(MPID_Progress_state * progress_state)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_Connection_terminate
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_Connection_terminate(MPIDI_VC_t * vc)
{
int mpi_errno = MPI_SUCCESS;
@@ -297,7 +297,7 @@ int MPIDI_CH3_Connection_terminate(MPIDI_VC_t * vc)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Progress_init
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3I_Progress_init(void)
{
int mpi_errno = MPI_SUCCESS;
@@ -347,7 +347,7 @@ int MPIDI_CH3I_Progress_init(void)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Progress_finalize
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3I_Progress_finalize(void)
{
int mpi_errno;
@@ -407,7 +407,7 @@ int MPIDI_CH3I_Progress_finalize(void)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Progress_wakeup
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
void MPIDI_CH3I_Progress_wakeup(void)
{
MPIU_DBG_MSG(CH3_OTHER,TYPICAL,"progress_wakeup called");
@@ -418,7 +418,7 @@ void MPIDI_CH3I_Progress_wakeup(void)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_Get_business_card
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_Get_business_card(int myRank, char *value, int length)
{
return MPIDI_CH3U_Get_business_card_sock(myRank, &value, &length);
@@ -428,7 +428,7 @@ int MPIDI_CH3_Get_business_card(int myRank, char *value, int length)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Progress_handle_sock_event
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int MPIDI_CH3I_Progress_handle_sock_event(MPIDU_Sock_event_t * event)
{
int mpi_errno = MPI_SUCCESS;
@@ -707,7 +707,7 @@ static int MPIDI_CH3I_Progress_handle_sock_event(MPIDU_Sock_event_t * event)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Progress_delay
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int MPIDI_CH3I_Progress_delay(unsigned int completion_count)
{
int mpi_errno = MPI_SUCCESS;
@@ -731,7 +731,7 @@ static int MPIDI_CH3I_Progress_delay(unsigned int completion_count)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Progress_continue
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int MPIDI_CH3I_Progress_continue(unsigned int completion_count)
{
int mpi_errno = MPI_SUCCESS;
@@ -757,7 +757,7 @@ static int MPIDI_CH3I_Progress_continue(unsigned int completion_count)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_VC_post_connect
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3I_VC_post_connect(MPIDI_VC_t * vc)
{
return MPIDI_CH3I_VC_post_sockconnect( vc );
@@ -768,7 +768,7 @@ int MPIDI_CH3I_VC_post_connect(MPIDI_VC_t * vc)
#undef FUNCNAME
#define FUNCNAME connection_pop_sendq_req
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline int connection_pop_sendq_req(MPIDI_CH3I_Connection_t * conn)
{
int mpi_errno = MPI_SUCCESS;
@@ -801,7 +801,7 @@ static inline int connection_pop_sendq_req(MPIDI_CH3I_Connection_t * conn)
#undef FUNCNAME
#define FUNCNAME connection_post_recv_pkt
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline int connection_post_recv_pkt(MPIDI_CH3I_Connection_t * conn)
{
int mpi_errno = MPI_SUCCESS;
@@ -941,7 +941,7 @@ int MPIDI_CH3I_Progress( int blocking, MPID_Progress_state *state )
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Progress_register_hook
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3I_Progress_register_hook(int (*progress_fn)(int*))
{
int mpi_errno = MPI_SUCCESS;
@@ -976,7 +976,7 @@ int MPIDI_CH3I_Progress_register_hook(int (*progress_fn)(int*))
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Progress_deregister_hook
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3I_Progress_deregister_hook(int (*progress_fn)(int*))
{
int mpi_errno = MPI_SUCCESS;
diff --git a/src/mpid/ch3/channels/sock/src/ch3_win_fns.c b/src/mpid/ch3/channels/sock/src/ch3_win_fns.c
index 8942099..3e1c466 100644
--- a/src/mpid/ch3/channels/sock/src/ch3_win_fns.c
+++ b/src/mpid/ch3/channels/sock/src/ch3_win_fns.c
@@ -11,7 +11,7 @@
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_Win_fns_init
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_Win_fns_init(MPIDI_CH3U_Win_fns_t *win_fns)
{
int mpi_errno = MPI_SUCCESS;
@@ -29,7 +29,7 @@ int MPIDI_CH3_Win_fns_init(MPIDI_CH3U_Win_fns_t *win_fns)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_Win_hooks_init
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_Win_hooks_init(MPIDI_CH3U_Win_hooks_t *win_hooks)
{
int mpi_errno = MPI_SUCCESS;
@@ -47,7 +47,7 @@ int MPIDI_CH3_Win_hooks_init(MPIDI_CH3U_Win_hooks_t *win_hooks)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_Win_pkt_orderings_init
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_Win_pkt_orderings_init(MPIDI_CH3U_Win_pkt_ordering_t * win_pkt_orderings)
{
int mpi_errno = MPI_SUCCESS;
diff --git a/src/mpid/ch3/channels/sock/src/ch3i_errno.c b/src/mpid/ch3/channels/sock/src/ch3i_errno.c
index 7b4294f..80d5b97 100644
--- a/src/mpid/ch3/channels/sock/src/ch3i_errno.c
+++ b/src/mpid/ch3/channels/sock/src/ch3i_errno.c
@@ -9,7 +9,7 @@
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_sock_errno_to_mpi_errno
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3I_sock_errno_to_mpi_errno(char * fcname, int sock_errno)
{
int mpi_errno;
diff --git a/src/mpid/ch3/include/mpid_rma_issue.h b/src/mpid/ch3/include/mpid_rma_issue.h
index 548beb0..e347170 100644
--- a/src/mpid/ch3/include/mpid_rma_issue.h
+++ b/src/mpid/ch3/include/mpid_rma_issue.h
@@ -19,7 +19,7 @@
#undef FUNCNAME
#define FUNCNAME immed_copy
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline int immed_copy(void *src, void *dest, size_t len)
{
int mpi_errno = MPI_SUCCESS;
@@ -62,7 +62,7 @@ static inline int immed_copy(void *src, void *dest, size_t len)
#undef FUNCNAME
#define FUNCNAME fill_in_derived_dtp_info
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline void fill_in_derived_dtp_info(MPIDI_RMA_dtype_info * dtype_info, void *dataloop,
MPID_Datatype * dtp)
{
@@ -98,7 +98,7 @@ static inline void fill_in_derived_dtp_info(MPIDI_RMA_dtype_info * dtype_info, v
#undef FUNCNAME
#define FUNCNAME init_accum_ext_pkt
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int init_accum_ext_pkt(MPIDI_CH3_Pkt_flags_t flags,
MPID_Datatype * target_dtp, MPIDI_msg_sz_t stream_offset,
void **ext_hdr_ptr, MPI_Aint * ext_hdr_sz)
@@ -181,7 +181,7 @@ static int init_accum_ext_pkt(MPIDI_CH3_Pkt_flags_t flags,
#undef FUNCNAME
#define FUNCNAME init_get_accum_ext_pkt
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int init_get_accum_ext_pkt(MPIDI_CH3_Pkt_flags_t flags,
MPID_Datatype * target_dtp, MPIDI_msg_sz_t stream_offset,
void **ext_hdr_ptr, MPI_Aint * ext_hdr_sz)
@@ -214,7 +214,7 @@ static int init_get_accum_ext_pkt(MPIDI_CH3_Pkt_flags_t flags,
#undef FUNCNAME
#define FUNCNAME issue_from_origin_buffer
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
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,
MPIDI_msg_sz_t stream_offset, MPIDI_msg_sz_t stream_size,
@@ -390,7 +390,7 @@ static int issue_from_origin_buffer(MPIDI_RMA_Op_t * rma_op, MPIDI_VC_t * vc,
#undef FUNCNAME
#define FUNCNAME issue_put_op
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
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)
{
@@ -473,7 +473,7 @@ static int issue_put_op(MPIDI_RMA_Op_t * rma_op, MPID_Win * win_ptr,
#undef FUNCNAME
#define FUNCNAME issue_acc_op
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
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)
{
@@ -640,7 +640,7 @@ static int issue_acc_op(MPIDI_RMA_Op_t * rma_op, MPID_Win * win_ptr,
#undef FUNCNAME
#define FUNCNAME issue_get_acc_op
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
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)
{
@@ -894,7 +894,7 @@ static int issue_get_acc_op(MPIDI_RMA_Op_t * rma_op, MPID_Win * win_ptr,
#undef FUNCNAME
#define FUNCNAME issue_get_op
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int issue_get_op(MPIDI_RMA_Op_t * rma_op, MPID_Win * win_ptr,
MPIDI_RMA_Target_t * target_ptr, MPIDI_CH3_Pkt_flags_t flags)
{
@@ -1022,7 +1022,7 @@ static int issue_get_op(MPIDI_RMA_Op_t * rma_op, MPID_Win * win_ptr,
#undef FUNCNAME
#define FUNCNAME issue_cas_op
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int issue_cas_op(MPIDI_RMA_Op_t * rma_op,
MPID_Win * win_ptr, MPIDI_RMA_Target_t * target_ptr,
MPIDI_CH3_Pkt_flags_t flags)
@@ -1086,7 +1086,7 @@ static int issue_cas_op(MPIDI_RMA_Op_t * rma_op,
#undef FUNCNAME
#define FUNCNAME issue_fop_op
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int issue_fop_op(MPIDI_RMA_Op_t * rma_op,
MPID_Win * win_ptr, MPIDI_RMA_Target_t * target_ptr,
MPIDI_CH3_Pkt_flags_t flags)
@@ -1186,7 +1186,7 @@ static int issue_fop_op(MPIDI_RMA_Op_t * rma_op,
#undef FUNCNAME
#define FUNCNAME issue_rma_op
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline int issue_rma_op(MPIDI_RMA_Op_t * op_ptr, MPID_Win * win_ptr,
MPIDI_RMA_Target_t * target_ptr, MPIDI_CH3_Pkt_flags_t flags)
{
@@ -1237,7 +1237,7 @@ static inline int issue_rma_op(MPIDI_RMA_Op_t * op_ptr, MPID_Win * win_ptr,
#undef FUNCNAME
#define FUNCNAME set_user_req_after_issuing_op
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline int set_user_req_after_issuing_op(MPIDI_RMA_Op_t * op)
{
int i, incomplete_req_cnt = 0;
diff --git a/src/mpid/ch3/include/mpid_rma_lockqueue.h b/src/mpid/ch3/include/mpid_rma_lockqueue.h
index 78dda5d..f0509c5 100644
--- a/src/mpid/ch3/include/mpid_rma_lockqueue.h
+++ b/src/mpid/ch3/include/mpid_rma_lockqueue.h
@@ -18,7 +18,7 @@ MPIR_T_PVAR_DOUBLE_TIMER_DECL_EXTERN(RMA, rma_winlock_getlocallock);
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Win_target_lock_entry_alloc
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline MPIDI_RMA_Target_lock_entry_t *MPIDI_CH3I_Win_target_lock_entry_alloc(MPID_Win *
win_ptr,
MPIDI_CH3_Pkt_t
@@ -49,7 +49,7 @@ static inline MPIDI_RMA_Target_lock_entry_t *MPIDI_CH3I_Win_target_lock_entry_al
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Win_target_lock_entry_free
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline int MPIDI_CH3I_Win_target_lock_entry_free(MPID_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 1dba61b..fa60ab2 100644
--- a/src/mpid/ch3/include/mpid_rma_oplist.h
+++ b/src/mpid/ch3/include/mpid_rma_oplist.h
@@ -47,7 +47,7 @@ MPIR_T_PVAR_DOUBLE_TIMER_DECL_EXTERN(RMA, rma_rmaqueue_alloc);
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Win_op_alloc
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline MPIDI_RMA_Op_t *MPIDI_CH3I_Win_op_alloc(MPID_Win * win_ptr)
{
MPIDI_RMA_Op_t *e;
@@ -84,7 +84,7 @@ static inline MPIDI_RMA_Op_t *MPIDI_CH3I_Win_op_alloc(MPID_Win * win_ptr)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Win_op_free
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline int MPIDI_CH3I_Win_op_free(MPID_Win * win_ptr, MPIDI_RMA_Op_t * e)
{
int mpi_errno = MPI_SUCCESS;
@@ -107,7 +107,7 @@ static inline int MPIDI_CH3I_Win_op_free(MPID_Win * win_ptr, MPIDI_RMA_Op_t * e)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Win_target_alloc
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline MPIDI_RMA_Target_t *MPIDI_CH3I_Win_target_alloc(MPID_Win * win_ptr)
{
MPIDI_RMA_Target_t *e;
@@ -151,7 +151,7 @@ static inline MPIDI_RMA_Target_t *MPIDI_CH3I_Win_target_alloc(MPID_Win * win_ptr
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Win_target_free
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline int MPIDI_CH3I_Win_target_free(MPID_Win * win_ptr, MPIDI_RMA_Target_t * e)
{
int mpi_errno = MPI_SUCCESS;
@@ -179,7 +179,7 @@ static inline int MPIDI_CH3I_Win_target_free(MPID_Win * win_ptr, MPIDI_RMA_Targe
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Win_create_target
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline int MPIDI_CH3I_Win_create_target(MPID_Win * win_ptr, int target_rank,
MPIDI_RMA_Target_t ** e)
{
@@ -222,7 +222,7 @@ static inline int MPIDI_CH3I_Win_create_target(MPID_Win * win_ptr, int target_ra
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Win_find_target
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline int MPIDI_CH3I_Win_find_target(MPID_Win * win_ptr, int target_rank,
MPIDI_RMA_Target_t ** e)
{
@@ -255,7 +255,7 @@ static inline int MPIDI_CH3I_Win_find_target(MPID_Win * win_ptr, int target_rank
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Win_enqueue_op
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline int MPIDI_CH3I_Win_enqueue_op(MPID_Win * win_ptr, MPIDI_RMA_Op_t * op)
{
int mpi_errno = MPI_SUCCESS;
@@ -307,7 +307,7 @@ static inline int MPIDI_CH3I_Win_enqueue_op(MPID_Win * win_ptr, MPIDI_RMA_Op_t *
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Win_target_dequeue_and_free
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline int MPIDI_CH3I_Win_target_dequeue_and_free(MPID_Win * win_ptr, MPIDI_RMA_Target_t * e)
{
int mpi_errno = MPI_SUCCESS;
@@ -338,7 +338,7 @@ static inline int MPIDI_CH3I_Win_target_dequeue_and_free(MPID_Win * win_ptr, MPI
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_RMA_Cleanup_ops_target
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline int MPIDI_CH3I_RMA_Cleanup_ops_target(MPID_Win * win_ptr, MPIDI_RMA_Target_t * target)
{
MPIDI_RMA_Op_t *curr_op = NULL;
@@ -483,7 +483,7 @@ static inline int MPIDI_CH3I_RMA_Cleanup_ops_target(MPID_Win * win_ptr, MPIDI_RM
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_RMA_Cleanup_ops_win
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline int MPIDI_CH3I_RMA_Cleanup_ops_win(MPID_Win * win_ptr,
int *local_completed, int *remote_completed)
{
@@ -527,7 +527,7 @@ static inline int MPIDI_CH3I_RMA_Cleanup_ops_win(MPID_Win * win_ptr,
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_RMA_Cleanup_targets_win
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline int MPIDI_CH3I_RMA_Cleanup_targets_win(MPID_Win * win_ptr)
{
MPIDI_RMA_Target_t *target = NULL, *next_target = NULL;
@@ -554,7 +554,7 @@ static inline int MPIDI_CH3I_RMA_Cleanup_targets_win(MPID_Win * win_ptr)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Win_get_op
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline int MPIDI_CH3I_Win_get_op(MPID_Win * win_ptr, MPIDI_RMA_Op_t ** e)
{
MPIDI_RMA_Op_t *new_ptr = NULL;
@@ -610,7 +610,7 @@ static inline int MPIDI_CH3I_Win_get_op(MPID_Win * win_ptr, MPIDI_RMA_Op_t ** e)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_RMA_Ops_append
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline void MPIDI_CH3I_RMA_Ops_append(MPIDI_RMA_Ops_list_t * list,
MPIDI_RMA_Ops_list_t * list_tail,
MPIDI_RMA_Op_t * elem)
@@ -627,7 +627,7 @@ static inline void MPIDI_CH3I_RMA_Ops_append(MPIDI_RMA_Ops_list_t * list,
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_RMA_Ops_unlink
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline void MPIDI_CH3I_RMA_Ops_unlink(MPIDI_RMA_Ops_list_t * list,
MPIDI_RMA_Ops_list_t * list_tail,
MPIDI_RMA_Op_t * elem)
@@ -644,7 +644,7 @@ static inline void MPIDI_CH3I_RMA_Ops_unlink(MPIDI_RMA_Ops_list_t * list,
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_RMA_Ops_free_elem
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline void MPIDI_CH3I_RMA_Ops_free_elem(MPID_Win * win_ptr, MPIDI_RMA_Ops_list_t * list,
MPIDI_RMA_Ops_list_t * list_tail,
MPIDI_RMA_Op_t * curr_ptr)
diff --git a/src/mpid/ch3/include/mpid_rma_shm.h b/src/mpid/ch3/include/mpid_rma_shm.h
index cb23a96..66dd4b3 100644
--- a/src/mpid/ch3/include/mpid_rma_shm.h
+++ b/src/mpid/ch3/include/mpid_rma_shm.h
@@ -250,7 +250,7 @@ static inline int shm_copy(const void *src, int scount, MPI_Datatype stype,
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Shm_put_op
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
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,
@@ -293,7 +293,7 @@ static inline int MPIDI_CH3I_Shm_put_op(const void *origin_addr, int origin_coun
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Shm_acc_op
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
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,
@@ -427,7 +427,7 @@ static inline int MPIDI_CH3I_Shm_acc_op(const void *origin_addr, int origin_coun
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Shm_get_acc_op
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline int MPIDI_CH3I_Shm_get_acc_op(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
@@ -574,7 +574,7 @@ static inline int MPIDI_CH3I_Shm_get_acc_op(const void *origin_addr, int origin_
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Shm_get_op
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
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,
@@ -617,7 +617,7 @@ static inline int MPIDI_CH3I_Shm_get_op(void *origin_addr, int origin_count,
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Shm_cas_op
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_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)
@@ -675,7 +675,7 @@ static inline int MPIDI_CH3I_Shm_cas_op(const void *origin_addr, const void *com
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Shm_fop_op
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_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)
diff --git a/src/mpid/ch3/include/mpidimpl.h b/src/mpid/ch3/include/mpidimpl.h
index 5a2de23..9cc3fee 100644
--- a/src/mpid/ch3/include/mpidimpl.h
+++ b/src/mpid/ch3/include/mpidimpl.h
@@ -1065,8 +1065,8 @@ extern char *MPIDI_DBG_parent_str;
#endif
/* This is used to quote a name in a definition (see FUNCNAME/FCNAME below) */
-#define MPIDI_QUOTE(A) MPIDI_QUOTE2(A)
-#define MPIDI_QUOTE2(A) #A
+#define MPIU_QUOTE(A) MPIU_QUOTE2(A)
+#define MPIU_QUOTE2(A) #A
#ifdef MPICH_DBG_OUTPUT
void MPIDI_DBG_Print_packet(MPIDI_CH3_Pkt_t *pkt);
diff --git a/src/mpid/ch3/include/mpidrma.h b/src/mpid/ch3/include/mpidrma.h
index 67e885a..b11e196 100644
--- a/src/mpid/ch3/include/mpidrma.h
+++ b/src/mpid/ch3/include/mpidrma.h
@@ -16,7 +16,7 @@
#undef FUNCNAME
#define FUNCNAME send_lock_msg
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline int send_lock_msg(int dest, int lock_type, MPID_Win * win_ptr)
{
int mpi_errno = MPI_SUCCESS;
@@ -63,7 +63,7 @@ static inline int send_lock_msg(int dest, int lock_type, MPID_Win * win_ptr)
#undef FUNCNAME
#define FUNCNAME send_unlock_msg
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline int send_unlock_msg(int dest, MPID_Win * win_ptr, MPIDI_CH3_Pkt_flags_t flags)
{
int mpi_errno = MPI_SUCCESS;
@@ -107,7 +107,7 @@ static inline int send_unlock_msg(int dest, MPID_Win * win_ptr, MPIDI_CH3_Pkt_fl
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Send_lock_ack_pkt
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline int MPIDI_CH3I_Send_lock_ack_pkt(MPIDI_VC_t * vc, MPID_Win * win_ptr,
MPIDI_CH3_Pkt_flags_t flags,
MPI_Win source_win_handle,
@@ -154,7 +154,7 @@ static inline int MPIDI_CH3I_Send_lock_ack_pkt(MPIDI_VC_t * vc, MPID_Win * win_p
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Send_lock_op_ack_pkt
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline int MPIDI_CH3I_Send_lock_op_ack_pkt(MPIDI_VC_t * vc, MPID_Win * win_ptr,
MPIDI_CH3_Pkt_flags_t flags,
MPI_Win source_win_handle,
@@ -201,7 +201,7 @@ static inline int MPIDI_CH3I_Send_lock_op_ack_pkt(MPIDI_VC_t * vc, MPID_Win * wi
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Send_ack_pkt
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline int MPIDI_CH3I_Send_ack_pkt(MPIDI_VC_t * vc, MPID_Win * win_ptr,
MPI_Win source_win_handle)
{
@@ -238,7 +238,7 @@ static inline int MPIDI_CH3I_Send_ack_pkt(MPIDI_VC_t * vc, MPID_Win * win_ptr,
#undef FUNCNAME
#define FUNCNAME send_decr_at_cnt_msg
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline int send_decr_at_cnt_msg(int dst, MPID_Win * win_ptr, MPIDI_CH3_Pkt_flags_t flags)
{
MPIDI_CH3_Pkt_t upkt;
@@ -280,7 +280,7 @@ static inline int send_decr_at_cnt_msg(int dst, MPID_Win * win_ptr, MPIDI_CH3_Pk
#undef FUNCNAME
#define FUNCNAME send_flush_msg
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline int send_flush_msg(int dest, MPID_Win * win_ptr)
{
int mpi_errno = MPI_SUCCESS;
@@ -732,7 +732,7 @@ static inline int adjust_op_piggybacked_with_lock(MPID_Win * win_ptr,
#undef FUNCNAME
#define FUNCNAME acquire_local_lock
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline int acquire_local_lock(MPID_Win * win_ptr, int lock_type)
{
int mpi_errno = MPI_SUCCESS;
@@ -792,7 +792,7 @@ static inline int acquire_local_lock(MPID_Win * win_ptr, int lock_type)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_RMA_Handle_ack
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline int MPIDI_CH3I_RMA_Handle_ack(MPID_Win * win_ptr, int target_rank)
{
int mpi_errno = MPI_SUCCESS;
@@ -817,7 +817,7 @@ static inline int MPIDI_CH3I_RMA_Handle_ack(MPID_Win * win_ptr, int target_rank)
#undef FUNCNAME
#define FUNCNAME do_accumulate_op
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline int do_accumulate_op(void *source_buf, int source_count, MPI_Datatype source_dtp,
void *target_buf, int target_count, MPI_Datatype target_dtp,
MPI_Aint stream_offset, MPI_Op acc_op)
diff --git a/src/mpid/ch3/src/ch3u_buffer.c b/src/mpid/ch3/src/ch3u_buffer.c
index bf4db2b..b7dba61 100644
--- a/src/mpid/ch3/src/ch3u_buffer.c
+++ b/src/mpid/ch3/src/ch3u_buffer.c
@@ -31,7 +31,7 @@ Used indirectly by mpid_irecv, mpid_recv (through MPIDI_CH3_RecvFromSelf) and
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3U_Buffer_copy
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
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, MPIDI_msg_sz_t * rsz,
diff --git a/src/mpid/ch3/src/ch3u_comm_spawn_multiple.c b/src/mpid/ch3/src/ch3u_comm_spawn_multiple.c
index 743ce74..a959b7f 100644
--- a/src/mpid/ch3/src/ch3u_comm_spawn_multiple.c
+++ b/src/mpid/ch3/src/ch3u_comm_spawn_multiple.c
@@ -33,7 +33,7 @@
#undef FUNCNAME
#define FUNCNAME mpi_to_pmi_keyvals
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int mpi_to_pmi_keyvals( MPID_Info *info_ptr, PMI_keyval_t **kv_ptr,
int *nkeys_ptr )
{
@@ -101,7 +101,7 @@ static void free_pmi_keyvals(PMI_keyval_t **kv, int size, int *counts)
#undef FUNCNAME
#define FUNCNAME MPIDI_Comm_spawn_multiple
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_Comm_spawn_multiple(int count, char **commands,
char ***argvs, const int *maxprocs,
MPID_Info **info_ptrs, int root,
@@ -324,7 +324,7 @@ static char *parent_port_name = 0; /* Name of parent port if this
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_GetParentPort
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_GetParentPort(char ** parent_port)
{
int mpi_errno = MPI_SUCCESS;
diff --git a/src/mpid/ch3/src/ch3u_eager.c b/src/mpid/ch3/src/ch3u_eager.c
index a8e1b3c..683d481 100644
--- a/src/mpid/ch3/src/ch3u_eager.c
+++ b/src/mpid/ch3/src/ch3u_eager.c
@@ -16,7 +16,7 @@
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_SendNoncontig_iov
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
/* 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. */
@@ -83,7 +83,7 @@ int MPIDI_CH3_SendNoncontig_iov( MPIDI_VC_t *vc, MPID_Request *sreq,
#undef FUNCNAME
#define FUNCNAME MPIDI_EagerNoncontigSend
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
/* MPIDI_CH3_EagerNoncontigSend - Eagerly send noncontiguous data */
int MPIDI_CH3_EagerNoncontigSend( MPID_Request **sreq_p,
MPIDI_CH3_Pkt_type_t reqtype,
@@ -150,7 +150,7 @@ int MPIDI_CH3_EagerNoncontigSend( MPID_Request **sreq_p,
#undef FUNCNAME
#define FUNCNAME MPIDI_EagerContigSend
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_EagerContigSend( MPID_Request **sreq_p,
MPIDI_CH3_Pkt_type_t reqtype,
const void * buf, MPIDI_msg_sz_t data_sz, int rank,
@@ -216,7 +216,7 @@ int MPIDI_CH3_EagerContigSend( MPID_Request **sreq_p,
#undef FUNCNAME
#define FUNCNAME MPIDI_EagerContigShortSend
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_EagerContigShortSend( MPID_Request **sreq_p,
MPIDI_CH3_Pkt_type_t reqtype,
const void * buf, MPIDI_msg_sz_t data_sz, int rank,
@@ -287,7 +287,7 @@ int MPIDI_CH3_EagerContigShortSend( MPID_Request **sreq_p,
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_PktHandler_EagerShortSend
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_PktHandler_EagerShortSend( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt,
MPIDI_msg_sz_t *buflen, MPID_Request **rreqp )
{
@@ -521,7 +521,7 @@ int MPIDI_CH3_PktHandler_EagerShortSend( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt,
#undef FUNCNAME
#define FUNCNAME MPIDI_EagerContigIsend
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_EagerContigIsend( MPID_Request **sreq_p,
MPIDI_CH3_Pkt_type_t reqtype,
const void * buf, MPIDI_msg_sz_t data_sz, int rank,
@@ -600,7 +600,7 @@ int MPIDI_CH3_EagerContigIsend( MPID_Request **sreq_p,
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_PktHandler_EagerSend
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_PktHandler_EagerSend( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt,
MPIDI_msg_sz_t *buflen, MPID_Request **rreqp )
{
@@ -684,7 +684,7 @@ int MPIDI_CH3_PktHandler_EagerSend( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt,
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_PktHandler_ReadySend
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_PktHandler_ReadySend( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt,
MPIDI_msg_sz_t *buflen, MPID_Request **rreqp )
{
diff --git a/src/mpid/ch3/src/ch3u_eagersync.c b/src/mpid/ch3/src/ch3u_eagersync.c
index 89f5872..f90dac6 100644
--- a/src/mpid/ch3/src/ch3u_eagersync.c
+++ b/src/mpid/ch3/src/ch3u_eagersync.c
@@ -16,7 +16,7 @@
#undef FUNCNAME
#define FUNCNAME MPIDI_EagerSyncNoncontigSend
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
/* MPIDI_CH3_EagerSyncNoncontigSend - Eagerly send noncontiguous data in
synchronous mode.
@@ -212,7 +212,7 @@ int MPIDI_CH3_EagerSyncAck( MPIDI_VC_t *vc, MPID_Request *rreq )
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_PktHandler_EagerSyncSend
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_PktHandler_EagerSyncSend( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt,
MPIDI_msg_sz_t *buflen, MPID_Request **rreqp )
{
@@ -333,7 +333,7 @@ int MPIDI_CH3_PktHandler_EagerSyncSend( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt,
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_PktHandler_EagerSyncAck
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_PktHandler_EagerSyncAck( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt,
MPIDI_msg_sz_t *buflen, MPID_Request **rreqp )
{
diff --git a/src/mpid/ch3/src/ch3u_handle_connection.c b/src/mpid/ch3/src/ch3u_handle_connection.c
index 352fc07..c47c965 100644
--- a/src/mpid/ch3/src/ch3u_handle_connection.c
+++ b/src/mpid/ch3/src/ch3u_handle_connection.c
@@ -25,7 +25,7 @@ char *MPIDI_failed_procs_string = NULL;
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3U_Handle_connection
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
/*@
MPIDI_CH3U_Handle_connection - handle connection event
@@ -200,7 +200,7 @@ fn_fail:
#undef FUNCNAME
#define FUNCNAME MPIDI_VC_SendClose
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
/*@
MPIDI_CH3U_VC_SendClose - Initiate a close on a virtual connection
@@ -363,7 +363,7 @@ int MPIDI_CH3_PktPrint_Close( FILE *fp, MPIDI_CH3_Pkt_t *pkt )
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3U_VC_WaitForClose
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
/*@
MPIDI_CH3U_VC_WaitForClose - Wait for all virtual connections to close
@*/
diff --git a/src/mpid/ch3/src/ch3u_handle_op_req.c b/src/mpid/ch3/src/ch3u_handle_op_req.c
index bca34d7..cad0d1c 100644
--- a/src/mpid/ch3/src/ch3u_handle_op_req.c
+++ b/src/mpid/ch3/src/ch3u_handle_op_req.c
@@ -13,7 +13,7 @@
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_ReqHandler_ReqOpsComplete
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_ReqHandler_ReqOpsComplete(MPIDI_VC_t * vc, MPID_Request * sreq, int *complete)
{
int mpi_errno = MPI_SUCCESS;
diff --git a/src/mpid/ch3/src/ch3u_handle_recv_pkt.c b/src/mpid/ch3/src/ch3u_handle_recv_pkt.c
index 745c39f..f5d5c8d 100644
--- a/src/mpid/ch3/src/ch3u_handle_recv_pkt.c
+++ b/src/mpid/ch3/src/ch3u_handle_recv_pkt.c
@@ -51,7 +51,7 @@
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3U_Handle_ordered_recv_pkt
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3U_Handle_ordered_recv_pkt(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt,
MPIDI_msg_sz_t *buflen, MPID_Request ** rreqp)
{
@@ -101,7 +101,7 @@ int MPIDI_CH3U_Handle_ordered_recv_pkt(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt,
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3U_Receive_data_found
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3U_Receive_data_found(MPID_Request *rreq, char *buf, MPIDI_msg_sz_t *buflen, int *complete)
{
int dt_contig;
@@ -234,7 +234,7 @@ fn_fail:
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3U_Receive_data_unexpected
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3U_Receive_data_unexpected(MPID_Request * rreq, char *buf, MPIDI_msg_sz_t *buflen, int *complete)
{
int mpi_errno = MPI_SUCCESS;
@@ -292,7 +292,7 @@ int MPIDI_CH3U_Receive_data_unexpected(MPID_Request * rreq, char *buf, MPIDI_msg
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3U_Post_data_receive_found
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3U_Post_data_receive_found(MPID_Request * rreq)
{
int mpi_errno = MPI_SUCCESS;
@@ -369,7 +369,7 @@ int MPIDI_CH3U_Post_data_receive_found(MPID_Request * rreq)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3U_Post_data_receive_unexpected
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3U_Post_data_receive_unexpected(MPID_Request * rreq)
{
int mpi_errno = MPI_SUCCESS;
@@ -412,7 +412,7 @@ int MPIDI_CH3U_Post_data_receive_unexpected(MPID_Request * rreq)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Try_acquire_win_lock
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3I_Try_acquire_win_lock(MPID_Win *win_ptr, int requested_lock)
{
int existing_lock;
@@ -494,7 +494,7 @@ int MPIDI_CH3_PktHandler_FlowCntlUpdate( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt,
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_PktHandler_EndCH3
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_PktHandler_EndCH3( MPIDI_VC_t *vc ATTRIBUTE((unused)),
MPIDI_CH3_Pkt_t *pkt ATTRIBUTE((unused)),
MPIDI_msg_sz_t *buflen ATTRIBUTE((unused)),
@@ -522,7 +522,7 @@ int MPIDI_CH3_PktHandler_EndCH3( MPIDI_VC_t *vc ATTRIBUTE((unused)),
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_PktHandler_Init
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_PktHandler_Init( MPIDI_CH3_PktHandler_Fcn *pktArray[],
int arraySize )
{
diff --git a/src/mpid/ch3/src/ch3u_handle_recv_req.c b/src/mpid/ch3/src/ch3u_handle_recv_req.c
index 7d0c8c1..8325f27 100644
--- a/src/mpid/ch3/src/ch3u_handle_recv_req.c
+++ b/src/mpid/ch3/src/ch3u_handle_recv_req.c
@@ -13,7 +13,7 @@ static int create_derived_datatype(MPID_Request * req, MPIDI_RMA_dtype_info * dt
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3U_Handle_recv_req
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3U_Handle_recv_req(MPIDI_VC_t * vc, MPID_Request * rreq, int *complete)
{
static int in_routine ATTRIBUTE((unused)) = FALSE;
@@ -72,7 +72,7 @@ int MPIDI_CH3_ReqHandler_RecvComplete(MPIDI_VC_t * vc ATTRIBUTE((unused)),
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_ReqHandler_PutRecvComplete
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_ReqHandler_PutRecvComplete(MPIDI_VC_t * vc, MPID_Request * rreq, int *complete)
{
int mpi_errno = MPI_SUCCESS;
@@ -131,7 +131,7 @@ int MPIDI_CH3_ReqHandler_PutRecvComplete(MPIDI_VC_t * vc, MPID_Request * rreq, i
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_ReqHandler_AccumRecvComplete
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_ReqHandler_AccumRecvComplete(MPIDI_VC_t * vc, MPID_Request * rreq, int *complete)
{
int mpi_errno = MPI_SUCCESS;
@@ -227,7 +227,7 @@ int MPIDI_CH3_ReqHandler_AccumRecvComplete(MPIDI_VC_t * vc, MPID_Request * rreq,
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_ReqHandler_GaccumRecvComplete
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_ReqHandler_GaccumRecvComplete(MPIDI_VC_t * vc, MPID_Request * rreq, int *complete)
{
int mpi_errno = MPI_SUCCESS;
@@ -396,7 +396,7 @@ int MPIDI_CH3_ReqHandler_GaccumRecvComplete(MPIDI_VC_t * vc, MPID_Request * rreq
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_ReqHandler_FOPRecvComplete
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_ReqHandler_FOPRecvComplete(MPIDI_VC_t * vc, MPID_Request * rreq, int *complete)
{
int mpi_errno = MPI_SUCCESS;
@@ -527,7 +527,7 @@ int MPIDI_CH3_ReqHandler_FOPRecvComplete(MPIDI_VC_t * vc, MPID_Request * rreq, i
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_ReqHandler_PutDerivedDTRecvComplete
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_ReqHandler_PutDerivedDTRecvComplete(MPIDI_VC_t * vc ATTRIBUTE((unused)),
MPID_Request * rreq, int *complete)
{
@@ -575,7 +575,7 @@ int MPIDI_CH3_ReqHandler_PutDerivedDTRecvComplete(MPIDI_VC_t * vc ATTRIBUTE((unu
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_ReqHandler_AccumMetadataRecvComplete
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_ReqHandler_AccumMetadataRecvComplete(MPIDI_VC_t * vc ATTRIBUTE((unused)),
MPID_Request * rreq, int *complete)
{
@@ -690,7 +690,7 @@ int MPIDI_CH3_ReqHandler_AccumMetadataRecvComplete(MPIDI_VC_t * vc ATTRIBUTE((un
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_ReqHandler_GaccumMetadataRecvComplete
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_ReqHandler_GaccumMetadataRecvComplete(MPIDI_VC_t * vc,
MPID_Request * rreq, int *complete)
{
@@ -823,7 +823,7 @@ int MPIDI_CH3_ReqHandler_GaccumMetadataRecvComplete(MPIDI_VC_t * vc,
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_ReqHandler_GetDerivedDTRecvComplete
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_ReqHandler_GetDerivedDTRecvComplete(MPIDI_VC_t * vc,
MPID_Request * rreq, int *complete)
{
@@ -908,7 +908,7 @@ int MPIDI_CH3_ReqHandler_GetDerivedDTRecvComplete(MPIDI_VC_t * vc,
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_ReqHandler_UnpackUEBufComplete
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_ReqHandler_UnpackUEBufComplete(MPIDI_VC_t * vc ATTRIBUTE((unused)),
MPID_Request * rreq, int *complete)
{
@@ -941,7 +941,7 @@ int MPIDI_CH3_ReqHandler_UnpackUEBufComplete(MPIDI_VC_t * vc ATTRIBUTE((unused))
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_ReqHandler_UnpackSRBufComplete
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_ReqHandler_UnpackSRBufComplete(MPIDI_VC_t * vc, MPID_Request * rreq, int *complete)
{
int mpi_errno = MPI_SUCCESS;
@@ -976,7 +976,7 @@ int MPIDI_CH3_ReqHandler_UnpackSRBufComplete(MPIDI_VC_t * vc, MPID_Request * rre
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_ReqHandler_UnpackSRBufReloadIOV
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_ReqHandler_UnpackSRBufReloadIOV(MPIDI_VC_t * vc ATTRIBUTE((unused)),
MPID_Request * rreq, int *complete)
{
@@ -999,7 +999,7 @@ int MPIDI_CH3_ReqHandler_UnpackSRBufReloadIOV(MPIDI_VC_t * vc ATTRIBUTE((unused)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_ReqHandler_ReloadIOV
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_ReqHandler_ReloadIOV(MPIDI_VC_t * vc ATTRIBUTE((unused)),
MPID_Request * rreq, int *complete)
{
@@ -1024,7 +1024,7 @@ int MPIDI_CH3_ReqHandler_ReloadIOV(MPIDI_VC_t * vc ATTRIBUTE((unused)),
#undef FUNCNAME
#define FUNCNAME create_derived_datatype
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int create_derived_datatype(MPID_Request * req, MPIDI_RMA_dtype_info * dtype_info,
MPID_Datatype ** dtp)
{
@@ -1834,7 +1834,7 @@ static int entered_count = 0;
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Release_lock
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3I_Release_lock(MPID_Win * win_ptr)
{
MPIDI_RMA_Target_lock_entry_t *target_lock_entry, *target_lock_entry_next;
@@ -1936,7 +1936,7 @@ int MPIDI_CH3I_Release_lock(MPID_Win * win_ptr)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_ReqHandler_PiggybackLockOpRecvComplete
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_ReqHandler_PiggybackLockOpRecvComplete(MPIDI_VC_t * vc,
MPID_Request * rreq, int *complete)
{
diff --git a/src/mpid/ch3/src/ch3u_handle_revoke_pkt.c b/src/mpid/ch3/src/ch3u_handle_revoke_pkt.c
index 29b19e1..d169ae1 100644
--- a/src/mpid/ch3/src/ch3u_handle_revoke_pkt.c
+++ b/src/mpid/ch3/src/ch3u_handle_revoke_pkt.c
@@ -9,7 +9,7 @@
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_PktHandler_Revoke
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_PktHandler_Revoke(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt,
MPIDI_msg_sz_t *buflen, MPID_Request **rreqp)
{
diff --git a/src/mpid/ch3/src/ch3u_handle_send_req.c b/src/mpid/ch3/src/ch3u_handle_send_req.c
index 9580d63..00910e9 100644
--- a/src/mpid/ch3/src/ch3u_handle_send_req.c
+++ b/src/mpid/ch3/src/ch3u_handle_send_req.c
@@ -10,7 +10,7 @@
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3U_Handle_send_req
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3U_Handle_send_req(MPIDI_VC_t * vc, MPID_Request * sreq, int *complete)
{
int mpi_errno = MPI_SUCCESS;
@@ -97,7 +97,7 @@ int MPIDI_CH3_ReqHandler_GetSendComplete(MPIDI_VC_t * vc ATTRIBUTE((unused)),
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_ReqHandler_GaccumSendComplete
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_ReqHandler_GaccumSendComplete(MPIDI_VC_t * vc, MPID_Request * rreq, int *complete)
{
int mpi_errno = MPI_SUCCESS;
@@ -163,7 +163,7 @@ int MPIDI_CH3_ReqHandler_GaccumSendComplete(MPIDI_VC_t * vc, MPID_Request * rreq
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_ReqHandler_CASSendComplete
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_ReqHandler_CASSendComplete(MPIDI_VC_t * vc, MPID_Request * rreq, int *complete)
{
int mpi_errno = MPI_SUCCESS;
@@ -228,7 +228,7 @@ int MPIDI_CH3_ReqHandler_CASSendComplete(MPIDI_VC_t * vc, MPID_Request * rreq, i
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_ReqHandler_FOPSendComplete
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_ReqHandler_FOPSendComplete(MPIDI_VC_t * vc, MPID_Request * rreq, int *complete)
{
int mpi_errno = MPI_SUCCESS;
diff --git a/src/mpid/ch3/src/ch3u_port.c b/src/mpid/ch3/src/ch3u_port.c
index 6870f51..d982acd 100644
--- a/src/mpid/ch3/src/ch3u_port.c
+++ b/src/mpid/ch3/src/ch3u_port.c
@@ -112,7 +112,7 @@ static int MPIDI_CH3I_Initialize_tmp_comm(MPID_Comm **comm_pptr,
#undef FUNCNAME
#define FUNCNAME MPIDI_Create_inter_root_communicator_connect
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int MPIDI_Create_inter_root_communicator_connect(const char *port_name,
MPID_Comm **comm_pptr,
MPIDI_VC_t **vc_pptr)
@@ -161,7 +161,7 @@ static int MPIDI_Create_inter_root_communicator_connect(const char *port_name,
#undef FUNCNAME
#define FUNCNAME MPIDI_Create_inter_root_communicator_accept
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int MPIDI_Create_inter_root_communicator_accept(const char *port_name,
MPID_Comm **comm_pptr,
MPIDI_VC_t **vc_pptr)
@@ -233,7 +233,7 @@ fn_fail:
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Initialize_tmp_comm
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int MPIDI_CH3I_Initialize_tmp_comm(MPID_Comm **comm_pptr,
MPIDI_VC_t *vc_ptr, int is_low_group, int context_id_offset)
{
@@ -334,7 +334,7 @@ fn_fail:
#undef FUNCNAME
#define FUNCNAME MPIDI_Comm_connect
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_Comm_connect(const char *port_name, MPID_Info *info, int root,
MPID_Comm *comm_ptr, MPID_Comm **newcomm)
{
@@ -578,7 +578,7 @@ int MPIDI_Comm_connect(const char *port_name, MPID_Info *info, int root,
#undef FUNCNAME
#define FUNCNAME ExtractLocalPGInfo
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int ExtractLocalPGInfo( MPID_Comm *comm_p,
pg_translation local_translation[],
pg_node **pg_list_p,
@@ -685,7 +685,7 @@ static int ExtractLocalPGInfo( MPID_Comm *comm_p,
#undef FUNCNAME
#define FUNCNAME ReceivePGAndDistribute
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int ReceivePGAndDistribute( MPID_Comm *tmp_comm, MPID_Comm *comm_ptr,
int root, int *recvtag_p,
int n_remote_pgs, MPIDI_PG_t *remote_pg[] )
@@ -764,7 +764,7 @@ static int ReceivePGAndDistribute( MPID_Comm *tmp_comm, MPID_Comm *comm_ptr,
#undef FUNCNAME
#define FUNCNAME MPID_PG_BCast
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_PG_BCast( MPID_Comm *peercomm_p, MPID_Comm *comm_p, int root )
{
int n_local_pgs=0, mpi_errno = MPI_SUCCESS;
@@ -868,7 +868,7 @@ int MPID_PG_BCast( MPID_Comm *peercomm_p, MPID_Comm *comm_p, int root )
#undef FUNCNAME
#define FUNCNAME SendPGtoPeerAndFree
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int SendPGtoPeerAndFree( MPID_Comm *tmp_comm, int *sendtag_p,
pg_node *pg_list )
{
@@ -930,7 +930,7 @@ static int SendPGtoPeerAndFree( MPID_Comm *tmp_comm, int *sendtag_p,
#undef FUNCNAME
#define FUNCNAME MPIDI_Comm_accept
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_Comm_accept(const char *port_name, MPID_Info *info, int root,
MPID_Comm *comm_ptr, MPID_Comm **newcomm)
{
@@ -1147,7 +1147,7 @@ Input/Output Parameters:
#undef FUNCNAME
#define FUNCNAME SetupNewIntercomm
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int SetupNewIntercomm( MPID_Comm *comm_ptr, int remote_comm_size,
pg_translation remote_translation[],
MPIDI_PG_t **remote_pg,
@@ -1209,7 +1209,7 @@ static int SetupNewIntercomm( MPID_Comm *comm_ptr, int remote_comm_size,
#undef FUNCNAME
#define FUNCNAME FreeNewVC
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int FreeNewVC( MPIDI_VC_t *new_vc )
{
MPID_Progress_state progress_state;
@@ -1271,7 +1271,7 @@ static int AcceptQueueSize = 0;
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Acceptq_enqueue
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3I_Acceptq_enqueue(MPIDI_VC_t * vc, int port_name_tag )
{
int mpi_errno=MPI_SUCCESS;
@@ -1315,7 +1315,7 @@ int MPIDI_CH3I_Acceptq_enqueue(MPIDI_VC_t * vc, int port_name_tag )
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Acceptq_dequeue
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3I_Acceptq_dequeue(MPIDI_VC_t ** vc, int port_name_tag)
{
int mpi_errno=MPI_SUCCESS;
diff --git a/src/mpid/ch3/src/ch3u_recvq.c b/src/mpid/ch3/src/ch3u_recvq.c
index 1f1bcfe..7ff61d5 100644
--- a/src/mpid/ch3/src/ch3u_recvq.c
+++ b/src/mpid/ch3/src/ch3u_recvq.c
@@ -210,7 +210,7 @@ fn_fail:
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3U_Recvq_FU
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3U_Recvq_FU(int source, int tag, int context_id, MPI_Status *s)
{
MPID_Request * rreq;
@@ -291,7 +291,7 @@ int MPIDI_CH3U_Recvq_FU(int source, int tag, int context_id, MPI_Status *s)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3U_Recvq_FDU
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
MPID_Request * MPIDI_CH3U_Recvq_FDU(MPI_Request sreq_id,
MPIDI_Message_match * match)
{
@@ -376,7 +376,7 @@ MPID_Request * MPIDI_CH3U_Recvq_FDU(MPI_Request sreq_id,
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3U_Recvq_FDU_matchonly
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
MPID_Request * MPIDI_CH3U_Recvq_FDU_matchonly(int source, int tag, int context_id, MPID_Comm *comm, int *foundp)
{
int found = FALSE;
@@ -495,7 +495,7 @@ lock_exit:
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3U_Recvq_FDU_or_AEP
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
MPID_Request * MPIDI_CH3U_Recvq_FDU_or_AEP(int source, int tag,
int context_id, MPID_Comm *comm, void *user_buf,
MPI_Aint user_count, MPI_Datatype datatype, int * foundp)
@@ -676,7 +676,7 @@ MPID_Request * MPIDI_CH3U_Recvq_FDU_or_AEP(int source, int tag,
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3U_Recvq_DP
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3U_Recvq_DP(MPID_Request * rreq)
{
int found;
@@ -749,7 +749,7 @@ int MPIDI_CH3U_Recvq_DP(MPID_Request * rreq)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3U_Recvq_FDP_or_AEU
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
MPID_Request * MPIDI_CH3U_Recvq_FDP_or_AEU(MPIDI_Message_match * match,
int * foundp)
{
@@ -1200,7 +1200,7 @@ void MPIDI_CH3U_Dbg_print_recvq(FILE *stream);
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3U_Dbg_print_recvq
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
void MPIDI_CH3U_Dbg_print_recvq(FILE *stream)
{
MPID_Request * rreq;
@@ -1254,7 +1254,7 @@ void MPIDI_CH3U_Dbg_print_recvq(FILE *stream)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3U_Recvq_count_unexp
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3U_Recvq_count_unexp(void)
{
int count = 0;
diff --git a/src/mpid/ch3/src/ch3u_request.c b/src/mpid/ch3/src/ch3u_request.c
index 3400fab..8f949e4 100644
--- a/src/mpid/ch3/src/ch3u_request.c
+++ b/src/mpid/ch3/src/ch3u_request.c
@@ -31,7 +31,7 @@ MPIU_Object_alloc_t MPID_Request_mem = {
#undef FUNCNAME
#define FUNCNAME MPID_Request_create
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
MPID_Request * MPID_Request_create(void)
{
MPID_Request * req;
@@ -117,7 +117,7 @@ MPID_Request * MPID_Request_create(void)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_Request_destroy
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
void MPIDI_CH3_Request_destroy(MPID_Request * req)
{
MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3_REQUEST_DESTROY);
@@ -200,7 +200,7 @@ void MPIDI_CH3_Request_destroy(MPID_Request * req)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3U_Request_load_send_iov
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3U_Request_load_send_iov(MPID_Request * const sreq,
MPID_IOV * const iov, int * const iov_n)
{
@@ -312,7 +312,7 @@ int MPIDI_CH3U_Request_load_send_iov(MPID_Request * const sreq,
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3U_Request_load_recv_iov
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3U_Request_load_recv_iov(MPID_Request * const rreq)
{
MPI_Aint last;
@@ -521,7 +521,7 @@ int MPIDI_CH3U_Request_load_recv_iov(MPID_Request * const rreq)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3U_Request_unpack_srbuf
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3U_Request_unpack_srbuf(MPID_Request * rreq)
{
MPI_Aint last;
@@ -598,7 +598,7 @@ int MPIDI_CH3U_Request_unpack_srbuf(MPID_Request * rreq)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3U_Request_unpack_uebuf
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3U_Request_unpack_uebuf(MPID_Request * rreq)
{
int dt_contig;
diff --git a/src/mpid/ch3/src/ch3u_rma_ops.c b/src/mpid/ch3/src/ch3u_rma_ops.c
index d90492e..3cb0b36 100644
--- a/src/mpid/ch3/src/ch3u_rma_ops.c
+++ b/src/mpid/ch3/src/ch3u_rma_ops.c
@@ -37,7 +37,7 @@ cvars:
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Put
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_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,
@@ -216,7 +216,7 @@ int MPIDI_CH3I_Put(const void *origin_addr, int origin_count, MPI_Datatype
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Get
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_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,
@@ -388,7 +388,7 @@ int MPIDI_CH3I_Get(void *origin_addr, int origin_count, MPI_Datatype
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Accumulate
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
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,
@@ -601,7 +601,7 @@ int MPIDI_CH3I_Accumulate(const void *origin_addr, int origin_count, MPI_Datatyp
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Get_accumulate
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
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,
@@ -855,7 +855,7 @@ int MPIDI_CH3I_Get_accumulate(const void *origin_addr, int origin_count,
#undef FUNCNAME
#define FUNCNAME MPIDI_Put
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_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)
@@ -882,7 +882,7 @@ int MPIDI_Put(const void *origin_addr, int origin_count, MPI_Datatype
#undef FUNCNAME
#define FUNCNAME MPIDI_Get
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_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)
@@ -909,7 +909,7 @@ int MPIDI_Get(void *origin_addr, int origin_count, MPI_Datatype
#undef FUNCNAME
#define FUNCNAME MPIDI_Accumulate
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_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)
@@ -936,7 +936,7 @@ int MPIDI_Accumulate(const void *origin_addr, int origin_count, MPI_Datatype
#undef FUNCNAME
#define FUNCNAME MPIDI_Get_accumulate
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_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,
@@ -967,7 +967,7 @@ int MPIDI_Get_accumulate(const void *origin_addr, int origin_count,
#undef FUNCNAME
#define FUNCNAME MPIDI_Compare_and_swap
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_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)
@@ -1106,7 +1106,7 @@ int MPIDI_Compare_and_swap(const void *origin_addr, const void *compare_addr,
#undef FUNCNAME
#define FUNCNAME MPIDI_Fetch_and_op
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_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)
diff --git a/src/mpid/ch3/src/ch3u_rma_pkthandler.c b/src/mpid/ch3/src/ch3u_rma_pkthandler.c
index 84231c9..2fac191 100644
--- a/src/mpid/ch3/src/ch3u_rma_pkthandler.c
+++ b/src/mpid/ch3/src/ch3u_rma_pkthandler.c
@@ -181,7 +181,7 @@ void MPIDI_CH3_RMA_Init_pkthandler_pvars(void)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_ExtPktHandler_Accumulate
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int MPIDI_CH3_ExtPktHandler_Accumulate(MPIDI_CH3_Pkt_flags_t flags,
int is_derived_dt, void **ext_hdr_ptr,
MPI_Aint * ext_hdr_sz)
@@ -230,7 +230,7 @@ static int MPIDI_CH3_ExtPktHandler_Accumulate(MPIDI_CH3_Pkt_flags_t flags,
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_ExtPktHandler_GetAccumulate
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int MPIDI_CH3_ExtPktHandler_GetAccumulate(MPIDI_CH3_Pkt_flags_t flags,
int is_derived_dt, void **ext_hdr_ptr,
MPI_Aint * ext_hdr_sz)
@@ -256,7 +256,7 @@ static int MPIDI_CH3_ExtPktHandler_GetAccumulate(MPIDI_CH3_Pkt_flags_t flags,
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_PktHandler_Put
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_PktHandler_Put(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt,
MPIDI_msg_sz_t * buflen, MPID_Request ** rreqp)
{
@@ -430,7 +430,7 @@ int MPIDI_CH3_PktHandler_Put(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt,
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_PktHandler_Get
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_PktHandler_Get(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt,
MPIDI_msg_sz_t * buflen, MPID_Request ** rreqp)
{
@@ -645,7 +645,7 @@ int MPIDI_CH3_PktHandler_Get(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt,
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_PktHandler_Accumulate
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_PktHandler_Accumulate(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt,
MPIDI_msg_sz_t * buflen, MPID_Request ** rreqp)
{
@@ -857,7 +857,7 @@ int MPIDI_CH3_PktHandler_Accumulate(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt,
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_PktHandler_GetAccumulate
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_PktHandler_GetAccumulate(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt,
MPIDI_msg_sz_t * buflen, MPID_Request ** rreqp)
{
@@ -1146,7 +1146,7 @@ int MPIDI_CH3_PktHandler_GetAccumulate(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt,
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_PktHandler_CAS
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_PktHandler_CAS(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt,
MPIDI_msg_sz_t * buflen, MPID_Request ** rreqp)
{
@@ -1258,7 +1258,7 @@ int MPIDI_CH3_PktHandler_CAS(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt,
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_PktHandler_CASResp
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_PktHandler_CASResp(MPIDI_VC_t * vc ATTRIBUTE((unused)),
MPIDI_CH3_Pkt_t * pkt,
MPIDI_msg_sz_t * buflen, MPID_Request ** rreqp)
@@ -1316,7 +1316,7 @@ int MPIDI_CH3_PktHandler_CASResp(MPIDI_VC_t * vc ATTRIBUTE((unused)),
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_PktHandler_FOP
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_PktHandler_FOP(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt,
MPIDI_msg_sz_t * buflen, MPID_Request ** rreqp)
{
@@ -1504,7 +1504,7 @@ int MPIDI_CH3_PktHandler_FOP(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt,
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_PktHandler_FOPResp
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_PktHandler_FOPResp(MPIDI_VC_t * vc ATTRIBUTE((unused)),
MPIDI_CH3_Pkt_t * pkt,
MPIDI_msg_sz_t * buflen, MPID_Request ** rreqp)
@@ -1591,7 +1591,7 @@ int MPIDI_CH3_PktHandler_FOPResp(MPIDI_VC_t * vc ATTRIBUTE((unused)),
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_PktHandler_Get_AccumResp
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_PktHandler_Get_AccumResp(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt,
MPIDI_msg_sz_t * buflen, MPID_Request ** rreqp)
{
@@ -1736,7 +1736,7 @@ int MPIDI_CH3_PktHandler_Get_AccumResp(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt,
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_PktHandler_Lock
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_PktHandler_Lock(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt,
MPIDI_msg_sz_t * buflen, MPID_Request ** rreqp)
{
@@ -1791,7 +1791,7 @@ int MPIDI_CH3_PktHandler_Lock(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt,
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_PktHandler_GetResp
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_PktHandler_GetResp(MPIDI_VC_t * vc ATTRIBUTE((unused)),
MPIDI_CH3_Pkt_t * pkt,
MPIDI_msg_sz_t * buflen, MPID_Request ** rreqp)
@@ -1884,7 +1884,7 @@ int MPIDI_CH3_PktHandler_GetResp(MPIDI_VC_t * vc ATTRIBUTE((unused)),
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_PktHandler_LockAck
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_PktHandler_LockAck(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt,
MPIDI_msg_sz_t * buflen, MPID_Request ** rreqp)
{
@@ -1932,7 +1932,7 @@ int MPIDI_CH3_PktHandler_LockAck(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt,
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_PktHandler_LockOpAck
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_PktHandler_LockOpAck(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt,
MPIDI_msg_sz_t * buflen, MPID_Request ** rreqp)
{
@@ -1987,7 +1987,7 @@ int MPIDI_CH3_PktHandler_LockOpAck(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt,
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_PktHandler_Ack
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_PktHandler_Ack(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt,
MPIDI_msg_sz_t * buflen, MPID_Request ** rreqp)
{
@@ -2027,7 +2027,7 @@ int MPIDI_CH3_PktHandler_Ack(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt,
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_PktHandler_DecrAtCnt
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_PktHandler_DecrAtCnt(MPIDI_VC_t * vc ATTRIBUTE((unused)),
MPIDI_CH3_Pkt_t * pkt,
MPIDI_msg_sz_t * buflen, MPID_Request ** rreqp)
@@ -2069,7 +2069,7 @@ int MPIDI_CH3_PktHandler_DecrAtCnt(MPIDI_VC_t * vc ATTRIBUTE((unused)),
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_PktHandler_Unlock
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_PktHandler_Unlock(MPIDI_VC_t * vc ATTRIBUTE((unused)),
MPIDI_CH3_Pkt_t * pkt,
MPIDI_msg_sz_t * buflen, MPID_Request ** rreqp)
@@ -2113,7 +2113,7 @@ int MPIDI_CH3_PktHandler_Unlock(MPIDI_VC_t * vc ATTRIBUTE((unused)),
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_PktHandler_Flush
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_PktHandler_Flush(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt,
MPIDI_msg_sz_t * buflen, MPID_Request ** rreqp)
{
diff --git a/src/mpid/ch3/src/ch3u_rma_progress.c b/src/mpid/ch3/src/ch3u_rma_progress.c
index 5e45be7..66a2611 100644
--- a/src/mpid/ch3/src/ch3u_rma_progress.c
+++ b/src/mpid/ch3/src/ch3u_rma_progress.c
@@ -57,7 +57,7 @@ static inline int issue_ops_win(MPID_Win * win_ptr, int *made_progress);
#undef FUNCNAME
#define FUNCNAME check_and_switch_window_state
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline int check_and_switch_window_state(MPID_Win * win_ptr, int *is_able_to_issue,
int *made_progress)
{
@@ -163,7 +163,7 @@ static inline int check_and_switch_window_state(MPID_Win * win_ptr, int *is_able
#undef FUNCNAME
#define FUNCNAME check_and_switch_target_state
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline int check_and_switch_target_state(MPID_Win * win_ptr, MPIDI_RMA_Target_t * target,
int *is_able_to_issue, int *made_progress)
{
@@ -311,7 +311,7 @@ static inline int check_and_switch_target_state(MPID_Win * win_ptr, MPIDI_RMA_Ta
#undef FUNCNAME
#define FUNCNAME issue_ops_target
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline int issue_ops_target(MPID_Win * win_ptr, MPIDI_RMA_Target_t * target,
int *made_progress)
{
@@ -509,7 +509,7 @@ static inline int issue_ops_target(MPID_Win * win_ptr, MPIDI_RMA_Target_t * targ
#undef FUNCNAME
#define FUNCNAME issue_ops_win
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline int issue_ops_win(MPID_Win * win_ptr, int *made_progress)
{
int mpi_errno = MPI_SUCCESS;
@@ -564,7 +564,7 @@ static inline int issue_ops_win(MPID_Win * win_ptr, int *made_progress)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_RMA_Free_ops_before_completion
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3I_RMA_Free_ops_before_completion(MPID_Win * win_ptr)
{
MPIDI_RMA_Op_t *curr_op = NULL;
@@ -676,7 +676,7 @@ int MPIDI_CH3I_RMA_Free_ops_before_completion(MPID_Win * win_ptr)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_RMA_Cleanup_ops_aggressive
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3I_RMA_Cleanup_ops_aggressive(MPID_Win * win_ptr)
{
int i, local_completed = 0, remote_completed ATTRIBUTE((unused)) = 0;
@@ -737,7 +737,7 @@ int MPIDI_CH3I_RMA_Cleanup_ops_aggressive(MPID_Win * win_ptr)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_RMA_Cleanup_target_aggressive
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3I_RMA_Cleanup_target_aggressive(MPID_Win * win_ptr, MPIDI_RMA_Target_t ** target)
{
int i, local_completed ATTRIBUTE((unused)) = 0, remote_completed = 0;
@@ -828,7 +828,7 @@ int MPIDI_CH3I_RMA_Cleanup_target_aggressive(MPID_Win * win_ptr, MPIDI_RMA_Targe
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_RMA_Make_progress_target
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3I_RMA_Make_progress_target(MPID_Win * win_ptr, int target_rank, int *made_progress)
{
int temp_progress = 0;
@@ -893,7 +893,7 @@ int MPIDI_CH3I_RMA_Make_progress_target(MPID_Win * win_ptr, int target_rank, int
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_RMA_Make_progress_win
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3I_RMA_Make_progress_win(MPID_Win * win_ptr, int *made_progress)
{
int mpi_errno = MPI_SUCCESS;
@@ -942,7 +942,7 @@ int MPIDI_CH3I_RMA_Make_progress_win(MPID_Win * win_ptr, int *made_progress)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_RMA_Make_progress_global
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3I_RMA_Make_progress_global(int *made_progress)
{
MPIDI_RMA_Win_list_t *win_elem = MPIDI_RMA_Win_list;
diff --git a/src/mpid/ch3/src/ch3u_rma_reqops.c b/src/mpid/ch3/src/ch3u_rma_reqops.c
index ae16cf5..9737925 100644
--- a/src/mpid/ch3/src/ch3u_rma_reqops.c
+++ b/src/mpid/ch3/src/ch3u_rma_reqops.c
@@ -11,7 +11,7 @@
#undef FUNCNAME
#define FUNCNAME MPIDI_Rput
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_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,
@@ -73,7 +73,7 @@ int MPIDI_Rput(const void *origin_addr, int origin_count,
#undef FUNCNAME
#define FUNCNAME MPIDI_Rget
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_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,
@@ -135,7 +135,7 @@ int MPIDI_Rget(void *origin_addr, int origin_count,
#undef FUNCNAME
#define FUNCNAME MPIDI_Raccumulate
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_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,
@@ -197,7 +197,7 @@ int MPIDI_Raccumulate(const void *origin_addr, int origin_count,
#undef FUNCNAME
#define FUNCNAME MPIDI_Rget_accumulate
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_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,
diff --git a/src/mpid/ch3/src/ch3u_rma_sync.c b/src/mpid/ch3/src/ch3u_rma_sync.c
index 7049605..6a6b29c 100644
--- a/src/mpid/ch3/src/ch3u_rma_sync.c
+++ b/src/mpid/ch3/src/ch3u_rma_sync.c
@@ -330,7 +330,7 @@ void MPIDI_CH3_RMA_Init_sync_pvars(void)
#undef FUNCNAME
#define FUNCNAME flush_local_all
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline int flush_local_all(MPID_Win * win_ptr)
{
int i, made_progress = 0;
@@ -418,7 +418,7 @@ static inline int flush_local_all(MPID_Win * win_ptr)
#undef FUNCNAME
#define FUNCNAME flush_all
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline int flush_all(MPID_Win * win_ptr)
{
int i, made_progress = 0;
@@ -475,7 +475,7 @@ static inline int flush_all(MPID_Win * win_ptr)
#undef FUNCNAME
#define FUNCNAME MPIDI_Win_fence
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_Win_fence(int assert, MPID_Win * win_ptr)
{
int i;
@@ -695,7 +695,7 @@ int MPIDI_Win_fence(int assert, MPID_Win * win_ptr)
#undef FUNCNAME
#define FUNCNAME MPIDI_Win_post
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_Win_post(MPID_Group * post_grp_ptr, int assert, MPID_Win * win_ptr)
{
int *post_ranks_in_win_grp;
@@ -793,7 +793,7 @@ int MPIDI_Win_post(MPID_Group * post_grp_ptr, int assert, MPID_Win * win_ptr)
#undef FUNCNAME
#define FUNCNAME MPIDI_Win_start
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_Win_start(MPID_Group * group_ptr, int assert, MPID_Win * win_ptr)
{
int mpi_errno = MPI_SUCCESS;
@@ -917,7 +917,7 @@ int MPIDI_Win_start(MPID_Group * group_ptr, int assert, MPID_Win * win_ptr)
#undef FUNCNAME
#define FUNCNAME MPIDI_Win_complete
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_Win_complete(MPID_Win * win_ptr)
{
int mpi_errno = MPI_SUCCESS;
@@ -1009,7 +1009,7 @@ int MPIDI_Win_complete(MPID_Win * win_ptr)
#undef FUNCNAME
#define FUNCNAME MPIDI_Win_wait
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_Win_wait(MPID_Win * win_ptr)
{
int mpi_errno = MPI_SUCCESS;
@@ -1048,7 +1048,7 @@ int MPIDI_Win_wait(MPID_Win * win_ptr)
#undef FUNCNAME
#define FUNCNAME MPIDI_Win_test
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_Win_test(MPID_Win * win_ptr, int *flag)
{
int mpi_errno = MPI_SUCCESS;
@@ -1094,7 +1094,7 @@ int MPIDI_Win_test(MPID_Win * win_ptr, int *flag)
#undef FUNCNAME
#define FUNCNAME MPIDI_Win_lock
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_Win_lock(int lock_type, int dest, int assert, MPID_Win * win_ptr)
{
int made_progress = 0;
@@ -1205,7 +1205,7 @@ int MPIDI_Win_lock(int lock_type, int dest, int assert, MPID_Win * win_ptr)
#undef FUNCNAME
#define FUNCNAME MPIDI_Win_unlock
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_Win_unlock(int dest, MPID_Win * win_ptr)
{
int made_progress = 0;
@@ -1310,7 +1310,7 @@ int MPIDI_Win_unlock(int dest, MPID_Win * win_ptr)
#undef FUNCNAME
#define FUNCNAME MPIDI_Win_flush
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_Win_flush(int dest, MPID_Win * win_ptr)
{
int made_progress = 0;
@@ -1410,7 +1410,7 @@ int MPIDI_Win_flush(int dest, MPID_Win * win_ptr)
#undef FUNCNAME
#define FUNCNAME MPIDI_Win_flush_local
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_Win_flush_local(int dest, MPID_Win * win_ptr)
{
int made_progress = 0;
@@ -1505,7 +1505,7 @@ int MPIDI_Win_flush_local(int dest, MPID_Win * win_ptr)
#undef FUNCNAME
#define FUNCNAME MPIDI_Win_lock_all
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_Win_lock_all(int assert, MPID_Win * win_ptr)
{
int i, rank = win_ptr->comm_ptr->rank;
@@ -1587,7 +1587,7 @@ int MPIDI_Win_lock_all(int assert, MPID_Win * win_ptr)
#undef FUNCNAME
#define FUNCNAME MPIDI_Win_unlock_all
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_Win_unlock_all(MPID_Win * win_ptr)
{
int i, made_progress = 0;
@@ -1732,7 +1732,7 @@ int MPIDI_Win_unlock_all(MPID_Win * win_ptr)
#undef FUNCNAME
#define FUNCNAME MPIDI_Win_flush_all
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_Win_flush_all(MPID_Win * win_ptr)
{
int i;
@@ -1781,7 +1781,7 @@ int MPIDI_Win_flush_all(MPID_Win * win_ptr)
#undef FUNCNAME
#define FUNCNAME MPIDI_Win_flush_local_all
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_Win_flush_local_all(MPID_Win * win_ptr)
{
int i;
@@ -1830,7 +1830,7 @@ int MPIDI_Win_flush_local_all(MPID_Win * win_ptr)
#undef FUNCNAME
#define FUNCNAME MPIDI_Win_sync
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_Win_sync(MPID_Win * win_ptr)
{
int mpi_errno = MPI_SUCCESS;
diff --git a/src/mpid/ch3/src/ch3u_rndv.c b/src/mpid/ch3/src/ch3u_rndv.c
index 264c475..3bb42b2 100644
--- a/src/mpid/ch3/src/ch3u_rndv.c
+++ b/src/mpid/ch3/src/ch3u_rndv.c
@@ -14,7 +14,7 @@
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_RndvSend
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_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,
MPI_Datatype datatype, int dt_contig, MPIDI_msg_sz_t data_sz,
@@ -106,7 +106,7 @@ int MPIDI_CH3_RndvSend( MPID_Request **sreq_p, const void * buf, MPI_Aint count,
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_PktHandler_RndvReqToSend
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_PktHandler_RndvReqToSend( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt,
MPIDI_msg_sz_t *buflen, MPID_Request **rreqp )
{
@@ -194,7 +194,7 @@ int MPIDI_CH3_PktHandler_RndvReqToSend( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt,
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_PktHandler_RndvClrToSend
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_PktHandler_RndvClrToSend( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt,
MPIDI_msg_sz_t *buflen, MPID_Request **rreqp )
{
@@ -279,7 +279,7 @@ int MPIDI_CH3_PktHandler_RndvClrToSend( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt,
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_PktHandler_RndvSend
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_PktHandler_RndvSend( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt,
MPIDI_msg_sz_t *buflen, MPID_Request **rreqp )
{
@@ -335,7 +335,7 @@ int MPIDI_CH3_PktHandler_RndvSend( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt,
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_RecvRndv
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_RecvRndv( MPIDI_VC_t * vc, MPID_Request *rreq )
{
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 45b7007..3507d88 100644
--- a/src/mpid/ch3/src/ch3u_win_fns.c
+++ b/src/mpid/ch3/src/ch3u_win_fns.c
@@ -13,7 +13,7 @@ MPIR_T_PVAR_DOUBLE_TIMER_DECL_EXTERN(RMA, rma_wincreate_allgather);
#undef FUNCNAME
#define FUNCNAME MPIDI_Win_fns_init
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_Win_fns_init(MPIDI_CH3U_Win_fns_t * win_fns)
{
int mpi_errno = MPI_SUCCESS;
@@ -36,7 +36,7 @@ int MPIDI_Win_fns_init(MPIDI_CH3U_Win_fns_t * win_fns)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3U_Win_gather_info
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_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)
{
@@ -103,7 +103,7 @@ int MPIDI_CH3U_Win_gather_info(void *base, MPI_Aint size, int disp_unit,
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3U_Win_create
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_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)
{
@@ -138,7 +138,7 @@ int MPIDI_CH3U_Win_create(void *base, MPI_Aint size, int disp_unit, MPID_Info *
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3U_Win_create_dynamic
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3U_Win_create_dynamic(MPID_Info * info, MPID_Comm * comm_ptr, MPID_Win ** win_ptr)
{
int mpi_errno = MPI_SUCCESS;
@@ -163,7 +163,7 @@ int MPIDI_CH3U_Win_create_dynamic(MPID_Info * info, MPID_Comm * comm_ptr, MPID_W
#undef FUNCNAME
#define FUNCNAME MPIDI_Win_attach
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_Win_attach(MPID_Win * win, void *base, MPI_Aint size)
{
int mpi_errno = MPI_SUCCESS;
@@ -186,7 +186,7 @@ int MPIDI_Win_attach(MPID_Win * win, void *base, MPI_Aint size)
#undef FUNCNAME
#define FUNCNAME MPIDI_Win_detach
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_Win_detach(MPID_Win * win, const void *base)
{
int mpi_errno = MPI_SUCCESS;
@@ -209,7 +209,7 @@ int MPIDI_Win_detach(MPID_Win * win, const void *base)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3U_Win_allocate
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_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)
{
@@ -243,7 +243,7 @@ int MPIDI_CH3U_Win_allocate(MPI_Aint size, int disp_unit, MPID_Info * info,
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3U_Win_allocate_no_shm
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_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)
{
@@ -285,7 +285,7 @@ int MPIDI_CH3U_Win_allocate_no_shm(MPI_Aint size, int disp_unit, MPID_Info * inf
#undef FUNCNAME
#define FUNCNAME MPIDI_Win_set_info
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_Win_set_info(MPID_Win * win, MPID_Info * info)
{
int mpi_errno = MPI_SUCCESS;
@@ -364,7 +364,7 @@ int MPIDI_Win_set_info(MPID_Win * win, MPID_Info * info)
#undef FUNCNAME
#define FUNCNAME MPIDI_Win_get_info
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_Win_get_info(MPID_Win * win, MPID_Info ** info_used)
{
int mpi_errno = MPI_SUCCESS;
diff --git a/src/mpid/ch3/src/mpid_abort.c b/src/mpid/ch3/src/mpid_abort.c
index b48e618..e4a9369 100644
--- a/src/mpid/ch3/src/mpid_abort.c
+++ b/src/mpid/ch3/src/mpid_abort.c
@@ -29,7 +29,7 @@
#undef FUNCNAME
#define FUNCNAME MPID_Abort
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_Abort(MPID_Comm * comm, int mpi_errno, int exit_code,
const char *error_msg)
{
diff --git a/src/mpid/ch3/src/mpid_aint.c b/src/mpid/ch3/src/mpid_aint.c
index ca4c00b..e331f57 100644
--- a/src/mpid/ch3/src/mpid_aint.c
+++ b/src/mpid/ch3/src/mpid_aint.c
@@ -19,7 +19,7 @@
#undef FUNCNAME
#define FUNCNAME MPID_Aint_add
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
MPI_Aint MPID_Aint_add(MPI_Aint base, MPI_Aint disp)
{
MPI_Aint result;
@@ -46,7 +46,7 @@ MPI_Aint MPID_Aint_add(MPI_Aint base, MPI_Aint disp)
#undef FUNCNAME
#define FUNCNAME MPID_Aint_diff
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
MPI_Aint MPID_Aint_diff(MPI_Aint addr1, MPI_Aint addr2)
{
MPI_Aint result;
diff --git a/src/mpid/ch3/src/mpid_cancel_recv.c b/src/mpid/ch3/src/mpid_cancel_recv.c
index d1d3902..054f8ce 100644
--- a/src/mpid/ch3/src/mpid_cancel_recv.c
+++ b/src/mpid/ch3/src/mpid_cancel_recv.c
@@ -9,7 +9,7 @@
#undef FUNCNAME
#define FUNCNAME MPID_Cancel_recv
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_Cancel_recv(MPID_Request * rreq)
{
int netmod_cancelled = TRUE;
diff --git a/src/mpid/ch3/src/mpid_cancel_send.c b/src/mpid/ch3/src/mpid_cancel_send.c
index 298ee59..2b626d7 100644
--- a/src/mpid/ch3/src/mpid_cancel_send.c
+++ b/src/mpid/ch3/src/mpid_cancel_send.c
@@ -13,7 +13,7 @@
#undef FUNCNAME
#define FUNCNAME MPID_Cancel_send
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_Cancel_send(MPID_Request * sreq)
{
MPIDI_VC_t * vc;
diff --git a/src/mpid/ch3/src/mpid_comm_disconnect.c b/src/mpid/ch3/src/mpid_comm_disconnect.c
index 0f187de..8553f65 100644
--- a/src/mpid/ch3/src/mpid_comm_disconnect.c
+++ b/src/mpid/ch3/src/mpid_comm_disconnect.c
@@ -21,7 +21,7 @@
#undef FUNCNAME
#define FUNCNAME MPID_Comm_disconnect
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_Comm_disconnect(MPID_Comm *comm_ptr)
{
int mpi_errno = MPI_SUCCESS;
diff --git a/src/mpid/ch3/src/mpid_comm_revoke.c b/src/mpid/ch3/src/mpid_comm_revoke.c
index 1fae5da..2d88ddc 100644
--- a/src/mpid/ch3/src/mpid_comm_revoke.c
+++ b/src/mpid/ch3/src/mpid_comm_revoke.c
@@ -18,7 +18,7 @@
#undef FUNCNAME
#define FUNCNAME MPID_Comm_revoke
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_Comm_revoke(MPID_Comm *comm_ptr, int is_remote)
{
MPIDI_VC_t *vc;
diff --git a/src/mpid/ch3/src/mpid_comm_spawn_multiple.c b/src/mpid/ch3/src/mpid_comm_spawn_multiple.c
index 12cd32b..b1e4795 100644
--- a/src/mpid/ch3/src/mpid_comm_spawn_multiple.c
+++ b/src/mpid/ch3/src/mpid_comm_spawn_multiple.c
@@ -31,7 +31,7 @@
#undef FUNCNAME
#define FUNCNAME MPID_Comm_spawn_multiple
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#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,
diff --git a/src/mpid/ch3/src/mpid_finalize.c b/src/mpid/ch3/src/mpid_finalize.c
index 1d60f85..48abc26 100644
--- a/src/mpid/ch3/src/mpid_finalize.c
+++ b/src/mpid/ch3/src/mpid_finalize.c
@@ -14,7 +14,7 @@
#undef FUNCNAME
#define FUNCNAME MPID_Finalize
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_Finalize(void)
{
int mpi_errno = MPI_SUCCESS;
diff --git a/src/mpid/ch3/src/mpid_get_universe_size.c b/src/mpid/ch3/src/mpid_get_universe_size.c
index 827fbfc..4b4c6dd 100644
--- a/src/mpid/ch3/src/mpid_get_universe_size.c
+++ b/src/mpid/ch3/src/mpid_get_universe_size.c
@@ -22,7 +22,7 @@
#undef FUNCNAME
#define FUNCNAME MPID_Get_universe_size
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_Get_universe_size(int * universe_size)
{
int mpi_errno = MPI_SUCCESS;
diff --git a/src/mpid/ch3/src/mpid_getpname.c b/src/mpid/ch3/src/mpid_getpname.c
index fbc9778..87dcbe5 100644
--- a/src/mpid/ch3/src/mpid_getpname.c
+++ b/src/mpid/ch3/src/mpid_getpname.c
@@ -21,7 +21,7 @@ static inline void setupProcessorName( void );
#undef FUNCNAME
#define FUNCNAME MPID_Get_processor_name
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_Get_processor_name(char * name, int namelen, int * resultlen)
{
int mpi_errno = MPI_SUCCESS;
diff --git a/src/mpid/ch3/src/mpid_init.c b/src/mpid/ch3/src/mpid_init.c
index 6373ae2..e07f24b 100644
--- a/src/mpid/ch3/src/mpid_init.c
+++ b/src/mpid/ch3/src/mpid_init.c
@@ -47,7 +47,7 @@ MPIDI_CH3U_Win_pkt_ordering_t MPIDI_CH3U_Win_pkt_orderings = { 0 };
#undef FUNCNAME
#define FUNCNAME finalize_failed_procs_group
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int finalize_failed_procs_group(void *param)
{
int mpi_errno = MPI_SUCCESS;
@@ -89,7 +89,7 @@ static int set_eager_threshold(MPID_Comm *comm_ptr, MPID_Info *info, void *state
#undef FUNCNAME
#define FUNCNAME MPID_Init
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_Init(int *argc, char ***argv, int requested, int *provided,
int *has_args, int *has_env)
{
diff --git a/src/mpid/ch3/src/mpid_iprobe.c b/src/mpid/ch3/src/mpid_iprobe.c
index 9252a57..41f3f97 100644
--- a/src/mpid/ch3/src/mpid_iprobe.c
+++ b/src/mpid/ch3/src/mpid_iprobe.c
@@ -12,7 +12,7 @@ int (*MPIDI_Anysource_iprobe_fn)(int tag, MPID_Comm * comm, int context_offset,
#undef FUNCNAME
#define FUNCNAME MPID_Iprobe
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_Iprobe(int source, int tag, MPID_Comm *comm, int context_offset,
int *flag, MPI_Status *status)
{
diff --git a/src/mpid/ch3/src/mpid_irecv.c b/src/mpid/ch3/src/mpid_irecv.c
index 5cb85ba..3c30933 100644
--- a/src/mpid/ch3/src/mpid_irecv.c
+++ b/src/mpid/ch3/src/mpid_irecv.c
@@ -9,7 +9,7 @@
#undef FUNCNAME
#define FUNCNAME MPID_Irecv
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_Irecv(void * buf, MPI_Aint count, MPI_Datatype datatype, int rank, int tag,
MPID_Comm * comm, int context_offset,
MPID_Request ** request)
diff --git a/src/mpid/ch3/src/mpid_irsend.c b/src/mpid/ch3/src/mpid_irsend.c
index 6bedef9..2d7ba63 100644
--- a/src/mpid/ch3/src/mpid_irsend.c
+++ b/src/mpid/ch3/src/mpid_irsend.c
@@ -14,7 +14,7 @@
#undef FUNCNAME
#define FUNCNAME MPID_Irsend
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_Irsend(const void * buf, int count, MPI_Datatype datatype, int rank, int tag, MPID_Comm * comm, int context_offset,
MPID_Request ** request)
{
diff --git a/src/mpid/ch3/src/mpid_isend.c b/src/mpid/ch3/src/mpid_isend.c
index b71933f..3ff8cac 100644
--- a/src/mpid/ch3/src/mpid_isend.c
+++ b/src/mpid/ch3/src/mpid_isend.c
@@ -26,7 +26,7 @@
#undef FUNCNAME
#define FUNCNAME MPID_Isend
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_Isend(const void * buf, MPI_Aint count, MPI_Datatype datatype, int rank,
int tag, MPID_Comm * comm, int context_offset,
MPID_Request ** request)
diff --git a/src/mpid/ch3/src/mpid_issend.c b/src/mpid/ch3/src/mpid_issend.c
index d1def5a..a275c6f 100644
--- a/src/mpid/ch3/src/mpid_issend.c
+++ b/src/mpid/ch3/src/mpid_issend.c
@@ -14,7 +14,7 @@
#undef FUNCNAME
#define FUNCNAME MPID_Issend
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_Issend(const void * buf, int count, MPI_Datatype datatype, int rank, int tag, MPID_Comm * comm, int context_offset,
MPID_Request ** request)
{
diff --git a/src/mpid/ch3/src/mpid_port.c b/src/mpid/ch3/src/mpid_port.c
index c9333bb..2c676e2 100644
--- a/src/mpid/ch3/src/mpid_port.c
+++ b/src/mpid/ch3/src/mpid_port.c
@@ -40,7 +40,7 @@ static MPIDI_PortFns portFns = { 0, 0, 0, 0 };
#undef FUNCNAME
#define FUNCNAME MPID_Open_port
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_Open_port(MPID_Info *info_ptr, char *port_name)
{
int mpi_errno=MPI_SUCCESS;
@@ -91,7 +91,7 @@ Input Parameters:
#undef FUNCNAME
#define FUNCNAME MPID_Close_port
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_Close_port(const char *port_name)
{
int mpi_errno=MPI_SUCCESS;
@@ -127,7 +127,7 @@ int MPID_Close_port(const char *port_name)
#undef FUNCNAME
#define FUNCNAME MPID_Comm_accept
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#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)
{
@@ -165,7 +165,7 @@ int MPID_Comm_accept(const char * port_name, MPID_Info * info, int root,
#undef FUNCNAME
#define FUNCNAME MPID_Comm_connect
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#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)
{
@@ -280,7 +280,7 @@ static void free_port_name_tag(int tag)
#undef FUNCNAME
#define FUNCNAME MPIDI_Open_port
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int MPIDI_Open_port(MPID_Info *info_ptr, char *port_name)
{
int mpi_errno = MPI_SUCCESS;
@@ -325,7 +325,7 @@ fn_fail:
#undef FUNCNAME
#define FUNCNAME MPIDI_Close_port
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int MPIDI_Close_port(const char *port_name)
{
int mpi_errno = MPI_SUCCESS;
diff --git a/src/mpid/ch3/src/mpid_probe.c b/src/mpid/ch3/src/mpid_probe.c
index e48aae0..71bf6dd 100644
--- a/src/mpid/ch3/src/mpid_probe.c
+++ b/src/mpid/ch3/src/mpid_probe.c
@@ -9,7 +9,7 @@
#undef FUNCNAME
#define FUNCNAME MPID_Probe
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_Probe(int source, int tag, MPID_Comm * comm, int context_offset,
MPI_Status * status)
{
diff --git a/src/mpid/ch3/src/mpid_recv.c b/src/mpid/ch3/src/mpid_recv.c
index 80d3fd9..cd19a3a 100644
--- a/src/mpid/ch3/src/mpid_recv.c
+++ b/src/mpid/ch3/src/mpid_recv.c
@@ -9,7 +9,7 @@
#undef FUNCNAME
#define FUNCNAME MPID_Recv
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_Recv(void * buf, MPI_Aint count, MPI_Datatype datatype, int rank, int tag,
MPID_Comm * comm, int context_offset,
MPI_Status * status, MPID_Request ** request)
diff --git a/src/mpid/ch3/src/mpid_rma.c b/src/mpid/ch3/src/mpid_rma.c
index 016f4a3..5fcaebf 100644
--- a/src/mpid/ch3/src/mpid_rma.c
+++ b/src/mpid/ch3/src/mpid_rma.c
@@ -94,7 +94,7 @@ static int win_init(MPI_Aint size, int disp_unit, int create_flavor, int model,
#undef FUNCNAME
#define FUNCNAME MPID_Win_create
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_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)
{
@@ -129,7 +129,7 @@ int MPID_Win_create(void *base, MPI_Aint size, int disp_unit, MPID_Info * info,
#undef FUNCNAME
#define FUNCNAME MPID_Win_allocate
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_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)
{
@@ -159,7 +159,7 @@ int MPID_Win_allocate(MPI_Aint size, int disp_unit, MPID_Info * info,
#undef FUNCNAME
#define FUNCNAME MPID_Win_create_dynamic
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_Win_create_dynamic(MPID_Info * info, MPID_Comm * comm_ptr, MPID_Win ** win_ptr)
{
int mpi_errno = MPI_SUCCESS;
@@ -192,7 +192,7 @@ int MPID_Win_create_dynamic(MPID_Info * info, MPID_Comm * comm_ptr, MPID_Win **
#undef FUNCNAME
#define FUNCNAME MPID_Alloc_mem
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
void *MPID_Alloc_mem(size_t size, MPID_Info * info_ptr)
{
void *ap = NULL;
@@ -210,7 +210,7 @@ void *MPID_Alloc_mem(size_t size, MPID_Info * info_ptr)
#undef FUNCNAME
#define FUNCNAME MPID_Free_mem
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_Free_mem(void *ptr)
{
int mpi_errno = MPI_SUCCESS;
@@ -232,7 +232,7 @@ int MPID_Free_mem(void *ptr)
#undef FUNCNAME
#define FUNCNAME MPID_Win_allocate_shared
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_Win_allocate_shared(MPI_Aint size, int disp_unit, MPID_Info * info, MPID_Comm * comm_ptr,
void *base_ptr, MPID_Win ** win_ptr)
{
@@ -419,7 +419,7 @@ static int win_init(MPI_Aint size, int disp_unit, int create_flavor, int model,
#undef FUNCNAME
#define FUNCNAME MPID_Win_set_info
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_Win_set_info(MPID_Win * win, MPID_Info * info)
{
int mpi_errno = MPI_SUCCESS;
@@ -443,7 +443,7 @@ int MPID_Win_set_info(MPID_Win * win, MPID_Info * info)
#undef FUNCNAME
#define FUNCNAME MPID_Win_get_info
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_Win_get_info(MPID_Win * win, MPID_Info ** info_used)
{
int mpi_errno = MPI_SUCCESS;
diff --git a/src/mpid/ch3/src/mpid_rsend.c b/src/mpid/ch3/src/mpid_rsend.c
index 0defcfb..01de9d2 100644
--- a/src/mpid/ch3/src/mpid_rsend.c
+++ b/src/mpid/ch3/src/mpid_rsend.c
@@ -18,7 +18,7 @@
#undef FUNCNAME
#define FUNCNAME MPID_Rsend
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_Rsend(const void * buf, int count, MPI_Datatype datatype, int rank, int tag, MPID_Comm * comm, int context_offset,
MPID_Request ** request)
{
diff --git a/src/mpid/ch3/src/mpid_send.c b/src/mpid/ch3/src/mpid_send.c
index 21a8477..de2682c 100644
--- a/src/mpid/ch3/src/mpid_send.c
+++ b/src/mpid/ch3/src/mpid_send.c
@@ -14,7 +14,7 @@
#undef FUNCNAME
#define FUNCNAME MPID_Send
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_Send(const void * buf, MPI_Aint count, MPI_Datatype datatype, int rank,
int tag, MPID_Comm * comm, int context_offset,
MPID_Request ** request)
diff --git a/src/mpid/ch3/src/mpid_ssend.c b/src/mpid/ch3/src/mpid_ssend.c
index 3944138..53b8d16 100644
--- a/src/mpid/ch3/src/mpid_ssend.c
+++ b/src/mpid/ch3/src/mpid_ssend.c
@@ -14,7 +14,7 @@
#undef FUNCNAME
#define FUNCNAME MPID_Ssend
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_Ssend(const void * buf, MPI_Aint count, MPI_Datatype datatype, int rank, int tag, MPID_Comm * comm, int context_offset,
MPID_Request ** request)
{
diff --git a/src/mpid/ch3/src/mpid_startall.c b/src/mpid/ch3/src/mpid_startall.c
index 4e23342..e6b2efc 100644
--- a/src/mpid/ch3/src/mpid_startall.c
+++ b/src/mpid/ch3/src/mpid_startall.c
@@ -51,7 +51,7 @@
#undef FUNCNAME
#define FUNCNAME MPID_Startall
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_Startall(int count, MPID_Request * requests[])
{
int i;
@@ -161,7 +161,7 @@ int MPID_Startall(int count, MPID_Request * requests[])
#undef FUNCNAME
#define FUNCNAME MPID_Send_init
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_Send_init(const void * buf, int count, MPI_Datatype datatype, int rank, int tag, MPID_Comm * comm, int context_offset,
MPID_Request ** request)
{
@@ -191,7 +191,7 @@ int MPID_Send_init(const void * buf, int count, MPI_Datatype datatype, int rank,
#undef FUNCNAME
#define FUNCNAME MPID_Ssend_init
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_Ssend_init(const void * buf, int count, MPI_Datatype datatype, int rank, int tag, MPID_Comm * comm, int context_offset,
MPID_Request ** request)
{
@@ -221,7 +221,7 @@ int MPID_Ssend_init(const void * buf, int count, MPI_Datatype datatype, int rank
#undef FUNCNAME
#define FUNCNAME MPID_Rsend_init
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_Rsend_init(const void * buf, int count, MPI_Datatype datatype, int rank, int tag, MPID_Comm * comm, int context_offset,
MPID_Request ** request)
{
@@ -251,7 +251,7 @@ int MPID_Rsend_init(const void * buf, int count, MPI_Datatype datatype, int rank
#undef FUNCNAME
#define FUNCNAME MPID_Bsend_init
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_Bsend_init(const void * buf, int count, MPI_Datatype datatype, int rank, int tag, MPID_Comm * comm, int context_offset,
MPID_Request ** request)
{
@@ -289,7 +289,7 @@ int MPID_Bsend_init(const void * buf, int count, MPI_Datatype datatype, int rank
#undef FUNCNAME
#define FUNCNAME MPID_Recv_init
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_Recv_init(void * buf, int count, MPI_Datatype datatype, int rank, int tag, MPID_Comm * comm, int context_offset,
MPID_Request ** request)
{
diff --git a/src/mpid/ch3/src/mpid_vc.c b/src/mpid/ch3/src/mpid_vc.c
index 2b45214..1de638b 100644
--- a/src/mpid/ch3/src/mpid_vc.c
+++ b/src/mpid/ch3/src/mpid_vc.c
@@ -107,7 +107,7 @@ MPIDI_VCRT_t;
#undef FUNCNAME
#define FUNCNAME MPID_VCRT_Create
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_VCRT_Create(int size, MPID_VCRT *vcrt_ptr)
{
MPIDI_VCRT_t * vcrt;
@@ -146,7 +146,7 @@ int MPID_VCRT_Create(int size, MPID_VCRT *vcrt_ptr)
#undef FUNCNAME
#define FUNCNAME MPID_VCRT_Add_ref
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_VCRT_Add_ref(MPID_VCRT vcrt)
{
MPIDI_STATE_DECL(MPID_STATE_MPID_VCRT_ADD_REF);
@@ -169,7 +169,7 @@ int MPID_VCRT_Add_ref(MPID_VCRT vcrt)
#undef FUNCNAME
#define FUNCNAME MPID_VCRT_Release
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_VCRT_Release(MPID_VCRT vcrt, int isDisconnect )
{
int in_use;
@@ -280,7 +280,7 @@ int MPID_VCRT_Release(MPID_VCRT vcrt, int isDisconnect )
#undef FUNCNAME
#define FUNCNAME MPID_VCRT_Get_ptr
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_VCRT_Get_ptr(MPID_VCRT vcrt, MPID_VCR **vc_pptr)
{
MPIDI_STATE_DECL(MPID_STATE_MPID_VCRT_GET_PTR);
@@ -308,7 +308,7 @@ int MPID_VCRT_Get_ptr(MPID_VCRT vcrt, MPID_VCR **vc_pptr)
#undef FUNCNAME
#define FUNCNAME MPID_VCR_Dup
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_VCR_Dup(MPID_VCR orig_vcr, MPID_VCR * new_vcr)
{
MPIDI_STATE_DECL(MPID_STATE_MPID_VCR_DUP);
@@ -340,7 +340,7 @@ int MPID_VCR_Dup(MPID_VCR orig_vcr, MPID_VCR * new_vcr)
#undef FUNCNAME
#define FUNCNAME MPID_VCR_Get_lpid
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_VCR_Get_lpid(MPID_VCR vcr, int * lpid_ptr)
{
MPIDI_STATE_DECL(MPID_STATE_MPID_VCR_GET_LPID);
@@ -360,7 +360,7 @@ int MPID_VCR_Get_lpid(MPID_VCR vcr, int * lpid_ptr)
#undef FUNCNAME
#define FUNCNAME MPID_GPID_GetAllInComm
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_GPID_GetAllInComm( MPID_Comm *comm_ptr, int local_size,
int local_gpids[], int *singlePG )
{
@@ -402,7 +402,7 @@ int MPID_GPID_GetAllInComm( MPID_Comm *comm_ptr, int local_size,
#undef FUNCNAME
#define FUNCNAME MPID_GPID_Get
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_GPID_Get( MPID_Comm *comm_ptr, int rank, int gpid[] )
{
int pgid;
@@ -427,7 +427,7 @@ int MPID_GPID_Get( MPID_Comm *comm_ptr, int rank, int gpid[] )
#undef FUNCNAME
#define FUNCNAME MPID_GPID_ToLpidArray
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_GPID_ToLpidArray( int size, int gpid[], int lpid[] )
{
int i, mpi_errno = MPI_SUCCESS;
@@ -494,7 +494,7 @@ int MPID_GPID_ToLpidArray( int size, int gpid[], int lpid[] )
#undef FUNCNAME
#define FUNCNAME MPID_VCR_CommFromLpids
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_VCR_CommFromLpids( MPID_Comm *newcomm_ptr,
int size, const int lpids[] )
{
@@ -578,7 +578,7 @@ fn_fail:
#undef FUNCNAME
#define FUNCNAME MPID_PG_ForwardPGInfo
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_PG_ForwardPGInfo( MPID_Comm *peer_ptr, MPID_Comm *comm_ptr,
int nPGids, const int gpids[],
int root )
@@ -694,7 +694,7 @@ char MPIU_hostname[MAX_HOSTNAME_LEN] = "_UNKNOWN_"; /* '_' is an illegal char fo
#undef FUNCNAME
#define FUNCNAME MPID_Get_node_id
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_Get_node_id(MPID_Comm *comm, int rank, MPID_Node_id_t *id_p)
{
*id_p = comm->vcr[rank]->node_id;
@@ -704,7 +704,7 @@ int MPID_Get_node_id(MPID_Comm *comm, int rank, MPID_Node_id_t *id_p)
#undef FUNCNAME
#define FUNCNAME MPID_Get_max_node_id
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_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)
@@ -796,7 +796,7 @@ typedef struct map_block
#undef FUNCNAME
#define FUNCNAME parse_mapping
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int parse_mapping(char *map_str, mapping_type_t *type, map_block_t **map, int *nblocks)
{
int mpi_errno = MPI_SUCCESS;
@@ -972,7 +972,7 @@ static int compare_ints(const void *orig_x, const void *orig_y)
#undef FUNCNAME
#define FUNCNAME populate_ids_from_mapping
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int populate_ids_from_mapping(char *mapping, int *num_nodes, MPIDI_PG_t *pg, int *did_map)
{
int mpi_errno = MPI_SUCCESS;
@@ -1097,7 +1097,7 @@ fn_fail:
#undef FUNCNAME
#define FUNCNAME MPIDI_Populate_vc_node_ids
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_Populate_vc_node_ids(MPIDI_PG_t *pg, int our_pg_rank)
{
int mpi_errno = MPI_SUCCESS;
diff --git a/src/mpid/ch3/src/mpidi_isend_self.c b/src/mpid/ch3/src/mpidi_isend_self.c
index 453ab9e..e239ba5 100644
--- a/src/mpid/ch3/src/mpidi_isend_self.c
+++ b/src/mpid/ch3/src/mpidi_isend_self.c
@@ -15,7 +15,7 @@
#undef FUNCNAME
#define FUNCNAME MPIDI_Isend_self
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_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 type, MPID_Request ** request)
{
diff --git a/src/mpid/ch3/src/mpidi_pg.c b/src/mpid/ch3/src/mpidi_pg.c
index 2367259..4dfdc8b 100644
--- a/src/mpid/ch3/src/mpidi_pg.c
+++ b/src/mpid/ch3/src/mpidi_pg.c
@@ -33,7 +33,7 @@ static MPIDI_PG_t *pg_world = NULL;
#undef FUNCNAME
#define FUNCNAME MPIDI_PG_Init
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_PG_Init(int *argc_p, char ***argv_p,
MPIDI_PG_Compare_ids_fn_t compare_ids_fn,
MPIDI_PG_Destroy_fn_t destroy_fn)
@@ -73,7 +73,7 @@ int MPIDI_PG_Init(int *argc_p, char ***argv_p,
#undef FUNCNAME
#define FUNCNAME MPIDI_PG_Finalize
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
/*@
MPIDI_PG_Finalize - Finalize the process groups, including freeing all
process group structures
@@ -173,7 +173,7 @@ int MPIDI_PG_Finalize(void)
#undef FUNCNAME
#define FUNCNAME MPIDI_PG_Create
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_PG_Create(int vct_sz, void * pg_id, MPIDI_PG_t ** pg_ptr)
{
MPIDI_PG_t * pg = NULL, *pgnext;
@@ -262,7 +262,7 @@ int MPIDI_PG_Create(int vct_sz, void * pg_id, MPIDI_PG_t ** pg_ptr)
#undef FUNCNAME
#define FUNCNAME MPIDI_PG_Destroy
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_PG_Destroy(MPIDI_PG_t * pg)
{
MPIDI_PG_t * pg_prev;
@@ -356,7 +356,7 @@ int MPIDI_PG_Destroy(MPIDI_PG_t * pg)
#undef FUNCNAME
#define FUNCNAME MPIDI_PG_Find
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_PG_Find(void * id, MPIDI_PG_t ** pg_ptr)
{
MPIDI_PG_t * pg;
@@ -388,7 +388,7 @@ int MPIDI_PG_Find(void * id, MPIDI_PG_t ** pg_ptr)
#undef FUNCNAME
#define FUNCNAME MPIDI_PG_Id_compare
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_PG_Id_compare(void * id1, void *id2)
{
return MPIDI_PG_Compare_ids_fn(id1, id2);
@@ -398,7 +398,7 @@ int MPIDI_PG_Id_compare(void * id1, void *id2)
#undef FUNCNAME
#define FUNCNAME MPIDI_PG_Get_next
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_PG_Get_next(MPIDI_PG_iterator *iter, MPIDI_PG_t ** pg_ptr)
{
*pg_ptr = (*iter);
@@ -412,7 +412,7 @@ int MPIDI_PG_Get_next(MPIDI_PG_iterator *iter, MPIDI_PG_t ** pg_ptr)
#undef FUNCNAME
#define FUNCNAME MPIDI_PG_Has_next
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_PG_Has_next(MPIDI_PG_iterator *iter)
{
return (*iter != NULL);
@@ -421,7 +421,7 @@ int MPIDI_PG_Has_next(MPIDI_PG_iterator *iter)
#undef FUNCNAME
#define FUNCNAME MPIDI_PG_Get_iterator
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_PG_Get_iterator(MPIDI_PG_iterator *iter)
{
*iter = MPIDI_PG_list;
@@ -440,7 +440,7 @@ int MPIDI_PG_Get_iterator(MPIDI_PG_iterator *iter)
#undef FUNCNAME
#define FUNCNAME MPIDI_PG_To_string
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_PG_To_string(MPIDI_PG_t *pg_ptr, char **str_ptr, int *lenStr)
{
int mpi_errno = MPI_SUCCESS;
@@ -475,7 +475,7 @@ fn_fail:
#undef FUNCNAME
#define FUNCNAME MPIDI_PG_Create_from_string
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_PG_Create_from_string(const char * str, MPIDI_PG_t ** pg_pptr,
int *flag)
{
@@ -584,7 +584,7 @@ void MPIDI_PG_IdToNum( MPIDI_PG_t *pg, int *id )
#undef FUNCNAME
#define FUNCNAME MPIDI_PG_SetConnInfo
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_PG_SetConnInfo( int rank, const char *connString )
{
#ifdef USE_PMI2_API
@@ -674,7 +674,7 @@ int MPIDI_PG_SetConnInfo( int rank, const char *connString )
#undef FUNCNAME
#define FUNCNAME getConnInfoKVS
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int getConnInfoKVS( int rank, char *buf, int bufsize, MPIDI_PG_t *pg )
{
#ifdef USE_PMI2_API
@@ -823,7 +823,7 @@ static int connFreeKVS( MPIDI_PG_t *pg )
#undef FUNCNAME
#define FUNCNAME MPIDI_PG_InitConnKVS
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_PG_InitConnKVS( MPIDI_PG_t *pg )
{
#ifdef USE_PMI2_API
@@ -912,7 +912,7 @@ static int getConnInfo( int rank, char *buf, int bufsize, MPIDI_PG_t *pg )
#undef FUNCNAME
#define FUNCNAME connToString
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int connToString( char **buf_p, int *slen, MPIDI_PG_t *pg )
{
int mpi_errno = MPI_SUCCESS;
@@ -1089,7 +1089,7 @@ int MPIDI_PG_InitConnString( MPIDI_PG_t *pg )
#undef FUNCNAME
#define FUNCNAME MPIDI_PG_GetConnString
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_PG_GetConnString( MPIDI_PG_t *pg, int rank, char *val, int vallen )
{
int mpi_errno = MPI_SUCCESS;
@@ -1108,7 +1108,7 @@ int MPIDI_PG_GetConnString( MPIDI_PG_t *pg, int rank, char *val, int vallen )
#undef FUNCNAME
#define FUNCNAME MPIDI_PG_Dup_vcr
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
/*@
MPIDI_PG_Dup_vcr - Duplicate a virtual connection from a process group
@@ -1152,7 +1152,7 @@ int MPIDI_PG_Dup_vcr( MPIDI_PG_t *pg, int rank, MPIDI_VC_t **vc_p )
#undef FUNCNAME
#define FUNCNAME MPIDI_PG_Close_VCs
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
/*@
MPIDI_PG_Close_VCs - Close all virtual connections on all process groups.
diff --git a/src/mpid/ch3/src/mpidi_rma.c b/src/mpid/ch3/src/mpidi_rma.c
index a48f6f7..8240ae2 100644
--- a/src/mpid/ch3/src/mpidi_rma.c
+++ b/src/mpid/ch3/src/mpidi_rma.c
@@ -87,7 +87,7 @@ MPIDI_RMA_Target_t *global_rma_target_pool_head = NULL, *global_rma_target_pool_
#undef FUNCNAME
#define FUNCNAME MPIDI_RMA_init
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_RMA_init(void)
{
int mpi_errno = MPI_SUCCESS;
@@ -129,7 +129,7 @@ int MPIDI_RMA_init(void)
#undef FUNCNAME
#define FUNCNAME MPIDI_RMA_finalize
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
void MPIDI_RMA_finalize(void)
{
MPIDI_STATE_DECL(MPID_STATE_MPIDI_RMA_FINALIZE);
@@ -146,7 +146,7 @@ void MPIDI_RMA_finalize(void)
#undef FUNCNAME
#define FUNCNAME MPIDI_Win_free
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_Win_free(MPID_Win ** win_ptr)
{
int mpi_errno = MPI_SUCCESS;
@@ -257,7 +257,7 @@ int MPIDI_Win_free(MPID_Win ** win_ptr)
#undef FUNCNAME
#define FUNCNAME MPIDI_Win_shared_query
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_Win_shared_query(MPID_Win * win_ptr, int target_rank, MPI_Aint * size,
int *disp_unit, void *baseptr)
{
@@ -283,7 +283,7 @@ int MPIDI_Win_shared_query(MPID_Win * win_ptr, int target_rank, MPI_Aint * size,
#undef FUNCNAME
#define FUNCNAME MPIDI_Alloc_mem
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
void *MPIDI_Alloc_mem(size_t size, MPID_Info * info_ptr)
{
void *ap;
@@ -301,7 +301,7 @@ void *MPIDI_Alloc_mem(size_t size, MPID_Info * info_ptr)
#undef FUNCNAME
#define FUNCNAME MPIDI_Free_mem
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_Free_mem(void *ptr)
{
int mpi_errno = MPI_SUCCESS;
diff --git a/src/mpid/ch3/util/ftb/ftb.c b/src/mpid/ch3/util/ftb/ftb.c
index fd401f9..5d8693c 100644
--- a/src/mpid/ch3/util/ftb/ftb.c
+++ b/src/mpid/ch3/util/ftb/ftb.c
@@ -31,7 +31,7 @@ static FTB_event_info_t event_info[] = {
#undef FUNCNAME
#define FUNCNAME MPIDU_Ftb_init
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDU_Ftb_init(void)
{
int mpi_errno = MPI_SUCCESS;
@@ -75,7 +75,7 @@ fn_fail:
#undef FUNCNAME
#define FUNCNAME MPIDU_Ftb_publish
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
void MPIDU_Ftb_publish(const char *event_name, const char *event_payload)
{
FTB_event_properties_t event_prop;
@@ -97,7 +97,7 @@ void MPIDU_Ftb_publish(const char *event_name, const char *event_payload)
#undef FUNCNAME
#define FUNCNAME MPIDU_Ftb_publish_vc
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
void MPIDU_Ftb_publish_vc(const char *event_name, struct MPIDI_VC *vc)
{
char payload[FTB_MAX_PAYLOAD_DATA] = "";
@@ -112,7 +112,7 @@ void MPIDU_Ftb_publish_vc(const char *event_name, struct MPIDI_VC *vc)
#undef FUNCNAME
#define FUNCNAME MPIDU_Ftb_publish_me
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
void MPIDU_Ftb_publish_me(const char *event_name)
{
char payload[FTB_MAX_PAYLOAD_DATA] = "";
@@ -129,7 +129,7 @@ void MPIDU_Ftb_publish_me(const char *event_name)
#undef FUNCNAME
#define FUNCNAME MPIDU_Ftb_finalize
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
void MPIDU_Ftb_finalize(void)
{
MPIDI_STATE_DECL(MPID_STATE_MPIDU_FTB_FINALIZE);
diff --git a/src/mpid/ch3/util/sock/ch3u_connect_sock.c b/src/mpid/ch3/util/sock/ch3u_connect_sock.c
index 9c4f1e0..3f2f486 100644
--- a/src/mpid/ch3/util/sock/ch3u_connect_sock.c
+++ b/src/mpid/ch3/util/sock/ch3u_connect_sock.c
@@ -93,7 +93,7 @@ extern MPIDU_Sock_set_t MPIDI_CH3I_sock_set;
#undef FUNCNAME
#define FUNCNAME MPIDU_CH3I_SetupListener
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDU_CH3I_SetupListener( MPIDU_Sock_set_t sock_set )
{
int mpi_errno = MPI_SUCCESS;
@@ -127,7 +127,7 @@ int MPIDU_CH3I_SetupListener( MPIDU_Sock_set_t sock_set )
#undef FUNCNAME
#define FUNCNAME MPIDU_CH3I_ShutdownListener
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDU_CH3I_ShutdownListener( void )
{
int mpi_errno;
@@ -158,7 +158,7 @@ int MPIDU_CH3I_ShutdownListener( void )
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Connection_alloc
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3I_Connection_alloc(MPIDI_CH3I_Connection_t ** connp)
{
int mpi_errno = MPI_SUCCESS;
@@ -204,7 +204,7 @@ int MPIDI_CH3I_Connection_alloc(MPIDI_CH3I_Connection_t ** connp)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Connect_to_root_sock
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3I_Connect_to_root_sock(const char * port_name,
MPIDI_VC_t ** new_vc)
{
@@ -331,7 +331,7 @@ int MPIDI_CH3I_Connect_to_root_sock(const char * port_name,
#undef FUNCNAME
#define FUNCNAME MPIDU_Sock_get_conninfo_from_bc
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDU_Sock_get_conninfo_from_bc( const char *bc,
char *host_description, int maxlen,
int *port, MPIDU_Sock_ifaddr_t *ifaddr,
@@ -427,7 +427,7 @@ int MPIDU_Sock_get_conninfo_from_bc( const char *bc,
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3U_Get_business_card_sock
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3U_Get_business_card_sock(int myRank,
char **bc_val_p, int *val_max_sz_p)
{
@@ -539,7 +539,7 @@ static void connection_destroy(MPIDI_CH3I_Connection_t * conn);
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_Sockconn_handle_accept_event
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_Sockconn_handle_accept_event( void )
{
int mpi_errno = MPI_SUCCESS;
@@ -580,7 +580,7 @@ int MPIDI_CH3_Sockconn_handle_accept_event( void )
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_Sockconn_handle_connect_event
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_Sockconn_handle_connect_event( MPIDI_CH3I_Connection_t *conn,
int event_error )
{
@@ -646,7 +646,7 @@ int MPIDI_CH3_Sockconn_handle_connect_event( MPIDI_CH3I_Connection_t *conn,
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_Sockconn_handle_close_event
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_Sockconn_handle_close_event( MPIDI_CH3I_Connection_t * conn )
{
int mpi_errno = MPI_SUCCESS;
@@ -723,7 +723,7 @@ int MPIDI_CH3_Sockconn_handle_close_event( MPIDI_CH3I_Connection_t * conn )
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_Sockconn_handle_conn_event
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_Sockconn_handle_conn_event( MPIDI_CH3I_Connection_t * conn )
{
int mpi_errno = MPI_SUCCESS;
@@ -875,7 +875,7 @@ int MPIDI_CH3_Sockconn_handle_conn_event( MPIDI_CH3I_Connection_t * conn )
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_Sockconn_handle_connopen_event
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_Sockconn_handle_connopen_event( MPIDI_CH3I_Connection_t * conn )
{
int mpi_errno = MPI_SUCCESS;
@@ -1009,7 +1009,7 @@ int MPIDI_CH3_Sockconn_handle_connopen_event( MPIDI_CH3I_Connection_t * conn )
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3_Sockconn_handle_connwrite
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3_Sockconn_handle_connwrite( MPIDI_CH3I_Connection_t * conn )
{
int mpi_errno = MPI_SUCCESS;
@@ -1084,7 +1084,7 @@ int MPIDI_CH3_Sockconn_handle_connwrite( MPIDI_CH3I_Connection_t * conn )
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_VC_post_sockconnect
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3I_VC_post_sockconnect(MPIDI_VC_t * vc)
{
int mpi_errno = MPI_SUCCESS;
@@ -1154,7 +1154,7 @@ int MPIDI_CH3I_VC_post_sockconnect(MPIDI_VC_t * vc)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3I_Sock_connect
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3I_Sock_connect( MPIDI_VC_t *vc, const char val[], int vallen )
{
char host_description[MAX_HOST_DESCRIPTION_LEN];
@@ -1261,7 +1261,7 @@ int MPIDI_CH3I_Sock_connect( MPIDI_VC_t *vc, const char val[], int vallen )
#undef FUNCNAME
#define FUNCNAME connection_post_recv_pkt
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int connection_post_recv_pkt(MPIDI_CH3I_Connection_t * conn)
{
int mpi_errno = MPI_SUCCESS;
@@ -1284,7 +1284,7 @@ static int connection_post_recv_pkt(MPIDI_CH3I_Connection_t * conn)
#undef FUNCNAME
#define FUNCNAME connection_post_send_pkt
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int connection_post_send_pkt(MPIDI_CH3I_Connection_t * conn)
{
int mpi_errno = MPI_SUCCESS;
@@ -1307,7 +1307,7 @@ static int connection_post_send_pkt(MPIDI_CH3I_Connection_t * conn)
#undef FUNCNAME
#define FUNCNAME connection_post_send_pkt_and_pgid
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int connection_post_send_pkt_and_pgid(MPIDI_CH3I_Connection_t * conn)
{
int mpi_errno;
@@ -1336,7 +1336,7 @@ static int connection_post_send_pkt_and_pgid(MPIDI_CH3I_Connection_t * conn)
#undef FUNCNAME
#define FUNCNAME connection_post_sendq_req
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int connection_post_sendq_req(MPIDI_CH3I_Connection_t * conn)
{
int mpi_errno = MPI_SUCCESS;
@@ -1372,7 +1372,7 @@ static int connection_post_sendq_req(MPIDI_CH3I_Connection_t * conn)
#undef FUNCNAME
#define FUNCNAME connection_destroy
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static void connection_destroy(MPIDI_CH3I_Connection_t * conn)
{
MPIDI_STATE_DECL(MPID_STATE_CONNECTION_DESTROY);
diff --git a/src/mpid/ch3/util/sock/ch3u_getinterfaces.c b/src/mpid/ch3/util/sock/ch3u_getinterfaces.c
index 905bcf6..2719799 100644
--- a/src/mpid/ch3/util/sock/ch3u_getinterfaces.c
+++ b/src/mpid/ch3/util/sock/ch3u_getinterfaces.c
@@ -62,7 +62,7 @@ static int MPIDI_CH3U_GetIPInterface( MPIDU_Sock_ifaddr_t *, int * );
#undef FUNCNAME
#define FUNCNAME MPIDU_CH3U_GetSockInterfaceAddr
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDU_CH3U_GetSockInterfaceAddr( int myRank, char *ifname, int maxIfname,
MPIDU_Sock_ifaddr_t *ifaddr )
{
diff --git a/src/mpid/ch3/util/sock/ch3u_init_sock.c b/src/mpid/ch3/util/sock/ch3u_init_sock.c
index a2a89fe..a77f4dd 100644
--- a/src/mpid/ch3/util/sock/ch3u_init_sock.c
+++ b/src/mpid/ch3/util/sock/ch3u_init_sock.c
@@ -32,7 +32,7 @@
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3U_Init_sock
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3U_Init_sock(int has_parent, MPIDI_PG_t *pg_p, int pg_rank,
char **bc_val_p, int *val_max_sz_p)
{
diff --git a/src/mpid/ch3/util/unordered/unordered.c b/src/mpid/ch3/util/unordered/unordered.c
index 61b4bf4..845a4e0 100644
--- a/src/mpid/ch3/util/unordered/unordered.c
+++ b/src/mpid/ch3/util/unordered/unordered.c
@@ -24,7 +24,7 @@ int MPIDI_CH3U_Handle_unordered_recv_pkt(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt)
#undef FUNCNAME
#define FUNCNAME MPIDI_CH3U_Handle_unordered_recv_pkt
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_CH3U_Handle_unordered_recv_pkt(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t * pkt,
MPID_Request ** rreqp)
{
diff --git a/src/mpid/common/datatype/mpid_ext32_segment.c b/src/mpid/common/datatype/mpid_ext32_segment.c
index e035e63..d7898c6 100644
--- a/src/mpid/common/datatype/mpid_ext32_segment.c
+++ b/src/mpid/common/datatype/mpid_ext32_segment.c
@@ -171,7 +171,7 @@ static int external32_float_convert(char *dest_buf,
#undef FUNCNAME
#define FUNCNAME MPID_Segment_contig_pack_external32_to_buf
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int MPID_Segment_contig_pack_external32_to_buf(DLOOP_Offset *blocks_p,
DLOOP_Type el_type,
DLOOP_Offset rel_off,
@@ -234,7 +234,7 @@ static int MPID_Segment_contig_pack_external32_to_buf(DLOOP_Offset *blocks_p,
#undef FUNCNAME
#define FUNCNAME MPID_Segment_contig_unpack_external32_to_buf
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int MPID_Segment_contig_unpack_external32_to_buf(DLOOP_Offset *blocks_p,
DLOOP_Type el_type,
DLOOP_Offset rel_off,
@@ -297,7 +297,7 @@ static int MPID_Segment_contig_unpack_external32_to_buf(DLOOP_Offset *blocks_p,
#undef FUNCNAME
#define FUNCNAME MPID_Segment_pack_external32
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
void MPID_Segment_pack_external32(struct DLOOP_Segment *segp,
DLOOP_Offset first,
DLOOP_Offset *lastp,
@@ -326,7 +326,7 @@ void MPID_Segment_pack_external32(struct DLOOP_Segment *segp,
#undef FUNCNAME
#define FUNCNAME MPID_Segment_unpack_external32
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
void MPID_Segment_unpack_external32(struct DLOOP_Segment *segp,
DLOOP_Offset first,
DLOOP_Offset *lastp,
diff --git a/src/mpid/common/datatype/mpid_segment.c b/src/mpid/common/datatype/mpid_segment.c
index 412e7eb..2debdcb 100644
--- a/src/mpid/common/datatype/mpid_segment.c
+++ b/src/mpid/common/datatype/mpid_segment.c
@@ -88,7 +88,7 @@ static int MPID_Segment_vector_flatten(DLOOP_Offset *blocks_p,
#undef FUNCNAME
#define FUNCNAME MPID_Segment_pack_vector
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
/* MPID_Segment_pack_vector
*
* Parameters:
@@ -141,7 +141,7 @@ return;
#undef FUNCNAME
#define FUNCNAME MPID_Segment_unpack_vector
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
void MPID_Segment_unpack_vector(struct DLOOP_Segment *segp,
DLOOP_Offset first,
DLOOP_Offset *lastp,
@@ -158,7 +158,7 @@ return;
#undef FUNCNAME
#define FUNCNAME MPID_Segment_flatten
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
/* MPID_Segment_flatten
*
* offp - pointer to array to fill in with offsets
@@ -214,7 +214,7 @@ return;
#undef FUNCNAME
#define FUNCNAME MPID_Segment_contig_pack_to_iov
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
/* MPID_Segment_contig_pack_to_iov
*/
static int MPID_Segment_contig_pack_to_iov(DLOOP_Offset *blocks_p,
@@ -277,7 +277,7 @@ static int MPID_Segment_contig_pack_to_iov(DLOOP_Offset *blocks_p,
#undef FUNCNAME
#define FUNCNAME MPID_Segment_vector_pack_to_iov
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
/* MPID_Segment_vector_pack_to_iov
*
* Input Parameters:
@@ -399,7 +399,7 @@ static int MPID_Segment_vector_pack_to_iov(DLOOP_Offset *blocks_p,
#undef FUNCNAME
#define FUNCNAME MPID_Segment_contig_flatten
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
/* MPID_Segment_contig_flatten
*/
static int MPID_Segment_contig_flatten(DLOOP_Offset *blocks_p,
@@ -456,7 +456,7 @@ static int MPID_Segment_contig_flatten(DLOOP_Offset *blocks_p,
#undef FUNCNAME
#define FUNCNAME MPID_Segment_vector_flatten
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
/* MPID_Segment_vector_flatten
*
* Notes:
diff --git a/src/mpid/common/sock/iocp/sock.c b/src/mpid/common/sock/iocp/sock.c
index 51e6c15..6bcd579 100644
--- a/src/mpid/common/sock/iocp/sock.c
+++ b/src/mpid/common/sock/iocp/sock.c
@@ -7,8 +7,8 @@
#include "mpiimpl.h"
#include "mpidu_sock.h"
-#define MPIDI_QUOTE(A) MPIDI_QUOTE2(A)
-#define MPIDI_QUOTE2(A) #A
+#define MPIU_QUOTE(A) MPIU_QUOTE2(A)
+#define MPIU_QUOTE2(A) #A
#define SOCKI_TCP_BUFFER_SIZE 32*1024
#define SOCKI_DESCRIPTION_LENGTH 256
@@ -123,7 +123,7 @@ static char *get_error_string(int error_code)
#undef FUNCNAME
#define FUNCNAME easy_create
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int easy_create_ranged(SOCKET *sock, int port, unsigned long addr)
{
int mpi_errno=MPI_SUCCESS;
@@ -232,7 +232,7 @@ static int easy_create_ranged(SOCKET *sock, int port, unsigned long addr)
#undef FUNCNAME
#define FUNCNAME easy_create
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int easy_create(SOCKET *sock, int port, unsigned long addr)
{
int mpi_errno;
@@ -369,7 +369,7 @@ static inline void init_state_struct(sock_state_t *p)
#undef FUNCNAME
#define FUNCNAME post_next_accept
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static inline int post_next_accept(sock_state_t * context)
{
int mpi_errno;
@@ -408,7 +408,7 @@ static inline int post_next_accept(sock_state_t * context)
#undef FUNCNAME
#define FUNCNAME MPIDU_Sock_init
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDU_Sock_init()
{
int mpi_errno;
@@ -489,7 +489,7 @@ int MPIDU_Sock_init()
#undef FUNCNAME
#define FUNCNAME MPIDU_Sock_finalize
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDU_Sock_finalize()
{
int mpi_errno;
@@ -711,7 +711,7 @@ int MPIDU_Sock_hostname_to_host_description(char *hostname, char *host_descripti
#undef FUNCNAME
#define FUNCNAME MPIDU_Sock_get_host_description
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDU_Sock_get_host_description(int myRank,
char * host_description, int len)
{
@@ -763,7 +763,7 @@ int MPIDU_Sock_get_host_description(int myRank,
#undef FUNCNAME
#define FUNCNAME MPIDU_Sock_create_set
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDU_Sock_create_set(MPIDU_Sock_set_t * set)
{
int mpi_errno;
@@ -793,7 +793,7 @@ int MPIDU_Sock_create_set(MPIDU_Sock_set_t * set)
#undef FUNCNAME
#define FUNCNAME MPIDU_Sock_destroy_set
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDU_Sock_destroy_set(MPIDU_Sock_set_t set)
{
int mpi_errno;
@@ -826,7 +826,7 @@ int MPIDU_Sock_destroy_set(MPIDU_Sock_set_t set)
#undef FUNCNAME
#define FUNCNAME MPIDU_Sock_native_to_sock
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDU_Sock_native_to_sock(MPIDU_Sock_set_t set, MPIDU_SOCK_NATIVE_FD fd, void *user_ptr, MPIDU_Sock_t *sock_ptr)
{
int mpi_errno;
@@ -884,7 +884,7 @@ int MPIDU_Sock_native_to_sock(MPIDU_Sock_set_t set, MPIDU_SOCK_NATIVE_FD fd, voi
#undef FUNCNAME
#define FUNCNAME MPIDU_Sock_listen
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDU_Sock_listen(MPIDU_Sock_set_t set, void * user_ptr, int * port, MPIDU_Sock_t * sock)
{
int mpi_errno;
@@ -965,7 +965,7 @@ int MPIDU_Sock_listen(MPIDU_Sock_set_t set, void * user_ptr, int * port, MPIDU_S
#undef FUNCNAME
#define FUNCNAME MPIDU_Sock_accept
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDU_Sock_accept(MPIDU_Sock_t listener_sock, MPIDU_Sock_set_t set, void * user_ptr, MPIDU_Sock_t * sock)
{
int mpi_errno;
@@ -1122,7 +1122,7 @@ static unsigned int GetMask(char *pszMask)
#undef FUNCNAME
#define FUNCNAME MPIDU_Sock_post_connect
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDU_Sock_post_connect(MPIDU_Sock_set_t set, void * user_ptr, char * host_description, int port, MPIDU_Sock_t * sock)
{
int mpi_errno;
@@ -1331,7 +1331,7 @@ int MPIDU_Sock_post_connect(MPIDU_Sock_set_t set, void * user_ptr, char * host_d
#undef FUNCNAME
#define FUNCNAME MPIDU_Sock_set_user_ptr
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDU_Sock_set_user_ptr(MPIDU_Sock_t sock, void * user_ptr)
{
int mpi_errno;
@@ -1358,7 +1358,7 @@ int MPIDU_Sock_set_user_ptr(MPIDU_Sock_t sock, void * user_ptr)
#undef FUNCNAME
#define FUNCNAME MPIDU_Sock_post_close
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDU_Sock_post_close(MPIDU_Sock_t sock)
{
int mpi_errno;
@@ -1524,7 +1524,7 @@ int MPIDU_Sock_post_close(MPIDU_Sock_t sock)
#undef FUNCNAME
#define FUNCNAME MPIDU_Sock_post_read
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDU_Sock_post_read(MPIDU_Sock_t sock, void * buf, MPIU_Size_t minbr, MPIU_Size_t maxbr,
MPIDU_Sock_progress_update_func_t fn)
{
@@ -1543,7 +1543,7 @@ int MPIDU_Sock_post_read(MPIDU_Sock_t sock, void * buf, MPIU_Size_t minbr, MPIU_
#undef FUNCNAME
#define FUNCNAME MPIDU_Sock_post_readv
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDU_Sock_post_readv(MPIDU_Sock_t sock, MPID_IOV * iov, int iov_n, MPIDU_Sock_progress_update_func_t fn)
{
int iter;
@@ -1650,7 +1650,7 @@ int MPIDU_Sock_post_readv(MPIDU_Sock_t sock, MPID_IOV * iov, int iov_n, MPIDU_So
#undef FUNCNAME
#define FUNCNAME MPIDU_Sock_post_write
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDU_Sock_post_write(MPIDU_Sock_t sock, void * buf, MPIU_Size_t min, MPIU_Size_t max, MPIDU_Sock_progress_update_func_t fn)
{
int mpi_errno = MPI_SUCCESS;
@@ -1668,7 +1668,7 @@ int MPIDU_Sock_post_write(MPIDU_Sock_t sock, void * buf, MPIU_Size_t min, MPIU_S
#undef FUNCNAME
#define FUNCNAME MPIDU_Sock_post_writev
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDU_Sock_post_writev(MPIDU_Sock_t sock, MPID_IOV * iov, int iov_n, MPIDU_Sock_progress_update_func_t fn)
{
int mpi_errno = MPI_SUCCESS;
@@ -1762,7 +1762,7 @@ int MPIDU_Sock_post_writev(MPIDU_Sock_t sock, MPID_IOV * iov, int iov_n, MPIDU_S
#undef FUNCNAME
#define FUNCNAME MPIDU_Sock_wait
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDU_Sock_wait(MPIDU_Sock_set_t set, int timeout, MPIDU_Sock_event_t * out)
{
/*double t1, t2;*/
@@ -2637,7 +2637,7 @@ int MPIDU_Sock_wait(MPIDU_Sock_set_t set, int timeout, MPIDU_Sock_event_t * out)
#undef FUNCNAME
#define FUNCNAME MPIDU_Sock_wakeup
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDU_Sock_wakeup(MPIDU_Sock_set_t set)
{
/* post a completion event to wake up sock_wait */
@@ -2648,7 +2648,7 @@ int MPIDU_Sock_wakeup(MPIDU_Sock_set_t set)
#undef FUNCNAME
#define FUNCNAME MPIDU_Sock_read
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDU_Sock_read(MPIDU_Sock_t sock, void * buf, MPIU_Size_t len, MPIU_Size_t * num_read)
{
int mpi_errno = MPI_SUCCESS;
@@ -2666,7 +2666,7 @@ int MPIDU_Sock_read(MPIDU_Sock_t sock, void * buf, MPIU_Size_t len, MPIU_Size_t
#undef FUNCNAME
#define FUNCNAME MPIDU_Sock_readv
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDU_Sock_readv(MPIDU_Sock_t sock, MPID_IOV * iov, int iov_n, MPIU_Size_t * num_read)
{
int mpi_errno = MPI_SUCCESS;
@@ -2735,7 +2735,7 @@ int MPIDU_Sock_readv(MPIDU_Sock_t sock, MPID_IOV * iov, int iov_n, MPIU_Size_t *
#undef FUNCNAME
#define FUNCNAME MPIDU_Sock_write
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDU_Sock_write(MPIDU_Sock_t sock, void * buf, MPIU_Size_t len, MPIU_Size_t * num_written)
{
int mpi_errno;
@@ -2753,7 +2753,7 @@ int MPIDU_Sock_write(MPIDU_Sock_t sock, void * buf, MPIU_Size_t len, MPIU_Size_t
#undef FUNCNAME
#define FUNCNAME MPIDU_Sock_writev
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDU_Sock_writev(MPIDU_Sock_t sock, MPID_IOV * iov, int iov_n, MPIU_Size_t * num_written)
{
int mpi_errno;
@@ -2810,7 +2810,7 @@ int MPIDU_Sock_writev(MPIDU_Sock_t sock, MPID_IOV * iov, int iov_n, MPIU_Size_t
#undef FUNCNAME
#define FUNCNAME MPIDU_Sock_get_sock_id
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDU_Sock_get_sock_id(MPIDU_Sock_t sock)
{
int ret_val;
@@ -2833,7 +2833,7 @@ int MPIDU_Sock_get_sock_id(MPIDU_Sock_t sock)
#undef FUNCNAME
#define FUNCNAME MPIDU_Sock_get_sock_set_id
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDU_Sock_get_sock_set_id(MPIDU_Sock_set_t set)
{
int ret_val;
@@ -2848,7 +2848,7 @@ int MPIDU_Sock_get_sock_set_id(MPIDU_Sock_set_t set)
#undef FUNCNAME
#define FUNCNAME MPIDU_Sock_get_error_class_string
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDU_Sock_get_error_class_string(int error, char *error_string, int length)
{
MPIDI_STATE_DECL(MPID_STATE_MPIDU_SOCK_GET_ERROR_CLASS_STRING);
diff --git a/src/mpid/pamid/src/mpid_aint.c b/src/mpid/pamid/src/mpid_aint.c
index ca4c00b..e331f57 100644
--- a/src/mpid/pamid/src/mpid_aint.c
+++ b/src/mpid/pamid/src/mpid_aint.c
@@ -19,7 +19,7 @@
#undef FUNCNAME
#define FUNCNAME MPID_Aint_add
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
MPI_Aint MPID_Aint_add(MPI_Aint base, MPI_Aint disp)
{
MPI_Aint result;
@@ -46,7 +46,7 @@ MPI_Aint MPID_Aint_add(MPI_Aint base, MPI_Aint disp)
#undef FUNCNAME
#define FUNCNAME MPID_Aint_diff
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
MPI_Aint MPID_Aint_diff(MPI_Aint addr1, MPI_Aint addr2)
{
MPI_Aint result;
diff --git a/src/mpid/pamid/src/mpid_init.c b/src/mpid/pamid/src/mpid_init.c
index f47cf29..1d46060 100644
--- a/src/mpid/pamid/src/mpid_init.c
+++ b/src/mpid/pamid/src/mpid_init.c
@@ -334,7 +334,7 @@ static struct
#undef FUNCNAME
#define FUNCNAME split_type
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#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)
{
diff --git a/src/mpid/pamid/src/mpid_progress.c b/src/mpid/pamid/src/mpid_progress.c
index 1b6df50..f4294f7 100644
--- a/src/mpid/pamid/src/mpid_progress.c
+++ b/src/mpid/pamid/src/mpid_progress.c
@@ -28,7 +28,7 @@ static progress_func_ptr_t progress_hooks[MAX_PROGRESS_HOOKS] = { NULL };
#undef FUNCNAME
#define FUNCNAME MPIDI_Progress_register_hook
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_Progress_register_hook(int (*progress_fn)(int*))
{
int mpi_errno = MPI_SUCCESS;
@@ -63,7 +63,7 @@ int MPIDI_Progress_register_hook(int (*progress_fn)(int*))
#undef FUNCNAME
#define FUNCNAME MPIDI_Progress_deregister_hook
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIDI_Progress_deregister_hook(int (*progress_fn)(int*))
{
int mpi_errno = MPI_SUCCESS;
diff --git a/src/mpid/pamid/src/mpidi_util.c b/src/mpid/pamid/src/mpidi_util.c
index 37ebc8f..e5fc834 100644
--- a/src/mpid/pamid/src/mpidi_util.c
+++ b/src/mpid/pamid/src/mpidi_util.c
@@ -1999,7 +1999,7 @@ inline bool MPIDI_cuda_is_device_buf(const void* ptr)
#undef FUNCNAME
#define FUNCNAME MPID_Get_node_id
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#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)
{
@@ -2029,7 +2029,7 @@ int MPID_Get_node_id(MPID_Comm *comm, int rank, MPID_Node_id_t *id_p)
#undef FUNCNAME
#define FUNCNAME MPID_Get_max_node_id
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPID_Get_max_node_id(MPID_Comm *comm, MPID_Node_id_t *max_id_p)
{
int mpi_errno = MPI_SUCCESS;
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 3f1bac9..eddd15f 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
@@ -58,7 +58,7 @@ MPIDI_Compare_and_swap_using_pami_rmw(pami_context_t context,
#undef FUNCNAME
#define FUNCNAME MPIDI_Compare_and_swap
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#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)
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 749165c..826afab 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
@@ -182,7 +182,7 @@ MPIDI_Atomic (pami_context_t context,
#define FUNCNAME MPIDI_Fetch_and_op
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#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)
diff --git a/src/util/dbg/dbg_printf.c b/src/util/dbg/dbg_printf.c
index dc674ee..d3c8277 100644
--- a/src/util/dbg/dbg_printf.c
+++ b/src/util/dbg/dbg_printf.c
@@ -837,7 +837,7 @@ Environment variables\n\
#undef FUNCNAME
#define FUNCNAME MPIU_DBG_Open_temp_file
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int MPIU_DBG_Open_temp_file(FILE **dbg_fp)
{
int mpi_errno = MPI_SUCCESS;
@@ -876,7 +876,7 @@ static int MPIU_DBG_Open_temp_file(FILE **dbg_fp)
#undef FUNCNAME
#define FUNCNAME MPIU_DBG_Open_temp_file
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int MPIU_DBG_Open_temp_file(FILE **dbg_fp)
{
int mpi_errno = MPI_SUCCESS;
@@ -921,7 +921,7 @@ static int MPIU_DBG_Open_temp_file(FILE **dbg_fp)
#undef FUNCNAME
#define FUNCNAME MPIU_DBG_Open_temp_file
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
static int MPIU_DBG_Open_temp_file(FILE **dbg_fp)
{
int mpi_errno = MPI_SUCCESS;
diff --git a/src/util/mem/handlemem.c b/src/util/mem/handlemem.c
index 500ae8b..a9c9250 100644
--- a/src/util/mem/handlemem.c
+++ b/src/util/mem/handlemem.c
@@ -330,7 +330,7 @@ Input Parameters:
#undef FUNCNAME
#define FUNCNAME MPIU_Handle_obj_alloc
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
void *MPIU_Handle_obj_alloc(MPIU_Object_alloc_t *objmem)
{
void *ret;
@@ -343,7 +343,7 @@ void *MPIU_Handle_obj_alloc(MPIU_Object_alloc_t *objmem)
#undef FUNCNAME
#define FUNCNAME MPIU_Handle_obj_alloc_unsafe
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
void *MPIU_Handle_obj_alloc_unsafe(MPIU_Object_alloc_t *objmem)
{
MPIU_Handle_common *ptr;
diff --git a/src/util/procmap/local_proc.c b/src/util/procmap/local_proc.c
index 2e9f016..885eafa 100644
--- a/src/util/procmap/local_proc.c
+++ b/src/util/procmap/local_proc.c
@@ -53,7 +53,7 @@
#undef FUNCNAME
#define FUNCNAME MPIU_Find_local_and_external
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_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,
@@ -228,7 +228,7 @@ fn_fail:
#undef FUNCNAME
#define FUNCNAME MPIU_Get_internode_rank
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIU_Get_internode_rank(MPID_Comm *comm_ptr, int r)
{
int mpi_errno = MPI_SUCCESS;
@@ -249,7 +249,7 @@ int MPIU_Get_internode_rank(MPID_Comm *comm_ptr, int r)
#undef FUNCNAME
#define FUNCNAME MPIU_Get_intranode_rank
#undef FCNAME
-#define FCNAME MPIDI_QUOTE(FUNCNAME)
+#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIU_Get_intranode_rank(MPID_Comm *comm_ptr, int r)
{
int mpi_errno = MPI_SUCCESS;
http://git.mpich.org/mpich.git/commitdiff/efb3befc92251e285229302667135bf41a7fa28d
commit efb3befc92251e285229302667135bf41a7fa28d
Author: Hajime Fujita <hajime.fujita at intel.com>
Date: Thu Jul 9 11:24:55 2015 -0500
Remove MPID_TimerStateBegin/End functions
Because nobody is using them.
Signed-off-by: Pavan Balaji <balaji at anl.gov>
diff --git a/src/include/mpiimplthread.h b/src/include/mpiimplthread.h
index 625cc90..4adcdf8 100644
--- a/src/include/mpiimplthread.h
+++ b/src/include/mpiimplthread.h
@@ -136,9 +136,6 @@ typedef struct MPID_Stateinfo_t {
int count;
} MPID_Stateinfo_t;
#define MPICH_MAX_STATES 512
-/* Timer state routines (src/util/instrm/states.c) */
-void MPID_TimerStateBegin( int, MPID_Time_t * );
-void MPID_TimerStateEnd( int, MPID_Time_t * );
/* arbitrary, just needed to avoid cleaning up heap allocated memory at thread
* destruction time */
diff --git a/src/util/instrm/Makefile.mk b/src/util/instrm/Makefile.mk
index cca66a4..f2ae72c 100644
--- a/src/util/instrm/Makefile.mk
+++ b/src/util/instrm/Makefile.mk
@@ -6,6 +6,5 @@
##
mpi_core_sources += \
- src/util/instrm/states.c \
src/util/instrm/instr.c
diff --git a/src/util/instrm/states.c b/src/util/instrm/states.c
deleted file mode 100644
index 64b69c8..0000000
--- a/src/util/instrm/states.c
+++ /dev/null
@@ -1,36 +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"
-
-/*
- * We pass in a variable that will hold the time stamp so that these routines
- * are reentrant.
- */
-
-void MPID_TimerStateBegin( int id, MPID_Time_t *time_stamp )
-{
-#ifdef HAVE_TIMING
- MPIU_THREADPRIV_DECL;
- MPIU_THREADPRIV_GET;
-
- MPID_Wtime( time_stamp );
- MPIU_THREADPRIV_FIELD(timestamps[id].count) =
- MPIU_THREADPRIV_FIELD(timestamps[id].count) + 1;
-#endif
-}
-void MPID_TimerStateEnd( int id, MPID_Time_t *time_stamp )
-{
-#ifdef HAVE_TIMING
- MPID_Time_t final_time;
- MPIU_THREADPRIV_DECL;
- MPIU_THREADPRIV_GET;
-
- MPID_Wtime( &final_time );
- MPID_Wtime_acc( time_stamp, &final_time,
- &MPIU_THREADPRIV_FIELD(timestamps[id].stamp) );
-#endif
-}
http://git.mpich.org/mpich.git/commitdiff/1023f288880960d249ba0b762d4d93fdf601279c
commit 1023f288880960d249ba0b762d4d93fdf601279c
Author: Hajime Fujita <hajime.fujita at intel.com>
Date: Thu Jul 9 10:19:32 2015 -0500
Cleanup: Move Nemesis-internal prototypes to impl.h
Move function prototypes to mpid_nem_impl.h, as they are only used
internally inside the Nemesis layer. They don't need to be exposed
to the upper layer through mpidi_ch3_post.h.
Signed-off-by: Pavan Balaji <balaji at anl.gov>
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 a726b7d..272622d 100644
--- a/src/mpid/ch3/channels/nemesis/include/mpid_nem_impl.h
+++ b/src/mpid/ch3/channels/nemesis/include/mpid_nem_impl.h
@@ -32,6 +32,10 @@ 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);
+/* rendezvous hooks */
+int MPID_nem_lmt_RndvSend(MPID_Request **sreq_p, const void * buf, MPI_Aint count, MPI_Datatype datatype, int dt_contig,
+ MPIDI_msg_sz_t data_sz, MPI_Aint dt_true_lb, int rank, int tag, MPID_Comm * comm, int context_offset);
+int MPID_nem_lmt_RndvRecv(struct MPIDI_VC *vc, MPID_Request *rreq);
#define MPID_nem_mpich_release_fbox(cell) \
(OPA_store_release_int(&MPID_nem_mem_region.mailboxes.in[(cell)->pkt.mpich.source]->mpich.flag.value, 0), \
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 13dbeb7..2bf6009 100644
--- a/src/mpid/ch3/channels/nemesis/include/mpidi_ch3_post.h
+++ b/src/mpid/ch3/channels/nemesis/include/mpidi_ch3_post.h
@@ -36,12 +36,6 @@ int MPIDI_CH3I_Posted_recv_dequeued(MPID_Request *rreq);
#include "mpid_nem_post.h"
-/* rendezvous hooks */
-int MPID_nem_lmt_RndvSend(MPID_Request **sreq_p, const void * buf, MPI_Aint count, MPI_Datatype datatype, int dt_contig,
- MPIDI_msg_sz_t data_sz, MPI_Aint dt_true_lb, int rank, int tag, MPID_Comm * comm, int context_offset);
-int MPID_nem_lmt_RndvRecv(struct MPIDI_VC *vc, MPID_Request *rreq);
-
-
int MPIDI_CH3I_Register_anysource_notification(void (*enqueue_fn)(MPID_Request *rreq), int (*dequeue_fn)(MPID_Request *rreq));
#endif /* !defined(MPICH_MPIDI_CH3_POST_H_INCLUDED) */
http://git.mpich.org/mpich.git/commitdiff/6699a2bf9a2a6ccd6159c380eea7b9e2cda2403d
commit 6699a2bf9a2a6ccd6159c380eea7b9e2cda2403d
Author: Hajime Fujita <hajime.fujita at intel.com>
Date: Wed Jul 8 04:52:48 2015 -0500
Cleanup: Nemesis-specific symbols must begin with MPIDI
MPID_NEM_VC_NETMOD_AREA_LEN and MPID_NEM_REQ_NETMOD_AREA_LEN are
now prefixed with MPIDI, because they are used only in Nemesis
and not exposed to the MPI layer.
Signed-off-by: Pavan Balaji <balaji at anl.gov>
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 6a01926..4ca3ac8 100644
--- a/src/mpid/ch3/channels/nemesis/include/mpidi_ch3_pre.h
+++ b/src/mpid/ch3/channels/nemesis/include/mpidi_ch3_pre.h
@@ -45,8 +45,8 @@ typedef enum MPIDI_CH3I_VC_state
MPIDI_CH3I_VC_state_t;
/* size of private data area in vc and req for network modules */
-#define MPID_NEM_VC_NETMOD_AREA_LEN 128
-#define MPID_NEM_REQ_NETMOD_AREA_LEN 192
+#define MPIDI_NEM_VC_NETMOD_AREA_LEN 128
+#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;
@@ -143,7 +143,7 @@ typedef struct MPIDI_CH3I_VC
union
{
- char padding[MPID_NEM_VC_NETMOD_AREA_LEN];
+ char padding[MPIDI_NEM_VC_NETMOD_AREA_LEN];
/* Temporary helper field for ticket #1679. Should force proper pointer
* alignment on finnicky platforms like SPARC. Proper fix is to stop
@@ -174,7 +174,7 @@ struct MPIDI_CH3I_Request
union
{
- char padding[MPID_NEM_REQ_NETMOD_AREA_LEN];
+ char padding[MPIDI_NEM_REQ_NETMOD_AREA_LEN];
/* Temporary helper field for ticket #1679. Should force proper pointer
* alignment on finnicky platforms like SPARC. Proper fix is to stop
diff --git a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_vc.c b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_vc.c
index 55e6c25..2ef3139 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/llc/llc_vc.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/llc/llc_vc.c
@@ -131,9 +131,9 @@ static int llc_vc_init(MPIDI_VC_t * vc)
{
MPIU_DBG_MSG_D(CH3_CHANNEL, VERBOSE,
- "MPID_NEM_VC_NETMOD_AREA_LEN = %d\n", MPID_NEM_VC_NETMOD_AREA_LEN);
+ "MPIDI_NEM_VC_NETMOD_AREA_LEN = %d\n", MPIDI_NEM_VC_NETMOD_AREA_LEN);
MPIU_DBG_MSG_D(CH3_CHANNEL, VERBOSE,
- "MPID_NEM_REQ_NETMOD_AREA_LEN = %d", MPID_NEM_REQ_NETMOD_AREA_LEN);
+ "MPIDI_NEM_REQ_NETMOD_AREA_LEN = %d", MPIDI_NEM_REQ_NETMOD_AREA_LEN);
MPIU_DBG_MSG_D(CH3_CHANNEL, VERBOSE,
"MPID_nem_llc_vc_area = %d\n", (int) sizeof(MPID_nem_llc_vc_area));
}
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 84bbe06..1964a34 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_init.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_init.c
@@ -127,8 +127,8 @@ int MPID_nem_mxm_init(MPIDI_PG_t * pg_p, int pg_rank, char **bc_val_p, int *val_
MPIDI_FUNC_ENTER(MPID_STATE_MXM_INIT);
/* first make sure that our private fields in the vc and req fit into the area provided */
- MPIU_Assert(sizeof(MPID_nem_mxm_vc_area) <= MPID_NEM_VC_NETMOD_AREA_LEN);
- MPIU_Assert(sizeof(MPID_nem_mxm_req_area) <= MPID_NEM_REQ_NETMOD_AREA_LEN);
+ MPIU_Assert(sizeof(MPID_nem_mxm_vc_area) <= MPIDI_NEM_VC_NETMOD_AREA_LEN);
+ MPIU_Assert(sizeof(MPID_nem_mxm_req_area) <= MPIDI_NEM_REQ_NETMOD_AREA_LEN);
/* mpich-specific initialization of mxm */
diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_init.c b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_init.c
index 7e221f7..5c4c3d9 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_init.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_init.c
@@ -336,8 +336,8 @@ int MPID_nem_ofi_get_ordering(int *ordering)
static inline int compile_time_checking()
{
- OFI_COMPILE_TIME_ASSERT(sizeof(MPID_nem_ofi_vc_t) <= MPID_NEM_VC_NETMOD_AREA_LEN);
- OFI_COMPILE_TIME_ASSERT(sizeof(MPID_nem_ofi_req_t) <= MPID_NEM_REQ_NETMOD_AREA_LEN);
+ OFI_COMPILE_TIME_ASSERT(sizeof(MPID_nem_ofi_vc_t) <= MPIDI_NEM_VC_NETMOD_AREA_LEN);
+ OFI_COMPILE_TIME_ASSERT(sizeof(MPID_nem_ofi_req_t) <= MPIDI_NEM_REQ_NETMOD_AREA_LEN);
OFI_COMPILE_TIME_ASSERT(sizeof(iovec_t) == sizeof(MPID_IOV));
MPIU_Assert(((void *) &(((iovec_t *) 0)->iov_base)) ==
((void *) &(((MPID_IOV *) 0)->MPID_IOV_BUF)));
diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_init.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_init.c
index 1d308df..a26cf3e 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_init.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_init.c
@@ -154,8 +154,8 @@ static int ptl_init(MPIDI_PG_t *pg_p, int pg_rank, char **bc_val_p, int *val_max
MPIDI_FUNC_ENTER(MPID_STATE_PTL_INIT);
/* first make sure that our private fields in the vc and req fit into the area provided */
- MPIU_Assert(sizeof(MPID_nem_ptl_vc_area) <= MPID_NEM_VC_NETMOD_AREA_LEN);
- MPIU_Assert(sizeof(MPID_nem_ptl_req_area) <= MPID_NEM_REQ_NETMOD_AREA_LEN);
+ MPIU_Assert(sizeof(MPID_nem_ptl_vc_area) <= MPIDI_NEM_VC_NETMOD_AREA_LEN);
+ MPIU_Assert(sizeof(MPID_nem_ptl_req_area) <= MPIDI_NEM_REQ_NETMOD_AREA_LEN);
/* Make sure our IOV is the same as portals4's IOV */
MPIU_Assert(sizeof(ptl_iovec_t) == sizeof(MPID_IOV));
diff --git a/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_init.c b/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_init.c
index 94600a3..dda2a01 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_init.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_init.c
@@ -162,7 +162,7 @@ int MPID_nem_tcp_init (MPIDI_PG_t *pg_p, int pg_rank, char **bc_val_p, int *val_
MPID_nem_net_module_vc_dbg_print_sendq = MPID_nem_tcp_vc_dbg_print_sendq;
/* first make sure that our private fields in the vc fit into the area provided */
- MPIU_Assert(sizeof(MPID_nem_tcp_vc_area) <= MPID_NEM_VC_NETMOD_AREA_LEN);
+ MPIU_Assert(sizeof(MPID_nem_tcp_vc_area) <= MPIDI_NEM_VC_NETMOD_AREA_LEN);
/* set up listener socket */
mpi_errno = set_up_listener();
http://git.mpich.org/mpich.git/commitdiff/088d74b5ce167d33e9d53dc2bfb2666b7f13ea54
commit 088d74b5ce167d33e9d53dc2bfb2666b7f13ea54
Author: Hajime Fujita <hajime.fujita at intel.com>
Date: Wed Jul 8 04:32:07 2015 -0500
Cleanup: MPIR_Rank_t should be MPIDI_Rank_t
Renamed MPIR_Rank_t to MPIDI_Rank_t because it is not used in
MPI layers.
Signed-off-by: Pavan Balaji <balaji at anl.gov>
diff --git a/src/mpi/debugger/dll_mpich.c b/src/mpi/debugger/dll_mpich.c
index d4cb084..abd55ca 100644
--- a/src/mpi/debugger/dll_mpich.c
+++ b/src/mpi/debugger/dll_mpich.c
@@ -325,19 +325,6 @@ int mqs_image_has_queues (mqs_image *image, char **message)
loff = dbgr_field_offset( dreq_type, (char *)"datatype" );
i_info->req_datatype_offs = dev_offs + loff;
match_offs = dbgr_field_offset( dreq_type, (char *)"match" );
- /*
- Current definition from the mpidpre.h file for ch3.
-
- typedef struct MPIDI_Message_match_parts {
- int32_t tag;
- MPIR_Rank_t rank;
- MPIR_Context_id_t context_id;
- } MPIDI_Message_match_parts_t;
- typedef union {
- MPIDI_Message_match_parts_t parts;
- MPIR_Upint whole;
- } MPIDI_Message_match;
- */
if (match_offs >= 0) {
mqs_type *match_type = dbgr_find_type( image, (char *)"MPIDI_Message_match", mqs_lang_c );
if (match_type) {
diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_init.c b/src/mpid/ch3/channels/nemesis/src/ch3_init.c
index 0cb3a36..221a23a 100644
--- a/src/mpid/ch3/channels/nemesis/src/ch3_init.c
+++ b/src/mpid/ch3/channels/nemesis/src/ch3_init.c
@@ -27,7 +27,7 @@ static int split_type(MPID_Comm * comm_ptr, int stype, int key,
MPID_Info *info_ptr, MPID_Comm ** newcomm_ptr)
{
MPID_Node_id_t id;
- MPIR_Rank_t nid;
+ MPIDI_Rank_t nid;
int mpi_errno = MPI_SUCCESS;
if (MPIDI_CH3I_Shm_supported()) {
diff --git a/src/mpid/ch3/include/mpidpre.h b/src/mpid/ch3/include/mpidpre.h
index 0197578..bfba003 100644
--- a/src/mpid/ch3/include/mpidpre.h
+++ b/src/mpid/ch3/include/mpidpre.h
@@ -67,15 +67,15 @@ typedef unsigned long MPID_Seqnum_t;
#include "mpichconf.h"
#if CH3_RANK_BITS == 16
-typedef int16_t MPIR_Rank_t;
+typedef int16_t MPIDI_Rank_t;
#elif CH3_RANK_BITS == 32
-typedef int32_t MPIR_Rank_t;
+typedef int32_t MPIDI_Rank_t;
#endif /* CH3_RANK_BITS */
/* Indicates that this device is topology aware and implements the
MPID_Get_node_id function (and friends). */
#define MPID_USE_NODE_IDS
-typedef MPIR_Rank_t MPID_Node_id_t;
+typedef MPIDI_Rank_t MPID_Node_id_t;
/* provides "pre" typedefs and such for NBC scheduling mechanism */
@@ -105,7 +105,7 @@ typedef MPIR_Rank_t MPID_Node_id_t;
*/
typedef struct MPIDI_Message_match_parts {
int32_t tag;
- MPIR_Rank_t rank;
+ MPIDI_Rank_t rank;
MPIR_Context_id_t context_id;
} MPIDI_Message_match_parts_t;
typedef union {
http://git.mpich.org/mpich.git/commitdiff/e089052743eafde37cf84d3fc5ca23ca136e288b
commit e089052743eafde37cf84d3fc5ca23ca136e288b
Author: Hajime Fujita <hajime.fujita at intel.com>
Date: Wed Jul 8 04:20:43 2015 -0500
Cleanup: MPIDI_RMA_* prototypes must be private
This patch moves MPIDI_RMA_* functions to the internal header file,
as they are only used internally in CH3, not exposed to the upper
layer.
Signed-off-by: Pavan Balaji <balaji at anl.gov>
diff --git a/src/mpid/ch3/include/mpidimpl.h b/src/mpid/ch3/include/mpidimpl.h
index e05d569..5a2de23 100644
--- a/src/mpid/ch3/include/mpidimpl.h
+++ b/src/mpid/ch3/include/mpidimpl.h
@@ -1128,6 +1128,9 @@ int MPIDI_CH3_Complete_Acceptq_dequeue(MPIDI_VC_t * vc);
/* mpirma.h (in src/mpi/rma?) */
/* ------------------------------------------------------------------------- */
+int MPIDI_RMA_init(void);
+void MPIDI_RMA_finalize(void);
+
/* The Win_fns table contains pointers to the channel's implementation of the
* RMA window creation routines. The channel must provide the init function,
* which can optionally override any defaults already set by CH3.
diff --git a/src/mpid/ch3/include/mpidpre.h b/src/mpid/ch3/include/mpidpre.h
index 6dd0481..0197578 100644
--- a/src/mpid/ch3/include/mpidpre.h
+++ b/src/mpid/ch3/include/mpidpre.h
@@ -489,7 +489,4 @@ MPID_REQUEST_DECL
ADI */
#define USE_MPID_RMA_TABLE
-int MPIDI_RMA_init(void);
-void MPIDI_RMA_finalize(void);
-
#endif /* !defined(MPICH_MPIDPRE_H_INCLUDED) */
-----------------------------------------------------------------------
Summary of changes:
src/include/mpiimpl.h | 11 +---
src/include/mpiimplthread.h | 3 -
src/mpi/comm/intercomm_merge.c | 2 +-
src/mpi/debugger/dll_mpich.c | 13 ----
src/mpi/errhan/errhandler_set.c | 2 +-
src/mpi/info/info_set.c | 2 +-
src/mpi/pt2pt/bsendutil.c | 12 ++--
src/mpi/pt2pt/mpir_request.c | 2 +-
src/mpi/rma/accumulate.c | 2 +-
src/mpi/rma/compare_and_swap.c | 2 +-
src/mpi/rma/fetch_and_op.c | 2 +-
src/mpi/rma/get.c | 2 +-
src/mpi/rma/get_accumulate.c | 2 +-
src/mpi/rma/put.c | 2 +-
src/mpi/rma/raccumulate.c | 2 +-
src/mpi/rma/rget.c | 2 +-
src/mpi/rma/rget_accumulate.c | 2 +-
src/mpi/rma/rput.c | 2 +-
src/mpi/rma/win_attach.c | 2 +-
src/mpi/rma/win_complete.c | 2 +-
src/mpi/rma/win_detach.c | 2 +-
src/mpi/rma/win_fence.c | 2 +-
src/mpi/rma/win_flush.c | 2 +-
src/mpi/rma/win_flush_all.c | 2 +-
src/mpi/rma/win_flush_local.c | 2 +-
src/mpi/rma/win_flush_local_all.c | 2 +-
src/mpi/rma/win_free.c | 2 +-
src/mpi/rma/win_lock.c | 2 +-
src/mpi/rma/win_lock_all.c | 2 +-
src/mpi/rma/win_post.c | 2 +-
src/mpi/rma/win_shared_query.c | 2 +-
src/mpi/rma/win_start.c | 2 +-
src/mpi/rma/win_sync.c | 2 +-
src/mpi/rma/win_test.c | 2 +-
src/mpi/rma/win_unlock.c | 2 +-
src/mpi/rma/win_unlock_all.c | 2 +-
src/mpi/rma/win_wait.c | 2 +-
src/mpi/timer/mpidtime.c | 2 +-
.../ch3/channels/nemesis/include/mpid_nem_impl.h | 6 ++-
.../ch3/channels/nemesis/include/mpid_nem_inline.h | 24 ++++----
.../ch3/channels/nemesis/include/mpid_nem_queue.h | 6 +-
.../ch3/channels/nemesis/include/mpidi_ch3_impl.h | 4 +-
.../ch3/channels/nemesis/include/mpidi_ch3_post.h | 6 --
.../ch3/channels/nemesis/include/mpidi_ch3_pre.h | 8 +-
.../ch3/channels/nemesis/netmod/llc/llc_cancel.c | 2 +-
.../ch3/channels/nemesis/netmod/llc/llc_fini.c | 2 +-
.../ch3/channels/nemesis/netmod/llc/llc_init.c | 12 ++--
.../ch3/channels/nemesis/netmod/llc/llc_poll.c | 12 ++--
.../ch3/channels/nemesis/netmod/llc/llc_probe.c | 6 +-
.../ch3/channels/nemesis/netmod/llc/llc_send.c | 14 ++--
src/mpid/ch3/channels/nemesis/netmod/llc/llc_vc.c | 14 ++--
.../ch3/channels/nemesis/netmod/mxm/mxm_cancel.c | 4 +-
.../ch3/channels/nemesis/netmod/mxm/mxm_init.c | 20 +++---
.../ch3/channels/nemesis/netmod/mxm/mxm_poll.c | 10 ++--
.../ch3/channels/nemesis/netmod/mxm/mxm_probe.c | 6 +-
.../ch3/channels/nemesis/netmod/mxm/mxm_send.c | 14 ++--
.../ch3/channels/nemesis/netmod/ofi/ofi_init.c | 4 +-
.../channels/nemesis/netmod/portals4/ptl_init.c | 20 +++---
src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c | 60 ++++++++++----------
.../ch3/channels/nemesis/netmod/tcp/tcp_ckpt.c | 8 +-
.../ch3/channels/nemesis/netmod/tcp/tcp_finalize.c | 2 +-
.../ch3/channels/nemesis/netmod/tcp/tcp_getip.c | 2 +-
.../ch3/channels/nemesis/netmod/tcp/tcp_init.c | 24 ++++----
.../ch3/channels/nemesis/netmod/tcp/tcp_send.c | 16 +++---
.../ch3/channels/nemesis/netmod/tcp/tcp_utility.c | 12 ++--
src/mpid/ch3/channels/nemesis/src/ch3_finalize.c | 2 +-
src/mpid/ch3/channels/nemesis/src/ch3_init.c | 18 +++---
src/mpid/ch3/channels/nemesis/src/ch3_isend.c | 2 +-
src/mpid/ch3/channels/nemesis/src/ch3_isendv.c | 2 +-
src/mpid/ch3/channels/nemesis/src/ch3_istartmsg.c | 2 +-
src/mpid/ch3/channels/nemesis/src/ch3_istartmsgv.c | 2 +-
src/mpid/ch3/channels/nemesis/src/ch3_progress.c | 32 +++++-----
src/mpid/ch3/channels/nemesis/src/ch3_rma_shm.c | 4 +-
src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c | 16 +++---
src/mpid/ch3/channels/nemesis/src/ch3i_comm.c | 12 ++--
.../ch3/channels/nemesis/src/ch3i_eagernoncontig.c | 2 +-
src/mpid/ch3/channels/nemesis/src/mpid_nem_alloc.c | 8 +-
.../ch3/channels/nemesis/src/mpid_nem_barrier.c | 4 +-
src/mpid/ch3/channels/nemesis/src/mpid_nem_ckpt.c | 20 +++---
src/mpid/ch3/channels/nemesis/src/mpid_nem_debug.c | 6 +-
.../ch3/channels/nemesis/src/mpid_nem_finalize.c | 2 +-
src/mpid/ch3/channels/nemesis/src/mpid_nem_init.c | 10 ++--
src/mpid/ch3/channels/nemesis/src/mpid_nem_lmt.c | 20 +++---
.../ch3/channels/nemesis/src/mpid_nem_lmt_dma.c | 24 ++++----
.../ch3/channels/nemesis/src/mpid_nem_lmt_shm.c | 30 +++++-----
.../channels/nemesis/src/mpid_nem_lmt_vmsplice.c | 12 ++--
src/mpid/ch3/channels/nemesis/src/mpid_nem_mpich.c | 4 +-
.../ch3/channels/nemesis/src/mpid_nem_mpich_rma.c | 32 +++++-----
.../ch3/channels/nemesis/src/mpid_nem_network.c | 2 +-
.../channels/nemesis/src/mpid_nem_network_poll.c | 2 +-
src/mpid/ch3/channels/sock/src/ch3_finalize.c | 2 +-
src/mpid/ch3/channels/sock/src/ch3_init.c | 2 +-
src/mpid/ch3/channels/sock/src/ch3_isend.c | 4 +-
src/mpid/ch3/channels/sock/src/ch3_isendv.c | 4 +-
src/mpid/ch3/channels/sock/src/ch3_istartmsg.c | 4 +-
src/mpid/ch3/channels/sock/src/ch3_istartmsgv.c | 4 +-
src/mpid/ch3/channels/sock/src/ch3_progress.c | 30 +++++-----
src/mpid/ch3/channels/sock/src/ch3_win_fns.c | 6 +-
src/mpid/ch3/channels/sock/src/ch3i_errno.c | 2 +-
src/mpid/ch3/include/mpid_rma_issue.h | 26 ++++----
src/mpid/ch3/include/mpid_rma_lockqueue.h | 4 +-
src/mpid/ch3/include/mpid_rma_oplist.h | 30 +++++-----
src/mpid/ch3/include/mpid_rma_shm.h | 12 ++--
src/mpid/ch3/include/mpidimpl.h | 7 ++-
src/mpid/ch3/include/mpidpre.h | 11 +--
src/mpid/ch3/include/mpidrma.h | 20 +++---
src/mpid/ch3/src/ch3u_buffer.c | 2 +-
src/mpid/ch3/src/ch3u_comm_spawn_multiple.c | 6 +-
src/mpid/ch3/src/ch3u_eager.c | 16 +++---
src/mpid/ch3/src/ch3u_eagersync.c | 6 +-
src/mpid/ch3/src/ch3u_handle_connection.c | 6 +-
src/mpid/ch3/src/ch3u_handle_op_req.c | 2 +-
src/mpid/ch3/src/ch3u_handle_recv_pkt.c | 16 +++---
src/mpid/ch3/src/ch3u_handle_recv_req.c | 32 +++++-----
src/mpid/ch3/src/ch3u_handle_revoke_pkt.c | 2 +-
src/mpid/ch3/src/ch3u_handle_send_req.c | 8 +-
src/mpid/ch3/src/ch3u_port.c | 26 ++++----
src/mpid/ch3/src/ch3u_recvq.c | 16 +++---
src/mpid/ch3/src/ch3u_request.c | 12 ++--
src/mpid/ch3/src/ch3u_rma_ops.c | 20 +++---
src/mpid/ch3/src/ch3u_rma_pkthandler.c | 38 ++++++------
src/mpid/ch3/src/ch3u_rma_progress.c | 20 +++---
src/mpid/ch3/src/ch3u_rma_reqops.c | 8 +-
src/mpid/ch3/src/ch3u_rma_sync.c | 34 ++++++------
src/mpid/ch3/src/ch3u_rndv.c | 10 ++--
src/mpid/ch3/src/ch3u_win_fns.c | 20 +++---
src/mpid/ch3/src/mpid_abort.c | 2 +-
src/mpid/ch3/src/mpid_aint.c | 4 +-
src/mpid/ch3/src/mpid_cancel_recv.c | 2 +-
src/mpid/ch3/src/mpid_cancel_send.c | 2 +-
src/mpid/ch3/src/mpid_comm_disconnect.c | 2 +-
src/mpid/ch3/src/mpid_comm_revoke.c | 2 +-
src/mpid/ch3/src/mpid_comm_spawn_multiple.c | 2 +-
src/mpid/ch3/src/mpid_finalize.c | 2 +-
src/mpid/ch3/src/mpid_get_universe_size.c | 2 +-
src/mpid/ch3/src/mpid_getpname.c | 2 +-
src/mpid/ch3/src/mpid_init.c | 4 +-
src/mpid/ch3/src/mpid_iprobe.c | 2 +-
src/mpid/ch3/src/mpid_irecv.c | 2 +-
src/mpid/ch3/src/mpid_irsend.c | 2 +-
src/mpid/ch3/src/mpid_isend.c | 2 +-
src/mpid/ch3/src/mpid_issend.c | 2 +-
src/mpid/ch3/src/mpid_port.c | 12 ++--
src/mpid/ch3/src/mpid_probe.c | 2 +-
src/mpid/ch3/src/mpid_recv.c | 2 +-
src/mpid/ch3/src/mpid_rma.c | 16 +++---
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 | 12 ++--
src/mpid/ch3/src/mpid_vc.c | 32 +++++-----
src/mpid/ch3/src/mpidi_isend_self.c | 2 +-
src/mpid/ch3/src/mpidi_pg.c | 36 ++++++------
src/mpid/ch3/src/mpidi_rma.c | 12 ++--
src/mpid/ch3/util/ftb/ftb.c | 10 ++--
src/mpid/ch3/util/sock/ch3u_connect_sock.c | 38 ++++++------
src/mpid/ch3/util/sock/ch3u_getinterfaces.c | 2 +-
src/mpid/ch3/util/sock/ch3u_init_sock.c | 2 +-
src/mpid/ch3/util/unordered/unordered.c | 2 +-
src/mpid/common/datatype/mpid_ext32_segment.c | 8 +-
src/mpid/common/datatype/mpid_segment.c | 14 ++--
src/mpid/common/sock/iocp/sock.c | 58 ++++++++++----------
src/mpid/pamid/src/mpid_aint.c | 4 +-
src/mpid/pamid/src/mpid_init.c | 2 +-
src/mpid/pamid/src/mpid_progress.c | 4 +-
src/mpid/pamid/src/mpidi_util.c | 4 +-
.../pamid/src/onesided/mpid_win_compare_and_swap.c | 2 +-
.../pamid/src/onesided/mpid_win_fetch_and_op.c | 2 +-
src/util/dbg/dbg_printf.c | 6 +-
src/util/instrm/Makefile.mk | 1 -
src/util/instrm/states.c | 36 ------------
src/util/mem/handlemem.c | 4 +-
src/util/procmap/local_proc.c | 6 +-
173 files changed, 737 insertions(+), 799 deletions(-)
delete mode 100644 src/util/instrm/states.c
hooks/post-receive
--
MPICH primary repository
More information about the commits
mailing list