mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
merge revision(s) 1613917ae6: [Backport #15784]
Defer setting gc_stress instead of setting dont_gc [Bug #15784] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@67777 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
b67fae3712
commit
8536f671b2
2 changed files with 2 additions and 8 deletions
8
gc.c
8
gc.c
|
|
@ -2386,12 +2386,6 @@ Init_heap(void)
|
|||
{
|
||||
rb_objspace_t *objspace = &rb_objspace;
|
||||
|
||||
gc_stress_set(objspace, ruby_initial_gc_stress);
|
||||
|
||||
dont_gc = 1;
|
||||
|
||||
gc_stress_set(objspace, ruby_initial_gc_stress);
|
||||
|
||||
#if RGENGC_ESTIMATE_OLDMALLOC
|
||||
objspace->rgengc.oldmalloc_increase_limit = gc_params.oldmalloc_limit_min;
|
||||
#endif
|
||||
|
|
@ -2418,7 +2412,7 @@ Init_gc_stress(void)
|
|||
{
|
||||
rb_objspace_t *objspace = &rb_objspace;
|
||||
|
||||
dont_gc = 0;
|
||||
gc_stress_set(objspace, ruby_initial_gc_stress);
|
||||
}
|
||||
|
||||
typedef int each_obj_callback(void *, void *, size_t, void *);
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#define RUBY_VERSION "2.5.6"
|
||||
#define RUBY_RELEASE_DATE "2019-08-27"
|
||||
#define RUBY_PATCHLEVEL 195
|
||||
#define RUBY_PATCHLEVEL 196
|
||||
|
||||
#define RUBY_RELEASE_YEAR 2019
|
||||
#define RUBY_RELEASE_MONTH 8
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue