1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix total_freed_objects for invalidated pages

Browse Source 
When the object is moved back into the T_MOVED, the flags of the T_MOVED
is not copied, so the FL_FROM_FREELIST flag is lost. This causes
total_freed_objects to always be incremented.
This commit is contained in:
Peter Zhu 2021-09-15 09:37:46 -04:00 committed by Peter Zhu
parent a65ac2d6fa
commit db51bcada4
Notes: git 2021-09-15 22:59:58 +09:00 
Merged: https://github.com/ruby/ruby/pull/4841
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gc.c
View File

@ -5833,6 +5833,7 @@ invalidate_moved_plane(rb_objspace_t *objspace, struct heap_page *page, uintptr_
CLEAR_IN_BITMAP(GET_HEAP_PINNED_BITS(forwarding_object), forwarding_object); CLEAR_IN_BITMAP(GET_HEAP_PINNED_BITS(forwarding_object), forwarding_object);
bool from_freelist = FL_TEST_RAW(forwarding_object, FL_FROM_FREELIST);
object = rb_gc_location(forwarding_object); object = rb_gc_location(forwarding_object);
gc_move(objspace, object, forwarding_object, page->size_pool->slot_size); gc_move(objspace, object, forwarding_object, page->size_pool->slot_size);
@ -5840,7 +5841,7 @@ invalidate_moved_plane(rb_objspace_t *objspace, struct heap_page *page, uintptr_
* is the free slot for the original page */ * is the free slot for the original page */
struct heap_page *orig_page = GET_HEAP_PAGE(object); struct heap_page *orig_page = GET_HEAP_PAGE(object);
orig_page->free_slots++; orig_page->free_slots++;
if (!FL_TEST_RAW(object, FL_FROM_FREELIST)) { if (!from_freelist) {
objspace->profile.total_freed_objects++; objspace->profile.total_freed_objects++;
} }
heap_page_add_freeobj(objspace, orig_page, object); heap_page_add_freeobj(objspace, orig_page, object);