x2

Author: bratpiorka

hwloc

@@ -0,0 +1 @@
+Subproject commit 8ba08b0a8af47c176859288e716928f67f03d0c6

src/ipc.c

@@ -59,7 +59,7 @@ umf_result_t umfGetIPCHandle(const void *ptr, umf_ipc_handle_t *umfIPCHandle,
 
     size_t ipcHandleSize = 0;
     umf_memory_properties_handle_t props = NULL;
-    umf_result_t ret = umfMemoryTrackerGetAllocProps(ptr, &props);
+    umf_result_t ret = umfGetMemoryPropertiesHandle(ptr, &props);
     if (ret != UMF_RESULT_SUCCESS) {
         LOG_ERR("cannot get alloc props for ptr = %p.", ptr);
         return ret;

src/memory_pool.c

@@ -240,7 +240,13 @@ umf_result_t umfFree(void *ptr) {
 }
 
 umf_memory_pool_handle_t umfPoolByPtr(const void *ptr) {
-    return umfMemoryTrackerGetPool(ptr);
+    umf_memory_properties_handle_t props = NULL;
+    umf_result_t ret = umfGetMemoryPropertiesHandle(ptr, &props);
+    if (ret != UMF_RESULT_SUCCESS || props == NULL) {
+        return NULL;
+    }
+
+    return props->pool;
 }
 
 umf_result_t umfPoolGetMemoryProvider(umf_memory_pool_handle_t hPool,

src/memory_props.c

@@ -23,12 +23,14 @@ umfGetMemoryPropertiesHandle(const void *ptr,
         return UMF_RESULT_ERROR_INVALID_ARGUMENT;
     }
 
-    // TODO remove
-    umf_result_t ret = umfMemoryTrackerGetAllocProps(ptr, props_handle);
+    tracker_alloc_info_t *info = NULL;
+    umf_result_t ret = umfMemoryTrackerGetAllocInfo(ptr, &info);
     if (ret != UMF_RESULT_SUCCESS) {
         return UMF_RESULT_ERROR_INVALID_ARGUMENT;
     }
 
+    *props_handle = &info->props;
+
     return UMF_RESULT_SUCCESS;
 }
 

src/pool/pool_disjoint.c

@@ -885,7 +885,7 @@ size_t disjoint_pool_malloc_usable_size(void *pool, const void *ptr) {
         }
 
         umf_memory_properties_handle_t props = NULL;
-        umf_result_t umf_result = umfMemoryTrackerGetAllocProps(ptr, &props);
+        umf_result_t umf_result = umfGetMemoryPropertiesHandle(ptr, &props);
         if (umf_result != UMF_RESULT_SUCCESS) {
             return 0;
         }
@@ -932,7 +932,7 @@ umf_result_t disjoint_pool_free(void *pool, void *ptr) {
         }
 
         umf_memory_properties_handle_t props = NULL;
-        umf_result_t ret = umfMemoryTrackerGetAllocProps(ptr, &props);
+        umf_result_t ret = umfGetMemoryPropertiesHandle(ptr, &props);
         if (ret != UMF_RESULT_SUCCESS) {
             TLS_last_allocation_error = ret;
             LOG_ERR("failed to get allocation info from the memory tracker");

src/pool/pool_proxy.c

@@ -98,7 +98,7 @@ static umf_result_t proxy_free(void *pool, void *ptr) {
 
     if (ptr) {
         umf_memory_properties_handle_t props = NULL;
-        umf_result_t umf_result = umfMemoryTrackerGetAllocProps(ptr, &props);
+        umf_result_t umf_result = umfGetMemoryPropertiesHandle(ptr, &props);
 
         if (umf_result != UMF_RESULT_SUCCESS) {
             TLS_last_allocation_error = umf_result;

src/provider/provider_tracking.c

@@ -46,17 +46,6 @@ struct umf_memory_tracker_t {
     critnib *ipc_segments_map;
 };
 
-typedef struct tracker_alloc_info_t {
-    umf_memory_properties_t props;
-
-    // number of overlapping memory regions in the next level of map falling
-    // within the current range
-    size_t n_children;
-#if !defined(NDEBUG) && defined(UMF_DEVELOPER_MODE)
-    uint64_t is_freed;
-#endif
-} tracker_alloc_info_t;
-
 typedef struct tracker_ipc_info_t {
     size_t size;
     umf_memory_provider_handle_t provider;
@@ -470,20 +459,9 @@ umfMemoryTrackerRemoveIpcSegment(umf_memory_tracker_handle_t hTracker,
     return UMF_RESULT_SUCCESS;
 }
 
-umf_memory_pool_handle_t umfMemoryTrackerGetPool(const void *ptr) {
-    umf_memory_properties_handle_t props = NULL;
-    umf_result_t ret = umfMemoryTrackerGetAllocProps(ptr, &props);
-    if (ret != UMF_RESULT_SUCCESS || props == NULL) {
-        return NULL;
-    }
-
-    return props->pool;
-}
-
-umf_result_t
-umfMemoryTrackerGetAllocProps(const void *ptr,
-                              umf_memory_properties_handle_t *props) {
-    assert(props);
+umf_result_t umfMemoryTrackerGetAllocInfo(const void *ptr,
+                                          tracker_alloc_info_t **info) {
+    assert(info);
 
     if (ptr == NULL) {
         return UMF_RESULT_ERROR_INVALID_ARGUMENT;
@@ -569,7 +547,7 @@ umfMemoryTrackerGetAllocProps(const void *ptr,
         return UMF_RESULT_ERROR_INVALID_ARGUMENT;
     }
 
-    *props = &top_most_value->props;
+    *info = top_most_value;
 
     assert(ref_top_most_value);
     critnib_release(TRACKER->alloc_segments_map[ref_level], ref_top_most_value);

src/provider/provider_tracking.h

@@ -35,11 +35,19 @@ extern umf_memory_tracker_handle_t TRACKER;
 umf_memory_tracker_handle_t umfMemoryTrackerCreate(void);
 void umfMemoryTrackerDestroy(umf_memory_tracker_handle_t handle);
 
-umf_memory_pool_handle_t umfMemoryTrackerGetPool(const void *ptr);
+typedef struct tracker_alloc_info_t {
+    umf_memory_properties_t props;
+
+    // number of overlapping memory regions in the next level of map falling
+    // within the current range
+    size_t n_children;
+#if !defined(NDEBUG) && defined(UMF_DEVELOPER_MODE)
+    uint64_t is_freed;
+#endif
+} tracker_alloc_info_t;
 
-umf_result_t
-umfMemoryTrackerGetAllocProps(const void *ptr,
-                              umf_memory_properties_handle_t *props);
+umf_result_t umfMemoryTrackerGetAllocInfo(const void *ptr,
+                                          tracker_alloc_info_t **info);
 
 typedef struct umf_ipc_info_t {
     void *base;