kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

gc.c: promote long-lived NODE_CREF objects to oldgen

Browse source 
* include/ruby/ruby.h: add RGENGC_WB_PROTECTED_NODE_CREF setting
  In a large app, this reduces the size of
  remembered_shady_object_count by 80%. [Bug #9225] [ruby-core:58947]
* gc.c (rb_node_newnode): add FL_WB_PROTECTED flag to NODE_CREF
* class.c (rewrite_cref_stack): insert OBJ_WRITE for NODE_CREF
* iseq.c (set_relation): ditto
* iseq.c (rb_iseq_clone): ditto
* vm_eval.c (rb_yield_refine_block): ditto
* vm_insnhelper.c (vm_cref_push): ditto
* vm_insnhelper.h (COPY_CREF): ditto

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44059 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
tmm1 2013-12-08 02:28:04 +00:00
parent 779ae78995
commit 8f77cfb308
8 changed files with 28 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ChangeLog
View file

@ -1,3 +1,16 @@
Sun Dec 8 11:21:00 2013 Aman Gupta <ruby@tmm1.net>
* include/ruby/ruby.h: add RGENGC_WB_PROTECTED_NODE_CREF setting
In a large app, this reduces the size of
remembered_shady_object_count by 80%. [Bug #9225] [ruby-core:58947]
* gc.c (rb_node_newnode): add FL_WB_PROTECTED flag to NODE_CREF
* class.c (rewrite_cref_stack): insert OBJ_WRITE for NODE_CREF
* iseq.c (set_relation): ditto
* iseq.c (rb_iseq_clone): ditto
* vm_eval.c (rb_yield_refine_block): ditto
* vm_insnhelper.c (vm_cref_push): ditto
* vm_insnhelper.h (COPY_CREF): ditto
Sun Dec 8 10:45:05 2013 Aman Gupta <ruby@tmm1.net> Sun Dec 8 10:45:05 2013 Aman Gupta <ruby@tmm1.net>
* hash.c (hash_aset_str): revert r43870 due to performance issue * hash.c (hash_aset_str): revert r43870 due to performance issue

2
class.c
View file

@ -239,7 +239,7 @@ rewrite_cref_stack(NODE *node, VALUE old_klass, VALUE new_klass, NODE **new_cref
while (node) { while (node) {
if (node->nd_clss == old_klass) { if (node->nd_clss == old_klass) {
new_node = NEW_CREF(new_klass); new_node = NEW_CREF(new_klass);
new_node->nd_next = node->nd_next; OBJ_WRITE(new_node, &new_node->nd_next, node->nd_next);
*new_cref_ptr = new_node; *new_cref_ptr = new_node;
return; return;
} }

3
gc.c
View file

@ -1344,7 +1344,8 @@ rb_newobj_of(VALUE klass, VALUE flags)
NODE* NODE*
rb_node_newnode(enum node_type type, VALUE a0, VALUE a1, VALUE a2) rb_node_newnode(enum node_type type, VALUE a0, VALUE a1, VALUE a2)
{ {
NODE *n = (NODE *)newobj_of(0, T_NODE, a0, a1, a2); VALUE flags = (RGENGC_WB_PROTECTED_NODE_CREF && type == NODE_CREF ? FL_WB_PROTECTED : 0);
NODE *n = (NODE *)newobj_of(0, T_NODE | flags, a0, a1, a2);
nd_set_type(n, type); nd_set_type(n, type);
return n; return n;
} }

3
include/ruby/ruby.h
View file

@ -740,6 +740,9 @@ VALUE rb_obj_setup(VALUE obj, VALUE klass, VALUE type);
#ifndef RGENGC_WB_PROTECTED_BIGNUM #ifndef RGENGC_WB_PROTECTED_BIGNUM
#define RGENGC_WB_PROTECTED_BIGNUM 1 #define RGENGC_WB_PROTECTED_BIGNUM 1
#endif #endif
#ifndef RGENGC_WB_PROTECTED_NODE_CREF
#define RGENGC_WB_PROTECTED_NODE_CREF 1
#endif
struct RBasic { struct RBasic {
VALUE flags; VALUE flags;

6
iseq.c
View file

@ -215,7 +215,7 @@ set_relation(rb_iseq_t *iseq, const VALUE parent)
NODE *cref = NEW_CREF(th->top_wrapper); NODE *cref = NEW_CREF(th->top_wrapper);
cref->nd_refinements = Qnil; cref->nd_refinements = Qnil;
cref->nd_visi = NOEX_PRIVATE; cref->nd_visi = NOEX_PRIVATE;
cref->nd_next = iseq->cref_stack; OBJ_WRITE(cref, &cref->nd_next, iseq->cref_stack);
ISEQ_SET_CREF(iseq, cref); ISEQ_SET_CREF(iseq, cref);
} }
iseq->local_iseq = iseq; iseq->local_iseq = iseq;
@ -1930,10 +1930,10 @@ rb_iseq_clone(VALUE iseqval, VALUE newcbase)
} }
if (newcbase) { if (newcbase) {
ISEQ_SET_CREF(iseq1, NEW_CREF(newcbase)); ISEQ_SET_CREF(iseq1, NEW_CREF(newcbase));
iseq1->cref_stack->nd_refinements = iseq0->cref_stack->nd_refinements; OBJ_WRITE(iseq1->cref_stack, &iseq1->cref_stack->nd_refinements, iseq0->cref_stack->nd_refinements);
iseq1->cref_stack->nd_visi = iseq0->cref_stack->nd_visi; iseq1->cref_stack->nd_visi = iseq0->cref_stack->nd_visi;
if (iseq0->cref_stack->nd_next) { if (iseq0->cref_stack->nd_next) {
iseq1->cref_stack->nd_next = iseq0->cref_stack->nd_next; OBJ_WRITE(iseq1->cref_stack, &iseq1->cref_stack->nd_next, iseq0->cref_stack->nd_next);
} }
OBJ_WRITE(iseq1, &iseq1->klass, newcbase); OBJ_WRITE(iseq1, &iseq1->klass, newcbase);
} }

2
vm_eval.c
View file

@ -1546,7 +1546,7 @@ rb_yield_refine_block(VALUE refinement, VALUE refinements)
} }
cref = vm_cref_push(th, refinement, NOEX_PUBLIC, blockptr); cref = vm_cref_push(th, refinement, NOEX_PUBLIC, blockptr);
cref->flags |= NODE_FL_CREF_PUSHED_BY_EVAL; cref->flags |= NODE_FL_CREF_PUSHED_BY_EVAL;
cref->nd_refinements = refinements; OBJ_WRITE(cref, &cref->nd_refinements, refinements);
return vm_yield_with_cref(th, 0, NULL, cref); return vm_yield_with_cref(th, 0, NULL, cref);
} }

4
vm_insnhelper.c
View file

@ -285,10 +285,10 @@ vm_cref_push(rb_thread_t *th, VALUE klass, int noex, rb_block_t *blockptr)
cref->nd_visi = noex; cref->nd_visi = noex;
if (blockptr) { if (blockptr) {
cref->nd_next = vm_get_cref0(blockptr->iseq, blockptr->ep); OBJ_WRITE(cref, &cref->nd_next, vm_get_cref0(blockptr->iseq, blockptr->ep));
} }
else if (cfp) { else if (cfp) {
cref->nd_next = vm_get_cref0(cfp->iseq, cfp->ep); OBJ_WRITE(cref, &cref->nd_next, vm_get_cref0(cfp->iseq, cfp->ep));
} }
/* TODO: why cref->nd_next is 1? */ /* TODO: why cref->nd_next is 1? */
if (cref->nd_next && cref->nd_next != (void *) 1 && if (cref->nd_next && cref->nd_next != (void *) 1 &&

6
vm_insnhelper.h
View file

@ -174,7 +174,7 @@ enum vm_regan_acttype {
/**********************************************************/ /**********************************************************/
#define COPY_CREF_OMOD(c1, c2) do { \ #define COPY_CREF_OMOD(c1, c2) do { \
(c1)->nd_refinements = (c2)->nd_refinements; \ OBJ_WRITE((c1), &(c1)->nd_refinements, (c2)->nd_refinements); \
if (!NIL_P((c2)->nd_refinements)) { \ if (!NIL_P((c2)->nd_refinements)) { \
(c1)->flags |= NODE_FL_CREF_OMOD_SHARED; \ (c1)->flags |= NODE_FL_CREF_OMOD_SHARED; \
(c2)->flags |= NODE_FL_CREF_OMOD_SHARED; \ (c2)->flags |= NODE_FL_CREF_OMOD_SHARED; \
@ -184,9 +184,9 @@ enum vm_regan_acttype {
#define COPY_CREF(c1, c2) do { \ #define COPY_CREF(c1, c2) do { \
NODE *__tmp_c2 = (c2); \ NODE *__tmp_c2 = (c2); \
COPY_CREF_OMOD(c1, __tmp_c2); \ COPY_CREF_OMOD(c1, __tmp_c2); \
(c1)->nd_clss = __tmp_c2->nd_clss; \ OBJ_WRITE((c1), &(c1)->nd_clss, __tmp_c2->nd_clss); \
(c1)->nd_visi = __tmp_c2->nd_visi;\ (c1)->nd_visi = __tmp_c2->nd_visi;\
(c1)->nd_next = __tmp_c2->nd_next; \ OBJ_WRITE((c1), &(c1)->nd_next, __tmp_c2->nd_next); \
if (__tmp_c2->flags & NODE_FL_CREF_PUSHED_BY_EVAL) { \ if (__tmp_c2->flags & NODE_FL_CREF_PUSHED_BY_EVAL) { \
(c1)->flags |= NODE_FL_CREF_PUSHED_BY_EVAL; \ (c1)->flags |= NODE_FL_CREF_PUSHED_BY_EVAL; \
} \ } \