Skip to content

gh-120198: Stop the world when setting __class__ on free-threaded build #120672

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
Fidget-Spinner merged 8 commits into from
Jul 10, 2024
Merged

gh-120198: Stop the world when setting __class__ on free-threaded build #120672

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2e5667e
Stop the world when setting __class__
Fidget-Spinner Jun 18, 2024
b482f87
Address reviews
Fidget-Spinner Jun 18, 2024
d2a7095
fix non-free-threaded builds
Fidget-Spinner Jun 18, 2024
8a562ce
Address review
Fidget-Spinner Jun 19, 2024
a88d238
Merge remote-tracking branch 'upstream/main' into class_stoptheworld
Fidget-Spinner Jun 19, 2024
8a25bfb
Address Sam's reviews
Fidget-Spinner Jun 21, 2024
13486cb
fix name
Fidget-Spinner Jun 21, 2024
a409ab2
Address reviews
Fidget-Spinner Jul 10, 2024
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
Prev Previous commit
Address reviews
  • Loading branch information
@Fidget-Spinner
Fidget-Spinner committed Jul 10, 2024
commit a409ab27ca0a2deab743d76fb7a7074e2fb791c1
2 changes: 1 addition & 1 deletion Lib/test/test_free_threading/test_type.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ class Bar:
thing = Foo()
def work():
foo = thing
for _ in range(10000):
for _ in range(5000):
foo.__class__ = Bar
type(foo)
foo.__class__ = Foo
Expand Down
18 changes: 4 additions & 14 deletions Objects/typeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6607,7 +6607,7 @@ compatible_for_assignment(PyTypeObject* oldto, PyTypeObject* newto, const char*


static int
object_set_class_world_stopped(PyObject *self, PyTypeObject *newto, PyTypeObject **oldto_p)
object_set_class_world_stopped(PyObject *self, PyTypeObject *newto)
{
PyTypeObject *oldto = Py_TYPE(self);

Expand Down Expand Up @@ -6682,13 +6682,7 @@ object_set_class_world_stopped(PyObject *self, PyTypeObject *newto, PyTypeObject
}
}

// If we raced after materialization and replaced the dict
// then the materialized dict should no longer have the
// inline values in which case detach is a nop.
// Note: we don't need to lock here because the world should be stopped.

assert(_PyObject_GetManagedDict(self) == dict ||
dict->ma_values != _PyObject_InlineValues(self));
assert(_PyObject_GetManagedDict(self) == dict);

if (_PyDict_DetachFromObject(dict, self) < 0) {
return -1;
Expand All @@ -6701,8 +6695,6 @@ object_set_class_world_stopped(PyObject *self, PyTypeObject *newto, PyTypeObject

Py_SET_TYPE(self, newto);

*oldto_p = oldto;

return 0;
}
else {
Expand Down Expand Up @@ -6734,12 +6726,10 @@ object_set_class(PyObject *self, PyObject *value, void *closure)

#ifdef Py_GIL_DISABLED
PyInterpreterState *interp = _PyInterpreterState_GET();
// The real Py_TYPE(self) (`oldto`) may have changed from
// underneath us in another thread, so we stop the world.
_PyEval_StopTheWorld(interp);
#endif
PyTypeObject *oldto;
int res = object_set_class_world_stopped(self, newto, &oldto);
PyTypeObject *oldto = Py_TYPE(self);
int res = object_set_class_world_stopped(self, newto);
#ifdef Py_GIL_DISABLED
_PyEval_StartTheWorld(interp);
#endif
Expand Down