sentinel: uses local jobid and family as uint32_t and fix abstraction

Author: ggouaillardet

ompi/mca/rte/orte/rte_orte.h

@@ -3,7 +3,7 @@
  *                         All rights reserved.
  * Copyright (c) 2013-2015 Intel, Inc. All rights reserved
  * Copyright (c) 2014      Cisco Systems, Inc.  All rights reserved.
- * Copyright (c) 2014      Research Organization for Information Science
+ * Copyright (c) 2014-2016 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2015      Intel, Inc. All rights reserved.
  * $COPYRIGHT$
@@ -59,6 +59,10 @@ typedef orte_ns_cmp_bitmask_t ompi_rte_cmp_bitmask_t;
 #define OMPI_RTE_CMP_JOBID  ORTE_NS_CMP_JOBID
 #define OMPI_RTE_CMP_VPID   ORTE_NS_CMP_VPID
 #define OMPI_RTE_CMP_ALL    ORTE_NS_CMP_ALL
+#define OMPI_LOCAL_JOBID(jobid) ORTE_LOCAL_JOBID(jobid)
+#define OMPI_JOB_FAMILY(jobid)  ORTE_JOB_FAMILY(jobid)
+#define OMPI_CONSTRUCT_JOBID(family,local) ORTE_CONSTRUCT_JOBID(family,local)
+
 /* This is the DSS tag to serialize a proc name */
 #define OMPI_NAME ORTE_NAME
 #define OMPI_PROCESS_NAME_HTON ORTE_PROCESS_NAME_HTON

ompi/proc/proc.h

@@ -373,20 +373,21 @@ static inline bool ompi_proc_is_sentinel (ompi_proc_t *proc)
  * we assume an ompi_proc_t is at least aligned on two bytes,
  * so if the LSB of a pointer to an ompi_proc_t is 1, we have to handle
  * this pointer as a sentinel instead of a pointer.
- * a sentinel can be seen as a 64 bits array with the following format :
+ * a sentinel can be seen as an uint64_t with the following format :
  * - bit  0     : 1
  * - bits 1-15  : local jobid
  * - bits 16-31 : job family
  * - bits 32-63 : vpid
  */
 static inline uintptr_t ompi_proc_name_to_sentinel (opal_process_name_t name)
 {
-    uintptr_t tmp, sentinel = 0x1;
+    uintptr_t tmp, sentinel = 0;
     /* local jobid must fit in 15 bits */
-    assert(! (ORTE_LOCAL_JOBID(name.jobid) & 0x8000));
-    tmp = (uintptr_t)ORTE_LOCAL_JOBID(name.jobid);
+    assert(! (OMPI_LOCAL_JOBID(name.jobid) & 0x8000));
+    sentinel |= 0x1;
+    tmp = (uintptr_t)OMPI_LOCAL_JOBID(name.jobid);
     sentinel |= ((tmp << 1) & 0xfffe);
-    tmp = (uintptr_t)ORTE_JOB_FAMILY(name.jobid);
+    tmp = (uintptr_t)OMPI_JOB_FAMILY(name.jobid);
     sentinel |= ((tmp << 16) & 0xffff0000);
     tmp = (uintptr_t)name.vpid;
     sentinel |= ((tmp << 32) & 0xffffffff00000000);
@@ -396,13 +397,13 @@ static inline uintptr_t ompi_proc_name_to_sentinel (opal_process_name_t name)
 static inline opal_process_name_t ompi_proc_sentinel_to_name (uintptr_t sentinel)
 {
   opal_process_name_t name;
-  uint16_t local, family;
+  uint32_t local, family;
   uint32_t vpid;
   assert(sentinel & 0x1);
   local = (sentinel >> 1) & 0x7fff;
   family = (sentinel >> 16) & 0xffff;
   vpid = (sentinel >> 32) & 0xffffffff;
-  name.jobid = ORTE_CONSTRUCT_JOBID(family,local);
+  name.jobid = OMPI_CONSTRUCT_JOBID(family,local);
   name.vpid = vpid;
   return name;
 }