Merge branch 'main' into gh-145866-call_intrinsic_2

Author: KevinH15291

Doc/whatsnew/3.15.rst

@@ -842,6 +842,7 @@ mimetypes
 * Add ``application/sql`` and ``application/vnd.sqlite3``.
   (Contributed by Charlie Lin in :gh:`145698`.)
 * Add ``image/jxl``. (Contributed by Foolbar in :gh:`144213`.)
+* Add ``application/efi``. (Contributed by Charlie Lin in :gh:`145720`.)
 * Add the following MIME types:
 
   - ``application/vnd.ms-cab-compressed`` for ``.cab`` extension

Lib/mimetypes.py

@@ -478,6 +478,7 @@ def _default_mime_types():
         '.js'     : 'text/javascript',
         '.mjs'    : 'text/javascript',
         '.dcm'    : 'application/dicom',
+        '.efi'    : 'application/efi',
         '.epub'   : 'application/epub+zip',
         '.gz'     : 'application/gzip',
         '.json'   : 'application/json',

Misc/NEWS.d/next/Core_and_Builtins/2026-03-19-16-16-40.gh-issue-135871.jSExZ3.rst

@@ -0,0 +1 @@
+Improve multithreaded scaling of PyMutex in low-contention scenarios by reloading the lock's internal state, without slowing down high-contention scenarios.

Misc/NEWS.d/next/Library/2026-03-10-01-54-34.gh-issue-145719.okJRoK.rst

@@ -0,0 +1 @@
+Add ``application/efi`` MIME type to :mod:`mimetypes`.

Python/lock.c

@@ -27,8 +27,10 @@ static const PyTime_t TIME_TO_BE_FAIR_NS = 1000*1000;
 // enabled.
 #if Py_GIL_DISABLED
 static const int MAX_SPIN_COUNT = 40;
+static const int RELOAD_SPIN_MASK = 3;
 #else
 static const int MAX_SPIN_COUNT = 0;
+static const int RELOAD_SPIN_MASK = 1;
 #endif
 
 struct mutex_entry {
@@ -79,6 +81,16 @@ _PyMutex_LockTimed(PyMutex *m, PyTime_t timeout, _PyLockFlags flags)
     };
 
     Py_ssize_t spin_count = 0;
+#ifdef Py_GIL_DISABLED
+    // Using thread-id as a way of reducing contention further in the reload below.
+    // It adds a pseudo-random starting offset to the recurrence, so that threads
+    // are less likely to try and run compare-exchange at the same time.
+    // The lower bits of platform thread ids are likely to not be random,
+    // hence the right shift.
+    const Py_ssize_t tid = (Py_ssize_t)(_Py_ThreadId() >> 12);
+#else
+    const Py_ssize_t tid = 0;
+#endif
     for (;;) {
         if ((v & _Py_LOCKED) == 0) {
             // The lock is unlocked. Try to grab it.
@@ -92,6 +104,9 @@ _PyMutex_LockTimed(PyMutex *m, PyTime_t timeout, _PyLockFlags flags)
             // Spin for a bit.
             _Py_yield();
             spin_count++;
+            if (((spin_count + tid) & RELOAD_SPIN_MASK) == 0) {
+                v = _Py_atomic_load_uint8_relaxed(&m->_bits);
+            }
             continue;
         }
 

Python/sysmodule.c

@@ -3878,20 +3878,38 @@ static PyStructSequence_Desc emscripten_info_desc = {
 
 EM_JS(char *, _Py_emscripten_runtime, (void), {
     var info;
-    if (typeof navigator == 'object') {
+    if (typeof process === "object") {
+        if (process.versions?.bun) {
+            info = `bun v${process.versions.bun}`;
+        } else if (process.versions?.deno) {
+            info = `deno v${process.versions.deno}`;
+        } else {
+            // As far as I can tell, every JavaScript runtime puts "node" in
+            // process.release.name. Pyodide once checked for
+            //
+            // process.release.name === "node"
+            //
+            // and this is apparently part of the reason other runtimes started
+            // lying about it. Similar to the situation with userAgent.
+            //
+            // But just in case some other JS runtime decides to tell us what it
+            // is, we'll pick it up.
+            const name = process.release?.name ?? "node";
+            info = `${name} ${process.version}`;
+        }
+        // Include v8 version if we know it
+        if (process.versions?.v8) {
+            info +=  ` (v8 ${process.versions.v8})`;
+        }
+    } else if (typeof navigator === "object") {
         info = navigator.userAgent;
-    } else if (typeof process == 'object') {
-        info = "Node.js ".concat(process.version);
     } else {
         info = "UNKNOWN";
     }
-    var len = lengthBytesUTF8(info) + 1;
-    var res = _malloc(len);
-    if (res) stringToUTF8(info, res, len);
 #if __wasm64__
-    return BigInt(res);
+    return BigInt(stringToNewUTF8(info));
 #else
-    return res;
+    return stringToNewUTF8(info);
 #endif
 });