[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1b1-48-g60165ef

[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  60165ef2d70dc83586201408add87bdd5f86aa0b (commit)
       via  38282c95c597f9fe60ef7cb79a0cf2cc73f4fa28 (commit)
      from  885bf732074b5fab25cb0c14c9ce25e62b8f8d82 (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/60165ef2d70dc83586201408add87bdd5f86aa0b

commit 60165ef2d70dc83586201408add87bdd5f86aa0b
Author: Xin Zhao <xinzhao3 at illinois.edu>
Date:   Tue Sep 24 23:22:36 2013 -0500

    set disp_unit in win_shared_query.
    
    Signed-off-by: Pavan Balaji <balaji at mcs.anl.gov>

diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_rma_shm.c b/src/mpid/ch3/channels/nemesis/src/ch3_rma_shm.c
index 6045f54..bfd70b3 100644
--- a/src/mpid/ch3/channels/nemesis/src/ch3_rma_shm.c
+++ b/src/mpid/ch3/channels/nemesis/src/ch3_rma_shm.c
@@ -29,11 +29,13 @@ int MPIDI_CH3_SHM_Win_shared_query(MPID_Win *win_ptr, int target_rank, MPI_Aint
 
         /* Default, if no processes have size > 0. */
         *size               = 0;
+        *disp_unit          = 0;
         *((void**) baseptr) = NULL;
 
         for (i = 0; i < comm_size; i++) {
             if (win_ptr->sizes[i] > 0) {
                 *size               = win_ptr->sizes[i];
+                *disp_unit          = win_ptr->disp_units[i];
                 *((void**) baseptr) = win_ptr->shm_base_addrs[i];
                 break;
             }
@@ -41,6 +43,7 @@ int MPIDI_CH3_SHM_Win_shared_query(MPID_Win *win_ptr, int target_rank, MPI_Aint
 
     } else {
         *size               = win_ptr->sizes[target_rank];
+        *disp_unit          = win_ptr->disp_units[target_rank];
         *((void**) baseptr) = win_ptr->shm_base_addrs[target_rank];
     }
 

http://git.mpich.org/mpich.git/commitdiff/38282c95c597f9fe60ef7cb79a0cf2cc73f4fa28

commit 38282c95c597f9fe60ef7cb79a0cf2cc73f4fa28
Author: Pavan Balaji <balaji at mcs.anl.gov>
Date:   Tue Aug 27 19:05:25 2013 -0500

    Improve the win_shared test to check for more errors.
    
    As reported by Michael Raymond @ SGI, we were never checking if the
    disp_unit was set correctly.  This patch improves the error checks.
    
    Signed-off-by: Xin Zhao <xinzhao3 at illinois.edu>

diff --git a/test/mpi/rma/win_shared.c b/test/mpi/rma/win_shared.c
index b4e1f6c..03e35de 100644
--- a/test/mpi/rma/win_shared.c
+++ b/test/mpi/rma/win_shared.c
@@ -42,15 +42,19 @@ int main(int argc, char **argv) {
     /* Locate absolute base */
     MPI_Win_shared_query(shm_win, MPI_PROC_NULL, &size, &disp_unit, &base); 
 
+    /* make sure the query returned the right values */
+    if (disp_unit != sizeof(int))
+        errors++;
+    if (size != ELEM_PER_PROC * sizeof(int))
+        errors++;
+    if ((shm_rank == 0) && (base != my_base))
+        errors++;
+    if (shm_rank && (base == my_base))
+        errors++;
+
     if (verbose) printf("%d -- size = %d baseptr = %p my_baseptr = %p\n", shm_rank, 
                         (int) size, (void*) base, (void*) my_base);
 
-    assert(size == ELEM_PER_PROC * sizeof(int));
-    if (shm_rank == 0)
-        assert(base == my_base);
-    else
-        assert(base != my_base);
-
     MPI_Win_lock_all(MPI_MODE_NOCHECK, shm_win);
 
     /* Write to all my data */

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

Summary of changes:
 src/mpid/ch3/channels/nemesis/src/ch3_rma_shm.c |    3 +++
 test/mpi/rma/win_shared.c                       |   16 ++++++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
MPICH primary repository