[Python-checkins] r81011 - in python/branches/release26-maint: Lib/test/test_signal.py Misc/NEWS Modules/signalmodule.c Python/pythonrun.c (original) (raw)

jean-paul.calderone python-checkins at python.org
Sat May 8 23:11:28 CEST 2010


Author: jean-paul.calderone Date: Sat May 8 23:11:28 2010 New Revision: 81011

Log: Merged revisions 81007 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk

........ r81007 | jean-paul.calderone | 2010-05-08 16:06:02 -0400 (Sat, 08 May 2010) | 1 line

Skip signal handler re-installation if it is not necessary. Issue 8354. ........

Modified: python/branches/release26-maint/ (props changed) python/branches/release26-maint/Lib/test/test_signal.py python/branches/release26-maint/Misc/NEWS python/branches/release26-maint/Modules/signalmodule.c python/branches/release26-maint/Python/pythonrun.c

Modified: python/branches/release26-maint/Lib/test/test_signal.py

--- python/branches/release26-maint/Lib/test/test_signal.py (original) +++ python/branches/release26-maint/Lib/test/test_signal.py Sat May 8 23:11:28 2010 @@ -256,48 +256,121 @@ class SiginterruptTest(unittest.TestCase): signum = signal.SIGUSR1 - def readpipe_interrupted(self, cb): + + def setUp(self): + """Install a no-op signal handler that can be set to allow + interrupts or not, and arrange for the original signal handler to be + re-installed when the test is finished. + """ + self._cleanups = [] + oldhandler = signal.signal(self.signum, lambda x,y: None) + self.addCleanup(signal.signal, self.signum, oldhandler) + + + def tearDown(self): + """Run any cleanup functions which have been registered. + """ + for (f, a) in self._cleanups: + f(*a) + + + def addCleanup(self, f, *a): + """Register a function to be called at the end of the test method + run. + """ + self._cleanups.append((f, a)) + + + def readpipe_interrupted(self): + """Perform a read during which a signal will arrive. Return True if the + read is interrupted by the signal and raises an exception. Return False + if it returns normally. + """ + # Create a pipe that can be used for the read. Also clean it up + # when the test is over, since nothing else will (but see below for + # the write end). r, w = os.pipe() + self.addCleanup(os.close, r) + + # Create another process which can send a signal to this one to try + # to interrupt the read. ppid = os.getpid() pid = os.fork() - oldhandler = signal.signal(self.signum, lambda x,y: None) - cb() - if pid==0: - # child code: sleep, kill, sleep. and then exit, - # which closes the pipe from which the parent process reads + if pid == 0: + # Child code: sleep to give the parent enough time to enter the + # read() call (there's a race here, but it's really tricky to + # eliminate it); then signal the parent process. Also, sleep + # again to make it likely that the signal is delivered to the + # parent process before the child exits. If the child exits + # first, the write end of the pipe will be closed and the test + # is invalid. try: time.sleep(0.2) os.kill(ppid, self.signum) time.sleep(0.2) finally: + # No matter what, just exit as fast as possible now. exit_subprocess()

class ItimerTest(unittest.TestCase): def setUp(self):

Modified: python/branches/release26-maint/Misc/NEWS

--- python/branches/release26-maint/Misc/NEWS (original) +++ python/branches/release26-maint/Misc/NEWS Sat May 8 23:11:28 2010 @@ -73,6 +73,9 @@

+- Issue #8354: The siginterrupt setting is now preserved for all signals,

Modified: python/branches/release26-maint/Modules/signalmodule.c

--- python/branches/release26-maint/Modules/signalmodule.c (original) +++ python/branches/release26-maint/Modules/signalmodule.c Sat May 8 23:11:28 2010 @@ -192,7 +192,12 @@ return; } #endif +#ifndef HAVE_SIGACTION + /* If the handler was not set up with sigaction, reinstall it. See + * Python/pythonrun.c for the implementation of PyOS_setsig which + * makes this true. See also issue8354. */ PyOS_setsig(sig_num, signal_handler); +#endif }

Modified: python/branches/release26-maint/Python/pythonrun.c

--- python/branches/release26-maint/Python/pythonrun.c (original) +++ python/branches/release26-maint/Python/pythonrun.c Sat May 8 23:11:28 2010 @@ -1867,6 +1867,10 @@ PyOS_setsig(int sig, PyOS_sighandler_t handler) { #ifdef HAVE_SIGACTION + /* Some code in Modules/signalmodule.c depends on sigaction() being + * used here if HAVE_SIGACTION is defined. Fix that if this code + * changes to invalidate that assumption. + */ struct sigaction context, ocontext; context.sa_handler = handler; sigemptyset(&context.sa_mask);



More information about the Python-checkins mailing list