Skip to content

gc: Do not finish lazy sweeps when freeing the object space #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dbussink merged 1 commit into from
Jan 29, 2015
Merged

gc: Do not finish lazy sweeps when freeing the object space #24

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion gc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -920,7 +920,8 @@ static void heap_page_free(rb_objspace_t *objspace, struct heap_page *page);
void
rb_objspace_free(rb_objspace_t *objspace)
{
gc_rest_sweep(objspace);
if (is_lazy_sweeping(heap_eden))
rb_bug("lazy sweeping underway when freeing object space");

if (objspace->profile.records) {
free(objspace->profile.records);
Expand Down Expand Up @@ -2255,6 +2256,12 @@ rb_objspace_call_finalizer(rb_objspace_t *objspace)
st_free_table(finalizer_table);
finalizer_table = 0;
ATOMIC_SET(finalizing, 0);

/*
* finish any lazy sweeps that may have been started
* when finalizing the objects in the heap
*/
gc_rest_sweep(objspace);
}

static inline int
Expand Down