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: invoke GC before memory allocation (xmalloc/xrealloc)

Browse source 
when GC.stress = true.
  [Bug #9859]
* test/ruby/test_gc.rb: add a test.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46399 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2014-06-10 16:55:32 +00:00
parent 9ada2641c6
commit c8c9952066
3 changed files with 35 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Wed Jun 11 01:53:22 2014 Koichi Sasada <ko1@atdot.net>
* gc.c: invoke GC before memory allocation (xmalloc/xrealloc)
when GC.stress = true.
[Bug #9859]
* test/ruby/test_gc.rb: add a test.
Tue Jun 10 13:20:14 2014 Takeyuki FUJIOKA <xibbar@ruby-lang.org> Tue Jun 10 13:20:14 2014 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
* lib/cgi/core.rb: Provide a mechanism to specify the * lib/cgi/core.rb: Provide a mechanism to specify the

15
gc.c
View file

@ -6230,6 +6230,14 @@ atomic_sub_nounderflow(size_t *var, size_t sub)
} }
} }
static void
objspace_malloc_gc_stress(rb_objspace_t *objspace)
{
if (ruby_gc_stress && !ruby_disable_gc_stress && ruby_native_thread_p()) {
garbage_collect_with_gvl(objspace, gc_stress_full_mark_after_malloc_p(), TRUE, GPR_FLAG_STRESS | GPR_FLAG_MALLOC);
}
}
static void static void
objspace_malloc_increase(rb_objspace_t *objspace, void *mem, size_t new_size, size_t old_size, enum memop_type type) objspace_malloc_increase(rb_objspace_t *objspace, void *mem, size_t new_size, size_t old_size, enum memop_type type)
{ {
@ -6246,12 +6254,6 @@ objspace_malloc_increase(rb_objspace_t *objspace, void *mem, size_t new_size, si
#endif #endif
} }
if (type != MEMOP_TYPE_FREE &&
ruby_gc_stress && !ruby_disable_gc_stress &&
ruby_native_thread_p()) {
garbage_collect_with_gvl(objspace, gc_stress_full_mark_after_malloc_p(), TRUE, GPR_FLAG_MALLOC);
}
if (type == MEMOP_TYPE_MALLOC) { if (type == MEMOP_TYPE_MALLOC) {
retry: retry:
if (malloc_increase > malloc_limit && ruby_native_thread_p()) { if (malloc_increase > malloc_limit && ruby_native_thread_p()) {
@ -6335,6 +6337,7 @@ objspace_malloc_fixup(rb_objspace_t *objspace, void *mem, size_t size)
} }
#define TRY_WITH_GC(alloc) do { \ #define TRY_WITH_GC(alloc) do { \
objspace_malloc_gc_stress(objspace); \
if (!(alloc) && \ if (!(alloc) && \
(!garbage_collect_with_gvl(objspace, 1, 1, GPR_FLAG_MALLOC) || /* full mark && immediate sweep */ \ (!garbage_collect_with_gvl(objspace, 1, 1, GPR_FLAG_MALLOC) || /* full mark && immediate sweep */ \
!(alloc))) { \ !(alloc))) { \

18
test/ruby/test_gc.rb
View file

@ -312,4 +312,22 @@ class TestGc < Test::Unit::TestCase
def test_verify_internal_consistency def test_verify_internal_consistency
assert_nil(GC.verify_internal_consistency) assert_nil(GC.verify_internal_consistency)
end end
def test_gc_stress_on_realloc
assert_normal_exit(<<-'end;', '[Bug #9859]')
class C
def initialize
@a = nil
@b = nil
@c = nil
@d = nil
@e = nil
@f = nil
end
end
GC.stress = true
C.new
end;
end
end end