We know what a daemon is there is no need to dig into the nidmap to find it out.
This commit was SVN r21503.
Этот коммит содержится в:
родитель
0ba845fed2
Коммит
6a00481285
@ -2,7 +2,7 @@
|
||||
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||
* University Research and Technology
|
||||
* Corporation. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The University of Tennessee and The University
|
||||
* Copyright (c) 2004-2009 The University of Tennessee and The University
|
||||
* of Tennessee Research Foundation. All rights
|
||||
* reserved.
|
||||
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
@ -207,6 +207,10 @@ 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;
|
||||
}
|
||||
|
@ -1,5 +1,8 @@
|
||||
/*
|
||||
* Copyright (c) 2009 Cisco Systems, Inc. All rights reserved.
|
||||
* Copyright (c) 2009 The University of Tennessee and The University
|
||||
* of Tennessee Research Foundation. All rights
|
||||
* reserved.
|
||||
*
|
||||
* $COPYRIGHT$
|
||||
*
|
||||
@ -546,6 +549,10 @@ static orte_vpid_t proc_get_daemon(orte_process_name_t *proc)
|
||||
{
|
||||
orte_proc_t *pdata;
|
||||
|
||||
if( ORTE_JOBID_IS_DAEMON(proc->jobid) ) {
|
||||
return proc->vpid;
|
||||
}
|
||||
|
||||
/* get the job data */
|
||||
if (NULL == (pdata = find_proc(proc))) {
|
||||
return ORTE_VPID_INVALID;
|
||||
|
6
orte/mca/ess/env/ess_env_module.c
поставляемый
6
orte/mca/ess/env/ess_env_module.c
поставляемый
@ -2,7 +2,7 @@
|
||||
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||
* University Research and Technology
|
||||
* Corporation. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The University of Tennessee and The University
|
||||
* Copyright (c) 2004-2009 The University of Tennessee and The University
|
||||
* of Tennessee Research Foundation. All rights
|
||||
* reserved.
|
||||
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
@ -252,6 +252,10 @@ 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;
|
||||
}
|
||||
|
@ -2,7 +2,7 @@
|
||||
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||
* University Research and Technology
|
||||
* Corporation. All rights reserved.
|
||||
* Copyright (c) 2004-2008 The University of Tennessee and The University
|
||||
* Copyright (c) 2004-2009 The University of Tennessee and The University
|
||||
* of Tennessee Research Foundation. All rights
|
||||
* reserved.
|
||||
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
@ -661,6 +661,10 @@ static orte_vpid_t proc_get_daemon(orte_process_name_t *proc)
|
||||
{
|
||||
orte_proc_t *pdata;
|
||||
|
||||
if( ORTE_JOBID_IS_DAEMON(proc->jobid) ) {
|
||||
return proc->vpid;
|
||||
}
|
||||
|
||||
/* get the job data */
|
||||
if (NULL == (pdata = find_proc(proc))) {
|
||||
return ORTE_VPID_INVALID;
|
||||
|
@ -2,7 +2,7 @@
|
||||
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||
* University Research and Technology
|
||||
* Corporation. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The University of Tennessee and The University
|
||||
* Copyright (c) 2004-2009 The University of Tennessee and The University
|
||||
* of Tennessee Research Foundation. All rights
|
||||
* reserved.
|
||||
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
@ -218,6 +218,10 @@ 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;
|
||||
}
|
||||
|
@ -2,7 +2,7 @@
|
||||
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||
* University Research and Technology
|
||||
* Corporation. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The University of Tennessee and The University
|
||||
* Copyright (c) 2004-2009 The University of Tennessee and The University
|
||||
* of Tennessee Research Foundation. All rights
|
||||
* reserved.
|
||||
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
@ -415,6 +415,10 @@ 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;
|
||||
}
|
||||
|
@ -2,7 +2,7 @@
|
||||
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||
* University Research and Technology
|
||||
* Corporation. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The University of Tennessee and The University
|
||||
* Copyright (c) 2004-2009 The University of Tennessee and The University
|
||||
* of Tennessee Research Foundation. All rights
|
||||
* reserved.
|
||||
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
@ -223,11 +223,11 @@ 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))) {
|
||||
/* don't generate an error message here - it could be a call to
|
||||
* get a route to a proc in an unknown job. Let the caller decide
|
||||
* if an error message is required
|
||||
*/
|
||||
return ORTE_VPID_INVALID;
|
||||
}
|
||||
|
||||
|
@ -2,7 +2,7 @@
|
||||
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||
* University Research and Technology
|
||||
* Corporation. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The University of Tennessee and The University
|
||||
* Copyright (c) 2004-2009 The University of Tennessee and The University
|
||||
* of Tennessee Research Foundation. All rights
|
||||
* reserved.
|
||||
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
@ -396,11 +396,11 @@ 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))) {
|
||||
/* don't generate an error message here - it could be a call to
|
||||
* get a route to a proc in an unknown job. Let the caller decide
|
||||
* if an error message is required
|
||||
*/
|
||||
return ORTE_VPID_INVALID;
|
||||
}
|
||||
|
||||
|
@ -2,7 +2,7 @@
|
||||
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
||||
* University Research and Technology
|
||||
* Corporation. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The University of Tennessee and The University
|
||||
* Copyright (c) 2004-2009 The University of Tennessee and The University
|
||||
* of Tennessee Research Foundation. All rights
|
||||
* reserved.
|
||||
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
||||
@ -220,11 +220,11 @@ 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))) {
|
||||
/* don't generate an error message here - it could be a call to
|
||||
* get a route to a proc in an unknown job. Let the caller decide
|
||||
* if an error message is required
|
||||
*/
|
||||
return ORTE_VPID_INVALID;
|
||||
}
|
||||
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user