Skip to content

gh-129107: make bytearray free-thread safe #129108

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
kumaraditya303 merged 13 commits into from
Feb 15, 2025
Merged

gh-129107: make bytearray free-thread safe #129108

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ebdd6b7
gh-129107: make bytearray free-thread safe
tom-pytel Jan 20, 2025
b7812f5
📜🤖 Added by blurb_it.
blurb-it[bot] Jan 20, 2025
832cc05
fix smelly symbols
tom-pytel Jan 20, 2025
932ec76
bytearray iterator made free-thread safe
tom-pytel Jan 21, 2025
1b214bb
minor fix
tom-pytel Jan 21, 2025
6314eb4
Merge branch 'main' into fix-issue-129107
tom-pytel Feb 12, 2025
31fd0e0
regen bytearrayobject.c.h
tom-pytel Feb 12, 2025
86967fb
_PyByteArray_Resize_lock_held -> bytearray_resize_lock_held
tom-pytel Feb 12, 2025
12ad6f0
Merge branch 'main' into fix-issue-129107
tom-pytel Feb 12, 2025
baafb1f
remove iterator changes and add test
tom-pytel Feb 13, 2025
e08a36b
misc changes
tom-pytel Feb 14, 2025
9c5b800
remove unnecessary Py_BEGIN_CRITICAL_SECTION
tom-pytel Feb 14, 2025
e168d5b
use relaxed atomics for alloc
kumaraditya303 Feb 15, 2025
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
Next Next commit
misc changes
  • Loading branch information
@tom-pytel
tom-pytel committed Feb 14, 2025
commit e08a36bff6d6d9ee0493560b27a657d0cfdbaa5b
4 changes: 2 additions & 2 deletions Lib/test/test_bytes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import unittest

import test.support
from test import support
from test.support import import_helper
from test.support import threading_helper
from test.support import warnings_helper
Expand Down Expand Up @@ -2189,8 +2190,7 @@ class BytesSubclassTest(SubclassTest, unittest.TestCase):


class FreeThreadingTest(unittest.TestCase):
@unittest.skipUnless(sysconfig.get_config_var('Py_GIL_DISABLED'),
'this test can only possibly fail with GIL disabled')
@unittest.skipUnless(support.Py_GIL_DISABLED, 'this test can only possibly fail with GIL disabled')
@threading_helper.reap_threads
@threading_helper.requires_working_threading()
def test_free_threading_bytearray(self):
Expand Down
2 changes: 2 additions & 0 deletions Objects/bytearrayobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,7 @@ bytearray_setslice_linear(PyByteArrayObject *self,
Py_ssize_t lo, Py_ssize_t hi,
char *bytes, Py_ssize_t bytes_len)
{
_Py_CRITICAL_SECTION_ASSERT_OBJECT_LOCKED(self);
Py_ssize_t avail = hi - lo;
char *buf = PyByteArray_AS_STRING(self);
Py_ssize_t growth = bytes_len - avail;
Expand Down Expand Up @@ -614,6 +615,7 @@ static int
bytearray_setslice(PyByteArrayObject *self, Py_ssize_t lo, Py_ssize_t hi,
PyObject *values)
{
_Py_CRITICAL_SECTION_ASSERT_OBJECT_LOCKED(self);
Py_ssize_t needed;
void *bytes;
Py_buffer vbytes;
Expand Down