From bca8015b94ad7d81e8c08ae83a13fef00dfca7fa Mon Sep 17 00:00:00 2001
From: George Bosilca <bosilca@icl.utk.edu>
Date: Tue, 23 Jun 2009 20:21:55 +0000
Subject: [PATCH] Add the proc_get_daemon capability to the bproc launcher.

This commit was SVN r21501.
---
 orte/mca/ess/bproc/ess_bproc_module.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/orte/mca/ess/bproc/ess_bproc_module.c b/orte/mca/ess/bproc/ess_bproc_module.c
index 4e8d72dfdd..1032deae0a 100644
--- a/orte/mca/ess/bproc/ess_bproc_module.c
+++ b/orte/mca/ess/bproc/ess_bproc_module.c
@@ -39,6 +39,7 @@ static int bproc_set_name(void);
 static int rte_init(void);
 static int rte_finalize(void);
 static bool proc_is_local(orte_process_name_t *proc);
+static orte_vpid_t proc_get_daemon(orte_process_name_t *proc);
 static char* proc_get_hostname(orte_process_name_t *proc);
 static uint32_t proc_get_arch(orte_process_name_t *proc);
 static uint8_t proc_get_local_rank(orte_process_name_t *proc);
@@ -50,11 +51,14 @@ orte_ess_base_module_t orte_ess_bproc_module = {
     rte_finalize,
     orte_ess_base_app_abort,
     proc_is_local,
+    proc_get_daemon,
     proc_get_hostname,
     proc_get_arch,
     proc_get_local_rank,
     proc_get_node_rank,
     update_arch,
+    NULL,  /* update_pidmap */
+    NULL,  /* update_nidmap */
     NULL  /* no FT support for Bproc */
 };
 
@@ -213,6 +217,26 @@ static int32_t find_daemon_node(orte_vpid_t vpid)
     return -1;
 }
 
+static orte_vpid_t proc_get_daemon(orte_process_name_t *proc)
+{
+    orte_nid_t *nid;
+
+    if( ORTE_JOBID_IS_DAEMON(proc->jobid) ) {
+        return proc->vpid;
+    }
+    if (NULL == (nid = orte_util_lookup_nid(proc))) {
+        return ORTE_VPID_INVALID;
+    }
+
+    OPAL_OUTPUT_VERBOSE((2, orte_ess_base_output,
+                         "%s ess:env: proc %s is hosted by daemon %s",
+                         ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
+                         ORTE_NAME_PRINT(proc),
+                         ORTE_VPID_PRINT(nid->daemon)));
+
+    return nid->daemon;
+}
+
 static char* proc_get_hostname(orte_process_name_t *proc)
 {
     int32_t node;