From db92ac3ce1cdc9c429d19089d89b9c03656f12d8 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Thu, 30 Jan 2014 00:53:30 +0000 Subject: [PATCH] Cleanup role of aggregator relative to daemons Refs trac:4176 This commit was SVN r30495. The following Trac tickets were found above: Ticket 4176 --> https://svn.open-mpi.org/trac/ompi/ticket/4176 --- orte/mca/oob/tcp/oob_tcp_listener.c | 4 ++-- orte/mca/sensor/heartbeat/sensor_heartbeat.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/orte/mca/oob/tcp/oob_tcp_listener.c b/orte/mca/oob/tcp/oob_tcp_listener.c index 154d46a019..5edad87334 100644 --- a/orte/mca/oob/tcp/oob_tcp_listener.c +++ b/orte/mca/oob/tcp/oob_tcp_listener.c @@ -13,7 +13,7 @@ * All rights reserved. * Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2011 Oak Ridge National Labs. All rights reserved. - * Copyright (c) 2013 Intel, Inc. All rights reserved. + * Copyright (c) 2013-2014 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -175,7 +175,7 @@ static int create_listen(void) * port in the range. Otherwise, tcp_port_min will be 0, which * means "pick any port" */ - if (ORTE_PROC_IS_DAEMON) { + if (ORTE_PROC_IS_DAEMON || ORTE_PROC_IS_AGGREGATOR) { if (NULL != mca_oob_tcp_component.tcp_static_ports) { /* if static ports were provided, take the * first entry in the list diff --git a/orte/mca/sensor/heartbeat/sensor_heartbeat.c b/orte/mca/sensor/heartbeat/sensor_heartbeat.c index d4c5137018..24daf3b954 100644 --- a/orte/mca/sensor/heartbeat/sensor_heartbeat.c +++ b/orte/mca/sensor/heartbeat/sensor_heartbeat.c @@ -145,7 +145,7 @@ static void sample(void) } /* send heartbeat */ - if (ORTE_SUCCESS != (rc = orte_rml.send_buffer_nb(ORTE_PROC_MY_HNP, buf, + if (ORTE_SUCCESS != (rc = orte_rml.send_buffer_nb(ORTE_PROC_MY_DAEMON, buf, ORTE_RML_TAG_HEARTBEAT, orte_rml_send_callback, NULL))) { ORTE_ERROR_LOG(rc);