Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork32k
gh-128942: make arraymodule.c free-thread safe (lock-free)#130771
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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Open
tom-pytel wants to merge43 commits intopython:mainChoose a base branch
base:main
Could not load branches
Branch not found:{{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
+1,268 −439
Open
Changes from5 commits
Commits
Show all changes
43 commits Select commitHold shift + click to select a range
f54c5fc slow arraymodule
tom-pytel4c71f00 lockfree read and write single element
tom-pytel512c4c7 📜🤖 Added by blurb_it.
blurb-it[bot]060100f ensure_shared_on_resize() in one more place
tom-pyteld0b17c6 fix stupid direct return out of critical section
tom-pytelc17b787 requested changes
tom-pytel4fd8383 downgrade to _Py_atomic_load_ptr_relaxed in missed place
tom-pyteld00f2b7 arraymodule linked statically
tom-pytela3e6004 cleanups
tom-pytelfb6212a test and tsan stuff
tom-pytel04a8f9d getters and setters using atomics
tom-pytel01423fd fix 2 byte wchar_t
tom-pytel99331dd remove debug printf
tom-pytel07c98cc just a hunch...
tom-pytelcf3bbbb atomic "memcpy"
tom-pytel51135a4 misc
tom-pytelfff827e use proper type FT_ macros
tom-pytel12f0ff6 atomic aggregate _Py_atomic_source_memcpy_relaxed()
tom-pytel1a6b8df Merge branch 'main' into fix-issue-128942-lockfree
tom-pytel94ef417 remove atomic memcpy
tom-pytel0056412 Merge branch 'main' into fix-issue-128942-lockfree
tom-pytel1431784 regen clinic
tom-pytel460d3d7 Merge branch 'main' into fix-issue-128942-lockfree
tom-pytel409239c requested changes
tom-pytela6f17c9 more requested changes
tom-pytelb5d219e __declspec(align(8)) for Windows
tom-pytel2c82071 shut up check-c-globals
tom-pytel1ba50e9 alignment changes
tom-pytel576aebf MS_WINDOWS -> _MSC_VER
tom-pytel4dd0954 Merge branch 'main' into fix-issue-128942-lockfree
tom-pyteld4e5313 #include "pycore_gc.h", something moved
tom-pytel48eabe3 Merge branch 'main' into fix-issue-128942-lockfree
tom-pytelc056b13 Merge branch 'main' into fix-issue-128942-lockfree
tom-pytelaffae8e remove NULL check in arraydata_free()
tom-pytel689c7a3 Merge branch 'main' into fix-issue-128942-lockfree
tom-pytel3e2f8cd Merge branch 'main' into fix-issue-128942-lockfree
tom-pytel7286fed Merge branch 'main' into fix-issue-128942-lockfree
tom-pytel6550906 Merge branch 'main' into fix-issue-128942-lockfree
tom-pytel5b35203 Merge branch 'main' into fix-issue-128942-lockfree
tom-pytel15d92ca Merge branch 'main' into fix-issue-128942-lockfree
tom-pytel2e7132e change to use new _Py_ALIGN_AS() macro
tom-pytel06f86cf Merge branch 'main' into fix-issue-128942-lockfree
tom-pyteld29c208 Merge branch 'main' into fix-issue-128942-lockfree
tom-pytelFile filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
2 changes: 1 addition & 1 deletionInclude/internal/pycore_pymem.h
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -117,7 +117,7 @@ extern wchar_t *_PyMem_DefaultRawWcsdup(const wchar_t *str); | ||
| extern int _PyMem_DebugEnabled(void); | ||
| // Enqueue a pointer to be freed possibly after some delay. | ||
| PyAPI_FUNC(void) _PyMem_FreeDelayed(void *ptr); | ||
tom-pytel marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| // Enqueue an object to be freed possibly after some delay | ||
| #ifdef Py_GIL_DISABLED | ||
265 changes: 265 additions & 0 deletionsLib/test/test_array.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -3,16 +3,20 @@ | ||
| """ | ||
| import collections.abc | ||
| import io | ||
| import unittest | ||
| from test import support | ||
| from test.support import import_helper | ||
| from test.support import os_helper | ||
| from test.support import threading_helper | ||
| from test.support import _2G | ||
| import weakref | ||
| import pickle | ||
| import operator | ||
| import random | ||
| import struct | ||
| import sys | ||
| import threading | ||
| import warnings | ||
| import array | ||
| @@ -1673,5 +1677,266 @@ def test_gh_128961(self): | ||
| self.assertRaises(StopIteration, next, it) | ||
| class FreeThreadingTest(unittest.TestCase): | ||
tom-pytel marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| # Test pretty much everything that can break under free-threading. | ||
| # Non-deterministic, but at least one of these things will fail if | ||
| # array module is not free-thread safe. | ||
| @unittest.skipUnless(support.Py_GIL_DISABLED, 'this test can only possibly fail with GIL disabled') | ||
tom-pytel marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| @threading_helper.reap_threads | ||
tom-pytel marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| @threading_helper.requires_working_threading() | ||
| def test_free_threading(self): | ||
tom-pytel marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| def pop1(b, a): # MODIFIES! | ||
| b.wait() | ||
| try: a.pop() | ||
| except IndexError: pass | ||
| def append1(b, a): # MODIFIES! | ||
| b.wait() | ||
| a.append(2) | ||
| def insert1(b, a): # MODIFIES! | ||
| b.wait() | ||
| a.insert(0, 2) | ||
| def extend(b, a): # MODIFIES! | ||
| c = array.array('i', [2]) | ||
| b.wait() | ||
| a.extend(c) | ||
| def extend2(b, a, c): # MODIFIES! | ||
| b.wait() | ||
| a.extend(c) | ||
| def inplace_concat(b, a): # MODIFIES! | ||
| c = array.array('i', [2]) | ||
| b.wait() | ||
| a += c | ||
| def inplace_concat2(b, a, c): # MODIFIES! | ||
| b.wait() | ||
| a += c | ||
| def inplace_repeat2(b, a): # MODIFIES! | ||
| b.wait() | ||
| a *= 2 | ||
| def clear(b, a, *args): # MODIFIES! | ||
| b.wait() | ||
| a.clear() | ||
| def clear2(b, a, c): # MODIFIES c! | ||
| b.wait() | ||
| try: c.clear() | ||
| except BufferError: pass | ||
| def remove1(b, a): # MODIFIES! | ||
| b.wait() | ||
| try: a.remove(1) | ||
| except ValueError: pass | ||
| def fromunicode(b, a): # MODIFIES! | ||
| b.wait() | ||
| a.fromunicode('test') | ||
| def frombytes(b, a): # MODIFIES! | ||
| b.wait() | ||
| a.frombytes(b'0000') | ||
| def frombytes2(b, a, c): # MODIFIES! | ||
| b.wait() | ||
| a.frombytes(c) | ||
| def fromlist(b, a): # MODIFIES! | ||
| n = random.randint(0, 100) | ||
| b.wait() | ||
| a.fromlist([2] * n) | ||
| def ass_subscr2(b, a, c): # MODIFIES! | ||
| b.wait() | ||
| a[:] = c | ||
| def ass0(b, a): # modifies inplace | ||
| b.wait() | ||
| try: a[0] = 0 | ||
| except IndexError: pass | ||
| def byteswap(b, a): # modifies inplace | ||
| b.wait() | ||
| a.byteswap() | ||
| def tounicode(b, a): | ||
| b.wait() | ||
| a.tounicode() | ||
| def tobytes(b, a): | ||
| b.wait() | ||
| a.tobytes() | ||
| def tolist(b, a): | ||
| b.wait() | ||
| a.tolist() | ||
| def tofile(b, a): | ||
| f = io.BytesIO() | ||
| b.wait() | ||
| a.tofile(f) | ||
| def reduce_ex2(b, a): | ||
| b.wait() | ||
| a.__reduce_ex__(2) | ||
| def reduce_ex3(b, a): | ||
| b.wait() | ||
| c = a.__reduce_ex__(3) | ||
| assert not c[1] or 0xdd not in c[1][3] | ||
| def copy(b, a): | ||
| b.wait() | ||
| c = a.__copy__() | ||
| assert not c or 0xdd not in c | ||
| def repr1(b, a): | ||
| b.wait() | ||
| repr(a) | ||
| def repeat2(b, a): | ||
| b.wait() | ||
| a * 2 | ||
| def count1(b, a): | ||
| b.wait() | ||
| a.count(1) | ||
| def index1(b, a): | ||
| b.wait() | ||
| try: a.index(1) | ||
| except ValueError: pass | ||
| def contains1(b, a): | ||
| b.wait() | ||
| try: 1 in a | ||
| except ValueError: pass | ||
| def subscr0(b, a): | ||
| b.wait() | ||
| try: a[0] | ||
| except IndexError: pass | ||
| def concat(b, a): | ||
| b.wait() | ||
| a + a | ||
| def concat2(b, a, c): | ||
| b.wait() | ||
| a + c | ||
| def richcmplhs(b, a): | ||
| c = a[:] | ||
| b.wait() | ||
| a == c | ||
| def richcmprhs(b, a): | ||
| c = a[:] | ||
| b.wait() | ||
| c == a | ||
| def new(b, a): | ||
| tc = a.typecode | ||
| b.wait() | ||
| array.array(tc, a) | ||
| def repr_(b, a): | ||
| b.wait() | ||
| repr(a) | ||
| def irepeat(b, a): # MODIFIES! | ||
| b.wait() | ||
| a *= 2 | ||
| def newi(b, l): | ||
| b.wait() | ||
| array.array('i', l) | ||
| def fromlistl(b, a, l): # MODIFIES! | ||
| b.wait() | ||
| a.fromlist(l) | ||
| def fromlistlclear(b, a, l): # MODIFIES LIST! | ||
| b.wait() | ||
| l.clear() | ||
| def iter_next(b, a, it): # MODIFIES ITERATOR! | ||
| b.wait() | ||
| list(it) | ||
| def iter_reduce(b, a, it): | ||
| b.wait() | ||
| c = it.__reduce__() | ||
| assert not c[1] or 0xdd not in c[1][0] | ||
| def check(funcs, a=None, *args): | ||
| if a is None: | ||
| a = array.array('i', [1]) | ||
| barrier = threading.Barrier(len(funcs)) | ||
| threads = [] | ||
| for func in funcs: | ||
| thread = threading.Thread(target=func, args=(barrier, a, *args)) | ||
| threads.append(thread) | ||
| with threading_helper.start_threads(threads): | ||
| pass | ||
| check([pop1] * 10) | ||
| check([pop1] + [subscr0] * 10) | ||
| check([append1] * 10) | ||
| check([insert1] * 10) | ||
| check([pop1] + [index1] * 10) | ||
| check([pop1] + [contains1] * 10) | ||
| check([insert1] + [repeat2] * 10) | ||
| check([pop1] + [repr1] * 10) | ||
| check([inplace_repeat2] * 10) | ||
| check([byteswap] * 10) | ||
| check([insert1] + [clear] * 10) | ||
| check([pop1] + [count1] * 10) | ||
| check([remove1] * 10) | ||
| check([clear] + [copy] * 10, array.array('B', b'0' * 0x400000)) | ||
| check([pop1] + [reduce_ex2] * 10) | ||
| check([clear] + [reduce_ex3] * 10, array.array('B', b'0' * 0x400000)) | ||
| check([pop1] + [tobytes] * 10) | ||
| check([pop1] + [tolist] * 10) | ||
| check([clear, tounicode] * 10, array.array('w', 'a'*10000)) | ||
| check([clear, tofile] * 10, array.array('w', 'a'*10000)) | ||
| check([clear] + [extend] * 10) | ||
| check([clear] + [inplace_concat] * 10) | ||
| check([clear] + [concat] * 10, array.array('w', 'a'*10000)) | ||
| check([fromunicode] * 10, array.array('w', 'a')) | ||
| check([frombytes] * 10) | ||
| check([fromlist] * 10) | ||
| check([clear] + [richcmplhs] * 10, array.array('i', [1]*10000)) | ||
| check([clear] + [richcmprhs] * 10, array.array('i', [1]*10000)) | ||
| check([clear, ass0] * 10, array.array('i', [1]*10000)) # to test array_ass_item must disable Py_mp_ass_subscript | ||
| check([clear] + [new] * 10, array.array('w', 'a'*10000)) | ||
| check([clear] + [repr_] * 10, array.array('B', b'0' * 0x40000)) | ||
| check([clear] + [repr_] * 10, array.array('B', b'0' * 0x40000)) | ||
| check([clear] + [irepeat] * 10, array.array('B', b'0' * 0x40000)) | ||
| check([clear] + [iter_reduce] * 10, a := array.array('B', b'0' * 0x400), iter(a)) | ||
| # make sure we handle non-self objects correctly | ||
| check([clear] + [newi] * 10, [2] * random.randint(0, 100)) | ||
| check([fromlistlclear] + [fromlistl] * 10, array.array('i', [1]), [2] * random.randint(0, 100)) | ||
| check([clear2] + [concat2] * 10, array.array('w', 'a'*10000), array.array('w', 'a'*10000)) | ||
| check([clear2] + [inplace_concat2] * 10, array.array('w', 'a'*10000), array.array('w', 'a'*10000)) | ||
| check([clear2] + [extend2] * 10, array.array('w', 'a'*10000), array.array('w', 'a'*10000)) | ||
| check([clear2] + [ass_subscr2] * 10, array.array('w', 'a'*10000), array.array('w', 'a'*10000)) | ||
| check([clear2] + [frombytes2] * 10, array.array('w', 'a'*10000), array.array('B', b'a'*10000)) | ||
| # iterator stuff | ||
| check([clear] + [iter_next] * 10, a := array.array('i', [1] * 10), iter(a)) | ||
| if __name__ == "__main__": | ||
| unittest.main() | ||
1 change: 1 addition & 0 deletionsMisc/NEWS.d/next/Library/2025-03-02-21-08-05.gh-issue-128942.4MTI6s.rst
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| Make :mod:`array` module safe under :term:`free threading`. |
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.