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

[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  46afb9506a29457620cc1dba1e8ebc9b7a4647c4 (commit)
       via  57b297e649d9ff23d4391f1ecd9c9af616e9d114 (commit)
      from  ba2870aa38153dc3bb37d6586c14c57896733537 (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/46afb9506a29457620cc1dba1e8ebc9b7a4647c4

commit 46afb9506a29457620cc1dba1e8ebc9b7a4647c4
Author: Xin Zhao <xinzhao3 at illinois.edu>
Date:   Fri Jun 26 23:51:44 2015 -0500

    Increase timeLimit of test/mpi/rma/rma-contig to 12min.
    
    This test sometimes takes 11min on 32bits machine in random
    configure tests. This patch increases its time limit to 12min.
    
    Signed-off-by: Pavan Balaji <balaji at anl.gov>

diff --git a/test/mpi/rma/testlist.in b/test/mpi/rma/testlist.in
index ae7524c..42766cc 100644
--- a/test/mpi/rma/testlist.in
+++ b/test/mpi/rma/testlist.in
@@ -129,7 +129,7 @@ mutex_bench 4 mpiversion=3.0
 mutex_bench_shared 4 mpiversion=3.0
 mutex_bench_shm 4 mpiversion=3.0
 mutex_bench_shm_ordered 4 mpiversion=3.0
-rma-contig 2 mpiversion=3.0 timeLimit=600
+rma-contig 2 mpiversion=3.0 timeLimit=720
 badrma 2 mpiversion=3.0
 acc-loc 4
 fence_shm 2 mpiversion=3.0

http://git.mpich.org/mpich.git/commitdiff/57b297e649d9ff23d4391f1ecd9c9af616e9d114

commit 57b297e649d9ff23d4391f1ecd9c9af616e9d114
Author: Xin Zhao <xinzhao3 at illinois.edu>
Date:   Fri Jun 26 22:10:05 2015 -0500

    Bug-fix: set kind of user request in request-based RMA operation correctly.
    
    Here we should set the kind of user request in request-based RMA
    operation to MPID_WIN_REQUEST, so that in MPI_Wait function, after
    request is completed, it will decrement the ref counter of the
    request and free it.
    
    Originally the kind is set to MPID_REQUEST_SEND, which goes into
    the path of MPID_REQUEST_SEND in MPI_Wait and causes segment fault
    when --enable-debuginfo is set in configure.
    
    Signed-off-by: Pavan Balaji <balaji at anl.gov>

diff --git a/src/mpid/ch3/src/ch3u_rma_reqops.c b/src/mpid/ch3/src/ch3u_rma_reqops.c
index 68a7d9c..ae16cf5 100644
--- a/src/mpid/ch3/src/ch3u_rma_reqops.c
+++ b/src/mpid/ch3/src/ch3u_rma_reqops.c
@@ -39,7 +39,7 @@ int MPIDI_Rput(const void *origin_addr, int origin_count,
     /* Create user request, initially cc=1, ref=1 */
     ureq = MPID_Request_create();
     MPIU_ERR_CHKANDJUMP(ureq == NULL, mpi_errno, MPI_ERR_OTHER, "**nomemreq");
-    ureq->kind = MPID_REQUEST_SEND;
+    ureq->kind = MPID_WIN_REQUEST;
 
     /* Enqueue or perform the RMA operation */
     if (target_rank != MPI_PROC_NULL && data_sz != 0) {
@@ -101,7 +101,7 @@ int MPIDI_Rget(void *origin_addr, int origin_count,
     /* Create user request, initially cc=1, ref=1 */
     ureq = MPID_Request_create();
     MPIU_ERR_CHKANDJUMP(ureq == NULL, mpi_errno, MPI_ERR_OTHER, "**nomemreq");
-    ureq->kind = MPID_REQUEST_SEND;
+    ureq->kind = MPID_WIN_REQUEST;
 
     /* Enqueue or perform the RMA operation */
     if (target_rank != MPI_PROC_NULL && data_sz != 0) {
@@ -161,7 +161,7 @@ int MPIDI_Raccumulate(const void *origin_addr, int origin_count,
     /* Create user request, initially cc=1, ref=1 */
     ureq = MPID_Request_create();
     MPIU_ERR_CHKANDJUMP(ureq == NULL, mpi_errno, MPI_ERR_OTHER, "**nomemreq");
-    ureq->kind = MPID_REQUEST_SEND;
+    ureq->kind = MPID_WIN_REQUEST;
 
     MPIDI_Datatype_get_info(origin_count, origin_datatype, dt_contig, data_sz, dtp, dt_true_lb);
 
@@ -224,7 +224,7 @@ int MPIDI_Rget_accumulate(const void *origin_addr, int origin_count,
     /* Create user request, initially cc=1, ref=1 */
     ureq = MPID_Request_create();
     MPIU_ERR_CHKANDJUMP(ureq == NULL, mpi_errno, MPI_ERR_OTHER, "**nomemreq");
-    ureq->kind = MPID_REQUEST_SEND;
+    ureq->kind = MPID_WIN_REQUEST;
 
     /* Note that GACC is only a no-op if no data goes in both directions */
     MPIDI_Datatype_get_info(origin_count, origin_datatype, dt_contig, data_sz, dtp, dt_true_lb);

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

Summary of changes:
 src/mpid/ch3/src/ch3u_rma_reqops.c |    8 ++++----
 test/mpi/rma/testlist.in           |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
MPICH primary repository