Merge branch 'main' into call-len

Author: Fidget-Spinner

Doc/c-api/init_config.rst

@@ -320,7 +320,7 @@ Configuration Options
    * - ``"cpu_count"``
      - :c:member:`cpu_count <PyConfig.cpu_count>`
      - ``int``
-     - Read-only
+     - Public
    * - ``"dev_mode"``
      - :c:member:`dev_mode <PyConfig.dev_mode>`
      - ``bool``
@@ -619,6 +619,8 @@ Some options are read from the :mod:`sys` attributes. For example, the option
    The caller must have an :term:`attached thread state`. The function cannot
    be called before Python initialization nor after Python finalization.
 
+   .. audit-event:: cpython.PyConfig_Set name,value c.PyConfig_Set
+
    .. versionadded:: 3.14
 
 

Include/internal/pycore_interp_structs.h

@@ -9,7 +9,6 @@ extern "C" {
 
 #include "pycore_ast_state.h"     // struct ast_state
 #include "pycore_llist.h"         // struct llist_node
-#include "pycore_memoryobject.h"  // struct _memoryobject_state
 #include "pycore_opcode_utils.h"  // NUM_COMMON_CONSTANTS
 #include "pycore_pymath.h"        // _PY_SHORT_FLOAT_REPR
 #include "pycore_structs.h"       // PyHamtObject
@@ -913,10 +912,9 @@ struct _is {
     struct _dtoa_state dtoa;
     struct _py_func_state func_state;
     struct _py_code_state code_state;
+
     struct _Py_dict_state dict_state;
     struct _Py_exc_state exc_state;
-    struct _memoryobject_state memobj_state;
-
     struct _Py_mem_interp_free_queue mem_free_queue;
 
     struct ast_state ast;

Include/internal/pycore_memoryobject.h

@@ -8,17 +8,6 @@ extern "C" {
 #  error "this header requires Py_BUILD_CORE define"
 #endif
 
-struct _memoryobject_state {
-    PyTypeObject *XIBufferViewType;
-};
-
-extern PyStatus _PyMemoryView_InitTypes(PyInterpreterState *);
-extern void _PyMemoryView_FiniTypes(PyInterpreterState *);
-
-// exported for _interpreters module
-PyAPI_FUNC(PyTypeObject *) _PyMemoryView_GetXIBuffewViewType(void);
-
-
 extern PyTypeObject _PyManagedBuffer_Type;
 
 PyObject *

Lib/test/test_capi/test_config.py

@@ -1,6 +1,7 @@
 """
 Tests PyConfig_Get() and PyConfig_Set() C API (PEP 741).
 """
+import os
 import sys
 import sysconfig
 import types
@@ -374,12 +375,23 @@ def expect_bool_not(value):
                 finally:
                     config_set(name, old_value)
 
+    def test_config_set_cpu_count(self):
+        config_get = _testcapi.config_get
+        config_set = _testcapi.config_set
+
+        old_value = config_get('cpu_count')
+        try:
+            config_set('cpu_count', 123)
+            self.assertEqual(os.cpu_count(), 123)
+        finally:
+            config_set('cpu_count', old_value)
+
     def test_config_set_read_only(self):
         # Test PyConfig_Set() on read-only options
         config_set = _testcapi.config_set
         for name, value in (
             ("allocator", 0),  # PyPreConfig member
-            ("cpu_count", 8),
+            ("perf_profiling", 8),
             ("dev_mode", True),
             ("filesystem_encoding", "utf-8"),
         ):

Lib/test/test_remote_pdb.py

@@ -13,14 +13,18 @@
 import unittest.mock
 from contextlib import contextmanager
 from pathlib import Path
-from test.support import is_wasi, os_helper
+from test.support import is_wasi, os_helper, SHORT_TIMEOUT
 from test.support.os_helper import temp_dir, TESTFN, unlink
 from typing import Dict, List, Optional, Tuple, Union, Any
 
 import pdb
 from pdb import _PdbServer, _PdbClient
 
 
+if not sys.is_remote_debug_enabled():
+    raise unittest.SkipTest('remote debugging is disabled')
+
+
 @contextmanager
 def kill_on_error(proc):
     """Context manager killing the subprocess if a Python exception is raised."""
@@ -415,7 +419,7 @@ def test_connect_and_basic_commands(self):
             self._send_command(client_file, "c")
 
             # Wait for process to finish
-            stdout, _ = process.communicate(timeout=5)
+            stdout, _ = process.communicate(timeout=SHORT_TIMEOUT)
 
             # Check if we got the expected output
             self.assertIn("Function returned: 42", stdout)
@@ -458,19 +462,13 @@ def test_breakpoints(self):
 
             # Continue to end
             self._send_command(client_file, "c")
-            stdout, _ = process.communicate(timeout=5)
+            stdout, _ = process.communicate(timeout=SHORT_TIMEOUT)
 
             self.assertIn("Function returned: 42", stdout)
             self.assertEqual(process.returncode, 0)
 
     def test_keyboard_interrupt(self):
         """Test that sending keyboard interrupt breaks into pdb."""
-        synchronizer_sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        synchronizer_sock.bind(('127.0.0.1', 0))  # Let OS assign port
-        synchronizer_sock.settimeout(5)
-        synchronizer_sock.listen(1)
-        self.addCleanup(synchronizer_sock.close)
-        sync_port = synchronizer_sock.getsockname()[1]
 
         script = textwrap.dedent(f"""
             import time
@@ -487,11 +485,10 @@ def bar():
                     version=pdb._PdbServer.protocol_version(),
                 )
                 print("Connected to debugger")
-                iterations = 10
-                socket.create_connection(('127.0.0.1', {sync_port})).close()
+                iterations = 50
                 while iterations > 0:
-                    print("Iteration", iterations)
-                    time.sleep(1)
+                    print("Iteration", iterations, flush=True)
+                    time.sleep(0.2)
                     iterations -= 1
                 return 42
 
@@ -508,28 +505,26 @@ def bar():
             # Continue execution
             self._send_command(client_file, "c")
 
-            # Wait until execution has continued
-            synchronizer_sock.accept()[0].close()
-
-            # Wait a bit so the remote leaves create_connection(). This is not
-            # required but makes the rest of the test faster as we will exit the main
-            # loop immediately by setting iterations to 0.
-            time.sleep(0.1)
+            # Confirm that the remote is already in the while loop. We know
+            # it's in bar() and we can exit the loop immediately by setting
+            # iterations to 0.
+            while line := process.stdout.readline():
+                if line.startswith("Iteration"):
+                    break
 
             # Inject a script to interrupt the running process
             self._send_interrupt(process.pid)
             messages = self._read_until_prompt(client_file)
 
-            # Verify we got the keyboard interrupt message. Is possible that we get interrupted somewhere
-            # in bar() or when leving create_connection()
+            # Verify we got the keyboard interrupt message.
             interrupt_msgs = [msg['message'] for msg in messages if 'message' in msg]
-            expected_msg = [msg for msg in interrupt_msgs if "bar()" in msg or "create_connection()" in msg]
+            expected_msg = [msg for msg in interrupt_msgs if "bar()" in msg]
             self.assertGreater(len(expected_msg), 0)
 
             # Continue to end as fast as we can
             self._send_command(client_file, "iterations = 0")
             self._send_command(client_file, "c")
-            stdout, _ = process.communicate(timeout=5)
+            stdout, _ = process.communicate(timeout=SHORT_TIMEOUT)
             self.assertIn("Function returned: 42", stdout)
             self.assertEqual(process.returncode, 0)
 
@@ -547,7 +542,7 @@ def test_handle_eof(self):
             client_file.flush()
 
             # The process should complete normally after receiving EOF
-            stdout, stderr = process.communicate(timeout=5)
+            stdout, stderr = process.communicate(timeout=SHORT_TIMEOUT)
 
             # Verify process completed correctly
             self.assertIn("Function returned: 42", stdout)
@@ -597,7 +592,7 @@ def run_test():
             self.assertIn('protocol version', message['message'])
 
             # The process should complete normally
-            stdout, stderr = process.communicate(timeout=5)
+            stdout, stderr = process.communicate(timeout=SHORT_TIMEOUT)
 
             # Verify the process completed successfully
             self.assertIn("Test result: True", stdout)
@@ -639,7 +634,7 @@ def test_help_system(self):
             # Continue execution to finish the program
             self._send_command(client_file, "c")
 
-            stdout, stderr = process.communicate(timeout=5)
+            stdout, stderr = process.communicate(timeout=SHORT_TIMEOUT)
             self.assertIn("Function returned: 42", stdout)
             self.assertEqual(process.returncode, 0)
 
@@ -697,7 +692,7 @@ def test_multi_line_commands(self):
             # Continue execution to finish
             self._send_command(client_file, "c")
 
-            stdout, stderr = process.communicate(timeout=5)
+            stdout, stderr = process.communicate(timeout=SHORT_TIMEOUT)
             self.assertIn("Function returned: 42", stdout)
             self.assertEqual(process.returncode, 0)
 

Modules/_asynciomodule.c

@@ -185,6 +185,10 @@ typedef struct {
     /* Counter for autogenerated Task names */
     uint64_t task_name_counter;
 
+    /* Pointer to the asyncio debug offset to avoid it to be optimized away
+       by the compiler */
+    void *debug_offsets;
+
 } asyncio_state;
 
 static inline asyncio_state *
@@ -4320,6 +4324,8 @@ module_init(asyncio_state *state)
         goto fail;
     }
 
+    state->debug_offsets = &_AsyncioDebug;
+
     Py_DECREF(module);
     return 0;
 

Modules/_interpreters_common.h

@@ -5,7 +5,6 @@
     _RESOLVE_MODINIT_FUNC_NAME(NAME)
 
 
-#ifdef REGISTERS_HEAP_TYPES
 static int
 ensure_xid_class(PyTypeObject *cls, xidatafunc getdata)
 {
@@ -17,6 +16,7 @@ ensure_xid_class(PyTypeObject *cls, xidatafunc getdata)
     return _PyXIData_RegisterClass(&ctx, cls, getdata);
 }
 
+#ifdef REGISTERS_HEAP_TYPES
 static int
 clear_xid_class(PyTypeObject *cls)
 {