Merge pull request #253 from ldorau/Update_pool_size_after_freeing_most_of_the_first_pool

Fix computing ptr and update pool_size

Author: bratpiorka

src/base_alloc/base_alloc_linear.c

@@ -193,9 +193,11 @@ int umf_ba_linear_free(umf_ba_linear_pool_t *pool, void *ptr) {
         if ((pool->metadata.pool_n_allocs == 0) && pool->next_pool &&
             (pool->metadata.pool_size > page_size)) {
             // we can free the first (main) pool except of the first page containing the metadata
-            void *ptr = pool + page_size;
+            void *ptr = (char *)pool + page_size;
             size_t size = pool->metadata.pool_size - page_size;
             ba_os_free(ptr, size);
+            // update pool_size
+            pool->metadata.pool_size = page_size;
         }
         _DEBUG_EXECUTE(ba_debug_checks(pool));
         util_mutex_unlock(&pool->metadata.lock);

src/utils/utils_common.h

@@ -15,6 +15,11 @@
 #include <stdlib.h>
 #include <string.h>
 
+#ifndef _WIN32
+#include <sys/syscall.h>
+#include <unistd.h>
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -31,7 +36,7 @@ extern "C" {
 
 #define __TLS __declspec(thread)
 
-static inline char *os_getenv(const char *name) {
+static inline char *util_getenv(const char *name) {
     char *buffer;
     size_t numberOfElements;
     errno_t err = _dupenv_s(&buffer, &numberOfElements, name);
@@ -42,28 +47,33 @@ static inline char *os_getenv(const char *name) {
     return buffer;
 }
 
-static inline void os_free_getenv(char *val) { free(val); }
+static inline void util_free_getenv(char *val) { free(val); }
+
+// TODO: implement util_get_page_size() for Windows
+static inline size_t util_get_page_size(void) { return 4096; }
 
 #else /* Linux */
 
 #define __TLS __thread
 
-static inline char *os_getenv(const char *name) { return getenv(name); }
-static inline void os_free_getenv(const char *val) {
+static inline char *util_getenv(const char *name) { return getenv(name); }
+static inline void util_free_getenv(const char *val) {
     (void)val; // unused
 }
 
+static inline size_t util_get_page_size(void) { return sysconf(_SC_PAGE_SIZE); }
+
 #endif /* _WIN32 */
 
 // check if we are running in the proxy library
 static inline int is_running_in_proxy_lib(void) {
     int is_in_proxy_lib_val = 0;
-    char *ld_preload = os_getenv("LD_PRELOAD");
+    char *ld_preload = util_getenv("LD_PRELOAD");
     if (ld_preload && strstr(ld_preload, "libumf_proxy.so")) {
         is_in_proxy_lib_val = 1;
     }
 
-    os_free_getenv(ld_preload);
+    util_free_getenv(ld_preload);
     return is_in_proxy_lib_val;
 }
 

test/common/test_helpers.h

@@ -70,7 +70,9 @@ static inline void UT_OUT(const char *format, ...) {
                       (unsigned long long)(rhs)),                              \
              0)))
 
+#ifndef ALIGN_UP
 #define ALIGN_UP(size, align) (((size) + (align)-1) & ~((align)-1))
+#endif
 
 int bufferIsFilledWithChar(void *ptr, size_t size, char c);
 

test/test_base_alloc_linear.cpp

@@ -10,6 +10,7 @@
 #include <thread>
 
 #include "base_alloc_linear.h"
+#include "utils_common.h"
 
 #include "base.hpp"
 #include "test_helpers.h"
@@ -56,9 +57,14 @@ TEST_F(test, baseAllocLinearMultiThreadedAllocMemset) {
 
     srand(0);
 
+    // The first pool should be bigger than one page,
+    // but not big enough to hold all allocations,
+    // so that there were more pools allocated.
+    // This is needed to test freeing the first pool.
+    size_t pool_size = 2 * util_get_page_size();
+
     auto pool = std::shared_ptr<umf_ba_linear_pool_t>(
-        umf_ba_linear_create(NTHREADS * ITERATIONS * MAX_ALLOCATION_SIZE),
-        umf_ba_linear_destroy);
+        umf_ba_linear_create(pool_size), umf_ba_linear_destroy);
 
     auto poolAlloc = [](int TID, umf_ba_linear_pool_t *pool) {
         struct buffer_t {