From c69f1d0226cf266f57cccdc4bdacf5c49ca2bd22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Sun, 25 Aug 2019 15:23:49 +0200
Subject: [PATCH] hwloc-2.0: use hwloc_linux_read_path_as_cpumask()

See https://github.com/open-mpi/hwloc/commit/e7f5962f014bbf9dcd284498b8662ec7645c2d4e.
---
 runtime/realm/threads.cc | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/runtime/realm/threads.cc b/runtime/realm/threads.cc
index 544df6c965..452745edb0 100644
--- a/runtime/realm/threads.cc
+++ b/runtime/realm/threads.cc
@@ -1470,15 +1470,12 @@ namespace Realm {
 				std::set<int>& sibling_ids) {
     char str[1024];
     sprintf(str, "/sys/devices/system/cpu/cpu%d/topology/thread_siblings", cpu_id);
-    FILE *f = fopen(str, "r");
-    if(!f) {
+    hwloc_bitmap_t set = hwloc_bitmap_alloc();
+
+    if (hwloc_linux_read_path_as_cpumask(str, set) < 0) {
       log_thread.warning() << "can't read '" << str << "' - skipping";
       return false;
     }
-    hwloc_bitmap_t set = hwloc_bitmap_alloc();
-    hwloc_linux_parse_cpumap_file(f, set);
-
-    fclose(f);
 
     // loop over all siblings (except ourselves)
     for(int siblingid = hwloc_bitmap_first(set);