8000 gh-123471: Make concurrent iteration over itertools.pairwise safe under free-threading by eendebakpt · Pull Request #123848 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-123471: Make concurrent iteration over itertools.pairwise safe under free-threading #123848

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

Closed
wants to merge 8 commits into from
Closed

gh-123471: Make concurrent iteration over itertools.pairwise safe under free-threading #123848

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a50c07b
Make concurrent iteration over pairwise safe under free-threading
eendebakpt Sep 7, 2024
eed6486
make setting po->old atomic
eendebakpt Sep 8, 2024
8493433
atomic exchanges
eendebakpt Sep 8, 2024
00f3e34
📜🤖 Added by blurb_it.
blurb-it[bot] Sep 8, 2024
f93d93a
add missing incref/decref pair
eendebakpt Sep 8, 2024
ae9ed99
Merge branch 'pairwise_ft_v2' of github.com:eendebakpt/cpython into p…
eendebakpt Sep 8, 2024
82e0489
fix whatsnew; optimize incref on new
eendebakpt Sep 8, 2024
8e4d77e
add missing tests
eendebakpt Sep 9, 2024
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
make setting po->old atomic
  • Loading branch information
@eendebakpt
eendebakpt committed Sep 8, 2024
commit eed6486f1bf6a4058ec94f60b6f396a98972e2d2
24 changes: 18 additions & 6 deletions Modules/itertoolsmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,29 +350,34 @@ pairwise_next(pairwiseobject *po)
if (old == NULL) {
old = (*Py_TYPE(it)->tp_iternext)(it);
Py_XSETREF(po->old, old);
if (old == NULL) {
#ifndef Py_GIL_DISABLED
if (old == NULL) {
Py_CLEAR(po->it);
#else
_Py_atomic_store_int_relaxed(&po->iterator_exhausted, 1);
#endif
return NULL;
}
it = po->it;
if (it == NULL) {
Py_CLEAR(po->old);
return NULL;
}
#else
if (old == NULL) {
_Py_atomic_store_int_relaxed(&po->iterator_exhausted, 1);
return NULL;
}
#endif
}
Py_INCREF(old);
new = (*Py_TYPE(it)->tp_iternext)(it);
if (new == NULL) {
#ifndef Py_GIL_DISABLED
Py_CLEAR(po->it);
Py_CLEAR(po->old);
#else
_Py_atomic_store_int_relaxed(&po->iterator_exhausted, 1);
PyObject *po_old = ( PyObject *)_Py_atomic_exchange_ptr(&po->old, 0);
Py_XDECREF(po_old);
#endif
Py_CLEAR(po->old);
Py_DECREF(old);
return NULL;
}
Expand Down Expand Up @@ -400,7 +405,14 @@ pairwise_next(pairwiseobject *po)
}
}

Py_XSETREF(po->old, new); // this should be atomic in the FT build
#ifndef Py_GIL_DISABLED
Py_XSETREF(po->old, new);
#else
// this should be atomic in the FT build
PyObject *po_old = ( PyObject *)_Py_atomic_exchange_ptr(&po->old, new);
Py_XDECREF(po_old);
#endif

Py_DECREF(old);
return result;
}
Expand Down
0