Remove the memory debugging options. Fix what appears to be a typo in a help file.

This commit was SVN r12107.

orte/mca/pls/rsh/pls_rsh_component.c

@@ -109,8 +109,6 @@ orte_pls_rsh_component_t mca_pls_rsh_component = {
 int orte_pls_rsh_component_open(void)
 {
     int tmp;
-    char *ctmp;
-    char *valgrind = "valgrind --verbose --log-file=debug.out --num-callers=100 --tool=memcheck --trace-children=no --leak-check=full --show-reachable=yes";
     mca_base_component_t *c = &mca_pls_rsh_component.super.pls_version;
 
     /* initialize globals */
@@ -142,28 +140,12 @@ int orte_pls_rsh_component_open(void)
                                     false, false, false, &tmp);
         mca_pls_rsh_component.debug = OPAL_INT_TO_BOOL(tmp);
     }
-
-    /* see if we want to use malloc options to debug memory in the daemons */
-    mca_base_param_reg_int_name("orte_debug", "malloc",
-                                "Whether or not to use the malloc options to debug memory usage (Mac OS-X *only*)",
-                                false, false, (int)false, &tmp);
-    mca_pls_rsh_component.debug_malloc = OPAL_INT_TO_BOOL(tmp);
     
     mca_base_param_reg_string(c, "orted",
                               "The command name that the rsh pls component will invoke for the ORTE daemon",
                               false, false, "orted", 
                               &mca_pls_rsh_component.orted);
     
-    /* see if we want to use valgrind to debug memory in the daemons */
-    mca_base_param_reg_int_name("orte_debug", "valgrind",
-                                "Whether or not to launch the orteds under valgrind (Linux *only*)",
-                                false, false, (int)false, &tmp);
-    if (tmp) {
-        asprintf(&ctmp, "%s %s", valgrind, mca_pls_rsh_component.orted);
-        free(mca_pls_rsh_component.orted);
-        mca_pls_rsh_component.orted = ctmp;
-    }
-    
     mca_base_param_reg_int(c, "priority",
                            "Priority of the rsh pls component",
                            false, false, 10,

orte/mca/pls/rsh/pls_rsh_module.c

@@ -911,14 +911,6 @@ int orte_pls_rsh_launch(orte_jobid_t jobid)
             var = mca_base_param_environ_variable("seed",NULL,NULL);
             opal_setenv(var, "0", true, &env);
             
-            /* check for malloc debug options */
-            if (mca_pls_rsh_component.debug_malloc) {
-                opal_setenv("MallocPreScribble", "1", true, &env);
-                opal_setenv("MallocScribble", "1", true, &env);
-                opal_setenv("MallocCheckHeapAbort", "1", true, &env);
-                opal_setenv("MallocBadFreeAbort", "1", true, &env);
-            }
-            
             /* exec the daemon */
             if (mca_pls_rsh_component.debug) {
                 param = opal_argv_join(exec_argv, ' ');

orte/tools/orterun/help-orterun.txt

@@ -80,7 +80,7 @@ that was returned: %d.
  %s = %s
 in the environment. Returned value %d instead of ORTE_SUCCESS.
 [orterun:proc-aborted]
-%s noticed that job rank %lu with PID %lu on node "%s" exited on signal %d.
+%s noticed that job rank %lu with PID %lu on node %s exited on signal %d.
 [orterun:abnormal-exit]
 WARNING: %s encountered an abnormal exit.
 

orte/tools/orterun/orterun.c

@@ -245,14 +245,6 @@ opal_cmd_line_init_t cmd_line_init[] = {
       NULL, OPAL_CMD_LINE_TYPE_BOOL,
       "Enable debugging of any OpenRTE daemons used by this application, storing output in files" },
     
-    { "orte", "debug", "malloc", '\0', NULL, "debug-malloc", 0,
-        NULL, OPAL_CMD_LINE_TYPE_INT,
-        "Enable debugging of OpenRTE using malloc options (Mac OS-X *only*)" },
-    
-    { "orte", "debug", "valgrind", '\0', NULL, "debug-valgrind", 0,
-        NULL, OPAL_CMD_LINE_TYPE_INT,
-        "Enable debugging of OpenRTE using valgrind on daemons (Linux *only*)" },
-    
     { "orte", "no_daemonize", NULL, '\0', NULL, "no-daemonize", 0,
       NULL, OPAL_CMD_LINE_TYPE_BOOL,
       "Do not detach OpenRTE daemons used by this application" },
@@ -374,32 +366,6 @@ int orterun(int argc, char *argv[])
         }
         free(tmp);
     }
-    id = mca_base_param_reg_int_name("orte_debug", "malloc",
-                                     "Whether or not to use the malloc options to debug memory usage (Mac OS-X *only*)",
-                                     false, false, (int)false, &iparam);
-    if (iparam) {
-        char *tmp = mca_base_param_environ_variable("orte", "debug", "malloc");
-        if (ORTE_SUCCESS != (rc = opal_setenv(tmp, "1", true, &environ))) {
-            opal_show_help("help-orterun.txt", "orterun:environ", false,
-                           orterun_basename, tmp, "1", rc);
-            free(tmp);
-            return rc;
-        }
-        free(tmp);
-    }
-    id = mca_base_param_reg_int_name("orte_debug", "valgrind",
-                                     "Whether or not to launch the orteds under valgrind (Linux *only*)",
-                                     false, false, (int)false, &iparam);
-    if (iparam) {
-        char *tmp = mca_base_param_environ_variable("orte", "debug", "valgrind");
-        if (ORTE_SUCCESS != (rc = opal_setenv(tmp, "1", true, &environ))) {
-            opal_show_help("help-orterun.txt", "orterun:environ", false,
-                           orterun_basename, tmp, "1", rc);
-            free(tmp);
-            return rc;
-        }
-        free(tmp);
-    }
     id = mca_base_param_reg_int_name("orte", "debug",
                                      "Top-level ORTE debug switch",
                                      false, false, 0, &iparam);