Skip to content

gh-129107: make bytearrayiter free-threading safe #130096

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 12 commits into from
Feb 19, 2025
Merged

gh-129107: make bytearrayiter free-threading safe #130096

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
cac384d
gh-129107: make bytearrayiter free-threading safe
tom-pytel Feb 13, 2025
4626f8f
📜🤖 Added by blurb_it.
blurb-it[bot] Feb 13, 2025
518d5c5
remove unnecessary critical sections
tom-pytel Feb 13, 2025
8a1edd8
misc cleanup
tom-pytel Feb 14, 2025
1069a64
atomic PyByteArray_GET_SIZE
tom-pytel Feb 14, 2025
185e2f1
use support.Py_GIL_DISABLED
tom-pytel Feb 14, 2025
cfa80bb
Merge branch 'main' into fix-issue-129107-iterator
tom-pytel Feb 15, 2025
6e15abd
restore bytearrayiter_next critical section
tom-pytel Feb 15, 2025
82ee657
Update Misc/NEWS.d/next/Core_and_Builtins/2025-02-13-20-42-53.gh-issu…
tom-pytel Feb 18, 2025
db66626
requested changes
tom-pytel Feb 18, 2025
b41ca85
requested changes
tom-pytel Feb 18, 2025
095e20e
test iter_reduce and iter_setstate
tom-pytel Feb 18, 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
remove unnecessary critical sections
  • Loading branch information
@tom-pytel
tom-pytel committed Feb 13, 2025
commit 518d5c5f71c49eea029fa72a363b6653edf36017
5 changes: 0 additions & 5 deletions Objects/bytearrayobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#include "pycore_bytes_methods.h"
#include "pycore_bytesobject.h"
#include "pycore_ceval.h" // _PyEval_GetBuiltin()
#include "pycore_critical_section.h"
#include "pycore_object.h" // _PyObject_GC_UNTRACK()
#include "pycore_strhex.h" // _Py_strhex_with_sep()
#include "pycore_long.h" // _PyLong_FromUnsignedChar()
Expand Down Expand Up @@ -2530,14 +2529,12 @@ bytearrayiter_next(PyObject *self)
PyByteArrayObject *seq = it->it_seq;
assert(PyByteArray_Check(seq));

Py_BEGIN_CRITICAL_SECTION(seq);
if (index < PyByteArray_GET_SIZE(seq)) {
val = (unsigned char)PyByteArray_AS_STRING(seq)[index];
}
else {
val = -1;
}
Py_END_CRITICAL_SECTION();

if (val == -1) {
FT_ATOMIC_STORE_SSIZE_RELAXED(it->it_index, -1);
Expand Down Expand Up @@ -2581,11 +2578,9 @@ bytearrayiter_reduce(PyObject *self, PyObject *Py_UNUSED(ignored))
PyObject *ret = NULL;
Py_ssize_t index = FT_ATOMIC_LOAD_SSIZE_RELAXED(it->it_index);
if (index >= 0) {
Py_BEGIN_CRITICAL_SECTION(it->it_seq);
if (index <= PyByteArray_GET_SIZE(it->it_seq)) {
Comment thread
tom-pytel marked this conversation as resolved.
Outdated
ret = Py_BuildValue("N(O)n", iter, it->it_seq, index);
}
Py_END_CRITICAL_SECTION();
}
if (ret == NULL) {
ret = Py_BuildValue("N(())", iter);
Expand Down