From 06a58affca1bf9beeec58715663340b37bdc6263 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Fri, 14 Mar 2014 20:40:12 +0000 Subject: [PATCH] Fix minor hwloc memory leak in sbgp/basesmsocket cmr=v1.8:reviewer=hjelmn This commit was SVN r31074. --- ompi/mca/sbgp/basesmsocket/sbgp_basesmsocket_component.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ompi/mca/sbgp/basesmsocket/sbgp_basesmsocket_component.c b/ompi/mca/sbgp/basesmsocket/sbgp_basesmsocket_component.c index c29de6adf9..b8d757718a 100644 --- a/ompi/mca/sbgp/basesmsocket/sbgp_basesmsocket_component.c +++ b/ompi/mca/sbgp/basesmsocket/sbgp_basesmsocket_component.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2009-2012 Oak Ridge National Laboratory. All rights reserved. * Copyright (c) 2009-2012 Mellanox Technologies. All rights reserved. - * Copyright (c) 2013 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2013-2014 Cisco Systems, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -173,6 +173,7 @@ static int mca_sbgp_map_to_logical_socket_id(int *socket) if( 0 != hwloc_get_cpubind(opal_hwloc_topology,good, 0)){ /* report some error */ BASESMSOCKET_VERBOSE(10, "The global variable opal_hwloc_topology appears not to have been initialized\n"); + hwloc_bitmap_free(good); return OMPI_ERROR; } @@ -239,6 +240,7 @@ static int mca_sbgp_map_to_logical_socket_id(int *socket) /* end while */ } *socket = my_logical_socket_id; + hwloc_bitmap_free(good); return ret;