VM: storing some sample data in the heap (#337)
This is the first half of it. In the second half the samples array should also be stored in the heap.char-rename
parent
90b7f9ceb3
commit
0590ebf914
|
@ -64,10 +64,13 @@ enum special_object {
|
||||||
SIGNAL_HANDLER_WORD,
|
SIGNAL_HANDLER_WORD,
|
||||||
LEAF_SIGNAL_HANDLER_WORD,
|
LEAF_SIGNAL_HANDLER_WORD,
|
||||||
WIN_EXCEPTION_HANDLER,
|
WIN_EXCEPTION_HANDLER,
|
||||||
UNUSED2,
|
|
||||||
|
|
||||||
// Incremented on every modify-code-heap call; invalidates call( inline
|
// Vector used by the sampling profiler to store collected call
|
||||||
// caching
|
// frames.
|
||||||
|
OBJ_SAMPLE_CALLSTACKS = 51,
|
||||||
|
|
||||||
|
// Incremented on every modify-code-heap call; invalidates call(
|
||||||
|
// inline caching
|
||||||
REDEFINITION_COUNTER = 52,
|
REDEFINITION_COUNTER = 52,
|
||||||
|
|
||||||
// Callback stub generation in callbacks.cpp
|
// Callback stub generation in callbacks.cpp
|
||||||
|
|
|
@ -2,6 +2,40 @@
|
||||||
|
|
||||||
namespace factor {
|
namespace factor {
|
||||||
|
|
||||||
|
// This is like the growable_array class, except the whole of it
|
||||||
|
// exists on the Factor heap. growarr = growable array.
|
||||||
|
static cell growarr_capacity(array *growarr) {
|
||||||
|
return untag_fixnum(growarr->data()[0]);
|
||||||
|
}
|
||||||
|
|
||||||
|
static cell growarr_nth(array *growarr, cell slot) {
|
||||||
|
return array_nth(untag<array>(growarr->data()[1]), slot);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Allocates memory
|
||||||
|
array* factor_vm::allot_growarr() {
|
||||||
|
data_root<array> contents(allot_array(10, false_object), this);
|
||||||
|
array *growarr = allot_uninitialized_array<array>(2);
|
||||||
|
set_array_nth(growarr, 0, tag_fixnum(0));
|
||||||
|
set_array_nth(growarr, 1, contents.value());
|
||||||
|
return growarr;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Allocates memory
|
||||||
|
void factor_vm::growarr_add(array *growarr_, cell elt_) {
|
||||||
|
data_root<array> growarr(growarr_, this);
|
||||||
|
data_root<object> elt(elt_, this);
|
||||||
|
data_root<array> contents(growarr.untagged()->data()[1], this);
|
||||||
|
|
||||||
|
cell count = growarr_capacity(growarr.untagged());
|
||||||
|
if (count == array_capacity(contents.untagged())) {
|
||||||
|
contents.set_untagged(reallot_array(contents.untagged(), 2 * count));
|
||||||
|
set_array_nth(growarr.untagged(), 1, contents.value());
|
||||||
|
}
|
||||||
|
set_array_nth(contents.untagged(), count, elt.value());
|
||||||
|
set_array_nth(growarr.untagged(), 0, tag_fixnum(count + 1));
|
||||||
|
}
|
||||||
|
|
||||||
profiling_sample_count profiling_sample_count::record_counts() volatile {
|
profiling_sample_count profiling_sample_count::record_counts() volatile {
|
||||||
atomic::fence();
|
atomic::fence();
|
||||||
profiling_sample_count returned(sample_count, gc_sample_count,
|
profiling_sample_count returned(sample_count, gc_sample_count,
|
||||||
|
@ -31,6 +65,7 @@ profiling_sample::profiling_sample(profiling_sample_count const& counts, cell th
|
||||||
callstack_begin(callstack_begin),
|
callstack_begin(callstack_begin),
|
||||||
callstack_end(callstack_end) { }
|
callstack_end(callstack_end) { }
|
||||||
|
|
||||||
|
// Allocates memory (sample_callstacks2->add)
|
||||||
void factor_vm::record_sample(bool prolog_p) {
|
void factor_vm::record_sample(bool prolog_p) {
|
||||||
profiling_sample_count counts = sample_counts.record_counts();
|
profiling_sample_count counts = sample_counts.record_counts();
|
||||||
if (counts.empty()) {
|
if (counts.empty()) {
|
||||||
|
@ -38,17 +73,20 @@ void factor_vm::record_sample(bool prolog_p) {
|
||||||
}
|
}
|
||||||
// Appends the callstack, which is just a sequence of quotation or
|
// Appends the callstack, which is just a sequence of quotation or
|
||||||
// word references, to sample_callstacks.
|
// word references, to sample_callstacks.
|
||||||
cell begin = sample_callstacks.size();
|
cell callstacks_cell = special_objects[OBJ_SAMPLE_CALLSTACKS];
|
||||||
|
data_root<array> callstacks = data_root<array>(callstacks_cell, this);
|
||||||
|
cell begin = growarr_capacity(callstacks.untagged());
|
||||||
|
|
||||||
bool skip_p = prolog_p;
|
bool skip_p = prolog_p;
|
||||||
auto recorder = [&](cell frame_top, cell size, code_block* owner, cell addr) {
|
auto recorder = [&](cell frame_top, cell size, code_block* owner, cell addr) {
|
||||||
if (skip_p)
|
if (skip_p)
|
||||||
skip_p = false;
|
skip_p = false;
|
||||||
else
|
else {
|
||||||
sample_callstacks.push_back(owner->owner);
|
growarr_add(callstacks.untagged(), owner->owner);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
iterate_callstack(ctx, recorder);
|
iterate_callstack(ctx, recorder);
|
||||||
cell end = sample_callstacks.size();
|
cell end = growarr_capacity(callstacks.untagged());
|
||||||
|
|
||||||
// Add the sample.
|
// Add the sample.
|
||||||
cell thread = special_objects[OBJ_CURRENT_THREAD];
|
cell thread = special_objects[OBJ_CURRENT_THREAD];
|
||||||
|
@ -64,16 +102,13 @@ void factor_vm::set_sampling_profiler(fixnum rate) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void factor_vm::start_sampling_profiler(fixnum rate) {
|
void factor_vm::start_sampling_profiler(fixnum rate) {
|
||||||
|
special_objects[OBJ_SAMPLE_CALLSTACKS] = tag<array>(allot_growarr());
|
||||||
samples_per_second = rate;
|
samples_per_second = rate;
|
||||||
sample_counts.clear();
|
sample_counts.clear();
|
||||||
// Release the memory consumed by collecting samples.
|
// Release the memory consumed by collecting samples.
|
||||||
samples.clear();
|
samples.clear();
|
||||||
samples.shrink_to_fit();
|
samples.shrink_to_fit();
|
||||||
sample_callstacks.clear();
|
|
||||||
sample_callstacks.shrink_to_fit();
|
|
||||||
|
|
||||||
samples.reserve(10 * rate);
|
samples.reserve(10 * rate);
|
||||||
sample_callstacks.reserve(100 * rate);
|
|
||||||
atomic::store(&sampling_profiler_p, true);
|
atomic::store(&sampling_profiler_p, true);
|
||||||
start_sampling_profiler_timer();
|
start_sampling_profiler_timer();
|
||||||
}
|
}
|
||||||
|
@ -92,12 +127,16 @@ void factor_vm::primitive_sampling_profiler() {
|
||||||
void factor_vm::primitive_get_samples() {
|
void factor_vm::primitive_get_samples() {
|
||||||
if (atomic::load(&sampling_profiler_p) || samples.empty()) {
|
if (atomic::load(&sampling_profiler_p) || samples.empty()) {
|
||||||
ctx->push(false_object);
|
ctx->push(false_object);
|
||||||
} else {
|
return;
|
||||||
|
}
|
||||||
data_root<array> samples_array(allot_array(samples.size(), false_object),
|
data_root<array> samples_array(allot_array(samples.size(), false_object),
|
||||||
this);
|
this);
|
||||||
std::vector<profiling_sample>::const_iterator from_iter = samples.begin();
|
std::vector<profiling_sample>::const_iterator from_iter = samples.begin();
|
||||||
cell to_i = 0;
|
cell to_i = 0;
|
||||||
|
|
||||||
|
cell callstacks_cell = special_objects[OBJ_SAMPLE_CALLSTACKS];
|
||||||
|
data_root<array> callstacks = data_root<array>(callstacks_cell, this);
|
||||||
|
|
||||||
for (; from_iter != samples.end(); ++from_iter, ++to_i) {
|
for (; from_iter != samples.end(); ++from_iter, ++to_i) {
|
||||||
data_root<array> sample(allot_array(7, false_object), this);
|
data_root<array> sample(allot_array(7, false_object), this);
|
||||||
|
|
||||||
|
@ -120,14 +159,14 @@ void factor_vm::primitive_get_samples() {
|
||||||
this);
|
this);
|
||||||
|
|
||||||
for (cell i = 0; i < callstack_size; i++) {
|
for (cell i = 0; i < callstack_size; i++) {
|
||||||
set_array_nth(callstack.untagged(), i,
|
cell block_owner = growarr_nth(callstacks.untagged(),
|
||||||
sample_callstacks[from_iter->callstack_begin + i]);
|
from_iter->callstack_begin + i);
|
||||||
|
set_array_nth(callstack.untagged(), i, block_owner);
|
||||||
}
|
}
|
||||||
set_array_nth(sample.untagged(), 6, callstack.value());
|
set_array_nth(sample.untagged(), 6, callstack.value());
|
||||||
set_array_nth(samples_array.untagged(), to_i, sample.value());
|
set_array_nth(samples_array.untagged(), to_i, sample.value());
|
||||||
}
|
}
|
||||||
ctx->push(samples_array.value());
|
ctx->push(samples_array.value());
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -214,10 +214,6 @@ template <typename Fixup> void slot_visitor<Fixup>::visit_all_roots() {
|
||||||
iter->second = visit_pointer(iter->second);
|
iter->second = visit_pointer(iter->second);
|
||||||
}
|
}
|
||||||
|
|
||||||
FACTOR_FOR_EACH(parent->sample_callstacks) {
|
|
||||||
visit_handle(&*iter);
|
|
||||||
}
|
|
||||||
|
|
||||||
FACTOR_FOR_EACH(parent->samples) {
|
FACTOR_FOR_EACH(parent->samples) {
|
||||||
visit_handle(&iter->thread);
|
visit_handle(&iter->thread);
|
||||||
}
|
}
|
||||||
|
|
|
@ -86,7 +86,6 @@ struct factor_vm {
|
||||||
|
|
||||||
// State kept by the sampling profiler
|
// State kept by the sampling profiler
|
||||||
std::vector<profiling_sample> samples;
|
std::vector<profiling_sample> samples;
|
||||||
std::vector<cell> sample_callstacks;
|
|
||||||
volatile profiling_sample_count sample_counts;
|
volatile profiling_sample_count sample_counts;
|
||||||
|
|
||||||
// GC is off during heap walking
|
// GC is off during heap walking
|
||||||
|
@ -193,6 +192,8 @@ struct factor_vm {
|
||||||
void set_sampling_profiler(fixnum rate);
|
void set_sampling_profiler(fixnum rate);
|
||||||
void primitive_sampling_profiler();
|
void primitive_sampling_profiler();
|
||||||
void primitive_get_samples();
|
void primitive_get_samples();
|
||||||
|
array* allot_growarr();
|
||||||
|
void growarr_add(array *growarr_, cell value);
|
||||||
|
|
||||||
// errors
|
// errors
|
||||||
void general_error(vm_error_type error, cell arg1, cell arg2);
|
void general_error(vm_error_type error, cell arg1, cell arg2);
|
||||||
|
|
Loading…
Reference in New Issue