Replace linear base allocator with the global one in memspace

Signed-off-by: Lukasz Dorau <[email protected]>

Author: ldorau

src/memspace.c

@@ -38,8 +38,7 @@ static umf_result_t verifyMemTargetsTypes(umf_memspace_handle_t memspace) {
 static umf_result_t memoryTargetHandlesToPriv(umf_memspace_handle_t memspace,
                                               void ***pPrivs) {
     assert(memspace);
-    void **privs = umf_ba_linear_alloc(memspace->linear_allocator,
-                                       sizeof(void *) * memspace->size);
+    void **privs = umf_ba_global_alloc(sizeof(void *) * memspace->size);
     if (privs == NULL) {
         return UMF_RESULT_ERROR_OUT_OF_HOST_MEMORY;
     }
@@ -70,7 +69,8 @@ umf_result_t umfPoolCreateFromMemspace(umf_memspace_handle_t memspace,
     assert(verifyMemTargetsTypes(memspace) == UMF_RESULT_SUCCESS);
     ret = memspace->nodes[0]->ops->pool_create_from_memspace(
         memspace, privs, memspace->size, policy, pool);
-    // privs is freed during destroying memspace->linear_allocator
+
+    umf_ba_global_free(privs, sizeof(void *) * memspace->size);
 
     return ret;
 }
@@ -94,7 +94,8 @@ umfMemoryProviderCreateFromMemspace(umf_memspace_handle_t memspace,
     assert(verifyMemTargetsTypes(memspace) == UMF_RESULT_SUCCESS);
     ret = memspace->nodes[0]->ops->memory_provider_create_from_memspace(
         memspace, privs, memspace->size, policy, provider);
-    // privs is freed during destroying memspace->linear_allocator
+
+    umf_ba_global_free(privs, sizeof(void *) * memspace->size);
 
     return ret;
 }
@@ -105,6 +106,7 @@ void umfMemspaceDestroy(umf_memspace_handle_t memspace) {
         umfMemoryTargetDestroy(memspace->nodes[i]);
     }
 
-    umf_ba_linear_destroy(memspace->linear_allocator);
+    umf_ba_global_free(memspace->nodes,
+                       memspace->size * sizeof(umf_memory_target_handle_t));
     umf_ba_global_free(memspace, sizeof(struct umf_memspace_t));
 }

src/memspace_internal.h

@@ -13,7 +13,6 @@
 #include <umf/memspace.h>
 
 #include "base_alloc.h"
-#include "base_alloc_linear.h"
 #include "memory_target.h"
 
 #ifdef __cplusplus
@@ -23,9 +22,6 @@ extern "C" {
 struct umf_memspace_t {
     size_t size;
     umf_memory_target_handle_t *nodes;
-
-    // own local linear base allocator
-    umf_ba_linear_pool_t *linear_allocator;
 };
 
 ///

src/memspaces/memspace_numa.c

@@ -12,7 +12,6 @@
 #include "../memory_targets/memory_target_numa.h"
 #include "../memspace_internal.h"
 #include "base_alloc_global.h"
-#include "base_alloc_linear.h"
 #include "memspace_numa.h"
 
 enum umf_result_t
@@ -30,18 +29,9 @@ umfMemspaceCreateFromNumaArray(size_t *nodeIds, size_t numIds,
         return UMF_RESULT_ERROR_OUT_OF_HOST_MEMORY;
     }
 
-    umf_ba_linear_pool_t *linear_allocator =
-        umf_ba_linear_create(0 /* minimal pool size */);
-    if (!linear_allocator) {
-        ret = UMF_RESULT_ERROR_OUT_OF_HOST_MEMORY;
-        goto err_umf_ba_linear_create;
-    }
-
-    memspace->linear_allocator = linear_allocator;
-
     memspace->size = numIds;
-    memspace->nodes = (umf_memory_target_handle_t *)umf_ba_linear_alloc(
-        linear_allocator, numIds * sizeof(umf_memory_target_handle_t));
+    memspace->nodes = (umf_memory_target_handle_t *)umf_ba_global_alloc(
+        memspace->size * sizeof(umf_memory_target_handle_t));
     if (!memspace->nodes) {
         ret = UMF_RESULT_ERROR_OUT_OF_HOST_MEMORY;
         goto err_nodes_alloc;
@@ -62,12 +52,12 @@ umfMemspaceCreateFromNumaArray(size_t *nodeIds, size_t numIds,
     return UMF_RESULT_SUCCESS;
 
 err_target_create:
+    umf_ba_global_free(memspace->nodes,
+                       memspace->size * sizeof(umf_memory_target_handle_t));
     for (size_t i = 0; i < nodeIdx; i++) {
         umfMemoryTargetDestroy(memspace->nodes[i]);
     }
 err_nodes_alloc:
-    umf_ba_linear_destroy(linear_allocator);
-err_umf_ba_linear_create:
     umf_ba_global_free(memspace, sizeof(struct umf_memspace_t));
     return ret;
 }