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

[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  13160734588f866d802124c9ea33eaad29b9dd51 (commit)
      from  8976a2cb117ee3e902399f47a11d0421e37e753c (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/13160734588f866d802124c9ea33eaad29b9dd51

commit 13160734588f866d802124c9ea33eaad29b9dd51
Author: Rob Latham <robl at mcs.anl.gov>
Date:   Thu Jul 16 10:44:16 2015 -0500

    system calls return ssize_t, not int
    
    read, readv, write, writev (and the  MPL_large_writev and
    MPL_large_readv wrappers) return ssize_t, not int.  For cases, like
    gather_big, where writev is indeed operating on large amount of data,
    the return type was overflowing a 32 bit int.
    
    see #1767  -- but still 15,000 more locations to fix
    
    Signed-off-by: Ken Raffenetti <raffenet at mcs.anl.gov>

diff --git a/src/mpid/common/sock/poll/sock_wait.i b/src/mpid/common/sock/poll/sock_wait.i
index 21a852a..1e1759c 100644
--- a/src/mpid/common/sock/poll/sock_wait.i
+++ b/src/mpid/common/sock/poll/sock_wait.i
@@ -317,7 +317,7 @@ int MPIDU_Sock_wait(struct MPIDU_Sock_set * sock_set, int millisecond_timeout,
 	else if ((MPICH_THREAD_LEVEL == MPI_THREAD_MULTIPLE) && pollinfo->type == MPIDU_SOCKI_TYPE_INTERRUPTER)
 		{
 		    char c[16];
-		    int nb;
+		    ssize_t nb;
 
 		    do
 		    {
@@ -570,7 +570,7 @@ static int MPIDU_Socki_handle_pollerr(struct pollfd * const pollfd, struct polli
 #define FCNAME MPIU_QUOTE(FUNCNAME)
 static int MPIDU_Socki_handle_read(struct pollfd * const pollfd, struct pollinfo * const pollinfo)
 {
-    int nb;
+    ssize_t nb;
     int mpi_errno = MPI_SUCCESS;
     MPIDI_STATE_DECL(MPID_STATE_READ);
     MPIDI_STATE_DECL(MPID_STATE_READV);
@@ -689,7 +689,7 @@ static int MPIDU_Socki_handle_read(struct pollfd * const pollfd, struct pollinfo
 #define FCNAME MPIU_QUOTE(FUNCNAME)
 static int MPIDU_Socki_handle_write(struct pollfd * const pollfd, struct pollinfo * const pollinfo)
 {
-    int nb;
+    ssize_t nb;
     int mpi_errno = MPI_SUCCESS;
     MPIDI_STATE_DECL(MPID_STATE_WRITE);
     MPIDI_STATE_DECL(MPID_STATE_WRITEV);
diff --git a/test/mpi/coll/testlist.in b/test/mpi/coll/testlist.in
index 74f2135..fd4be71 100644
--- a/test/mpi/coll/testlist.in
+++ b/test/mpi/coll/testlist.in
@@ -78,7 +78,7 @@ exscan 10
 exscan2 5
 gather 4
 gather2 4
- at largetest@gather_big 8 xfail=ticket1767
+ at largetest@gather_big 8
 scattern 4
 scatter2 4
 scatter3 4

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

Summary of changes:
 src/mpid/common/sock/poll/sock_wait.i |    6 +++---
 test/mpi/coll/testlist.in             |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
MPICH primary repository