Use premmapped areas for smaller allocations than _small_limit.

1 files changed, 39 insertions, 14 deletions

diff --git a/vespalib/src/tests/util/mmap_file_allocator/mmap_file_allocator_test.cpp b/vespalib/src/tests/util/mmap_file_allocator/mmap_file_allocator_test.cpp
index ef16998902e..d2088ccb2b7 100644
--- a/vespalib/src/tests/util/mmap_file_allocator/mmap_file_allocator_test.cpp
+++ b/vespalib/src/tests/util/mmap_file_allocator/mmap_file_allocator_test.cpp
@@ -36,7 +36,24 @@ struct MyAlloc
 
 }
 
-class MmapFileAllocatorTest : public ::testing::Test
+struct AllocatorSetup {
+    uint32_t small_limit;
+    uint32_t premmap_size;
+
+    AllocatorSetup(uint32_t small_limit_in, uint32_t premmap_size_in)
+        : small_limit(small_limit_in),
+          premmap_size(premmap_size_in)
+    {
+    }
+};
+
+std::ostream& operator<<(std::ostream& os, const AllocatorSetup setup)
+{
+    os << "small" << setup.small_limit << "premm" << setup.premmap_size;
+    return os;
+}
+
+class MmapFileAllocatorTest : public ::testing::TestWithParam<AllocatorSetup>
 {
 protected:
     MmapFileAllocator _allocator;
@@ -47,40 +64,48 @@ public:
 };
 
 MmapFileAllocatorTest::MmapFileAllocatorTest()
-    : _allocator(basedir)
+    : _allocator(basedir, GetParam().small_limit, GetParam().premmap_size)
 {
 }
 
 MmapFileAllocatorTest::~MmapFileAllocatorTest() = default;
 
-TEST_F(MmapFileAllocatorTest, zero_sized_allocation_is_handled)
+INSTANTIATE_TEST_SUITE_P(MmapFileAllocatorMultiTest,
+                         MmapFileAllocatorTest,
+                         testing::Values(AllocatorSetup(0, 1_Mi), AllocatorSetup(512, 1_Mi), AllocatorSetup(128_Ki, 1_Mi)), testing::PrintToStringParamName());
+
+
+
+TEST_P(MmapFileAllocatorTest, zero_sized_allocation_is_handled)
 {
     MyAlloc buf(_allocator, _allocator.alloc(0));
     EXPECT_EQ(nullptr, buf.data);
     EXPECT_EQ(0u, buf.size);
 }
 
-TEST_F(MmapFileAllocatorTest, mmap_file_allocator_works)
+TEST_P(MmapFileAllocatorTest, mmap_file_allocator_works)
 {
-    MyAlloc buf(_allocator, _allocator.alloc(4));
-    EXPECT_LE(4u, buf.size);
+    MyAlloc buf(_allocator, _allocator.alloc(400));
+    EXPECT_LE(400u, buf.size);
     EXPECT_TRUE(buf.data != nullptr);
     memcpy(buf.data, "1st", 4);
-    MyAlloc buf2(_allocator, _allocator.alloc(5));
+    MyAlloc buf2(_allocator, _allocator.alloc(600));
     EXPECT_LE(5u, buf2.size);
     EXPECT_TRUE(buf2.data != nullptr);
     EXPECT_TRUE(buf.data != buf2.data);
     memcpy(buf2.data, "fine", 5);
-    EXPECT_EQ(0u, _allocator.resize_inplace(buf.asPair(), 5));
-    EXPECT_EQ(0u, _allocator.resize_inplace(buf.asPair(), 3));
+    EXPECT_EQ(0u, _allocator.resize_inplace(buf.asPair(), 500));
+    EXPECT_EQ(0u, _allocator.resize_inplace(buf.asPair(), 300));
     EXPECT_NE(0u, _allocator.get_end_offset());
-    int result = msync(buf.data, buf.size, MS_SYNC);
-    EXPECT_EQ(0, result);
-    result = msync(buf2.data, buf2.size, MS_SYNC);
-    EXPECT_EQ(0, result);
+    if (GetParam().small_limit == 0) {
+        int result = msync(buf.data, buf.size, MS_SYNC);
+        EXPECT_EQ(0, result);
+        result = msync(buf2.data, buf2.size, MS_SYNC);
+        EXPECT_EQ(0, result);
+    }
 }
 
-TEST_F(MmapFileAllocatorTest, reuse_file_offset_works)
+TEST_P(MmapFileAllocatorTest, reuse_file_offset_works)
 {
     {
         MyAlloc buf(_allocator, _allocator.alloc(hello.size() + 1));