Skip to content

Commit

Permalink
gc.c: separate event hook call from newobj_init
Browse files Browse the repository at this point in the history
* gc.c (newobj_init): separate event hook call and remove the
  argument for it.

* gc.c (newobj_slowpath): call event hook after initialized the
  new object.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52348 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
nobu committed Oct 29, 2015
1 parent 5869f9a commit 7f7dcb6
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions gc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1705,7 +1705,7 @@ gc_event_hook_body(rb_thread_t *th, rb_objspace_t *objspace, const rb_event_flag
} while (0)

static inline VALUE
newobj_init(VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3, int wb_protected, rb_objspace_t *objspace, VALUE obj, int hook_needed)
newobj_init(VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3, int wb_protected, rb_objspace_t *objspace, VALUE obj)
{
if (RGENGC_CHECK_MODE > 0) {
assert(BUILTIN_TYPE(obj) == T_NONE);
Expand Down Expand Up @@ -1763,9 +1763,6 @@ newobj_init(VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3, int wb_prote

objspace->total_allocated_objects++;

if (UNLIKELY(hook_needed)) {
gc_event_hook(objspace, RUBY_INTERNAL_EVENT_NEWOBJ, obj);
}
gc_report(5, objspace, "newobj: %s\n", obj_info(obj));

#if RGENGC_OLD_NEWOBJ_CHECK > 0
Expand Down Expand Up @@ -1812,7 +1809,9 @@ newobj_slowpath(VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3, int wb_p
}

obj = heap_get_freeobj(objspace, heap_eden);
return newobj_init(klass, flags, v1, v2, v3, wb_protected, objspace, obj, gc_event_hook_needed_p(objspace, RUBY_INTERNAL_EVENT_NEWOBJ));
newobj_init(klass, flags, v1, v2, v3, wb_protected, objspace, obj);
gc_event_hook(objspace, RUBY_INTERNAL_EVENT_NEWOBJ, obj);
return obj;
}

static inline VALUE
Expand All @@ -1834,7 +1833,7 @@ newobj_of(VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3, int wb_protect
ruby_gc_stressful ||
gc_event_hook_available_p(objspace)) &&
(obj = heap_get_freeobj_head(objspace, heap_eden)) != Qfalse)) {
return newobj_init(klass, flags, v1, v2, v3, wb_protected, objspace, obj, FALSE);
return newobj_init(klass, flags, v1, v2, v3, wb_protected, objspace, obj);
}
else {
return newobj_slowpath(klass, flags, v1, v2, v3, wb_protected, objspace);
Expand Down

0 comments on commit 7f7dcb6

Please sign in to comment.