1
1

plm base: make sure to assign "node" early enough

Make sure to assign "node" before using it in ORTE_FLAG_SET.

Signed-off-by: Jeff Squyres <jsquyres@cisco.com>
Этот коммит содержится в:
Jeff Squyres 2017-01-25 08:02:59 -08:00
родитель e7323fdd93
Коммит 230bbc597d

Просмотреть файл

@ -9,7 +9,7 @@
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2007-2015 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2007-2017 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2009 Institut National de Recherche en Informatique
* et Automatique. All rights reserved.
* Copyright (c) 2011-2012 Los Alamos National Security, LLC.
@ -1053,6 +1053,8 @@ void orte_plm_base_daemon_callback(int status, orte_process_name_t* sender,
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
ORTE_NAME_PRINT(&daemon->name), nodename));
node = daemon->node;
/* look this node up, if necessary */
if (!orte_plm_globals.daemon_nodes_assigned_at_launch) {
OPAL_OUTPUT_VERBOSE((5, orte_plm_base_framework.framework_output,
@ -1067,7 +1069,6 @@ void orte_plm_base_daemon_callback(int status, orte_process_name_t* sender,
ORTE_FLAG_SET(node, ORTE_NODE_FLAG_LOC_VERIFIED);
}
node = daemon->node;
if (NULL == node) {
/* this shouldn't happen - it indicates an error in the
* prior node matching logic, so report it and error out