ruby-changes:72156
From: Matt <ko1@a...>
Date: Tue, 14 Jun 2022 02:11:51 +0900 (JST)
Subject: [ruby-changes:72156] 56cc3e99b6 (master): Move String RVALUES between pools
https://git.ruby-lang.org/ruby.git/commit/?id=56cc3e99b6 From 56cc3e99b6b9ec004255280337f6b8353f5e5b06 Mon Sep 17 00:00:00 2001 From: Matt Valentine-House <matt@e...> Date: Wed, 6 Apr 2022 09:55:23 +0100 Subject: Move String RVALUES between pools And re-embed any strings that can now fit inside the slot they've been moved to --- gc.c | 102 +++++++++++++++++++++++++---------- include/ruby/internal/core/rstring.h | 3 ++ internal/string.h | 4 ++ string.c | 77 ++++++++++++++++++++++++-- test/ruby/test_gc_compact.rb | 39 ++++++++++++++ 5 files changed, 194 insertions(+), 31 deletions(-) diff --git a/gc.c b/gc.c index 42ccae0d11..b3b44e87a1 100644 --- a/gc.c +++ b/gc.c @@ -837,6 +837,8 @@ typedef struct rb_objspace { https://github.com/ruby/ruby/blob/trunk/gc.c#L837 struct { size_t considered_count_table[T_MASK]; size_t moved_count_table[T_MASK]; + size_t moved_up_count_table[T_MASK]; + size_t moved_down_count_table[T_MASK]; size_t total_moved; } rcompactor; @@ -5091,7 +5093,7 @@ gc_setup_mark_bits(struct heap_page *page) https://github.com/ruby/ruby/blob/trunk/gc.c#L5093 } static int gc_is_moveable_obj(rb_objspace_t *objspace, VALUE obj); -static VALUE gc_move(rb_objspace_t *objspace, VALUE scan, VALUE free, size_t slot_size); +static VALUE gc_move(rb_objspace_t *objspace, VALUE scan, VALUE free, size_t src_slot_size, size_t slot_size); static void lock_page_body(rb_objspace_t *objspace, struct heap_page_body *body) @@ -5130,6 +5132,7 @@ unlock_page_body(rb_objspace_t *objspace, struct heap_page_body *body) https://github.com/ruby/ruby/blob/trunk/gc.c#L5132 static bool try_move(rb_objspace_t *objspace, rb_heap_t *heap, struct heap_page *free_page, VALUE src) { + struct heap_page *src_page = GET_HEAP_PAGE(src); if (!free_page) { return false; } @@ -5150,12 +5153,16 @@ try_move(rb_objspace_t *objspace, rb_heap_t *heap, struct heap_page *free_page, https://github.com/ruby/ruby/blob/trunk/gc.c#L5153 free_page->freelist = RANY(dest)->as.free.next; GC_ASSERT(RB_BUILTIN_TYPE(dest) == T_NONE); - GC_ASSERT(free_page->slot_size == GET_HEAP_PAGE(src)->slot_size); + if (src_page->slot_size > free_page->slot_size) { + objspace->rcompactor.moved_down_count_table[BUILTIN_TYPE(src)]++; + } else if (free_page->slot_size > src_page->slot_size) { + objspace->rcompactor.moved_up_count_table[BUILTIN_TYPE(src)]++; + } objspace->rcompactor.moved_count_table[BUILTIN_TYPE(src)]++; objspace->rcompactor.total_moved++; - gc_move(objspace, src, dest, free_page->slot_size); + gc_move(objspace, src, dest, src_page->slot_size, free_page->slot_size); gc_pin(objspace, src); free_page->free_slots--; } @@ -5907,7 +5914,7 @@ invalidate_moved_plane(rb_objspace_t *objspace, struct heap_page *page, uintptr_ https://github.com/ruby/ruby/blob/trunk/gc.c#L5914 object = rb_gc_location(forwarding_object); - gc_move(objspace, object, forwarding_object, page->slot_size); + gc_move(objspace, object, forwarding_object, GET_HEAP_PAGE(object)->slot_size, page->slot_size); /* forwarding_object is now our actual object, and "object" * is the free slot for the original page */ struct heap_page *orig_page = GET_HEAP_PAGE(object); @@ -5976,6 +5983,8 @@ gc_compact_start(rb_objspace_t *objspace) https://github.com/ruby/ruby/blob/trunk/gc.c#L5983 memset(objspace->rcompactor.considered_count_table, 0, T_MASK * sizeof(size_t)); memset(objspace->rcompactor.moved_count_table, 0, T_MASK * sizeof(size_t)); + memset(objspace->rcompactor.moved_up_count_table, 0, T_MASK * sizeof(size_t)); + memset(objspace->rcompactor.moved_down_count_table, 0, T_MASK * sizeof(size_t)); /* Set up read barrier for pages containing MOVED objects */ install_handlers(); @@ -8224,14 +8233,34 @@ gc_compact_heap_cursors_met_p(rb_heap_t *heap) https://github.com/ruby/ruby/blob/trunk/gc.c#L8233 return heap->sweeping_page == heap->compact_cursor; } +static rb_size_pool_t * +gc_compact_destination_pool(rb_objspace_t *objspace, rb_size_pool_t *src_pool, VALUE src) +{ + size_t obj_size; + + switch (BUILTIN_TYPE(src)) { + case T_STRING: + obj_size = rb_str_size_as_embedded(src); + if (rb_gc_size_allocatable_p(obj_size)){ + return &size_pools[size_pool_idx_for_size(obj_size)]; + } + else { + GC_ASSERT(!STR_EMBED_P(src)); + return &size_pools[0]; + } + default: + return src_pool; + } +} + static bool -gc_compact_move(rb_objspace_t *objspace, rb_heap_t *heap, VALUE src) +gc_compact_move(rb_objspace_t *objspace, rb_heap_t *heap, rb_size_pool_t *size_pool, VALUE src) { GC_ASSERT(BUILTIN_TYPE(src) != T_MOVED); - rb_heap_t *dheap = heap; + rb_heap_t *dheap = SIZE_POOL_EDEN_HEAP(gc_compact_destination_pool(objspace, size_pool, src)); if (gc_compact_heap_cursors_met_p(dheap)) { - return false; + return dheap != heap; } while (!try_move(objspace, dheap, dheap->free_pages, src)) { struct gc_sweep_context ctx = { @@ -8254,7 +8283,7 @@ gc_compact_move(rb_objspace_t *objspace, rb_heap_t *heap, VALUE src) https://github.com/ruby/ruby/blob/trunk/gc.c#L8283 } static bool -gc_compact_plane(rb_objspace_t *objspace, rb_heap_t *heap, uintptr_t p, bits_t bitset, struct heap_page *page) { +gc_compact_plane(rb_objspace_t *objspace, rb_size_pool_t *size_pool, rb_heap_t *heap, uintptr_t p, bits_t bitset, struct heap_page *page) { short slot_size = page->slot_size; short slot_bits = slot_size / BASE_SLOT_SIZE; GC_ASSERT(slot_bits > 0); @@ -8266,7 +8295,7 @@ gc_compact_plane(rb_objspace_t *objspace, rb_heap_t *heap, uintptr_t p, bits_t b https://github.com/ruby/ruby/blob/trunk/gc.c#L8295 if (bitset & 1) { objspace->rcompactor.considered_count_table[BUILTIN_TYPE(vp)]++; - if (!gc_compact_move(objspace, heap, vp)) { + if (!gc_compact_move(objspace, heap, size_pool, vp)) { //the cursors met. bubble up return false; } @@ -8295,7 +8324,7 @@ gc_compact_page(rb_objspace_t *objspace, rb_size_pool_t *size_pool, rb_heap_t *h https://github.com/ruby/ruby/blob/trunk/gc.c#L8324 bitset = (mark_bits[0] & ~pin_bits[0]); bitset >>= NUM_IN_PAGE(p); if (bitset) { - if (!gc_compact_plane(objspace, heap, (uintptr_t)p, bitset, page)) + if (!gc_compact_plane(objspace, size_pool, heap, (uintptr_t)p, bitset, page)) return false; } p += (BITS_BITLENGTH - NUM_IN_PAGE(p)) * BASE_SLOT_SIZE; @@ -8303,7 +8332,7 @@ gc_compact_page(rb_objspace_t *objspace, rb_size_pool_t *size_pool, rb_heap_t *h https://github.com/ruby/ruby/blob/trunk/gc.c#L8332 for (int j = 1; j < HEAP_PAGE_BITMAP_LIMIT; j++) { bitset = (mark_bits[j] & ~pin_bits[j]); if (bitset) { - if (!gc_compact_plane(objspace, heap, (uintptr_t)p, bitset, page)) + if (!gc_compact_plane(objspace, size_pool, heap, (uintptr_t)p, bitset, page)) return false; } p += BITS_BITLENGTH * BASE_SLOT_SIZE; @@ -8347,7 +8376,6 @@ gc_sweep_compact(rb_objspace_t *objspace) https://github.com/ruby/ruby/blob/trunk/gc.c#L8376 struct heap_page *start_page = heap->compact_cursor; if (!gc_compact_page(objspace, size_pool, heap, start_page)) { - GC_ASSERT(heap->sweeping_page == heap->compact_cursor); lock_page_body(objspace, GET_PAGE_BODY(start_page->start)); continue; @@ -9626,7 +9654,7 @@ gc_is_moveable_obj(rb_objspace_t *objspace, VALUE obj) https://github.com/ruby/ruby/blob/trunk/gc.c#L9654 } static VALUE -gc_move(rb_objspace_t *objspace, VALUE scan, VALUE free, size_t slot_size) +gc_move(rb_objspace_t *objspace, VALUE scan, VALUE free, size_t src_slot_size, size_t slot_size) { int marked; int wb_unprotected; @@ -9676,8 +9704,8 @@ gc_move(rb_objspace_t *objspace, VALUE scan, VALUE free, size_t slot_size) https://github.com/ruby/ruby/blob/trunk/gc.c#L9704 } /* Move the object */ - memcpy(dest, src, slot_size); - memset(src, 0, slot_size); + memcpy(dest, src, MIN(src_slot_size, slot_size)); + memset(src, 0, src_slot_size); /* Set bits for object in new location */ if (marking) { @@ -10271,23 +10299,31 @@ gc_update_object_references(rb_objspace_t *objspace, VALUE obj) https://github.com/ruby/ruby/blob/trunk/gc.c#L10299 break; case T_STRING: - if (STR_SHARED_P(obj)) { + { #if USE_RVARGC - VALUE orig_shared = any->as.string.as.heap.aux.shared; #endif - UPDATE_IF_MOVED(objspace, any->as.string.as.heap.aux.shared); + + if (STR_SHARED_P(obj)) { #if USE_RVARGC - VALUE shared = any->as.string.as.heap.aux.shared; - if (STR_EMBED_P(shared)) { - size_t offset = (size_t)any->as.string.as.heap.ptr - (size_t)RSTRING(orig_shared)->as.embed.ary; - GC_ASSERT(any->as.string.as.heap.ptr >= RSTRING(orig_shared)->as.embed.ary); - GC_ASSERT(offset <= (size_t)RSTRING(shared)->as.embed.len); - any->as.string.as.heap.ptr = RSTRING(shared)->as.embed.ary + offset; - } + VALUE old_root = any->as.string.as.heap.aux.shared; #endif - } - break; + UPDATE_IF_MOVED(objspace, any->as.string.as.heap.aux.shared); +#if USE_RVARGC + VALUE new_root = any->as.string.as.heap.aux.shared; + rb_str_update_shared_ary(obj, old_root, new_root); + + // if, afte (... truncated) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/