summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog12
-rw-r--r--gc.c14
2 files changed, 19 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index b879ea1df9..2d19c5dbd3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Sep 9 18:51:36 2014 Koichi Sasada <ko1@atdot.net>
+
+ * gc.c (gc_stat_internal): fix symbol names
+ * heap_final_slot -> heap_final_slots
+ * heap_swept_slot -> heap_swept_slots
+
Tue Sep 9 18:18:07 2014 Koichi Sasada <ko1@atdot.net>
* gc.c (rb_objspace_t::heap_pages): rename field names:
@@ -12,6 +18,12 @@ Tue Sep 9 18:18:07 2014 Koichi Sasada <ko1@atdot.net>
* heap_pages_increment -> heap_allocatable_pages
* gc.c (gc_stat_internal): fix symbol names
+ * heap_used -> heap_allocated_pages
+ * heap_eden_page_length -> heap_eden_pages
+ * heap_tomb_page_length -> heap_tomb_pages
+ * heap_increment -> heap_allocatable_pages
+ * heap_length -> heap_sorted_length
+
ref: [Feature #9924]
https://docs.google.com/spreadsheets/d/11Ua4uBr6o0k-nORrZLEIIUkHJ9JRzRR0NyZfrhEEnc8/edit?usp=sharing
Yellow color fields in this table are changed.
diff --git a/gc.c b/gc.c
index 2093cf4016..d3b580b2f8 100644
--- a/gc.c
+++ b/gc.c
@@ -6269,7 +6269,7 @@ gc_stat_internal(VALUE hash_or_sym)
{
static VALUE sym_count;
static VALUE sym_heap_used, sym_heap_sorted_length, sym_heap_allocatable_pages;
- static VALUE sym_heap_live_slot, sym_heap_free_slot, sym_heap_final_slot, sym_heap_swept_slot;
+ static VALUE sym_heap_live_slot, sym_heap_free_slot, sym_heap_final_slots, sym_heap_swept_slots;
static VALUE sym_heap_eden_pages, sym_heap_tomb_pages;
static VALUE sym_total_allocated_object, sym_total_freed_object;
static VALUE sym_malloc_increase, sym_malloc_limit;
@@ -6308,8 +6308,8 @@ gc_stat_internal(VALUE hash_or_sym)
S(heap_allocatable_pages);
S(heap_live_slot);
S(heap_free_slot);
- S(heap_final_slot);
- S(heap_swept_slot);
+ S(heap_final_slots);
+ S(heap_swept_slots);
S(heap_eden_pages);
S(heap_tomb_pages);
S(total_allocated_object);
@@ -6354,8 +6354,8 @@ gc_stat_internal(VALUE hash_or_sym)
SET(heap_allocatable_pages, heap_allocatable_pages);
SET(heap_live_slot, objspace_live_slot(objspace));
SET(heap_free_slot, objspace_free_slot(objspace));
- SET(heap_final_slot, heap_pages_final_slots);
- SET(heap_swept_slot, heap_pages_swept_slots);
+ SET(heap_final_slots, heap_pages_final_slots);
+ SET(heap_swept_slots, heap_pages_swept_slots);
SET(heap_eden_pages, heap_eden->page_length);
SET(heap_tomb_pages, heap_tomb->page_length);
SET(total_allocated_object, objspace->total_allocated_object_num);
@@ -6420,8 +6420,8 @@ gc_stat_internal(VALUE hash_or_sym)
* :heap_allocatable_pages=>2,
* :heap_live_slot=>6836,
* :heap_free_slot=>519,
- * :heap_final_slot=>0,
- * :heap_swept_slot=>818,
+ * :heap_final_slots=>0,
+ * :heap_swept_slots=>818,
* :total_allocated_object=>7674,
* :total_freed_object=>838,
* :malloc_increase=>181034,