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: Improve accuracy of objspace_live_num() and

Browse source 
allocated/freed counters. patched by tmm1(Aman Gupta).
  [Bug #8092] [ruby-core:53392]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39812 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nari 2013-03-18 15:30:02 +00:00
parent 1bc93a1591
commit 80329d3a66
3 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Tue Mar 19 00:26:22 2013 Narihiro Nakamura <authornari@gmail.com>
* gc.c: Improve accuracy of objspace_live_num() and
allocated/freed counters. patched by tmm1(Aman Gupta).
[Bug #8092] [ruby-core:53392]
Mon Mar 18 21:42:48 2013 Narihiro Nakamura <authornari@gmail.com> Mon Mar 18 21:42:48 2013 Narihiro Nakamura <authornari@gmail.com>
* gc.c: Avoid unnecessary heap growth. patched by tmm1(Aman Gupta). * gc.c: Avoid unnecessary heap growth. patched by tmm1(Aman Gupta).

8
gc.c
View file

@ -1431,13 +1431,11 @@ finalize_list(rb_objspace_t *objspace, RVALUE *p)
while (p) { while (p) {
RVALUE *tmp = p->as.free.next; RVALUE *tmp = p->as.free.next;
run_final(objspace, (VALUE)p); run_final(objspace, (VALUE)p);
objspace->total_freed_object_num++;
if (!FL_TEST(p, FL_SINGLETON)) { /* not freeing page */ if (!FL_TEST(p, FL_SINGLETON)) { /* not freeing page */
add_slot_local_freelist(objspace, p); add_slot_local_freelist(objspace, p);
if (!is_lazy_sweeping(objspace)) {
objspace->total_freed_object_num++;
objspace->heap.free_num++; objspace->heap.free_num++;
} }
}
else { else {
struct heaps_slot *slot = (struct heaps_slot *)(VALUE)RDATA(p)->dmark; struct heaps_slot *slot = (struct heaps_slot *)(VALUE)RDATA(p)->dmark;
slot->header->limit--; slot->header->limit--;
@ -1940,9 +1938,9 @@ slot_sweep(rb_objspace_t *objspace, struct heaps_slot *sweep_slot)
else { else {
sweep_slot->free_next = NULL; sweep_slot->free_next = NULL;
} }
objspace->total_freed_object_num += freed_num;
objspace->heap.free_num += freed_num + empty_num; objspace->heap.free_num += freed_num + empty_num;
} }
objspace->total_freed_object_num += freed_num;
objspace->heap.final_num += final_num; objspace->heap.final_num += final_num;
if (deferred_final_list && !finalizing) { if (deferred_final_list && !finalizing) {
@ -2969,11 +2967,11 @@ rb_gc_force_recycle(VALUE p)
rb_objspace_t *objspace = &rb_objspace; rb_objspace_t *objspace = &rb_objspace;
struct heaps_slot *slot; struct heaps_slot *slot;
objspace->total_freed_object_num++;
if (MARKED_IN_BITMAP(GET_HEAP_BITMAP(p), p)) { if (MARKED_IN_BITMAP(GET_HEAP_BITMAP(p), p)) {
add_slot_local_freelist(objspace, (RVALUE *)p); add_slot_local_freelist(objspace, (RVALUE *)p);
} }
else { else {
objspace->total_freed_object_num++;
objspace->heap.free_num++; objspace->heap.free_num++;
slot = add_slot_local_freelist(objspace, (RVALUE *)p); slot = add_slot_local_freelist(objspace, (RVALUE *)p);
if (slot->free_next == NULL) { if (slot->free_next == NULL) {

6
test/ruby/test_gc.rb
View file

@ -64,6 +64,12 @@ class TestGc < Test::Unit::TestCase
assert_equal(arg, res) assert_equal(arg, res)
assert_equal(false, res.empty?) assert_equal(false, res.empty?)
assert_kind_of(Integer, res[:count]) assert_kind_of(Integer, res[:count])
stat, count = {}, {}
GC.start
GC.stat(stat)
ObjectSpace.count_objects(count)
assert_equal(count[:TOTAL]-count[:FREE], stat[:heap_live_num])
end end
def test_singleton_method def test_singleton_method