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

* gc.c (make_deferred): clear flags to T_ZOMBIE.

Browse Source 
* gc.c (slot_sweep_body): fix indent.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41405 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2013-06-18 22:26:57 +00:00
parent 0393a91926
commit d879849b6e
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Wed Jun 19 07:25:35 2013 Koichi Sasada <ko1@atdot.net>
* gc.c (make_deferred): clear flags to T_ZOMBIE.
* gc.c (slot_sweep_body): fix indent.
Wed Jun 19 07:18:47 2013 Tanaka Akira <akr@fsij.org> Wed Jun 19 07:18:47 2013 Tanaka Akira <akr@fsij.org>
* bignum.c (rb_big_aref): Apply BIGLO to ~xds[i] for environment which * bignum.c (rb_big_aref): Apply BIGLO to ~xds[i] for environment which

9
gc.c
View File

@ -1151,7 +1151,7 @@ free_unused_heaps(rb_objspace_t *objspace)
static inline void static inline void
make_deferred(RVALUE *p) make_deferred(RVALUE *p)
{ {
p->as.basic.flags = (p->as.basic.flags & ~T_MASK) | T_ZOMBIE; p->as.basic.flags = T_ZOMBIE;
} }
static inline void static inline void
@ -2200,19 +2200,16 @@ slot_sweep_body(rb_objspace_t *objspace, struct heaps_slot *sweep_slot, const in
if ((bitset & 1) && BUILTIN_TYPE(p) != T_ZOMBIE) { if ((bitset & 1) && BUILTIN_TYPE(p) != T_ZOMBIE) {
if (p->as.basic.flags) { if (p->as.basic.flags) {
#if GC_PROFILE_MORE_DETAIL #if GC_PROFILE_MORE_DETAIL
if(record) if(record) record->removing_objects++;
record->removing_objects++;
#endif #endif
rgengc_report(3, objspace, "slot_sweep_body: free %p (%s)\n", p, obj_type_name((VALUE)p)); rgengc_report(3, objspace, "slot_sweep_body: free %p (%s)\n", p, obj_type_name((VALUE)p));
#if USE_RGENGC && RGENGC_CHECK_MODE #if USE_RGENGC && RGENGC_CHECK_MODE
if (objspace->rgengc.during_minor_gc && RVALUE_PROMOTED(p)) rb_bug("slot_sweep_body: %p (%s) is promoted.\n", p, obj_type_name((VALUE)p)); if (objspace->rgengc.during_minor_gc && RVALUE_PROMOTED(p)) rb_bug("slot_sweep_body: %p (%s) is promoted.\n", p, obj_type_name((VALUE)p));
if (rgengc_remembered(objspace, (VALUE)p)) rb_bug("slot_sweep_body: %p (%s) is remembered.\n", p, obj_type_name((VALUE)p)); if (rgengc_remembered(objspace, (VALUE)p)) rb_bug("slot_sweep_body: %p (%s) is remembered.\n", p, obj_type_name((VALUE)p));
#endif #endif
if ((deferred = obj_free(objspace, (VALUE)p)) || if ((deferred = obj_free(objspace, (VALUE)p)) || (FL_TEST(p, FL_FINALIZE))) {
(FL_TEST(p, FL_FINALIZE))) {
if (!deferred) { if (!deferred) {
p->as.free.flags = T_ZOMBIE; p->as.free.flags = T_ZOMBIE;
RDATA(p)->dfree = 0; RDATA(p)->dfree = 0;
} }
p->as.free.next = deferred_final_list; p->as.free.next = deferred_final_list;