From a2085a5916f3eea3dc5e9edabf9a3e21a102ba08 Mon Sep 17 00:00:00 2001
From: Ralph Castain <rhc@open-mpi.org>
Date: Sat, 30 Aug 2014 00:48:25 +0000
Subject: [PATCH] Fix the PSM transport key generator to match prior releases
This commit was SVN r32649.
---
orte/mca/ess/pmi/ess_pmi_module.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/orte/mca/ess/pmi/ess_pmi_module.c b/orte/mca/ess/pmi/ess_pmi_module.c
index bdad13ed94..d93d7ef41f 100644
--- a/orte/mca/ess/pmi/ess_pmi_module.c
+++ b/orte/mca/ess/pmi/ess_pmi_module.c
@@ -231,8 +231,8 @@ static int rte_init(void)
* we can use the jobfam and stepid as unique keys
* because they are unique values assigned by the RM
*/
- unique_key[0] = (uint64_t)(((ORTE_PROC_MY_NAME->jobid & 0xffff0000))) >> 32;
- unique_key[1] = (uint64_t)(((ORTE_PROC_MY_NAME->jobid & 0x0000ffff))) >> 32;
+ unique_key[0] = ORTE_JOB_FAMILY(ORTE_PROC_MY_NAME->jobid);
+ unique_key[1] = ORTE_LOCAL_JOBID(ORTE_PROC_MY_NAME->jobid);
if (NULL == (string_key = orte_pre_condition_transports_print(unique_key))) {
ORTE_ERROR_LOG(ORTE_ERR_OUT_OF_RESOURCE);
return ORTE_ERR_OUT_OF_RESOURCE;