* Move the sys_info initialization into ompi_init(), since it should really

be there for any OMPI process.

This commit was SVN r2000.

src/mpi/runtime/ompi_mpi_init.c

@@ -66,11 +66,6 @@ int ompi_mpi_init(int argc, char **argv, int requested, int *provided)
         return ret;
     }
 
-    /* Get the local system information and populate the
-       ompi_system_info structure */
-
-    ompi_sys_info();
-
     /* Become a OMPI process */
 
     if (OMPI_SUCCESS != (ret = ompi_init(argc, argv))) {

src/runtime/ompi_init.c

@@ -10,6 +10,7 @@
 #include "runtime/runtime.h"
 #include "util/output.h"
 #include "util/malloc.h"
+#include "util/sys_info.h"
 #include "threads/mutex.h"
 #include "event/event.h"
 
@@ -106,11 +107,10 @@ int ompi_init(int argc, char *argv[])
 
   ompi_malloc_init();
 
-  /* Other things that we'll probably need:
+  /* Get the local system information and populate the
+     ompi_system_info structure */
 
-     - session directory setup
+  ompi_sys_info();
-     - ...?
-  */
 
   /* All done */
 

src/tools/openmpi/openmpi.c

@@ -47,9 +47,6 @@ int main(int argc, char **argv)
 
     tmp = universe_name = remote_host = remote_uid = NULL;
 
-    /* get info on type of system we are on */
-    ompi_sys_info();
-
     /* setup to read common command line options that span all Open MPI programs */
     ompi_common_cmd_line_init(argc, argv);
 

src/util/sys_info.h

@@ -53,13 +53,18 @@ typedef struct ompi_sys_info_t ompi_sys_info_t;
 
 extern ompi_sys_info_t ompi_system_info;
 
+
 /**
- * Discover and record a wide range of information about the system upon which
+ * \internal
- * this code is executing. ompi_sys_info populates a global variable with information about the system
+ *
- * upon which the process is executing.
+ * Discover and record a wide range of information about the system
+ * upon which this code is executing. ompi_sys_info populates a global
+ * variable with information about the system upon which the process
+ * is executing.
+ *
+ * Called from \c ompi_init.
  *
  * @retval OMPI_SUCCESS If values are successfully determined.
  * @retval OMPI_ERROR If the system does not provide the requested information.
  */
-
 int ompi_sys_info(void);