tracker props2

Author: bratpiorka

src/ipc.c

@@ -58,14 +58,14 @@ umf_result_t umfGetIPCHandle(const void *ptr, umf_ipc_handle_t *umfIPCHandle,
     }
 
     size_t ipcHandleSize = 0;
-    umf_alloc_info_t allocInfo = {NULL, 0, NULL, NULL};
+    umf_alloc_info_t allocInfo = {NULL, 0, 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;
     }
 
-    ret = umfPoolGetIPCHandleSize(allocInfo.pool, &ipcHandleSize);
+    ret = umfPoolGetIPCHandleSize(allocInfo.props->pool, &ipcHandleSize);
     if (ret != UMF_RESULT_SUCCESS) {
         LOG_ERR("cannot get IPC handle size.");
         return ret;
@@ -79,12 +79,13 @@ umf_result_t umfGetIPCHandle(const void *ptr, umf_ipc_handle_t *umfIPCHandle,
 
     // We cannot use umfPoolGetMemoryProvider function because it returns
     // upstream provider but we need tracking one
-    if (allocInfo.pool == NULL || allocInfo.pool->provider == NULL) {
+    if (allocInfo.props == NULL || allocInfo.props->pool == NULL ||
+        allocInfo.props->pool->provider == NULL) {
         LOG_ERR("cannot get memory provider from pool");
         umf_ba_global_free(ipcData);
         return UMF_RESULT_ERROR_UNKNOWN;
     }
-    umf_memory_provider_handle_t provider = allocInfo.pool->provider;
+    umf_memory_provider_handle_t provider = allocInfo.props->pool->provider;
 
     ret = umfMemoryProviderGetIPCHandle(provider, allocInfo.base,
                                         allocInfo.baseSize,

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, NULL};
+    umf_alloc_info_t allocInfo = {NULL, 0, NULL};
     umf_result_t ret = umfMemoryTrackerGetAllocInfo(ptr, &allocInfo);
     if (ret != UMF_RESULT_SUCCESS) {
         return UMF_RESULT_ERROR_INVALID_ARGUMENT;

src/pool/pool_proxy.c

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

src/provider/provider_tracking.c

@@ -471,13 +471,13 @@ umfMemoryTrackerRemoveIpcSegment(umf_memory_tracker_handle_t hTracker,
 }
 
 umf_memory_pool_handle_t umfMemoryTrackerGetPool(const void *ptr) {
-    umf_alloc_info_t allocInfo = {NULL, 0, NULL, NULL};
+    umf_alloc_info_t allocInfo = {NULL, 0, NULL};
     umf_result_t ret = umfMemoryTrackerGetAllocInfo(ptr, &allocInfo);
     if (ret != UMF_RESULT_SUCCESS) {
         return NULL;
     }
 
-    return allocInfo.pool;
+    return allocInfo.props->pool;
 }
 
 umf_result_t umfMemoryTrackerGetAllocInfo(const void *ptr,
@@ -570,7 +570,6 @@ umf_result_t umfMemoryTrackerGetAllocInfo(const void *ptr,
 
     pAllocInfo->base = (void *)top_most_key;
     pAllocInfo->baseSize = top_most_value->props.base_size;
-    pAllocInfo->pool = top_most_value->props.pool;
     pAllocInfo->props = &top_most_value->props;
 
     assert(ref_top_most_value);

src/provider/provider_tracking.h

@@ -40,7 +40,6 @@ umf_memory_pool_handle_t umfMemoryTrackerGetPool(const void *ptr);
 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;