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

* gc.c (rb_gc_call_finalizer_at_exit): deffers IO finalization.

Browse Source 
[ruby-dev:36646]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19654 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-10-01 10:13:57 +00:00
parent 1d54761948
commit 837d3aa882
2 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Wed Oct 1 19:13:55 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* gc.c (rb_gc_call_finalizer_at_exit): deffers IO finalization.
[ruby-dev:36646]
Wed Oct 1 19:11:48 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Oct 1 19:11:48 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* marshal.c (marshal_dump): fixed for check_dump_arg. * marshal.c (marshal_dump): fixed for check_dump_arg.

35
gc.c
View File

@ -1728,6 +1728,15 @@ make_deferred(RVALUE *p)
p->as.basic.flags = (p->as.basic.flags & ~T_MASK) | T_ZOMBIE; p->as.basic.flags = (p->as.basic.flags & ~T_MASK) | T_ZOMBIE;
} }
static inline void
make_io_deferred(RVALUE *p)
{
rb_io_t *fptr = p->as.file.fptr;
make_deferred(p);
p->as.data.dfree = (void (*)(void*))rb_io_fptr_finalize;
p->as.data.data = fptr;
}
static int static int
obj_free(rb_objspace_t *objspace, VALUE obj) obj_free(rb_objspace_t *objspace, VALUE obj)
{ {
@ -1802,10 +1811,7 @@ obj_free(rb_objspace_t *objspace, VALUE obj)
break; break;
case T_FILE: case T_FILE:
if (RANY(obj)->as.file.fptr) { if (RANY(obj)->as.file.fptr) {
rb_io_t *fptr = RANY(obj)->as.file.fptr; make_io_deferred(RANY(obj));
make_deferred(RANY(obj));
RDATA(obj)->dfree = (void (*)(void*))rb_io_fptr_finalize;
RDATA(obj)->data = fptr;
return 1; return 1;
} }
break; break;
@ -2305,7 +2311,7 @@ run_final(rb_objspace_t *objspace, VALUE obj)
} }
static void static void
gc_finalize_deferred(rb_objspace_t *objspace) finalize_deferred(rb_objspace_t *objspace)
{ {
RVALUE *p = deferred_final_list; RVALUE *p = deferred_final_list;
deferred_final_list = 0; deferred_final_list = 0;
@ -2313,6 +2319,12 @@ gc_finalize_deferred(rb_objspace_t *objspace)
if (p) { if (p) {
finalize_list(objspace, p); finalize_list(objspace, p);
} }
}
static void
gc_finalize_deferred(rb_objspace_t *objspace)
{
finalize_deferred(objspace);
free_unused_heaps(objspace); free_unused_heaps(objspace);
} }
@ -2349,9 +2361,7 @@ rb_gc_call_finalizer_at_exit(void)
/* run finalizers */ /* run finalizers */
if (finalizer_table) { if (finalizer_table) {
p = deferred_final_list; finalize_deferred(objspace);
deferred_final_list = 0;
finalize_list(objspace, p);
while (finalizer_table->num_entries > 0) { while (finalizer_table->num_entries > 0) {
RVALUE *final_list = 0; RVALUE *final_list = 0;
st_foreach(finalizer_table, chain_finalized_object, st_foreach(finalizer_table, chain_finalized_object,
@ -2379,20 +2389,19 @@ rb_gc_call_finalizer_at_exit(void)
xfree(DATA_PTR(p)); xfree(DATA_PTR(p));
} }
else if (RANY(p)->as.data.dfree) { else if (RANY(p)->as.data.dfree) {
(*RANY(p)->as.data.dfree)(DATA_PTR(p)); make_deferred(RANY(p));
} }
VALGRIND_MAKE_MEM_UNDEFINED((void*)p, sizeof(RVALUE));
} }
else if (BUILTIN_TYPE(p) == T_FILE) { else if (BUILTIN_TYPE(p) == T_FILE) {
if (rb_io_fptr_finalize(RANY(p)->as.file.fptr)) { if (RANY(p)->as.file.fptr) {
p->as.free.flags = 0; make_io_deferred(RANY(p));
VALGRIND_MAKE_MEM_UNDEFINED((void*)p, sizeof(RVALUE));
} }
} }
p++; p++;
} }
} }
during_gc = 0; during_gc = 0;
finalize_deferred(objspace);
} }
void void