Fix ompi-server so it works with unity routed module - still not working with tree routing.

Cleanup debug flag so it activates debugging on the data server code itself

This commit was SVN r18080.

ompi/tools/ompi-server/ompi-server.c

@@ -85,10 +85,6 @@ opal_cmd_line_init_t ompi_server_cmd_line_opts[] = {
       &debug, OPAL_CMD_LINE_TYPE_BOOL,
         "Debug the Open MPI server" },
         
-    { "orte", "debug", NULL, '\0', NULL, "debug-devel", 0,
-      NULL, OPAL_CMD_LINE_TYPE_BOOL,
-      "Debug the OpenRTE" },
-
     { "orte", "no_daemonize", NULL, '\0', NULL, "no-daemonize", 0,
       &no_daemonize, OPAL_CMD_LINE_TYPE_BOOL,
       "Don't daemonize into the background" },
@@ -144,16 +140,17 @@ int main(int argc, char *argv[])
      */
     mca_base_cmd_line_process_args(cmd_line, &environ, &environ);
     
-    /* register and process the orte params */
-    if (ORTE_SUCCESS != (ret = orte_register_params())) {
-        return ret;
+    /* if debug is set, then set orte_debug_flag so that the data server
+     * code will output
+     */
+    if (debug) {
+        putenv("OMPI_MCA_orte_debug=1");
     }
-
+        
     /* detach from controlling terminal
      * otherwise, remain attached so output can get to us
      */
-    if(orte_debug_flag == false &&
-       debug == false &&
+    if(debug == false &&
        no_daemonize == false) {
         opal_daemon_init(NULL);
     }
@@ -200,7 +197,7 @@ int main(int argc, char *argv[])
             FILE *fp;
             fp = fopen(report_uri, "w");
             if (NULL == fp) {
-                fprintf(stderr, "ompi-server: failed to open designated file -- aborting\n");
+                fprintf(stderr, "ompi-server: failed to open designated file %s -- aborting\n", report_uri);
                 orte_finalize();
                 exit(1);
             }

orte/test/mpi/pubsub.c

@@ -22,7 +22,7 @@ int main(int argc, char* argv[])
     printf("Hello, World, I am %d of %d\n", rank, size);
     
     MPI_Info_create(&info);
-    MPI_Info_set(info, "ompi_global_scope", "false");
+    MPI_Info_set(info, "ompi_global_scope", "true");
     
     if (0 == rank) {
         MPI_Open_port(MPI_INFO_NULL, port);

orte/tools/orterun/orterun.c

@@ -177,7 +177,7 @@ static opal_cmd_line_init_t cmd_line_init[] = {
     /* uri of Open MPI server, or at least where to get it */
     { NULL, NULL, NULL, '\0', "ompi-server", "ompi-server", 1,
       &orterun_globals.ompi_server, OPAL_CMD_LINE_TYPE_STRING,
-      "Specify the URI of the Open MPI server, or the name of the file that contains that info" },
+      "Specify the URI of the Open MPI server, or the name of the file (specified as file:filename) that contains that info" },
     
     { "carto", "file", "path", '\0', "cf", "cartofile", 1,
       NULL, OPAL_CMD_LINE_TYPE_STRING,
@@ -1396,7 +1396,7 @@ static int create_app(int argc, char* argv[], orte_app_context_t **app_ptr,
     /* add the ompi-server, if provided */
     if (NULL != ompi_server) {
         bool found_serv = false;
-        asprintf(&param, "OMPI_MCA_dpm_orte_server=%s", ompi_server);
+        asprintf(&param, "OMPI_MCA_pubsub_orte_server=%s", ompi_server);
         /* this shouldn't exist, but if it does... */
         for (i=0; i < opal_argv_count(app->env); i++) {
             if (0 == strcmp(param, app->env[i])) {