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

remove redundant NULL check in mark functions

Browse source 
gc.c (gc_mark_children)only calls mark_func if the T_DATA ptr is
non-NULL, so avoid redundantly checking for that in each
mark function.

* iseq.c (iseq_mark): remove check for data pointer
* proc.c (binding_mark): ditto
* vm.c (rb_thread_mark): ditto
* vm_trace.c (tp_mark): ditto

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51252 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
normal 2015-07-15 08:29:22 +00:00
parent 28c42b4c25
commit a0908cb413
5 changed files with 80 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Wed Jul 15 17:27:40 2015 Eric Wong <e@80x24.org>
* iseq.c (iseq_mark): remove check for data pointer
* proc.c (binding_mark): ditto
* vm.c (rb_thread_mark): ditto
* vm_trace.c (tp_mark): ditto
Wed Jul 15 16:55:04 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Jul 15 16:55:04 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* encoding.c (enc_autoload): drop dummy encoding flag from * encoding.c (enc_autoload): drop dummy encoding flag from

31
iseq.c
View file

@ -102,27 +102,26 @@ iseq_free(void *ptr)
static void static void
iseq_mark(void *ptr) iseq_mark(void *ptr)
{ {
rb_iseq_t *iseq = ptr;
RUBY_MARK_ENTER("iseq"); RUBY_MARK_ENTER("iseq");
if (ptr) { RUBY_GC_INFO("%s @ %s\n", RSTRING_PTR(iseq->location.label), RSTRING_PTR(iseq->location.path));
rb_iseq_t *iseq = ptr;
RUBY_GC_INFO("%s @ %s\n", RSTRING_PTR(iseq->location.label), RSTRING_PTR(iseq->location.path)); RUBY_MARK_UNLESS_NULL(iseq->mark_ary);
RUBY_MARK_UNLESS_NULL(iseq->location.label);
RUBY_MARK_UNLESS_NULL(iseq->location.base_label);
RUBY_MARK_UNLESS_NULL(iseq->location.path);
RUBY_MARK_UNLESS_NULL(iseq->location.absolute_path);
RUBY_MARK_UNLESS_NULL(iseq->coverage);
RUBY_MARK_UNLESS_NULL(iseq->mark_ary); if (iseq->compile_data != 0) {
RUBY_MARK_UNLESS_NULL(iseq->location.label); struct iseq_compile_data *const compile_data = iseq->compile_data;
RUBY_MARK_UNLESS_NULL(iseq->location.base_label); RUBY_MARK_UNLESS_NULL(compile_data->mark_ary);
RUBY_MARK_UNLESS_NULL(iseq->location.path); RUBY_MARK_UNLESS_NULL(compile_data->err_info);
RUBY_MARK_UNLESS_NULL(iseq->location.absolute_path); RUBY_MARK_UNLESS_NULL(compile_data->catch_table_ary);
RUBY_MARK_UNLESS_NULL(iseq->coverage);
if (iseq->compile_data != 0) {
struct iseq_compile_data *const compile_data = iseq->compile_data;
RUBY_MARK_UNLESS_NULL(compile_data->mark_ary);
RUBY_MARK_UNLESS_NULL(compile_data->err_info);
RUBY_MARK_UNLESS_NULL(compile_data->catch_table_ary);
}
} }
RUBY_MARK_LEAVE("iseq"); RUBY_MARK_LEAVE("iseq");
} }

12
proc.c
View file

@ -243,13 +243,13 @@ binding_free(void *ptr)
static void static void
binding_mark(void *ptr) binding_mark(void *ptr)
{ {
rb_binding_t *bind; rb_binding_t *bind = ptr;
RUBY_MARK_ENTER("binding"); RUBY_MARK_ENTER("binding");
if (ptr) {
bind = ptr; RUBY_MARK_UNLESS_NULL(bind->env);
RUBY_MARK_UNLESS_NULL(bind->env); RUBY_MARK_UNLESS_NULL(bind->path);
RUBY_MARK_UNLESS_NULL(bind->path);
}
RUBY_MARK_LEAVE("binding"); RUBY_MARK_LEAVE("binding");
} }

100
vm.c
View file

@ -2053,64 +2053,62 @@ void rb_fiber_mark_self(rb_fiber_t *fib);
void void
rb_thread_mark(void *ptr) rb_thread_mark(void *ptr)
{ {
rb_thread_t *th = NULL; rb_thread_t *th = ptr;
RUBY_MARK_ENTER("thread"); RUBY_MARK_ENTER("thread");
if (ptr) {
th = ptr;
if (th->stack) {
VALUE *p = th->stack;
VALUE *sp = th->cfp->sp;
rb_control_frame_t *cfp = th->cfp;
rb_control_frame_t *limit_cfp = (void *)(th->stack + th->stack_size);
rb_gc_mark_values((long)(sp - p), p); if (th->stack) {
VALUE *p = th->stack;
VALUE *sp = th->cfp->sp;
rb_control_frame_t *cfp = th->cfp;
rb_control_frame_t *limit_cfp = (void *)(th->stack + th->stack_size);
while (cfp != limit_cfp) { rb_gc_mark_values((long)(sp - p), p);
rb_iseq_t *iseq = cfp->iseq;
rb_gc_mark(cfp->proc); while (cfp != limit_cfp) {
rb_gc_mark(cfp->self); rb_iseq_t *iseq = cfp->iseq;
if (iseq) { rb_gc_mark(cfp->proc);
rb_gc_mark(RUBY_VM_NORMAL_ISEQ_P(iseq) ? iseq->self : (VALUE)iseq); rb_gc_mark(cfp->self);
} if (iseq) {
cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp); rb_gc_mark(RUBY_VM_NORMAL_ISEQ_P(iseq) ? iseq->self : (VALUE)iseq);
} }
cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
} }
/* mark ruby objects */
RUBY_MARK_UNLESS_NULL(th->first_proc);
if (th->first_proc) RUBY_MARK_UNLESS_NULL(th->first_args);
RUBY_MARK_UNLESS_NULL(th->thgroup);
RUBY_MARK_UNLESS_NULL(th->value);
RUBY_MARK_UNLESS_NULL(th->errinfo);
RUBY_MARK_UNLESS_NULL(th->pending_interrupt_queue);
RUBY_MARK_UNLESS_NULL(th->pending_interrupt_mask_stack);
RUBY_MARK_UNLESS_NULL(th->root_svar);
RUBY_MARK_UNLESS_NULL(th->top_self);
RUBY_MARK_UNLESS_NULL(th->top_wrapper);
rb_fiber_mark_self(th->fiber);
rb_fiber_mark_self(th->root_fiber);
RUBY_MARK_UNLESS_NULL(th->stat_insn_usage);
RUBY_MARK_UNLESS_NULL(th->last_status);
RUBY_MARK_UNLESS_NULL(th->locking_mutex);
rb_mark_tbl(th->local_storage);
RUBY_MARK_UNLESS_NULL(th->local_storage_recursive_hash);
RUBY_MARK_UNLESS_NULL(th->local_storage_recursive_hash_for_trace);
if (GET_THREAD() != th && th->machine.stack_start && th->machine.stack_end) {
rb_gc_mark_machine_stack(th);
rb_gc_mark_locations((VALUE *)&th->machine.regs,
(VALUE *)(&th->machine.regs) +
sizeof(th->machine.regs) / sizeof(VALUE));
}
RUBY_MARK_UNLESS_NULL(th->name);
rb_vm_trace_mark_event_hooks(&th->event_hooks);
} }
/* mark ruby objects */
RUBY_MARK_UNLESS_NULL(th->first_proc);
if (th->first_proc) RUBY_MARK_UNLESS_NULL(th->first_args);
RUBY_MARK_UNLESS_NULL(th->thgroup);
RUBY_MARK_UNLESS_NULL(th->value);
RUBY_MARK_UNLESS_NULL(th->errinfo);
RUBY_MARK_UNLESS_NULL(th->pending_interrupt_queue);
RUBY_MARK_UNLESS_NULL(th->pending_interrupt_mask_stack);
RUBY_MARK_UNLESS_NULL(th->root_svar);
RUBY_MARK_UNLESS_NULL(th->top_self);
RUBY_MARK_UNLESS_NULL(th->top_wrapper);
rb_fiber_mark_self(th->fiber);
rb_fiber_mark_self(th->root_fiber);
RUBY_MARK_UNLESS_NULL(th->stat_insn_usage);
RUBY_MARK_UNLESS_NULL(th->last_status);
RUBY_MARK_UNLESS_NULL(th->locking_mutex);
rb_mark_tbl(th->local_storage);
RUBY_MARK_UNLESS_NULL(th->local_storage_recursive_hash);
RUBY_MARK_UNLESS_NULL(th->local_storage_recursive_hash_for_trace);
if (GET_THREAD() != th && th->machine.stack_start && th->machine.stack_end) {
rb_gc_mark_machine_stack(th);
rb_gc_mark_locations((VALUE *)&th->machine.regs,
(VALUE *)(&th->machine.regs) +
sizeof(th->machine.regs) / sizeof(VALUE));
}
RUBY_MARK_UNLESS_NULL(th->name);
rb_vm_trace_mark_event_hooks(&th->event_hooks);
RUBY_MARK_LEAVE("thread"); RUBY_MARK_LEAVE("thread");
} }

8
vm_trace.c
View file

@ -653,11 +653,9 @@ typedef struct rb_tp_struct {
static void static void
tp_mark(void *ptr) tp_mark(void *ptr)
{ {
if (ptr) { rb_tp_t *tp = ptr;
rb_tp_t *tp = (rb_tp_t *)ptr; rb_gc_mark(tp->proc);
rb_gc_mark(tp->proc); if (tp->target_th) rb_gc_mark(tp->target_th->self);
if (tp->target_th) rb_gc_mark(tp->target_th->self);
}
} }
static size_t static size_t