Reinstall signal handler when Python signal handler called

Author: user202729

src/cysignals/implementation.c

@@ -681,7 +681,14 @@ static void setup_cysignals_handlers(void)
     sigprocmask(SIG_SETMASK, &default_sigmask, &sigmask_with_sigint);
 #endif
 
-    /* Install signal handlers */
+    /* Install signal handlers. We need a separate C-level interrupt handler
+     * apart from the Python-level interrupt handler because Python-level
+     * interrupt handler will not be called inside Cython code.
+     * See init_cysignals and python_check_interrupt for an explanation.
+     * A downside is the C-level interrupt handler will be overwritten
+     * when signal(SIGINT, getsignal(SIGINT)) is executed, in that case
+     * init_cysignals() need to be called again.
+     */
     /* Handlers for interrupt-like signals */
     sa.sa_handler = cysigs_interrupt_handler;
     sa.sa_flags = 0;

src/cysignals/signals.pxd

@@ -26,6 +26,7 @@ cdef extern from "struct_signals.h":
 
     ctypedef struct cysigs_t:
         cy_atomic_int sig_on_count
+        cy_atomic_int interrupt_received
         cy_atomic_int block_sigint
         const char* s
         PyObject* exc_value

src/cysignals/signals.pyx

@@ -352,6 +352,13 @@ def python_check_interrupt(sig, frame):
     code. This simply delegates to the interrupt handling code in
     ``implementation.c``.
     """
+    if sig_check() == 0:
+        return
+    # If this line is reached, a possibility is that something called
+    # signal(SIGINT, getsignal(SIGINT)), which cause cysigs_interrupt_handler
+    # to not be called. We reinstall the C-level signal handler.
+    init_cysignals()
+    cysigs.interrupt_received = sig
     sig_check()