[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1.3-23-gb065ce2
Service Account
noreply at mpich.org
Mon Oct 20 10:15:35 CDT 2014
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 b065ce2e89e03683c89e57a0d06f8106c805b7bf (commit)
via 3ffe739574ddd8a77a9189f2e1bbbfff14284c67 (commit)
from f91a57d30ffba0fad02bb4b36b551e5fcf2a9f2c (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/b065ce2e89e03683c89e57a0d06f8106c805b7bf
commit b065ce2e89e03683c89e57a0d06f8106c805b7bf
Author: Pavan Balaji <balaji at anl.gov>
Date: Thu Oct 16 18:13:22 2014 -0500
Change macros to use standard format
This makes sure that macros work the normal way (using a semicolon at
the end, etc.) It also removes a block of unused code from
mx_cancel.c.
Modified by Wesley to split from previous patch.
Signed-off-by: Wesley Bland <wbland at anl.gov>
Signed-off-by: Pavan Balaji <balaji at anl.gov>
diff --git a/src/mpid/ch3/channels/nemesis/netmod/ib/ib_poll.c b/src/mpid/ch3/channels/nemesis/netmod/ib/ib_poll.c
index 9106eb9..e6cc5b4 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/ib/ib_poll.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/ib/ib_poll.c
@@ -24,14 +24,16 @@ static int entered_drain_scq = 0;
#define MPID_NEM_IB_SEND_PROGRESS_POLLINGSET MPID_nem_ib_send_progress(vc);
#else
#define MPID_NEM_IB_SEND_PROGRESS_POLLINGSET { \
- int n; \
- for (n = 0; n < MPID_NEM_IB_NRINGBUF; n++) { \
- if (((MPID_nem_ib_ringbuf_allocated[n / 64] >> (n & 63)) & 1) == 0) { \
- continue; \
- } \
- mpi_errno = MPID_nem_ib_poll_eager(&MPID_nem_ib_ringbuf[n]); /*FIXME: perform send_progress for all sendqs */\
- MPIU_ERR_CHKANDJUMP(mpi_errno, mpi_errno, MPI_ERR_OTHER, "**MPID_nem_ib_poll_eager"); \
- } \
+ do { \
+ int n; \
+ for (n = 0; n < MPID_NEM_IB_NRINGBUF; n++) { \
+ if (((MPID_nem_ib_ringbuf_allocated[n / 64] >> (n & 63)) & 1) == 0) { \
+ continue; \
+ } \
+ mpi_errno = MPID_nem_ib_poll_eager(&MPID_nem_ib_ringbuf[n]); /*FIXME: perform send_progress for all sendqs */ \
+ MPIU_ERR_CHKANDJUMP(mpi_errno, mpi_errno, MPI_ERR_OTHER, "**MPID_nem_ib_poll_eager"); \
+ } \
+ } while (0)
}
#if 0
int n; \
@@ -45,11 +47,16 @@ static int entered_drain_scq = 0;
#endif
#if 1
#define MPID_NEM_IB_CHECK_AND_SEND_PROGRESS \
- if (!MPID_nem_ib_sendq_empty(vc_ib->sendq) && MPID_nem_ib_sendq_ready_to_send_head(vc_ib)) { \
- MPID_nem_ib_send_progress(vc); \
-}
+ do { \
+ if (!MPID_nem_ib_sendq_empty(vc_ib->sendq) && MPID_nem_ib_sendq_ready_to_send_head(vc_ib)) { \
+ MPID_nem_ib_send_progress(vc); \
+ } \
+ } while (0)
#else
-#define MPID_NEM_IB_CHECK_AND_SEND_PROGRESS MPID_NEM_IB_SEND_PROGRESS_POLLINGSET
+#define MPID_NEM_IB_CHECK_AND_SEND_PROGRESS \
+ do { \
+ MPID_NEM_IB_SEND_PROGRESS_POLLINGSET; \
+ } while (0)
#endif
#undef FUNCNAME
@@ -1690,13 +1697,13 @@ int MPID_nem_ib_PktHandler_EagerSend(MPIDI_VC_t * vc,
* progress_send for all of VCs using nces in ib_poll. */
dprintf("pkthandler,eagersend,send_progress\n");
fflush(stdout);
- MPID_NEM_IB_CHECK_AND_SEND_PROGRESS
- /* fall back to the original handler */
- /* we don't need to worry about the difference caused by embedding seq_num
- * because size of MPI-header of MPIDI_CH3_PKT_EAGER_SEND equals to sizeof(MPIDI_CH3_Pkt_t)
- * see MPID_nem_ib_iSendContig
- */
- //ch3_pkt->type = MPIDI_CH3_PKT_EAGER_SEND;
+ MPID_NEM_IB_CHECK_AND_SEND_PROGRESS;
+ /* fall back to the original handler */
+ /* we don't need to worry about the difference caused by embedding seq_num
+ * because size of MPI-header of MPIDI_CH3_PKT_EAGER_SEND equals to sizeof(MPIDI_CH3_Pkt_t)
+ * see MPID_nem_ib_iSendContig
+ */
+ //ch3_pkt->type = MPIDI_CH3_PKT_EAGER_SEND;
#if 0
mpi_errno = MPID_nem_handle_pkt(vc, (char *) pkt_parent_class, *buflen);
#else
@@ -2254,7 +2261,8 @@ int MPID_nem_ib_pkt_GET_DONE_handler(MPIDI_VC_t * vc,
if (REQ_FIELD(req, seg_seq_num) == REQ_FIELD(req, seg_num)) {
/* last packet of segments */
- MPID_NEM_IB_CHECK_AND_SEND_PROGRESS mpi_errno = vc->ch.lmt_done_send(vc, req);
+ MPID_NEM_IB_CHECK_AND_SEND_PROGRESS;
+ mpi_errno = vc->ch.lmt_done_send(vc, req);
if (mpi_errno)
MPIU_ERR_POP(mpi_errno);
}
@@ -2446,8 +2454,10 @@ int MPID_nem_ib_PktHandler_reply_seq_num(MPIDI_VC_t * vc,
/* try to send from sendq because at least one RDMA-write-to buffer has been released */
//dprintf("pkthandler,reply_seq_num,send_progress\n");
dprintf("pkthandler,reply_seq_num,send_progress\n");
- MPID_NEM_IB_CHECK_AND_SEND_PROGRESS fn_exit:MPIDI_FUNC_EXIT
- (MPID_STATE_MPID_NEM_IB_PKTHANDLER_REPLY_SEQ_NUM);
+ MPID_NEM_IB_CHECK_AND_SEND_PROGRESS;
+
+ fn_exit:
+ MPIDI_FUNC_EXIT(MPID_STATE_MPID_NEM_IB_PKTHANDLER_REPLY_SEQ_NUM);
return mpi_errno;
//fn_fail:
goto fn_exit;
http://git.mpich.org/mpich.git/commitdiff/3ffe739574ddd8a77a9189f2e1bbbfff14284c67
commit 3ffe739574ddd8a77a9189f2e1bbbfff14284c67
Author: Pavan Balaji <balaji at anl.gov>
Date: Thu Oct 9 13:35:56 2014 -0500
Function state cleanup.
We were not setting the function states correctly in a bunch of
functions.
Modifications by Wesley to split up big commit.
Signed-off-by: Wesley Bland <wbland at anl.gov>
Signed-off-by: Pavan Balaji <balaji at anl.gov>
diff --git a/src/mpi/attr/win_set_attr.c b/src/mpi/attr/win_set_attr.c
index a211331..8522d40 100644
--- a/src/mpi/attr/win_set_attr.c
+++ b/src/mpi/attr/win_set_attr.c
@@ -200,6 +200,7 @@ int MPI_Win_set_attr(MPI_Win win, int win_keyval, void *attribute_val)
{
int mpi_errno = MPI_SUCCESS;
MPID_MPI_STATE_DECL(MPID_STATE_MPI_WIN_SET_ATTR);
+ MPID_MPI_FUNC_ENTER(MPID_STATE_MPI_WIN_SET_ATTR);
MPIR_ERRTEST_INITIALIZED_ORDIE();
diff --git a/src/mpi/comm/comm_agree.c b/src/mpi/comm/comm_agree.c
index 870f43d..49a71d7 100644
--- a/src/mpi/comm/comm_agree.c
+++ b/src/mpi/comm/comm_agree.c
@@ -98,6 +98,7 @@ int MPIR_Comm_agree(MPID_Comm *comm_ptr, int *flag)
}
fn_exit:
+ MPID_MPI_FUNC_EXIT(MPID_STATE_MPIR_COMM_AGREE);
return mpi_errno;
fn_fail:
goto fn_exit;
diff --git a/src/mpi/comm/comm_set_info.c b/src/mpi/comm/comm_set_info.c
index e6940a8..0acbfbe 100644
--- a/src/mpi/comm/comm_set_info.c
+++ b/src/mpi/comm/comm_set_info.c
@@ -62,6 +62,7 @@ int MPIR_Comm_set_info_impl(MPID_Comm * comm_ptr, MPID_Info * info_ptr)
}
fn_exit:
+ MPID_MPI_FUNC_EXIT(MPID_STATE_MPIR_COMM_SET_INFO_IMPL);
return mpi_errno;
fn_fail:
goto fn_exit;
diff --git a/src/mpi/comm/comm_shrink.c b/src/mpi/comm/comm_shrink.c
index 24560e7..844d617 100644
--- a/src/mpi/comm/comm_shrink.c
+++ b/src/mpi/comm/comm_shrink.c
@@ -82,6 +82,7 @@ int MPIR_Comm_shrink(MPID_Comm *comm_ptr, MPID_Comm **newcomm_ptr)
fn_exit:
MPIR_Group_release(comm_grp);
+ MPID_MPI_FUNC_EXIT(MPID_STATE_MPIR_COMM_SHRINK);
return mpi_errno;
fn_fail:
if (*newcomm_ptr) MPIU_Object_set_ref(*newcomm_ptr, 0);
diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c
index 1934ce6..1032a2b 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c
@@ -163,6 +163,8 @@ static inline void save_iov(MPID_Request *sreq, void *hdr, void *data, MPIDI_msg
++index;
}
sreq->dev.iov_count = index;
+
+ MPIDI_FUNC_EXIT(MPID_STATE_SAVE_IOV);
}
#undef FUNCNAME
diff --git a/src/mpid/ch3/channels/nemesis/netmod/wintcp/socksm.c b/src/mpid/ch3/channels/nemesis/netmod/wintcp/socksm.c
index a6f5099..fec9e89 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/wintcp/socksm.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/wintcp/socksm.c
@@ -1972,7 +1972,7 @@ static int state_c_tmpvcack_success_handler(MPIU_EXOVERLAPPED *rd_ov)
}
fn_exit:
- MPIDI_FUNC_ENTER(MPID_STATE_STATE_C_TMPVCACK_SUCCESS_HANDLER);
+ MPIDI_FUNC_EXIT(MPID_STATE_STATE_C_TMPVCACK_SUCCESS_HANDLER);
return mpi_errno;
fn_fail:
goto fn_exit;
diff --git a/src/mpid/ch3/include/mpidrma.h b/src/mpid/ch3/include/mpidrma.h
index 02c0b9c..8024bf2 100644
--- a/src/mpid/ch3/include/mpidrma.h
+++ b/src/mpid/ch3/include/mpidrma.h
@@ -1095,7 +1095,7 @@ static inline int MPIDI_CH3I_Wait_for_pt_ops_finish(MPID_Win *win_ptr)
}
fn_exit:
- MPIDI_RMA_FUNC_ENTER(MPID_STATE_MPIDI_CH3I_WAIT_FOR_PT_OPS_FINISH);
+ MPIDI_RMA_FUNC_EXIT(MPID_STATE_MPIDI_CH3I_WAIT_FOR_PT_OPS_FINISH);
return mpi_errno;
fn_fail:
goto fn_exit;
diff --git a/src/mpid/ch3/src/mpid_comm_agree.c b/src/mpid/ch3/src/mpid_comm_agree.c
index 6377397..12ae988 100644
--- a/src/mpid/ch3/src/mpid_comm_agree.c
+++ b/src/mpid/ch3/src/mpid_comm_agree.c
@@ -113,6 +113,7 @@ int MPID_Comm_agree(MPID_Comm *comm_ptr, uint32_t *bitarray, int *flag, int new_
MPIU_Free(children);
fn_exit:
+ MPID_MPI_FUNC_EXIT(MPID_STATE_MPID_COMM_AGREE);
return mpi_errno;
fn_fail:
goto fn_exit;
diff --git a/src/mpid/ch3/src/mpid_comm_failure_ack.c b/src/mpid/ch3/src/mpid_comm_failure_ack.c
index fe70fdc..e5034a1 100644
--- a/src/mpid/ch3/src/mpid_comm_failure_ack.c
+++ b/src/mpid/ch3/src/mpid_comm_failure_ack.c
@@ -139,6 +139,7 @@ int MPID_Comm_failed_bitarray(MPID_Comm *comm_ptr, uint32_t **bitarray, int acke
fn_exit:
MPIU_CHKLMEM_FREEALL();
+ MPIDI_FUNC_EXIT(MPID_STATE_COMM_FAILED_BITARRAY);
return mpi_errno;
fn_fail:
goto fn_exit;
-----------------------------------------------------------------------
Summary of changes:
src/mpi/attr/win_set_attr.c | 1 +
src/mpi/comm/comm_agree.c | 1 +
src/mpi/comm/comm_set_info.c | 1 +
src/mpi/comm/comm_shrink.c | 1 +
src/mpid/ch3/channels/nemesis/netmod/ib/ib_poll.c | 54 ++++++++++++--------
.../ch3/channels/nemesis/netmod/portals4/ptl_nm.c | 2 +
.../ch3/channels/nemesis/netmod/wintcp/socksm.c | 2 +-
src/mpid/ch3/include/mpidrma.h | 2 +-
src/mpid/ch3/src/mpid_comm_agree.c | 1 +
src/mpid/ch3/src/mpid_comm_failure_ack.c | 1 +
10 files changed, 42 insertions(+), 24 deletions(-)
hooks/post-receive
--
MPICH primary repository
More information about the commits
mailing list