зеркало из https://github.com/github/ruby.git
ext/objspace: remove OS.after_gc_start_hook= and move internal test
* ext/objspace/gc_hook.c: remove this file * ext/-test-/tracepoint/gc_hook.c: new filename for above * ext/objspace/objspace.c: remove ObjectSpace.after_gc_start_hook= * test/objspace/test_objspace.rb: remove test * test/-ext-/tracepoint/test_tracepoint.rb: add above test for tracepoint re-entry git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44007 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
tmm1
Родитель
53035271a8
Коммит
6692436b9f
|
|
@ -1,3 +1,12 @@
|
|||
Thu Dec 5 18:18:08 2013 Aman Gupta <ruby@tmm1.net>
|
||||
|
||||
* ext/objspace/gc_hook.c: remove this file
|
||||
* ext/-test-/tracepoint/gc_hook.c: new filename for above
|
||||
* ext/objspace/objspace.c: remove ObjectSpace.after_gc_start_hook=
|
||||
* test/objspace/test_objspace.rb: remove test
|
||||
* test/-ext-/tracepoint/test_tracepoint.rb: add above test for
|
||||
tracepoint re-entry
|
||||
|
||||
Thu Dec 5 17:44:53 2013 Koichi Sasada <ko1@atdot.net>
|
||||
|
||||
* gc.c: change function names vm_ prefix to objspace_ prefix.
|
||||
|
|
|
|||
|
|
@ -1,18 +1,3 @@
|
|||
/**********************************************************************
|
||||
|
||||
gc_hook.c - GC hook mechanism/ObjectSpace extender for MRI.
|
||||
|
||||
$Author$
|
||||
created at: Tue May 28 01:34:25 2013
|
||||
|
||||
NOTE: This extension library is not expected to exist except C Ruby.
|
||||
NOTE: This feature is an example usage of internal event tracing APIs.
|
||||
|
||||
All the files in this distribution are covered under the Ruby's
|
||||
license (see the file COPYING).
|
||||
|
||||
**********************************************************************/
|
||||
|
||||
#include "ruby/ruby.h"
|
||||
#include "ruby/debug.h"
|
||||
|
||||
|
|
@ -53,18 +38,18 @@ gc_start_end_i(VALUE tpval, void *data)
|
|||
}
|
||||
|
||||
static VALUE
|
||||
set_gc_hook(VALUE rb_mObjSpace, VALUE proc, rb_event_flag_t event, const char *tp_str, const char *proc_str)
|
||||
set_gc_hook(VALUE module, VALUE proc, rb_event_flag_t event, const char *tp_str, const char *proc_str)
|
||||
{
|
||||
VALUE tpval;
|
||||
ID tp_key = rb_intern(tp_str);
|
||||
ID proc_key = rb_intern(proc_str);
|
||||
|
||||
/* disable previous keys */
|
||||
if (rb_ivar_defined(rb_mObjSpace, tp_key) != 0 &&
|
||||
RTEST(tpval = rb_ivar_get(rb_mObjSpace, tp_key))) {
|
||||
if (rb_ivar_defined(module, tp_key) != 0 &&
|
||||
RTEST(tpval = rb_ivar_get(module, tp_key))) {
|
||||
rb_tracepoint_disable(tpval);
|
||||
rb_ivar_set(rb_mObjSpace, tp_key, Qnil);
|
||||
rb_ivar_set(rb_mObjSpace, proc_key, Qnil);
|
||||
rb_ivar_set(module, tp_key, Qnil);
|
||||
rb_ivar_set(module, proc_key, Qnil);
|
||||
}
|
||||
|
||||
if (RTEST(proc)) {
|
||||
|
|
@ -73,8 +58,8 @@ set_gc_hook(VALUE rb_mObjSpace, VALUE proc, rb_event_flag_t event, const char *t
|
|||
}
|
||||
|
||||
tpval = rb_tracepoint_new(0, event, gc_start_end_i, (void *)proc);
|
||||
rb_ivar_set(rb_mObjSpace, tp_key, tpval);
|
||||
rb_ivar_set(rb_mObjSpace, proc_key, proc); /* GC guard */
|
||||
rb_ivar_set(module, tp_key, tpval);
|
||||
rb_ivar_set(module, proc_key, proc); /* GC guard */
|
||||
rb_tracepoint_enable(tpval);
|
||||
}
|
||||
|
||||
|
|
@ -82,14 +67,14 @@ set_gc_hook(VALUE rb_mObjSpace, VALUE proc, rb_event_flag_t event, const char *t
|
|||
}
|
||||
|
||||
static VALUE
|
||||
set_after_gc_start(VALUE rb_mObjSpace, VALUE proc)
|
||||
set_after_gc_start(VALUE module, VALUE proc)
|
||||
{
|
||||
return set_gc_hook(rb_mObjSpace, proc, RUBY_INTERNAL_EVENT_GC_START,
|
||||
return set_gc_hook(module, proc, RUBY_INTERNAL_EVENT_GC_START,
|
||||
"__set_after_gc_start_tpval__", "__set_after_gc_start_proc__");
|
||||
}
|
||||
|
||||
void
|
||||
Init_gc_hook(VALUE rb_mObjSpace)
|
||||
Init_gc_hook(VALUE module)
|
||||
{
|
||||
rb_define_module_function(rb_mObjSpace, "after_gc_start_hook=", set_after_gc_start, 1);
|
||||
rb_define_module_function(module, "after_gc_start_hook=", set_after_gc_start, 1);
|
||||
}
|
||||
|
|
@ -85,10 +85,13 @@ tracepoint_specify_normal_and_internal_events(VALUE self)
|
|||
return Qnil; /* should not be reached */
|
||||
}
|
||||
|
||||
void Init_gc_hook(VALUE);
|
||||
|
||||
void
|
||||
Init_tracepoint(void)
|
||||
{
|
||||
VALUE mBug = rb_define_module("Bug");
|
||||
Init_gc_hook(mBug);
|
||||
rb_define_module_function(mBug, "tracepoint_track_objspace_events", tracepoint_track_objspace_events, 0);
|
||||
rb_define_module_function(mBug, "tracepoint_specify_normal_and_internal_events", tracepoint_specify_normal_and_internal_events, 0);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -716,7 +716,6 @@ reachable_objects_from_root(VALUE self)
|
|||
}
|
||||
|
||||
void Init_object_tracing(VALUE rb_mObjSpace);
|
||||
void Init_gc_hook(VALUE rb_mObjSpace);
|
||||
void Init_objspace_dump(VALUE rb_mObjSpace);
|
||||
|
||||
/*
|
||||
|
|
@ -768,6 +767,5 @@ Init_objspace(void)
|
|||
rb_define_method(rb_mInternalObjectWrapper, "internal_object_id", iow_internal_object_id, 0);
|
||||
|
||||
Init_object_tracing(rb_mObjSpace);
|
||||
Init_gc_hook(rb_mObjSpace);
|
||||
Init_objspace_dump(rb_mObjSpace);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
require 'test/unit'
|
||||
require '-test-/tracepoint'
|
||||
require_relative '../../ruby/envutil'
|
||||
|
||||
class TestTracepointObj < Test::Unit::TestCase
|
||||
def test_not_available_from_ruby
|
||||
|
|
@ -56,4 +57,24 @@ class TestTracepointObj < Test::Unit::TestCase
|
|||
def test_tracepoint_specify_normal_and_internal_events
|
||||
assert_raise(TypeError){ Bug.tracepoint_specify_normal_and_internal_events }
|
||||
end
|
||||
|
||||
def test_after_gc_start_hook_with_GC_stress
|
||||
bug8492 = '[ruby-dev:47400] [Bug #8492]: infinite after_gc_start_hook reentrance'
|
||||
assert_nothing_raised(Timeout::Error, bug8492) do
|
||||
assert_in_out_err(%w[-r-test-/tracepoint], <<-'end;', /\A[1-9]/, timeout: 2)
|
||||
stress, GC.stress = GC.stress, false
|
||||
count = 0
|
||||
Bug.after_gc_start_hook = proc {count += 1}
|
||||
begin
|
||||
GC.stress = true
|
||||
3.times {Object.new}
|
||||
ensure
|
||||
GC.stress = stress
|
||||
Bug.after_gc_start_hook = nil
|
||||
end
|
||||
puts count
|
||||
end;
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
|
|
|||
|
|
@ -193,25 +193,6 @@ class TestObjSpace < Test::Unit::TestCase
|
|||
assert_equal(nil, ObjectSpace.allocation_sourcefile(obj3))
|
||||
end
|
||||
|
||||
def test_after_gc_start_hook_with_GC_stress
|
||||
bug8492 = '[ruby-dev:47400] [Bug #8492]: infinite after_gc_start_hook reentrance'
|
||||
assert_nothing_raised(Timeout::Error, bug8492) do
|
||||
assert_in_out_err(%w[-robjspace], <<-'end;', /\A[1-9]/, timeout: 2)
|
||||
stress, GC.stress = GC.stress, false
|
||||
count = 0
|
||||
ObjectSpace.after_gc_start_hook = proc {count += 1}
|
||||
begin
|
||||
GC.stress = true
|
||||
3.times {Object.new}
|
||||
ensure
|
||||
GC.stress = stress
|
||||
ObjectSpace.after_gc_start_hook = nil
|
||||
end
|
||||
puts count
|
||||
end;
|
||||
end
|
||||
end
|
||||
|
||||
def test_dump_to_default
|
||||
line = nil
|
||||
info = nil
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче