* move around some of the ompi universe prep code in preparation for making

it work properly

This commit was SVN r2045.

src/runtime/Makefile.am

@@ -15,7 +15,6 @@ headers = \
 	runtime.h \
 	runtime_types.h \
         universe_connect.h \
-        universe_init.h \
 	ompi_progress.h
 
 libruntime_la_SOURCES = \
@@ -23,8 +22,7 @@ libruntime_la_SOURCES = \
         ompi_abort.c \
         ompi_finalize.c \
         ompi_init.c \
-        universe_connect.c \
-        universe_init.c \
+        ompi_universe.c \
 	ompi_progress.c \
         ompi_rte_finalize.c \
         ompi_rte_init.c \

src/runtime/ompi_universe.c

@@ -3,19 +3,20 @@
  *
  */
 
+#include "ompi_config.h"
+#include "include/constants.h"
+
 #include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <string.h>
 #include <sys/stat.h>
 
-#include "ompi_config.h"
-#include "include/constants.h"
-
 #include "util/os_path.h"
 #include "runtime/universe_connect.h"
 
-int ompi_universe_connect(char *tmpdir)
+int
+ompi_universe_connect(char *tmpdir)
 {
     char *uri, tmp[100], *oob_info_path;
     FILE *fp;

src/runtime/universe_init.c

@@ -1,37 +0,0 @@
-/*
- * $HEADER$
- *
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <libgen.h>
-#include <sys/stat.h>
-
-#include "ompi_config.h"
-#include "util/proc_info.h"
-#include "util/os_path.h"
-#include "util/session_dir.h"
-#include "runtime/universe_init.h"
-
-char *ompi_universe_init(char *tmpdir, char *user, char *universe)
-{
-    char *uri, *tmp, *oob_info_path;
-    FILE *fp;
-
-
-    if (OMPI_ERROR == ompi_session_dir(true, tmpdir, user, NULL, NULL, universe, "seed", NULL)) {
-	/* not found, and could not be created */
-	return(NULL);
-    }
-
-    oob_info_path = ompi_os_path(false, ompi_process_info.job_session_dir, "oob", NULL);
-    fp = fopen(oob_info_path, "w"); /* must be a new file - fail if one already exists */
-    if (NULL == fp) {
-	return(NULL);
-    }
-
-    uri = strdup("dummy_uri_for_seed_oob");
-    fclose(fp);
-    return(ompi_process_info.job_session_dir);
-}

src/runtime/universe_init.h

@@ -1,9 +0,0 @@
-/*
- * $HEADER$
- *
- */
-/** @file
- *
- */
-
-char *ompi_universe_init(char *tmpdir, char *user, char *universe);

src/tools/openmpi/openmpi.c

@@ -21,10 +21,13 @@ openmpi.c - main program for spawning persistent universe.
 
 #include "util/proc_info.h"
 #include "util/session_dir.h"
-#include "runtime/universe_init.h"
+/* #include "runtime/universe_init.h" */
 #include "runtime/universe_connect.h"
 #include "tools/openmpi/openmpi.h"
 
+/* BWB - fix me - removed to be cleaned up later... */
+#define ompi_universe_init(a)
+
 
 ompi_universe_t ompi_universe = {
     /* .name =              */    NULL,