Remove a couple more stale fields

This commit was SVN r24645.

orte/mca/errmgr/hnp/errmgr_hnp.c

@@ -1443,17 +1443,11 @@ static void check_job_complete(orte_job_t *jdata)
     ORTE_UPDATE_EXIT_STATUS(0);
     /* provide a notifier message if that framework is active - ignored otherwise */
     if (NULL != (job = (orte_job_t*)opal_pointer_array_get_item(orte_job_data, 1))) {
-        if (NULL == job->name) {
-            job->name = strdup(orte_process_info.nodename);
-        }
-        if (NULL == job->instance) {
-            asprintf(&job->instance, "%d", orte_process_info.pid);
-        }
         if (0 == orte_exit_status) {
-            asprintf(&msg, "Job %s:%s complete", job->name, job->instance);
+            asprintf(&msg, "Job %s complete", ORTE_JOBID_PRINT(job->jobid));
             orte_notifier.log(ORTE_NOTIFIER_INFO, 0, msg);
         } else {
-            asprintf(&msg, "Job %s:%s terminated abnormally", job->name, job->instance);
+            asprintf(&msg, "Job %s terminated abnormally", ORTE_JOBID_PRINT(job->jobid));
             orte_notifier.log(ORTE_NOTIFIER_ALERT, orte_exit_status, msg);
         }
         free(msg);

orte/runtime/data_type_support/orte_dt_packing_fns.c

@@ -156,20 +156,6 @@ int orte_dt_pack_job(opal_buffer_t *buffer, const void *src,
     jobs = (orte_job_t**) src;
 
     for (i=0; i < num_vals; i++) {
-        /* pack the name of this job - may be null */
-        if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
-                         (void*)(&(jobs[i]->name)), 1, OPAL_STRING))) {
-            ORTE_ERROR_LOG(rc);
-            return rc;
-        }
-
-        /* pack the name of the instance of the job - may be null */
-        if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
-                         (void*)(&(jobs[i]->instance)), 1, OPAL_STRING))) {
-            ORTE_ERROR_LOG(rc);
-            return rc;
-        }
-
         /* pack the jobid */
         if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
                         (void*)(&(jobs[i]->jobid)), 1, ORTE_JOBID))) {

orte/runtime/data_type_support/orte_dt_print_fns.c

@@ -218,10 +218,8 @@ int orte_dt_print_job(char **output, char *prefix, orte_job_t *src, opal_data_ty
         asprintf(&pfx2, "%s", prefix);
     }
 
-    asprintf(&tmp, "\n%sData for job: %s\tName: %s\tInstance: %s\tRecovery: %s(%s)\n%s\tNum apps: %ld\tControls: %0x\tStdin target: %s\tState: %s\tAbort: %s", pfx2,
+    asprintf(&tmp, "\n%sData for job: %s\tRecovery: %s(%s)\n%s\tNum apps: %ld\tControls: %0x\tStdin target: %s\tState: %s\tAbort: %s", pfx2,
              ORTE_JOBID_PRINT(src->jobid),
-             (NULL != src->name) ? src->name : "NULL",
-             (NULL != src->instance) ? src->instance : "NULL",
              (src->enable_recovery) ? "ENABLED" : "DISABLED",
              (src->recovery_defined) ? "DEFINED" : "DEFAULT",
              pfx2,

orte/runtime/data_type_support/orte_dt_unpacking_fns.c

@@ -166,22 +166,6 @@ int orte_dt_unpack_job(opal_buffer_t *buffer, void *dest,
             return ORTE_ERR_OUT_OF_RESOURCE;
         }
 
-        /* unpack the name of this job - may be null */
-        n = 1;
-        if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer,
-                                &(jobs[i]->name), &n, OPAL_STRING))) {
-            ORTE_ERROR_LOG(rc);
-            return rc;
-        }
-
-        /* unpack the instance name of this job - may be null */
-        n = 1;
-        if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer,
-                                &(jobs[i]->instance), &n, OPAL_STRING))) {
-            ORTE_ERROR_LOG(rc);
-            return rc;
-        }
-
         /* unpack the jobid */
         n = 1;
         if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer,

orte/runtime/orte_globals.c

@@ -652,8 +652,6 @@ OBJ_CLASS_INSTANCE(orte_app_context_t,
 
 static void orte_job_construct(orte_job_t* job)
 {
-    job->name = NULL;
-    job->instance = NULL;
     job->jobid = ORTE_JOBID_INVALID;
     job->apps = OBJ_NEW(opal_pointer_array_t);
     opal_pointer_array_init(job->apps,
@@ -719,14 +717,6 @@ static void orte_job_destruct(orte_job_t* job)
                     ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(job->jobid));
     }
     
-    if (NULL != job->name) {
-        free(job->name);
-    }
-
-    if (NULL != job->instance) {
-        free(job->instance);
-    }
-
     for (n=0; n < job->apps->size; n++) {
         if (NULL == (app = (orte_app_context_t*)opal_pointer_array_get_item(job->apps, n))) {
             continue;

orte/runtime/orte_globals.h

@@ -364,10 +364,6 @@ typedef uint16_t orte_job_controls_t;
 typedef struct {
     /** Base object so this can be put on a list */
     opal_list_item_t super;
-    /* a name for this job */
-    char *name;
-    /* a name for this instance of the job */
-    char *instance;
     /* jobid for this job */
     orte_jobid_t jobid;
     /* app_context array for this job */