Skip to content

gh-123471: make itertools.batched thread-safe #129416

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 9 commits into from
Mar 12, 2025
+51 −2
Merged

gh-123471: make itertools.batched thread-safe #129416

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
070c877
Make itertools.batched thread-safe
eendebakpt Jan 15, 2025
cc3c42b
enable tests
eendebakpt Jan 28, 2025
6452c72
Merge branch 'main' into batched_ft
eendebakpt Feb 19, 2025
0193795
📜🤖 Added by blurb_it.
blurb-it[bot] Feb 19, 2025
71fed22
review comments
eendebakpt Mar 11, 2025
3ae3c48
review comments
eendebakpt Mar 11, 2025
560bc59
review comments
eendebakpt Mar 11, 2025
0cd92fc
Merge branch 'main' into batched_ft
eendebakpt Mar 11, 2025
4df892d
Update Lib/test/test_free_threading/test_itertools_batched.py
eendebakpt Mar 12, 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
review comments
  • Loading branch information
@eendebakpt
eendebakpt committed Mar 11, 2025
commit 560bc59322fe92de2e9acf7cc123a78420ac626f
15 changes: 3 additions & 12 deletions Modules/itertoolsmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,15 +191,9 @@ batched_next(batchedobject *bo)
PyObject *item;
PyObject *result;

#ifdef Py_GIL_DISABLED
if (it == NULL) {
return NULL;
}
#else
if (n < 0) {
Comment thread
kumaraditya303 marked this conversation as resolved.
return NULL;
}
#endif
result = PyTuple_New(n);
if (result == NULL) {
return NULL;
Expand All @@ -219,9 +213,8 @@ batched_next(batchedobject *bo)
if (PyErr_Occurred()) {
if (!PyErr_ExceptionMatches(PyExc_StopIteration)) {
/* Input raised an exception other than StopIteration */
#ifdef Py_GIL_DISABLED
FT_ATOMIC_STORE_SSIZE_RELAXED(bo->batch_size, -1);
#else
#ifndef Py_GIL_DISABLED
Py_CLEAR(bo->it);
Comment thread
kumaraditya303 marked this conversation as resolved.
#endif
Py_DECREF(result);
Expand All @@ -230,18 +223,16 @@ batched_next(batchedobject *bo)
PyErr_Clear();
}
if (i == 0) {
#ifdef Py_GIL_DISABLED
FT_ATOMIC_STORE_SSIZE_RELAXED(bo->batch_size, -1);
#else
#ifndef Py_GIL_DISABLED
Py_CLEAR(bo->it);
#endif
Py_DECREF(result);
return NULL;
}
if (bo->strict) {
#ifdef Py_GIL_DISABLED
FT_ATOMIC_STORE_SSIZE_RELAXED(bo->batch_size, -1);
#else
#ifndef Py_GIL_DISABLED
Py_CLEAR(bo->it);
#endif
Py_DECREF(result);
Expand Down
Loading