- Moved Brian's Big Comment to src/lam/runtime/lam_rte_init.c

- Check user-requested thread level
- Call back-end init function

This commit was SVN r417.

src/mpi/interface/c/init.c

@@ -4,73 +4,38 @@
 
 #include "lam_config.h"
 
+#include <stdlib.h>
+
 #include "mpi.h"
 #include "mpi/interface/c/bindings.h"
+#include "mpi/runtime/runtime.h"
 
 #if LAM_HAVE_WEAK_SYMBOLS && LAM_PROFILING_DEFINES
 #pragma weak MPI_Init = PMPI_Init
 #endif
 
 
-int
-MPI_Init(int *argc, char ***argv)
+int MPI_Init(int *argc, char ***argv)
 {
-#if 0
-  /*
-   * BWB - this comment should be removed at some point in the very near future
-   *
-   * This #if 0'ed out block of code is a rough approximation of what
-   * should happen to get this parallel job bootstrapped and ready to
-   * run.  There are probably some bugs in the OOB and PCM interfaces
-   * that are going to make this really interesting (sorry :( ), but I
-   * think it should work once the MPI modules are written...
-   */
+  int provided;
+  char *env;
+  int requested = MPI_THREAD_SINGLE;
 
-  /* Do the "right" MCA query and init functions to fire up the
-   * run-time environment interfaces.  I'm not exactly sure what these
-   * calls will be (since they are in the base functions, right?), but
-   * do them here 
-   *
-   * Order is:
-   *   1) PCM
-   *   2) OOB
-   *   3) Registery
-   *
-   * Don't forget to close down in the reverse order at end of the day
-   * - even the silly COFS implementations are going to leak resources
-   * like crazy if you don't.
-   *
-   * The OOB system may not actually be usable until the end of
-   * pcm_proc_startup, but must be initialized here.
-   */
+  /* check for environment overrides for requested thread level.  If
+     there is, check to see that it is a valid/supported thread level.
+     If not, default to MPI_THREAD_SINGLE. */
 
-  /* Do the client side of the rendezvous with our launcher (or
-   * whatever is needed for our RTE to figure out how to talk with our
-   * peers and all that. 
-   */
-  ret = mca_pcm.pcm_proc_startup();
-  if (ret != MPI_SUCCESS) printf("oops!\n");
+  if (NULL != (env = getenv("LAM_MPI_THREAD_LEVEL"))) {
+    requested = atoi(env);
+    if (requested < MPI_THREAD_SINGLE || requested > MPI_THREAD_MULTIPLE) {
+      /* JMS call the show_help() interface */
+      exit(1);
+    }
+  } 
+    
+  /* Call the back-end initialization function (we need to put as
+     little in this function as possible so that if it's profiled, we
+     don't lose anything) */
 
-  /* at this point, we can use the OOB interface directly if we really
-     need to, but is a bit tricky since we don't have a peers list
-     yet. */
-  mca_pcm.get_peers(&procs, &nprocs);
-
-  /* get a pointer to me */
-  my_proc = mca_pcm.get_me();
-
-  /* get my parents.  need to think about how to do this - i don't
-   *  think this is what we want at all...  We can probably ignore
-   *  this for a little while since we don't have a run time
-   *  environment tha supports spawn just yet, but something to
-   *  remember...
-   */
-  mca_pcm.get_parent(&pprocs, &npprocs);
-
-  /* we should have enough information by now to start running the PML
-   * and PTL interfaces, right? 
-   */
-#endif
-
-  return MPI_SUCCESS;
+  return lam_mpi_init(*argc, *argv, requested, &provided);
 }