[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2-104-gbfc2ce9

[Service Account]

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  bfc2ce9aefde8353f7e3df30247003993dde2cbe (commit)
      from  320af6c9d31ff7086be34440dd6ebc8c70a72e64 (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/bfc2ce9aefde8353f7e3df30247003993dde2cbe

commit bfc2ce9aefde8353f7e3df30247003993dde2cbe
Author: Ken Raffenetti <raffenet at mcs.anl.gov>
Date:   Fri Sep 11 13:55:23 2015 -0500

    netmod/portals4: use MPL_MIN for msg size calc
    
    No reviewer.

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 b5a8d38..bafb327 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_nm.c
@@ -512,10 +512,10 @@ int MPID_nem_ptl_nm_ctl_event_handler(const ptl_event_t *e)
                 REQ_PTL(req)->recv_ptr = e->start;
                 req->ch.vc = vc;
 
-                size = remaining < MPIDI_nem_ptl_ni_limits.max_msg_size ? remaining : MPIDI_nem_ptl_ni_limits.max_msg_size;
                 buf_ptr = (char *)TMPBUF(req) + packet_sz - sizeof(ptl_size_t);
                 target_offset = *((ptl_size_t *)buf_ptr);
                 do {
+                    size = MPL_MIN(remaining, MPIDI_nem_ptl_ni_limits.max_msg_size);
                     MPIDI_CH3U_Request_increment_cc(req, &incomplete);  /* Will be decremented - and eventually freed in REPLY */
                     ret = MPID_nem_ptl_rptl_get(MPIDI_nem_ptl_global_md, (ptl_size_t)buf_ptr,
                                                 size, vc_ptl->id, vc_ptl->ptc, NPTL_MATCH(sender_req_id, GET_TAG, MPIDI_Process.my_pg_rank), target_offset, req);
@@ -528,8 +528,6 @@ int MPID_nem_ptl_nm_ctl_event_handler(const ptl_event_t *e)
                     buf_ptr += size;
                     remaining -= size;
                     target_offset += size;
-                    if (remaining < MPIDI_nem_ptl_ni_limits.max_msg_size)
-                        size = remaining;
                 } while (remaining);
             }
 
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 08272e9..0d74b5c 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_recv.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_recv.c
@@ -193,10 +193,7 @@ static void big_get(void *buf, ptl_size_t left_to_get, MPIDI_VC_t *vc, ptl_match
 
     while (left_to_get > 0) {
         /* get up to the maximum allowed by the portals interface */
-        if (left_to_get > MPIDI_nem_ptl_ni_limits.max_msg_size)
-            get_sz = MPIDI_nem_ptl_ni_limits.max_msg_size;
-        else
-            get_sz = left_to_get;
+        get_sz = MPL_MIN(MPIDI_nem_ptl_ni_limits.max_msg_size, left_to_get);
 
         ret = MPID_nem_ptl_rptl_get(MPIDI_nem_ptl_global_md, start, get_sz, vc_ptl->id, vc_ptl->ptg, match_bits, 0, rreq);
         DBG_MSG_GET("global", get_sz, vc->pg_rank, match_bits);
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 f07ee0a..386b02d 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c
@@ -36,10 +36,7 @@ static void big_meappend(void *buf, ptl_size_t left_to_send, MPIDI_VC_t *vc, ptl
     /* queue up as many entries as necessary to describe the entire message */
     for (i = 0; left_to_send > 0; i++) {
         /* send up to the maximum allowed by the portals interface */
-        if (left_to_send > MPIDI_nem_ptl_ni_limits.max_msg_size)
-            me.length = MPIDI_nem_ptl_ni_limits.max_msg_size;
-        else
-            me.length = left_to_send;
+        me.length = MPL_MIN(MPIDI_nem_ptl_ni_limits.max_msg_size, left_to_send);
 
         ret = PtlMEAppend(MPIDI_nem_ptl_ni, MPIDI_nem_ptl_get_pt, &me, PTL_PRIORITY_LIST, sreq,
                           &REQ_PTL(sreq)->get_me_p[i]);

-----------------------------------------------------------------------

Summary of changes:
 .../ch3/channels/nemesis/netmod/portals4/ptl_nm.c  |    4 +---
 .../channels/nemesis/netmod/portals4/ptl_recv.c    |    5 +----
 .../channels/nemesis/netmod/portals4/ptl_send.c    |    5 +----
 3 files changed, 3 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
MPICH primary repository