Cheri-research/snmalloc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replace assert with SNMALLOC_ASSERT

Browse Source
This commit is contained in:
Amaury Chamayou
2020-03-04 16:57:44 +00:00
parent ef77bccfc2
commit acbcbce597
30 changed files with 128 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/test/func/memory/memory.cc
View File

@@ -73,7 +73,7 @@ void test_random_allocation()
cell = alloc->alloc(16);
auto pair = allocated.insert(cell);
// Check not already allocated
assert(pair.second);
SNMALLOC_ASSERT(pair.second);
UNUSED(pair);
alloc_count++;
}
@@ -130,14 +130,14 @@ void test_double_alloc()
for (size_t i = 0; i < (n * 2); i++)
{
void* p = a1->alloc(20);
assert(set1.find(p) == set1.end());
SNMALLOC_ASSERT(set1.find(p) == set1.end());
set1.insert(p);
}
for (size_t i = 0; i < (n * 2); i++)
{
void* p = a2->alloc(20);
assert(set2.find(p) == set2.end());
SNMALLOC_ASSERT(set2.find(p) == set2.end());
set2.insert(p);
}
@@ -178,8 +178,8 @@ void test_external_pointer()
void* p4 = Alloc::external_pointer<End>(p2);
UNUSED(p3);
UNUSED(p4);
assert(p1 == p3);
assert((size_t)p4 == (size_t)p1 + size - 1);
SNMALLOC_ASSERT(p1 == p3);
SNMALLOC_ASSERT((size_t)p4 == (size_t)p1 + size - 1);
}
alloc->dealloc(p1, size);
@@ -281,7 +281,7 @@ void test_alloc_16M()
const size_t size = 16'000'000;
void* p1 = alloc->alloc(size);
assert(Alloc::alloc_size(Alloc::external_pointer(p1)) >= size);
SNMALLOC_ASSERT(Alloc::alloc_size(Alloc::external_pointer(p1)) >= size);
alloc->dealloc(p1);
}
@@ -292,7 +292,7 @@ void test_calloc_16M()
const size_t size = 16'000'000;
void* p1 = alloc->alloc<YesZero>(size);
assert(Alloc::alloc_size(Alloc::external_pointer(p1)) >= size);
SNMALLOC_ASSERT(Alloc::alloc_size(Alloc::external_pointer(p1)) >= size);
alloc->dealloc(p1);
}

2
src/test/func/sizeclass/sizeclass.cc
View File

@@ -12,7 +12,7 @@ void test_align_size()
{
bool failed = false;
assert(snmalloc::aligned_size(128, 160) == 256);
SNMALLOC_ASSERT(snmalloc::aligned_size(128, 160) == 256);
for (size_t size = 1;
size < snmalloc::sizeclass_to_size(snmalloc::NUM_SIZECLASSES - 1);

2
src/test/histogram.h
View File

@@ -77,7 +77,7 @@ namespace histogram
else
{
auto i = get_index(value);
assert(i < BUCKETS);
SNMALLOC_ASSERT(i < BUCKETS);
count[i]++;
}
}

6
src/test/perf/singlethread/singlethread.cc
View File

@@ -20,7 +20,7 @@ void test_alloc_dealloc(size_t count, size_t size, bool write)
for (size_t i = 0; i < ((count * 3) / 2); i++)
{
void* p = alloc->alloc<zero_mem>(size);
assert(set.find(p) == set.end());
SNMALLOC_ASSERT(set.find(p) == set.end());
if (write)
*(int*)p = 4;
@@ -35,14 +35,14 @@ void test_alloc_dealloc(size_t count, size_t size, bool write)
void* p = *it;
alloc->dealloc(p, size);
set.erase(it);
assert(set.find(p) == set.end());
SNMALLOC_ASSERT(set.find(p) == set.end());
}
// alloc 1x objects
for (size_t i = 0; i < count; i++)
{
void* p = alloc->alloc<zero_mem>(size);
assert(set.find(p) == set.end());
SNMALLOC_ASSERT(set.find(p) == set.end());
if (write)
*(int*)p = 4;