[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1.3-15-g1a4265d

[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  1a4265d0710eddc5cdcdd6a1599d41e9a1d9203b (commit)
       via  007484728272fce06476159d38c62ddce47e583a (commit)
      from  f0151661c7276b57e39a31c092c8c63de0fb94f0 (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/1a4265d0710eddc5cdcdd6a1599d41e9a1d9203b

commit 1a4265d0710eddc5cdcdd6a1599d41e9a1d9203b
Author: Ken Raffenetti <raffenet at mcs.anl.gov>
Date:   Tue Oct 14 18:10:01 2014 -0500

    portals4: large threshold comparison
    
    If a message size is <= PTL_LARGE_THRESHOLD, use a single operation.
    Previously, this would generate unnecessary 0-byte operations when
    messages were exactly the size of the threshold.
    
    Signed-off-by: Pavan Balaji <balaji at 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 005b678..15a9345 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_recv.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_recv.c
@@ -399,7 +399,7 @@ int MPID_nem_ptl_recv_posted(MPIDI_VC_t *vc, MPID_Request *rreq)
     MPIDI_Datatype_get_info(rreq->dev.user_count, rreq->dev.datatype, dt_contig, data_sz, dt_ptr, dt_true_lb);
     MPIU_DBG_MSG_FMT(CH3_CHANNEL, VERBOSE, (MPIU_DBG_FDEST, "count=%d datatype=%#x contig=%d data_sz=%lu", rreq->dev.user_count, rreq->dev.datatype, dt_contig, data_sz));
 
-    if (data_sz < PTL_LARGE_THRESHOLD) {
+    if (data_sz <= PTL_LARGE_THRESHOLD) {
         if (dt_contig) {
             /* small contig message */
             MPIU_DBG_MSG(CH3_CHANNEL, VERBOSE, "Small contig message");
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 f86cbcc..0ab2bc7 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_send.c
@@ -202,7 +202,7 @@ static int send_msg(ptl_hdr_data_t ssend_flag, struct MPIDI_VC *vc, const void *
     MPIDI_Datatype_get_info(count, datatype, dt_contig, data_sz, dt_ptr, dt_true_lb);
     MPIU_DBG_MSG_FMT(CH3_CHANNEL, VERBOSE, (MPIU_DBG_FDEST, "count=%d datatype=%#x contig=%d data_sz=%lu", count, datatype, dt_contig, data_sz));
     
-    if (data_sz < PTL_LARGE_THRESHOLD) {
+    if (data_sz <= PTL_LARGE_THRESHOLD) {
         /* Small message.  Send all data eagerly */
         if (dt_contig) {
             MPIU_DBG_MSG(CH3_CHANNEL, VERBOSE, "Small contig message");

http://git.mpich.org/mpich.git/commitdiff/007484728272fce06476159d38c62ddce47e583a

commit 007484728272fce06476159d38c62ddce47e583a
Author: Ken Raffenetti <raffenet at mcs.anl.gov>
Date:   Mon Oct 13 12:29:52 2014 -0500

    portals4: remove pointer update from unmatched improbe
    
    Previously, the message pointer in an improbe call in the portals4
    netmod layer was set to MPI_MESSAGE_NULL if there was no match. This
    is incorrect because the ch3 layer eventually returns either a valid
    pointer or NULL. As ch3 already starts the value at NULL, we can just
    omit the update.
    
    Signed-off-by: Pavan Balaji <balaji at 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 b7c7dcc..f686381 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_probe.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_probe.c
@@ -241,7 +241,6 @@ int MPID_nem_ptl_improbe(MPIDI_VC_t *vc, int source, int tag, MPID_Comm *comm, i
     }
     else {
         MPID_Request_release(req);
-        *message = MPI_MESSAGE_NULL;
     }
 
  fn_exit:

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

Summary of changes:
 .../channels/nemesis/netmod/portals4/ptl_probe.c   |    1 -
 .../channels/nemesis/netmod/portals4/ptl_recv.c    |    2 +-
 .../channels/nemesis/netmod/portals4/ptl_send.c    |    2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
MPICH primary repository