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

revert da3bca513f437b05b3953c3712ff48621fc5e008

Browse Source 
It seems introduce critical problems. Now I could not find
out the issue.

http://ci.rvm.jp/results/trunk-test@ruby-sky1/3286048
This commit is contained in:
Koichi Sasada 2020-12-11 09:54:34 +09:00
parent 9b0c36b390
commit 974e89ae07
2 changed files with 13 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
gc.c
View File

@ -2157,71 +2157,34 @@ newobj_init(VALUE klass, VALUE flags, int wb_protected, rb_objspace_t *objspace,
return obj; return obj;
} }
static inline void
ractor_cache_fill_freelist(rb_objspace_t *objspace, rb_ractor_t *cr, struct heap_page *page)
{
cr->newobj_cache.using_page = page;
cr->newobj_cache.freelist = page->freelist;
page->free_slots = 0;
page->freelist = NULL;
}
static inline VALUE static inline VALUE
ractor_cached_freeobj(rb_objspace_t *objspace, rb_ractor_t *cr) ractor_cached_freeobj(rb_objspace_t *objspace, rb_ractor_t *cr)
{ {
retry:;
RVALUE *p = cr->newobj_cache.freelist; RVALUE *p = cr->newobj_cache.freelist;
if (LIKELY(p != NULL)) { if (p) {
VALUE obj = (VALUE)p; VALUE obj = (VALUE)p;
cr->newobj_cache.freelist = p->as.free.next; cr->newobj_cache.freelist = p->as.free.next;
asan_unpoison_object(obj, true); asan_unpoison_object(obj, true);
return obj; return obj;
} }
else { else {
if (cr->newobj_cache.free_pages) { return Qfalse;
struct heap_page *page = cr->newobj_cache.free_pages;
asan_unpoison_memory_region(&page->freelist, sizeof(RVALUE*), false);
cr->newobj_cache.free_pages = page->free_next;
ractor_cache_fill_freelist(objspace, cr, page);
goto retry;
}
return false;
} }
} }
#define RACTOR_SLOT_CACHE_NUM 512
static struct heap_page * static struct heap_page *
heap_next_freepages(rb_objspace_t *objspace, rb_heap_t *heap) heap_next_freepage(rb_objspace_t *objspace, rb_heap_t *heap)
{ {
ASSERT_vm_locking(); ASSERT_vm_locking();
// find at least 1 page struct heap_page *page;
while (heap->free_pages == NULL) { while (heap->free_pages == NULL) {
heap_prepare(objspace, heap); heap_prepare(objspace, heap);
} }
page = heap->free_pages;
// cache another pages if available heap->free_pages = page->free_next;
struct heap_page *page = heap->free_pages;
size_t free_slots = page->free_slots;
struct heap_page *p = page;
int page_cnt = 1;
while (p->free_next) {
if (free_slots >= RACTOR_SLOT_CACHE_NUM) {
break;
}
free_slots += p->free_slots;
p = p->free_next;
page_cnt++;
}
heap->free_pages = p->free_next;
p->free_next = NULL;
RUBY_DEBUG_LOG("free_slots:%d pages:%d", page->free_next ? (int)free_slots : (int)page->free_slots, page_cnt);
GC_ASSERT(page->free_slots != 0); GC_ASSERT(page->free_slots != 0);
RUBY_DEBUG_LOG("page:%p freelist:%p cnt:%d", page, page->freelist, page->free_slots); RUBY_DEBUG_LOG("page:%p freelist:%p cnt:%d", page, page->freelist, page->free_slots);
@ -2236,13 +2199,13 @@ ractor_cache_slots(rb_objspace_t *objspace, rb_ractor_t *cr)
{ {
ASSERT_vm_locking(); ASSERT_vm_locking();
GC_ASSERT(cr->newobj_cache.freelist == NULL); GC_ASSERT(cr->newobj_cache.freelist == NULL);
GC_ASSERT(cr->newobj_cache.free_pages == NULL);
struct heap_page *page = heap_next_freepages(objspace, heap_eden); struct heap_page *page = heap_next_freepage(objspace, heap_eden);
struct heap_page *pages = page->free_next;
ractor_cache_fill_freelist(objspace, cr, page); cr->newobj_cache.using_page = page;
cr->newobj_cache.free_pages = pages; cr->newobj_cache.freelist = page->freelist;
page->free_slots = 0;
page->freelist = NULL;
GC_ASSERT(RB_TYPE_P((VALUE)cr->newobj_cache.freelist, T_NONE)); GC_ASSERT(RB_TYPE_P((VALUE)cr->newobj_cache.freelist, T_NONE));
} }
@ -2272,7 +2235,7 @@ newobj_slowpath(VALUE klass, VALUE flags, rb_objspace_t *objspace, rb_ractor_t *
} }
// allocate new slot // allocate new slot
while ((obj = ractor_cached_freeobj(objspace, cr)) == 0) { while ((obj = ractor_cached_freeobj(objspace, cr)) == Qfalse) {
ractor_cache_slots(objspace, cr); ractor_cache_slots(objspace, cr);
} }
GC_ASSERT(obj != 0); GC_ASSERT(obj != 0);
@ -5086,17 +5049,8 @@ gc_sweep_start_heap(rb_objspace_t *objspace, rb_heap_t *heap)
*p = freelist; *p = freelist;
} }
#if 0
int free_slots = 0;
for (RVALUE *p = freelist; p; p = p->as.free.next) free_slots++;
for (struct heap_page *page = r->newobj_cache.free_pages; page;
page = page->free_next) free_slots += page->free_slots;
fprintf(stderr, "r:%d unused free_slots:%d\n", r->id, free_slots);
#endif
r->newobj_cache.using_page = NULL; r->newobj_cache.using_page = NULL;
r->newobj_cache.freelist = NULL; r->newobj_cache.freelist = NULL;
r->newobj_cache.free_pages = NULL;
} }
} }

1
ractor_core.h
View File

@ -137,7 +137,6 @@ struct rb_ractor_struct {
struct { struct {
struct RVALUE *freelist; struct RVALUE *freelist;
struct heap_page *using_page; struct heap_page *using_page;
struct heap_page *free_pages;
} newobj_cache; } newobj_cache;
// gc.c rb_objspace_reachable_objects_from // gc.c rb_objspace_reachable_objects_from