tracker props

Author: bratpiorka

FlameGraph

@@ -0,0 +1 @@
+Subproject commit 41fee1f99f9276008b7cd112fca19dc3ea84ac32

src/ipc.c

@@ -58,8 +58,8 @@ umf_result_t umfGetIPCHandle(const void *ptr, umf_ipc_handle_t *umfIPCHandle,
     }
 
     size_t ipcHandleSize = 0;
-    umf_alloc_info_t allocInfo;
-    umf_result_t ret = umfMemoryTrackerGetAllocInfo(ptr, &allocInfo, NULL);
+    umf_alloc_info_t allocInfo = {NULL, 0, NULL, NULL};
+    umf_result_t ret = umfMemoryTrackerGetAllocInfo(ptr, &allocInfo);
     if (ret != UMF_RESULT_SUCCESS) {
         LOG_ERR("cannot get alloc info for ptr = %p.", ptr);
         return ret;

src/memory_props.c

@@ -19,13 +19,17 @@ umf_result_t
 umfGetMemoryPropertiesHandle(const void *ptr,
                              umf_memory_properties_handle_t *props_handle) {
 
-    // TODO remove?
-    umf_alloc_info_t allocInfo = {NULL, 0, NULL};
-    umf_result_t ret = umfMemoryTrackerGetAllocInfo(ptr, &allocInfo, props_handle);
+    if (props_handle == NULL) {
+        return UMF_RESULT_ERROR_INVALID_ARGUMENT;
+    }
+
+    umf_alloc_info_t allocInfo = {NULL, 0, NULL, NULL};
+    umf_result_t ret = umfMemoryTrackerGetAllocInfo(ptr, &allocInfo);
     if (ret != UMF_RESULT_SUCCESS) {
         return UMF_RESULT_ERROR_INVALID_ARGUMENT;
     }
 
+    *props_handle = allocInfo.props;
 
     return UMF_RESULT_SUCCESS;
 }

src/memory_props_internal.h

@@ -33,15 +33,6 @@ typedef struct umf_memory_properties_t {
     uint64_t id;
     void *base;
     size_t base_size;
-
-    // TODO
-    bool gpu_properties_initialized;
-    union {
-#if UMF_BUILD_LEVEL_ZERO_PROVIDER
-        ze_memory_allocation_properties_t ze_properties;
-#endif
-        int unused; // in case of no GPU support
-    } gpu;
 } umf_memory_properties_t;
 
 #ifdef __cplusplus

src/pool/pool_disjoint.c

@@ -884,8 +884,8 @@ size_t disjoint_pool_malloc_usable_size(void *pool, const void *ptr) {
             critnib_release(disjoint_pool->known_slabs, ref_slab);
         }
 
-        umf_alloc_info_t allocInfo = {NULL, 0, NULL};
-        umf_result_t ret = umfMemoryTrackerGetAllocInfo(ptr, &allocInfo, NULL);
+        umf_alloc_info_t allocInfo = {NULL, 0, NULL, NULL};
+        umf_result_t ret = umfMemoryTrackerGetAllocInfo(ptr, &allocInfo);
         if (ret != UMF_RESULT_SUCCESS) {
             return 0;
         }
@@ -925,8 +925,8 @@ umf_result_t disjoint_pool_free(void *pool, void *ptr) {
             critnib_release(disjoint_pool->known_slabs, ref_slab);
         }
 
-        umf_alloc_info_t allocInfo = {NULL, 0, NULL};
-        umf_result_t ret = umfMemoryTrackerGetAllocInfo(ptr, &allocInfo, NULL);
+        umf_alloc_info_t allocInfo = {NULL, 0, NULL, NULL};
+        umf_result_t ret = umfMemoryTrackerGetAllocInfo(ptr, &allocInfo);
         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

@@ -97,9 +97,8 @@ static umf_result_t proxy_free(void *pool, void *ptr) {
     struct proxy_memory_pool *hPool = (struct proxy_memory_pool *)pool;
 
     if (ptr) {
-        umf_alloc_info_t allocInfo = {NULL, 0, NULL};
-        umf_result_t umf_result =
-            umfMemoryTrackerGetAllocInfo(ptr, &allocInfo, NULL);
+        umf_alloc_info_t allocInfo = {NULL, 0, NULL, NULL};
+        umf_result_t umf_result = umfMemoryTrackerGetAllocInfo(ptr, &allocInfo);
         if (umf_result == UMF_RESULT_SUCCESS) {
             size = allocInfo.baseSize;
         }

src/provider/provider_tracking.c

@@ -205,6 +205,8 @@ umfMemoryTrackerAddAtLevel(umf_memory_tracker_handle_t hTracker, int level,
     value->props.id = utils_atomic_increment_u64(&unique_alloc_id);
     value->props.base = (void *)ptr;
     value->props.base_size = size;
+    value->props.pool = pool;
+    value->props.ptr = (void *)ptr;
 
     value->size = size;
     value->n_children = 0;
@@ -472,18 +474,17 @@ umfMemoryTrackerRemoveIpcSegment(umf_memory_tracker_handle_t hTracker,
 }
 
 umf_memory_pool_handle_t umfMemoryTrackerGetPool(const void *ptr) {
-    umf_alloc_info_t allocInfo = {NULL, 0, NULL};
-    umf_result_t ret = umfMemoryTrackerGetAllocInfo(ptr, &allocInfo, NULL);
+    umf_alloc_info_t allocInfo = {NULL, 0, NULL, NULL};
+    umf_result_t ret = umfMemoryTrackerGetAllocInfo(ptr, &allocInfo);
     if (ret != UMF_RESULT_SUCCESS) {
         return NULL;
     }
 
     return allocInfo.pool;
 }
 
-umf_result_t
-umfMemoryTrackerGetAllocInfo(const void *ptr, umf_alloc_info_t *pAllocInfo,
-                             umf_memory_properties_handle_t *props) {
+umf_result_t umfMemoryTrackerGetAllocInfo(const void *ptr,
+                                          umf_alloc_info_t *pAllocInfo) {
     assert(pAllocInfo);
 
     if (ptr == NULL) {
@@ -572,11 +573,8 @@ umfMemoryTrackerGetAllocInfo(const void *ptr, umf_alloc_info_t *pAllocInfo,
     pAllocInfo->base = (void *)top_most_key;
     pAllocInfo->baseSize = top_most_value->size;
     pAllocInfo->pool = top_most_value->pool;
+    pAllocInfo->props = &top_most_value->props;
 
-    if (props != NULL) {
-        *props = &top_most_value->props;
-    }
-    
     assert(ref_top_most_value);
     critnib_release(TRACKER->alloc_segments_map[ref_level], ref_top_most_value);
 

src/provider/provider_tracking.h

@@ -41,11 +41,12 @@ typedef struct umf_alloc_info_t {
     void *base;
     size_t baseSize;
     umf_memory_pool_handle_t pool;
+
+    umf_memory_properties_handle_t props;
 } umf_alloc_info_t;
 
-umf_result_t
-umfMemoryTrackerGetAllocInfo(const void *ptr, umf_alloc_info_t *pAllocInfo,
-                             umf_memory_properties_handle_t *props_handle);
+umf_result_t umfMemoryTrackerGetAllocInfo(const void *ptr,
+                                          umf_alloc_info_t *pAllocInfo);
 
 typedef struct umf_ipc_info_t {
     void *base;