* Move the MPI runtime code from src/runtime to src/mpiruntime to make the

abstraction a little clearer.
* Include mpiruntime.h instead of runtime.h in errhandler.h since only the
  MPI stuff was needed - speeds compile times greatly when working on the
  RTE...

This commit was SVN r1948.

configure.ac

@@ -854,6 +854,7 @@ AC_CONFIG_FILES([
     src/os/linux/ia64/Makefile
     src/os/linux/x86_64/Makefile
     src/os/tru64/Makefile
+    src/mpiruntime/Makefile
     src/runtime/Makefile
     src/threads/Makefile
     src/util/Makefile

src/Makefile.am

@@ -19,6 +19,7 @@ SUBDIRS = \
         class \
         mca \
         mpi \
+	mpiruntime \
         op \
         os \
         proc \
@@ -45,6 +46,7 @@ libmpi_la_LIBADD = \
         class/liblfc.la \
         mca/libmca.la \
         mpi/libmpi_bindings.la \
+	mpiruntime/libmpiruntime.la \
         op/libop.la \
         proc/libproc.la \
         request/librequest.la \

src/errhandler/errhandler.h

@@ -11,7 +11,7 @@
 #include "mpi.h"
 #include "class/ompi_object.h"
 #include "class/ompi_pointer_array.h"
-#include "runtime/runtime.h"
+#include "mpiruntime/mpiruntime.h"
 #include "errhandler/errhandler_predefined.h"
 
 /*

src/mpiruntime/Makefile.am

@@ -0,0 +1,29 @@
+# -*- makefile -*-
+#
+# $HEADER$
+#
+
+include $(top_srcdir)/config/Makefile.options
+
+AM_CPPFLAGS = -I$(top_builddir)/src/event
+
+noinst_LTLIBRARIES = libmpiruntime.la
+
+# Source code files
+
+headers = \
+	mpiruntime.h
+
+libmpiruntime_la_SOURCES = \
+	$(headers) \
+        ompi_mpi_init.c \
+        ompi_mpi_finalize.c
+
+# Conditionally install the header files
+
+if WANT_INSTALL_HEADERS
+ompidir = $(includedir)/openmpi/mpiruntime
+ompi_HEADERS = $(headers)
+else
+ompidir = $(includedir)
+endif

src/mpiruntime/mpiruntime.h

@@ -0,0 +1,55 @@
+/*
+ * $HEADER$
+ */
+
+/**
+ * @file
+ *
+ * Interface into the MPI portion of the Open MPI Run Time Environment
+ */
+
+#ifndef OMPI_MPIRUNTIME_H
+#define OMPI_MPIRUNTIME_H
+
+#include "ompi_config.h"
+
+/*
+ * Global variables and symbols for the MPI layer
+ */
+
+extern bool ompi_mpi_initialized;
+extern bool ompi_mpi_finalized;
+extern bool ompi_mpi_param_check;
+
+extern bool ompi_mpi_thread_multiple;
+extern int ompi_mpi_thread_requested;
+extern int ompi_mpi_thread_provided;
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+  /**
+   * Initialize the Open MPI MPI environment
+   *
+   * Intialize all support code needed for MPI applications.  This
+   * function should only be called by MPI applications (including
+   * singletons).  It should only be called after both \code
+   * ompi_init() and \code ompi_rte_init() have been called.
+   */
+  int ompi_mpi_init(int argc, char **argv, int requested, int *provided);
+
+  /**
+   * Finalize the Open MPI MPI environment
+   *
+   * Should be called after all MPI functionality is complete (usually
+   * during MPI_FINALIZE) and before \c ompi_rte_finalize().
+   */
+  int ompi_mpi_finalize(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* OMPI_MPIRUNTIME_H */

src/runtime/Makefile.am

@@ -24,8 +24,6 @@ libruntime_la_SOURCES = \
         ompi_init.c \
         universe_connect.c \
         universe_init.c \
-        ompi_mpi_init.c \
-        ompi_mpi_finalize.c \
 	ompi_progress.c \
         ompi_rte_finalize.c \
         ompi_rte_init.c

src/runtime/runtime.h

@@ -13,19 +13,9 @@
 
 #include "ompi_config.h"
 
-
-/*
- * Global variables and symbols for the MPI layer
- */
-
-extern bool ompi_mpi_initialized;
-extern bool ompi_mpi_finalized;
-extern bool ompi_mpi_param_check;
-
-extern bool ompi_mpi_thread_multiple;
-extern int ompi_mpi_thread_requested;
-extern int ompi_mpi_thread_provided;
-
+/* For backwards compatibility.  If you only need MPI stuff, please include
+   mpiruntime/mpiruntime.h directly */
+#include "mpiruntime/mpiruntime.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -81,25 +71,6 @@ extern "C" {
    */
   int ompi_rte_finalize(void);
 
-
-  /**
-   * Initialize the Open MPI MPI environment
-   *
-   * Intialize all support code needed for MPI applications.  This
-   * function should only be called by MPI applications (including
-   * singletons).  It should only be called after both \code
-   * ompi_init() and \code ompi_rte_init() have been called.
-   */
-  int ompi_mpi_init(int argc, char **argv, int requested, int *provided);
-
-  /**
-   * Finalize the Open MPI MPI environment
-   *
-   * Should be called after all MPI functionality is complete (usually
-   * during MPI_FINALIZE) and before \c ompi_rte_finalize().
-   */
-  int ompi_mpi_finalize(void);
-
 #ifdef __cplusplus
 }
 #endif