roland/xo-expression2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xo-alloc: alter GC to use LinearAlloc directly - retire ListAlloc

Browse source
This commit is contained in:
Roland Conybeare 2025-08-12 13:14:01 -05:00
commit cbaa4c90f8
4 changed files with 30 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

11
xo-alloc/include/xo/alloc/ArenaAlloc.hpp
View file

@ -28,15 +28,20 @@ namespace xo {
ArenaAlloc(ArenaAlloc &&) = delete;
~ArenaAlloc();
/** create allocator with capacity @p z,
/** Create allocator with capacity @p z,
* Reserve memory addresses for @p z bytes,
* but don't commit them until needed
**/
static up<ArenaAlloc> make(const std::string & name,
std::size_t z,
bool debug_flag);
std::size_t z,
bool debug_flag);
std::byte * free_ptr() const { return free_ptr_; }
void set_free_ptr(std::byte * x);
/** Reset to empty state **/
void reset(std::size_t /*z_ignored*/) { this->clear(); }
void capture_object_statistics(capture_phase phase,
ObjectStatistics * p_dest) const;

18
xo-alloc/include/xo/alloc/GC.hpp
View file

@ -5,7 +5,7 @@
#pragma once
#include "ListAlloc.hpp"
#include "ArenaAlloc.hpp"
#include "GcStatistics.hpp"
#include "xo/callback/UpCallbackSet.hpp"
#include "xo/indentlog/print/array.hpp"
@ -240,14 +240,14 @@ namespace xo {
virtual std::byte * alloc_gc_copy(std::size_t z, const void * src) final override;
private:
ListAlloc * nursery_to() const { return nursery(role::to_space); }
ListAlloc * nursery_from() const { return nursery(role::from_space); }
ArenaAlloc * nursery_to() const { return nursery(role::to_space); }
ArenaAlloc * nursery_from() const { return nursery(role::from_space); }
ListAlloc * tenured_to() const { return tenured(role::to_space); }
ListAlloc * tenured_from() const { return tenured(role::from_space); }
ArenaAlloc * tenured_to() const { return tenured(role::to_space); }
ArenaAlloc * tenured_from() const { return tenured(role::from_space); }
ListAlloc * nursery(role r) const { return nursery_[role2int(r)].get(); }
ListAlloc * tenured(role r) const { return tenured_[role2int(r)].get(); }
ArenaAlloc * nursery(role r) const { return nursery_[role2int(r)].get(); }
ArenaAlloc * tenured(role r) const { return tenured_[role2int(r)].get(); }
MutationLog * mutation_log(role r) const { return mutation_log_[role2int(r)].get(); }
@ -314,11 +314,11 @@ namespace xo {
/** contains allocated objects, along with unreachable garbage to be collected.
* roles reverse after each incremental, or full, collection.
**/
std::array<up<ListAlloc>, role2int(role::N)> nursery_;
std::array<up<ArenaAlloc>, role2int(role::N)> nursery_;
/** empty space, destination for objects that survive collection.
* roles reverse after each full collection.
**/
std::array<up<ListAlloc>, role2int(role::N)> tenured_;
std::array<up<ArenaAlloc>, role2int(role::N)> tenured_;
/** current state of GC activity.
* @text