From f722f134f7691a3c134562ec42261ddb3f1bbc2b Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Sat, 23 Aug 2008 03:13:29 +0000 Subject: [PATCH] Check the return code from opal_paffinity before continuing to set maffinity as it can only be done if the map_to_socket_core function succeeds. This commit was SVN r19396. --- ompi/mca/btl/sm/btl_sm.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ompi/mca/btl/sm/btl_sm.c b/ompi/mca/btl/sm/btl_sm.c index 310349965f..cac31dd689 100644 --- a/ompi/mca/btl/sm/btl_sm.c +++ b/ompi/mca/btl/sm/btl_sm.c @@ -138,7 +138,7 @@ static void init_maffinity(int *my_mem_node, int *max_mem_node) { static opal_carto_graph_t *topo; opal_value_array_t dists; - int i, num_core, socket, rc; + int i, num_core, socket; opal_paffinity_base_cpu_set_t cpus; char *myslot = NULL; opal_carto_node_distance_t *dist; @@ -165,7 +165,11 @@ static void init_maffinity(int *my_mem_node, int *max_mem_node) if(OPAL_PAFFINITY_CPU_ISSET(i, cpus)) break; - rc = opal_paffinity_base_get_map_to_socket_core(i, &socket, &i); + if (OMPI_SUCCESS != opal_paffinity_base_get_map_to_socket_core(i, &socket, &i)) { + /* no topology info available */ + goto out; + } + asprintf(&myslot, "slot%d", socket); slot_node = opal_carto_base_find_node(topo, myslot);