FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

gh-159558: Avoid un-needed nested locks in set operations by johng · Pull Request #159559 · python/cpython · GitHub

  1. python
  2. cpython

Repository navigation

gh-159558: Avoid un-needed nested locks in set operations #159559

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

Open
johng wants to merge 10 commits into
base: main
Choose a base branch
Could not load branches
Branch not found: {{ refName }}

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.
from
+23 −5
Conversation 1 Commits 10 Checks 52 Files changed 2
Open

gh-159558: Avoid un-needed nested locks in set operations #159559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5820ba8
Avoid re-locking both sets in set.issuperset() on the free-threaded b…
johng Oct 14, 2026
0a4c788
Avoid re-locking the set in set.discard() and set.remove() on the fre…
johng Oct 16, 2026
5ca398f
ctypes: do not re-lock the object in the Simple.value setter on the f…
johng Oct 16, 2026
576731e
ctypes: do not re-lock the pointer or its target in the Pointer.conte…
johng Oct 16, 2026
ead0976
ctypes: do not re-lock the destination in PyCData_set()
johng Oct 16, 2026
dc0fe28
News entry
johng Oct 15, 2026
180a455
gh-159558: Add NEWS entries for the set and ctypes critical-section r…
johng Oct 16, 2026
b5102fc
Move the ctypes changes to a separate PR
johng Oct 16, 2026
f13c0ee
gh-159558: Combine the NEWS entries
johng Oct 16, 2026
f9b1718
gh-159558: Drop a redundant comment
johng Oct 16, 2026
File filter

Filter by extension

Filter by extension .c  (1) .rst  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/Core_and_Builtins/2026-10-16-17-55-45.gh-issue-159558.ftCsRe.rst
Show comments
View file
Open in desktop
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
Show hidden characters
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Speed up ``set >= set``, ``set > set``, :meth:`set.issuperset`, :meth:`set.discard`
and :meth:`set.remove` on the free-threaded build by not re-entering a critical
section already held on the set.
25 changes: 20 additions & 5 deletions Objects/setobject.c
Show comments
View file
Open in desktop
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
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -411,27 +411,39 @@ set_insert_clean(setentry *table, size_t mask, PyObject *key, Py_hash_t hash)
/* ======================================================================== */

static int
set_lookkey(PySetObject *so, PyObject *key, Py_hash_t hash, setentry **epp)
set_lookkey_lock_held(PySetObject *so, PyObject *key, Py_hash_t hash,
setentry **epp)
{
int status;
if (PyFrozenSet_CheckExact(so)) {
status = set_do_lookup(so, so->table, so->mask, key, hash, epp,
set_compare_frozenset);
}
else {
Py_BEGIN_CRITICAL_SECTION(so);
do {
status = set_do_lookup(so, so->table, so->mask, key, hash, epp,
set_compare_entry_lock_held);
} while (status == SET_LOOKKEY_CHANGED);
Py_END_CRITICAL_SECTION();
}
assert(status == SET_LOOKKEY_FOUND ||
status == SET_LOOKKEY_NO_MATCH ||
status == SET_LOOKKEY_ERROR);
return status;
}

static int
set_lookkey(PySetObject *so, PyObject *key, Py_hash_t hash, setentry **epp)
{
if (PyFrozenSet_CheckExact(so)) {
return set_lookkey_lock_held(so, key, hash, epp);
}
int status;
Py_BEGIN_CRITICAL_SECTION(so);
status = set_lookkey_lock_held(so, key, hash, epp);
Py_END_CRITICAL_SECTION();
return status;
}

#ifdef Py_GIL_DISABLED
static int
set_lookkey_threadsafe(PySetObject *so, PyObject *key, Py_hash_t hash)
Expand Down Expand Up @@ -581,7 +593,7 @@ set_discard_entry(PySetObject *so, PyObject *key, Py_hash_t hash)
{
setentry *entry;
PyObject *old_key;
int status = set_lookkey(so, key, hash, &entry);
int status = set_lookkey_lock_held(so, key, hash, &entry);
if (status < 0) {
return -1;
}
Expand Down Expand Up @@ -2418,6 +2430,9 @@ set_issubset_impl(PySetObject *so, PyObject *other)
Py_ssize_t pos = 0;
int rv;

_Py_CRITICAL_SECTION_ASSERT_OBJECT_LOCKED(so);
_Py_CRITICAL_SECTION_ASSERT_OBJECT_LOCKED(other);

if (!PyAnySet_Check(other)) {
PyObject *tmp = set_intersection(so, other);
if (tmp == NULL) {
Expand Down Expand Up @@ -2460,7 +2475,7 @@ set_issuperset_impl(PySetObject *so, PyObject *other)
/*[clinic end generated code: output=ecf00ce552c09461 input=5f2e1f262e6e4ccc]*/
{
if (PyAnySet_Check(other)) {
return set_issubset(other, (PyObject *)so);
return set_issubset_impl((PySetObject *)other, (PyObject *)so);
}

PyObject *key, *it = PyObject_GetIter(other);
Expand Down
Loading
Back | FazBrowse Home | New Git URL