Merge pull request #922 from DamianDuy/ensureMinBucketHasCorrectValues

[umf] ensure MinBucketSize parameter is a power of two
oneapi-src · Oct 6, 2023 · 9badc83 · 9badc83
2 parents c282ba0 + 47314b3
commit 9badc83
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/source/common/umf_pools/disjoint_pool.cpp b/source/common/umf_pools/disjoint_pool.cpp
@@ -894,6 +894,12 @@ umf_result_t DisjointPool::initialize(umf_memory_provider_handle_t *providers,
     if (numProviders != 1 || !providers[0]) {
         return UMF_RESULT_ERROR_INVALID_ARGUMENT;
     }
+    // MinBucketSize parameter must be a power of 2 for bucket sizes
+    // to generate correctly.
+    if (!parameters.MinBucketSize ||
+        !((parameters.MinBucketSize & (parameters.MinBucketSize - 1)) == 0)) {
+        return UMF_RESULT_ERROR_INVALID_ARGUMENT;
+    }
 
     impl = std::make_unique<AllocImpl>(providers[0], parameters);
     return UMF_RESULT_SUCCESS;

diff --git a/source/common/umf_pools/disjoint_pool.hpp b/source/common/umf_pools/disjoint_pool.hpp
@@ -45,7 +45,8 @@ class DisjointPoolConfig {
     size_t Capacity = 0;
 
     // Holds the minimum bucket size valid for allocation of a memory type.
-    size_t MinBucketSize = 0;
+    // This value must be a power of 2.
+    size_t MinBucketSize = 1;
 
     // Holds size of the pool managed by the allocator.
     size_t CurPoolSize = 0;