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 (gc_marks_finish): fix syntax error.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54452 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2016-03-31 08:49:09 +00:00
parent 49369ef173
commit 9bb740d2ec
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Thu Mar 31 17:48:25 2016 Koichi Sasada <ko1@atdot.net>
* gc.c (gc_marks_finish): fix syntax error.
Thu Mar 31 16:49:36 2016 Koichi Sasada <ko1@atdot.net>
* gc.c: simplify allocate/free detecting logic at the end of marking.

5
gc.c
View file

@ -5383,8 +5383,8 @@ gc_marks_finish(rb_objspace_t *objspace)
/* check free_min */
if (min_free_slots < gc_params.heap_free_slots) min_free_slots = gc_params.heap_free_slots;
if (sweep_slots < min_free_slots) {
#if USE_RGENGC
if (sweep_slots < min_free_slots) {
if (!full_marking) {
if (objspace->profile.count - objspace->rgengc.last_major_gc < RVALUE_OLD_AGE) {
full_marking = TRUE;
@ -5426,11 +5426,12 @@ gc_marks_finish(rb_objspace_t *objspace)
objspace->rgengc.need_major_gc ? "major" : "minor");
#else /* USE_RGENGC */
if (sweep_slots < min_free_slots) {
gc_report(1, objspace, "gc_marks_finish: heap_set_increment!!\n");
heap_set_increment(objspace, heap_extend_pages(objspace, sweep_slot, total_slot));
heap_increment(objspace, heap);
#endif
}
#endif
}
gc_event_hook(objspace, RUBY_INTERNAL_EVENT_GC_END_MARK, 0);

2
vm_insnhelper.c
View file

@ -663,7 +663,7 @@ vm_get_ev_const(rb_thread_t *th, VALUE orig_klass, ID id, int is_defined)
/* in current lexical scope */
const rb_cref_t *root_cref = rb_vm_get_cref(th->cfp->ep);
const rb_cref_t *cref;
VALUE klass = orig_klass;
VALUE klass = Qnil;
while (root_cref && CREF_PUSHED_BY_EVAL(root_cref)) {
root_cref = CREF_NEXT(root_cref);