steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

VM: Refactor aging_collector to Factor style

db4
Erik Charlebois 2013-05-11 21:39:48 -04:00
parent a42ba561d2
commit ee9fd64b69
2 changed files with 53 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
vm/aging_collector.cpp
View File

@ -1,16 +1,13 @@
#include "master.hpp"
namespace factor
{
namespace factor {
aging_collector::aging_collector(factor_vm *parent_) :
copying_collector<aging_space,aging_policy>(
parent_,
aging_collector::aging_collector(factor_vm* parent_)
: copying_collector<aging_space, aging_policy>(parent_,
parent_->data->aging,
aging_policy(parent_)) {}
void factor_vm::collect_aging()
{
void factor_vm::collect_aging() {
/* Promote objects referenced from tenured space to tenured space, copy
everything else to the aging semi-space, and reset the nursery pointer. */
{
@ -22,15 +19,17 @@ void factor_vm::collect_aging()
gc_event* event = current_gc->event;
if(event) event->started_card_scan();
collector.trace_cards(data->tenured,
card_points_to_aging,
full_unmarker());
if(event) event->ended_card_scan(collector.cards_scanned,collector.decks_scanned);
if (event)
event->started_card_scan();
collector.trace_cards(data->tenured, card_points_to_aging, full_unmarker());
if (event)
event->ended_card_scan(collector.cards_scanned, collector.decks_scanned);
if(event) event->started_code_scan();
if (event)
event->started_code_scan();
collector.trace_code_heap_roots(&code->points_to_aging);
if(event) event->ended_code_scan(collector.code_blocks_scanned);
if (event)
event->ended_code_scan(collector.code_blocks_scanned);
collector.tenure_reachable_objects();
}

10
vm/aging_collector.hpp
View File

@ -1,18 +1,16 @@
namespace factor
{
namespace factor {
struct aging_policy {
factor_vm* parent;
aging_space* aging;
tenured_space* tenured;
explicit aging_policy(factor_vm *parent_) :
parent(parent_),
explicit aging_policy(factor_vm* parent_)
: parent(parent_),
aging(parent->data->aging),
tenured(parent->data->tenured) {}
bool should_copy_p(object *untagged)
{
bool should_copy_p(object* untagged) {
return !(aging->contains_p(untagged) || tenured->contains_p(untagged));
}