aboutsummaryrefslogtreecommitdiffstats
path: root/vespalib/src/tests/util
diff options
context:
space:
mode:
authorArne Juul <arnej@verizonmedia.com>2021-02-15 13:54:24 +0000
committerArne Juul <arnej@verizonmedia.com>2021-02-15 14:16:17 +0000
commitc0b8734987176a93588909739af143c6b0a1a6ff (patch)
tree33340f0cfc5e9e4b8691abdaa378712f3bf8ded5 /vespalib/src/tests/util
parente385cf1498861b27da4312828613bdabab9b2161 (diff)
use size literals in vespalib
Diffstat (limited to 'vespalib/src/tests/util')
-rw-r--r--vespalib/src/tests/util/generationhandler_stress/generation_handler_stress_test.cpp6
-rw-r--r--vespalib/src/tests/util/rcuvector/rcuvector_test.cpp7
2 files changed, 7 insertions, 6 deletions
diff --git a/vespalib/src/tests/util/generationhandler_stress/generation_handler_stress_test.cpp b/vespalib/src/tests/util/generationhandler_stress/generation_handler_stress_test.cpp
index 2c1463e506a..f606b7aa39e 100644
--- a/vespalib/src/tests/util/generationhandler_stress/generation_handler_stress_test.cpp
+++ b/vespalib/src/tests/util/generationhandler_stress/generation_handler_stress_test.cpp
@@ -2,9 +2,9 @@
#include <vespa/log/log.h>
LOG_SETUP("generation_handler_stress_test");
#include <vespa/vespalib/testkit/testapp.h>
-
#include <vespa/vespalib/util/generationhandler.h>
#include <vespa/vespalib/util/threadstackexecutor.h>
+#include <vespa/vespalib/util/size_literals.h>
using vespalib::Executor;
using vespalib::GenerationHandler;
@@ -52,8 +52,8 @@ private:
Fixture::Fixture(uint32_t readThreads)
: _generationHandler(),
_readThreads(readThreads),
- _writer(1, 128 * 1024),
- _readers(readThreads, 128 * 1024),
+ _writer(1, 128_Ki),
+ _readers(readThreads, 128_Ki),
_doneWriteWork(0),
_doneReadWork(0),
_stopRead(0),
diff --git a/vespalib/src/tests/util/rcuvector/rcuvector_test.cpp b/vespalib/src/tests/util/rcuvector/rcuvector_test.cpp
index 4cbfbfebd3c..d0f319d4a0b 100644
--- a/vespalib/src/tests/util/rcuvector/rcuvector_test.cpp
+++ b/vespalib/src/tests/util/rcuvector/rcuvector_test.cpp
@@ -2,6 +2,7 @@
#include <vespa/vespalib/testkit/testapp.h>
#include <vespa/vespalib/util/rcuvector.h>
+#include <vespa/vespalib/util/size_literals.h>
using namespace vespalib;
@@ -241,13 +242,13 @@ struct ShrinkFixture {
GenerationHolder g;
RcuVectorBase<int> vec;
int *oldPtr;
- ShrinkFixture() : g(), vec(4096, 50, 0, g, alloc::Alloc::allocMMap()), oldPtr()
+ ShrinkFixture() : g(), vec(4_Ki, 50, 0, g, alloc::Alloc::allocMMap()), oldPtr()
{
for (size_t i = 0; i < 4000; ++i) {
vec.push_back(7);
}
EXPECT_EQUAL(4000u, vec.size());
- EXPECT_EQUAL(4096u, vec.capacity());
+ EXPECT_EQUAL(4_Ki, vec.capacity());
assertEmptyHoldList();
oldPtr = &vec[0];
}
@@ -263,7 +264,7 @@ TEST_F("require that shrink() does not increase allocated memory", ShrinkFixture
{
f.vec.shrink(2732);
EXPECT_EQUAL(2732u, f.vec.size());
- EXPECT_EQUAL(4096u, f.vec.capacity());
+ EXPECT_EQUAL(4_Ki, f.vec.capacity());
TEST_DO(f.assertOldEqualNewBuffer());
TEST_DO(f.assertEmptyHoldList());
}