Changeset 5694

Timestamp:

11/04/09 17:45:41 (3 weeks ago)

Author:

balaji

Message:

Simple version of the asynchronous progress code, where we have a
thread waiting around for a request that only completes at
MPI_Finalize time. Fixes ticket #917.

Reviewed by goodell.

Location:

mpich2/trunk/src/mpi/init

Files:

• Makefile.sm (modified) (1 diff)
• async.c (added)
• finalize.c (modified) (3 diffs)
• init.c (modified) (3 diffs)
• initthread.c (modified) (2 diffs)
• mpi_init.h (modified) (1 diff)

mpich2/trunk/src/mpi/init/Makefile.sm

@@ -1 +1 @@
 mpi_sources = abort.c init.c initialized.c initthread.c \
- ismain.c finalize.c finalized.c querythread.c 
+ ismain.c finalize.c finalized.c querythread.c async.c
 HEADERS = mpi_init.h
 # Note that initinfo is only in the MPI library, not the profile library

mpich2/trunk/src/mpi/init/finalize.c

@@ -7 +7 @@
 
 #include "mpiimpl.h"
+#include "mpi_init.h"
 
 /* -- Begin Profiling Symbol Block for routine MPI_Finalize */
@@ -115 +116 @@
     static const char FCNAME[] = "MPI_Finalize";
     int mpi_errno = MPI_SUCCESS;
+    int rc;
 #if defined(HAVE_USLEEP) && defined(USE_COVERAGE)
     int rank=0;
@@ -129 +131 @@
     
     /* ... body of routine ... */
+
+    /* If the user requested for asynchronous progress, we need to
+     * shutdown the progress thread */
+    if (MPIR_async_thread_initialized) {
+        mpi_errno = MPIR_Finalize_async_thread();
+        if (mpi_errno) goto fn_fail;
+    }
     
 #if defined(HAVE_USLEEP) && defined(USE_COVERAGE)

mpich2/trunk/src/mpi/init/init.c

@@ -30 +30 @@
 /* Any internal routines can go here.  Make them static if possible */
 #endif
+
+int MPIR_async_thread_initialized = 0;
 
 #undef FUNCNAME
@@ -70 +72 @@
     int mpi_errno = MPI_SUCCESS;
     int rc;
-    int threadLevel;
+    int threadLevel, provided;
     MPIU_THREADPRIV_DECL;
     MPID_MPI_INIT_STATE_DECL(MPID_STATE_MPI_INIT);
@@ -141 +143 @@
     threadLevel = MPI_THREAD_SINGLE;
 #endif
-    
-    mpi_errno = MPIR_Init_thread( argc, argv, threadLevel, (int *)0 );
+
+    /* If the user requested for asynchronous progress, request for
+     * THREAD_MULTIPLE. */
+    rc = 0;
+    MPIU_GetEnvBool("MPICH_ASYNC_PROGRESS", &rc);
+    if (rc)
+        threadLevel = MPI_THREAD_MULTIPLE;
+
+    mpi_errno = MPIR_Init_thread( argc, argv, threadLevel, &provided );
     if (mpi_errno != MPI_SUCCESS) goto fn_fail;
+
+    if (provided == MPI_THREAD_MULTIPLE) {
+        mpi_errno = MPIR_Init_async_thread();
+        if (mpi_errno) goto fn_fail;
+
+        MPIR_async_thread_initialized = 1;
+    }
 
     /* ... end of body of routine ... */

mpich2/trunk/src/mpi/init/initthread.c

@@ -503 +503 @@
     static const char FCNAME[] = "MPI_Init_thread";
     int mpi_errno = MPI_SUCCESS;
-    int rc;
+    int rc, reqd = required;
     MPIU_THREADPRIV_DECL;
     MPID_MPI_INIT_STATE_DECL(MPID_STATE_MPI_INIT_THREAD);
@@ -554 +554 @@
 
     /* ... body of routine ... */
-    
-    mpi_errno = MPIR_Init_thread( argc, argv, required, provided );
-    if (mpi_errno != MPI_SUCCESS) goto fn_fail; 
+
+    /* If the user requested for asynchronous progress, request for
+     * THREAD_MULTIPLE. */
+    rc = 0;
+    MPIU_GetEnvBool("MPICH_ASYNC_PROGRESS", &rc);
+    if (rc)
+        reqd = MPI_THREAD_MULTIPLE;
+
+    mpi_errno = MPIR_Init_thread( argc, argv, reqd, provided );
+    if (mpi_errno != MPI_SUCCESS) goto fn_fail;
+
+    if (rc && *provided == MPI_THREAD_MULTIPLE) {
+        mpi_errno = MPIR_Init_async_thread();
+        if (mpi_errno) goto fn_fail;
+
+        MPIR_async_thread_initialized = 1;
+    }
 
     /* ... end of body of routine ... */

mpich2/trunk/src/mpi/init/mpi_init.h

@@ -4 +4 @@
  *      See COPYRIGHT in top-level directory.
  */
+
 /* Definitions local to src/mpi/init only */
 int MPIR_Init_thread(int *, char ***, int, int *);
+int MPIR_Init_async_thread(void);
+int MPIR_Finalize_async_thread(void);
+
+extern int MPIR_async_thread_initialized;