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

[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  c75f7cda9b017cadcfcbc5f14637ab08aa2ae748 (commit)
      from  758e1b2b63bd8af1b2ebec29abec07e143f8a274 (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/c75f7cda9b017cadcfcbc5f14637ab08aa2ae748

commit c75f7cda9b017cadcfcbc5f14637ab08aa2ae748
Author: Sangmin Seo <sseo at anl.gov>
Date:   Thu Mar 5 13:35:09 2015 -0600

    Do not reference a CH3 variable in ROMIO glue.
    
    Although MPIDI_CH3I_progress_blocked is a variable only used in CH3,
    it was referenced in the ROMIO glue code. This caused a build problem
    when pamid is used as a device. This patch removed the reference to
    MPIDI_CH3I_progress_blocked, but it degrades the efficiency of
    MPIR_Ext_cs_yield_allfunc_if_progress_blocked() since we do not have
    a way to check if the progress engine is blocked for now (related to
    ticket #2202). For a better solution for ticket #2202, we need to
    fix a wait function of the extended generalized request.
    
    Fixes #2242
    
    Signed-off-by: Rob Latham <robl at mcs.anl.gov>

diff --git a/src/glue/romio/glue_romio.c b/src/glue/romio/glue_romio.c
index 0f376c5..9b64992 100644
--- a/src/glue/romio/glue_romio.c
+++ b/src/glue/romio/glue_romio.c
@@ -52,20 +52,10 @@ void MPIR_Ext_cs_exit_allfunc(void)
 /* This routine is for a thread to yield control when the thread is waiting for
  * the completion of communication inside a ROMIO routine but the progress
  * engine is blocked by another thread. */
-#ifdef MPICH_IS_THREADED
-extern volatile int MPIDI_CH3I_progress_blocked;
-#endif
 void MPIR_Ext_cs_yield_allfunc_if_progress_blocked(void)
 {
-#ifdef MPICH_IS_THREADED
-    MPIU_THREAD_CHECK_BEGIN;
-    {
-        if (MPIDI_CH3I_progress_blocked == TRUE) {
-            MPIU_THREAD_CS_YIELD(ALLFUNC,);
-        }
-    }
-    MPIU_THREAD_CHECK_END;
-#endif
+    /* TODO: check whether the progress engine is blocked */
+    MPIU_THREAD_CS_YIELD(ALLFUNC,);
 }
 
 /* will consider MPI_DATATYPE_NULL to be an error */

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

Summary of changes:
 src/glue/romio/glue_romio.c |   14 ++------------
 1 files changed, 2 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
MPICH primary repository