Skip to content

gh-152235: Defer GC tracking during the lock-free fill in set.__init__#153079

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

Closed
corona10 wants to merge 1 commit into from
Closed

gh-152235: Defer GC tracking during the lock-free fill in set.__init__ #153079

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
31 changes: 23 additions & 8 deletions Objects/setobject.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2770,21 +2770,36 @@ set_init(PyObject *so, PyObject *args, PyObject *kwds)
if (!PyArg_UnpackTuple(args, Py_TYPE(self)->tp_name, 0, 1, &iterable))
return -1;

if (_PyObject_IsUniquelyReferenced((PyObject *)self) && self->fill == 0) {
self->hash = -1;
if (iterable == NULL) {
return 0;
}
return set_update_local(self, iterable);
if (!_PyObject_IsUniquelyReferenced((PyObject *)self) || self->fill != 0) {
goto shared;
}

_PyObject_GC_UNTRACK(self);
// Double-check that the object is still uniquely referenced after untracking it.
if (!_PyObject_IsUniquelyReferenced((PyObject *)self)) {
_PyObject_GC_TRACK(self);
goto shared;
}

self->hash = -1;
int rv = 0;
if (iterable != NULL) {
rv = set_update_local(self, iterable);
}
_PyObject_GC_TRACK(self);
return rv;

shared:
Py_BEGIN_CRITICAL_SECTION(self);
if (self->fill)
if (self->fill) {
set_clear_internal((PyObject*)self);
}
self->hash = -1;
Py_END_CRITICAL_SECTION();

if (iterable == NULL)
if (iterable == NULL) {
return 0;
}
return set_update_internal(self, iterable);
}

Expand Down
Loading