From 52b33e8bbef6e61c2a4d8edfad8e54ad27d52e14 Mon Sep 17 00:00:00 2001 From: Stephen Herbein Date: Tue, 14 Jul 2020 10:36:50 -0700 Subject: [PATCH] fixup! hwloc-reader: switch to the types_filter functions new to hwloc 2 --- resource/readers/resource_reader_hwloc.cpp | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/resource/readers/resource_reader_hwloc.cpp b/resource/readers/resource_reader_hwloc.cpp index 7f2cf8981..007005311 100644 --- a/resource/readers/resource_reader_hwloc.cpp +++ b/resource/readers/resource_reader_hwloc.cpp @@ -309,23 +309,26 @@ int resource_reader_hwloc_t::unpack_internal (resource_graph_t &g, goto done; } #else - if (hwloc_topology_set_io_types_filter(topo, + if (hwloc_topology_set_io_types_filter (topo, HWLOC_TYPE_FILTER_KEEP_IMPORTANT) < 0) { - m_err_msg += "hwloc_topology_set_io_types_filter"; - goto done; + errno = EINVAL; + m_err_msg += "hwloc_topology_set_io_types_filter; "; + goto done; } - if (hwloc_topology_set_cache_types_filter(topo, + if (hwloc_topology_set_cache_types_filter (topo, HWLOC_TYPE_FILTER_KEEP_STRUCTURE) < 0) { - m_err_msg += "hwloc_topology_set_cache_types_filter"; - goto done; + errno = EINVAL; + m_err_msg += "hwloc_topology_set_cache_types_filter; "; + goto done; } - if (hwloc_topology_set_icache_types_filter(topo, + if (hwloc_topology_set_icache_types_filter (topo, HWLOC_TYPE_FILTER_KEEP_STRUCTURE) < 0) { - m_err_msg += "hwloc_topology_set_icache_types_filter"; - goto done; + errno = EINVAL; + m_err_msg += "hwloc_topology_set_icache_types_filter; "; + goto done; } #endif if ( hwloc_topology_set_xmlbuffer (topo, str.c_str (), len) != 0) {