1994-05-11 05:59:13 -03:00
|
|
|
|
1995-01-02 15:30:30 -04:00
|
|
|
/* Signal module -- many thanks to Lance Ellinghaus */
|
1994-05-11 05:59:13 -03:00
|
|
|
|
1997-04-09 16:24:53 -03:00
|
|
|
/* XXX Signals should be recorded per thread, now we have thread state. */
|
|
|
|
|
1994-09-14 10:32:22 -03:00
|
|
|
#include "Python.h"
|
2013-02-10 15:56:49 -04:00
|
|
|
#ifndef MS_WINDOWS
|
|
|
|
#include "posixmodule.h"
|
|
|
|
#endif
|
2014-07-29 18:31:34 -03:00
|
|
|
#ifdef MS_WINDOWS
|
|
|
|
#include "socketmodule.h" /* needed for SOCKET_T */
|
|
|
|
#endif
|
1994-05-11 05:59:13 -03:00
|
|
|
|
2002-06-30 12:26:10 -03:00
|
|
|
#ifdef MS_WINDOWS
|
2013-03-31 17:48:04 -03:00
|
|
|
#include <windows.h>
|
Merged revisions 78338,78345-78346,78561-78562,78566,78574,78581,78634,78660,78675 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78338 | andrew.kuchling | 2010-02-22 15:04:02 -0600 (Mon, 22 Feb 2010) | 4 lines
Remove Tools/modulator, a reference to it in the docs, and a screenshot of it.
(I asked the BDFL first, and he approved removing it. The last actual bugfix
to Tools/modulator was in 2001; since then all changes have been search-and-replace:
string methods, whitespace fixes, etc.)
........
r78345 | andrew.kuchling | 2010-02-22 17:10:52 -0600 (Mon, 22 Feb 2010) | 1 line
#7706: DONT_HAVE_ERRNO_H is no longer defined by configure (after rev.46819).
........
r78346 | andrew.kuchling | 2010-02-22 17:12:00 -0600 (Mon, 22 Feb 2010) | 1 line
#7706: add include guards where they're missing; required for Windows CE
........
r78561 | andrew.kuchling | 2010-03-01 13:51:43 -0600 (Mon, 01 Mar 2010) | 1 line
#7191: describe more details of wbits parameter
........
r78562 | andrew.kuchling | 2010-03-01 14:11:57 -0600 (Mon, 01 Mar 2010) | 1 line
#7637: avoid repeated-concatenation antipattern in example
........
r78566 | barry.warsaw | 2010-03-01 15:46:51 -0600 (Mon, 01 Mar 2010) | 4 lines
Manually copy patch for bug 7250 from the release26-maint branch. I suck
because I did this in the wrong order and couldn't smack svnmerge into
submission.
........
r78574 | benjamin.peterson | 2010-03-01 17:25:13 -0600 (Mon, 01 Mar 2010) | 1 line
remove CVS id
........
r78581 | michael.foord | 2010-03-02 08:22:15 -0600 (Tue, 02 Mar 2010) | 1 line
Link correction in documentation.
........
r78634 | benjamin.peterson | 2010-03-03 15:28:25 -0600 (Wed, 03 Mar 2010) | 1 line
rephrase
........
r78660 | dirkjan.ochtman | 2010-03-04 13:21:53 -0600 (Thu, 04 Mar 2010) | 4 lines
Try to fix buildbot breakage from r78384.
Thanks bitdancer and briancurtin for the help.
........
r78675 | florent.xicluna | 2010-03-04 19:12:14 -0600 (Thu, 04 Mar 2010) | 2 lines
These line should not be there.
........
2010-03-21 19:36:19 -03:00
|
|
|
#ifdef HAVE_PROCESS_H
|
1997-04-09 16:24:53 -03:00
|
|
|
#include <process.h>
|
|
|
|
#endif
|
Merged revisions 78338,78345-78346,78561-78562,78566,78574,78581,78634,78660,78675 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78338 | andrew.kuchling | 2010-02-22 15:04:02 -0600 (Mon, 22 Feb 2010) | 4 lines
Remove Tools/modulator, a reference to it in the docs, and a screenshot of it.
(I asked the BDFL first, and he approved removing it. The last actual bugfix
to Tools/modulator was in 2001; since then all changes have been search-and-replace:
string methods, whitespace fixes, etc.)
........
r78345 | andrew.kuchling | 2010-02-22 17:10:52 -0600 (Mon, 22 Feb 2010) | 1 line
#7706: DONT_HAVE_ERRNO_H is no longer defined by configure (after rev.46819).
........
r78346 | andrew.kuchling | 2010-02-22 17:12:00 -0600 (Mon, 22 Feb 2010) | 1 line
#7706: add include guards where they're missing; required for Windows CE
........
r78561 | andrew.kuchling | 2010-03-01 13:51:43 -0600 (Mon, 01 Mar 2010) | 1 line
#7191: describe more details of wbits parameter
........
r78562 | andrew.kuchling | 2010-03-01 14:11:57 -0600 (Mon, 01 Mar 2010) | 1 line
#7637: avoid repeated-concatenation antipattern in example
........
r78566 | barry.warsaw | 2010-03-01 15:46:51 -0600 (Mon, 01 Mar 2010) | 4 lines
Manually copy patch for bug 7250 from the release26-maint branch. I suck
because I did this in the wrong order and couldn't smack svnmerge into
submission.
........
r78574 | benjamin.peterson | 2010-03-01 17:25:13 -0600 (Mon, 01 Mar 2010) | 1 line
remove CVS id
........
r78581 | michael.foord | 2010-03-02 08:22:15 -0600 (Tue, 02 Mar 2010) | 1 line
Link correction in documentation.
........
r78634 | benjamin.peterson | 2010-03-03 15:28:25 -0600 (Wed, 03 Mar 2010) | 1 line
rephrase
........
r78660 | dirkjan.ochtman | 2010-03-04 13:21:53 -0600 (Thu, 04 Mar 2010) | 4 lines
Try to fix buildbot breakage from r78384.
Thanks bitdancer and briancurtin for the help.
........
r78675 | florent.xicluna | 2010-03-04 19:12:14 -0600 (Thu, 04 Mar 2010) | 2 lines
These line should not be there.
........
2010-03-21 19:36:19 -03:00
|
|
|
#endif
|
1997-04-09 16:24:53 -03:00
|
|
|
|
Merged revisions 78338,78345-78346,78561-78562,78566,78574,78581,78634,78660,78675 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78338 | andrew.kuchling | 2010-02-22 15:04:02 -0600 (Mon, 22 Feb 2010) | 4 lines
Remove Tools/modulator, a reference to it in the docs, and a screenshot of it.
(I asked the BDFL first, and he approved removing it. The last actual bugfix
to Tools/modulator was in 2001; since then all changes have been search-and-replace:
string methods, whitespace fixes, etc.)
........
r78345 | andrew.kuchling | 2010-02-22 17:10:52 -0600 (Mon, 22 Feb 2010) | 1 line
#7706: DONT_HAVE_ERRNO_H is no longer defined by configure (after rev.46819).
........
r78346 | andrew.kuchling | 2010-02-22 17:12:00 -0600 (Mon, 22 Feb 2010) | 1 line
#7706: add include guards where they're missing; required for Windows CE
........
r78561 | andrew.kuchling | 2010-03-01 13:51:43 -0600 (Mon, 01 Mar 2010) | 1 line
#7191: describe more details of wbits parameter
........
r78562 | andrew.kuchling | 2010-03-01 14:11:57 -0600 (Mon, 01 Mar 2010) | 1 line
#7637: avoid repeated-concatenation antipattern in example
........
r78566 | barry.warsaw | 2010-03-01 15:46:51 -0600 (Mon, 01 Mar 2010) | 4 lines
Manually copy patch for bug 7250 from the release26-maint branch. I suck
because I did this in the wrong order and couldn't smack svnmerge into
submission.
........
r78574 | benjamin.peterson | 2010-03-01 17:25:13 -0600 (Mon, 01 Mar 2010) | 1 line
remove CVS id
........
r78581 | michael.foord | 2010-03-02 08:22:15 -0600 (Tue, 02 Mar 2010) | 1 line
Link correction in documentation.
........
r78634 | benjamin.peterson | 2010-03-03 15:28:25 -0600 (Wed, 03 Mar 2010) | 1 line
rephrase
........
r78660 | dirkjan.ochtman | 2010-03-04 13:21:53 -0600 (Thu, 04 Mar 2010) | 4 lines
Try to fix buildbot breakage from r78384.
Thanks bitdancer and briancurtin for the help.
........
r78675 | florent.xicluna | 2010-03-04 19:12:14 -0600 (Thu, 04 Mar 2010) | 2 lines
These line should not be there.
........
2010-03-21 19:36:19 -03:00
|
|
|
#ifdef HAVE_SIGNAL_H
|
1994-05-11 05:59:13 -03:00
|
|
|
#include <signal.h>
|
Merged revisions 78338,78345-78346,78561-78562,78566,78574,78581,78634,78660,78675 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78338 | andrew.kuchling | 2010-02-22 15:04:02 -0600 (Mon, 22 Feb 2010) | 4 lines
Remove Tools/modulator, a reference to it in the docs, and a screenshot of it.
(I asked the BDFL first, and he approved removing it. The last actual bugfix
to Tools/modulator was in 2001; since then all changes have been search-and-replace:
string methods, whitespace fixes, etc.)
........
r78345 | andrew.kuchling | 2010-02-22 17:10:52 -0600 (Mon, 22 Feb 2010) | 1 line
#7706: DONT_HAVE_ERRNO_H is no longer defined by configure (after rev.46819).
........
r78346 | andrew.kuchling | 2010-02-22 17:12:00 -0600 (Mon, 22 Feb 2010) | 1 line
#7706: add include guards where they're missing; required for Windows CE
........
r78561 | andrew.kuchling | 2010-03-01 13:51:43 -0600 (Mon, 01 Mar 2010) | 1 line
#7191: describe more details of wbits parameter
........
r78562 | andrew.kuchling | 2010-03-01 14:11:57 -0600 (Mon, 01 Mar 2010) | 1 line
#7637: avoid repeated-concatenation antipattern in example
........
r78566 | barry.warsaw | 2010-03-01 15:46:51 -0600 (Mon, 01 Mar 2010) | 4 lines
Manually copy patch for bug 7250 from the release26-maint branch. I suck
because I did this in the wrong order and couldn't smack svnmerge into
submission.
........
r78574 | benjamin.peterson | 2010-03-01 17:25:13 -0600 (Mon, 01 Mar 2010) | 1 line
remove CVS id
........
r78581 | michael.foord | 2010-03-02 08:22:15 -0600 (Tue, 02 Mar 2010) | 1 line
Link correction in documentation.
........
r78634 | benjamin.peterson | 2010-03-03 15:28:25 -0600 (Wed, 03 Mar 2010) | 1 line
rephrase
........
r78660 | dirkjan.ochtman | 2010-03-04 13:21:53 -0600 (Thu, 04 Mar 2010) | 4 lines
Try to fix buildbot breakage from r78384.
Thanks bitdancer and briancurtin for the help.
........
r78675 | florent.xicluna | 2010-03-04 19:12:14 -0600 (Thu, 04 Mar 2010) | 2 lines
These line should not be there.
........
2010-03-21 19:36:19 -03:00
|
|
|
#endif
|
|
|
|
#ifdef HAVE_SYS_STAT_H
|
Merged revisions 59565-59594 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59568 | facundo.batista | 2007-12-19 13:53:01 +0100 (Wed, 19 Dec 2007) | 3 lines
Some minor cleanups. Thanks Mark Dickinson.
........
r59573 | raymond.hettinger | 2007-12-19 19:13:31 +0100 (Wed, 19 Dec 2007) | 1 line
Fix issue 1661: Flags argument silently ignored in re functions with compiled regexes.
........
r59574 | guido.van.rossum | 2007-12-19 20:41:06 +0100 (Wed, 19 Dec 2007) | 7 lines
Patch #1583 by Adam Olsen.
This adds signal.set_wakeup_fd(fd) which sets a file descriptor to
which a zero byte will be written whenever a C exception handler runs.
I added a simple C API as well, PySignal_SetWakeupFd(fd).
........
r59575 | raymond.hettinger | 2007-12-19 23:14:34 +0100 (Wed, 19 Dec 2007) | 1 line
Bigger range for non-extended opargs.
........
r59576 | guido.van.rossum | 2007-12-19 23:51:13 +0100 (Wed, 19 Dec 2007) | 5 lines
Patch #1549 by Thomas Herve.
This changes the rules for when __hash__ is inherited slightly,
by allowing it to be inherited when one or more of __lt__, __le__,
__gt__, __ge__ are overridden, as long as __eq__ and __ne__ aren't.
........
r59577 | raymond.hettinger | 2007-12-20 02:25:05 +0100 (Thu, 20 Dec 2007) | 1 line
Add comments
........
r59578 | brett.cannon | 2007-12-20 11:09:52 +0100 (Thu, 20 Dec 2007) | 3 lines
Add tests for the warnings module; specifically formatwarning and showwarning.
Still need tests for warn_explicit and simplefilter.
........
r59582 | guido.van.rossum | 2007-12-20 18:28:10 +0100 (Thu, 20 Dec 2007) | 2 lines
Patch #1672 by Joseph Armbruster. Use tempdir() to get a temporary directory.
........
r59584 | georg.brandl | 2007-12-20 22:03:02 +0100 (Thu, 20 Dec 2007) | 2 lines
Fix refleak introduced in r59576.
........
r59586 | guido.van.rossum | 2007-12-21 00:48:28 +0100 (Fri, 21 Dec 2007) | 4 lines
Improve performance of built-in any()/all() by avoiding PyIter_Next() --
using a trick found in ifilter().
Feel free to backport to 2.5.
........
r59591 | andrew.kuchling | 2007-12-22 18:27:02 +0100 (Sat, 22 Dec 2007) | 1 line
Add item
........
2007-12-24 04:52:31 -04:00
|
|
|
#include <sys/stat.h>
|
Merged revisions 78338,78345-78346,78561-78562,78566,78574,78581,78634,78660,78675 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78338 | andrew.kuchling | 2010-02-22 15:04:02 -0600 (Mon, 22 Feb 2010) | 4 lines
Remove Tools/modulator, a reference to it in the docs, and a screenshot of it.
(I asked the BDFL first, and he approved removing it. The last actual bugfix
to Tools/modulator was in 2001; since then all changes have been search-and-replace:
string methods, whitespace fixes, etc.)
........
r78345 | andrew.kuchling | 2010-02-22 17:10:52 -0600 (Mon, 22 Feb 2010) | 1 line
#7706: DONT_HAVE_ERRNO_H is no longer defined by configure (after rev.46819).
........
r78346 | andrew.kuchling | 2010-02-22 17:12:00 -0600 (Mon, 22 Feb 2010) | 1 line
#7706: add include guards where they're missing; required for Windows CE
........
r78561 | andrew.kuchling | 2010-03-01 13:51:43 -0600 (Mon, 01 Mar 2010) | 1 line
#7191: describe more details of wbits parameter
........
r78562 | andrew.kuchling | 2010-03-01 14:11:57 -0600 (Mon, 01 Mar 2010) | 1 line
#7637: avoid repeated-concatenation antipattern in example
........
r78566 | barry.warsaw | 2010-03-01 15:46:51 -0600 (Mon, 01 Mar 2010) | 4 lines
Manually copy patch for bug 7250 from the release26-maint branch. I suck
because I did this in the wrong order and couldn't smack svnmerge into
submission.
........
r78574 | benjamin.peterson | 2010-03-01 17:25:13 -0600 (Mon, 01 Mar 2010) | 1 line
remove CVS id
........
r78581 | michael.foord | 2010-03-02 08:22:15 -0600 (Tue, 02 Mar 2010) | 1 line
Link correction in documentation.
........
r78634 | benjamin.peterson | 2010-03-03 15:28:25 -0600 (Wed, 03 Mar 2010) | 1 line
rephrase
........
r78660 | dirkjan.ochtman | 2010-03-04 13:21:53 -0600 (Thu, 04 Mar 2010) | 4 lines
Try to fix buildbot breakage from r78384.
Thanks bitdancer and briancurtin for the help.
........
r78675 | florent.xicluna | 2010-03-04 19:12:14 -0600 (Thu, 04 Mar 2010) | 2 lines
These line should not be there.
........
2010-03-21 19:36:19 -03:00
|
|
|
#endif
|
2008-03-24 11:05:07 -03:00
|
|
|
#ifdef HAVE_SYS_TIME_H
|
2008-03-24 10:39:54 -03:00
|
|
|
#include <sys/time.h>
|
2008-03-24 11:05:07 -03:00
|
|
|
#endif
|
Merged revisions 59565-59594 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59568 | facundo.batista | 2007-12-19 13:53:01 +0100 (Wed, 19 Dec 2007) | 3 lines
Some minor cleanups. Thanks Mark Dickinson.
........
r59573 | raymond.hettinger | 2007-12-19 19:13:31 +0100 (Wed, 19 Dec 2007) | 1 line
Fix issue 1661: Flags argument silently ignored in re functions with compiled regexes.
........
r59574 | guido.van.rossum | 2007-12-19 20:41:06 +0100 (Wed, 19 Dec 2007) | 7 lines
Patch #1583 by Adam Olsen.
This adds signal.set_wakeup_fd(fd) which sets a file descriptor to
which a zero byte will be written whenever a C exception handler runs.
I added a simple C API as well, PySignal_SetWakeupFd(fd).
........
r59575 | raymond.hettinger | 2007-12-19 23:14:34 +0100 (Wed, 19 Dec 2007) | 1 line
Bigger range for non-extended opargs.
........
r59576 | guido.van.rossum | 2007-12-19 23:51:13 +0100 (Wed, 19 Dec 2007) | 5 lines
Patch #1549 by Thomas Herve.
This changes the rules for when __hash__ is inherited slightly,
by allowing it to be inherited when one or more of __lt__, __le__,
__gt__, __ge__ are overridden, as long as __eq__ and __ne__ aren't.
........
r59577 | raymond.hettinger | 2007-12-20 02:25:05 +0100 (Thu, 20 Dec 2007) | 1 line
Add comments
........
r59578 | brett.cannon | 2007-12-20 11:09:52 +0100 (Thu, 20 Dec 2007) | 3 lines
Add tests for the warnings module; specifically formatwarning and showwarning.
Still need tests for warn_explicit and simplefilter.
........
r59582 | guido.van.rossum | 2007-12-20 18:28:10 +0100 (Thu, 20 Dec 2007) | 2 lines
Patch #1672 by Joseph Armbruster. Use tempdir() to get a temporary directory.
........
r59584 | georg.brandl | 2007-12-20 22:03:02 +0100 (Thu, 20 Dec 2007) | 2 lines
Fix refleak introduced in r59576.
........
r59586 | guido.van.rossum | 2007-12-21 00:48:28 +0100 (Fri, 21 Dec 2007) | 4 lines
Improve performance of built-in any()/all() by avoiding PyIter_Next() --
using a trick found in ifilter().
Feel free to backport to 2.5.
........
r59591 | andrew.kuchling | 2007-12-22 18:27:02 +0100 (Sat, 22 Dec 2007) | 1 line
Add item
........
2007-12-24 04:52:31 -04:00
|
|
|
|
2011-04-30 10:21:58 -03:00
|
|
|
#if defined(HAVE_PTHREAD_SIGMASK) && !defined(HAVE_BROKEN_PTHREAD_SIGMASK)
|
|
|
|
# define PYPTHREAD_SIGMASK
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if defined(PYPTHREAD_SIGMASK) && defined(HAVE_PTHREAD_H)
|
|
|
|
# include <pthread.h>
|
|
|
|
#endif
|
|
|
|
|
1994-06-23 08:25:45 -03:00
|
|
|
#ifndef SIG_ERR
|
2000-09-16 13:35:28 -03:00
|
|
|
#define SIG_ERR ((PyOS_sighandler_t)(-1))
|
1994-06-23 08:25:45 -03:00
|
|
|
#endif
|
|
|
|
|
1995-01-02 15:30:30 -04:00
|
|
|
#ifndef NSIG
|
2000-07-04 11:17:33 -03:00
|
|
|
# if defined(_NSIG)
|
2010-05-09 12:52:27 -03:00
|
|
|
# define NSIG _NSIG /* For BSD/SysV */
|
2000-07-04 11:17:33 -03:00
|
|
|
# elif defined(_SIGMAX)
|
2010-05-09 12:52:27 -03:00
|
|
|
# define NSIG (_SIGMAX + 1) /* For QNX */
|
2000-07-04 11:17:33 -03:00
|
|
|
# elif defined(SIGMAX)
|
2010-05-09 12:52:27 -03:00
|
|
|
# define NSIG (SIGMAX + 1) /* For djgpp */
|
2000-07-04 11:17:33 -03:00
|
|
|
# else
|
2010-05-09 12:52:27 -03:00
|
|
|
# define NSIG 64 /* Use a reasonable default value */
|
2000-07-04 11:17:33 -03:00
|
|
|
# endif
|
1995-01-02 15:30:30 -04:00
|
|
|
#endif
|
|
|
|
|
|
|
|
|
1994-06-23 08:25:45 -03:00
|
|
|
/*
|
|
|
|
NOTES ON THE INTERACTION BETWEEN SIGNALS AND THREADS
|
|
|
|
|
|
|
|
When threads are supported, we want the following semantics:
|
|
|
|
|
|
|
|
- only the main thread can set a signal handler
|
|
|
|
- any thread can get a signal handler
|
|
|
|
- signals are only delivered to the main thread
|
|
|
|
|
|
|
|
I.e. we don't support "synchronous signals" like SIGFPE (catching
|
|
|
|
this doesn't make much sense in Python anyway) nor do we support
|
|
|
|
signals as a means of inter-thread communication, since not all
|
|
|
|
thread implementations support that (at least our thread library
|
|
|
|
doesn't).
|
|
|
|
|
|
|
|
We still have the problem that in some implementations signals
|
|
|
|
generated by the keyboard (e.g. SIGINT) are delivered to all
|
|
|
|
threads (e.g. SGI), while in others (e.g. Solaris) such signals are
|
|
|
|
delivered to one random thread (an intermediate possibility would
|
1995-01-12 07:29:01 -04:00
|
|
|
be to deliver it to the main thread -- POSIX?). For now, we have
|
1994-06-23 08:25:45 -03:00
|
|
|
a working implementation that works in all three cases -- the
|
|
|
|
handler ignores signals if getpid() isn't the same as in the main
|
|
|
|
thread. XXX This is a hack.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifdef WITH_THREAD
|
1997-06-06 18:16:41 -03:00
|
|
|
#include <sys/types.h> /* For pid_t */
|
1998-10-01 17:42:43 -03:00
|
|
|
#include "pythread.h"
|
1994-06-23 08:25:45 -03:00
|
|
|
static long main_thread;
|
|
|
|
static pid_t main_pid;
|
|
|
|
#endif
|
|
|
|
|
2011-05-15 05:21:59 -03:00
|
|
|
static volatile struct {
|
|
|
|
sig_atomic_t tripped;
|
2010-05-09 12:52:27 -03:00
|
|
|
PyObject *func;
|
1997-01-02 20:14:25 -04:00
|
|
|
} Handlers[NSIG];
|
|
|
|
|
2014-07-29 18:31:34 -03:00
|
|
|
#ifdef MS_WINDOWS
|
|
|
|
#define INVALID_FD ((SOCKET_T)-1)
|
|
|
|
|
|
|
|
static volatile struct {
|
|
|
|
SOCKET_T fd;
|
|
|
|
int use_send;
|
|
|
|
int send_err_set;
|
|
|
|
int send_errno;
|
|
|
|
int send_win_error;
|
|
|
|
} wakeup = {INVALID_FD, 0, 0};
|
|
|
|
#else
|
|
|
|
#define INVALID_FD (-1)
|
2011-05-15 05:21:59 -03:00
|
|
|
static volatile sig_atomic_t wakeup_fd = -1;
|
2014-07-29 18:31:34 -03:00
|
|
|
#endif
|
Merged revisions 59565-59594 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59568 | facundo.batista | 2007-12-19 13:53:01 +0100 (Wed, 19 Dec 2007) | 3 lines
Some minor cleanups. Thanks Mark Dickinson.
........
r59573 | raymond.hettinger | 2007-12-19 19:13:31 +0100 (Wed, 19 Dec 2007) | 1 line
Fix issue 1661: Flags argument silently ignored in re functions with compiled regexes.
........
r59574 | guido.van.rossum | 2007-12-19 20:41:06 +0100 (Wed, 19 Dec 2007) | 7 lines
Patch #1583 by Adam Olsen.
This adds signal.set_wakeup_fd(fd) which sets a file descriptor to
which a zero byte will be written whenever a C exception handler runs.
I added a simple C API as well, PySignal_SetWakeupFd(fd).
........
r59575 | raymond.hettinger | 2007-12-19 23:14:34 +0100 (Wed, 19 Dec 2007) | 1 line
Bigger range for non-extended opargs.
........
r59576 | guido.van.rossum | 2007-12-19 23:51:13 +0100 (Wed, 19 Dec 2007) | 5 lines
Patch #1549 by Thomas Herve.
This changes the rules for when __hash__ is inherited slightly,
by allowing it to be inherited when one or more of __lt__, __le__,
__gt__, __ge__ are overridden, as long as __eq__ and __ne__ aren't.
........
r59577 | raymond.hettinger | 2007-12-20 02:25:05 +0100 (Thu, 20 Dec 2007) | 1 line
Add comments
........
r59578 | brett.cannon | 2007-12-20 11:09:52 +0100 (Thu, 20 Dec 2007) | 3 lines
Add tests for the warnings module; specifically formatwarning and showwarning.
Still need tests for warn_explicit and simplefilter.
........
r59582 | guido.van.rossum | 2007-12-20 18:28:10 +0100 (Thu, 20 Dec 2007) | 2 lines
Patch #1672 by Joseph Armbruster. Use tempdir() to get a temporary directory.
........
r59584 | georg.brandl | 2007-12-20 22:03:02 +0100 (Thu, 20 Dec 2007) | 2 lines
Fix refleak introduced in r59576.
........
r59586 | guido.van.rossum | 2007-12-21 00:48:28 +0100 (Fri, 21 Dec 2007) | 4 lines
Improve performance of built-in any()/all() by avoiding PyIter_Next() --
using a trick found in ifilter().
Feel free to backport to 2.5.
........
r59591 | andrew.kuchling | 2007-12-22 18:27:02 +0100 (Sat, 22 Dec 2007) | 1 line
Add item
........
2007-12-24 04:52:31 -04:00
|
|
|
|
2007-12-10 21:06:40 -04:00
|
|
|
/* Speed up sigcheck() when none tripped */
|
|
|
|
static volatile sig_atomic_t is_tripped = 0;
|
1994-05-11 05:59:13 -03:00
|
|
|
|
1997-01-02 20:14:25 -04:00
|
|
|
static PyObject *DefaultHandler;
|
|
|
|
static PyObject *IgnoreHandler;
|
|
|
|
static PyObject *IntHandler;
|
1994-05-11 05:59:13 -03:00
|
|
|
|
2001-03-06 08:13:56 -04:00
|
|
|
/* On Solaris 8, gcc will produce a warning that the function
|
|
|
|
declaration is not a prototype. This is caused by the definition of
|
|
|
|
SIG_DFL as (void (*)())0; the correct declaration would have been
|
|
|
|
(void (*)(int))0. */
|
|
|
|
|
2000-09-16 13:35:28 -03:00
|
|
|
static PyOS_sighandler_t old_siginthandler = SIG_DFL;
|
1997-08-02 00:01:42 -03:00
|
|
|
|
2011-11-21 16:26:56 -04:00
|
|
|
#ifdef MS_WINDOWS
|
|
|
|
static HANDLE sigint_event = NULL;
|
|
|
|
#endif
|
|
|
|
|
2008-03-24 10:39:54 -03:00
|
|
|
#ifdef HAVE_GETITIMER
|
|
|
|
static PyObject *ItimerError;
|
|
|
|
|
|
|
|
/* auxiliary functions for setitimer/getitimer */
|
|
|
|
static void
|
|
|
|
timeval_from_double(double d, struct timeval *tv)
|
|
|
|
{
|
|
|
|
tv->tv_sec = floor(d);
|
|
|
|
tv->tv_usec = fmod(d, 1.0) * 1000000.0;
|
|
|
|
}
|
|
|
|
|
2008-10-02 16:56:01 -03:00
|
|
|
Py_LOCAL_INLINE(double)
|
2008-03-24 10:39:54 -03:00
|
|
|
double_from_timeval(struct timeval *tv)
|
|
|
|
{
|
|
|
|
return tv->tv_sec + (double)(tv->tv_usec / 1000000.0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
itimer_retval(struct itimerval *iv)
|
|
|
|
{
|
|
|
|
PyObject *r, *v;
|
|
|
|
|
|
|
|
r = PyTuple_New(2);
|
|
|
|
if (r == NULL)
|
2010-05-09 12:52:27 -03:00
|
|
|
return NULL;
|
2008-03-24 10:39:54 -03:00
|
|
|
|
|
|
|
if(!(v = PyFloat_FromDouble(double_from_timeval(&iv->it_value)))) {
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_DECREF(r);
|
|
|
|
return NULL;
|
2008-03-24 10:39:54 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
PyTuple_SET_ITEM(r, 0, v);
|
|
|
|
|
|
|
|
if(!(v = PyFloat_FromDouble(double_from_timeval(&iv->it_interval)))) {
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_DECREF(r);
|
|
|
|
return NULL;
|
2008-03-24 10:39:54 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
PyTuple_SET_ITEM(r, 1, v);
|
|
|
|
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
#endif
|
1994-05-11 05:59:13 -03:00
|
|
|
|
1994-09-07 11:32:49 -03:00
|
|
|
static PyObject *
|
2000-07-10 09:04:18 -03:00
|
|
|
signal_default_int_handler(PyObject *self, PyObject *args)
|
1994-05-11 05:59:13 -03:00
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
PyErr_SetNone(PyExc_KeyboardInterrupt);
|
|
|
|
return NULL;
|
1995-03-10 11:13:48 -04:00
|
|
|
}
|
|
|
|
|
2002-06-13 17:33:02 -03:00
|
|
|
PyDoc_STRVAR(default_int_handler_doc,
|
1998-06-28 13:54:49 -03:00
|
|
|
"default_int_handler(...)\n\
|
|
|
|
\n\
|
2004-06-17 12:55:53 -03:00
|
|
|
The default handler for SIGINT installed by Python.\n\
|
2002-06-13 17:33:02 -03:00
|
|
|
It raises KeyboardInterrupt.");
|
1998-06-28 13:54:49 -03:00
|
|
|
|
2000-07-22 20:49:30 -03:00
|
|
|
|
|
|
|
static int
|
|
|
|
checksignals_witharg(void * unused)
|
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
return PyErr_CheckSignals();
|
2000-07-22 20:49:30 -03:00
|
|
|
}
|
|
|
|
|
2013-08-17 15:27:56 -03:00
|
|
|
static int
|
2014-07-29 18:31:34 -03:00
|
|
|
report_wakeup_write_error(void *data)
|
2013-08-17 15:27:56 -03:00
|
|
|
{
|
|
|
|
int save_errno = errno;
|
|
|
|
errno = (int) (Py_intptr_t) data;
|
|
|
|
PyErr_SetFromErrno(PyExc_OSError);
|
|
|
|
PySys_WriteStderr("Exception ignored when trying to write to the "
|
|
|
|
"signal wakeup fd:\n");
|
|
|
|
PyErr_WriteUnraisable(NULL);
|
|
|
|
errno = save_errno;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-07-29 18:31:34 -03:00
|
|
|
#ifdef MS_WINDOWS
|
|
|
|
static int
|
|
|
|
report_wakeup_send_error(void* Py_UNUSED(data))
|
|
|
|
{
|
|
|
|
PyObject *res;
|
|
|
|
|
|
|
|
if (wakeup.send_win_error) {
|
|
|
|
/* PyErr_SetExcFromWindowsErr() invokes FormatMessage() which
|
|
|
|
recognizes the error codes used by both GetLastError() and
|
|
|
|
WSAGetLastError */
|
|
|
|
res = PyErr_SetExcFromWindowsErr(PyExc_OSError, wakeup.send_win_error);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
errno = wakeup.send_errno;
|
|
|
|
res = PyErr_SetFromErrno(PyExc_OSError);
|
|
|
|
}
|
|
|
|
|
|
|
|
assert(res == NULL);
|
|
|
|
wakeup.send_err_set = 0;
|
|
|
|
|
|
|
|
PySys_WriteStderr("Exception ignored when trying to send to the "
|
|
|
|
"signal wakeup fd:\n");
|
|
|
|
PyErr_WriteUnraisable(NULL);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif /* MS_WINDOWS */
|
|
|
|
|
2011-04-18 11:25:56 -03:00
|
|
|
static void
|
|
|
|
trip_signal(int sig_num)
|
|
|
|
{
|
2011-05-07 21:03:15 -03:00
|
|
|
unsigned char byte;
|
2014-07-29 18:31:34 -03:00
|
|
|
int fd;
|
|
|
|
Py_ssize_t rc;
|
2011-05-24 21:35:58 -03:00
|
|
|
|
2011-04-18 11:25:56 -03:00
|
|
|
Handlers[sig_num].tripped = 1;
|
2014-07-29 18:31:34 -03:00
|
|
|
|
|
|
|
#ifdef MS_WINDOWS
|
|
|
|
fd = Py_SAFE_DOWNCAST(wakeup.fd, SOCKET_T, int);
|
|
|
|
#else
|
|
|
|
fd = wakeup_fd;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
if (fd != INVALID_FD) {
|
2011-05-24 21:35:58 -03:00
|
|
|
byte = (unsigned char)sig_num;
|
2014-07-29 18:31:34 -03:00
|
|
|
#ifdef MS_WINDOWS
|
|
|
|
if (wakeup.use_send) {
|
|
|
|
do {
|
|
|
|
rc = send(fd, &byte, 1, 0);
|
|
|
|
} while (rc < 0 && errno == EINTR);
|
|
|
|
|
|
|
|
/* we only have a storage for one error in the wakeup structure */
|
|
|
|
if (rc < 0 && !wakeup.send_err_set) {
|
|
|
|
wakeup.send_err_set = 1;
|
|
|
|
wakeup.send_errno = errno;
|
|
|
|
wakeup.send_win_error = GetLastError();
|
|
|
|
Py_AddPendingCall(report_wakeup_send_error, NULL);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
{
|
|
|
|
byte = (unsigned char)sig_num;
|
|
|
|
do {
|
|
|
|
rc = write(fd, &byte, 1);
|
|
|
|
} while (rc < 0 && errno == EINTR);
|
|
|
|
|
|
|
|
if (rc < 0) {
|
|
|
|
Py_AddPendingCall(report_wakeup_write_error,
|
|
|
|
(void *)(Py_intptr_t)errno);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!is_tripped) {
|
|
|
|
/* Set is_tripped after setting .tripped, as it gets
|
|
|
|
cleared in PyErr_CheckSignals() before .tripped. */
|
|
|
|
is_tripped = 1;
|
|
|
|
Py_AddPendingCall(checksignals_witharg, NULL);
|
2011-05-24 21:35:58 -03:00
|
|
|
}
|
2011-04-18 11:25:56 -03:00
|
|
|
}
|
|
|
|
|
2000-07-23 18:18:09 -03:00
|
|
|
static void
|
2000-07-10 09:04:18 -03:00
|
|
|
signal_handler(int sig_num)
|
1994-05-11 05:59:13 -03:00
|
|
|
{
|
2010-11-05 16:47:27 -03:00
|
|
|
int save_errno = errno;
|
|
|
|
|
|
|
|
#ifdef WITH_THREAD
|
2010-05-09 12:52:27 -03:00
|
|
|
/* See NOTES section above */
|
2010-11-05 16:47:27 -03:00
|
|
|
if (getpid() == main_pid)
|
2010-05-09 12:52:27 -03:00
|
|
|
#endif
|
2010-11-05 16:47:27 -03:00
|
|
|
{
|
2011-04-18 11:25:56 -03:00
|
|
|
trip_signal(sig_num);
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
2010-11-05 16:47:27 -03:00
|
|
|
|
|
|
|
#ifndef HAVE_SIGACTION
|
1994-09-14 10:32:22 -03:00
|
|
|
#ifdef SIGCHLD
|
2010-11-05 16:47:27 -03:00
|
|
|
/* To avoid infinite recursion, this signal remains
|
|
|
|
reset until explicit re-instated.
|
|
|
|
Don't clear the 'func' field as it is our pointer
|
|
|
|
to the Python handler... */
|
|
|
|
if (sig_num != SIGCHLD)
|
1994-06-23 08:25:45 -03:00
|
|
|
#endif
|
2010-05-09 12:52:27 -03:00
|
|
|
/* If the handler was not set up with sigaction, reinstall it. See
|
2014-11-20 07:39:37 -04:00
|
|
|
* Python/pylifecycle.c for the implementation of PyOS_setsig which
|
2010-05-09 12:52:27 -03:00
|
|
|
* makes this true. See also issue8354. */
|
|
|
|
PyOS_setsig(sig_num, signal_handler);
|
2010-05-09 00:18:57 -03:00
|
|
|
#endif
|
2010-11-05 16:47:27 -03:00
|
|
|
|
|
|
|
/* Issue #10311: asynchronously executing signal handlers should not
|
|
|
|
mutate errno under the feet of unsuspecting C code. */
|
|
|
|
errno = save_errno;
|
2011-11-21 16:26:56 -04:00
|
|
|
|
|
|
|
#ifdef MS_WINDOWS
|
|
|
|
if (sig_num == SIGINT)
|
|
|
|
SetEvent(sigint_event);
|
|
|
|
#endif
|
1994-05-11 05:59:13 -03:00
|
|
|
}
|
1994-09-07 11:32:49 -03:00
|
|
|
|
1995-03-10 11:13:48 -04:00
|
|
|
|
1997-08-22 17:42:00 -03:00
|
|
|
#ifdef HAVE_ALARM
|
1994-09-07 11:32:49 -03:00
|
|
|
static PyObject *
|
2000-07-10 09:04:18 -03:00
|
|
|
signal_alarm(PyObject *self, PyObject *args)
|
1994-08-01 08:34:53 -03:00
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
int t;
|
|
|
|
if (!PyArg_ParseTuple(args, "i:alarm", &t))
|
|
|
|
return NULL;
|
|
|
|
/* alarm() returns the number of seconds remaining */
|
|
|
|
return PyLong_FromLong((long)alarm(t));
|
1994-08-01 08:34:53 -03:00
|
|
|
}
|
1998-06-28 13:54:49 -03:00
|
|
|
|
2002-06-13 17:33:02 -03:00
|
|
|
PyDoc_STRVAR(alarm_doc,
|
1998-06-28 13:54:49 -03:00
|
|
|
"alarm(seconds)\n\
|
|
|
|
\n\
|
2002-06-13 17:33:02 -03:00
|
|
|
Arrange for SIGALRM to arrive after the given number of seconds.");
|
1995-03-10 11:13:48 -04:00
|
|
|
#endif
|
1994-09-07 11:32:49 -03:00
|
|
|
|
1997-08-22 17:42:00 -03:00
|
|
|
#ifdef HAVE_PAUSE
|
1995-01-10 16:56:29 -04:00
|
|
|
static PyObject *
|
2002-03-25 16:46:46 -04:00
|
|
|
signal_pause(PyObject *self)
|
1994-08-23 10:49:37 -03:00
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
|
|
(void)pause();
|
|
|
|
Py_END_ALLOW_THREADS
|
|
|
|
/* make sure that any exceptions that got raised are propagated
|
|
|
|
* back into Python
|
|
|
|
*/
|
|
|
|
if (PyErr_CheckSignals())
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
Py_INCREF(Py_None);
|
|
|
|
return Py_None;
|
1994-08-23 10:49:37 -03:00
|
|
|
}
|
2002-06-13 17:33:02 -03:00
|
|
|
PyDoc_STRVAR(pause_doc,
|
1998-07-21 19:41:18 -03:00
|
|
|
"pause()\n\
|
|
|
|
\n\
|
2002-06-13 17:33:02 -03:00
|
|
|
Wait until a signal arrives.");
|
1998-06-28 13:54:49 -03:00
|
|
|
|
1995-03-10 11:13:48 -04:00
|
|
|
#endif
|
1994-08-01 08:34:53 -03:00
|
|
|
|
2000-09-16 13:35:28 -03:00
|
|
|
|
1994-09-07 11:32:49 -03:00
|
|
|
static PyObject *
|
2000-07-10 09:04:18 -03:00
|
|
|
signal_signal(PyObject *self, PyObject *args)
|
1994-05-11 05:59:13 -03:00
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
PyObject *obj;
|
|
|
|
int sig_num;
|
|
|
|
PyObject *old_handler;
|
|
|
|
void (*func)(int);
|
|
|
|
if (!PyArg_ParseTuple(args, "iO:signal", &sig_num, &obj))
|
|
|
|
return NULL;
|
2010-08-06 16:27:32 -03:00
|
|
|
#ifdef MS_WINDOWS
|
|
|
|
/* Validate that sig_num is one of the allowable signals */
|
2010-09-06 13:04:10 -03:00
|
|
|
switch (sig_num) {
|
|
|
|
case SIGABRT: break;
|
2010-10-01 11:49:24 -03:00
|
|
|
#ifdef SIGBREAK
|
|
|
|
/* Issue #10003: SIGBREAK is not documented as permitted, but works
|
|
|
|
and corresponds to CTRL_BREAK_EVENT. */
|
|
|
|
case SIGBREAK: break;
|
|
|
|
#endif
|
2010-09-06 13:04:10 -03:00
|
|
|
case SIGFPE: break;
|
|
|
|
case SIGILL: break;
|
|
|
|
case SIGINT: break;
|
|
|
|
case SIGSEGV: break;
|
|
|
|
case SIGTERM: break;
|
|
|
|
default:
|
|
|
|
PyErr_SetString(PyExc_ValueError, "invalid signal value");
|
|
|
|
return NULL;
|
2010-08-06 16:27:32 -03:00
|
|
|
}
|
|
|
|
#endif
|
1994-06-23 08:25:45 -03:00
|
|
|
#ifdef WITH_THREAD
|
2010-05-09 12:52:27 -03:00
|
|
|
if (PyThread_get_thread_ident() != main_thread) {
|
|
|
|
PyErr_SetString(PyExc_ValueError,
|
|
|
|
"signal only works in main thread");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
if (sig_num < 1 || sig_num >= NSIG) {
|
|
|
|
PyErr_SetString(PyExc_ValueError,
|
|
|
|
"signal number out of range");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
if (obj == IgnoreHandler)
|
|
|
|
func = SIG_IGN;
|
|
|
|
else if (obj == DefaultHandler)
|
|
|
|
func = SIG_DFL;
|
|
|
|
else if (!PyCallable_Check(obj)) {
|
|
|
|
PyErr_SetString(PyExc_TypeError,
|
1994-05-11 05:59:13 -03:00
|
|
|
"signal handler must be signal.SIG_IGN, signal.SIG_DFL, or a callable object");
|
2010-05-09 12:52:27 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
func = signal_handler;
|
|
|
|
if (PyOS_setsig(sig_num, func) == SIG_ERR) {
|
2011-05-10 12:13:00 -03:00
|
|
|
PyErr_SetFromErrno(PyExc_OSError);
|
2010-05-09 12:52:27 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
old_handler = Handlers[sig_num].func;
|
|
|
|
Handlers[sig_num].tripped = 0;
|
|
|
|
Py_INCREF(obj);
|
|
|
|
Handlers[sig_num].func = obj;
|
2013-05-04 18:16:59 -03:00
|
|
|
if (old_handler != NULL)
|
|
|
|
return old_handler;
|
|
|
|
else
|
|
|
|
Py_RETURN_NONE;
|
1994-05-11 05:59:13 -03:00
|
|
|
}
|
|
|
|
|
2002-06-13 17:33:02 -03:00
|
|
|
PyDoc_STRVAR(signal_doc,
|
1998-06-28 13:54:49 -03:00
|
|
|
"signal(sig, action) -> action\n\
|
|
|
|
\n\
|
|
|
|
Set the action for the given signal. The action can be SIG_DFL,\n\
|
|
|
|
SIG_IGN, or a callable Python object. The previous action is\n\
|
|
|
|
returned. See getsignal() for possible return values.\n\
|
|
|
|
\n\
|
|
|
|
*** IMPORTANT NOTICE ***\n\
|
|
|
|
A signal handler function is called with two arguments:\n\
|
2002-06-13 17:33:02 -03:00
|
|
|
the first is the signal number, the second is the interrupted stack frame.");
|
1998-06-28 13:54:49 -03:00
|
|
|
|
2000-09-16 13:35:28 -03:00
|
|
|
|
1994-09-07 11:32:49 -03:00
|
|
|
static PyObject *
|
2000-07-10 09:04:18 -03:00
|
|
|
signal_getsignal(PyObject *self, PyObject *args)
|
1994-05-11 05:59:13 -03:00
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
int sig_num;
|
|
|
|
PyObject *old_handler;
|
|
|
|
if (!PyArg_ParseTuple(args, "i:getsignal", &sig_num))
|
|
|
|
return NULL;
|
|
|
|
if (sig_num < 1 || sig_num >= NSIG) {
|
|
|
|
PyErr_SetString(PyExc_ValueError,
|
|
|
|
"signal number out of range");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
old_handler = Handlers[sig_num].func;
|
2013-05-04 18:16:59 -03:00
|
|
|
if (old_handler != NULL) {
|
|
|
|
Py_INCREF(old_handler);
|
|
|
|
return old_handler;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
1994-05-11 05:59:13 -03:00
|
|
|
}
|
|
|
|
|
2002-06-13 17:33:02 -03:00
|
|
|
PyDoc_STRVAR(getsignal_doc,
|
1998-06-28 13:54:49 -03:00
|
|
|
"getsignal(sig) -> action\n\
|
|
|
|
\n\
|
|
|
|
Return the current action for the given signal. The return value can be:\n\
|
|
|
|
SIG_IGN -- if the signal is being ignored\n\
|
|
|
|
SIG_DFL -- if the default action for the signal is in effect\n\
|
|
|
|
None -- if an unknown handler is in effect\n\
|
2002-06-13 17:33:02 -03:00
|
|
|
anything else -- the callable Python object used as a handler");
|
1994-05-11 05:59:13 -03:00
|
|
|
|
Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60849,60852-60854,60856-60859,60861-60870,60874-60875,60880-60881,60886,60888-60890,60892,60894-60898,60900,60902-60906,60908,60911-60917,60919-60920,60922,60926,60929-60931,60933-60935,60937,60939-60941,60943-60954,60959-60961,60963-60964,60966-60967,60971,60977,60979-60989 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r60980 | georg.brandl | 2008-02-23 16:02:28 +0100 (Sat, 23 Feb 2008) | 2 lines
#1492: allow overriding BaseHTTPServer's content type for error messages.
........
r60982 | georg.brandl | 2008-02-23 16:06:25 +0100 (Sat, 23 Feb 2008) | 2 lines
#2165: fix test_logging failure on some machines.
........
r60983 | facundo.batista | 2008-02-23 16:07:35 +0100 (Sat, 23 Feb 2008) | 6 lines
Issue 1089358. Adds the siginterrupt() function, that is just a
wrapper around the system call with the same name. Also added
test cases, doc changes and NEWS entry. Thanks Jason and Ralf
Schmitt.
........
r60984 | georg.brandl | 2008-02-23 16:11:18 +0100 (Sat, 23 Feb 2008) | 2 lines
#2067: file.__exit__() now calls subclasses' close() method.
........
r60985 | georg.brandl | 2008-02-23 16:19:54 +0100 (Sat, 23 Feb 2008) | 2 lines
More difflib examples. Written for GHOP by Josip Dzolonga.
........
r60987 | andrew.kuchling | 2008-02-23 16:41:51 +0100 (Sat, 23 Feb 2008) | 1 line
#2072: correct documentation for .rpc_paths
........
r60988 | georg.brandl | 2008-02-23 16:43:48 +0100 (Sat, 23 Feb 2008) | 2 lines
#2161: Fix opcode name.
........
r60989 | andrew.kuchling | 2008-02-23 16:49:35 +0100 (Sat, 23 Feb 2008) | 2 lines
#1119331: ncurses will just call exit() if the terminal name isn't found.
Call setupterm() first so that we get a Python exception instead of just existing.
........
2008-02-23 12:23:06 -04:00
|
|
|
#ifdef HAVE_SIGINTERRUPT
|
|
|
|
PyDoc_STRVAR(siginterrupt_doc,
|
|
|
|
"siginterrupt(sig, flag) -> None\n\
|
|
|
|
change system call restart behaviour: if flag is False, system calls\n\
|
|
|
|
will be restarted when interrupted by signal sig, else system calls\n\
|
|
|
|
will be interrupted.");
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
signal_siginterrupt(PyObject *self, PyObject *args)
|
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
int sig_num;
|
|
|
|
int flag;
|
|
|
|
|
|
|
|
if (!PyArg_ParseTuple(args, "ii:siginterrupt", &sig_num, &flag))
|
|
|
|
return NULL;
|
|
|
|
if (sig_num < 1 || sig_num >= NSIG) {
|
|
|
|
PyErr_SetString(PyExc_ValueError,
|
|
|
|
"signal number out of range");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
if (siginterrupt(sig_num, flag)<0) {
|
2011-05-10 12:13:00 -03:00
|
|
|
PyErr_SetFromErrno(PyExc_OSError);
|
2010-05-09 12:52:27 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
Py_INCREF(Py_None);
|
|
|
|
return Py_None;
|
Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60849,60852-60854,60856-60859,60861-60870,60874-60875,60880-60881,60886,60888-60890,60892,60894-60898,60900,60902-60906,60908,60911-60917,60919-60920,60922,60926,60929-60931,60933-60935,60937,60939-60941,60943-60954,60959-60961,60963-60964,60966-60967,60971,60977,60979-60989 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r60980 | georg.brandl | 2008-02-23 16:02:28 +0100 (Sat, 23 Feb 2008) | 2 lines
#1492: allow overriding BaseHTTPServer's content type for error messages.
........
r60982 | georg.brandl | 2008-02-23 16:06:25 +0100 (Sat, 23 Feb 2008) | 2 lines
#2165: fix test_logging failure on some machines.
........
r60983 | facundo.batista | 2008-02-23 16:07:35 +0100 (Sat, 23 Feb 2008) | 6 lines
Issue 1089358. Adds the siginterrupt() function, that is just a
wrapper around the system call with the same name. Also added
test cases, doc changes and NEWS entry. Thanks Jason and Ralf
Schmitt.
........
r60984 | georg.brandl | 2008-02-23 16:11:18 +0100 (Sat, 23 Feb 2008) | 2 lines
#2067: file.__exit__() now calls subclasses' close() method.
........
r60985 | georg.brandl | 2008-02-23 16:19:54 +0100 (Sat, 23 Feb 2008) | 2 lines
More difflib examples. Written for GHOP by Josip Dzolonga.
........
r60987 | andrew.kuchling | 2008-02-23 16:41:51 +0100 (Sat, 23 Feb 2008) | 1 line
#2072: correct documentation for .rpc_paths
........
r60988 | georg.brandl | 2008-02-23 16:43:48 +0100 (Sat, 23 Feb 2008) | 2 lines
#2161: Fix opcode name.
........
r60989 | andrew.kuchling | 2008-02-23 16:49:35 +0100 (Sat, 23 Feb 2008) | 2 lines
#1119331: ncurses will just call exit() if the terminal name isn't found.
Call setupterm() first so that we get a Python exception instead of just existing.
........
2008-02-23 12:23:06 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
#endif
|
2000-09-16 13:35:28 -03:00
|
|
|
|
Merged revisions 59565-59594 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59568 | facundo.batista | 2007-12-19 13:53:01 +0100 (Wed, 19 Dec 2007) | 3 lines
Some minor cleanups. Thanks Mark Dickinson.
........
r59573 | raymond.hettinger | 2007-12-19 19:13:31 +0100 (Wed, 19 Dec 2007) | 1 line
Fix issue 1661: Flags argument silently ignored in re functions with compiled regexes.
........
r59574 | guido.van.rossum | 2007-12-19 20:41:06 +0100 (Wed, 19 Dec 2007) | 7 lines
Patch #1583 by Adam Olsen.
This adds signal.set_wakeup_fd(fd) which sets a file descriptor to
which a zero byte will be written whenever a C exception handler runs.
I added a simple C API as well, PySignal_SetWakeupFd(fd).
........
r59575 | raymond.hettinger | 2007-12-19 23:14:34 +0100 (Wed, 19 Dec 2007) | 1 line
Bigger range for non-extended opargs.
........
r59576 | guido.van.rossum | 2007-12-19 23:51:13 +0100 (Wed, 19 Dec 2007) | 5 lines
Patch #1549 by Thomas Herve.
This changes the rules for when __hash__ is inherited slightly,
by allowing it to be inherited when one or more of __lt__, __le__,
__gt__, __ge__ are overridden, as long as __eq__ and __ne__ aren't.
........
r59577 | raymond.hettinger | 2007-12-20 02:25:05 +0100 (Thu, 20 Dec 2007) | 1 line
Add comments
........
r59578 | brett.cannon | 2007-12-20 11:09:52 +0100 (Thu, 20 Dec 2007) | 3 lines
Add tests for the warnings module; specifically formatwarning and showwarning.
Still need tests for warn_explicit and simplefilter.
........
r59582 | guido.van.rossum | 2007-12-20 18:28:10 +0100 (Thu, 20 Dec 2007) | 2 lines
Patch #1672 by Joseph Armbruster. Use tempdir() to get a temporary directory.
........
r59584 | georg.brandl | 2007-12-20 22:03:02 +0100 (Thu, 20 Dec 2007) | 2 lines
Fix refleak introduced in r59576.
........
r59586 | guido.van.rossum | 2007-12-21 00:48:28 +0100 (Fri, 21 Dec 2007) | 4 lines
Improve performance of built-in any()/all() by avoiding PyIter_Next() --
using a trick found in ifilter().
Feel free to backport to 2.5.
........
r59591 | andrew.kuchling | 2007-12-22 18:27:02 +0100 (Sat, 22 Dec 2007) | 1 line
Add item
........
2007-12-24 04:52:31 -04:00
|
|
|
static PyObject *
|
|
|
|
signal_set_wakeup_fd(PyObject *self, PyObject *args)
|
|
|
|
{
|
2015-02-21 12:44:05 -04:00
|
|
|
struct _Py_stat_struct st;
|
2014-07-29 18:31:34 -03:00
|
|
|
#ifdef MS_WINDOWS
|
|
|
|
PyObject *fdobj;
|
2015-02-12 11:34:54 -04:00
|
|
|
SOCKET_T sockfd, old_sockfd;
|
2014-07-29 18:31:34 -03:00
|
|
|
int res;
|
|
|
|
int res_size = sizeof res;
|
|
|
|
PyObject *mod;
|
|
|
|
int is_socket;
|
|
|
|
|
|
|
|
if (!PyArg_ParseTuple(args, "O:set_wakeup_fd", &fdobj))
|
|
|
|
return NULL;
|
|
|
|
|
2015-02-12 11:34:54 -04:00
|
|
|
sockfd = PyLong_AsSocket_t(fdobj);
|
|
|
|
if (sockfd == (SOCKET_T)(-1) && PyErr_Occurred())
|
2014-07-29 18:31:34 -03:00
|
|
|
return NULL;
|
|
|
|
#else
|
2010-05-09 12:52:27 -03:00
|
|
|
int fd, old_fd;
|
2014-07-29 18:31:34 -03:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
if (!PyArg_ParseTuple(args, "i:set_wakeup_fd", &fd))
|
|
|
|
return NULL;
|
2014-07-29 18:31:34 -03:00
|
|
|
#endif
|
|
|
|
|
Merged revisions 59565-59594 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59568 | facundo.batista | 2007-12-19 13:53:01 +0100 (Wed, 19 Dec 2007) | 3 lines
Some minor cleanups. Thanks Mark Dickinson.
........
r59573 | raymond.hettinger | 2007-12-19 19:13:31 +0100 (Wed, 19 Dec 2007) | 1 line
Fix issue 1661: Flags argument silently ignored in re functions with compiled regexes.
........
r59574 | guido.van.rossum | 2007-12-19 20:41:06 +0100 (Wed, 19 Dec 2007) | 7 lines
Patch #1583 by Adam Olsen.
This adds signal.set_wakeup_fd(fd) which sets a file descriptor to
which a zero byte will be written whenever a C exception handler runs.
I added a simple C API as well, PySignal_SetWakeupFd(fd).
........
r59575 | raymond.hettinger | 2007-12-19 23:14:34 +0100 (Wed, 19 Dec 2007) | 1 line
Bigger range for non-extended opargs.
........
r59576 | guido.van.rossum | 2007-12-19 23:51:13 +0100 (Wed, 19 Dec 2007) | 5 lines
Patch #1549 by Thomas Herve.
This changes the rules for when __hash__ is inherited slightly,
by allowing it to be inherited when one or more of __lt__, __le__,
__gt__, __ge__ are overridden, as long as __eq__ and __ne__ aren't.
........
r59577 | raymond.hettinger | 2007-12-20 02:25:05 +0100 (Thu, 20 Dec 2007) | 1 line
Add comments
........
r59578 | brett.cannon | 2007-12-20 11:09:52 +0100 (Thu, 20 Dec 2007) | 3 lines
Add tests for the warnings module; specifically formatwarning and showwarning.
Still need tests for warn_explicit and simplefilter.
........
r59582 | guido.van.rossum | 2007-12-20 18:28:10 +0100 (Thu, 20 Dec 2007) | 2 lines
Patch #1672 by Joseph Armbruster. Use tempdir() to get a temporary directory.
........
r59584 | georg.brandl | 2007-12-20 22:03:02 +0100 (Thu, 20 Dec 2007) | 2 lines
Fix refleak introduced in r59576.
........
r59586 | guido.van.rossum | 2007-12-21 00:48:28 +0100 (Fri, 21 Dec 2007) | 4 lines
Improve performance of built-in any()/all() by avoiding PyIter_Next() --
using a trick found in ifilter().
Feel free to backport to 2.5.
........
r59591 | andrew.kuchling | 2007-12-22 18:27:02 +0100 (Sat, 22 Dec 2007) | 1 line
Add item
........
2007-12-24 04:52:31 -04:00
|
|
|
#ifdef WITH_THREAD
|
2010-05-09 12:52:27 -03:00
|
|
|
if (PyThread_get_thread_ident() != main_thread) {
|
|
|
|
PyErr_SetString(PyExc_ValueError,
|
|
|
|
"set_wakeup_fd only works in main thread");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
#endif
|
2014-07-21 11:28:54 -03:00
|
|
|
|
2014-07-29 18:31:34 -03:00
|
|
|
#ifdef MS_WINDOWS
|
|
|
|
is_socket = 0;
|
2015-02-12 11:34:54 -04:00
|
|
|
if (sockfd != INVALID_FD) {
|
2014-07-29 18:31:34 -03:00
|
|
|
/* Import the _socket module to call WSAStartup() */
|
|
|
|
mod = PyImport_ImportModuleNoBlock("_socket");
|
|
|
|
if (mod == NULL)
|
|
|
|
return NULL;
|
|
|
|
Py_DECREF(mod);
|
|
|
|
|
|
|
|
/* test the socket */
|
2015-02-12 11:34:54 -04:00
|
|
|
if (getsockopt(sockfd, SOL_SOCKET, SO_ERROR,
|
2014-07-29 18:31:34 -03:00
|
|
|
(char *)&res, &res_size) != 0) {
|
2015-02-12 11:34:54 -04:00
|
|
|
int fd, err;
|
|
|
|
|
|
|
|
err = WSAGetLastError();
|
2014-07-29 18:31:34 -03:00
|
|
|
if (err != WSAENOTSOCK) {
|
|
|
|
PyErr_SetExcFromWindowsErr(PyExc_OSError, err);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2015-02-12 11:34:54 -04:00
|
|
|
fd = (int)sockfd;
|
|
|
|
if ((SOCKET_T)fd != sockfd || !_PyVerify_fd(fd)) {
|
2014-07-29 18:31:34 -03:00
|
|
|
PyErr_SetString(PyExc_ValueError, "invalid fd");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2015-02-21 12:44:05 -04:00
|
|
|
if (_Py_fstat(fd, &st) != 0) {
|
2015-03-07 22:14:07 -04:00
|
|
|
PyErr_SetExcFromWindowsErr(PyExc_OSError, GetLastError());
|
2014-07-29 18:31:34 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
2014-08-27 07:59:44 -03:00
|
|
|
|
|
|
|
/* on Windows, a file cannot be set to non-blocking mode */
|
2014-07-29 18:31:34 -03:00
|
|
|
}
|
2014-08-27 07:59:44 -03:00
|
|
|
else {
|
2014-07-29 18:31:34 -03:00
|
|
|
is_socket = 1;
|
2014-08-27 07:59:44 -03:00
|
|
|
|
|
|
|
/* Windows does not provide a function to test if a socket
|
|
|
|
is in non-blocking mode */
|
|
|
|
}
|
2014-07-29 18:31:34 -03:00
|
|
|
}
|
|
|
|
|
2015-02-12 11:34:54 -04:00
|
|
|
old_sockfd = wakeup.fd;
|
|
|
|
wakeup.fd = sockfd;
|
2014-07-29 18:31:34 -03:00
|
|
|
wakeup.use_send = is_socket;
|
|
|
|
|
2015-02-12 11:34:54 -04:00
|
|
|
if (old_sockfd != INVALID_FD)
|
|
|
|
return PyLong_FromSocket_t(old_sockfd);
|
2014-07-29 18:31:34 -03:00
|
|
|
else
|
|
|
|
return PyLong_FromLong(-1);
|
|
|
|
#else
|
2014-07-24 16:58:53 -03:00
|
|
|
if (fd != -1) {
|
2014-08-27 07:59:44 -03:00
|
|
|
int blocking;
|
|
|
|
|
2014-07-24 17:51:05 -03:00
|
|
|
if (!_PyVerify_fd(fd)) {
|
|
|
|
PyErr_SetString(PyExc_ValueError, "invalid fd");
|
2014-07-24 16:58:53 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
2014-07-24 17:51:05 -03:00
|
|
|
|
2015-02-21 12:44:05 -04:00
|
|
|
if (_Py_fstat(fd, &st) != 0) {
|
2014-07-29 18:31:34 -03:00
|
|
|
PyErr_SetFromErrno(PyExc_OSError);
|
|
|
|
return NULL;
|
|
|
|
}
|
2014-08-27 07:59:44 -03:00
|
|
|
|
|
|
|
blocking = _Py_get_blocking(fd);
|
|
|
|
if (blocking < 0)
|
|
|
|
return NULL;
|
|
|
|
if (blocking) {
|
|
|
|
PyErr_Format(PyExc_ValueError,
|
|
|
|
"the fd %i must be in non-blocking mode",
|
|
|
|
fd);
|
|
|
|
return NULL;
|
|
|
|
}
|
2010-05-09 12:52:27 -03:00
|
|
|
}
|
2014-07-21 11:28:54 -03:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
old_fd = wakeup_fd;
|
|
|
|
wakeup_fd = fd;
|
2014-07-21 11:28:54 -03:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
return PyLong_FromLong(old_fd);
|
2014-07-29 18:31:34 -03:00
|
|
|
#endif
|
Merged revisions 59565-59594 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59568 | facundo.batista | 2007-12-19 13:53:01 +0100 (Wed, 19 Dec 2007) | 3 lines
Some minor cleanups. Thanks Mark Dickinson.
........
r59573 | raymond.hettinger | 2007-12-19 19:13:31 +0100 (Wed, 19 Dec 2007) | 1 line
Fix issue 1661: Flags argument silently ignored in re functions with compiled regexes.
........
r59574 | guido.van.rossum | 2007-12-19 20:41:06 +0100 (Wed, 19 Dec 2007) | 7 lines
Patch #1583 by Adam Olsen.
This adds signal.set_wakeup_fd(fd) which sets a file descriptor to
which a zero byte will be written whenever a C exception handler runs.
I added a simple C API as well, PySignal_SetWakeupFd(fd).
........
r59575 | raymond.hettinger | 2007-12-19 23:14:34 +0100 (Wed, 19 Dec 2007) | 1 line
Bigger range for non-extended opargs.
........
r59576 | guido.van.rossum | 2007-12-19 23:51:13 +0100 (Wed, 19 Dec 2007) | 5 lines
Patch #1549 by Thomas Herve.
This changes the rules for when __hash__ is inherited slightly,
by allowing it to be inherited when one or more of __lt__, __le__,
__gt__, __ge__ are overridden, as long as __eq__ and __ne__ aren't.
........
r59577 | raymond.hettinger | 2007-12-20 02:25:05 +0100 (Thu, 20 Dec 2007) | 1 line
Add comments
........
r59578 | brett.cannon | 2007-12-20 11:09:52 +0100 (Thu, 20 Dec 2007) | 3 lines
Add tests for the warnings module; specifically formatwarning and showwarning.
Still need tests for warn_explicit and simplefilter.
........
r59582 | guido.van.rossum | 2007-12-20 18:28:10 +0100 (Thu, 20 Dec 2007) | 2 lines
Patch #1672 by Joseph Armbruster. Use tempdir() to get a temporary directory.
........
r59584 | georg.brandl | 2007-12-20 22:03:02 +0100 (Thu, 20 Dec 2007) | 2 lines
Fix refleak introduced in r59576.
........
r59586 | guido.van.rossum | 2007-12-21 00:48:28 +0100 (Fri, 21 Dec 2007) | 4 lines
Improve performance of built-in any()/all() by avoiding PyIter_Next() --
using a trick found in ifilter().
Feel free to backport to 2.5.
........
r59591 | andrew.kuchling | 2007-12-22 18:27:02 +0100 (Sat, 22 Dec 2007) | 1 line
Add item
........
2007-12-24 04:52:31 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
PyDoc_STRVAR(set_wakeup_fd_doc,
|
|
|
|
"set_wakeup_fd(fd) -> fd\n\
|
|
|
|
\n\
|
2014-07-29 18:31:34 -03:00
|
|
|
Sets the fd to be written to (with the signal number) when a signal\n\
|
Merged revisions 59565-59594 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59568 | facundo.batista | 2007-12-19 13:53:01 +0100 (Wed, 19 Dec 2007) | 3 lines
Some minor cleanups. Thanks Mark Dickinson.
........
r59573 | raymond.hettinger | 2007-12-19 19:13:31 +0100 (Wed, 19 Dec 2007) | 1 line
Fix issue 1661: Flags argument silently ignored in re functions with compiled regexes.
........
r59574 | guido.van.rossum | 2007-12-19 20:41:06 +0100 (Wed, 19 Dec 2007) | 7 lines
Patch #1583 by Adam Olsen.
This adds signal.set_wakeup_fd(fd) which sets a file descriptor to
which a zero byte will be written whenever a C exception handler runs.
I added a simple C API as well, PySignal_SetWakeupFd(fd).
........
r59575 | raymond.hettinger | 2007-12-19 23:14:34 +0100 (Wed, 19 Dec 2007) | 1 line
Bigger range for non-extended opargs.
........
r59576 | guido.van.rossum | 2007-12-19 23:51:13 +0100 (Wed, 19 Dec 2007) | 5 lines
Patch #1549 by Thomas Herve.
This changes the rules for when __hash__ is inherited slightly,
by allowing it to be inherited when one or more of __lt__, __le__,
__gt__, __ge__ are overridden, as long as __eq__ and __ne__ aren't.
........
r59577 | raymond.hettinger | 2007-12-20 02:25:05 +0100 (Thu, 20 Dec 2007) | 1 line
Add comments
........
r59578 | brett.cannon | 2007-12-20 11:09:52 +0100 (Thu, 20 Dec 2007) | 3 lines
Add tests for the warnings module; specifically formatwarning and showwarning.
Still need tests for warn_explicit and simplefilter.
........
r59582 | guido.van.rossum | 2007-12-20 18:28:10 +0100 (Thu, 20 Dec 2007) | 2 lines
Patch #1672 by Joseph Armbruster. Use tempdir() to get a temporary directory.
........
r59584 | georg.brandl | 2007-12-20 22:03:02 +0100 (Thu, 20 Dec 2007) | 2 lines
Fix refleak introduced in r59576.
........
r59586 | guido.van.rossum | 2007-12-21 00:48:28 +0100 (Fri, 21 Dec 2007) | 4 lines
Improve performance of built-in any()/all() by avoiding PyIter_Next() --
using a trick found in ifilter().
Feel free to backport to 2.5.
........
r59591 | andrew.kuchling | 2007-12-22 18:27:02 +0100 (Sat, 22 Dec 2007) | 1 line
Add item
........
2007-12-24 04:52:31 -04:00
|
|
|
comes in. A library can use this to wakeup select or poll.\n\
|
2014-07-29 18:31:34 -03:00
|
|
|
The previous fd or -1 is returned.\n\
|
Merged revisions 59565-59594 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59568 | facundo.batista | 2007-12-19 13:53:01 +0100 (Wed, 19 Dec 2007) | 3 lines
Some minor cleanups. Thanks Mark Dickinson.
........
r59573 | raymond.hettinger | 2007-12-19 19:13:31 +0100 (Wed, 19 Dec 2007) | 1 line
Fix issue 1661: Flags argument silently ignored in re functions with compiled regexes.
........
r59574 | guido.van.rossum | 2007-12-19 20:41:06 +0100 (Wed, 19 Dec 2007) | 7 lines
Patch #1583 by Adam Olsen.
This adds signal.set_wakeup_fd(fd) which sets a file descriptor to
which a zero byte will be written whenever a C exception handler runs.
I added a simple C API as well, PySignal_SetWakeupFd(fd).
........
r59575 | raymond.hettinger | 2007-12-19 23:14:34 +0100 (Wed, 19 Dec 2007) | 1 line
Bigger range for non-extended opargs.
........
r59576 | guido.van.rossum | 2007-12-19 23:51:13 +0100 (Wed, 19 Dec 2007) | 5 lines
Patch #1549 by Thomas Herve.
This changes the rules for when __hash__ is inherited slightly,
by allowing it to be inherited when one or more of __lt__, __le__,
__gt__, __ge__ are overridden, as long as __eq__ and __ne__ aren't.
........
r59577 | raymond.hettinger | 2007-12-20 02:25:05 +0100 (Thu, 20 Dec 2007) | 1 line
Add comments
........
r59578 | brett.cannon | 2007-12-20 11:09:52 +0100 (Thu, 20 Dec 2007) | 3 lines
Add tests for the warnings module; specifically formatwarning and showwarning.
Still need tests for warn_explicit and simplefilter.
........
r59582 | guido.van.rossum | 2007-12-20 18:28:10 +0100 (Thu, 20 Dec 2007) | 2 lines
Patch #1672 by Joseph Armbruster. Use tempdir() to get a temporary directory.
........
r59584 | georg.brandl | 2007-12-20 22:03:02 +0100 (Thu, 20 Dec 2007) | 2 lines
Fix refleak introduced in r59576.
........
r59586 | guido.van.rossum | 2007-12-21 00:48:28 +0100 (Fri, 21 Dec 2007) | 4 lines
Improve performance of built-in any()/all() by avoiding PyIter_Next() --
using a trick found in ifilter().
Feel free to backport to 2.5.
........
r59591 | andrew.kuchling | 2007-12-22 18:27:02 +0100 (Sat, 22 Dec 2007) | 1 line
Add item
........
2007-12-24 04:52:31 -04:00
|
|
|
\n\
|
|
|
|
The fd must be non-blocking.");
|
|
|
|
|
|
|
|
/* C API for the same, without all the error checking */
|
|
|
|
int
|
|
|
|
PySignal_SetWakeupFd(int fd)
|
|
|
|
{
|
2014-07-29 18:31:34 -03:00
|
|
|
int old_fd;
|
2010-05-09 12:52:27 -03:00
|
|
|
if (fd < 0)
|
|
|
|
fd = -1;
|
2014-07-29 18:31:34 -03:00
|
|
|
|
|
|
|
#ifdef MS_WINDOWS
|
|
|
|
old_fd = Py_SAFE_DOWNCAST(wakeup.fd, SOCKET_T, int);
|
|
|
|
wakeup.fd = fd;
|
|
|
|
#else
|
|
|
|
old_fd = wakeup_fd;
|
2010-05-09 12:52:27 -03:00
|
|
|
wakeup_fd = fd;
|
2014-07-29 18:31:34 -03:00
|
|
|
#endif
|
2010-05-09 12:52:27 -03:00
|
|
|
return old_fd;
|
Merged revisions 59565-59594 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59568 | facundo.batista | 2007-12-19 13:53:01 +0100 (Wed, 19 Dec 2007) | 3 lines
Some minor cleanups. Thanks Mark Dickinson.
........
r59573 | raymond.hettinger | 2007-12-19 19:13:31 +0100 (Wed, 19 Dec 2007) | 1 line
Fix issue 1661: Flags argument silently ignored in re functions with compiled regexes.
........
r59574 | guido.van.rossum | 2007-12-19 20:41:06 +0100 (Wed, 19 Dec 2007) | 7 lines
Patch #1583 by Adam Olsen.
This adds signal.set_wakeup_fd(fd) which sets a file descriptor to
which a zero byte will be written whenever a C exception handler runs.
I added a simple C API as well, PySignal_SetWakeupFd(fd).
........
r59575 | raymond.hettinger | 2007-12-19 23:14:34 +0100 (Wed, 19 Dec 2007) | 1 line
Bigger range for non-extended opargs.
........
r59576 | guido.van.rossum | 2007-12-19 23:51:13 +0100 (Wed, 19 Dec 2007) | 5 lines
Patch #1549 by Thomas Herve.
This changes the rules for when __hash__ is inherited slightly,
by allowing it to be inherited when one or more of __lt__, __le__,
__gt__, __ge__ are overridden, as long as __eq__ and __ne__ aren't.
........
r59577 | raymond.hettinger | 2007-12-20 02:25:05 +0100 (Thu, 20 Dec 2007) | 1 line
Add comments
........
r59578 | brett.cannon | 2007-12-20 11:09:52 +0100 (Thu, 20 Dec 2007) | 3 lines
Add tests for the warnings module; specifically formatwarning and showwarning.
Still need tests for warn_explicit and simplefilter.
........
r59582 | guido.van.rossum | 2007-12-20 18:28:10 +0100 (Thu, 20 Dec 2007) | 2 lines
Patch #1672 by Joseph Armbruster. Use tempdir() to get a temporary directory.
........
r59584 | georg.brandl | 2007-12-20 22:03:02 +0100 (Thu, 20 Dec 2007) | 2 lines
Fix refleak introduced in r59576.
........
r59586 | guido.van.rossum | 2007-12-21 00:48:28 +0100 (Fri, 21 Dec 2007) | 4 lines
Improve performance of built-in any()/all() by avoiding PyIter_Next() --
using a trick found in ifilter().
Feel free to backport to 2.5.
........
r59591 | andrew.kuchling | 2007-12-22 18:27:02 +0100 (Sat, 22 Dec 2007) | 1 line
Add item
........
2007-12-24 04:52:31 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-03-24 10:39:54 -03:00
|
|
|
#ifdef HAVE_SETITIMER
|
|
|
|
static PyObject *
|
|
|
|
signal_setitimer(PyObject *self, PyObject *args)
|
|
|
|
{
|
|
|
|
double first;
|
|
|
|
double interval = 0;
|
|
|
|
int which;
|
|
|
|
struct itimerval new, old;
|
|
|
|
|
|
|
|
if(!PyArg_ParseTuple(args, "id|d:setitimer", &which, &first, &interval))
|
2010-05-09 12:52:27 -03:00
|
|
|
return NULL;
|
2008-03-24 10:39:54 -03:00
|
|
|
|
|
|
|
timeval_from_double(first, &new.it_value);
|
|
|
|
timeval_from_double(interval, &new.it_interval);
|
|
|
|
/* Let OS check "which" value */
|
|
|
|
if (setitimer(which, &new, &old) != 0) {
|
2010-05-09 12:52:27 -03:00
|
|
|
PyErr_SetFromErrno(ItimerError);
|
|
|
|
return NULL;
|
2008-03-24 10:39:54 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
return itimer_retval(&old);
|
|
|
|
}
|
|
|
|
|
|
|
|
PyDoc_STRVAR(setitimer_doc,
|
|
|
|
"setitimer(which, seconds[, interval])\n\
|
|
|
|
\n\
|
|
|
|
Sets given itimer (one of ITIMER_REAL, ITIMER_VIRTUAL\n\
|
|
|
|
or ITIMER_PROF) to fire after value seconds and after\n\
|
|
|
|
that every interval seconds.\n\
|
|
|
|
The itimer can be cleared by setting seconds to zero.\n\
|
|
|
|
\n\
|
|
|
|
Returns old values as a tuple: (delay, interval).");
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef HAVE_GETITIMER
|
|
|
|
static PyObject *
|
|
|
|
signal_getitimer(PyObject *self, PyObject *args)
|
|
|
|
{
|
|
|
|
int which;
|
|
|
|
struct itimerval old;
|
|
|
|
|
|
|
|
if (!PyArg_ParseTuple(args, "i:getitimer", &which))
|
2010-05-09 12:52:27 -03:00
|
|
|
return NULL;
|
2008-03-24 10:39:54 -03:00
|
|
|
|
|
|
|
if (getitimer(which, &old) != 0) {
|
2010-05-09 12:52:27 -03:00
|
|
|
PyErr_SetFromErrno(ItimerError);
|
|
|
|
return NULL;
|
2008-03-24 10:39:54 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
return itimer_retval(&old);
|
|
|
|
}
|
|
|
|
|
|
|
|
PyDoc_STRVAR(getitimer_doc,
|
|
|
|
"getitimer(which)\n\
|
|
|
|
\n\
|
|
|
|
Returns current value of given itimer.");
|
|
|
|
#endif
|
|
|
|
|
2011-06-25 07:13:40 -03:00
|
|
|
#if defined(PYPTHREAD_SIGMASK) || defined(HAVE_SIGWAIT) || \
|
|
|
|
defined(HAVE_SIGWAITINFO) || defined(HAVE_SIGTIMEDWAIT)
|
2011-04-30 10:21:58 -03:00
|
|
|
/* Convert an iterable to a sigset.
|
|
|
|
Return 0 on success, return -1 and raise an exception on error. */
|
|
|
|
|
|
|
|
static int
|
|
|
|
iterable_to_sigset(PyObject *iterable, sigset_t *mask)
|
|
|
|
{
|
|
|
|
int result = -1;
|
|
|
|
PyObject *iterator, *item;
|
|
|
|
long signum;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
sigemptyset(mask);
|
|
|
|
|
|
|
|
iterator = PyObject_GetIter(iterable);
|
|
|
|
if (iterator == NULL)
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
while (1)
|
|
|
|
{
|
|
|
|
item = PyIter_Next(iterator);
|
|
|
|
if (item == NULL) {
|
|
|
|
if (PyErr_Occurred())
|
|
|
|
goto error;
|
|
|
|
else
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
signum = PyLong_AsLong(item);
|
|
|
|
Py_DECREF(item);
|
|
|
|
if (signum == -1 && PyErr_Occurred())
|
|
|
|
goto error;
|
|
|
|
if (0 < signum && signum < NSIG)
|
|
|
|
err = sigaddset(mask, (int)signum);
|
|
|
|
else
|
|
|
|
err = 1;
|
|
|
|
if (err) {
|
|
|
|
PyErr_Format(PyExc_ValueError,
|
|
|
|
"signal number %ld out of range", signum);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
result = 0;
|
|
|
|
|
|
|
|
error:
|
|
|
|
Py_XDECREF(iterator);
|
|
|
|
return result;
|
|
|
|
}
|
2011-05-07 20:46:11 -03:00
|
|
|
#endif
|
2011-04-30 10:21:58 -03:00
|
|
|
|
2011-05-07 20:46:11 -03:00
|
|
|
#if defined(PYPTHREAD_SIGMASK) || defined(HAVE_SIGPENDING)
|
2011-05-04 08:20:35 -03:00
|
|
|
static PyObject*
|
|
|
|
sigset_to_set(sigset_t mask)
|
2011-04-30 10:21:58 -03:00
|
|
|
{
|
2011-05-04 08:20:35 -03:00
|
|
|
PyObject *signum, *result;
|
|
|
|
int sig;
|
2011-04-30 10:21:58 -03:00
|
|
|
|
2011-05-04 08:20:35 -03:00
|
|
|
result = PySet_New(0);
|
2011-04-30 10:21:58 -03:00
|
|
|
if (result == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
for (sig = 1; sig < NSIG; sig++) {
|
2011-05-04 08:20:35 -03:00
|
|
|
if (sigismember(&mask, sig) != 1)
|
2011-04-30 10:21:58 -03:00
|
|
|
continue;
|
|
|
|
|
|
|
|
/* Handle the case where it is a member by adding the signal to
|
|
|
|
the result list. Ignore the other cases because they mean the
|
|
|
|
signal isn't a member of the mask or the signal was invalid,
|
|
|
|
and an invalid signal must have been our fault in constructing
|
|
|
|
the loop boundaries. */
|
|
|
|
signum = PyLong_FromLong(sig);
|
|
|
|
if (signum == NULL) {
|
|
|
|
Py_DECREF(result);
|
|
|
|
return NULL;
|
|
|
|
}
|
2011-05-04 08:20:35 -03:00
|
|
|
if (PySet_Add(result, signum) == -1) {
|
2011-04-30 10:21:58 -03:00
|
|
|
Py_DECREF(signum);
|
|
|
|
Py_DECREF(result);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
Py_DECREF(signum);
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
2011-05-07 20:46:11 -03:00
|
|
|
#endif
|
2011-04-30 10:21:58 -03:00
|
|
|
|
2011-05-07 20:46:11 -03:00
|
|
|
#ifdef PYPTHREAD_SIGMASK
|
2011-05-04 08:20:35 -03:00
|
|
|
static PyObject *
|
|
|
|
signal_pthread_sigmask(PyObject *self, PyObject *args)
|
|
|
|
{
|
|
|
|
int how;
|
|
|
|
PyObject *signals;
|
|
|
|
sigset_t mask, previous;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
if (!PyArg_ParseTuple(args, "iO:pthread_sigmask", &how, &signals))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (iterable_to_sigset(signals, &mask))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
err = pthread_sigmask(how, &mask, &previous);
|
|
|
|
if (err != 0) {
|
|
|
|
errno = err;
|
2011-05-07 20:46:11 -03:00
|
|
|
PyErr_SetFromErrno(PyExc_OSError);
|
2011-05-04 08:20:35 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* if signals was unblocked, signal handlers have been called */
|
|
|
|
if (PyErr_CheckSignals())
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
return sigset_to_set(previous);
|
|
|
|
}
|
|
|
|
|
2011-04-30 10:21:58 -03:00
|
|
|
PyDoc_STRVAR(signal_pthread_sigmask_doc,
|
|
|
|
"pthread_sigmask(how, mask) -> old mask\n\
|
|
|
|
\n\
|
|
|
|
Fetch and/or change the signal mask of the calling thread.");
|
|
|
|
#endif /* #ifdef PYPTHREAD_SIGMASK */
|
|
|
|
|
2008-03-24 10:39:54 -03:00
|
|
|
|
2011-05-07 20:46:11 -03:00
|
|
|
#ifdef HAVE_SIGPENDING
|
|
|
|
static PyObject *
|
|
|
|
signal_sigpending(PyObject *self)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
sigset_t mask;
|
|
|
|
err = sigpending(&mask);
|
|
|
|
if (err)
|
|
|
|
return PyErr_SetFromErrno(PyExc_OSError);
|
|
|
|
return sigset_to_set(mask);
|
|
|
|
}
|
|
|
|
|
|
|
|
PyDoc_STRVAR(signal_sigpending_doc,
|
|
|
|
"sigpending() -> list\n\
|
|
|
|
\n\
|
|
|
|
Examine pending signals.");
|
|
|
|
#endif /* #ifdef HAVE_SIGPENDING */
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef HAVE_SIGWAIT
|
|
|
|
static PyObject *
|
|
|
|
signal_sigwait(PyObject *self, PyObject *args)
|
|
|
|
{
|
|
|
|
PyObject *signals;
|
|
|
|
sigset_t set;
|
|
|
|
int err, signum;
|
|
|
|
|
|
|
|
if (!PyArg_ParseTuple(args, "O:sigwait", &signals))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (iterable_to_sigset(signals, &set))
|
|
|
|
return NULL;
|
|
|
|
|
2011-06-09 20:39:53 -03:00
|
|
|
Py_BEGIN_ALLOW_THREADS
|
2011-05-07 20:46:11 -03:00
|
|
|
err = sigwait(&set, &signum);
|
2011-06-09 20:39:53 -03:00
|
|
|
Py_END_ALLOW_THREADS
|
2011-05-07 20:46:11 -03:00
|
|
|
if (err) {
|
|
|
|
errno = err;
|
|
|
|
return PyErr_SetFromErrno(PyExc_OSError);
|
|
|
|
}
|
|
|
|
|
|
|
|
return PyLong_FromLong(signum);
|
|
|
|
}
|
|
|
|
|
|
|
|
PyDoc_STRVAR(signal_sigwait_doc,
|
|
|
|
"sigwait(sigset) -> signum\n\
|
|
|
|
\n\
|
|
|
|
Wait a signal.");
|
|
|
|
#endif /* #ifdef HAVE_SIGPENDING */
|
|
|
|
|
2011-06-25 07:13:40 -03:00
|
|
|
#if defined(HAVE_SIGWAITINFO) || defined(HAVE_SIGTIMEDWAIT)
|
|
|
|
static int initialized;
|
|
|
|
static PyStructSequence_Field struct_siginfo_fields[] = {
|
|
|
|
{"si_signo", "signal number"},
|
|
|
|
{"si_code", "signal code"},
|
|
|
|
{"si_errno", "errno associated with this signal"},
|
|
|
|
{"si_pid", "sending process ID"},
|
|
|
|
{"si_uid", "real user ID of sending process"},
|
|
|
|
{"si_status", "exit value or signal"},
|
|
|
|
{"si_band", "band event for SIGPOLL"},
|
|
|
|
{0}
|
|
|
|
};
|
|
|
|
|
|
|
|
PyDoc_STRVAR(struct_siginfo__doc__,
|
|
|
|
"struct_siginfo: Result from sigwaitinfo or sigtimedwait.\n\n\
|
|
|
|
This object may be accessed either as a tuple of\n\
|
|
|
|
(si_signo, si_code, si_errno, si_pid, si_uid, si_status, si_band),\n\
|
|
|
|
or via the attributes si_signo, si_code, and so on.");
|
|
|
|
|
|
|
|
static PyStructSequence_Desc struct_siginfo_desc = {
|
|
|
|
"signal.struct_siginfo", /* name */
|
|
|
|
struct_siginfo__doc__, /* doc */
|
|
|
|
struct_siginfo_fields, /* fields */
|
|
|
|
7 /* n_in_sequence */
|
|
|
|
};
|
|
|
|
|
|
|
|
static PyTypeObject SiginfoType;
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
fill_siginfo(siginfo_t *si)
|
|
|
|
{
|
|
|
|
PyObject *result = PyStructSequence_New(&SiginfoType);
|
|
|
|
if (!result)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
PyStructSequence_SET_ITEM(result, 0, PyLong_FromLong((long)(si->si_signo)));
|
|
|
|
PyStructSequence_SET_ITEM(result, 1, PyLong_FromLong((long)(si->si_code)));
|
|
|
|
PyStructSequence_SET_ITEM(result, 2, PyLong_FromLong((long)(si->si_errno)));
|
|
|
|
PyStructSequence_SET_ITEM(result, 3, PyLong_FromPid(si->si_pid));
|
2013-02-10 15:56:49 -04:00
|
|
|
PyStructSequence_SET_ITEM(result, 4, _PyLong_FromUid(si->si_uid));
|
2011-06-25 07:13:40 -03:00
|
|
|
PyStructSequence_SET_ITEM(result, 5,
|
|
|
|
PyLong_FromLong((long)(si->si_status)));
|
|
|
|
PyStructSequence_SET_ITEM(result, 6, PyLong_FromLong(si->si_band));
|
|
|
|
if (PyErr_Occurred()) {
|
|
|
|
Py_DECREF(result);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef HAVE_SIGWAITINFO
|
|
|
|
static PyObject *
|
|
|
|
signal_sigwaitinfo(PyObject *self, PyObject *args)
|
|
|
|
{
|
|
|
|
PyObject *signals;
|
|
|
|
sigset_t set;
|
|
|
|
siginfo_t si;
|
|
|
|
int err;
|
2015-03-20 08:54:28 -03:00
|
|
|
int async_err = 0;
|
2011-06-25 07:13:40 -03:00
|
|
|
|
|
|
|
if (!PyArg_ParseTuple(args, "O:sigwaitinfo", &signals))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (iterable_to_sigset(signals, &set))
|
|
|
|
return NULL;
|
|
|
|
|
2015-03-20 08:54:28 -03:00
|
|
|
do {
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
|
|
err = sigwaitinfo(&set, &si);
|
|
|
|
Py_END_ALLOW_THREADS
|
|
|
|
} while (err == -1
|
|
|
|
&& errno == EINTR && !(async_err = PyErr_CheckSignals()));
|
2011-06-25 07:13:40 -03:00
|
|
|
if (err == -1)
|
2015-03-20 08:54:28 -03:00
|
|
|
return (!async_err) ? PyErr_SetFromErrno(PyExc_OSError) : NULL;
|
2011-06-25 07:13:40 -03:00
|
|
|
|
|
|
|
return fill_siginfo(&si);
|
|
|
|
}
|
|
|
|
|
|
|
|
PyDoc_STRVAR(signal_sigwaitinfo_doc,
|
|
|
|
"sigwaitinfo(sigset) -> struct_siginfo\n\
|
|
|
|
\n\
|
|
|
|
Wait synchronously for a signal until one of the signals in *sigset* is\n\
|
|
|
|
delivered.\n\
|
|
|
|
Returns a struct_siginfo containing information about the signal.");
|
|
|
|
#endif /* #ifdef HAVE_SIGWAITINFO */
|
|
|
|
|
|
|
|
#ifdef HAVE_SIGTIMEDWAIT
|
|
|
|
static PyObject *
|
|
|
|
signal_sigtimedwait(PyObject *self, PyObject *args)
|
|
|
|
{
|
2015-03-20 08:54:28 -03:00
|
|
|
PyObject *signals;
|
|
|
|
double timeout, frac;
|
|
|
|
struct timespec ts;
|
2011-06-25 07:13:40 -03:00
|
|
|
sigset_t set;
|
|
|
|
siginfo_t si;
|
2015-03-20 08:54:28 -03:00
|
|
|
int res;
|
|
|
|
_PyTime_timeval deadline, monotonic;
|
2011-06-25 07:13:40 -03:00
|
|
|
|
2015-03-20 08:54:28 -03:00
|
|
|
if (!PyArg_ParseTuple(args, "Od:sigtimedwait",
|
2012-03-02 17:54:03 -04:00
|
|
|
&signals, &timeout))
|
2011-06-25 07:13:40 -03:00
|
|
|
return NULL;
|
|
|
|
|
2015-03-20 08:54:28 -03:00
|
|
|
if (timeout < 0) {
|
2011-06-25 07:13:40 -03:00
|
|
|
PyErr_SetString(PyExc_ValueError, "timeout must be non-negative");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (iterable_to_sigset(signals, &set))
|
|
|
|
return NULL;
|
|
|
|
|
2015-03-20 08:54:28 -03:00
|
|
|
_PyTime_monotonic(&deadline);
|
|
|
|
_PyTime_AddDouble(&deadline, timeout, _PyTime_ROUND_UP);
|
|
|
|
|
|
|
|
do {
|
|
|
|
frac = fmod(timeout, 1.0);
|
|
|
|
timeout = floor(timeout);
|
|
|
|
ts.tv_sec = (long)timeout;
|
|
|
|
ts.tv_nsec = (long)(frac*1e9);
|
|
|
|
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
|
|
res = sigtimedwait(&set, &si, &ts);
|
|
|
|
Py_END_ALLOW_THREADS
|
|
|
|
|
|
|
|
if (res != -1)
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (errno != EINTR) {
|
|
|
|
if (errno == EAGAIN)
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
else
|
|
|
|
return PyErr_SetFromErrno(PyExc_OSError);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* sigtimedwait() was interrupted by a signal (EINTR) */
|
|
|
|
if (PyErr_CheckSignals())
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
_PyTime_monotonic(&monotonic);
|
|
|
|
timeout = _PyTime_INTERVAL(monotonic, deadline);
|
|
|
|
if (timeout <= 0.0)
|
|
|
|
break;
|
|
|
|
} while (1);
|
2011-06-25 07:13:40 -03:00
|
|
|
|
|
|
|
return fill_siginfo(&si);
|
|
|
|
}
|
|
|
|
|
|
|
|
PyDoc_STRVAR(signal_sigtimedwait_doc,
|
|
|
|
"sigtimedwait(sigset, (timeout_sec, timeout_nsec)) -> struct_siginfo\n\
|
|
|
|
\n\
|
|
|
|
Like sigwaitinfo(), but with a timeout specified as a tuple of (seconds,\n\
|
|
|
|
nanoseconds).");
|
|
|
|
#endif /* #ifdef HAVE_SIGTIMEDWAIT */
|
|
|
|
|
2011-05-07 20:46:11 -03:00
|
|
|
|
|
|
|
#if defined(HAVE_PTHREAD_KILL) && defined(WITH_THREAD)
|
|
|
|
static PyObject *
|
|
|
|
signal_pthread_kill(PyObject *self, PyObject *args)
|
|
|
|
{
|
|
|
|
long tid;
|
|
|
|
int signum;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
if (!PyArg_ParseTuple(args, "li:pthread_kill", &tid, &signum))
|
|
|
|
return NULL;
|
|
|
|
|
2011-05-09 09:45:38 -03:00
|
|
|
err = pthread_kill((pthread_t)tid, signum);
|
2011-05-07 20:46:11 -03:00
|
|
|
if (err != 0) {
|
|
|
|
errno = err;
|
|
|
|
PyErr_SetFromErrno(PyExc_OSError);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* the signal may have been send to the current thread */
|
|
|
|
if (PyErr_CheckSignals())
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
PyDoc_STRVAR(signal_pthread_kill_doc,
|
|
|
|
"pthread_kill(thread_id, signum)\n\
|
|
|
|
\n\
|
|
|
|
Send a signal to a thread.");
|
|
|
|
#endif /* #if defined(HAVE_PTHREAD_KILL) && defined(WITH_THREAD) */
|
|
|
|
|
|
|
|
|
|
|
|
|
1994-05-11 05:59:13 -03:00
|
|
|
/* List of functions defined in the module */
|
1997-01-02 20:14:25 -04:00
|
|
|
static PyMethodDef signal_methods[] = {
|
1997-08-22 17:42:00 -03:00
|
|
|
#ifdef HAVE_ALARM
|
2010-05-09 12:52:27 -03:00
|
|
|
{"alarm", signal_alarm, METH_VARARGS, alarm_doc},
|
2008-03-24 10:39:54 -03:00
|
|
|
#endif
|
|
|
|
#ifdef HAVE_SETITIMER
|
|
|
|
{"setitimer", signal_setitimer, METH_VARARGS, setitimer_doc},
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_GETITIMER
|
2010-05-09 12:52:27 -03:00
|
|
|
{"getitimer", signal_getitimer, METH_VARARGS, getitimer_doc},
|
1995-03-10 11:13:48 -04:00
|
|
|
#endif
|
2010-05-09 12:52:27 -03:00
|
|
|
{"signal", signal_signal, METH_VARARGS, signal_doc},
|
|
|
|
{"getsignal", signal_getsignal, METH_VARARGS, getsignal_doc},
|
|
|
|
{"set_wakeup_fd", signal_set_wakeup_fd, METH_VARARGS, set_wakeup_fd_doc},
|
Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60849,60852-60854,60856-60859,60861-60870,60874-60875,60880-60881,60886,60888-60890,60892,60894-60898,60900,60902-60906,60908,60911-60917,60919-60920,60922,60926,60929-60931,60933-60935,60937,60939-60941,60943-60954,60959-60961,60963-60964,60966-60967,60971,60977,60979-60989 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r60980 | georg.brandl | 2008-02-23 16:02:28 +0100 (Sat, 23 Feb 2008) | 2 lines
#1492: allow overriding BaseHTTPServer's content type for error messages.
........
r60982 | georg.brandl | 2008-02-23 16:06:25 +0100 (Sat, 23 Feb 2008) | 2 lines
#2165: fix test_logging failure on some machines.
........
r60983 | facundo.batista | 2008-02-23 16:07:35 +0100 (Sat, 23 Feb 2008) | 6 lines
Issue 1089358. Adds the siginterrupt() function, that is just a
wrapper around the system call with the same name. Also added
test cases, doc changes and NEWS entry. Thanks Jason and Ralf
Schmitt.
........
r60984 | georg.brandl | 2008-02-23 16:11:18 +0100 (Sat, 23 Feb 2008) | 2 lines
#2067: file.__exit__() now calls subclasses' close() method.
........
r60985 | georg.brandl | 2008-02-23 16:19:54 +0100 (Sat, 23 Feb 2008) | 2 lines
More difflib examples. Written for GHOP by Josip Dzolonga.
........
r60987 | andrew.kuchling | 2008-02-23 16:41:51 +0100 (Sat, 23 Feb 2008) | 1 line
#2072: correct documentation for .rpc_paths
........
r60988 | georg.brandl | 2008-02-23 16:43:48 +0100 (Sat, 23 Feb 2008) | 2 lines
#2161: Fix opcode name.
........
r60989 | andrew.kuchling | 2008-02-23 16:49:35 +0100 (Sat, 23 Feb 2008) | 2 lines
#1119331: ncurses will just call exit() if the terminal name isn't found.
Call setupterm() first so that we get a Python exception instead of just existing.
........
2008-02-23 12:23:06 -04:00
|
|
|
#ifdef HAVE_SIGINTERRUPT
|
2010-05-09 12:52:27 -03:00
|
|
|
{"siginterrupt", signal_siginterrupt, METH_VARARGS, siginterrupt_doc},
|
Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60849,60852-60854,60856-60859,60861-60870,60874-60875,60880-60881,60886,60888-60890,60892,60894-60898,60900,60902-60906,60908,60911-60917,60919-60920,60922,60926,60929-60931,60933-60935,60937,60939-60941,60943-60954,60959-60961,60963-60964,60966-60967,60971,60977,60979-60989 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r60980 | georg.brandl | 2008-02-23 16:02:28 +0100 (Sat, 23 Feb 2008) | 2 lines
#1492: allow overriding BaseHTTPServer's content type for error messages.
........
r60982 | georg.brandl | 2008-02-23 16:06:25 +0100 (Sat, 23 Feb 2008) | 2 lines
#2165: fix test_logging failure on some machines.
........
r60983 | facundo.batista | 2008-02-23 16:07:35 +0100 (Sat, 23 Feb 2008) | 6 lines
Issue 1089358. Adds the siginterrupt() function, that is just a
wrapper around the system call with the same name. Also added
test cases, doc changes and NEWS entry. Thanks Jason and Ralf
Schmitt.
........
r60984 | georg.brandl | 2008-02-23 16:11:18 +0100 (Sat, 23 Feb 2008) | 2 lines
#2067: file.__exit__() now calls subclasses' close() method.
........
r60985 | georg.brandl | 2008-02-23 16:19:54 +0100 (Sat, 23 Feb 2008) | 2 lines
More difflib examples. Written for GHOP by Josip Dzolonga.
........
r60987 | andrew.kuchling | 2008-02-23 16:41:51 +0100 (Sat, 23 Feb 2008) | 1 line
#2072: correct documentation for .rpc_paths
........
r60988 | georg.brandl | 2008-02-23 16:43:48 +0100 (Sat, 23 Feb 2008) | 2 lines
#2161: Fix opcode name.
........
r60989 | andrew.kuchling | 2008-02-23 16:49:35 +0100 (Sat, 23 Feb 2008) | 2 lines
#1119331: ncurses will just call exit() if the terminal name isn't found.
Call setupterm() first so that we get a Python exception instead of just existing.
........
2008-02-23 12:23:06 -04:00
|
|
|
#endif
|
1997-08-22 17:42:00 -03:00
|
|
|
#ifdef HAVE_PAUSE
|
2010-05-09 12:52:27 -03:00
|
|
|
{"pause", (PyCFunction)signal_pause,
|
2011-04-30 10:21:58 -03:00
|
|
|
METH_NOARGS, pause_doc},
|
1995-03-10 11:13:48 -04:00
|
|
|
#endif
|
2010-05-09 12:52:27 -03:00
|
|
|
{"default_int_handler", signal_default_int_handler,
|
|
|
|
METH_VARARGS, default_int_handler_doc},
|
2011-05-07 20:46:11 -03:00
|
|
|
#if defined(HAVE_PTHREAD_KILL) && defined(WITH_THREAD)
|
|
|
|
{"pthread_kill", (PyCFunction)signal_pthread_kill,
|
|
|
|
METH_VARARGS, signal_pthread_kill_doc},
|
|
|
|
#endif
|
2011-04-30 10:21:58 -03:00
|
|
|
#ifdef PYPTHREAD_SIGMASK
|
|
|
|
{"pthread_sigmask", (PyCFunction)signal_pthread_sigmask,
|
|
|
|
METH_VARARGS, signal_pthread_sigmask_doc},
|
2011-05-07 20:46:11 -03:00
|
|
|
#endif
|
|
|
|
#ifdef HAVE_SIGPENDING
|
|
|
|
{"sigpending", (PyCFunction)signal_sigpending,
|
|
|
|
METH_NOARGS, signal_sigpending_doc},
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_SIGWAIT
|
|
|
|
{"sigwait", (PyCFunction)signal_sigwait,
|
|
|
|
METH_VARARGS, signal_sigwait_doc},
|
2011-06-25 07:13:40 -03:00
|
|
|
#endif
|
|
|
|
#ifdef HAVE_SIGWAITINFO
|
|
|
|
{"sigwaitinfo", (PyCFunction)signal_sigwaitinfo,
|
|
|
|
METH_VARARGS, signal_sigwaitinfo_doc},
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_SIGTIMEDWAIT
|
|
|
|
{"sigtimedwait", (PyCFunction)signal_sigtimedwait,
|
|
|
|
METH_VARARGS, signal_sigtimedwait_doc},
|
2011-04-30 10:21:58 -03:00
|
|
|
#endif
|
2010-05-09 12:52:27 -03:00
|
|
|
{NULL, NULL} /* sentinel */
|
1994-05-11 05:59:13 -03:00
|
|
|
};
|
|
|
|
|
1997-01-02 20:14:25 -04:00
|
|
|
|
2002-06-13 17:33:02 -03:00
|
|
|
PyDoc_STRVAR(module_doc,
|
1998-06-28 13:54:49 -03:00
|
|
|
"This module provides mechanisms to use signal handlers in Python.\n\
|
|
|
|
\n\
|
|
|
|
Functions:\n\
|
|
|
|
\n\
|
|
|
|
alarm() -- cause SIGALRM after a specified time [Unix only]\n\
|
2008-03-24 10:39:54 -03:00
|
|
|
setitimer() -- cause a signal (described below) after a specified\n\
|
|
|
|
float time and the timer may restart then [Unix only]\n\
|
|
|
|
getitimer() -- get current value of timer [Unix only]\n\
|
1998-06-28 13:54:49 -03:00
|
|
|
signal() -- set the action for a given signal\n\
|
|
|
|
getsignal() -- get the signal action for a given signal\n\
|
|
|
|
pause() -- wait until a signal arrives [Unix only]\n\
|
|
|
|
default_int_handler() -- default SIGINT handler\n\
|
|
|
|
\n\
|
2008-03-24 10:39:54 -03:00
|
|
|
signal constants:\n\
|
1998-06-28 13:54:49 -03:00
|
|
|
SIG_DFL -- used to refer to the system default handler\n\
|
|
|
|
SIG_IGN -- used to ignore the signal\n\
|
|
|
|
NSIG -- number of defined signals\n\
|
|
|
|
SIGINT, SIGTERM, etc. -- signal numbers\n\
|
|
|
|
\n\
|
2008-03-24 10:39:54 -03:00
|
|
|
itimer constants:\n\
|
|
|
|
ITIMER_REAL -- decrements in real time, and delivers SIGALRM upon\n\
|
|
|
|
expiration\n\
|
|
|
|
ITIMER_VIRTUAL -- decrements only when the process is executing,\n\
|
|
|
|
and delivers SIGVTALRM upon expiration\n\
|
|
|
|
ITIMER_PROF -- decrements both when the process is executing and\n\
|
|
|
|
when the system is executing on behalf of the process.\n\
|
|
|
|
Coupled with ITIMER_VIRTUAL, this timer is usually\n\
|
|
|
|
used to profile the time spent by the application\n\
|
|
|
|
in user and kernel space. SIGPROF is delivered upon\n\
|
|
|
|
expiration.\n\
|
|
|
|
\n\n\
|
1998-06-28 13:54:49 -03:00
|
|
|
*** IMPORTANT NOTICE ***\n\
|
|
|
|
A signal handler function is called with two arguments:\n\
|
2002-06-13 17:33:02 -03:00
|
|
|
the first is the signal number, the second is the interrupted stack frame.");
|
1998-06-28 13:54:49 -03:00
|
|
|
|
2008-06-11 02:26:20 -03:00
|
|
|
static struct PyModuleDef signalmodule = {
|
2010-05-09 12:52:27 -03:00
|
|
|
PyModuleDef_HEAD_INIT,
|
2014-04-04 11:20:28 -03:00
|
|
|
"_signal",
|
2010-05-09 12:52:27 -03:00
|
|
|
module_doc,
|
|
|
|
-1,
|
|
|
|
signal_methods,
|
|
|
|
NULL,
|
|
|
|
NULL,
|
|
|
|
NULL,
|
|
|
|
NULL
|
2008-06-11 02:26:20 -03:00
|
|
|
};
|
|
|
|
|
2002-08-01 23:27:13 -03:00
|
|
|
PyMODINIT_FUNC
|
2014-04-04 10:34:17 -03:00
|
|
|
PyInit__signal(void)
|
1994-05-11 05:59:13 -03:00
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
PyObject *m, *d, *x;
|
|
|
|
int i;
|
1994-06-23 08:25:45 -03:00
|
|
|
|
|
|
|
#ifdef WITH_THREAD
|
2010-05-09 12:52:27 -03:00
|
|
|
main_thread = PyThread_get_thread_ident();
|
|
|
|
main_pid = getpid();
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* Create the module and add the functions */
|
|
|
|
m = PyModule_Create(&signalmodule);
|
|
|
|
if (m == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
2011-06-25 07:13:40 -03:00
|
|
|
#if defined(HAVE_SIGWAITINFO) || defined(HAVE_SIGTIMEDWAIT)
|
2013-07-22 17:24:54 -03:00
|
|
|
if (!initialized) {
|
|
|
|
if (PyStructSequence_InitType2(&SiginfoType, &struct_siginfo_desc) < 0)
|
|
|
|
return NULL;
|
|
|
|
}
|
2011-06-25 07:13:40 -03:00
|
|
|
Py_INCREF((PyObject*) &SiginfoType);
|
|
|
|
PyModule_AddObject(m, "struct_siginfo", (PyObject*) &SiginfoType);
|
|
|
|
initialized = 1;
|
|
|
|
#endif
|
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
/* Add some symbolic constants to the module */
|
|
|
|
d = PyModule_GetDict(m);
|
|
|
|
|
|
|
|
x = DefaultHandler = PyLong_FromVoidPtr((void *)SIG_DFL);
|
|
|
|
if (!x || PyDict_SetItemString(d, "SIG_DFL", x) < 0)
|
|
|
|
goto finally;
|
|
|
|
|
|
|
|
x = IgnoreHandler = PyLong_FromVoidPtr((void *)SIG_IGN);
|
|
|
|
if (!x || PyDict_SetItemString(d, "SIG_IGN", x) < 0)
|
|
|
|
goto finally;
|
|
|
|
|
|
|
|
x = PyLong_FromLong((long)NSIG);
|
|
|
|
if (!x || PyDict_SetItemString(d, "NSIG", x) < 0)
|
|
|
|
goto finally;
|
|
|
|
Py_DECREF(x);
|
|
|
|
|
2011-04-30 10:21:58 -03:00
|
|
|
#ifdef SIG_BLOCK
|
2011-05-02 11:15:43 -03:00
|
|
|
if (PyModule_AddIntMacro(m, SIG_BLOCK))
|
|
|
|
goto finally;
|
2011-04-30 10:21:58 -03:00
|
|
|
#endif
|
|
|
|
#ifdef SIG_UNBLOCK
|
2011-05-02 11:15:43 -03:00
|
|
|
if (PyModule_AddIntMacro(m, SIG_UNBLOCK))
|
|
|
|
goto finally;
|
2011-04-30 10:21:58 -03:00
|
|
|
#endif
|
|
|
|
#ifdef SIG_SETMASK
|
2011-05-02 11:15:43 -03:00
|
|
|
if (PyModule_AddIntMacro(m, SIG_SETMASK))
|
|
|
|
goto finally;
|
2011-04-30 10:21:58 -03:00
|
|
|
#endif
|
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
x = IntHandler = PyDict_GetItemString(d, "default_int_handler");
|
|
|
|
if (!x)
|
|
|
|
goto finally;
|
|
|
|
Py_INCREF(IntHandler);
|
|
|
|
|
|
|
|
Handlers[0].tripped = 0;
|
|
|
|
for (i = 1; i < NSIG; i++) {
|
|
|
|
void (*t)(int);
|
|
|
|
t = PyOS_getsig(i);
|
|
|
|
Handlers[i].tripped = 0;
|
|
|
|
if (t == SIG_DFL)
|
|
|
|
Handlers[i].func = DefaultHandler;
|
|
|
|
else if (t == SIG_IGN)
|
|
|
|
Handlers[i].func = IgnoreHandler;
|
|
|
|
else
|
|
|
|
Handlers[i].func = Py_None; /* None of our business */
|
|
|
|
Py_INCREF(Handlers[i].func);
|
|
|
|
}
|
|
|
|
if (Handlers[SIGINT].func == DefaultHandler) {
|
|
|
|
/* Install default int handler */
|
|
|
|
Py_INCREF(IntHandler);
|
|
|
|
Py_DECREF(Handlers[SIGINT].func);
|
|
|
|
Handlers[SIGINT].func = IntHandler;
|
|
|
|
old_siginthandler = PyOS_setsig(SIGINT, signal_handler);
|
|
|
|
}
|
1994-05-11 05:59:13 -03:00
|
|
|
|
|
|
|
#ifdef SIGHUP
|
2010-05-09 12:52:27 -03:00
|
|
|
x = PyLong_FromLong(SIGHUP);
|
|
|
|
PyDict_SetItemString(d, "SIGHUP", x);
|
|
|
|
Py_XDECREF(x);
|
1994-05-11 05:59:13 -03:00
|
|
|
#endif
|
|
|
|
#ifdef SIGINT
|
2010-05-09 12:52:27 -03:00
|
|
|
x = PyLong_FromLong(SIGINT);
|
|
|
|
PyDict_SetItemString(d, "SIGINT", x);
|
|
|
|
Py_XDECREF(x);
|
1994-05-11 05:59:13 -03:00
|
|
|
#endif
|
2001-10-01 14:58:40 -03:00
|
|
|
#ifdef SIGBREAK
|
2010-05-09 12:52:27 -03:00
|
|
|
x = PyLong_FromLong(SIGBREAK);
|
|
|
|
PyDict_SetItemString(d, "SIGBREAK", x);
|
|
|
|
Py_XDECREF(x);
|
2001-10-01 14:58:40 -03:00
|
|
|
#endif
|
1994-05-11 05:59:13 -03:00
|
|
|
#ifdef SIGQUIT
|
2010-05-09 12:52:27 -03:00
|
|
|
x = PyLong_FromLong(SIGQUIT);
|
|
|
|
PyDict_SetItemString(d, "SIGQUIT", x);
|
|
|
|
Py_XDECREF(x);
|
1994-05-11 05:59:13 -03:00
|
|
|
#endif
|
|
|
|
#ifdef SIGILL
|
2010-05-09 12:52:27 -03:00
|
|
|
x = PyLong_FromLong(SIGILL);
|
|
|
|
PyDict_SetItemString(d, "SIGILL", x);
|
|
|
|
Py_XDECREF(x);
|
1994-05-11 05:59:13 -03:00
|
|
|
#endif
|
|
|
|
#ifdef SIGTRAP
|
2010-05-09 12:52:27 -03:00
|
|
|
x = PyLong_FromLong(SIGTRAP);
|
|
|
|
PyDict_SetItemString(d, "SIGTRAP", x);
|
|
|
|
Py_XDECREF(x);
|
1994-05-11 05:59:13 -03:00
|
|
|
#endif
|
|
|
|
#ifdef SIGIOT
|
2010-05-09 12:52:27 -03:00
|
|
|
x = PyLong_FromLong(SIGIOT);
|
|
|
|
PyDict_SetItemString(d, "SIGIOT", x);
|
|
|
|
Py_XDECREF(x);
|
1994-05-11 05:59:13 -03:00
|
|
|
#endif
|
|
|
|
#ifdef SIGABRT
|
2010-05-09 12:52:27 -03:00
|
|
|
x = PyLong_FromLong(SIGABRT);
|
|
|
|
PyDict_SetItemString(d, "SIGABRT", x);
|
|
|
|
Py_XDECREF(x);
|
1994-05-11 05:59:13 -03:00
|
|
|
#endif
|
|
|
|
#ifdef SIGEMT
|
2010-05-09 12:52:27 -03:00
|
|
|
x = PyLong_FromLong(SIGEMT);
|
|
|
|
PyDict_SetItemString(d, "SIGEMT", x);
|
|
|
|
Py_XDECREF(x);
|
1994-05-11 05:59:13 -03:00
|
|
|
#endif
|
|
|
|
#ifdef SIGFPE
|
2010-05-09 12:52:27 -03:00
|
|
|
x = PyLong_FromLong(SIGFPE);
|
|
|
|
PyDict_SetItemString(d, "SIGFPE", x);
|
|
|
|
Py_XDECREF(x);
|
1994-05-11 05:59:13 -03:00
|
|
|
#endif
|
|
|
|
#ifdef SIGKILL
|
2010-05-09 12:52:27 -03:00
|
|
|
x = PyLong_FromLong(SIGKILL);
|
|
|
|
PyDict_SetItemString(d, "SIGKILL", x);
|
|
|
|
Py_XDECREF(x);
|
1994-05-11 05:59:13 -03:00
|
|
|
#endif
|
|
|
|
#ifdef SIGBUS
|
2010-05-09 12:52:27 -03:00
|
|
|
x = PyLong_FromLong(SIGBUS);
|
|
|
|
PyDict_SetItemString(d, "SIGBUS", x);
|
|
|
|
Py_XDECREF(x);
|
1994-05-11 05:59:13 -03:00
|
|
|
#endif
|
|
|
|
#ifdef SIGSEGV
|
2010-05-09 12:52:27 -03:00
|
|
|
x = PyLong_FromLong(SIGSEGV);
|
|
|
|
PyDict_SetItemString(d, "SIGSEGV", x);
|
|
|
|
Py_XDECREF(x);
|
1994-05-11 05:59:13 -03:00
|
|
|
#endif
|
|
|
|
#ifdef SIGSYS
|
2010-05-09 12:52:27 -03:00
|
|
|
x = PyLong_FromLong(SIGSYS);
|
|
|
|
PyDict_SetItemString(d, "SIGSYS", x);
|
|
|
|
Py_XDECREF(x);
|
1994-05-11 05:59:13 -03:00
|
|
|
#endif
|
|
|
|
#ifdef SIGPIPE
|
2010-05-09 12:52:27 -03:00
|
|
|
x = PyLong_FromLong(SIGPIPE);
|
|
|
|
PyDict_SetItemString(d, "SIGPIPE", x);
|
|
|
|
Py_XDECREF(x);
|
1994-05-11 05:59:13 -03:00
|
|
|
#endif
|
|
|
|
#ifdef SIGALRM
|
2010-05-09 12:52:27 -03:00
|
|
|
x = PyLong_FromLong(SIGALRM);
|
|
|
|
PyDict_SetItemString(d, "SIGALRM", x);
|
|
|
|
Py_XDECREF(x);
|
1994-05-11 05:59:13 -03:00
|
|
|
#endif
|
|
|
|
#ifdef SIGTERM
|
2010-05-09 12:52:27 -03:00
|
|
|
x = PyLong_FromLong(SIGTERM);
|
|
|
|
PyDict_SetItemString(d, "SIGTERM", x);
|
|
|
|
Py_XDECREF(x);
|
1994-05-11 05:59:13 -03:00
|
|
|
#endif
|
|
|
|
#ifdef SIGUSR1
|
2010-05-09 12:52:27 -03:00
|
|
|
x = PyLong_FromLong(SIGUSR1);
|
|
|
|
PyDict_SetItemString(d, "SIGUSR1", x);
|
|
|
|
Py_XDECREF(x);
|
1994-05-11 05:59:13 -03:00
|
|
|
#endif
|
|
|
|
#ifdef SIGUSR2
|
2010-05-09 12:52:27 -03:00
|
|
|
x = PyLong_FromLong(SIGUSR2);
|
|
|
|
PyDict_SetItemString(d, "SIGUSR2", x);
|
|
|
|
Py_XDECREF(x);
|
1994-05-11 05:59:13 -03:00
|
|
|
#endif
|
|
|
|
#ifdef SIGCLD
|
2010-05-09 12:52:27 -03:00
|
|
|
x = PyLong_FromLong(SIGCLD);
|
|
|
|
PyDict_SetItemString(d, "SIGCLD", x);
|
|
|
|
Py_XDECREF(x);
|
1994-05-11 05:59:13 -03:00
|
|
|
#endif
|
|
|
|
#ifdef SIGCHLD
|
2010-05-09 12:52:27 -03:00
|
|
|
x = PyLong_FromLong(SIGCHLD);
|
|
|
|
PyDict_SetItemString(d, "SIGCHLD", x);
|
|
|
|
Py_XDECREF(x);
|
1994-05-11 05:59:13 -03:00
|
|
|
#endif
|
|
|
|
#ifdef SIGPWR
|
2010-05-09 12:52:27 -03:00
|
|
|
x = PyLong_FromLong(SIGPWR);
|
|
|
|
PyDict_SetItemString(d, "SIGPWR", x);
|
|
|
|
Py_XDECREF(x);
|
1994-05-11 05:59:13 -03:00
|
|
|
#endif
|
|
|
|
#ifdef SIGIO
|
2010-05-09 12:52:27 -03:00
|
|
|
x = PyLong_FromLong(SIGIO);
|
|
|
|
PyDict_SetItemString(d, "SIGIO", x);
|
|
|
|
Py_XDECREF(x);
|
1994-05-11 05:59:13 -03:00
|
|
|
#endif
|
|
|
|
#ifdef SIGURG
|
2010-05-09 12:52:27 -03:00
|
|
|
x = PyLong_FromLong(SIGURG);
|
|
|
|
PyDict_SetItemString(d, "SIGURG", x);
|
|
|
|
Py_XDECREF(x);
|
1994-05-11 05:59:13 -03:00
|
|
|
#endif
|
|
|
|
#ifdef SIGWINCH
|
2010-05-09 12:52:27 -03:00
|
|
|
x = PyLong_FromLong(SIGWINCH);
|
|
|
|
PyDict_SetItemString(d, "SIGWINCH", x);
|
|
|
|
Py_XDECREF(x);
|
1994-05-11 05:59:13 -03:00
|
|
|
#endif
|
|
|
|
#ifdef SIGPOLL
|
2010-05-09 12:52:27 -03:00
|
|
|
x = PyLong_FromLong(SIGPOLL);
|
|
|
|
PyDict_SetItemString(d, "SIGPOLL", x);
|
|
|
|
Py_XDECREF(x);
|
1994-05-11 05:59:13 -03:00
|
|
|
#endif
|
|
|
|
#ifdef SIGSTOP
|
2010-05-09 12:52:27 -03:00
|
|
|
x = PyLong_FromLong(SIGSTOP);
|
|
|
|
PyDict_SetItemString(d, "SIGSTOP", x);
|
|
|
|
Py_XDECREF(x);
|
1994-05-11 05:59:13 -03:00
|
|
|
#endif
|
|
|
|
#ifdef SIGTSTP
|
2010-05-09 12:52:27 -03:00
|
|
|
x = PyLong_FromLong(SIGTSTP);
|
|
|
|
PyDict_SetItemString(d, "SIGTSTP", x);
|
|
|
|
Py_XDECREF(x);
|
1994-05-11 05:59:13 -03:00
|
|
|
#endif
|
|
|
|
#ifdef SIGCONT
|
2010-05-09 12:52:27 -03:00
|
|
|
x = PyLong_FromLong(SIGCONT);
|
|
|
|
PyDict_SetItemString(d, "SIGCONT", x);
|
|
|
|
Py_XDECREF(x);
|
1994-05-11 05:59:13 -03:00
|
|
|
#endif
|
|
|
|
#ifdef SIGTTIN
|
2010-05-09 12:52:27 -03:00
|
|
|
x = PyLong_FromLong(SIGTTIN);
|
|
|
|
PyDict_SetItemString(d, "SIGTTIN", x);
|
|
|
|
Py_XDECREF(x);
|
1994-05-11 05:59:13 -03:00
|
|
|
#endif
|
|
|
|
#ifdef SIGTTOU
|
2010-05-09 12:52:27 -03:00
|
|
|
x = PyLong_FromLong(SIGTTOU);
|
|
|
|
PyDict_SetItemString(d, "SIGTTOU", x);
|
|
|
|
Py_XDECREF(x);
|
1994-05-11 05:59:13 -03:00
|
|
|
#endif
|
|
|
|
#ifdef SIGVTALRM
|
2010-05-09 12:52:27 -03:00
|
|
|
x = PyLong_FromLong(SIGVTALRM);
|
|
|
|
PyDict_SetItemString(d, "SIGVTALRM", x);
|
|
|
|
Py_XDECREF(x);
|
1994-05-11 05:59:13 -03:00
|
|
|
#endif
|
|
|
|
#ifdef SIGPROF
|
2010-05-09 12:52:27 -03:00
|
|
|
x = PyLong_FromLong(SIGPROF);
|
|
|
|
PyDict_SetItemString(d, "SIGPROF", x);
|
|
|
|
Py_XDECREF(x);
|
1994-05-11 05:59:13 -03:00
|
|
|
#endif
|
1996-12-16 16:24:22 -04:00
|
|
|
#ifdef SIGXCPU
|
2010-05-09 12:52:27 -03:00
|
|
|
x = PyLong_FromLong(SIGXCPU);
|
|
|
|
PyDict_SetItemString(d, "SIGXCPU", x);
|
|
|
|
Py_XDECREF(x);
|
1996-12-16 16:24:22 -04:00
|
|
|
#endif
|
|
|
|
#ifdef SIGXFSZ
|
2010-05-09 12:52:27 -03:00
|
|
|
x = PyLong_FromLong(SIGXFSZ);
|
|
|
|
PyDict_SetItemString(d, "SIGXFSZ", x);
|
|
|
|
Py_XDECREF(x);
|
2002-01-12 07:43:25 -04:00
|
|
|
#endif
|
2003-07-31 07:35:29 -03:00
|
|
|
#ifdef SIGRTMIN
|
2010-05-09 12:52:27 -03:00
|
|
|
x = PyLong_FromLong(SIGRTMIN);
|
|
|
|
PyDict_SetItemString(d, "SIGRTMIN", x);
|
|
|
|
Py_XDECREF(x);
|
2003-07-31 07:35:29 -03:00
|
|
|
#endif
|
|
|
|
#ifdef SIGRTMAX
|
2010-05-09 12:52:27 -03:00
|
|
|
x = PyLong_FromLong(SIGRTMAX);
|
|
|
|
PyDict_SetItemString(d, "SIGRTMAX", x);
|
|
|
|
Py_XDECREF(x);
|
2003-07-31 07:35:29 -03:00
|
|
|
#endif
|
2002-01-12 07:43:25 -04:00
|
|
|
#ifdef SIGINFO
|
2010-05-09 12:52:27 -03:00
|
|
|
x = PyLong_FromLong(SIGINFO);
|
|
|
|
PyDict_SetItemString(d, "SIGINFO", x);
|
|
|
|
Py_XDECREF(x);
|
1994-05-11 05:59:13 -03:00
|
|
|
#endif
|
2008-03-24 10:39:54 -03:00
|
|
|
|
|
|
|
#ifdef ITIMER_REAL
|
|
|
|
x = PyLong_FromLong(ITIMER_REAL);
|
|
|
|
PyDict_SetItemString(d, "ITIMER_REAL", x);
|
|
|
|
Py_DECREF(x);
|
|
|
|
#endif
|
|
|
|
#ifdef ITIMER_VIRTUAL
|
|
|
|
x = PyLong_FromLong(ITIMER_VIRTUAL);
|
|
|
|
PyDict_SetItemString(d, "ITIMER_VIRTUAL", x);
|
|
|
|
Py_DECREF(x);
|
|
|
|
#endif
|
|
|
|
#ifdef ITIMER_PROF
|
|
|
|
x = PyLong_FromLong(ITIMER_PROF);
|
|
|
|
PyDict_SetItemString(d, "ITIMER_PROF", x);
|
|
|
|
Py_DECREF(x);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if defined (HAVE_SETITIMER) || defined (HAVE_GETITIMER)
|
2010-05-09 12:52:27 -03:00
|
|
|
ItimerError = PyErr_NewException("signal.ItimerError",
|
|
|
|
PyExc_IOError, NULL);
|
2008-08-24 02:48:10 -03:00
|
|
|
if (ItimerError != NULL)
|
2010-05-09 12:52:27 -03:00
|
|
|
PyDict_SetItemString(d, "ItimerError", ItimerError);
|
2008-03-24 10:39:54 -03:00
|
|
|
#endif
|
|
|
|
|
2010-04-12 14:16:38 -03:00
|
|
|
#ifdef CTRL_C_EVENT
|
|
|
|
x = PyLong_FromLong(CTRL_C_EVENT);
|
|
|
|
PyDict_SetItemString(d, "CTRL_C_EVENT", x);
|
|
|
|
Py_DECREF(x);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef CTRL_BREAK_EVENT
|
|
|
|
x = PyLong_FromLong(CTRL_BREAK_EVENT);
|
|
|
|
PyDict_SetItemString(d, "CTRL_BREAK_EVENT", x);
|
|
|
|
Py_DECREF(x);
|
|
|
|
#endif
|
|
|
|
|
2011-11-21 16:26:56 -04:00
|
|
|
#ifdef MS_WINDOWS
|
|
|
|
/* Create manual-reset event, initially unset */
|
|
|
|
sigint_event = CreateEvent(NULL, TRUE, FALSE, FALSE);
|
|
|
|
#endif
|
|
|
|
|
2008-06-11 02:26:20 -03:00
|
|
|
if (PyErr_Occurred()) {
|
2010-05-09 12:52:27 -03:00
|
|
|
Py_DECREF(m);
|
|
|
|
m = NULL;
|
2008-06-11 02:26:20 -03:00
|
|
|
}
|
1997-01-02 20:14:25 -04:00
|
|
|
|
|
|
|
finally:
|
2008-06-11 02:26:20 -03:00
|
|
|
return m;
|
1997-08-02 00:01:42 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2000-07-21 03:00:07 -03:00
|
|
|
finisignal(void)
|
1997-08-02 00:01:42 -03:00
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
int i;
|
|
|
|
PyObject *func;
|
|
|
|
|
|
|
|
PyOS_setsig(SIGINT, old_siginthandler);
|
|
|
|
old_siginthandler = SIG_DFL;
|
|
|
|
|
|
|
|
for (i = 1; i < NSIG; i++) {
|
|
|
|
func = Handlers[i].func;
|
|
|
|
Handlers[i].tripped = 0;
|
|
|
|
Handlers[i].func = NULL;
|
|
|
|
if (i != SIGINT && func != NULL && func != Py_None &&
|
|
|
|
func != DefaultHandler && func != IgnoreHandler)
|
|
|
|
PyOS_setsig(i, SIG_DFL);
|
|
|
|
Py_XDECREF(func);
|
|
|
|
}
|
|
|
|
|
2014-02-09 07:33:53 -04:00
|
|
|
Py_CLEAR(IntHandler);
|
|
|
|
Py_CLEAR(DefaultHandler);
|
|
|
|
Py_CLEAR(IgnoreHandler);
|
1994-05-11 05:59:13 -03:00
|
|
|
}
|
|
|
|
|
1997-01-02 20:14:25 -04:00
|
|
|
|
|
|
|
/* Declared in pyerrors.h */
|
1994-05-11 05:59:13 -03:00
|
|
|
int
|
2000-07-21 03:00:07 -03:00
|
|
|
PyErr_CheckSignals(void)
|
1994-05-11 05:59:13 -03:00
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
int i;
|
|
|
|
PyObject *f;
|
1997-01-02 20:14:25 -04:00
|
|
|
|
2010-05-09 12:52:27 -03:00
|
|
|
if (!is_tripped)
|
|
|
|
return 0;
|
2007-12-10 21:06:40 -04:00
|
|
|
|
1994-06-23 08:25:45 -03:00
|
|
|
#ifdef WITH_THREAD
|
2010-05-09 12:52:27 -03:00
|
|
|
if (PyThread_get_thread_ident() != main_thread)
|
|
|
|
return 0;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The is_tripped variable is meant to speed up the calls to
|
|
|
|
* PyErr_CheckSignals (both directly or via pending calls) when no
|
|
|
|
* signal has arrived. This variable is set to 1 when a signal arrives
|
|
|
|
* and it is set to 0 here, when we know some signals arrived. This way
|
|
|
|
* we can run the registered handlers with no signals blocked.
|
|
|
|
*
|
|
|
|
* NOTE: with this approach we can have a situation where is_tripped is
|
|
|
|
* 1 but we have no more signals to handle (Handlers[i].tripped
|
|
|
|
* is 0 for every signal i). This won't do us any harm (except
|
|
|
|
* we're gonna spent some cycles for nothing). This happens when
|
|
|
|
* we receive a signal i after we zero is_tripped and before we
|
|
|
|
* check Handlers[i].tripped.
|
|
|
|
*/
|
|
|
|
is_tripped = 0;
|
|
|
|
|
|
|
|
if (!(f = (PyObject *)PyEval_GetFrame()))
|
|
|
|
f = Py_None;
|
|
|
|
|
|
|
|
for (i = 1; i < NSIG; i++) {
|
|
|
|
if (Handlers[i].tripped) {
|
|
|
|
PyObject *result = NULL;
|
|
|
|
PyObject *arglist = Py_BuildValue("(iO)", i, f);
|
|
|
|
Handlers[i].tripped = 0;
|
|
|
|
|
|
|
|
if (arglist) {
|
|
|
|
result = PyEval_CallObject(Handlers[i].func,
|
|
|
|
arglist);
|
|
|
|
Py_DECREF(arglist);
|
|
|
|
}
|
|
|
|
if (!result)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
Py_DECREF(result);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
1994-05-11 05:59:13 -03:00
|
|
|
}
|
|
|
|
|
2000-09-16 13:35:28 -03:00
|
|
|
|
1997-01-02 20:14:25 -04:00
|
|
|
/* Replacements for intrcheck.c functionality
|
|
|
|
* Declared in pyerrors.h
|
|
|
|
*/
|
|
|
|
void
|
2000-07-21 03:00:07 -03:00
|
|
|
PyErr_SetInterrupt(void)
|
1997-01-02 20:14:25 -04:00
|
|
|
{
|
2011-04-18 11:25:56 -03:00
|
|
|
trip_signal(SIGINT);
|
1997-01-02 20:14:25 -04:00
|
|
|
}
|
1994-05-11 05:59:13 -03:00
|
|
|
|
|
|
|
void
|
2000-07-21 03:00:07 -03:00
|
|
|
PyOS_InitInterrupts(void)
|
1994-05-11 05:59:13 -03:00
|
|
|
{
|
2014-04-04 10:34:17 -03:00
|
|
|
PyObject *m = PyImport_ImportModule("_signal");
|
2010-05-09 12:52:27 -03:00
|
|
|
if (m) {
|
|
|
|
Py_DECREF(m);
|
|
|
|
}
|
1997-08-02 00:01:42 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2000-07-21 03:00:07 -03:00
|
|
|
PyOS_FiniInterrupts(void)
|
1997-08-02 00:01:42 -03:00
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
finisignal();
|
1994-05-11 05:59:13 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2000-07-21 03:00:07 -03:00
|
|
|
PyOS_InterruptOccurred(void)
|
1994-05-11 05:59:13 -03:00
|
|
|
{
|
2010-05-09 12:52:27 -03:00
|
|
|
if (Handlers[SIGINT].tripped) {
|
1994-06-23 08:25:45 -03:00
|
|
|
#ifdef WITH_THREAD
|
2010-05-09 12:52:27 -03:00
|
|
|
if (PyThread_get_thread_ident() != main_thread)
|
|
|
|
return 0;
|
1994-06-23 08:25:45 -03:00
|
|
|
#endif
|
2010-05-09 12:52:27 -03:00
|
|
|
Handlers[SIGINT].tripped = 0;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
1994-05-11 05:59:13 -03:00
|
|
|
}
|
1997-11-14 18:24:28 -04:00
|
|
|
|
2012-11-11 00:33:07 -04:00
|
|
|
static void
|
|
|
|
_clear_pending_signals(void)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
if (!is_tripped)
|
|
|
|
return;
|
|
|
|
is_tripped = 0;
|
|
|
|
for (i = 1; i < NSIG; ++i) {
|
|
|
|
Handlers[i].tripped = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1997-11-14 18:24:28 -04:00
|
|
|
void
|
2000-07-21 03:00:07 -03:00
|
|
|
PyOS_AfterFork(void)
|
1997-11-14 18:24:28 -04:00
|
|
|
{
|
2012-11-11 00:33:07 -04:00
|
|
|
/* Clear the signal flags after forking so that they aren't handled
|
|
|
|
* in both processes if they came in just before the fork() but before
|
|
|
|
* the interpreter had an opportunity to call the handlers. issue9535. */
|
|
|
|
_clear_pending_signals();
|
1997-11-14 18:24:28 -04:00
|
|
|
#ifdef WITH_THREAD
|
2012-02-02 15:31:42 -04:00
|
|
|
/* PyThread_ReInitTLS() must be called early, to make sure that the TLS API
|
|
|
|
* can be called safely. */
|
|
|
|
PyThread_ReInitTLS();
|
2011-04-27 14:28:05 -03:00
|
|
|
_PyGILState_Reinit();
|
2010-05-09 12:52:27 -03:00
|
|
|
PyEval_ReInitThreads();
|
|
|
|
main_thread = PyThread_get_thread_ident();
|
|
|
|
main_pid = getpid();
|
|
|
|
_PyImport_ReInitLock();
|
1997-11-14 18:24:28 -04:00
|
|
|
#endif
|
|
|
|
}
|
2011-11-21 16:26:56 -04:00
|
|
|
|
|
|
|
int
|
|
|
|
_PyOS_IsMainThread(void)
|
|
|
|
{
|
|
|
|
#ifdef WITH_THREAD
|
|
|
|
return PyThread_get_thread_ident() == main_thread;
|
|
|
|
#else
|
|
|
|
return 1;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef MS_WINDOWS
|
|
|
|
void *_PyOS_SigintEvent(void)
|
|
|
|
{
|
|
|
|
/* Returns a manual-reset event which gets tripped whenever
|
|
|
|
SIGINT is received.
|
|
|
|
|
|
|
|
Python.h does not include windows.h so we do cannot use HANDLE
|
|
|
|
as the return type of this function. We use void* instead. */
|
|
|
|
return sigint_event;
|
|
|
|
}
|
|
|
|
#endif
|