Clean up a little bit.

Add an option for setting up the job name.

This commit was SVN r22053.

orte/mca/plm/ccp/plm_ccp.h

@@ -30,6 +30,7 @@ struct orte_plm_ccp_component_t {
     char **checked_paths;
     char *stdout_file;
     char *stderr_file;
+    char *job_name;
     bool timing;
 };
 typedef struct orte_plm_ccp_component_t orte_plm_ccp_component_t;

orte/mca/plm/ccp/plm_ccp_component.c

@@ -95,20 +95,36 @@ static int plm_ccp_open(void)
                            false, false, 75, &mca_plm_ccp_component.priority);
 
     mca_base_param_reg_int(comp, "want_path_check",
-                           "Whether the launching process should check for the plm_ccp_orted executable in the PATH before launching (the CCP API does not give an indication of failure; this is a somewhat-lame workaround; non-zero values enable this check)",
+                           "Whether the launching process should check for "
+                           "the plm_ccp_orted executable in the PATH before "
+                           "launching (the CCP API does not give an indication "
+                           "of failure; this is a somewhat-lame workaround; "
+                           "non-zero values enable this check)",
                            false, false, (int) true, &tmp);
     mca_plm_ccp_component.want_path_check = OPAL_INT_TO_BOOL(tmp);
 
     mca_base_param_reg_string(comp, "stdout_file",
-                              "Path and file name for stdout on cluster nodes. By default, stdout will be sent to Job Scheduler. If no path specified, the user home path will be used. UNC path will not work for this param. ",
-                              false, false, "",
+                              "Path and file name for stdout on cluster nodes. "
+                              "By default, stdout will be sent to Job Scheduler. "
+                              "If no path specified, the user home path will be used. "
+                              "UNC path will not work for this param. ",
+                              false, false, NULL,
                               &mca_plm_ccp_component.stdout_file);
     
     mca_base_param_reg_string(comp, "stderr_file",
-                              "Path and file name for stderr on cluster nodes. By default, stderr will be sent to Job Scheduler. If no path specified, the user home path will be used. UNC path will not work for this param. ",
-                              false, false, "",
+                              "Path and file name for stderr on cluster nodes. "
+                              "By default, stderr will be sent to Job Scheduler. "
+                              "If no path specified, the user home path will be used. "
+                              "UNC path will not work for this param. ",
+                              false, false, NULL,
                               &mca_plm_ccp_component.stderr_file);
 
+    mca_base_param_reg_string(comp, "job_name",
+                              "The job name for displaying in the scheduler. "
+                              "It is set to the application name by default.",
+                              false, false, NULL,
+                              &mca_plm_ccp_component.job_name);
+
     tmp = mca_base_param_reg_int_name("orte", "timing",
                                       "Request that critical timing loops be measured",
                                       false, false, 0, &value);

orte/mca/plm/ccp/plm_ccp_module.c

@@ -342,6 +342,12 @@ GETMAP:
         }
     }
 
+    if(NULL != mca_plm_ccp_component.job_name){
+        pJob->put_Name(_bstr_t(mca_plm_ccp_component.job_name));
+    } else {
+        pJob->put_Name(_bstr_t((*(*apps)).app));
+    }
+
     pJob->put_MinimumNumberOfProcessors(num_processors);
     if (FAILED(hr)) {
         OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output,