Add _PY_FAIL_IF_INTERRUPTED flag

Don't call signal handlers if interrupted, only return PY_LOCK_INTR.

Author: vstinner

Include/internal/pycore_lock.h

@@ -48,6 +48,9 @@ typedef enum _PyLockFlags {
 
     // Handle signals if interrupted while waiting on the lock.
     _PY_LOCK_HANDLE_SIGNALS = 2,
+
+    // Fail if interrupted by a signal while waiting on the lock.
+    _PY_FAIL_IF_INTERRUPTED = 4,
 } _PyLockFlags;
 
 // Lock a mutex with an optional timeout and additional options. See

Python/lock.c

@@ -119,6 +119,9 @@ _PyMutex_LockTimed(PyMutex *m, PyTime_t timeout, _PyLockFlags flags)
                 return PY_LOCK_INTR;
             }
         }
+        else if (ret == Py_PARK_INTR && (flags & _PY_FAIL_IF_INTERRUPTED)) {
+            return PY_LOCK_INTR;
+        }
         else if (ret == Py_PARK_TIMEOUT) {
             assert(timeout >= 0);
             return PY_LOCK_FAILURE;

Python/thread.c

@@ -119,7 +119,7 @@ PyThread_acquire_lock_timed(PyThread_type_lock lock, PY_TIMEOUT_T microseconds,
 
     _PyLockFlags flags = _Py_LOCK_DONT_DETACH;
     if (intr_flag) {
-        flags |= _PY_LOCK_HANDLE_SIGNALS;
+        flags |= _PY_FAIL_IF_INTERRUPTED;
     }
 
     return _PyMutex_LockTimed((PyMutex *)lock, timeout, flags);