From 20bbe9ee2b3c5a7971db60b102e09d03ac186fe0 Mon Sep 17 00:00:00 2001 From: Josh Hursey Date: Fri, 13 Jul 2007 18:15:36 +0000 Subject: [PATCH] Bring back the AMCA fix for the orted from r15219. This fixes C/R support for the trunk which regressed in r15390 due to the RTE changes. This commit was SVN r15409. The following SVN revision numbers were found above: r15219 --> open-mpi/ompi@f88aa6c273d1259b15fb80f95a1154d400601658 r15390 --> open-mpi/ompi@bd65f8ba887cfa93295cf8a2f17ea7ecb04ac90b --- orte/orted/orted_main.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/orte/orted/orted_main.c b/orte/orted/orted_main.c index b5b1e937be..dcf76c3ae5 100644 --- a/orte/orted/orted_main.c +++ b/orte/orted/orted_main.c @@ -227,12 +227,6 @@ int orte_daemon(int argc, char *argv[]) /* initialize the singleton died pipe to an illegal value so we can detect it was set */ orted_globals.singleton_died_pipe = -1; - /* Ensure that enough of OPAL is setup for us to be able to run */ - if (OPAL_SUCCESS != opal_init_util()) { - fprintf(stderr, "OPAL failed to initialize -- orted aborting\n"); - exit(1); - } - /* save the environment for use when launching application processes */ orte_launch_environ = opal_argv_copy(environ); @@ -256,7 +250,12 @@ int orte_daemon(int argc, char *argv[]) */ mca_base_cmd_line_process_args(cmd_line, &environ, &environ); - + /* Ensure that enough of OPAL is setup for us to be able to run */ + if (OPAL_SUCCESS != opal_init_util()) { + fprintf(stderr, "OPAL failed to initialize -- orted aborting\n"); + exit(1); + } + /* register and process the orte params */ if (ORTE_SUCCESS != (ret = orte_register_params(ORTE_INFRASTRUCTURE))) { return ret;