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: expand sorted pages

Browse source 
* gc.c (heap_page_allocate): expand sorted pages before inserting
  allocated new page.  [Bug #12670]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59136 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-06-22 00:59:54 +00:00
parent ea57d84654
commit 7a1c10ba08
3 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
KNOWNBUGS.rb
View file

@ -5,13 +5,3 @@
# This test file includes tests which point out known bugs.
# So all tests will cause failure.
#
assert_normal_exit("#{<<-";END;"}", timeout: 5)
begin
require "-test-/typeddata"
rescue LoadError
else
n = 1 << 20
Bug::TypedData.make(n)
end
;END;

50
gc.c
View file

@ -1370,6 +1370,29 @@ rb_objspace_free(rb_objspace_t *objspace)
free(objspace);
}
static void
heap_pages_expand_sorted_to(rb_objspace_t *objspace, size_t next_length)
{
struct heap_page **sorted;
size_t size = next_length * sizeof(struct heap_page *);
gc_report(3, objspace, "heap_pages_expand_sorted: next_length: %d, size: %d\n", (int)next_length, (int)size);
if (heap_pages_sorted_length > 0) {
sorted = (struct heap_page **)realloc(heap_pages_sorted, size);
if (sorted) heap_pages_sorted = sorted;
}
else {
sorted = heap_pages_sorted = (struct heap_page **)malloc(size);
}
if (sorted == 0) {
rb_memerror();
}
heap_pages_sorted_length = next_length;
}
static void
heap_pages_expand_sorted(rb_objspace_t *objspace)
{
@ -1378,24 +1401,7 @@ heap_pages_expand_sorted(rb_objspace_t *objspace)
next_length += heap_tomb->total_pages;
if (next_length > heap_pages_sorted_length) {
struct heap_page **sorted;
size_t size = next_length * sizeof(struct heap_page *);
gc_report(3, objspace, "heap_pages_expand_sorted: next_length: %d, size: %d\n", (int)next_length, (int)size);
if (heap_pages_sorted_length > 0) {
sorted = (struct heap_page **)realloc(heap_pages_sorted, size);
if (sorted) heap_pages_sorted = sorted;
}
else {
sorted = heap_pages_sorted = (struct heap_page **)malloc(size);
}
if (sorted == 0) {
rb_memerror();
}
heap_pages_sorted_length = next_length;
heap_pages_expand_sorted_to(objspace, next_length);
}
}
@ -1533,6 +1539,9 @@ heap_page_allocate(rb_objspace_t *objspace)
rb_bug("same heap page is allocated: %p at %"PRIuVALUE, (void *)page_body, (VALUE)mid);
}
}
if (heap_allocated_pages >= heap_pages_sorted_length) {
heap_pages_expand_sorted_to(objspace, heap_allocated_pages + 1);
}
if (hi < heap_allocated_pages) {
MEMMOVE(&heap_pages_sorted[hi+1], &heap_pages_sorted[hi], struct heap_page_header*, heap_allocated_pages - hi);
}
@ -1542,7 +1551,10 @@ heap_page_allocate(rb_objspace_t *objspace)
heap_allocated_pages++;
objspace->profile.total_allocated_pages++;
if (RGENGC_CHECK_MODE) assert(heap_allocated_pages <= heap_pages_sorted_length);
if (heap_allocated_pages > heap_pages_sorted_length) {
rb_bug("heap_page_allocate: allocated(%"PRIdSIZE") > sorted(%"PRIdSIZE")",
heap_allocated_pages, heap_pages_sorted_length);
}
if (heap_pages_lomem == 0 || heap_pages_lomem > start) heap_pages_lomem = start;
if (heap_pages_himem < end) heap_pages_himem = end;

2
test/-ext-/typeddata/test_typeddata.rb
View file

@ -19,8 +19,6 @@ class Test_TypedData < Test::Unit::TestCase
end
def test_deferred_free
skip 'not solved'
assert_ruby_status([], "#{<<-"begin;"}\n#{<<-"end;"}")
require "-test-/typeddata"
begin;