1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Introduce a secondary arena

Browse Source 
We'll scan the secondary arena during GC mark. So, we should only
allocate "markable" instruction linked list nodes out of the secondary
arena.
This commit is contained in:
Aaron Patterson 2019-09-12 15:21:18 -07:00
parent bd017c633d
commit 3cd8f76f7f
No known key found for this signature in database
GPG Key ID: 953170BCB4FFAFC6
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compile.c
View File

@ -882,7 +882,7 @@ compile_data_alloc_with_arena(struct iseq_compile_data_storage **arena, size_t s
static void * static void *
compile_data_alloc(rb_iseq_t *iseq, size_t size) compile_data_alloc(rb_iseq_t *iseq, size_t size)
{ {
struct iseq_compile_data_storage ** arena = &ISEQ_COMPILE_DATA(iseq)->storage_current; struct iseq_compile_data_storage ** arena = &ISEQ_COMPILE_DATA(iseq)->node.storage_current;
return compile_data_alloc_with_arena(arena, size); return compile_data_alloc_with_arena(arena, size);
} }

8
iseq.c
View File

@ -75,7 +75,8 @@ static void
compile_data_free(struct iseq_compile_data *compile_data) compile_data_free(struct iseq_compile_data *compile_data)
{ {
if (compile_data) { if (compile_data) {
free_arena(compile_data->storage_head); free_arena(compile_data->node.storage_head);
free_arena(compile_data->insn.storage_head);
if (compile_data->ivar_cache_table) { if (compile_data->ivar_cache_table) {
rb_id_table_free(compile_data->ivar_cache_table); rb_id_table_free(compile_data->ivar_cache_table);
} }
@ -420,7 +421,7 @@ rb_iseq_memsize(const rb_iseq_t *iseq)
size += sizeof(struct iseq_compile_data); size += sizeof(struct iseq_compile_data);
cur = compile_data->storage_head; cur = compile_data->node.storage_head;
while (cur) { while (cur) {
size += cur->size + offsetof(struct iseq_compile_data_storage, buff); size += cur->size + offsetof(struct iseq_compile_data_storage, buff);
cur = cur->next; cur = cur->next;
@ -558,7 +559,8 @@ prepare_iseq_build(rb_iseq_t *iseq,
RB_OBJ_WRITE(iseq, &ISEQ_COMPILE_DATA(iseq)->mark_ary, rb_ary_tmp_new(3)); RB_OBJ_WRITE(iseq, &ISEQ_COMPILE_DATA(iseq)->mark_ary, rb_ary_tmp_new(3));
RB_OBJ_WRITE(iseq, &ISEQ_COMPILE_DATA(iseq)->catch_table_ary, Qnil); RB_OBJ_WRITE(iseq, &ISEQ_COMPILE_DATA(iseq)->catch_table_ary, Qnil);
ISEQ_COMPILE_DATA(iseq)->storage_head = ISEQ_COMPILE_DATA(iseq)->storage_current = new_arena(); ISEQ_COMPILE_DATA(iseq)->node.storage_head = ISEQ_COMPILE_DATA(iseq)->node.storage_current = new_arena();
ISEQ_COMPILE_DATA(iseq)->insn.storage_head = ISEQ_COMPILE_DATA(iseq)->insn.storage_current = new_arena();
ISEQ_COMPILE_DATA(iseq)->option = option; ISEQ_COMPILE_DATA(iseq)->option = option;
ISEQ_COMPILE_DATA(iseq)->ivar_cache_table = NULL; ISEQ_COMPILE_DATA(iseq)->ivar_cache_table = NULL;

10
iseq.h
View File

@ -99,8 +99,14 @@ struct iseq_compile_data {
struct iseq_label_data *redo_label; struct iseq_label_data *redo_label;
const rb_iseq_t *current_block; const rb_iseq_t *current_block;
struct iseq_compile_data_ensure_node_stack *ensure_node_stack; struct iseq_compile_data_ensure_node_stack *ensure_node_stack;
struct iseq_compile_data_storage *storage_head; struct {
struct iseq_compile_data_storage *storage_current; struct iseq_compile_data_storage *storage_head;
struct iseq_compile_data_storage *storage_current;
} node;
struct {
struct iseq_compile_data_storage *storage_head;
struct iseq_compile_data_storage *storage_current;
} insn;
int loopval_popped; /* used by NODE_BREAK */ int loopval_popped; /* used by NODE_BREAK */
int last_line; int last_line;
int label_no; int label_no;