Checkpoint start of setting up a head node process, fix a minor bug.

This commit was SVN r5609.

src/runtime/Makefile.am

@@ -39,6 +39,7 @@ libruntime_la_SOURCES = \
     orte_init_stage1.c \
     orte_init_stage2.c \
     orte_monitor.c \
+    orte_setup_hnp.c \
     orte_universe_exists.c \
     orte_restart.c \
     orte_wait.c

src/runtime/orte_setup_hnp.c

@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University.
+ *                         All rights reserved.
+ * Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
+ *                         All rights reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * $COPYRIGHT$
+ * 
+ * Additional copyrights may follow
+ * 
+ * $HEADER$
+ */
+
+/**
+ * @file
+ *
+ * Establish a Head Node Process on a cluster's front end
+ */
+
+
+#include "orte_config.h"
+
+#include <string.h>
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
+#include "include/orte_constants.h"
+#include "util/output.h"
+#include "util/univ_info.h"
+#include "util/sys_info.h"
+#include "util/proc_info.h"
+#include "util/os_path.h"
+#include "util/session_dir.h"
+#include "util/universe_setup_file_io.h"
+
+#include "mca/rml/rml.h"
+#include "mca/ns/ns.h"
+#include "mca/errmgr/errmgr.h"
+
+#include "runtime/runtime.h"
+
+
+int orte_setup_hnp(char *target_cluster)
+{
+    return ORTE_ERR_NOT_IMPLEMENTED;
+}

src/runtime/orte_universe_exists.c

@@ -72,7 +72,7 @@ int orte_universe_exists(orte_universe_t *univ)
         return ORTE_ERR_NOT_FOUND;
     }
 
-	if (OMPI_SUCCESS != (ret = orte_read_universe_setup_file(contact_file, univ))) {
+	if (ORTE_SUCCESS != (ret = orte_read_universe_setup_file(contact_file, univ))) {
         /* NOTE: THIS IS AN ERROR - ERROR_LOG IT */
         ORTE_ERROR_LOG(ret);
         free(contact_file);

src/runtime/runtime.h

@@ -153,6 +153,11 @@ OMPI_DECLSPEC    int orte_universe_exists(orte_universe_t *univ);
      */
 OMPI_DECLSPEC   int ompi_rte_init_io(void);
 
+    /**
+     * Establish a Head Node Process on a cluster's front end
+     */
+OMPI_DECLSPEC   int orte_setup_hnp(char *target_cluster);
+
 #if defined(c_plusplus) || defined(__cplusplus)
 }
 #endif