x

Author: bratpiorka

src/ipc.c

@@ -58,7 +58,7 @@ umf_result_t umfGetIPCHandle(const void *ptr, umf_ipc_handle_t *umfIPCHandle,
     }
 
     size_t ipcHandleSize = 0;
-    umf_alloc_info_t allocInfo = {NULL, 0, NULL};
+    umf_alloc_info_t allocInfo = {NULL};
     umf_result_t ret = umfMemoryTrackerGetAllocInfo(ptr, &allocInfo);
     if (ret != UMF_RESULT_SUCCESS) {
         LOG_ERR("cannot get alloc info for ptr = %p.", ptr);
@@ -92,8 +92,8 @@ umf_result_t umfGetIPCHandle(const void *ptr, umf_ipc_handle_t *umfIPCHandle,
     }
     umf_memory_provider_handle_t provider = allocInfo.props->pool->provider;
 
-    ret = umfMemoryProviderGetIPCHandle(provider, allocInfo.base,
-                                        allocInfo.baseSize,
+    ret = umfMemoryProviderGetIPCHandle(provider, allocInfo.props->base,
+                                        allocInfo.props->base_size,
                                         (void *)ipcData->providerIpcData);
     if (ret != UMF_RESULT_SUCCESS) {
         LOG_ERR("failed to get IPC handle.");
@@ -102,10 +102,10 @@ umf_result_t umfGetIPCHandle(const void *ptr, umf_ipc_handle_t *umfIPCHandle,
     }
 
     // ipcData->handle_id is filled by tracking provider
-    ipcData->base = allocInfo.base;
+    ipcData->base = allocInfo.props->base;
     ipcData->pid = utils_getpid();
-    ipcData->baseSize = allocInfo.baseSize;
-    ipcData->offset = (uintptr_t)ptr - (uintptr_t)allocInfo.base;
+    ipcData->baseSize = allocInfo.props->base_size;
+    ipcData->offset = (uintptr_t)ptr - (uintptr_t)allocInfo.props->base;
 
     *umfIPCHandle = ipcData;
     *size = ipcHandleSize;

src/memory_props.c

@@ -23,7 +23,7 @@ umfGetMemoryPropertiesHandle(const void *ptr,
         return UMF_RESULT_ERROR_INVALID_ARGUMENT;
     }
 
-    umf_alloc_info_t allocInfo = {NULL, 0, NULL};
+    umf_alloc_info_t allocInfo = {NULL};
     umf_result_t ret = umfMemoryTrackerGetAllocInfo(ptr, &allocInfo);
     if (ret != UMF_RESULT_SUCCESS) {
         return UMF_RESULT_ERROR_INVALID_ARGUMENT;

src/pool/pool_disjoint.c

@@ -884,13 +884,19 @@ 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_alloc_info_t allocInfo = {NULL};
         umf_result_t ret = umfMemoryTrackerGetAllocInfo(ptr, &allocInfo);
         if (ret != UMF_RESULT_SUCCESS) {
             return 0;
         }
 
-        return allocInfo.baseSize;
+        if (allocInfo.props == NULL) {
+            TLS_last_allocation_error = UMF_RESULT_ERROR_UNKNOWN;
+            LOG_ERR("failed to get allocation info from the memory tracker");
+            return 0;
+        }
+
+        return allocInfo.props->base_size;
     }
 
     // Get the unaligned pointer
@@ -925,15 +931,15 @@ 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_alloc_info_t allocInfo = {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");
             return ret;
         }
 
-        size_t size = allocInfo.baseSize;
+        size_t size = allocInfo.props->base_size;
         umf_memory_provider_handle_t provider = disjoint_pool->provider;
         ret = umfMemoryProviderFree(provider, ptr, size);
         if (ret != UMF_RESULT_SUCCESS) {

src/pool/pool_proxy.c

@@ -97,10 +97,10 @@ 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_alloc_info_t allocInfo = {NULL};
         umf_result_t umf_result = umfMemoryTrackerGetAllocInfo(ptr, &allocInfo);
         if (umf_result == UMF_RESULT_SUCCESS) {
-            size = allocInfo.baseSize;
+            size = allocInfo.props->base_size;
         }
     }
 

src/provider/provider_tracking.c

@@ -471,7 +471,7 @@ 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_alloc_info_t allocInfo = {NULL};
     umf_result_t ret = umfMemoryTrackerGetAllocInfo(ptr, &allocInfo);
     if (ret != UMF_RESULT_SUCCESS || allocInfo.props == NULL) {
         return NULL;
@@ -500,7 +500,7 @@ umf_result_t umfMemoryTrackerGetAllocInfo(const void *ptr,
 
     tracker_alloc_info_t *top_most_value = NULL;
     tracker_alloc_info_t *rvalue = NULL;
-    uintptr_t top_most_key = 0;
+    //uintptr_t top_most_key = 0;
     uintptr_t rkey = 0;
     uint64_t rsize = 0;
     size_t n_children = 0;
@@ -526,7 +526,7 @@ umf_result_t umfMemoryTrackerGetAllocInfo(const void *ptr,
                 critnib_release(TRACKER->alloc_segments_map[level], ref_value);
             }
             top_most_value = NULL;
-            top_most_key = 0;
+            //top_most_key = 0;
             rkey = 0;
             rsize = 0;
             level = 0;
@@ -541,7 +541,7 @@ umf_result_t umfMemoryTrackerGetAllocInfo(const void *ptr,
                                       &rsize);
         utils_atomic_load_acquire_size_t(&rvalue->n_children, &n_children);
         if (found && (uintptr_t)ptr < rkey + rsize) {
-            top_most_key = rkey;
+            //top_most_key = rkey;
             top_most_value = rvalue;
             if (ref_top_most_value) {
                 assert(level >= 1);
@@ -568,8 +568,6 @@ umf_result_t umfMemoryTrackerGetAllocInfo(const void *ptr,
         return UMF_RESULT_ERROR_INVALID_ARGUMENT;
     }
 
-    pAllocInfo->base = (void *)top_most_key;
-    pAllocInfo->baseSize = top_most_value->props.base_size;
     pAllocInfo->props = &top_most_value->props;
 
     assert(ref_top_most_value);

src/provider/provider_tracking.h

@@ -38,9 +38,6 @@ void umfMemoryTrackerDestroy(umf_memory_tracker_handle_t handle);
 umf_memory_pool_handle_t umfMemoryTrackerGetPool(const void *ptr);
 
 typedef struct umf_alloc_info_t {
-    void *base;
-    size_t baseSize;
-
     umf_memory_properties_handle_t props;
 } umf_alloc_info_t;