use a consistent naming scheme for the SNAPSHOT attributes

This commit was SVN r32083.

orte/util/attr.c

@@ -147,10 +147,10 @@ const char *orte_attr_key_to_str(orte_attribute_key_t key)
         return "JOB-FILE-MAPS";
     case ORTE_JOB_CKPT_STATE:
         return "JOB-CKPT-STATE";
-    case ORTE_JOB_CKPT_SNAPSHOT_REF:
-        return "JOB-CKPT-SNAPSHOT-REF";
-    case ORTE_JOB_SNAP_LOC:
-        return "JOB-SNAP-LOCATION";
+    case ORTE_JOB_SNAPSHOT_REF:
+        return "JOB-SNAPSHOT-REF";
+    case ORTE_JOB_SNAPSHOT_LOC:
+        return "JOB-SNAPSHOT-LOC";
     case ORTE_JOB_SNAPC_INIT_BAR:
         return "JOB-SNAPC-INIT-BARRIER-ID";
     case ORTE_JOB_SNAPC_FINI_BAR:
@@ -214,10 +214,10 @@ const char *orte_attr_key_to_str(orte_attribute_key_t key)
         return "PROC-FAST-FAILS";
     case ORTE_PROC_CKPT_STATE:
         return "PROC-CKPT-STATE";
-    case ORTE_PROC_CKPT_SNAP_REF:
-        return "PROC-CKPT-SNAP-REF";
-    case ORTE_PROC_SNAP_LOC:
-        return "PROC-SNAP-LOC";
+    case ORTE_PROC_SNAPSHOT_REF:
+        return "PROC-SNAPHOT-REF";
+    case ORTE_PROC_SNAPSHOT_LOC:
+        return "PROC-SNAPSHOT-LOC";
     case ORTE_PROC_NODENAME:
         return "PROC-NODENAME";
     case ORTE_PROC_CGROUP:

orte/util/attr.h

@@ -91,8 +91,8 @@ typedef uint16_t orte_job_flags_t;
 #define ORTE_JOB_MAX_LAUNCH_MSG_RECVD   (ORTE_JOB_START_KEY + 3)     // timeval - max time for launch msg to be received
 #define ORTE_JOB_FILE_MAPS              (ORTE_JOB_START_KEY + 4)     // opal_buffer_t - file maps associates with this job
 #define ORTE_JOB_CKPT_STATE             (ORTE_JOB_START_KEY + 5)     // size_t - ckpt state
-#define ORTE_JOB_CKPT_SNAPSHOT_REF      (ORTE_JOB_START_KEY + 6)     // string - snapshot reference
-#define ORTE_JOB_SNAP_LOC               (ORTE_JOB_START_KEY + 7)     // string - snapshot location
+#define ORTE_JOB_SNAPSHOT_REF           (ORTE_JOB_START_KEY + 6)     // string - snapshot reference
+#define ORTE_JOB_SNAPSHOT_LOC           (ORTE_JOB_START_KEY + 7)     // string - snapshot location
 #define ORTE_JOB_SNAPC_INIT_BAR         (ORTE_JOB_START_KEY + 8)     // orte_grpcomm_coll_id_t - collective id
 #define ORTE_JOB_SNAPC_FINI_BAR         (ORTE_JOB_START_KEY + 9)     // orte_grpcomm_coll_id_t - collective id
 #define ORTE_JOB_NUM_NONZERO_EXIT       (ORTE_JOB_START_KEY + 10)    // int32 - number of procs with non-zero exit codes
@@ -147,8 +147,8 @@ typedef uint16_t orte_proc_flags_t;
 #define ORTE_PROC_RESTART_TIME    (ORTE_PROC_START_KEY +  7)           // timeval - time of last restart
 #define ORTE_PROC_FAST_FAILS      (ORTE_PROC_START_KEY +  8)           // int32 - number of failures in "fast" window
 #define ORTE_PROC_CKPT_STATE      (ORTE_PROC_START_KEY +  9)           // size_t - ckpt state
-#define ORTE_PROC_CKPT_SNAP_REF   (ORTE_PROC_START_KEY + 10)           // string - snapshot reference
-#define ORTE_PROC_SNAP_LOC        (ORTE_PROC_START_KEY + 11)           // string - snapshot location
+#define ORTE_PROC_SNAPSHOT_REF    (ORTE_PROC_START_KEY + 10)           // string - snapshot reference
+#define ORTE_PROC_SNAPSHOT_LOC    (ORTE_PROC_START_KEY + 11)           // string - snapshot location
 #define ORTE_PROC_NODENAME        (ORTE_PROC_START_KEY + 12)           // string - node where proc is located, used only by tools
 #define ORTE_PROC_CGROUP          (ORTE_PROC_START_KEY + 13)           // string - name of cgroup this proc shall be assigned to
 #define ORTE_PROC_NBEATS          (ORTE_PROC_START_KEY + 14)           // int32 - number of heartbeats in current window