Create single, global hwloc topology instance

Author: igchor

src/CMakeLists.txt

@@ -60,7 +60,8 @@ set(UMF_SOURCES
     memspace.c
     provider/provider_tracking.c
     critnib/critnib.c
-    pool/pool_proxy.c)
+    pool/pool_proxy.c
+    topology.c)
 
 set(UMF_SOURCES_LINUX libumf_linux.c)
 

src/libumf_linux.c

@@ -10,8 +10,9 @@
 #include <stddef.h>
 
 #include "base_alloc_global.h"
-#include "memspace_host_all_internal.h"
+#include "memspace_internal.h"
 #include "provider_tracking.h"
+#include "topology.h"
 #include "utils_log.h"
 
 umf_memory_tracker_handle_t TRACKER = NULL;
@@ -27,6 +28,7 @@ void __attribute__((destructor)) umfDestroy(void) {
     TRACKER = NULL;
     umfMemoryTrackerDestroy(t);
     umfMemspaceHostAllDestroy();
+    umfDestroyTopology();
 }
 
 void libumfInit(void) {

src/memspace_internal.h

@@ -30,6 +30,8 @@ struct umf_memspace_t {
 ///
 void umfMemspaceDestroy(umf_memspace_handle_t hMemspace);
 
+void umfMemspaceHostAllDestroy(void);
+
 #ifdef __cplusplus
 }
 #endif

src/memspaces/memspace_host_all.c

@@ -13,9 +13,9 @@
 
 #include "base_alloc_global.h"
 #include "memory_target_numa.h"
-#include "memspace_host_all_internal.h"
 #include "memspace_internal.h"
 #include "memspace_numa.h"
+#include "topology.h"
 #include "utils_concurrency.h"
 
 static umf_result_t umfMemspaceHostAllCreate(umf_memspace_handle_t *hMemspace) {
@@ -25,30 +25,25 @@ static umf_result_t umfMemspaceHostAllCreate(umf_memspace_handle_t *hMemspace) {
 
     umf_result_t umf_ret = UMF_RESULT_SUCCESS;
 
-    hwloc_topology_t topology;
-    if (hwloc_topology_init(&topology)) {
+    hwloc_topology_t topology = umfGetTopology();
+    if (!topology) {
         // TODO: What would be an approrpiate err?
         return UMF_RESULT_ERROR_UNKNOWN;
     }
 
-    if (hwloc_topology_load(topology)) {
-        umf_ret = UMF_RESULT_ERROR_UNKNOWN;
-        goto err_topology_destroy;
-    }
-
     // Shouldn't return -1, as 'HWLOC_OBJ_NUMANODE' doesn't appear to be an
     // object that can be present on multiple levels.
     // Source: https://www.open-mpi.org/projects/hwloc/doc/hwloc-v2.10.0-letter.pdf
     int nNodes = hwloc_get_nbobjs_by_type(topology, HWLOC_OBJ_NUMANODE);
     if (nNodes < 0) {
         umf_ret = UMF_RESULT_ERROR_UNKNOWN;
-        goto err_topology_destroy;
+        goto err;
     }
 
     size_t *nodeIds = umf_ba_global_alloc(nNodes * sizeof(size_t));
     if (!nodeIds) {
         umf_ret = UMF_RESULT_ERROR_OUT_OF_HOST_MEMORY;
-        goto err_topology_destroy;
+        goto err;
     }
 
     // Collect all available NUMA node ids on the platform
@@ -67,8 +62,7 @@ static umf_result_t umfMemspaceHostAllCreate(umf_memspace_handle_t *hMemspace) {
 
     umf_ba_global_free(nodeIds);
 
-err_topology_destroy:
-    hwloc_topology_destroy(topology);
+err:
     return umf_ret;
 }
 

src/topology.c

@@ -0,0 +1,45 @@
+/*
+ *
+ * Copyright (C) 2024 Intel Corporation
+ *
+ * Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
+ * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+ *
+ */
+
+#include <hwloc.h>
+
+#include "base_alloc_global.h"
+#include "utils_concurrency.h"
+
+static hwloc_topology_t topology = NULL;
+static UTIL_ONCE_FLAG topology_initialized = UTIL_ONCE_FLAG_INIT;
+
+void umfDestroyTopology(void) {
+    if (topology) {
+        hwloc_topology_destroy(topology);
+    }
+}
+
+static void umfCreateTopology(void) {
+    if (hwloc_topology_init(&topology)) {
+        fprintf(stderr, "Error: Failed to initialize topology\n");
+        topology = NULL;
+        return;
+    }
+
+    if (hwloc_topology_load(topology)) {
+        fprintf(stderr, "Error: Failed to initialize topology\n");
+        hwloc_topology_destroy(topology);
+        topology = NULL;
+    }
+
+#if defined(_WIN32) && !defined(UMF_SHARED_LIBRARY)
+    atexit(umfDestroyTopology);
+#endif
+}
+
+hwloc_topology_t umfGetTopology(void) {
+    util_init_once(&topology_initialized, umfCreateTopology);
+    return topology;
+}

src/memspaces/memspace_host_all_internal.h renamed to src/topology.h

@@ -7,20 +7,20 @@
  *
  */
 
-#ifndef UMF_MEMSPACE_HOST_ALL_INTERNAL_H
-#define UMF_MEMSPACE_HOST_ALL_INTERNAL_H 1
+#ifndef UMF_TOPOLOGY_H
+#define UMF_TOPOLOGY_H 1
+
+#include <hwloc.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-///
-/// \brief Destroys the predefined host all memspace.
-///
-void umfMemspaceHostAllDestroy(void);
+hwloc_topology_t umfGetTopology(void);
+void umfDestroyTopology(void);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* UMF_MEMSPACE_HOST_ALL_INTERNAL_H */
+#endif /* UMF_TOPOLOGY_H */