[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2b3-100-g394d46b

[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  394d46b764838dc9193efc012ea297cab3a33aac (commit)
       via  c80f2c4e3ab28ac8b80c88d670a4a424bd2c49d4 (commit)
      from  93b114e3437d991eed22af6b9e2aede3d330401b (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/394d46b764838dc9193efc012ea297cab3a33aac

commit 394d46b764838dc9193efc012ea297cab3a33aac
Author: Ken Raffenetti <raffenet at mcs.anl.gov>
Date:   Mon Jun 15 08:33:56 2015 -0500

    netmod/portals4: fix per target event counting
    
    Ignore local completion events (SENDs) when counting outstanding
    ops to remote targets.
    
    No reviewer.

diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/rptl.c b/src/mpid/ch3/channels/nemesis/netmod/portals4/rptl.c
index c3742fc..0a3294b 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/portals4/rptl.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/rptl.c
@@ -547,7 +547,8 @@ static int get_event_info(ptl_event_t * event, struct rptl **ret_rptl, struct rp
         op = (struct rptl_op *) event->user_ptr;
 
         rptl_info.origin_events_left++;
-        op->target->issued_data_ops--;
+        if (event->type != PTL_EVENT_SEND)
+            op->target->issued_data_ops--;
 
         /* see if there are any pending ops to be issued */
         ret = poke_progress();

http://git.mpich.org/mpich.git/commitdiff/c80f2c4e3ab28ac8b80c88d670a4a424bd2c49d4

commit c80f2c4e3ab28ac8b80c88d670a4a424bd2c49d4
Author: Ken Raffenetti <raffenet at mcs.anl.gov>
Date:   Mon Jun 15 08:33:05 2015 -0500

    netmod/portals4: remove unused variable
    
    No reviewer.

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 8647a8c..0e136c7 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h
+++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h
@@ -43,7 +43,6 @@ typedef int (* event_handler_fn)(const ptl_event_t *e);
 
 typedef struct {
     struct MPID_nem_ptl_pack_overflow overflow[MPID_NEM_PTL_NUM_CHUNK_BUFFERS];
-    int noncontig;
     int large;
     ptl_handle_md_t md;
     ptl_handle_me_t put_me;
@@ -68,7 +67,6 @@ static inline MPID_nem_ptl_req_area * REQ_PTL(MPID_Request *req) {
             REQ_PTL(req_)->overflow[i].len  = 0;                \
             REQ_PTL(req_)->chunk_buffer[i] = NULL;              \
         }                                                       \
-        REQ_PTL(req_)->noncontig     = FALSE;                   \
         REQ_PTL(req_)->large         = FALSE;                   \
         REQ_PTL(req_)->md            = PTL_INVALID_HANDLE;      \
         REQ_PTL(req_)->put_me        = PTL_INVALID_HANDLE;      \

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

Summary of changes:
 .../channels/nemesis/netmod/portals4/ptl_impl.h    |    2 --
 .../ch3/channels/nemesis/netmod/portals4/rptl.c    |    3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
MPICH primary repository