[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.0.4-349-g61d01c5

[mysql vizuser]

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  61d01c53d9721051dc7bdd5647251257b95eca1c (commit)
       via  f18b91f0d3a6f507f70752e93bf8e5ee325c6e92 (commit)
       via  1a8ff2bfff7b3cef49d06cd16167926ede418914 (commit)
      from  8cf54f1978db324e5ed6de79eaf74b46a70b70dd (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/61d01c53d9721051dc7bdd5647251257b95eca1c

commit 61d01c53d9721051dc7bdd5647251257b95eca1c
Author: Xin Zhao <xinzhao3 at illinois.edu>
Date:   Thu Jul 18 11:27:17 2013 -0500

    fix bug:check info value of "alloc_shared_noncontig".
    
    Signed-off-by: Pavan Balaji <balaji at mcs.anl.gov>

diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c b/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c
index d5e6b1e..138b473 100644
--- a/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c
+++ b/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c
@@ -60,8 +60,13 @@ static int MPIDI_CH3I_Win_allocate_shared(MPI_Aint size, int disp_unit, MPID_Inf
 
     /* Check if we are allowed to allocate space non-contiguously */
     if (info != NULL) {
-        MPIR_Info_get_impl(info, "alloc_shared_noncontig", 0, NULL,
-                           &(*win_ptr)->info_args.alloc_shared_noncontig);
+        int alloc_shared_nctg_flag = 0;
+        char alloc_shared_nctg_value[MPI_MAX_INFO_VAL+1];
+        MPIR_Info_get_impl(info, "alloc_shared_noncontig", MPI_MAX_INFO_VAL,
+                           alloc_shared_nctg_value, &alloc_shared_nctg_flag);
+        if ((alloc_shared_nctg_flag == 1) && (!strncmp(alloc_shared_nctg_value, "true",
+                                                       strlen("true"))))
+            (*win_ptr)->info_args.alloc_shared_noncontig = 1;
     }
 
     /* see if we can allocate all windows contiguously */

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

commit f18b91f0d3a6f507f70752e93bf8e5ee325c6e92
Author: Xin Zhao <xinzhao3 at illinois.edu>
Date:   Thu Jul 18 10:30:04 2013 -0500

    bug of deleting redundant call to get win_ptr.
    
    Signed-off-by: Pavan Balaji <balaji at mcs.anl.gov>

diff --git a/src/mpid/ch3/src/ch3u_rma_sync.c b/src/mpid/ch3/src/ch3u_rma_sync.c
index b2c6989..f05a5bb 100644
--- a/src/mpid/ch3/src/ch3u_rma_sync.c
+++ b/src/mpid/ch3/src/ch3u_rma_sync.c
@@ -3913,8 +3913,6 @@ int MPIDI_CH3_PktHandler_CAS( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt,
     /* There are additional steps to take if this is a passive 
        target RMA or the last operation from the source */
 
-    MPID_Win_get_ptr(cas_pkt->target_win_handle, win_ptr);
-
     mpi_errno = MPIDI_CH3_Finish_rma_op_target(NULL, win_ptr, TRUE,
                                                cas_pkt->flags,
                                                MPI_WIN_NULL);

http://git.mpich.org/mpich.git/commitdiff/1a8ff2bfff7b3cef49d06cd16167926ede418914

commit 1a8ff2bfff7b3cef49d06cd16167926ede418914
Author: Xin Zhao <xinzhao3 at illinois.edu>
Date:   Thu Jul 18 10:26:35 2013 -0500

    bug on MPIU_INSTR_DURATION_END(rmapkt_acc_immed_op).
    
    Signed-off-by: Pavan Balaji <balaji at mcs.anl.gov>

diff --git a/src/mpid/ch3/src/ch3u_rma_sync.c b/src/mpid/ch3/src/ch3u_rma_sync.c
index 3c73497..b2c6989 100644
--- a/src/mpid/ch3/src/ch3u_rma_sync.c
+++ b/src/mpid/ch3/src/ch3u_rma_sync.c
@@ -3829,8 +3829,8 @@ int MPIDI_CH3_PktHandler_Accumulate_Immed( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt,
 		MPIU_ERR_SETANDJUMP1(mpi_errno,MPI_ERR_OP, "**opnotpredefined",
 				     "**opnotpredefined %d", accum_pkt->op );
 	    }
-	MPIU_INSTR_DURATION_END(rmapkt_acc_immed_op);
 	}
+	MPIU_INSTR_DURATION_END(rmapkt_acc_immed_op);
 	
 
 	/* There are additional steps to take if this is a passive 

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

Summary of changes:
 src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c |    9 +++++++--
 src/mpid/ch3/src/ch3u_rma_sync.c                |    4 +---
 2 files changed, 8 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
MPICH primary repository