[Python-checkins] bpo-31904: Support signal module on VxWorks (GH-23391)
vstinner
webhook-mailer at python.org
Mon Nov 30 16:48:44 EST 2020
https://github.com/python/cpython/commit/1244c816d7cdfa8a26d1671cab67122a8c5271a7
commit: 1244c816d7cdfa8a26d1671cab67122a8c5271a7
branch: master
author: pxinwr <peixing.xin at windriver.com>
committer: vstinner <vstinner at python.org>
date: 2020-11-30T22:48:33+01:00
summary:
bpo-31904: Support signal module on VxWorks (GH-23391)
files:
A Misc/NEWS.d/next/Library/2020-11-19-16-14-36.bpo-31904.83kf9d.rst
M Lib/test/test_signal.py
M Modules/signalmodule.c
diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py
index 5a8ff361f9656..6a43fe70372c5 100644
--- a/Lib/test/test_signal.py
+++ b/Lib/test/test_signal.py
@@ -519,10 +519,14 @@ def handler(signum, frame):
else:
write.setblocking(False)
- # Start with large chunk size to reduce the
- # number of send needed to fill the buffer.
written = 0
- for chunk_size in (2 ** 16, 2 ** 8, 1):
+ if sys.platform == "vxworks":
+ CHUNK_SIZES = (1,)
+ else:
+ # Start with large chunk size to reduce the
+ # number of send needed to fill the buffer.
+ CHUNK_SIZES = (2 ** 16, 2 ** 8, 1)
+ for chunk_size in CHUNK_SIZES:
chunk = b"x" * chunk_size
try:
while True:
@@ -595,6 +599,7 @@ def handler(signum, frame):
@unittest.skipIf(sys.platform == "win32", "Not valid on Windows")
+ at unittest.skipUnless(hasattr(signal, 'siginterrupt'), "needs signal.siginterrupt()")
class SiginterruptTest(unittest.TestCase):
def readpipe_interrupted(self, interrupt):
@@ -680,6 +685,8 @@ def test_siginterrupt_off(self):
@unittest.skipIf(sys.platform == "win32", "Not valid on Windows")
+ at unittest.skipUnless(hasattr(signal, 'getitimer') and hasattr(signal, 'setitimer'),
+ "needs signal.getitimer() and signal.setitimer()")
class ItimerTest(unittest.TestCase):
def setUp(self):
self.hndl_called = False
diff --git a/Misc/NEWS.d/next/Library/2020-11-19-16-14-36.bpo-31904.83kf9d.rst b/Misc/NEWS.d/next/Library/2020-11-19-16-14-36.bpo-31904.83kf9d.rst
new file mode 100644
index 0000000000000..e0ea23aefae7f
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2020-11-19-16-14-36.bpo-31904.83kf9d.rst
@@ -0,0 +1 @@
+Support signal module on VxWorks.
diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c
index fcc8f1cbda227..7ac797a3aa3f8 100644
--- a/Modules/signalmodule.c
+++ b/Modules/signalmodule.c
@@ -120,7 +120,11 @@ static volatile struct {
#else
#define INVALID_FD (-1)
static volatile struct {
+#ifdef __VXWORKS__
+ int fd;
+#else
sig_atomic_t fd;
+#endif
int warn_on_full_buffer;
} wakeup = {.fd = INVALID_FD, .warn_on_full_buffer = 1};
#endif
More information about the Python-checkins
mailing list