Merge pull request #1345 from ggouaillardet/topic/sentinel_proc_name_conversion

hjelmn · hjelmn · commit 39b44d06522b · 2016-02-10T19:08:33.000-07:00
Topic/sentinel proc name conversion
diff --git a/ompi/communicator/comm.c b/ompi/communicator/comm.c
@@ -18,7 +18,7 @@
  * Copyright (c) 2012      Oak Ridge National Labs.  All rights reserved.
  * Copyright (c) 2012-2015 Los Alamos National Security, LLC.
  *                         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) 2014-2015 Intel, Inc. All rights reserved.
  * Copyright (c) 2015      Mellanox Technologies. All rights reserved.
@@ -699,7 +699,7 @@ static int ompi_comm_split_type_get_part (ompi_group_t *group, int *results, int
         int include = false;
 
         if (ompi_proc_is_sentinel (proc)) {
-            opal_process_name_t proc_name = ompi_proc_sentinel_to_name ((intptr_t) proc);
+            opal_process_name_t proc_name = ompi_proc_sentinel_to_name ((uintptr_t) proc);
 
             u16ptr = &locality;
 
diff --git a/ompi/dpm/dpm.c b/ompi/dpm/dpm.c
@@ -169,7 +169,7 @@ int ompi_dpm_connect_accept(ompi_communicator_t *comm, int root,
         for (i=0; i < size; i++) {
             opal_process_name_t proc_name;
             if (ompi_proc_is_sentinel (proc_list[i])) {
-                proc_name = ompi_proc_sentinel_to_name ((intptr_t) proc_list[i]);
+                proc_name = ompi_proc_sentinel_to_name ((uintptr_t) proc_list[i]);
             } else {
                 proc_name = proc_list[i]->super.proc_name;
             }
@@ -532,7 +532,7 @@ static int construct_peers(ompi_group_t *group, opal_list_t *peers)
             return OMPI_ERR_NOT_FOUND;
         }
         if (ompi_proc_is_sentinel (proct)) {
-            proc_name = ompi_proc_sentinel_to_name ((intptr_t)proct);
+            proc_name = ompi_proc_sentinel_to_name ((uintptr_t)proct);
         } else {
             proc_name = proct->super.proc_name;
         }
diff --git a/ompi/group/group.h b/ompi/group/group.h
@@ -16,6 +16,8 @@
  * Copyright (c) 2012      Oak Ridge National Labs.  All rights reserved.
  * Copyright (c) 2013-2015 Los Alamos National Security, LLC.  All rights
  *                         reserved.
+ * Copyright (c) 2016      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -352,7 +354,7 @@ static inline struct ompi_proc_t *ompi_group_dense_lookup (ompi_group_t *group,
 
         /* replace sentinel value with an actual ompi_proc_t */
         ompi_proc_t *real_proc =
-            (ompi_proc_t *) ompi_proc_for_name (ompi_proc_sentinel_to_name ((intptr_t) proc));
+            (ompi_proc_t *) ompi_proc_for_name (ompi_proc_sentinel_to_name ((uintptr_t) proc));
 
         if (opal_atomic_cmpset_ptr (group->grp_proc_pointers + peer_id, proc, real_proc)) {
             OBJ_RETAIN(real_proc);
diff --git a/ompi/group/group_plist.c b/ompi/group/group_plist.c
@@ -14,6 +14,8 @@
  * Copyright (c) 2007      Cisco Systems, Inc. All rights reserved.
  * Copyright (c) 2013-2015 Los Alamos National Security, LLC.  All rights
  *                         reserved.
+ * Copyright (c) 2016      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -61,7 +63,7 @@ static struct ompi_proc_t *ompi_group_dense_lookup_raw (ompi_group_t *group, con
 {
     if (OPAL_UNLIKELY(ompi_proc_is_sentinel (group->grp_proc_pointers[peer_id]))) {
         ompi_proc_t *proc =
-            (ompi_proc_t *) ompi_proc_lookup (ompi_proc_sentinel_to_name ((intptr_t) group->grp_proc_pointers[peer_id]));
+            (ompi_proc_t *) ompi_proc_lookup (ompi_proc_sentinel_to_name ((uintptr_t) group->grp_proc_pointers[peer_id]));
         if (NULL != proc) {
             /* replace sentinel value with an actual ompi_proc_t */
             group->grp_proc_pointers[peer_id] = proc;
diff --git a/ompi/mca/pml/monitoring/pml_monitoring.c b/ompi/mca/pml/monitoring/pml_monitoring.c
@@ -4,6 +4,8 @@
  *                         reserved.
  * Copyright (c) 2013-2015 Inria.  All rights reserved.
  * Copyright (c) 2015      Bull SAS.  All rights reserved.
+ * Copyright (c) 2016      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -77,7 +79,7 @@ int mca_pml_monitoring_add_procs(struct ompi_proc_t **procs,
                 my_rank = i;
             /* Extract the peer procname from the procs array */
             if( ompi_proc_is_sentinel(procs[i]) ) {
-                tmp = ompi_proc_sentinel_to_name((intptr_t)procs[i]);
+                tmp = ompi_proc_sentinel_to_name((uintptr_t)procs[i]);
             } else {
                 tmp = procs[i]->super.proc_name;
             }
diff --git a/ompi/mca/rte/orte/rte_orte.h b/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
diff --git a/ompi/proc/proc.c b/ompi/proc/proc.c
@@ -14,7 +14,7 @@
  * Copyright (c) 2012-2015 Los Alamos National Security, LLC.  All rights
  *                         reserved.
  * Copyright (c) 2013-2015 Intel, Inc. All rights reserved
- * Copyright (c) 2014-2015 Research Organization for Information Science
+ * Copyright (c) 2014-2016 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2015      Mellanox Technologies. All rights reserved.
  *
@@ -642,7 +642,7 @@ ompi_proc_pack(ompi_proc_t **proclist, int proclistsize,
         ompi_proc_t *proc = proclist[i];
 
         if (ompi_proc_is_sentinel (proc)) {
-            proc = ompi_proc_for_name_nolock (ompi_proc_sentinel_to_name ((intptr_t) proc));
+            proc = ompi_proc_for_name_nolock (ompi_proc_sentinel_to_name ((uintptr_t) proc));
         }
 
         /* send proc name */
diff --git a/ompi/proc/proc.h b/ompi/proc/proc.h
@@ -13,7 +13,7 @@
  * Copyright (c) 2007-2012 Los Alamos National Security, LLC.  All rights
  *                         reserved.
  * Copyright (c) 2013-2014 Intel, Inc. All rights reserved
- * Copyright (c) 2015      Research Organization for Information Science
+ * Copyright (c) 2015-2016 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
@@ -369,17 +369,66 @@ static inline bool ompi_proc_is_sentinel (ompi_proc_t *proc)
     return (intptr_t) proc & 0x1;
 }
 
-static inline intptr_t ompi_proc_name_to_sentinel (opal_process_name_t name)
+#if OPAL_SIZEOF_PROCESS_NAME_T == SIZEOF_VOID_P
+/*
+ * 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 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 = 0;
+    /* local jobid must fit in 15 bits */
+    assert(! (OMPI_LOCAL_JOBID(name.jobid) & 0x8000));
+    sentinel |= 0x1;
+    tmp = (uintptr_t)OMPI_LOCAL_JOBID(name.jobid);
+    sentinel |= ((tmp << 1) & 0xfffe);
+    tmp = (uintptr_t)OMPI_JOB_FAMILY(name.jobid);
+    sentinel |= ((tmp << 16) & 0xffff0000);
+    tmp = (uintptr_t)name.vpid;
+    sentinel |= ((tmp << 32) & 0xffffffff00000000);
+    return sentinel;
+}
+
+static inline opal_process_name_t ompi_proc_sentinel_to_name (uintptr_t sentinel)
+{
+  opal_process_name_t name;
+  uint32_t local, family;
+  uint32_t vpid;
+  assert(sentinel & 0x1);
+  local = (sentinel >> 1) & 0x7fff;
+  family = (sentinel >> 16) & 0xffff;
+  vpid = (sentinel >> 32) & 0xffffffff;
+  name.jobid = OMPI_CONSTRUCT_JOBID(family,local);
+  name.vpid = vpid;
+  return name;
+}
+#elif 4 == SIZEOF_VOID_P
+/*
+ * currently, a sentinel is only made from the current jobid aka OMPI_PROC_MY_NAME->jobid
+ * so we only store the first 31 bits of the vpid
+ */
+static inline uintptr_t ompi_proc_name_to_sentinel (opal_process_name_t name)
 {
-  return (*((intptr_t *) &name) << 1) | 0x1;
+    assert(OMPI_PROC_MY_NAME->jobid == name.jobid);
+    return (uintptr_t)((name.vpid <<1) | 0x1);
 }
 
-static inline opal_process_name_t ompi_proc_sentinel_to_name (intptr_t sentinel)
+static inline opal_process_name_t ompi_proc_sentinel_to_name (uintptr_t sentinel)
 {
-  sentinel >>= 1;
-  sentinel &= 0x7FFFFFFFFFFFFFFF;
-  return *((opal_process_name_t *) &sentinel);
+  opal_process_name_t name;
+  name.jobid = OMPI_PROC_MY_NAME->jobid;
+  name.vpid = sentinel >> 1;
+  return name;
 }
+#else
+#error unsupported pointer size
+#endif
 
 END_C_DECLS
 
diff --git a/opal/dss/dss_types.h b/opal/dss/dss_types.h
@@ -14,7 +14,7 @@
  * Copyright (c) 2012-2013 Los Alamos National Security, Inc. All rights
  *                         reserved.
  * Copyright (c) 2014      Intel, 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$
  *
@@ -47,6 +47,7 @@ typedef struct {
     opal_jobid_t jobid;
     opal_vpid_t vpid;
 } opal_process_name_t;
+#define OPAL_SIZEOF_PROCESS_NAME_T 8
 
 BEGIN_C_DECLS
 
diff --git a/orte/util/name_fns.h b/orte/util/name_fns.h
@@ -97,6 +97,9 @@ ORTE_DECLSPEC char *orte_pretty_print_timing(int64_t secs, int64_t usecs);
 #define ORTE_CONSTRUCT_LOCAL_JOBID(local, job) \
     ( ((local) & 0xffff0000) | ((job) & 0x0000ffff) )
 
+#define ORTE_CONSTRUCT_JOBID(family, local) \
+    ORTE_CONSTRUCT_LOCAL_JOBID(ORTE_CONSTRUCT_JOB_FAMILY(family), local)
+
 /* a macro for identifying that a proc is a daemon */
 #define ORTE_JOBID_IS_DAEMON(n)  \
     !((n) & 0x0000ffff)

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ int ompi_dpm_connect_accept(ompi_communicator_t *comm, int root,`
`169`	`169`	`for (i=0; i < size; i++) {`
`170`	`170`	`opal_process_name_t proc_name;`
`171`	`171`	`if (ompi_proc_is_sentinel (proc_list[i])) {`
`172`		`- proc_name = ompi_proc_sentinel_to_name ((intptr_t) proc_list[i]);`
	`172`	`+ proc_name = ompi_proc_sentinel_to_name ((uintptr_t) proc_list[i]);`
`173`	`173`	`} else {`
`174`	`174`	`proc_name = proc_list[i]->super.proc_name;`
`175`	`175`	`}`
`@@ -532,7 +532,7 @@ static int construct_peers(ompi_group_t group, opal_list_t peers)`
`532`	`532`	`return OMPI_ERR_NOT_FOUND;`
`533`	`533`	`}`
`534`	`534`	`if (ompi_proc_is_sentinel (proct)) {`
`535`		`- proc_name = ompi_proc_sentinel_to_name ((intptr_t)proct);`
	`535`	`+ proc_name = ompi_proc_sentinel_to_name ((uintptr_t)proct);`
`536`	`536`	`} else {`
`537`	`537`	`proc_name = proct->super.proc_name;`
`538`	`538`	`}`