Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 28 additions & 0 deletions Lib/test/test_free_threading/test_io.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,34 @@ def sizeof(barrier, b, *ignore):
class CBytesIOTest(ThreadSafetyMixin, TestCase):
ioclass = io.BytesIO

@threading_helper.requires_working_threading()
@threading_helper.reap_threads
def test_concurrent_setstate_and_method_call(self):
# gh-153290: __setstate__() installed the instance __dict__ with a
# plain store, racing the lock-free LOAD_ATTR method fast path that
# reads the dict slot with an atomic acquire load.
states = [(b"A" * 64, 0, {}), (b"B" * 128, 32, {}), (b"C" * 256, 0, {})]
nreaders = 4
for _ in range(25):
shared = self.ioclass(b"initial payload")
barrier = threading.Barrier(1 + nreaders)

def setter():
barrier.wait()
for state in states:
shared.__setstate__(state)

def reader():
barrier.wait()
for _ in range(100):
shared.read(8)

threads = [threading.Thread(target=setter)]
threads += [threading.Thread(target=reader)
for _ in range(nreaders)]
with threading_helper.start_threads(threads):
pass

@threading_helper.requires_working_threading()
@threading_helper.reap_threads
def test_concurrent_whole_buffer_read_and_resize(self):
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Fix a data race on the free-threaded build when :meth:`!io.BytesIO.__setstate__`
installs the instance dictionary while another thread concurrently calls a
method on the same object.
4 changes: 3 additions & 1 deletion Modules/_io/bytesio.c
Original file line number Diff line number Diff line change
Expand Up @@ -1054,7 +1054,9 @@ bytesio_setstate_lock_held(PyObject *op, PyObject *state)
return NULL;
}
else {
self->dict = Py_NewRef(dict);
/* The LOAD_ATTR specializations read the dict slot lock-free
with an acquire load, so pair it with a release store. */
FT_ATOMIC_STORE_PTR_RELEASE(self->dict, Py_NewRef(dict));
}
}

Expand Down
Loading