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

Correctly account for heap_pages_final_slots so it does not underflow

Browse Source 
`rb_objspace_call_finalizer` creates zombies, but does not do the correct accounting (it should increment `heap_pages_final_slots` whenever it creates a zombie). When we do correct accounting, `heap_pages_final_slots` should never underflow (the check for underflow was introduced in 39725a4db6b121c7779b2b34f7da9d9339415a1c).

The implementation moves the accounting from the functions that call `make_zombie` into `make_zombie` itself, which reduces code duplication.
This commit is contained in:
Peter Zhu 2020-08-24 10:53:11 -04:00 committed by Aaron Patterson
parent 8c030b5c00
commit 326d89b7ce
Notes: git 2020-08-26 02:14:35 +09:00 
Merged: https://github.com/ruby/ruby/pull/3450
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gc.c
View File

@ -2597,6 +2597,10 @@ make_zombie(rb_objspace_t *objspace, VALUE obj, void (*dfree)(void *), void *dat
zombie->data = data; zombie->data = data;
zombie->next = heap_pages_deferred_final; zombie->next = heap_pages_deferred_final;
heap_pages_deferred_final = (VALUE)zombie; heap_pages_deferred_final = (VALUE)zombie;
struct heap_page *page = GET_HEAP_PAGE(obj);
page->final_slots++;
heap_pages_final_slots++;
} }
static inline void static inline void
@ -3484,7 +3488,9 @@ finalize_list(rb_objspace_t *objspace, VALUE zombie)
} }
RZOMBIE(zombie)->basic.flags = 0; RZOMBIE(zombie)->basic.flags = 0;
if (LIKELY(heap_pages_final_slots)) heap_pages_final_slots--; GC_ASSERT(heap_pages_final_slots > 0);
GC_ASSERT(page->final_slots > 0);
heap_pages_final_slots--;
page->final_slots--; page->final_slots--;
page->free_slots++; page->free_slots++;
heap_page_add_freeobj(objspace, GET_HEAP_PAGE(zombie), zombie); heap_page_add_freeobj(objspace, GET_HEAP_PAGE(zombie), zombie);
@ -4324,8 +4330,6 @@ gc_page_sweep(rb_objspace_t *objspace, rb_heap_t *heap, struct heap_page *sweep_
sweep_page->free_slots = freed_slots + empty_slots; sweep_page->free_slots = freed_slots + empty_slots;
objspace->profile.total_freed_objects += freed_slots; objspace->profile.total_freed_objects += freed_slots;
heap_pages_final_slots += final_slots;
sweep_page->final_slots += final_slots;
if (heap_pages_deferred_final && !finalizing) { if (heap_pages_deferred_final && !finalizing) {
rb_thread_t *th = GET_THREAD(); rb_thread_t *th = GET_THREAD();