[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2a2-28-g8bdfaf7

[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  8bdfaf741104f88c27b8a845d4ca325ad5005122 (commit)
      from  d5a4685bf65bc28b1077d967244ea529af1bfc20 (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/8bdfaf741104f88c27b8a845d4ca325ad5005122

commit 8bdfaf741104f88c27b8a845d4ca325ad5005122
Author: Kuleshov Aleksey <rndfax at yandex.ru>
Date:   Mon Dec 1 09:45:30 2014 -0600

    Fix bug in using wrong type for packsize.
    
    Type of the third argument for MPIR_Pack_size_impl should be a pointer
    to MPI_Aint. This patch fixes the wrong usage of int pointer for
    MPIR_Pack_size_impl in NEWMAD and MXM netmods.
    
    Signed-off-by: Sangmin Seo <sseo at anl.gov>

diff --git a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_poll.c b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_poll.c
index e8bddc3..752a1f9 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_poll.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_poll.c
@@ -482,8 +482,8 @@ static int _mxm_process_rdtype(MPID_Request ** rreq_p, MPI_Datatype datatype,
         *iov_count = n_iov;
     }
     else {
-        int packsize = 0;
-        MPIR_Pack_size_impl(rreq->dev.user_count, rreq->dev.datatype, (MPI_Aint *) & packsize);
+        MPI_Aint packsize = 0;
+        MPIR_Pack_size_impl(rreq->dev.user_count, rreq->dev.datatype, &packsize);
         rreq->dev.tmpbuf = MPIU_Malloc((size_t) packsize);
         MPIU_Assert(rreq->dev.tmpbuf);
         rreq->dev.tmpbuf_sz = packsize;
diff --git a/src/mpid/ch3/channels/nemesis/netmod/newmad/newmad_poll.c b/src/mpid/ch3/channels/nemesis/netmod/newmad/newmad_poll.c
index 2dba872..5a32515 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/newmad/newmad_poll.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/newmad/newmad_poll.c
@@ -575,7 +575,7 @@ int MPID_nem_newmad_process_rdtype(MPID_Request **rreq_p, MPID_Datatype * dt_ptr
     }
     else
     {
-	int packsize = 0;
+	MPI_Aint packsize = 0;
 	MPIR_Pack_size_impl(rreq->dev.user_count, rreq->dev.datatype, &packsize);
 	rreq->dev.tmpbuf = MPIU_Malloc((size_t) packsize);
 	MPIU_Assert(rreq->dev.tmpbuf);

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

Summary of changes:
 .../ch3/channels/nemesis/netmod/mxm/mxm_poll.c     |    4 ++--
 .../channels/nemesis/netmod/newmad/newmad_poll.c   |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
MPICH primary repository