Move some of the ompi_process_info down in OPAL.

This commit was SVN r32324.

ompi/runtime/ompi_mpi_init.c

@@ -661,6 +661,15 @@ int ompi_mpi_init(int argc, char **argv, int requested, int *provided)
         gettimeofday(&ompistart, NULL);
     }
 
+    opal_process_info.nodename         = ompi_process_info.nodename;
+    opal_process_info.job_session_dir  = ompi_process_info.job_session_dir;
+    opal_process_info.proc_session_dir = ompi_process_info.proc_session_dir;
+    opal_process_info.num_local_peers  = (int32_t)ompi_process_info.num_local_peers;
+    opal_process_info.my_local_rank    = (int32_t)ompi_process_info.my_local_rank;
+#if OPAL_HAVE_HWLOC
+    opal_process_info.cpuset           = ompi_process_info.cpuset;
+#endif  /* OPAL_HAVE_HWLOC */
+
     /* select buffered send allocator component to be used */
     if( OMPI_SUCCESS !=
 	(ret = mca_pml_base_bsend_init(OMPI_ENABLE_THREAD_MULTIPLE))) {

opal/util/proc.c

@@ -15,6 +15,17 @@
 #include "opal/util/arch.h"
 #include "opal/mca/dstore/dstore.h"
 
+opal_process_info_t opal_process_info = {
+    .nodename = "not yet named",
+    .job_session_dir = "not yet defined",
+    .proc_session_dir = "not yet defined",
+    .num_local_peers = 1,  /* I'm the only process around here */
+    .my_local_rank = 0,    /* I'm the only process around here */
+#if OPAL_HAVE_HWLOC
+    .cpuset = NULL,
+#endif
+};
+
 static opal_proc_t opal_local_proc = {
     { .opal_list_next = NULL,
       .opal_list_prev = NULL},

opal/util/proc.h

@@ -48,6 +48,18 @@ typedef struct opal_proc_t {
 } opal_proc_t;
 OBJ_CLASS_DECLARATION(opal_proc_t);
 
+typedef struct opal_process_info_t {
+    char *nodename;                     /**< string name for this node */
+    char *job_session_dir;              /**< Session directory for job */
+    char *proc_session_dir;             /**< Session directory for the process */
+    int32_t num_local_peers;            /**< number of procs from my job that share my node with me */
+    int32_t my_local_rank;    /**< local rank */
+#if OPAL_HAVE_HWLOC
+    char *cpuset;                       /**< String-representation of bitmap where we are bound */
+#endif
+} opal_process_info_t;
+OPAL_DECLSPEC extern opal_process_info_t opal_process_info;
+
 OPAL_DECLSPEC extern opal_proc_t* opal_proc_local_get(void);
 OPAL_DECLSPEC extern int opal_proc_local_set(opal_proc_t* proc);