Update a couple of fields, add a scheduler field to proc_info

This commit was SVN r30718.

orte/runtime/orte_globals.h

@@ -98,6 +98,9 @@ ORTE_DECLSPEC extern orte_process_name_t orte_name_invalid;  /** instantiated in
 /* define the name of my daemon */
 #define ORTE_PROC_MY_DAEMON     (&orte_process_info.my_daemon)
 
+/* define the name of my scheduler */
+#define ORTE_PROC_MY_SCHEDULER  (&orte_process_info.my_scheduler)
+
 ORTE_DECLSPEC extern bool orte_in_parallel_debugger;
 
 /* error manager callback function */

orte/util/proc_info.c

@@ -53,6 +53,7 @@ ORTE_DECLSPEC orte_proc_info_t orte_process_info = {
     /*  .my_hnp =                       */   ORTE_NAME_INVALID,
     /*  .my_hnp_uri =                   */   NULL,
     /*  .my_parent =                    */   ORTE_NAME_INVALID,
+    /*  .my_scheduler =                 */   ORTE_NAME_INVALID,
     /*  .hnp_pid =                      */   0,
     /*  .app_num =                      */   0,
     /*  .num_procs =                    */   1,

orte/util/proc_info.h

@@ -63,6 +63,7 @@ typedef uint32_t orte_proc_type_t;
 #define ORTE_PROC_AGGREGATOR    0x0080
 #define ORTE_PROC_IOF_ENDPT     0x1000
 #define ORTE_PROC_SCHEDULER     0x2000
+#define ORTE_PROC_MASTER        0x4000
 
 #define ORTE_PROC_IS_SINGLETON      (ORTE_PROC_SINGLETON & orte_process_info.proc_type)
 #define ORTE_PROC_IS_DAEMON         (ORTE_PROC_DAEMON & orte_process_info.proc_type)
@@ -75,6 +76,7 @@ typedef uint32_t orte_proc_type_t;
 #define ORTE_PROC_IS_AGGREGATOR     (ORTE_PROC_AGGREGATOR & orte_process_info.proc_type)
 #define ORTE_PROC_IS_IOF_ENDPT      (ORTE_PROC_IOF_ENDPT & orte_process_info.proc_type)
 #define ORTE_PROC_IS_SCHEDULER      (ORTE_PROC_SCHEDULER & orte_process_info.proc_type)
+#define ORTE_PROC_IS_MASTER         (ORTE_PROC_MASTER & orte_process_info.proc_type)
 
 
 /**
@@ -93,6 +95,7 @@ struct orte_proc_info_t {
     orte_process_name_t my_hnp;         /**< Name of my hnp */
     char *my_hnp_uri;                   /**< Contact info for my hnp */
     orte_process_name_t my_parent;      /**< Name of my parent (or my HNP if no parent was specified) */
+    orte_process_name_t my_scheduler;   /**< name of the scheduler for this system */
     pid_t hnp_pid;                      /**< hnp pid - used if singleton */
     orte_app_idx_t app_num;             /**< our index into the app_context array */
     orte_vpid_t num_procs;              /**< number of processes in this job */