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

NFC: FreeObject: shift readers to take domestication callbacks

Browse Source 
If we're going to check next's prev in atomic_read_next, we will need to
domesticate the next pointer first.  We could push the check up, but that opens
boxes, so it's simpler to plumb domestication this far down.  For symmetry, we
also plumb to (non-atomic) read_next.
This commit is contained in:
Nathaniel Wesley Filardo
2021-09-28 12:49:48 +01:00
committed by Nathaniel Wesley Filardo
parent e25db7b832
commit 06e333a3a9
3 changed files with 51 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/mem/corealloc.h
View File

@@ -416,7 +416,7 @@ namespace snmalloc
#ifdef SNMALLOC_TRACING
std::cout << "Handling remote" << std::endl;
#endif
handle_dealloc_remote(entry, p, need_post);
handle_dealloc_remote(entry, r.first.as_void(), need_post);
}
if (need_post)
@@ -435,7 +435,7 @@ namespace snmalloc
*/
void handle_dealloc_remote(
const MetaEntry& entry,
FreeObject::QueuePtr<capptr::bounds::AllocFull> p,
CapPtr<void, capptr::bounds::AllocFull> p,
bool& need_post)
{
// TODO this needs to not double count stats
@@ -716,6 +716,9 @@ namespace snmalloc
bool flush(bool destroy_queue = false)
{
SNMALLOC_ASSERT(attached_cache != nullptr);
// TODO: Placeholder
auto domesticate = [](FreeObject::QueuePtr<capptr::bounds::AllocFull> p)
SNMALLOC_FAST_PATH_LAMBDA { return p; };
if (destroy_queue)
{
@@ -724,10 +727,10 @@ namespace snmalloc
while (p != nullptr)
{
bool need_post = true; // Always going to post, so ignore.
auto n = p->atomic_read_next(key_global);
auto n = p->atomic_read_next(key_global, domesticate);
auto& entry = SharedStateHandle::Pagemap::get_metaentry(
backend_state_ptr(), snmalloc::address_cast(p));
handle_dealloc_remote(entry, p, need_post);
handle_dealloc_remote(entry, p.as_void(), need_post);
// XXX n is not known to be domesticated
p = n;
}