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

Move pagemap to using InvalidPointer.

Browse Source 
Replace a constant `uintptr_t` value of 1 that was repeatedly cast to a
pointer with an `InvalidPointer<1>`.
This commit is contained in:
David Chisnall
2019-04-29 13:46:57 +01:00
parent 28fac4d700
commit c3c71afa57
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mem/pagemap.h
View File

@@ -78,7 +78,7 @@ namespace snmalloc
(INDEX_LEVELS * BITS_PER_INDEX_LEVEL) + BITS_FOR_LEAF + GRANULARITY_BITS;
// Value used to represent when a node is being added too
static constexpr address_t LOCKED_ENTRY = 1;
static constexpr InvalidPointer<1> LOCKED_ENTRY;
struct Leaf
{
@@ -112,16 +112,14 @@ namespace snmalloc
// to see that correctly.
PagemapEntry* value = e->load(std::memory_order_relaxed);
if (address_cast(value) <= LOCKED_ENTRY)
if ((value == nullptr) || (value == LOCKED_ENTRY))
{
if constexpr (create_addr)
{
value = nullptr;
if (e->compare_exchange_strong(
value,
pointer_cast<PagemapEntry>(LOCKED_ENTRY),
std::memory_order_relaxed))
value, LOCKED_ENTRY, std::memory_order_relaxed))
{
auto& v = default_memory_provider;
value = v.alloc_chunk<PagemapEntry, OS_PAGE_SIZE>();