From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Date: Tue, 10 Dec 2024 08:02:22 +0000 (+0100) Subject: [3.12] gh-126775: make linecache.checkcache threadsafe and GC re-entrency safe (GH... X-Git-Tag: v3.12.9~174 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e881dd1c468beafd81d20be2e66a5fdd49cb3402;p=thirdparty%2FPython%2Fcpython.git [3.12] gh-126775: make linecache.checkcache threadsafe and GC re-entrency safe (GH-126776) (#127779) gh-126775: make linecache.checkcache threadsafe and GC re-entrency safe (GH-126776) (cherry picked from commit 2233c303e476496fc4c85a29a1429a7e4b1f707b) Co-authored-by: Thomas Grainger Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com> Co-authored-by: Bartosz Sławecki --- diff --git a/Lib/linecache.py b/Lib/linecache.py index 248cba93874c..b6453fe2f311 100644 --- a/Lib/linecache.py +++ b/Lib/linecache.py @@ -54,14 +54,17 @@ def checkcache(filename=None): (This is not checked upon each call!)""" if filename is None: - filenames = list(cache.keys()) - elif filename in cache: - filenames = [filename] + # get keys atomically + filenames = cache.copy().keys() else: - return + filenames = [filename] for filename in filenames: - entry = cache[filename] + try: + entry = cache[filename] + except KeyError: + continue + if len(entry) == 1: # lazy cache entry, leave it lazy. continue diff --git a/Misc/NEWS.d/next/Library/2024-11-13-10-44-25.gh-issue-126775.a3ubjh.rst b/Misc/NEWS.d/next/Library/2024-11-13-10-44-25.gh-issue-126775.a3ubjh.rst new file mode 100644 index 000000000000..429fc2aa17bd --- /dev/null +++ b/Misc/NEWS.d/next/Library/2024-11-13-10-44-25.gh-issue-126775.a3ubjh.rst @@ -0,0 +1 @@ +Make :func:`linecache.checkcache` thread safe and GC re-entrancy safe.