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

Free bitmap buffer if it's not used

Browse Source 
If the iseqs don't have any objects in them that need marking, then
immediately free the bitmap buffer
This commit is contained in:
Aaron Patterson 2022-06-23 16:02:42 -07:00 committed by Aaron Patterson
parent 8d63a04703
commit 0b58059f15
Notes: git 2022-06-24 08:52:21 +09:00 
Merged: https://github.com/ruby/ruby/pull/6058
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
compile.c
View File

@ -2340,6 +2340,7 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
int code_size = code_index; int code_size = code_index;
iseq_bits_t tmp[1] = {0}; iseq_bits_t tmp[1] = {0};
bool needs_bitmap = false;
if (ISEQ_MBITS_BUFLEN(code_index) == 1) { if (ISEQ_MBITS_BUFLEN(code_index) == 1) {
mark_offset_bits = tmp; mark_offset_bits = tmp;
@ -2397,6 +2398,7 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
ISEQ_MBITS_SET(mark_offset_bits, code_index + 1 + j); ISEQ_MBITS_SET(mark_offset_bits, code_index + 1 + j);
RB_OBJ_WRITTEN(iseq, Qundef, map); RB_OBJ_WRITTEN(iseq, Qundef, map);
FL_SET(iseqv, ISEQ_MARKABLE_ISEQ); FL_SET(iseqv, ISEQ_MARKABLE_ISEQ);
needs_bitmap = true;
break; break;
} }
case TS_LINDEX: case TS_LINDEX:
@ -2413,6 +2415,7 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
RB_OBJ_WRITTEN(iseq, Qundef, v); RB_OBJ_WRITTEN(iseq, Qundef, v);
ISEQ_MBITS_SET(mark_offset_bits, code_index + 1 + j); ISEQ_MBITS_SET(mark_offset_bits, code_index + 1 + j);
FL_SET(iseqv, ISEQ_MARKABLE_ISEQ); FL_SET(iseqv, ISEQ_MARKABLE_ISEQ);
needs_bitmap = true;
} }
break; break;
} }
@ -2542,7 +2545,13 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
body->mark_bits.single = mark_offset_bits[0]; body->mark_bits.single = mark_offset_bits[0];
} }
else { else {
body->mark_bits.list = mark_offset_bits; if (needs_bitmap) {
body->mark_bits.list = mark_offset_bits;
}
else {
body->mark_bits.list = 0;
ruby_xfree(mark_offset_bits);
}
} }
/* get rid of memory leak when REALLOC failed */ /* get rid of memory leak when REALLOC failed */
@ -11217,6 +11226,7 @@ ibf_load_code(const struct ibf_load *load, rb_iseq_t *iseq, ibf_offset_t bytecod
else { else {
mark_offset_bits = ZALLOC_N(iseq_bits_t, ISEQ_MBITS_BUFLEN(iseq_size)); mark_offset_bits = ZALLOC_N(iseq_bits_t, ISEQ_MBITS_BUFLEN(iseq_size));
} }
bool needs_bitmap = false;
unsigned int min_ic_index, min_ise_index, min_ivc_index; unsigned int min_ic_index, min_ise_index, min_ivc_index;
min_ic_index = min_ise_index = min_ivc_index = UINT_MAX; min_ic_index = min_ise_index = min_ivc_index = UINT_MAX;
@ -11243,6 +11253,7 @@ ibf_load_code(const struct ibf_load *load, rb_iseq_t *iseq, ibf_offset_t bytecod
RB_OBJ_WRITTEN(iseqv, Qundef, v); RB_OBJ_WRITTEN(iseqv, Qundef, v);
ISEQ_MBITS_SET(mark_offset_bits, code_index); ISEQ_MBITS_SET(mark_offset_bits, code_index);
FL_SET(iseqv, ISEQ_MARKABLE_ISEQ); FL_SET(iseqv, ISEQ_MARKABLE_ISEQ);
needs_bitmap = true;
} }
break; break;
} }
@ -11264,6 +11275,7 @@ ibf_load_code(const struct ibf_load *load, rb_iseq_t *iseq, ibf_offset_t bytecod
ISEQ_MBITS_SET(mark_offset_bits, code_index); ISEQ_MBITS_SET(mark_offset_bits, code_index);
RB_OBJ_WRITTEN(iseqv, Qundef, v); RB_OBJ_WRITTEN(iseqv, Qundef, v);
FL_SET(iseqv, ISEQ_MARKABLE_ISEQ); FL_SET(iseqv, ISEQ_MARKABLE_ISEQ);
needs_bitmap = true;
break; break;
} }
case TS_ISEQ: case TS_ISEQ:
@ -11275,6 +11287,7 @@ ibf_load_code(const struct ibf_load *load, rb_iseq_t *iseq, ibf_offset_t bytecod
RB_OBJ_WRITTEN(iseqv, Qundef, v); RB_OBJ_WRITTEN(iseqv, Qundef, v);
ISEQ_MBITS_SET(mark_offset_bits, code_index); ISEQ_MBITS_SET(mark_offset_bits, code_index);
FL_SET(iseqv, ISEQ_MARKABLE_ISEQ); FL_SET(iseqv, ISEQ_MARKABLE_ISEQ);
needs_bitmap = true;
} }
break; break;
} }
@ -11359,7 +11372,13 @@ ibf_load_code(const struct ibf_load *load, rb_iseq_t *iseq, ibf_offset_t bytecod
load_body->mark_bits.single = mark_offset_bits[0]; load_body->mark_bits.single = mark_offset_bits[0];
} }
else { else {
load_body->mark_bits.list = mark_offset_bits; if (needs_bitmap) {
load_body->mark_bits.list = mark_offset_bits;
}
else {
load_body->mark_bits.list = 0;
ruby_xfree(mark_offset_bits);
}
} }
assert(code_index == iseq_size); assert(code_index == iseq_size);

10
iseq.c
View File

@ -193,7 +193,7 @@ rb_iseq_free(const rb_iseq_t *iseq)
} }
ruby_xfree((void *)body->catch_table); ruby_xfree((void *)body->catch_table);
ruby_xfree((void *)body->param.opt_table); ruby_xfree((void *)body->param.opt_table);
if (ISEQ_MBITS_BUFLEN(body->iseq_size) > 1) { if (ISEQ_MBITS_BUFLEN(body->iseq_size) > 1 && body->mark_bits.list) {
ruby_xfree((void *)body->mark_bits.list); ruby_xfree((void *)body->mark_bits.list);
} }
@ -388,9 +388,11 @@ rb_iseq_each_value(const rb_iseq_t *iseq, iseq_value_itr_t * func, void *data)
iseq_scan_bits(0, body->mark_bits.single, code, func, data); iseq_scan_bits(0, body->mark_bits.single, code, func, data);
} }
else { else {
for (unsigned int i = 0; i < ISEQ_MBITS_BUFLEN(size); i++) { if (body->mark_bits.list) {
iseq_bits_t bits = body->mark_bits.list[i]; for (unsigned int i = 0; i < ISEQ_MBITS_BUFLEN(size); i++) {
iseq_scan_bits(i, bits, code, func, data); iseq_bits_t bits = body->mark_bits.list[i];
iseq_scan_bits(i, bits, code, func, data);
}
} }
} }
} }