-
-
Notifications
You must be signed in to change notification settings - Fork 33k
bpo-31558: Add gc.freeze() #3705
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.
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
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -71,6 +71,10 @@ _PyGC_Initialize(struct _gc_runtime_state *state) | |
state->generations[i] = generations[i]; | ||
}; | ||
state->generation0 = GEN_HEAD(0); | ||
struct gc_generation permanent_generation = { | ||
{{&state->permanent_generation.head, &state->permanent_generation.head, 0}}, 0, 0 | ||
}; | ||
state->permanent_generation = permanent_generation; | ||
} | ||
|
||
/*-------------------------------------------------------------------------- | ||
|
@@ -813,6 +817,8 @@ collect(int generation, Py_ssize_t *n_collected, Py_ssize_t *n_uncollectable, | |
for (i = 0; i < NUM_GENERATIONS; i++) | ||
PySys_FormatStderr(" %zd", | ||
gc_list_size(GEN_HEAD(i))); | ||
PySys_WriteStderr("\ngc: objects in permanent generation: %zd", | ||
gc_list_size(&_PyRuntime.gc.permanent_generation.head)); | ||
t1 = _PyTime_GetMonotonicClock(); | ||
|
||
PySys_WriteStderr("\n"); | ||
|
@@ -1405,6 +1411,56 @@ gc_is_tracked(PyObject *module, PyObject *obj) | |
return result; | ||
} | ||
|
||
/*[clinic input] | ||
gc.freeze | ||
|
||
Freeze all current tracked objects and ignore them for future collections. | ||
|
||
This can be used before a POSIX fork() call to make the gc copy-on-write friendly. | ||
Note: collection before a POSIX fork() call may free pages for future allocation | ||
which can cause copy-on-write. | ||
[clinic start generated code]*/ | ||
|
||
static PyObject * | ||
gc_freeze_impl(PyObject *module) | ||
/*[clinic end generated code: output=502159d9cdc4c139 input=b602b16ac5febbe5]*/ | ||
{ | ||
for (int i = 0; i < NUM_GENERATIONS; ++i) { | ||
gc_list_merge(GEN_HEAD(i), &_PyRuntime.gc.permanent_generation.head); | ||
_PyRuntime.gc.generations[i].count = 0; | ||
} | ||
Py_RETURN_NONE; | ||
} | ||
|
||
/*[clinic input] | ||
gc.unfreeze | ||
|
||
Unfreeze all objects in the permanent generation. | ||
|
||
Put all objects in the permanent generation back into oldest generation. | ||
[clinic start generated code]*/ | ||
|
||
static PyObject * | ||
gc_unfreeze_impl(PyObject *module) | ||
/*[clinic end generated code: output=1c15f2043b25e169 input=2dd52b170f4cef6c]*/ | ||
{ | ||
gc_list_merge(&_PyRuntime.gc.permanent_generation.head, GEN_HEAD(NUM_GENERATIONS-1)); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Do we need to update There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. No, it's always 0 since we don't use it, instead gc_list_size() is used for count. |
||
Py_RETURN_NONE; | ||
} | ||
|
||
/*[clinic input] | ||
gc.get_freeze_count -> int | ||
|
||
Return the number of objects in the permanent generation. | ||
[clinic start generated code]*/ | ||
|
||
static int | ||
gc_get_freeze_count_impl(PyObject *module) | ||
/*[clinic end generated code: output=e4e2ebcc77e5cbf3 input=4b759db880a3c6e4]*/ | ||
{ | ||
return gc_list_size(&_PyRuntime.gc.permanent_generation.head); | ||
} | ||
|
||
|
||
PyDoc_STRVAR(gc__doc__, | ||
"This module provides access to the garbage collector for reference cycles.\n" | ||
|
@@ -1422,7 +1478,10 @@ PyDoc_STRVAR(gc__doc__, | |
"get_objects() -- Return a list of all objects tracked by the collector.\n" | ||
"is_tracked() -- Returns true if a given object is tracked.\n" | ||
"get_referrers() -- Return the list of objects that refer to an object.\n" | ||
"get_referents() -- Return the list of objects that an object refers to.\n"); | ||
"get_referents() -- Return the list of objects that an object refers to.\n" | ||
"freeze() -- Freeze all tracked objects and ignore them for future collections.\n" | ||
"unfreeze() -- Unfreeze all objects in the permanent generation.\n" | ||
"get_freeze_count() -- Return the number of objects in the permanent generation.\n"); | ||
|
||
static PyMethodDef GcMethods[] = { | ||
GC_ENABLE_METHODDEF | ||
|
@@ -1441,6 +1500,9 @@ static PyMethodDef GcMethods[] = { | |
gc_get_referrers__doc__}, | ||
{"get_referents", gc_get_referents, METH_VARARGS, | ||
gc_get_referents__doc__}, | ||
GC_FREEZE_METHODDEF | ||
GC_UNFREEZE_METHODDEF | ||
GC_GET_FREEZE_COUNT_METHODDEF | ||
{NULL, NULL} /* Sentinel */ | ||
}; | ||
|
||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You should really undo the freezing after this test. We don't want tests to have so large side effects.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good point! This will require adding the "thaw" or "unfreeze" function that will move objects back from the permanent generation to a properly collected one. Do you think it would be enough for that call to move all of them to gen0? This won't be exactly "undoing the freeze" but doesn't require keeping track of which object belonged to which generation before.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Anything that empties the permanent generation is good enough IMHO. People can call
gc.collect
explicitly afterwards if they want to collect those objects.PS: as a non-native English locutor, I much prefer "unfreeze" to "thaw" :-)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh, didn't notice your "general comment" until now. So it seems we agree that moving everything to a single generation makes sense. But you're suggesting the oldest generation (gen2) instead. Makes sense.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok, I was just too lazy to add it but fine will update..