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

Hoisted out GPR_DEFAULT_REASON

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2019-08-13 09:43:11 +09:00
parent 917d766508
commit ac656bc2bd
No known key found for this signature in database
GPG Key ID: 4BC7D6DF58D8DF60
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gc.c
View File

@ -348,7 +348,11 @@ typedef enum {
GPR_FLAG_IMMEDIATE_SWEEP = 0x2000, GPR_FLAG_IMMEDIATE_SWEEP = 0x2000,
GPR_FLAG_HAVE_FINALIZE = 0x4000, GPR_FLAG_HAVE_FINALIZE = 0x4000,
GPR_FLAG_IMMEDIATE_MARK = 0x8000, GPR_FLAG_IMMEDIATE_MARK = 0x8000,
GPR_FLAG_FULL_MARK = 0x10000 GPR_FLAG_FULL_MARK = 0x10000,
GPR_DEFAULT_REASON =
(GPR_FLAG_FULL_MARK | GPR_FLAG_IMMEDIATE_MARK |
GPR_FLAG_IMMEDIATE_SWEEP | GPR_FLAG_CAPI),
} gc_profile_record_flag; } gc_profile_record_flag;
typedef struct gc_profile_record { typedef struct gc_profile_record {
@ -8268,7 +8272,7 @@ gc_compact(rb_objspace_t *objspace, int use_toward_empty, int use_double_pages,
objspace->flags.during_compacting = TRUE; objspace->flags.during_compacting = TRUE;
{ {
/* pin objects referenced by maybe pointers */ /* pin objects referenced by maybe pointers */
rb_gc(); garbage_collect(objspace, GPR_DEFAULT_REASON);
/* compact */ /* compact */
gc_compact_after_gc(objspace, use_toward_empty, use_double_pages, TRUE); gc_compact_after_gc(objspace, use_toward_empty, use_double_pages, TRUE);
} }
@ -8396,7 +8400,7 @@ gc_compact_after_gc(rb_objspace_t *objspace, int use_toward_empty, int use_doubl
mjit_gc_exit_hook(); // unlock MJIT here, because `rb_gc()` calls `mjit_gc_start_hook()` again. mjit_gc_exit_hook(); // unlock MJIT here, because `rb_gc()` calls `mjit_gc_start_hook()` again.
/* GC after compaction to eliminate T_MOVED */ /* GC after compaction to eliminate T_MOVED */
rb_gc(); garbage_collect(objspace, GPR_DEFAULT_REASON);
} }
/* /*
@ -8461,8 +8465,7 @@ void
rb_gc(void) rb_gc(void)
{ {
rb_objspace_t *objspace = &rb_objspace; rb_objspace_t *objspace = &rb_objspace;
int reason = GPR_FLAG_FULL_MARK | GPR_FLAG_IMMEDIATE_MARK | int reason = GPR_DEFAULT_REASON;
GPR_FLAG_IMMEDIATE_SWEEP | GPR_FLAG_CAPI;
garbage_collect(objspace, reason); garbage_collect(objspace, reason);
} }