[oss-build] Backport bpo-41675: Modernize siginterrupt calls

czardoz · czardoz · commit 6a0125b75d6f · 2021-05-07T14:09:26.000-07:00
Summary: The OSS build fails at compilation with this error: ``` /home/aniketpanse/cinder/Modules/signalmodule.c: In function ‘signal_siginterrupt_impl’: /home/aniketpanse/cinder/Modules/signalmodule.c:661:5: error: ‘siginterrupt’ is deprecated: Use sigaction with SA_RESTART instead [-Werror=deprecated-declarations] 661 | if (siginterrupt(signalnum, flag)<0) { | ^~ In file included from /home/aniketpanse/cinder/Modules/signalmodule.c:26: /usr/include/signal.h:311:12: note: declared here 311 | extern int siginterrupt (int __sig, int __interrupt) __THROW | ^~~~~~~~~~~~ cc1: all warnings being treated as errors make: *** [Makefile:2431: Modules/signalmodule.o] Error 1 make: *** Waiting for unfinished jobs.... ``` Backport upstream fix from python/cpython#22028 Test Plan: ran `./oss-build-and-test.sh`, which succeeded Reviewers: carljm, #cinder Reviewed By: carljm Subscribers: jackyzhang, #ig-webserver Differential Revision: https://phabricator.intern.facebook.com/D28297270 Signature: 28297270:1620421376:0a117614f6257be559e56172abd0ff2133d2b276
diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c
@@ -658,7 +658,19 @@ signal_siginterrupt_impl(PyObject *module, int signalnum, int flag)
                         "signal number out of range");
         return NULL;
     }
-    if (siginterrupt(signalnum, flag)<0) {
+#ifdef HAVE_SIGACTION
+    struct sigaction act;
+    (void) sigaction(signalnum, NULL, &act);
+    if (flag) {
+        act.sa_flags &= ~SA_RESTART;
+    }
+    else {
+        act.sa_flags |= SA_RESTART;
+    }
+    if (sigaction(signalnum, &act, NULL) < 0) {
+#else
+    if (siginterrupt(signalnum, flag) < 0) {
+#endif
         PyErr_SetFromErrno(PyExc_OSError);
         return NULL;
     }
