8000 Merge branch 'main' into typewatch · carljm/cpython@d67d6fd · GitHub
[go: up one dir, main page]
Skip to content

Commit d67d6fd

Browse files
carljmcarljm
committed
Merge branch 'main' into typewatch
* main: pythongh-68686: Retire eptag ptag scripts (python#98064) pythongh-97922: Run the GC only on eval breaker (python#97920) GitHub Workflows security hardening (python#96492) Add `@ezio-melotti` as codeowner for `.github/`. (python#98079) pythongh-97913 Docs: Add walrus operator to the index (python#97921) [doc] Fix broken links to C extensions accelerating stdlib modules (python#96914) pythongh-97822: Fix http.server documentation reference to test() function (python#98027) pythongh-91052: Add PyDict_Unwatch for unwatching a dictionary (python#98055) pythonGH-98023: Change default child watcher to PidfdChildWatcher on supported systems (python#98024) pythonGH-94182: Run the PidfdChildWatcher on the running loop (python#94184)
2 parents 27a4980 + 4ed00be commit d67d6fd

27 files changed

+296
-203
lines changed

‎.github/CODEOWNERS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
# It uses the same pattern rule for gitignore file
55
# https://git-scm.com/docs/gitignore#_pattern_format
66

7+
# GitHub
8+
.github/** @ezio-melotti
9+
710
# asyncio
811
**/*asyncio* @1st1 @asvetlov @gvanrossum
912

‎.github/workflows/project-updater.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ on:
66
- opened
77
- labeled
88

9+
permissions:
10+
contents: read
11+
912
jobs:
1013
add-to-project:
1114
name: Add issues to projects

‎Doc/c-api/dict.rst

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,24 +246,41 @@ Dictionary Objects
246246
of error (e.g. no more watcher IDs available), return ``-1`` and set an
247247
exception.
248248
249+
.. versionadded:: 3.12
250+
249251
.. c:function:: int PyDict_ClearWatcher(int watcher_id)
250252
251253
Clear watcher identified by *watcher_id* previously returned from
252254
:c:func:`PyDict_AddWatcher`. Return ``0`` on success, ``-1`` on error (e.g.
253255
if the given *watcher_id* was never registered.)
254256
257+
.. versionadded:: 3.12
258+
255259
.. c:function:: int PyDict_Watch(int watcher_id, PyObject *dict)
256260
257261
Mark dictionary *dict* as watched. The callback granted *watcher_id* by
258262
:c:func:`PyDict_AddWatcher` will be called when *dict* is modified or
259-
deallocated.
263+
deallocated. Return ``0`` on success or ``-1`` on error.
264+
265+
.. versionadded:: 3.12
266+
267+
.. c:function:: int PyDict_Unwatch(int watcher_id, PyObject *dict)
268+
269+
Mark dictionary *dict* as no longer watched. The callback granted
270+
*watcher_id* by :c:func:`PyDict_AddWatcher` will no longer be called when
271+
*dict* is modified or deallocated. The dict must previously have been
272+
watched by this watcher. Return ``0`` on success or ``-1`` on error.
273+
274+
.. versionadded:: 3.12
260275
261276
.. c:type:: PyDict_WatchEvent
262277
263278
Enumeration of possible dictionary watcher events: ``PyDict_EVENT_ADDED``,
264279
``PyDict_EVENT_MODIFIED``, ``PyDict_EVENT_DELETED``, ``PyDict_EVENT_CLONED``,
265280
``PyDict_EVENT_CLEARED``, or ``PyDict_EVENT_DEALLOCATED``.
266281
282+
.. versionadded:: 3.12
283+
267284
.. c:type:: int (*PyDict_WatchCallback)(PyDict_WatchEvent event, PyObject *dict, PyObject *key, PyObject *new_value)
268285
269286
Type of a dict watcher callback function.
@@ -289,3 +306,5 @@ Dictionary Objects
289306
If the callback returns with an exception set, it must return ``-1``; this
290307
exception will be printed as an unraisable exception using
291308
:c:func:`PyErr_WriteUnraisable`. Otherwise it should return ``0``.
309+
310+
.. versionadded:: 3.12

‎Doc/library/http.server.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -392,8 +392,8 @@ provides three different variants:
392392
contents of the file are output. If the file's MIME type starts with
393393
``text/`` the file is opened in text mode; otherwise binary mode is used.
394394

395-
For example usage, see the implementation of the :func:`test` function
396-
invocation in the :mod:`http.server` module.
395+
For example usage, see the implementation of the ``test`` function
396+
in :source:`Lib/http/server.py`.
397397

398398
.. versionchanged:: 3.7
399399
Support of the ``'If-Modified-Since'`` header.

‎Doc/license.rst

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,8 @@ for third-party software incorporated in the Python distribution.
302302
Mersenne Twister
303303
----------------
304304

305-
The :mod:`_random` module includes code based on a download from
305+
The :mod:`!_random` C extension underlying the :mod:`random` module
306+
includes code based on a download from
306307
http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/MT2002/emt19937ar.html. The following are
307308
the verbatim comments from the original code::
308309

@@ -819,7 +820,8 @@ sources unless the build is configured ``--with-system-expat``::
819820
libffi
820821
------
821822

822-
The :mod:`_ctypes` extension is built using an included copy of the libffi
823+
The :mod:`!_ctypes` C extension underlying the :mod:`ctypes` module
824+
is built using an included copy of the libffi
823825
sources unless the build is configured ``--with-system-libffi``::
824826

825827
Copyright (c) 1996-2008 Red Hat, Inc and others.
@@ -920,7 +922,8 @@ on the cfuhash project::
920922
libmpdec
921923
--------
922924

923-
The :mod:`_decimal` module is built using an included copy of the libmpdec
925+
The :mod:`!_decimal` C extension underlying the :mod:`decimal` module
926+
is built using an included copy of the libmpdec
924927
library unless the build is configured ``--with-system-libmpdec``::
925928

926929
Copyright (c) 2008-2020 Stefan Krah. All rights reserved.

‎Doc/reference/expressions.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1741,6 +1741,12 @@ returns a boolean value regardless of the type of its argument
17411741
(for example, ``not 'foo'`` produces ``False`` rather than ``''``.)
17421742

17431743

1744+
.. index::
1745+
single: := (colon equals)
1746+
single: assignment expression
1747+
single: walrus operator
1748+
single: named expression
1749+
17441750
Assignment expressions
17451751
======================
17461752

‎Doc/whatsnew/3.12.rst

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,13 @@ Other Language Changes
9393
when parsing source code containing null bytes. (Contributed by Pablo Galindo
9494
in :gh:`96670`.)
9595

96+
* The Garbage Collector now runs only on the eval breaker mechanism of the
97+
Python bytecode evaluation loop instead on object allocations. The GC can
98+
also run when :c:func:`PyErr_CheckSignals` is called so C extensions that
99+
need to run for a long time without executing any Python code also have a
100+
chance to execute the GC periodically. (Contributed by Pablo Galindo in
101+
:gh:`97922`.)
102+
96103
New Modules
97104
===========
98105

@@ -546,6 +553,11 @@ New Features
546553
which sets the vectorcall field of a given :c:type:`PyFunctionObject`.
547554
(Contributed by Andrew Frost in :gh:`92257`.)
548555

556+
* The C API now permits registering callbacks via :c:func:`PyDict_AddWatcher`,
557+
:c:func:`PyDict_AddWatch` and related APIs to be called whenever a dictionary
558+
is modified. This is intended for use by optimizing interpreters, JIT
559+
compilers, or debuggers.
560+
549561
Porting to Python 3.12
550562
----------------------
551563

‎Include/cpython/dictobject.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,3 +106,4 @@ PyAPI_FUNC(int) PyDict_ClearWatcher(int watcher_id);
106106

107107
// Mark given dictionary as "watched" (callback will be called if it is modified)
108108
PyAPI_FUNC(int) PyDict_Watch(int watcher_id, PyObject* dict);
109+
PyAPI_FUNC(int) PyDict_Unwatch(int watcher_id, PyObject* dict);

‎Include/internal/pycore_gc.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,8 @@ extern void _PyList_ClearFreeList(PyInterpreterState *interp);
202202
extern void _PyDict_ClearFreeList(PyInterpreterState *interp);
203203
extern void _PyAsyncGen_ClearFreeLists(PyInterpreterState *interp);
204204
extern void _PyContext_ClearFreeList(PyInterpreterState *interp);
205+
extern void _Py_ScheduleGC(PyInterpreterState *interp);
206+
extern void _Py_RunGC(PyThreadState *tstate);
205207

206208
#ifdef __cplusplus
207209
}

‎Include/internal/pycore_interp.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ struct _ceval_state {
4949
_Py_atomic_int eval_breaker;
5050
/* Request for dropping the GIL */
5151
_Py_atomic_int gil_drop_request;
52+
/* The GC is ready to be executed */
53+
_Py_atomic_int gc_scheduled;
5254
struct _pending_calls pending;
5355
};
5456

0 commit comments

Comments
 (0)
0