Merge branch 'master' into signal-std-handlers

python · serhiy-storchaka · Aug 25, 2018 · Jun 28, 2020 · Jun 28, 2020 · Jun 28, 2020
commit af73646e6d1239b07351a2e7d10faeaeca817d40
diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py
@@ -1,4 +1,5 @@
 import copy
+import errno
 import os
 import pickle
 import random

diff --git a/Modules/clinic/signalmodule.c.h b/Modules/clinic/signalmodule.c.h
diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c
@@ -1261,19 +1261,74 @@ signal_pthread_kill_impl(PyObject *module, unsigned long thread_id,
 #endif   /* #if defined(HAVE_PTHREAD_KILL) */
 
 
+/*[clinic input]
+signal.SIG_DFL
+    signalnum: int
+    frame: object
+    /
+
+Standard signal handler used to refer to the system default handler.
+[clinic start generated code]*/
+
 static PyObject *
-signal_sig_const(PyObject *self, PyObject *args)
+signal_SIG_DFL_impl(PyObject *module, int signalnum, PyObject *frame)
+/*[clinic end generated code: output=7293f25d5f7a3415 input=9df97af30cd58214]*/
 {
     PyErr_SetString(PyExc_TypeError,
-                    "standard handler can't be called directly");
+                    "system default handler can't be called directly");
     return NULL;
 }
 
-PyDoc_STRVAR(signal_SIG_DFL_doc,
-"Standard signal handler used to refer to the system default handler.");
 
-PyDoc_STRVAR(signal_SIG_IGN_doc,
-"Standard signal handler used to ignore the given signal.");
+/*[clinic input]
+signal.SIG_IGN
+    signalnum: int
+    frame: object
+    /
+
+Standard signal handler used to ignore the given signal.
+[clinic start generated code]*/
+
+static PyObject *
+signal_SIG_IGN_impl(PyObject *module, int signalnum, PyObject *frame)
+/*[clinic end generated code: output=8b52aad79325460a input=1b49e704cb42377a]*/
+{
+    Py_RETURN_NONE;
+}
+
+
+#if defined(__linux__) && defined(__NR_pidfd_send_signal)
+/*[clinic input]
+signal.pidfd_send_signal
+
+    pidfd: int
+    signalnum: int
+    siginfo: object = None
+    flags: int = 0
+    /
+
+Send a signal to a process referred to by a pid file descriptor.
+[clinic start generated code]*/
+
+static PyObject *
+signal_pidfd_send_signal_impl(PyObject *module, int pidfd, int signalnum,
+                              PyObject *siginfo, int flags)
+/*[clinic end generated code: output=2d59f04a75d9cbdf input=2a6543a1f4ac2000]*/
+
+{
+    if (siginfo != Py_None) {
+        PyErr_SetString(PyExc_TypeError, "siginfo must be None");
+        return NULL;
+    }
+    if (syscall(__NR_pidfd_send_signal, pidfd, signalnum, NULL, flags) < 0) {
+        PyErr_SetFromErrno(PyExc_OSError);
+        return NULL;
+    }
+    Py_RETURN_NONE;
+}
+#endif
+
+
 
 /* List of functions defined in the module -- some of the methoddefs are<
9D87
/span>
    defined to nothing if the corresponding C function is not available. */
@@ -1299,8 +1354,8 @@ static PyMethodDef signal_methods[] = {
 #if defined(HAVE_SIGFILLSET) || defined(MS_WINDOWS)
     SIGNAL_VALID_SIGNALS_METHODDEF
 #endif
-    {"SIG_DFL", signal_sig_const, METH_VARARGS, signal_SIG_DFL_doc},
-    {"SIG_IGN", signal_sig_const, METH_VARARGS, signal_SIG_IGN_doc},
+    SIGNAL_SIG_DFL_METHODDEF
+    SIGNAL_SIG_IGN_METHODDEF
     {NULL, NULL}           /* sentinel */
 };
 
@@ -1375,13 +1430,13 @@ PyInit__signal(void)
     /* Add some symbolic constants to the module */
     d = PyModule_GetDict(m);
 
-    x = DefaultHandler = PyDict_GetItemString(d, "SIG_DFL");
-    if (!x)
+    DefaultHandler = PyDict_GetItemString(d, "SIG_DFL");
+    if (!DefaultHandler)
         goto finally;
     Py_INCREF(DefaultHandler);
 
-    x = IgnoreHandler = PyDict_GetItemString(d, "SIG_IGN");
-    if (!x)
+    IgnoreHandler = PyDict_GetItemString(d, "SIG_IGN");
+    if (!IgnoreHandler)
         goto finally;
     Py_INCREF(IgnoreHandler);