[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2b2-40-gf08d09b
Service Account
noreply at mpich.org
Wed May 20 11:28:53 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 f08d09bc32bde098cdf1a8ac32a2e876e466ebe0 (commit)
via 0ac04e9d15fac513b702800900c01ae7b3e0f91c (commit)
via 6cf18737a44bea2affe6ef834314343cf2adc4fe (commit)
from b56f5da846530b7f48da5db76c78963b99d004f0 (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/f08d09bc32bde098cdf1a8ac32a2e876e466ebe0
commit f08d09bc32bde098cdf1a8ac32a2e876e466ebe0
Author: Ken Raffenetti <raffenet at mcs.anl.gov>
Date: Mon May 18 15:01:43 2015 -0500
netmod/portals4: pkt enum typo
Signed-off-by: Antonio J. Pena <apenya at mcs.anl.gov>
diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h
index 8f39d73..b8c633f 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h
+++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h
@@ -220,7 +220,7 @@ int MPID_nem_ptl_pkt_cancel_send_resp_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *p
typedef enum MPIDI_nem_ptl_pkt_type {
MPIDI_NEM_PTL_PKT_CANCEL_SEND_REQ,
MPIDI_NEM_PTL_PKT_CANCEL_SEND_RESP,
- MPIDI_NEM_TCP_PKT_INVALID = -1 /* force signed, to avoid warnings */
+ MPIDI_NEM_PTL_PKT_INVALID = -1 /* force signed, to avoid warnings */
} MPIDI_nem_ptl_pkt_type_t;
typedef struct MPIDI_nem_ptl_pkt_cancel_send_req
http://git.mpich.org/mpich.git/commitdiff/0ac04e9d15fac513b702800900c01ae7b3e0f91c
commit 0ac04e9d15fac513b702800900c01ae7b3e0f91c
Author: Ken Raffenetti <raffenet at mcs.anl.gov>
Date: Mon May 18 14:12:39 2015 -0500
netmod/portals4: minor request ref helper fixup
Signed-off-by: Antonio J. Pena <apenya at mcs.anl.gov>
diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_recv.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_recv.c
index f732751..76bb7ea 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_recv.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_recv.c
@@ -702,7 +702,7 @@ int MPID_nem_ptl_lmt_start_recv(MPIDI_VC_t *vc, MPID_Request *rreq, MPID_IOV s_
rreq->dev.match.parts.rank);
MPIDI_CH3U_Request_increment_cc(rreq, &was_incomplete);
MPIU_Assert(was_incomplete == 0);
- MPIU_Object_add_ref(rreq);
+ MPIR_Request_add_ref(rreq);
MPIDI_Datatype_get_info(rreq->dev.user_count, rreq->dev.datatype, dt_contig, data_sz, dt_ptr,
dt_true_lb);
http://git.mpich.org/mpich.git/commitdiff/6cf18737a44bea2affe6ef834314343cf2adc4fe
commit 6cf18737a44bea2affe6ef834314343cf2adc4fe
Author: Ken Raffenetti <raffenet at mcs.anl.gov>
Date: Mon May 18 11:12:34 2015 -0500
netmod/portals4: cleanup pt2pt request tracking
Simplifies request completion logic and ensures operations are properly
accounted for in the cancel send case. Removes pt2pt send tracking in the
VC, as requests are enough to guarantee completion.
Signed-off-by: Antonio J. Pena <apenya at mcs.anl.gov>
diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_probe.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_probe.c
index 3de3b1f..be03923 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_probe.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_probe.c
@@ -389,6 +389,7 @@ int MPID_nem_ptl_pkt_cancel_send_resp_handler(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *p
for (i = 0; i < REQ_PTL(sreq)->num_gets; i++) {
ret = PtlMEUnlink(REQ_PTL(sreq)->get_me_p[i]);
MPIU_ERR_CHKANDJUMP1(ret, mpi_errno, MPI_ERR_OTHER, "**ptlmeunlink", "**ptlmeunlink %s", MPID_nem_ptl_strerror(ret));
+ MPIDI_CH3U_Request_complete(sreq);
}
MPIU_DBG_MSG(CH3_OTHER,TYPICAL,"message cancelled");
} else {
diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c
index 32c4275..5d71929 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c
@@ -67,7 +67,7 @@ static int handler_send(const ptl_event_t *e)
MPIDI_VC_t *vc = sreq->ch.vc;
MPID_nem_ptl_vc_area *const vc_ptl = VC_PTL(vc);
- int i, ret, incomplete;
+ int i, ret;
MPIDI_STATE_DECL(MPID_STATE_HANDLER_SEND);
@@ -75,7 +75,7 @@ static int handler_send(const ptl_event_t *e)
MPIU_Assert(e->type == PTL_EVENT_SEND || e->type == PTL_EVENT_GET);
- /* if we are done, release all resources and complete the request */
+ /* if we are done, release all netmod resources */
if (MPID_cc_get(sreq->cc) == 1) {
if (REQ_PTL(sreq)->md != PTL_INVALID_HANDLE) {
ret = PtlMDRelease(REQ_PTL(sreq)->md);
@@ -88,15 +88,8 @@ static int handler_send(const ptl_event_t *e)
if (REQ_PTL(sreq)->get_me_p)
MPIU_Free(REQ_PTL(sreq)->get_me_p);
-
- MPIDI_CH3U_Request_complete(sreq);
- vc_ptl->num_queued_sends--;
-
- if (vc->state == MPIDI_VC_STATE_CLOSED && vc_ptl->num_queued_sends == 0)
- MPID_nem_ptl_vc_terminated(vc);
- } else {
- MPIDI_CH3U_Request_decrement_cc(sreq, &incomplete);
}
+ MPIDI_CH3U_Request_complete(sreq);
fn_exit:
MPIDI_FUNC_EXIT(MPID_STATE_HANDLER_SEND);
@@ -135,7 +128,6 @@ static int send_msg(ptl_hdr_data_t ssend_flag, struct MPIDI_VC *vc, const void *
sreq->dev.match.parts.tag = tag;
sreq->dev.match.parts.context_id = comm->context_id + context_offset;
sreq->ch.vc = vc;
- vc_ptl->num_queued_sends++;
if (!vc_ptl->id_initialized) {
mpi_errno = MPID_nem_ptl_init_id(vc);
-----------------------------------------------------------------------
Summary of changes:
.../channels/nemesis/netmod/portals4/ptl_impl.h | 2 +-
.../channels/nemesis/netmod/portals4/ptl_probe.c | 1 +
.../channels/nemesis/netmod/portals4/ptl_recv.c | 2 +-
.../channels/nemesis/netmod/portals4/ptl_send.c | 14 +++-----------
4 files changed, 6 insertions(+), 13 deletions(-)
hooks/post-receive
--
MPICH primary repository
More information about the commits
mailing list