cpython-lru_cache-weakref: Modules/selectmodule.c annotate

annotate Modules/selectmodule.c @ 82251:bb5a8564e186 2.7

Issue #13153: Tkinter functions now raise TclError instead of ValueError when a unicode argument contains non-BMP character.

author	Serhiy Storchaka <storchaka@gmail.com>
date	Mon, 18 Feb 2013 13:00:08 +0200
parents	1d33c79d2f6b
children	c6c2b216bd14

rev	line source
3675 d617de15774b Yet another pass at fd2obj -- this time for Windows Guido van Rossum <guido@python.org> parents: 2611 diff changeset	1 /* select - Module containing unix select(2) call.
4692 cb405b9696d4 Several changes... Guido please take a look! Barry Warsaw <barry@python.org> parents: 4621 diff changeset	2 Under Unix, the file descriptors are small integers.
cb405b9696d4 Several changes... Guido please take a look! Barry Warsaw <barry@python.org> parents: 4621 diff changeset	3 Under Win32, select only exists for sockets, and sockets may
cb405b9696d4 Several changes... Guido please take a look! Barry Warsaw <barry@python.org> parents: 4621 diff changeset	4 have any value except INVALID_SOCKET.
8823 f2a4a2b60860 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8616 diff changeset	5 Under BeOS, we suffer the same dichotomy as Win32; sockets can be anything
f2a4a2b60860 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8616 diff changeset	6 >= 0.
3675 d617de15774b Yet another pass at fd2obj -- this time for Windows Guido van Rossum <guido@python.org> parents: 2611 diff changeset	7 */
902 a4793ae26682 Changes for new UNIX-specific built-in module 'select' and new header for Guido van Rossum <guido@python.org> parents: diff changeset	8
4692 cb405b9696d4 Several changes... Guido please take a look! Barry Warsaw <barry@python.org> parents: 4621 diff changeset	9 #include "Python.h"
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	10 #include <structmember.h>
902 a4793ae26682 Changes for new UNIX-specific built-in module 'select' and new header for Guido van Rossum <guido@python.org> parents: diff changeset	11
37935 e3a8a8de355e Patch 1471761 - test for broken poll at runtime Ronald Oussoren <ronaldoussoren@mac.com> parents: 36501 diff changeset	12 #ifdef __APPLE__
e3a8a8de355e Patch 1471761 - test for broken poll at runtime Ronald Oussoren <ronaldoussoren@mac.com> parents: 36501 diff changeset	13 /* Perform runtime testing for a broken poll on OSX to make it easier
e3a8a8de355e Patch 1471761 - test for broken poll at runtime Ronald Oussoren <ronaldoussoren@mac.com> parents: 36501 diff changeset	14 * to use the same binary on multiple releases of the OS.
e3a8a8de355e Patch 1471761 - test for broken poll at runtime Ronald Oussoren <ronaldoussoren@mac.com> parents: 36501 diff changeset	15 */
e3a8a8de355e Patch 1471761 - test for broken poll at runtime Ronald Oussoren <ronaldoussoren@mac.com> parents: 36501 diff changeset	16 #undef HAVE_BROKEN_POLL
e3a8a8de355e Patch 1471761 - test for broken poll at runtime Ronald Oussoren <ronaldoussoren@mac.com> parents: 36501 diff changeset	17 #endif
e3a8a8de355e Patch 1471761 - test for broken poll at runtime Ronald Oussoren <ronaldoussoren@mac.com> parents: 36501 diff changeset	18
15512 e11c12323ebf SF bug 110843: Low FD_SETSIZE limit on Win32 (PR#41). Boosted to 512. Tim Peters <tim.peters@gmail.com> parents: 14918 diff changeset	19 /* Windows #defines FD_SETSIZE to 64 if FD_SETSIZE isn't already defined.
e11c12323ebf SF bug 110843: Low FD_SETSIZE limit on Win32 (PR#41). Boosted to 512. Tim Peters <tim.peters@gmail.com> parents: 14918 diff changeset	20 64 is too small (too many people have bumped into that limit).
e11c12323ebf SF bug 110843: Low FD_SETSIZE limit on Win32 (PR#41). Boosted to 512. Tim Peters <tim.peters@gmail.com> parents: 14918 diff changeset	21 Here we boost it.
e11c12323ebf SF bug 110843: Low FD_SETSIZE limit on Win32 (PR#41). Boosted to 512. Tim Peters <tim.peters@gmail.com> parents: 14918 diff changeset	22 Users who want even more than the boosted limit should #define
e11c12323ebf SF bug 110843: Low FD_SETSIZE limit on Win32 (PR#41). Boosted to 512. Tim Peters <tim.peters@gmail.com> parents: 14918 diff changeset	23 FD_SETSIZE higher before this; e.g., via compiler /D switch.
e11c12323ebf SF bug 110843: Low FD_SETSIZE limit on Win32 (PR#41). Boosted to 512. Tim Peters <tim.peters@gmail.com> parents: 14918 diff changeset	24 */
e11c12323ebf SF bug 110843: Low FD_SETSIZE limit on Win32 (PR#41). Boosted to 512. Tim Peters <tim.peters@gmail.com> parents: 14918 diff changeset	25 #if defined(MS_WINDOWS) && !defined(FD_SETSIZE)
e11c12323ebf SF bug 110843: Low FD_SETSIZE limit on Win32 (PR#41). Boosted to 512. Tim Peters <tim.peters@gmail.com> parents: 14918 diff changeset	26 #define FD_SETSIZE 512
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	27 #endif
15512 e11c12323ebf SF bug 110843: Low FD_SETSIZE limit on Win32 (PR#41). Boosted to 512. Tim Peters <tim.peters@gmail.com> parents: 14918 diff changeset	28
18603 b9d47d083d2c [Bug #438050] Andrew M. Kuchling <amk@amk.ca> parents: 17873 diff changeset	29 #if defined(HAVE_POLL_H)
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	30 #include <poll.h>
18603 b9d47d083d2c [Bug #438050] Andrew M. Kuchling <amk@amk.ca> parents: 17873 diff changeset	31 #elif defined(HAVE_SYS_POLL_H)
b9d47d083d2c [Bug #438050] Andrew M. Kuchling <amk@amk.ca> parents: 17873 diff changeset	32 #include <sys/poll.h>
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	33 #endif
4600 d36250aefb82 Keep gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	34
4621 a2f171ce25f8 Add ``extern void bzero();'' for SGI, to keep gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4600 diff changeset	35 #ifdef __sgi
a2f171ce25f8 Add ``extern void bzero();'' for SGI, to keep gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4600 diff changeset	36 /* This is missing from unistd.h */
13667 a6c7bfdd6777 Even more ANSIfication: fix as many function pointers and declarations as Thomas Wouters <thomas@python.org> parents: 13656 diff changeset	37 extern void bzero(void *, int);
4621 a2f171ce25f8 Add ``extern void bzero();'' for SGI, to keep gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4600 diff changeset	38 #endif
a2f171ce25f8 Add ``extern void bzero();'' for SGI, to keep gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4600 diff changeset	39
38716 42808526511c Patch #1495999: Part two of Windows CE changes. Martin v. Löwis <martin@v.loewis.de> parents: 38489 diff changeset	40 #ifdef HAVE_SYS_TYPES_H
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1392 diff changeset	41 #include <sys/types.h>
11243 6aac31cd2102 Patch by Mark Hammond to avoid certain header files on Windows/CE. Guido van Rossum <guido@python.org> parents: 9588 diff changeset	42 #endif
3675 d617de15774b Yet another pass at fd2obj -- this time for Windows Guido van Rossum <guido@python.org> parents: 2611 diff changeset	43
22114 c454b76d51e7 OS/2 EMX port changes (Modules part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21712 diff changeset	44 #if defined(PYOS_OS2) && !defined(PYCC_GCC)
6626 5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6367 diff changeset	45 #include <sys/time.h>
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6367 diff changeset	46 #include <utils.h>
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6367 diff changeset	47 #endif
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6367 diff changeset	48
3738 ce74bba8a6a6 Slightly different Windows ifdefs Guido van Rossum <guido@python.org> parents: 3675 diff changeset	49 #ifdef MS_WINDOWS
65911 b96edb02ef63 issue 10295 Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 65386 diff changeset	50 # include <winsock2.h>
3675 d617de15774b Yet another pass at fd2obj -- this time for Windows Guido van Rossum <guido@python.org> parents: 2611 diff changeset	51 #else
39043 c67b23397f30 Patch #1516912: improve Modules support for OpenVMS. Neal Norwitz <nnorwitz@gmail.com> parents: 38716 diff changeset	52 # define SOCKET int
c67b23397f30 Patch #1516912: improve Modules support for OpenVMS. Neal Norwitz <nnorwitz@gmail.com> parents: 38716 diff changeset	53 # ifdef __BEOS__
c67b23397f30 Patch #1516912: improve Modules support for OpenVMS. Neal Norwitz <nnorwitz@gmail.com> parents: 38716 diff changeset	54 # include <net/socket.h>
c67b23397f30 Patch #1516912: improve Modules support for OpenVMS. Neal Norwitz <nnorwitz@gmail.com> parents: 38716 diff changeset	55 # elif defined(__VMS)
c67b23397f30 Patch #1516912: improve Modules support for OpenVMS. Neal Norwitz <nnorwitz@gmail.com> parents: 38716 diff changeset	56 # include <socket.h>
c67b23397f30 Patch #1516912: improve Modules support for OpenVMS. Neal Norwitz <nnorwitz@gmail.com> parents: 38716 diff changeset	57 # endif
8823 f2a4a2b60860 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8616 diff changeset	58 #endif
902 a4793ae26682 Changes for new UNIX-specific built-in module 'select' and new header for Guido van Rossum <guido@python.org> parents: diff changeset	59
4692 cb405b9696d4 Several changes... Guido please take a look! Barry Warsaw <barry@python.org> parents: 4621 diff changeset	60 static PyObject *SelectError;
902 a4793ae26682 Changes for new UNIX-specific built-in module 'select' and new header for Guido van Rossum <guido@python.org> parents: diff changeset	61
4700 825038d98ab6 Reworked to eliminate all potential memory problems, including Barry Warsaw <barry@python.org> parents: 4692 diff changeset	62 /* list of Python objects and their file descriptor */
825038d98ab6 Reworked to eliminate all potential memory problems, including Barry Warsaw <barry@python.org> parents: 4692 diff changeset	63 typedef struct {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	64 PyObject obj; / owned reference */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	65 SOCKET fd;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	66 int sentinel; /* -1 == sentinel */
3675 d617de15774b Yet another pass at fd2obj -- this time for Windows Guido van Rossum <guido@python.org> parents: 2611 diff changeset	67 } pylist;
d617de15774b Yet another pass at fd2obj -- this time for Windows Guido van Rossum <guido@python.org> parents: 2611 diff changeset	68
4700 825038d98ab6 Reworked to eliminate all potential memory problems, including Barry Warsaw <barry@python.org> parents: 4692 diff changeset	69 static void
19328 b41638a11e4e Stop adding 3 to FD_SETSIZE -- it makes no sense. If it turns out it Tim Peters <tim.peters@gmail.com> parents: 19311 diff changeset	70 reap_obj(pylist fd2obj[FD_SETSIZE + 1])
4700 825038d98ab6 Reworked to eliminate all potential memory problems, including Barry Warsaw <barry@python.org> parents: 4692 diff changeset	71 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	72 int i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	73 for (i = 0; i < FD_SETSIZE + 1 && fd2obj[i].sentinel >= 0; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	74 Py_XDECREF(fd2obj[i].obj);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	75 fd2obj[i].obj = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	76 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	77 fd2obj[0].sentinel = -1;
4700 825038d98ab6 Reworked to eliminate all potential memory problems, including Barry Warsaw <barry@python.org> parents: 4692 diff changeset	78 }
825038d98ab6 Reworked to eliminate all potential memory problems, including Barry Warsaw <barry@python.org> parents: 4692 diff changeset	79
825038d98ab6 Reworked to eliminate all potential memory problems, including Barry Warsaw <barry@python.org> parents: 4692 diff changeset	80
4692 cb405b9696d4 Several changes... Guido please take a look! Barry Warsaw <barry@python.org> parents: 4621 diff changeset	81 /* returns -1 and sets the Python exception if an error occurred, otherwise
cb405b9696d4 Several changes... Guido please take a look! Barry Warsaw <barry@python.org> parents: 4621 diff changeset	82 returns a number >= 0
cb405b9696d4 Several changes... Guido please take a look! Barry Warsaw <barry@python.org> parents: 4621 diff changeset	83 */
3675 d617de15774b Yet another pass at fd2obj -- this time for Windows Guido van Rossum <guido@python.org> parents: 2611 diff changeset	84 static int
30402 a430be683a7a select.select() now accepts a sequence (as defined by PySequence_Fast()) for Brett Cannon <bcannon@gmail.com> parents: 27815 diff changeset	85 seq2set(PyObject seq, fd_set set, pylist fd2obj[FD_SETSIZE + 1])
902 a4793ae26682 Changes for new UNIX-specific built-in module 'select' and new header for Guido van Rossum <guido@python.org> parents: diff changeset	86 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	87 int i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	88 int max = -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	89 int index = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	90 PyObject* fast_seq = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	91 PyObject* o = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	92
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	93 fd2obj[0].obj = (PyObject)0; / set list to zero size */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	94 FD_ZERO(set);
4700 825038d98ab6 Reworked to eliminate all potential memory problems, including Barry Warsaw <barry@python.org> parents: 4692 diff changeset	95
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60612 diff changeset	96 fast_seq = PySequence_Fast(seq, "arguments 1-3 must be sequences");
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	97 if (!fast_seq)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	98 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	99
80164 02a5322b0cee Issue #16230: Fix a crash in select.select() when one the lists changes size while iterated on. Antoine Pitrou <solipsis@pitrou.net> parents: 72113 diff changeset	100 for (i = 0; i < PySequence_Fast_GET_SIZE(fast_seq); i++) {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	101 SOCKET v;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	102
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	103 /* any intervening fileno() calls could decr this refcnt */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	104 if (!(o = PySequence_Fast_GET_ITEM(fast_seq, i)))
30402 a430be683a7a select.select() now accepts a sequence (as defined by PySequence_Fast()) for Brett Cannon <bcannon@gmail.com> parents: 27815 diff changeset	105 return -1;
a430be683a7a select.select() now accepts a sequence (as defined by PySequence_Fast()) for Brett Cannon <bcannon@gmail.com> parents: 27815 diff changeset	106
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	107 Py_INCREF(o);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	108 v = PyObject_AsFileDescriptor( o );
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	109 if (v == -1) goto finally;
4700 825038d98ab6 Reworked to eliminate all potential memory problems, including Barry Warsaw <barry@python.org> parents: 4692 diff changeset	110
11656 db756d31e727 According to Ron Bickers, and with apparent approval of Chris Guido van Rossum <guido@python.org> parents: 11243 diff changeset	111 #if defined(_MSC_VER)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	112 max = 0; /* not used for Win32 */
4700 825038d98ab6 Reworked to eliminate all potential memory problems, including Barry Warsaw <barry@python.org> parents: 4692 diff changeset	113 #else /* !_MSC_VER */
72113 ff6adb867f40 Issue #12287: Fix a stack corruption in ossaudiodev module when the FD is Charles-François Natali <neologix@free.fr> parents: 71003 diff changeset	114 if (!_PyIsSelectable_fd(v)) {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	115 PyErr_SetString(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	116 "filedescriptor out of range in select()");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	117 goto finally;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	118 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	119 if (v > max)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	120 max = v;
4700 825038d98ab6 Reworked to eliminate all potential memory problems, including Barry Warsaw <barry@python.org> parents: 4692 diff changeset	121 #endif /* _MSC_VER */
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	122 FD_SET(v, set);
4700 825038d98ab6 Reworked to eliminate all potential memory problems, including Barry Warsaw <barry@python.org> parents: 4692 diff changeset	123
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	124 /* add object and its file descriptor to the list */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	125 if (index >= FD_SETSIZE) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	126 PyErr_SetString(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	127 "too many file descriptors in select()");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	128 goto finally;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	129 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	130 fd2obj[index].obj = o;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	131 fd2obj[index].fd = v;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	132 fd2obj[index].sentinel = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	133 fd2obj[++index].sentinel = -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	134 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	135 Py_DECREF(fast_seq);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	136 return max+1;
4700 825038d98ab6 Reworked to eliminate all potential memory problems, including Barry Warsaw <barry@python.org> parents: 4692 diff changeset	137
825038d98ab6 Reworked to eliminate all potential memory problems, including Barry Warsaw <barry@python.org> parents: 4692 diff changeset	138 finally:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	139 Py_XDECREF(o);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	140 Py_DECREF(fast_seq);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	141 return -1;
902 a4793ae26682 Changes for new UNIX-specific built-in module 'select' and new header for Guido van Rossum <guido@python.org> parents: diff changeset	142 }
a4793ae26682 Changes for new UNIX-specific built-in module 'select' and new header for Guido van Rossum <guido@python.org> parents: diff changeset	143
4692 cb405b9696d4 Several changes... Guido please take a look! Barry Warsaw <barry@python.org> parents: 4621 diff changeset	144 /* returns NULL and sets the Python exception if an error occurred */
cb405b9696d4 Several changes... Guido please take a look! Barry Warsaw <barry@python.org> parents: 4621 diff changeset	145 static PyObject *
19328 b41638a11e4e Stop adding 3 to FD_SETSIZE -- it makes no sense. If it turns out it Tim Peters <tim.peters@gmail.com> parents: 19311 diff changeset	146 set2list(fd_set *set, pylist fd2obj[FD_SETSIZE + 1])
902 a4793ae26682 Changes for new UNIX-specific built-in module 'select' and new header for Guido van Rossum <guido@python.org> parents: diff changeset	147 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	148 int i, j, count=0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	149 PyObject list, o;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	150 SOCKET fd;
4692 cb405b9696d4 Several changes... Guido please take a look! Barry Warsaw <barry@python.org> parents: 4621 diff changeset	151
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	152 for (j = 0; fd2obj[j].sentinel >= 0; j++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	153 if (FD_ISSET(fd2obj[j].fd, set))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	154 count++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	155 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	156 list = PyList_New(count);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	157 if (!list)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	158 return NULL;
902 a4793ae26682 Changes for new UNIX-specific built-in module 'select' and new header for Guido van Rossum <guido@python.org> parents: diff changeset	159
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	160 i = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	161 for (j = 0; fd2obj[j].sentinel >= 0; j++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	162 fd = fd2obj[j].fd;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	163 if (FD_ISSET(fd, set)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	164 o = fd2obj[j].obj;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	165 fd2obj[j].obj = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	166 /* transfer ownership */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	167 if (PyList_SetItem(list, i, o) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	168 goto finally;
4700 825038d98ab6 Reworked to eliminate all potential memory problems, including Barry Warsaw <barry@python.org> parents: 4692 diff changeset	169
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	170 i++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	171 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	172 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	173 return list;
4700 825038d98ab6 Reworked to eliminate all potential memory problems, including Barry Warsaw <barry@python.org> parents: 4692 diff changeset	174 finally:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	175 Py_DECREF(list);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	176 return NULL;
902 a4793ae26682 Changes for new UNIX-specific built-in module 'select' and new header for Guido van Rossum <guido@python.org> parents: diff changeset	177 }
4700 825038d98ab6 Reworked to eliminate all potential memory problems, including Barry Warsaw <barry@python.org> parents: 4692 diff changeset	178
19310 6cb9f538dce4 select_select(): Closing bug #448351 the easy way, i.e. by changing Barry Warsaw <barry@python.org> parents: 18754 diff changeset	179 #undef SELECT_USES_HEAP
6cb9f538dce4 select_select(): Closing bug #448351 the easy way, i.e. by changing Barry Warsaw <barry@python.org> parents: 18754 diff changeset	180 #if FD_SETSIZE > 1024
6cb9f538dce4 select_select(): Closing bug #448351 the easy way, i.e. by changing Barry Warsaw <barry@python.org> parents: 18754 diff changeset	181 #define SELECT_USES_HEAP
6cb9f538dce4 select_select(): Closing bug #448351 the easy way, i.e. by changing Barry Warsaw <barry@python.org> parents: 18754 diff changeset	182 #endif /* FD_SETSIZE > 1024 */
6cb9f538dce4 select_select(): Closing bug #448351 the easy way, i.e. by changing Barry Warsaw <barry@python.org> parents: 18754 diff changeset	183
4692 cb405b9696d4 Several changes... Guido please take a look! Barry Warsaw <barry@python.org> parents: 4621 diff changeset	184 static PyObject *
13502 7348cceee8fa ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13256 diff changeset	185 select_select(PyObject self, PyObject args)
902 a4793ae26682 Changes for new UNIX-specific built-in module 'select' and new header for Guido van Rossum <guido@python.org> parents: diff changeset	186 {
19310 6cb9f538dce4 select_select(): Closing bug #448351 the easy way, i.e. by changing Barry Warsaw <barry@python.org> parents: 18754 diff changeset	187 #ifdef SELECT_USES_HEAP
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	188 pylist rfd2obj, wfd2obj, *efd2obj;
19310 6cb9f538dce4 select_select(): Closing bug #448351 the easy way, i.e. by changing Barry Warsaw <barry@python.org> parents: 18754 diff changeset	189 #else /* !SELECT_USES_HEAP */
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	190 /* XXX: All this should probably be implemented as follows:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	191 * - find the highest descriptor we're interested in
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	192 * - add one
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	193 * - that's the size
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	194 * See: Stevens, APitUE, $12.5.1
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	195 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	196 pylist rfd2obj[FD_SETSIZE + 1];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	197 pylist wfd2obj[FD_SETSIZE + 1];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	198 pylist efd2obj[FD_SETSIZE + 1];
19310 6cb9f538dce4 select_select(): Closing bug #448351 the easy way, i.e. by changing Barry Warsaw <barry@python.org> parents: 18754 diff changeset	199 #endif /* SELECT_USES_HEAP */
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	200 PyObject ifdlist, ofdlist, *efdlist;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	201 PyObject *ret = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	202 PyObject *tout = Py_None;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	203 fd_set ifdset, ofdset, efdset;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	204 double timeout;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	205 struct timeval tv, *tvp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	206 long seconds;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	207 int imax, omax, emax, max;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	208 int n;
902 a4793ae26682 Changes for new UNIX-specific built-in module 'select' and new header for Guido van Rossum <guido@python.org> parents: diff changeset	209
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	210 /* convert arguments */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	211 if (!PyArg_UnpackTuple(args, "select", 3, 4,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	212 &ifdlist, &ofdlist, &efdlist, &tout))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	213 return NULL;
902 a4793ae26682 Changes for new UNIX-specific built-in module 'select' and new header for Guido van Rossum <guido@python.org> parents: diff changeset	214
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	215 if (tout == Py_None)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	216 tvp = (struct timeval *)0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	217 else if (!PyNumber_Check(tout)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	218 PyErr_SetString(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	219 "timeout must be a float or None");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	220 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	221 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	222 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	223 timeout = PyFloat_AsDouble(tout);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	224 if (timeout == -1 && PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	225 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	226 if (timeout > (double)LONG_MAX) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	227 PyErr_SetString(PyExc_OverflowError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	228 "timeout period too long");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	229 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	230 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	231 seconds = (long)timeout;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	232 timeout = timeout - (double)seconds;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	233 tv.tv_sec = seconds;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	234 tv.tv_usec = (long)(timeout * 1E6);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	235 tvp = &tv;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	236 }
4692 cb405b9696d4 Several changes... Guido please take a look! Barry Warsaw <barry@python.org> parents: 4621 diff changeset	237
902 a4793ae26682 Changes for new UNIX-specific built-in module 'select' and new header for Guido van Rossum <guido@python.org> parents: diff changeset	238
19310 6cb9f538dce4 select_select(): Closing bug #448351 the easy way, i.e. by changing Barry Warsaw <barry@python.org> parents: 18754 diff changeset	239 #ifdef SELECT_USES_HEAP
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	240 /* Allocate memory for the lists */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	241 rfd2obj = PyMem_NEW(pylist, FD_SETSIZE + 1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	242 wfd2obj = PyMem_NEW(pylist, FD_SETSIZE + 1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	243 efd2obj = PyMem_NEW(pylist, FD_SETSIZE + 1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	244 if (rfd2obj == NULL \|\| wfd2obj == NULL \|\| efd2obj == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	245 if (rfd2obj) PyMem_DEL(rfd2obj);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	246 if (wfd2obj) PyMem_DEL(wfd2obj);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	247 if (efd2obj) PyMem_DEL(efd2obj);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	248 return PyErr_NoMemory();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	249 }
19310 6cb9f538dce4 select_select(): Closing bug #448351 the easy way, i.e. by changing Barry Warsaw <barry@python.org> parents: 18754 diff changeset	250 #endif /* SELECT_USES_HEAP */
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	251 /* Convert sequences to fd_sets, and get maximum fd number
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	252 * propagates the Python exception set in seq2set()
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	253 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	254 rfd2obj[0].sentinel = -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	255 wfd2obj[0].sentinel = -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	256 efd2obj[0].sentinel = -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	257 if ((imax=seq2set(ifdlist, &ifdset, rfd2obj)) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	258 goto finally;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	259 if ((omax=seq2set(ofdlist, &ofdset, wfd2obj)) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	260 goto finally;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	261 if ((emax=seq2set(efdlist, &efdset, efd2obj)) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	262 goto finally;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	263 max = imax;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	264 if (omax > max) max = omax;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	265 if (emax > max) max = emax;
4692 cb405b9696d4 Several changes... Guido please take a look! Barry Warsaw <barry@python.org> parents: 4621 diff changeset	266
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	267 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	268 n = select(max, &ifdset, &ofdset, &efdset, tvp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	269 Py_END_ALLOW_THREADS
4692 cb405b9696d4 Several changes... Guido please take a look! Barry Warsaw <barry@python.org> parents: 4621 diff changeset	270
25399 97424b99df91 On Windows, call WSAGetLastError() to retrieve the error number. Thomas Heller <theller@ctypes.org> parents: 24408 diff changeset	271 #ifdef MS_WINDOWS
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	272 if (n == SOCKET_ERROR) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	273 PyErr_SetExcFromWindowsErr(SelectError, WSAGetLastError());
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	274 }
25399 97424b99df91 On Windows, call WSAGetLastError() to retrieve the error number. Thomas Heller <theller@ctypes.org> parents: 24408 diff changeset	275 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	276 if (n < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	277 PyErr_SetFromErrno(SelectError);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	278 }
25399 97424b99df91 On Windows, call WSAGetLastError() to retrieve the error number. Thomas Heller <theller@ctypes.org> parents: 24408 diff changeset	279 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	280 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	281 /* any of these three calls can raise an exception. it's more
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	282 convenient to test for this after all three calls... but
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	283 is that acceptable?
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	284 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	285 ifdlist = set2list(&ifdset, rfd2obj);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	286 ofdlist = set2list(&ofdset, wfd2obj);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	287 efdlist = set2list(&efdset, efd2obj);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	288 if (PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	289 ret = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	290 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	291 ret = PyTuple_Pack(3, ifdlist, ofdlist, efdlist);
902 a4793ae26682 Changes for new UNIX-specific built-in module 'select' and new header for Guido van Rossum <guido@python.org> parents: diff changeset	292
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	293 Py_DECREF(ifdlist);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	294 Py_DECREF(ofdlist);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	295 Py_DECREF(efdlist);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	296 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	297
4700 825038d98ab6 Reworked to eliminate all potential memory problems, including Barry Warsaw <barry@python.org> parents: 4692 diff changeset	298 finally:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	299 reap_obj(rfd2obj);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	300 reap_obj(wfd2obj);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	301 reap_obj(efd2obj);
19310 6cb9f538dce4 select_select(): Closing bug #448351 the easy way, i.e. by changing Barry Warsaw <barry@python.org> parents: 18754 diff changeset	302 #ifdef SELECT_USES_HEAP
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	303 PyMem_DEL(rfd2obj);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	304 PyMem_DEL(wfd2obj);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	305 PyMem_DEL(efd2obj);
19310 6cb9f538dce4 select_select(): Closing bug #448351 the easy way, i.e. by changing Barry Warsaw <barry@python.org> parents: 18754 diff changeset	306 #endif /* SELECT_USES_HEAP */
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	307 return ret;
902 a4793ae26682 Changes for new UNIX-specific built-in module 'select' and new header for Guido van Rossum <guido@python.org> parents: diff changeset	308 }
a4793ae26682 Changes for new UNIX-specific built-in module 'select' and new header for Guido van Rossum <guido@python.org> parents: diff changeset	309
31761 f4a4ac7331ec Added configure check for broken poll() on some unix systems (MacOS X 10.3) Nicholas Bastin <nick.bastin@gmail.com> parents: 30683 diff changeset	310 #if defined(HAVE_POLL) && !defined(HAVE_BROKEN_POLL)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	311 /*
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	312 * poll() support
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	313 */
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	314
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	315 typedef struct {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	316 PyObject_HEAD
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	317 PyObject *dict;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	318 int ufd_uptodate;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	319 int ufd_len;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	320 struct pollfd *ufds;
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	321 } pollObject;
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	322
24280 1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 23832 diff changeset	323 static PyTypeObject poll_Type;
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	324
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	325 /* Update the malloc'ed array of pollfds to match the dictionary
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	326 contained within a pollObject. Return 1 on success, 0 on an error.
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	327 */
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	328
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	329 static int
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	330 update_ufd_array(pollObject *self)
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	331 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	332 Py_ssize_t i, pos;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	333 PyObject key, value;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	334 struct pollfd *old_ufds = self->ufds;
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	335
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	336 self->ufd_len = PyDict_Size(self->dict);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	337 PyMem_RESIZE(self->ufds, struct pollfd, self->ufd_len);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	338 if (self->ufds == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	339 self->ufds = old_ufds;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	340 PyErr_NoMemory();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	341 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	342 }
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	343
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	344 i = pos = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	345 while (PyDict_Next(self->dict, &pos, &key, &value)) {
81590 d544873d62e9 Issue #15989: Fix several occurrences of integer overflow Serhiy Storchaka <storchaka@gmail.com> parents: 80164 diff changeset	346 assert(i < self->ufd_len);
d544873d62e9 Issue #15989: Fix several occurrences of integer overflow Serhiy Storchaka <storchaka@gmail.com> parents: 80164 diff changeset	347 /* Never overflow */
d544873d62e9 Issue #15989: Fix several occurrences of integer overflow Serhiy Storchaka <storchaka@gmail.com> parents: 80164 diff changeset	348 self->ufds[i].fd = (int)PyInt_AsLong(key);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	349 self->ufds[i].events = (short)PyInt_AsLong(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	350 i++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	351 }
81590 d544873d62e9 Issue #15989: Fix several occurrences of integer overflow Serhiy Storchaka <storchaka@gmail.com> parents: 80164 diff changeset	352 assert(i == self->ufd_len);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	353 self->ufd_uptodate = 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	354 return 1;
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	355 }
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	356
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23607 diff changeset	357 PyDoc_STRVAR(poll_register_doc,
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	358 "register(fd [, eventmask] ) -> None\n\n\
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	359 Register a file descriptor with the polling object.\n\
19311 fc7617312182 Fixed a couple of minor formatting nits where lines were > 79 columns wide. Barry Warsaw <barry@python.org> parents: 19310 diff changeset	360 fd -- either an integer, or an object with a fileno() method returning an\n\
fc7617312182 Fixed a couple of minor formatting nits where lines were > 79 columns wide. Barry Warsaw <barry@python.org> parents: 19310 diff changeset	361 int.\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23607 diff changeset	362 events -- an optional bitmask describing the type of events to check for");
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	363
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	364 static PyObject *
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	365 poll_register(pollObject self, PyObject args)
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	366 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	367 PyObject o, key, *value;
81590 d544873d62e9 Issue #15989: Fix several occurrences of integer overflow Serhiy Storchaka <storchaka@gmail.com> parents: 80164 diff changeset	368 int fd;
d544873d62e9 Issue #15989: Fix several occurrences of integer overflow Serhiy Storchaka <storchaka@gmail.com> parents: 80164 diff changeset	369 short events = POLLIN \| POLLPRI \| POLLOUT;
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	370 int err;
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	371
81590 d544873d62e9 Issue #15989: Fix several occurrences of integer overflow Serhiy Storchaka <storchaka@gmail.com> parents: 80164 diff changeset	372 if (!PyArg_ParseTuple(args, "O\|h:register", &o, &events)) {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	373 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	374 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	375
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	376 fd = PyObject_AsFileDescriptor(o);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	377 if (fd == -1) return NULL;
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	378
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	379 /* Add entry to the internal dictionary: the key is the
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	380 file descriptor, and the value is the event mask. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	381 key = PyInt_FromLong(fd);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	382 if (key == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	383 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	384 value = PyInt_FromLong(events);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	385 if (value == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	386 Py_DECREF(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	387 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	388 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	389 err = PyDict_SetItem(self->dict, key, value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	390 Py_DECREF(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	391 Py_DECREF(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	392 if (err < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	393 return NULL;
20668 3e9b85de447b Fix SF bug #474538: Memory (reference) leak in poller.register (Dave Brueck) Guido van Rossum <guido@python.org> parents: 20654 diff changeset	394
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	395 self->ufd_uptodate = 0;
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	396
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	397 Py_INCREF(Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	398 return Py_None;
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	399 }
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	400
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	401 PyDoc_STRVAR(poll_modify_doc,
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	402 "modify(fd, eventmask) -> None\n\n\
46094 b51e4b50ed30 Minor docstring typos Andrew M. Kuchling <amk@amk.ca> parents: 45991 diff changeset	403 Modify an already registered file descriptor.\n\
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	404 fd -- either an integer, or an object with a fileno() method returning an\n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	405 int.\n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	406 events -- an optional bitmask describing the type of events to check for");
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	407
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	408 static PyObject *
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	409 poll_modify(pollObject self, PyObject args)
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	410 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	411 PyObject o, key, *value;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	412 int fd, events;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	413 int err;
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	414
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	415 if (!PyArg_ParseTuple(args, "Oi:modify", &o, &events)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	416 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	417 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	418
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	419 fd = PyObject_AsFileDescriptor(o);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	420 if (fd == -1) return NULL;
20668 3e9b85de447b Fix SF bug #474538: Memory (reference) leak in poller.register (Dave Brueck) Guido van Rossum <guido@python.org> parents: 20654 diff changeset	421
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	422 /* Modify registered fd */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	423 key = PyInt_FromLong(fd);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	424 if (key == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	425 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	426 if (PyDict_GetItem(self->dict, key) == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	427 errno = ENOENT;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	428 PyErr_SetFromErrno(PyExc_IOError);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	429 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	430 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	431 value = PyInt_FromLong(events);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	432 if (value == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	433 Py_DECREF(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	434 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	435 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	436 err = PyDict_SetItem(self->dict, key, value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	437 Py_DECREF(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	438 Py_DECREF(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	439 if (err < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	440 return NULL;
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	441
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	442 self->ufd_uptodate = 0;
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	443
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	444 Py_INCREF(Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	445 return Py_None;
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	446 }
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	447
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	448
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23607 diff changeset	449 PyDoc_STRVAR(poll_unregister_doc,
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	450 "unregister(fd) -> None\n\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23607 diff changeset	451 Remove a file descriptor being tracked by the polling object.");
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	452
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	453 static PyObject *
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	454 poll_unregister(pollObject self, PyObject o)
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	455 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	456 PyObject *key;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	457 int fd;
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	458
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	459 fd = PyObject_AsFileDescriptor( o );
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	460 if (fd == -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	461 return NULL;
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	462
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	463 /* Check whether the fd is already in the array */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	464 key = PyInt_FromLong(fd);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	465 if (key == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	466 return NULL;
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	467
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	468 if (PyDict_DelItem(self->dict, key) == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	469 Py_DECREF(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	470 /* This will simply raise the KeyError set by PyDict_DelItem
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	471 if the file descriptor isn't registered. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	472 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	473 }
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	474
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	475 Py_DECREF(key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	476 self->ufd_uptodate = 0;
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	477
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	478 Py_INCREF(Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	479 return Py_None;
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	480 }
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	481
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23607 diff changeset	482 PyDoc_STRVAR(poll_poll_doc,
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	483 "poll( [timeout] ) -> list of (fd, event) 2-tuples\n\n\
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	484 Polls the set of registered file descriptors, returning a list containing \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23607 diff changeset	485 any descriptors that have events or errors to report.");
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	486
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	487 static PyObject *
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	488 poll_poll(pollObject self, PyObject args)
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	489 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	490 PyObject result_list = NULL, tout = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	491 int timeout = 0, poll_result, i, j;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	492 PyObject value = NULL, num = NULL;
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	493
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	494 if (!PyArg_UnpackTuple(args, "poll", 0, 1, &tout)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	495 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	496 }
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	497
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	498 /* Check values for timeout */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	499 if (tout == NULL \|\| tout == Py_None)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	500 timeout = -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	501 else if (!PyNumber_Check(tout)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	502 PyErr_SetString(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	503 "timeout must be an integer or None");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	504 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	505 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	506 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	507 tout = PyNumber_Int(tout);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	508 if (!tout)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	509 return NULL;
81590 d544873d62e9 Issue #15989: Fix several occurrences of integer overflow Serhiy Storchaka <storchaka@gmail.com> parents: 80164 diff changeset	510 timeout = _PyInt_AsInt(tout);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	511 Py_DECREF(tout);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	512 if (timeout == -1 && PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	513 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	514 }
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	515
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	516 /* Ensure the ufd array is up to date */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	517 if (!self->ufd_uptodate)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	518 if (update_ufd_array(self) == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	519 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	520
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	521 /* call poll() */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	522 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	523 poll_result = poll(self->ufds, self->ufd_len, timeout);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	524 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	525
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	526 if (poll_result < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	527 PyErr_SetFromErrno(SelectError);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	528 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	529 }
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	530
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	531 /* build the result list */
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	532
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	533 result_list = PyList_New(poll_result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	534 if (!result_list)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	535 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	536 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	537 for (i = 0, j = 0; j < poll_result; j++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	538 /* skip to the next fired descriptor */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	539 while (!self->ufds[i].revents) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	540 i++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	541 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	542 /* if we hit a NULL return, set value to NULL
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	543 and break out of loop; code at end will
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	544 clean up result_list */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	545 value = PyTuple_New(2);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	546 if (value == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	547 goto error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	548 num = PyInt_FromLong(self->ufds[i].fd);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	549 if (num == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	550 Py_DECREF(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	551 goto error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	552 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	553 PyTuple_SET_ITEM(value, 0, num);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	554
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	555 /* The &0xffff is a workaround for AIX. 'revents'
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	556 is a 16-bit short, and IBM assigned POLLNVAL
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	557 to be 0x8000, so the conversion to int results
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	558 in a negative number. See SF bug #923315. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	559 num = PyInt_FromLong(self->ufds[i].revents & 0xffff);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	560 if (num == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	561 Py_DECREF(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	562 goto error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	563 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	564 PyTuple_SET_ITEM(value, 1, num);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	565 if ((PyList_SetItem(result_list, j, value)) == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	566 Py_DECREF(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	567 goto error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	568 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	569 i++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	570 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	571 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	572 return result_list;
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	573
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	574 error:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	575 Py_DECREF(result_list);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	576 return NULL;
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	577 }
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	578
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	579 static PyMethodDef poll_methods[] = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	580 {"register", (PyCFunction)poll_register,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	581 METH_VARARGS, poll_register_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	582 {"modify", (PyCFunction)poll_modify,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	583 METH_VARARGS, poll_modify_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	584 {"unregister", (PyCFunction)poll_unregister,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	585 METH_O, poll_unregister_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	586 {"poll", (PyCFunction)poll_poll,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	587 METH_VARARGS, poll_poll_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	588 {NULL, NULL} /* sentinel */
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	589 };
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	590
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	591 static pollObject *
14277 984abd20eec2 Peter Schneider-Kamp <nowonder@nowonder.de>: Fred Drake <fdrake@acm.org> parents: 14182 diff changeset	592 newPollObject(void)
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	593 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	594 pollObject *self;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	595 self = PyObject_New(pollObject, &poll_Type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	596 if (self == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	597 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	598 /* ufd_uptodate is a Boolean, denoting whether the
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	599 array pointed to by ufds matches the contents of the dictionary. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	600 self->ufd_uptodate = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	601 self->ufds = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	602 self->dict = PyDict_New();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	603 if (self->dict == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	604 Py_DECREF(self);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	605 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	606 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	607 return self;
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	608 }
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	609
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	610 static void
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	611 poll_dealloc(pollObject *self)
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	612 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	613 if (self->ufds != NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	614 PyMem_DEL(self->ufds);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	615 Py_XDECREF(self->dict);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	616 PyObject_Del(self);
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	617 }
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	618
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	619 static PyObject *
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	620 poll_getattr(pollObject self, char name)
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	621 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	622 return Py_FindMethod(poll_methods, (PyObject *)self, name);
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	623 }
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	624
24283 c0a67a1cab09 Removed more stray instances of statichere, but left _sre.c alone. Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	625 static PyTypeObject poll_Type = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	626 /* The ob_type field must be initialized in the module init function
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	627 * to be portable to Windows without using C++. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	628 PyVarObject_HEAD_INIT(NULL, 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	629 "select.poll", /tp_name/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	630 sizeof(pollObject), /tp_basicsize/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	631 0, /tp_itemsize/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	632 /* methods */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	633 (destructor)poll_dealloc, /tp_dealloc/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	634 0, /tp_print/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	635 (getattrfunc)poll_getattr, /tp_getattr/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	636 0, /tp_setattr/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	637 0, /tp_compare/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	638 0, /tp_repr/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	639 0, /tp_as_number/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	640 0, /tp_as_sequence/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	641 0, /tp_as_mapping/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	642 0, /tp_hash/
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	643 };
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	644
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23607 diff changeset	645 PyDoc_STRVAR(poll_doc,
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	646 "Returns a polling object, which supports registering and\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23607 diff changeset	647 unregistering file descriptors, and then polling them for I/O events.");
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	648
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	649 static PyObject *
38489 3fe3ccdf0155 Make use of METH_O and METH_NOARGS where possible. Georg Brandl <georg@python.org> parents: 37935 diff changeset	650 select_poll(PyObject self, PyObject unused)
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	651 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	652 return (PyObject *)newPollObject();
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	653 }
37935 e3a8a8de355e Patch 1471761 - test for broken poll at runtime Ronald Oussoren <ronaldoussoren@mac.com> parents: 36501 diff changeset	654
e3a8a8de355e Patch 1471761 - test for broken poll at runtime Ronald Oussoren <ronaldoussoren@mac.com> parents: 36501 diff changeset	655 #ifdef __APPLE__
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	656 /*
37935 e3a8a8de355e Patch 1471761 - test for broken poll at runtime Ronald Oussoren <ronaldoussoren@mac.com> parents: 36501 diff changeset	657 * On some systems poll() sets errno on invalid file descriptors. We test
e3a8a8de355e Patch 1471761 - test for broken poll at runtime Ronald Oussoren <ronaldoussoren@mac.com> parents: 36501 diff changeset	658 * for this at runtime because this bug may be fixed or introduced between
e3a8a8de355e Patch 1471761 - test for broken poll at runtime Ronald Oussoren <ronaldoussoren@mac.com> parents: 36501 diff changeset	659 * OS releases.
e3a8a8de355e Patch 1471761 - test for broken poll at runtime Ronald Oussoren <ronaldoussoren@mac.com> parents: 36501 diff changeset	660 */
e3a8a8de355e Patch 1471761 - test for broken poll at runtime Ronald Oussoren <ronaldoussoren@mac.com> parents: 36501 diff changeset	661 static int select_have_broken_poll(void)
e3a8a8de355e Patch 1471761 - test for broken poll at runtime Ronald Oussoren <ronaldoussoren@mac.com> parents: 36501 diff changeset	662 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	663 int poll_test;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	664 int filedes[2];
37935 e3a8a8de355e Patch 1471761 - test for broken poll at runtime Ronald Oussoren <ronaldoussoren@mac.com> parents: 36501 diff changeset	665
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	666 struct pollfd poll_struct = { 0, POLLIN\|POLLPRI\|POLLOUT, 0 };
37935 e3a8a8de355e Patch 1471761 - test for broken poll at runtime Ronald Oussoren <ronaldoussoren@mac.com> parents: 36501 diff changeset	667
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	668 /* Create a file descriptor to make invalid */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	669 if (pipe(filedes) < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	670 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	671 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	672 poll_struct.fd = filedes[0];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	673 close(filedes[0]);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	674 close(filedes[1]);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	675 poll_test = poll(&poll_struct, 1, 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	676 if (poll_test < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	677 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	678 } else if (poll_test == 0 && poll_struct.revents != POLLNVAL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	679 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	680 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	681 return 0;
37935 e3a8a8de355e Patch 1471761 - test for broken poll at runtime Ronald Oussoren <ronaldoussoren@mac.com> parents: 36501 diff changeset	682 }
e3a8a8de355e Patch 1471761 - test for broken poll at runtime Ronald Oussoren <ronaldoussoren@mac.com> parents: 36501 diff changeset	683 #endif /* __APPLE__ */
e3a8a8de355e Patch 1471761 - test for broken poll at runtime Ronald Oussoren <ronaldoussoren@mac.com> parents: 36501 diff changeset	684
e3a8a8de355e Patch 1471761 - test for broken poll at runtime Ronald Oussoren <ronaldoussoren@mac.com> parents: 36501 diff changeset	685 #endif /* HAVE_POLL */
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	686
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	687 #ifdef HAVE_EPOLL
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	688 /* **************************************************************************
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	689 * epoll interface for Linux 2.6
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	690 *
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	691 * Written by Christian Heimes
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	692 * Inspired by Twisted's _epoll.pyx and select.poll()
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	693 */
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	694
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	695 #ifdef HAVE_SYS_EPOLL_H
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	696 #include <sys/epoll.h>
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	697 #endif
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	698
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	699 typedef struct {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	700 PyObject_HEAD
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	701 SOCKET epfd; /* epoll control file descriptor */
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	702 } pyEpoll_Object;
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	703
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	704 static PyTypeObject pyEpoll_Type;
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	705 #define pyepoll_CHECK(op) (PyObject_TypeCheck((op), &pyEpoll_Type))
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	706
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	707 static PyObject *
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	708 pyepoll_err_closed(void)
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	709 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	710 PyErr_SetString(PyExc_ValueError, "I/O operation on closed epoll fd");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	711 return NULL;
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	712 }
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	713
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	714 static int
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	715 pyepoll_internal_close(pyEpoll_Object *self)
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	716 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	717 int save_errno = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	718 if (self->epfd >= 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	719 int epfd = self->epfd;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	720 self->epfd = -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	721 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	722 if (close(epfd) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	723 save_errno = errno;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	724 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	725 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	726 return save_errno;
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	727 }
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	728
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	729 static PyObject *
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	730 newPyEpoll_Object(PyTypeObject *type, int sizehint, SOCKET fd)
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	731 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	732 pyEpoll_Object *self;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	733
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	734 if (sizehint == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	735 sizehint = FD_SETSIZE-1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	736 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	737 else if (sizehint < 1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	738 PyErr_Format(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	739 "sizehint must be greater zero, got %d",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	740 sizehint);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	741 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	742 }
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	743
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	744 assert(type != NULL && type->tp_alloc != NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	745 self = (pyEpoll_Object *) type->tp_alloc(type, 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	746 if (self == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	747 return NULL;
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	748
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	749 if (fd == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	750 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	751 self->epfd = epoll_create(sizehint);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	752 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	753 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	754 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	755 self->epfd = fd;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	756 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	757 if (self->epfd < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	758 Py_DECREF(self);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	759 PyErr_SetFromErrno(PyExc_IOError);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	760 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	761 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	762 return (PyObject *)self;
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	763 }
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	764
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	765
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	766 static PyObject *
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	767 pyepoll_new(PyTypeObject type, PyObject args, PyObject *kwds)
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	768 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	769 int sizehint = -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	770 static char *kwlist[] = {"sizehint", NULL};
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	771
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	772 if (!PyArg_ParseTupleAndKeywords(args, kwds, "\|i:epoll", kwlist,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	773 &sizehint))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	774 return NULL;
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	775
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	776 return newPyEpoll_Object(type, sizehint, -1);
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	777 }
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	778
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	779
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	780 static void
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	781 pyepoll_dealloc(pyEpoll_Object *self)
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	782 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	783 (void)pyepoll_internal_close(self);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	784 Py_TYPE(self)->tp_free(self);
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	785 }
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	786
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	787 static PyObject*
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	788 pyepoll_close(pyEpoll_Object *self)
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	789 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	790 errno = pyepoll_internal_close(self);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	791 if (errno < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	792 PyErr_SetFromErrno(PyExc_IOError);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	793 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	794 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	795 Py_RETURN_NONE;
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	796 }
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	797
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	798 PyDoc_STRVAR(pyepoll_close_doc,
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	799 "close() -> None\n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	800 \n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	801 Close the epoll control file descriptor. Further operations on the epoll\n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	802 object will raise an exception.");
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	803
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	804 static PyObject*
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	805 pyepoll_get_closed(pyEpoll_Object *self)
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	806 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	807 if (self->epfd < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	808 Py_RETURN_TRUE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	809 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	810 Py_RETURN_FALSE;
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	811 }
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	812
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	813 static PyObject*
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	814 pyepoll_fileno(pyEpoll_Object *self)
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	815 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	816 if (self->epfd < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	817 return pyepoll_err_closed();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	818 return PyInt_FromLong(self->epfd);
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	819 }
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	820
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	821 PyDoc_STRVAR(pyepoll_fileno_doc,
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	822 "fileno() -> int\n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	823 \n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	824 Return the epoll control file descriptor.");
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	825
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	826 static PyObject*
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	827 pyepoll_fromfd(PyObject cls, PyObject args)
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	828 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	829 SOCKET fd;
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	830
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	831 if (!PyArg_ParseTuple(args, "i:fromfd", &fd))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	832 return NULL;
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	833
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	834 return newPyEpoll_Object((PyTypeObject*)cls, -1, fd);
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	835 }
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	836
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	837 PyDoc_STRVAR(pyepoll_fromfd_doc,
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	838 "fromfd(fd) -> epoll\n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	839 \n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	840 Create an epoll object from a given control fd.");
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	841
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	842 static PyObject *
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	843 pyepoll_internal_ctl(int epfd, int op, PyObject *pfd, unsigned int events)
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	844 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	845 struct epoll_event ev;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	846 int result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	847 int fd;
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	848
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	849 if (epfd < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	850 return pyepoll_err_closed();
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	851
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	852 fd = PyObject_AsFileDescriptor(pfd);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	853 if (fd == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	854 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	855 }
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	856
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	857 switch(op) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	858 case EPOLL_CTL_ADD:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	859 case EPOLL_CTL_MOD:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	860 ev.events = events;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	861 ev.data.fd = fd;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	862 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	863 result = epoll_ctl(epfd, op, fd, &ev);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	864 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	865 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	866 case EPOLL_CTL_DEL:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	867 /* In kernel versions before 2.6.9, the EPOLL_CTL_DEL
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	868 * operation required a non-NULL pointer in event, even
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	869 * though this argument is ignored. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	870 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	871 result = epoll_ctl(epfd, op, fd, &ev);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	872 if (errno == EBADF) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	873 /* fd already closed */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	874 result = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	875 errno = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	876 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	877 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	878 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	879 default:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	880 result = -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	881 errno = EINVAL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	882 }
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	883
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	884 if (result < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	885 PyErr_SetFromErrno(PyExc_IOError);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	886 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	887 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	888 Py_RETURN_NONE;
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	889 }
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	890
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	891 static PyObject *
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	892 pyepoll_register(pyEpoll_Object self, PyObject args, PyObject *kwds)
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	893 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	894 PyObject *pfd;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	895 unsigned int events = EPOLLIN \| EPOLLOUT \| EPOLLPRI;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	896 static char *kwlist[] = {"fd", "eventmask", NULL};
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	897
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	898 if (!PyArg_ParseTupleAndKeywords(args, kwds, "O\|I:register", kwlist,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	899 &pfd, &events)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	900 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	901 }
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	902
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	903 return pyepoll_internal_ctl(self->epfd, EPOLL_CTL_ADD, pfd, events);
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	904 }
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	905
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	906 PyDoc_STRVAR(pyepoll_register_doc,
63609 a9cd2550ff40 Merged revisions 83593 via svnmerge from Georg Brandl <georg@python.org> parents: 61465 diff changeset	907 "register(fd[, eventmask]) -> None\n\
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	908 \n\
71003 a6586cb660dc Fix closes issue 11568 - update select.epoll.register docstring with mention of correct behavior. Senthil Kumaran <senthil@uthcode.com> parents: 68256 diff changeset	909 Registers a new fd or raises an IOError if the fd is already registered.\n\
46094 b51e4b50ed30 Minor docstring typos Andrew M. Kuchling <amk@amk.ca> parents: 45991 diff changeset	910 fd is the target file descriptor of the operation.\n\
b51e4b50ed30 Minor docstring typos Andrew M. Kuchling <amk@amk.ca> parents: 45991 diff changeset	911 events is a bit set composed of the various EPOLL constants; the default\n\
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	912 is EPOLL_IN \| EPOLL_OUT \| EPOLL_PRI.\n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	913 \n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	914 The epoll interface supports all file descriptors that support poll.");
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	915
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	916 static PyObject *
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	917 pyepoll_modify(pyEpoll_Object self, PyObject args, PyObject *kwds)
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	918 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	919 PyObject *pfd;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	920 unsigned int events;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	921 static char *kwlist[] = {"fd", "eventmask", NULL};
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	922
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	923 if (!PyArg_ParseTupleAndKeywords(args, kwds, "OI:modify", kwlist,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	924 &pfd, &events)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	925 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	926 }
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	927
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	928 return pyepoll_internal_ctl(self->epfd, EPOLL_CTL_MOD, pfd, events);
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	929 }
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	930
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	931 PyDoc_STRVAR(pyepoll_modify_doc,
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	932 "modify(fd, eventmask) -> None\n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	933 \n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	934 fd is the target file descriptor of the operation\n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	935 events is a bit set composed of the various EPOLL constants");
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	936
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	937 static PyObject *
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	938 pyepoll_unregister(pyEpoll_Object self, PyObject args, PyObject *kwds)
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	939 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	940 PyObject *pfd;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	941 static char *kwlist[] = {"fd", NULL};
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	942
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	943 if (!PyArg_ParseTupleAndKeywords(args, kwds, "O:unregister", kwlist,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	944 &pfd)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	945 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	946 }
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	947
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	948 return pyepoll_internal_ctl(self->epfd, EPOLL_CTL_DEL, pfd, 0);
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	949 }
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	950
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	951 PyDoc_STRVAR(pyepoll_unregister_doc,
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	952 "unregister(fd) -> None\n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	953 \n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	954 fd is the target file descriptor of the operation.");
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	955
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	956 static PyObject *
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	957 pyepoll_poll(pyEpoll_Object self, PyObject args, PyObject *kwds)
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	958 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	959 double dtimeout = -1.;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	960 int timeout;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	961 int maxevents = -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	962 int nfds, i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	963 PyObject elist = NULL, etuple = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	964 struct epoll_event *evs = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	965 static char *kwlist[] = {"timeout", "maxevents", NULL};
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	966
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	967 if (self->epfd < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	968 return pyepoll_err_closed();
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	969
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	970 if (!PyArg_ParseTupleAndKeywords(args, kwds, "\|di:poll", kwlist,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	971 &dtimeout, &maxevents)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	972 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	973 }
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	974
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	975 if (dtimeout < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	976 timeout = -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	977 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	978 else if (dtimeout * 1000.0 > INT_MAX) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	979 PyErr_SetString(PyExc_OverflowError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	980 "timeout is too large");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	981 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	982 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	983 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	984 timeout = (int)(dtimeout * 1000.0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	985 }
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	986
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	987 if (maxevents == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	988 maxevents = FD_SETSIZE-1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	989 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	990 else if (maxevents < 1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	991 PyErr_Format(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	992 "maxevents must be greater than 0, got %d",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	993 maxevents);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	994 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	995 }
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	996
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	997 evs = PyMem_New(struct epoll_event, maxevents);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	998 if (evs == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	999 Py_DECREF(self);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1000 PyErr_NoMemory();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1001 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1002 }
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1003
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1004 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1005 nfds = epoll_wait(self->epfd, evs, maxevents, timeout);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1006 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1007 if (nfds < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1008 PyErr_SetFromErrno(PyExc_IOError);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1009 goto error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1010 }
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1011
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1012 elist = PyList_New(nfds);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1013 if (elist == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1014 goto error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1015 }
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1016
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1017 for (i = 0; i < nfds; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1018 etuple = Py_BuildValue("iI", evs[i].data.fd, evs[i].events);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1019 if (etuple == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1020 Py_CLEAR(elist);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1021 goto error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1022 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1023 PyList_SET_ITEM(elist, i, etuple);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1024 }
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1025
46113 8d6fde16e493 Fix and simplify error handling, silencing a compiler warning. Georg Brandl <georg@python.org> parents: 46094 diff changeset	1026 error:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1027 PyMem_Free(evs);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1028 return elist;
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1029 }
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1030
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1031 PyDoc_STRVAR(pyepoll_poll_doc,
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1032 "poll([timeout=-1[, maxevents=-1]]) -> [(fd, events), (...)]\n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1033 \n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1034 Wait for events on the epoll file descriptor for a maximum time of timeout\n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1035 in seconds (as float). -1 makes poll wait indefinitely.\n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1036 Up to maxevents are returned to the caller.");
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1037
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1038 static PyMethodDef pyepoll_methods[] = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1039 {"fromfd", (PyCFunction)pyepoll_fromfd,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1040 METH_VARARGS \| METH_CLASS, pyepoll_fromfd_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1041 {"close", (PyCFunction)pyepoll_close, METH_NOARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1042 pyepoll_close_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1043 {"fileno", (PyCFunction)pyepoll_fileno, METH_NOARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1044 pyepoll_fileno_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1045 {"modify", (PyCFunction)pyepoll_modify,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1046 METH_VARARGS \| METH_KEYWORDS, pyepoll_modify_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1047 {"register", (PyCFunction)pyepoll_register,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1048 METH_VARARGS \| METH_KEYWORDS, pyepoll_register_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1049 {"unregister", (PyCFunction)pyepoll_unregister,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1050 METH_VARARGS \| METH_KEYWORDS, pyepoll_unregister_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1051 {"poll", (PyCFunction)pyepoll_poll,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1052 METH_VARARGS \| METH_KEYWORDS, pyepoll_poll_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1053 {NULL, NULL},
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1054 };
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1055
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1056 static PyGetSetDef pyepoll_getsetlist[] = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1057 {"closed", (getter)pyepoll_get_closed, NULL,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1058 "True if the epoll handler is closed"},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1059 {0},
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1060 };
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1061
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1062 PyDoc_STRVAR(pyepoll_doc,
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1063 "select.epoll([sizehint=-1])\n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1064 \n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1065 Returns an epolling object\n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1066 \n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1067 sizehint must be a positive integer or -1 for the default size. The\n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1068 sizehint is used to optimize internal data structures. It doesn't limit\n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1069 the maximum number of monitored events.");
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1070
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1071 static PyTypeObject pyEpoll_Type = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1072 PyVarObject_HEAD_INIT(NULL, 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1073 "select.epoll", /* tp_name */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1074 sizeof(pyEpoll_Object), /* tp_basicsize */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1075 0, /* tp_itemsize */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1076 (destructor)pyepoll_dealloc, /* tp_dealloc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1077 0, /* tp_print */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1078 0, /* tp_getattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1079 0, /* tp_setattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1080 0, /* tp_compare */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1081 0, /* tp_repr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1082 0, /* tp_as_number */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1083 0, /* tp_as_sequence */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1084 0, /* tp_as_mapping */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1085 0, /* tp_hash */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1086 0, /* tp_call */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1087 0, /* tp_str */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1088 PyObject_GenericGetAttr, /* tp_getattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1089 0, /* tp_setattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1090 0, /* tp_as_buffer */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1091 Py_TPFLAGS_DEFAULT, /* tp_flags */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1092 pyepoll_doc, /* tp_doc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1093 0, /* tp_traverse */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1094 0, /* tp_clear */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1095 0, /* tp_richcompare */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1096 0, /* tp_weaklistoffset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1097 0, /* tp_iter */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1098 0, /* tp_iternext */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1099 pyepoll_methods, /* tp_methods */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1100 0, /* tp_members */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1101 pyepoll_getsetlist, /* tp_getset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1102 0, /* tp_base */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1103 0, /* tp_dict */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1104 0, /* tp_descr_get */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1105 0, /* tp_descr_set */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1106 0, /* tp_dictoffset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1107 0, /* tp_init */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1108 0, /* tp_alloc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1109 pyepoll_new, /* tp_new */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1110 0, /* tp_free */
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1111 };
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1112
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1113 #endif /* HAVE_EPOLL */
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1114
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1115 #ifdef HAVE_KQUEUE
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1116 /* **************************************************************************
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1117 * kqueue interface for BSD
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1118 *
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1119 * Copyright (c) 2000 Doug White, 2006 James Knight, 2007 Christian Heimes
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1120 * All rights reserved.
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1121 *
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1122 * Redistribution and use in source and binary forms, with or without
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1123 * modification, are permitted provided that the following conditions
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1124 * are met:
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1125 * 1. Redistributions of source code must retain the above copyright
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1126 * notice, this list of conditions and the following disclaimer.
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1127 * 2. Redistributions in binary form must reproduce the above copyright
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1128 * notice, this list of conditions and the following disclaimer in the
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1129 * documentation and/or other materials provided with the distribution.
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1130 *
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1131 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1132 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1133 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1134 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1135 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1136 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1137 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1138 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1139 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1140 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1141 * SUCH DAMAGE.
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1142 */
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1143
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1144 #ifdef HAVE_SYS_EVENT_H
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1145 #include <sys/event.h>
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1146 #endif
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1147
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1148 PyDoc_STRVAR(kqueue_event_doc,
59834 9eabba6ded09 Merged revisions 77120,77151,77155,77209,77229,77256,77317,77331,77333,77359-77360,77382,77561,77570 via svnmerge from Georg Brandl <georg@python.org> parents: 56830 diff changeset	1149 "kevent(ident, filter=KQ_FILTER_READ, flags=KQ_EV_ADD, fflags=0, data=0, udata=0)\n\
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1150 \n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1151 This object is the equivalent of the struct kevent for the C API.\n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1152 \n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1153 See the kqueue manpage for more detailed information about the meaning\n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1154 of the arguments.\n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1155 \n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1156 One minor note: while you might hope that udata could store a\n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1157 reference to a python object, it cannot, because it is impossible to\n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1158 keep a proper reference count of the object once it's passed into the\n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1159 kernel. Therefore, I have restricted it to only storing an integer. I\n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1160 recommend ignoring it and simply using the 'ident' field to key off\n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1161 of. You could also set up a dictionary on the python side to store a\n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1162 udata->object mapping.");
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1163
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1164 typedef struct {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1165 PyObject_HEAD
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1166 struct kevent e;
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1167 } kqueue_event_Object;
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1168
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1169 static PyTypeObject kqueue_event_Type;
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1170
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1171 #define kqueue_event_Check(op) (PyObject_TypeCheck((op), &kqueue_event_Type))
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1172
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1173 typedef struct {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1174 PyObject_HEAD
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1175 SOCKET kqfd; /* kqueue control fd */
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1176 } kqueue_queue_Object;
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1177
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1178 static PyTypeObject kqueue_queue_Type;
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1179
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1180 #define kqueue_queue_Check(op) (PyObject_TypeCheck((op), &kqueue_queue_Type))
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1181
57112 068f9430cc24 Issue #7211: Allow 64-bit values for the `ident` and `data` fields of kevent Antoine Pitrou <solipsis@pitrou.net> parents: 55266 diff changeset	1182 #if (SIZEOF_UINTPTR_T != SIZEOF_VOID_P)
068f9430cc24 Issue #7211: Allow 64-bit values for the `ident` and `data` fields of kevent Antoine Pitrou <solipsis@pitrou.net> parents: 55266 diff changeset	1183 # error uintptr_t does not match void *!
068f9430cc24 Issue #7211: Allow 64-bit values for the `ident` and `data` fields of kevent Antoine Pitrou <solipsis@pitrou.net> parents: 55266 diff changeset	1184 #elif (SIZEOF_UINTPTR_T == SIZEOF_LONG_LONG)
068f9430cc24 Issue #7211: Allow 64-bit values for the `ident` and `data` fields of kevent Antoine Pitrou <solipsis@pitrou.net> parents: 55266 diff changeset	1185 # define T_UINTPTRT T_ULONGLONG
068f9430cc24 Issue #7211: Allow 64-bit values for the `ident` and `data` fields of kevent Antoine Pitrou <solipsis@pitrou.net> parents: 55266 diff changeset	1186 # define T_INTPTRT T_LONGLONG
068f9430cc24 Issue #7211: Allow 64-bit values for the `ident` and `data` fields of kevent Antoine Pitrou <solipsis@pitrou.net> parents: 55266 diff changeset	1187 # define PyLong_AsUintptr_t PyLong_AsUnsignedLongLong
068f9430cc24 Issue #7211: Allow 64-bit values for the `ident` and `data` fields of kevent Antoine Pitrou <solipsis@pitrou.net> parents: 55266 diff changeset	1188 # define UINTPTRT_FMT_UNIT "K"
068f9430cc24 Issue #7211: Allow 64-bit values for the `ident` and `data` fields of kevent Antoine Pitrou <solipsis@pitrou.net> parents: 55266 diff changeset	1189 # define INTPTRT_FMT_UNIT "L"
068f9430cc24 Issue #7211: Allow 64-bit values for the `ident` and `data` fields of kevent Antoine Pitrou <solipsis@pitrou.net> parents: 55266 diff changeset	1190 #elif (SIZEOF_UINTPTR_T == SIZEOF_LONG)
068f9430cc24 Issue #7211: Allow 64-bit values for the `ident` and `data` fields of kevent Antoine Pitrou <solipsis@pitrou.net> parents: 55266 diff changeset	1191 # define T_UINTPTRT T_ULONG
068f9430cc24 Issue #7211: Allow 64-bit values for the `ident` and `data` fields of kevent Antoine Pitrou <solipsis@pitrou.net> parents: 55266 diff changeset	1192 # define T_INTPTRT T_LONG
068f9430cc24 Issue #7211: Allow 64-bit values for the `ident` and `data` fields of kevent Antoine Pitrou <solipsis@pitrou.net> parents: 55266 diff changeset	1193 # define PyLong_AsUintptr_t PyLong_AsUnsignedLong
068f9430cc24 Issue #7211: Allow 64-bit values for the `ident` and `data` fields of kevent Antoine Pitrou <solipsis@pitrou.net> parents: 55266 diff changeset	1194 # define UINTPTRT_FMT_UNIT "k"
068f9430cc24 Issue #7211: Allow 64-bit values for the `ident` and `data` fields of kevent Antoine Pitrou <solipsis@pitrou.net> parents: 55266 diff changeset	1195 # define INTPTRT_FMT_UNIT "l"
068f9430cc24 Issue #7211: Allow 64-bit values for the `ident` and `data` fields of kevent Antoine Pitrou <solipsis@pitrou.net> parents: 55266 diff changeset	1196 #elif (SIZEOF_UINTPTR_T == SIZEOF_INT)
068f9430cc24 Issue #7211: Allow 64-bit values for the `ident` and `data` fields of kevent Antoine Pitrou <solipsis@pitrou.net> parents: 55266 diff changeset	1197 # define T_UINTPTRT T_UINT
068f9430cc24 Issue #7211: Allow 64-bit values for the `ident` and `data` fields of kevent Antoine Pitrou <solipsis@pitrou.net> parents: 55266 diff changeset	1198 # define T_INTPTRT T_INT
068f9430cc24 Issue #7211: Allow 64-bit values for the `ident` and `data` fields of kevent Antoine Pitrou <solipsis@pitrou.net> parents: 55266 diff changeset	1199 # define PyLong_AsUintptr_t PyLong_AsUnsignedLong
068f9430cc24 Issue #7211: Allow 64-bit values for the `ident` and `data` fields of kevent Antoine Pitrou <solipsis@pitrou.net> parents: 55266 diff changeset	1200 # define UINTPTRT_FMT_UNIT "I"
068f9430cc24 Issue #7211: Allow 64-bit values for the `ident` and `data` fields of kevent Antoine Pitrou <solipsis@pitrou.net> parents: 55266 diff changeset	1201 # define INTPTRT_FMT_UNIT "i"
068f9430cc24 Issue #7211: Allow 64-bit values for the `ident` and `data` fields of kevent Antoine Pitrou <solipsis@pitrou.net> parents: 55266 diff changeset	1202 #else
068f9430cc24 Issue #7211: Allow 64-bit values for the `ident` and `data` fields of kevent Antoine Pitrou <solipsis@pitrou.net> parents: 55266 diff changeset	1203 # error uintptr_t does not match int, long, or long long!
068f9430cc24 Issue #7211: Allow 64-bit values for the `ident` and `data` fields of kevent Antoine Pitrou <solipsis@pitrou.net> parents: 55266 diff changeset	1204 #endif
068f9430cc24 Issue #7211: Allow 64-bit values for the `ident` and `data` fields of kevent Antoine Pitrou <solipsis@pitrou.net> parents: 55266 diff changeset	1205
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1206 /* Unfortunately, we can't store python objects in udata, because
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1207 * kevents in the kernel can be removed without warning, which would
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1208 * forever lose the refcount on the object stored with it.
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1209 */
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1210
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1211 #define KQ_OFF(x) offsetof(kqueue_event_Object, x)
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1212 static struct PyMemberDef kqueue_event_members[] = {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60612 diff changeset	1213 {"ident", T_UINTPTRT, KQ_OFF(e.ident)},
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1214 {"filter", T_SHORT, KQ_OFF(e.filter)},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1215 {"flags", T_USHORT, KQ_OFF(e.flags)},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1216 {"fflags", T_UINT, KQ_OFF(e.fflags)},
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60612 diff changeset	1217 {"data", T_INTPTRT, KQ_OFF(e.data)},
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60612 diff changeset	1218 {"udata", T_UINTPTRT, KQ_OFF(e.udata)},
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1219 {NULL} /* Sentinel */
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1220 };
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1221 #undef KQ_OFF
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1222
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1223 static PyObject *
59841 d1398ff01a07 Merged revisions 77593,77702-77703,77858,77887,78113-78115,78117,78245,78385-78386,78496,78760,78771-78773,78802 via svnmerge from Georg Brandl <georg@python.org> parents: 59834 diff changeset	1224
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1225 kqueue_event_repr(kqueue_event_Object *s)
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1226 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1227 char buf[1024];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1228 PyOS_snprintf(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1229 buf, sizeof(buf),
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60612 diff changeset	1230 "<select.kevent ident=%zu filter=%d flags=0x%x fflags=0x%x "
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60612 diff changeset	1231 "data=0x%zd udata=%p>",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60612 diff changeset	1232 (size_t)(s->e.ident), s->e.filter, s->e.flags,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60612 diff changeset	1233 s->e.fflags, (Py_ssize_t)(s->e.data), s->e.udata);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1234 return PyString_FromString(buf);
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1235 }
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1236
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1237 static int
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1238 kqueue_event_init(kqueue_event_Object self, PyObject args, PyObject *kwds)
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1239 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1240 PyObject *pfd;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1241 static char *kwlist[] = {"ident", "filter", "flags", "fflags",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1242 "data", "udata", NULL};
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60612 diff changeset	1243 static char *fmt = "O\|hhi" INTPTRT_FMT_UNIT UINTPTRT_FMT_UNIT ":kevent";
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1244
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1245 EV_SET(&(self->e), 0, EVFILT_READ, EV_ADD, 0, 0, 0); /* defaults */
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1246
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60612 diff changeset	1247 if (!PyArg_ParseTupleAndKeywords(args, kwds, fmt, kwlist,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1248 &pfd, &(self->e.filter), &(self->e.flags),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1249 &(self->e.fflags), &(self->e.data), &(self->e.udata))) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1250 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1251 }
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1252
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60612 diff changeset	1253 if (PyLong_Check(pfd)) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60612 diff changeset	1254 self->e.ident = PyLong_AsUintptr_t(pfd);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60612 diff changeset	1255 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60612 diff changeset	1256 else {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60612 diff changeset	1257 self->e.ident = PyObject_AsFileDescriptor(pfd);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60612 diff changeset	1258 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60612 diff changeset	1259 if (PyErr_Occurred()) {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1260 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1261 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1262 return 0;
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1263 }
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1264
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1265 static PyObject *
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1266 kqueue_event_richcompare(kqueue_event_Object s, kqueue_event_Object o,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1267 int op)
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1268 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60612 diff changeset	1269 Py_intptr_t result = 0;
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1270
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1271 if (!kqueue_event_Check(o)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1272 if (op == Py_EQ \|\| op == Py_NE) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1273 PyObject *res = op == Py_EQ ? Py_False : Py_True;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1274 Py_INCREF(res);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1275 return res;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1276 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1277 PyErr_Format(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1278 "can't compare %.200s to %.200s",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1279 Py_TYPE(s)->tp_name, Py_TYPE(o)->tp_name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1280 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1281 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1282 if (((result = s->e.ident - o->e.ident) == 0) &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1283 ((result = s->e.filter - o->e.filter) == 0) &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1284 ((result = s->e.flags - o->e.flags) == 0) &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1285 ((result = s->e.fflags - o->e.fflags) == 0) &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1286 ((result = s->e.data - o->e.data) == 0) &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1287 ((result = s->e.udata - o->e.udata) == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1288 ) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1289 result = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1290 }
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1291
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1292 switch (op) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1293 case Py_EQ:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1294 result = (result == 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1295 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1296 case Py_NE:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1297 result = (result != 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1298 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1299 case Py_LE:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1300 result = (result <= 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1301 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1302 case Py_GE:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1303 result = (result >= 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1304 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1305 case Py_LT:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1306 result = (result < 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1307 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1308 case Py_GT:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1309 result = (result > 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1310 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1311 }
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60612 diff changeset	1312 return PyBool_FromLong((long)result);
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1313 }
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1314
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1315 static PyTypeObject kqueue_event_Type = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1316 PyVarObject_HEAD_INIT(NULL, 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1317 "select.kevent", /* tp_name */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1318 sizeof(kqueue_event_Object), /* tp_basicsize */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1319 0, /* tp_itemsize */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1320 0, /* tp_dealloc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1321 0, /* tp_print */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1322 0, /* tp_getattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1323 0, /* tp_setattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1324 0, /* tp_compare */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1325 (reprfunc)kqueue_event_repr, /* tp_repr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1326 0, /* tp_as_number */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1327 0, /* tp_as_sequence */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1328 0, /* tp_as_mapping */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1329 0, /* tp_hash */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1330 0, /* tp_call */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1331 0, /* tp_str */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1332 0, /* tp_getattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1333 0, /* tp_setattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1334 0, /* tp_as_buffer */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1335 Py_TPFLAGS_DEFAULT, /* tp_flags */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1336 kqueue_event_doc, /* tp_doc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1337 0, /* tp_traverse */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1338 0, /* tp_clear */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1339 (richcmpfunc)kqueue_event_richcompare, /* tp_richcompare */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1340 0, /* tp_weaklistoffset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1341 0, /* tp_iter */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1342 0, /* tp_iternext */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1343 0, /* tp_methods */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1344 kqueue_event_members, /* tp_members */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1345 0, /* tp_getset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1346 0, /* tp_base */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1347 0, /* tp_dict */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1348 0, /* tp_descr_get */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1349 0, /* tp_descr_set */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1350 0, /* tp_dictoffset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1351 (initproc)kqueue_event_init, /* tp_init */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1352 0, /* tp_alloc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1353 0, /* tp_new */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1354 0, /* tp_free */
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1355 };
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1356
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1357 static PyObject *
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1358 kqueue_queue_err_closed(void)
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1359 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1360 PyErr_SetString(PyExc_ValueError, "I/O operation on closed kqueue fd");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1361 return NULL;
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1362 }
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1363
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1364 static int
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1365 kqueue_queue_internal_close(kqueue_queue_Object *self)
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1366 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1367 int save_errno = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1368 if (self->kqfd >= 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1369 int kqfd = self->kqfd;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1370 self->kqfd = -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1371 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1372 if (close(kqfd) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1373 save_errno = errno;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1374 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1375 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1376 return save_errno;
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1377 }
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1378
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1379 static PyObject *
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1380 newKqueue_Object(PyTypeObject *type, SOCKET fd)
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1381 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1382 kqueue_queue_Object *self;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1383 assert(type != NULL && type->tp_alloc != NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1384 self = (kqueue_queue_Object *) type->tp_alloc(type, 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1385 if (self == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1386 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1387 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1388
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1389 if (fd == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1390 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1391 self->kqfd = kqueue();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1392 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1393 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1394 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1395 self->kqfd = fd;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1396 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1397 if (self->kqfd < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1398 Py_DECREF(self);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1399 PyErr_SetFromErrno(PyExc_IOError);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1400 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1401 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1402 return (PyObject *)self;
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1403 }
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1404
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1405 static PyObject *
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1406 kqueue_queue_new(PyTypeObject type, PyObject args, PyObject *kwds)
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1407 {
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1408
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1409 if ((args != NULL && PyObject_Size(args)) \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1410 (kwds != NULL && PyObject_Size(kwds))) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1411 PyErr_SetString(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1412 "select.kqueue doesn't accept arguments");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1413 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1414 }
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1415
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1416 return newKqueue_Object(type, -1);
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1417 }
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1418
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1419 static void
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1420 kqueue_queue_dealloc(kqueue_queue_Object *self)
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1421 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1422 kqueue_queue_internal_close(self);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1423 Py_TYPE(self)->tp_free(self);
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1424 }
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1425
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1426 static PyObject*
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1427 kqueue_queue_close(kqueue_queue_Object *self)
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1428 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1429 errno = kqueue_queue_internal_close(self);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1430 if (errno < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1431 PyErr_SetFromErrno(PyExc_IOError);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1432 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1433 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1434 Py_RETURN_NONE;
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1435 }
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1436
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1437 PyDoc_STRVAR(kqueue_queue_close_doc,
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1438 "close() -> None\n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1439 \n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1440 Close the kqueue control file descriptor. Further operations on the kqueue\n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1441 object will raise an exception.");
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1442
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1443 static PyObject*
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1444 kqueue_queue_get_closed(kqueue_queue_Object *self)
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1445 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1446 if (self->kqfd < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1447 Py_RETURN_TRUE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1448 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1449 Py_RETURN_FALSE;
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1450 }
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1451
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1452 static PyObject*
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1453 kqueue_queue_fileno(kqueue_queue_Object *self)
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1454 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1455 if (self->kqfd < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1456 return kqueue_queue_err_closed();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1457 return PyInt_FromLong(self->kqfd);
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1458 }
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1459
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1460 PyDoc_STRVAR(kqueue_queue_fileno_doc,
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1461 "fileno() -> int\n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1462 \n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1463 Return the kqueue control file descriptor.");
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1464
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1465 static PyObject*
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1466 kqueue_queue_fromfd(PyObject cls, PyObject args)
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1467 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1468 SOCKET fd;
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1469
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1470 if (!PyArg_ParseTuple(args, "i:fromfd", &fd))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1471 return NULL;
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1472
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1473 return newKqueue_Object((PyTypeObject*)cls, fd);
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1474 }
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1475
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1476 PyDoc_STRVAR(kqueue_queue_fromfd_doc,
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1477 "fromfd(fd) -> kqueue\n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1478 \n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1479 Create a kqueue object from a given control fd.");
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1480
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1481 static PyObject *
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1482 kqueue_queue_control(kqueue_queue_Object self, PyObject args)
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1483 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1484 int nevents = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1485 int gotevents = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1486 int nchanges = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1487 int i = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1488 PyObject *otimeout = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1489 PyObject *ch = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1490 PyObject it = NULL, ei = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1491 PyObject *result = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1492 struct kevent *evl = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1493 struct kevent *chl = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1494 struct timespec timeoutspec;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1495 struct timespec *ptimeoutspec;
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1496
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1497 if (self->kqfd < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1498 return kqueue_queue_err_closed();
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1499
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1500 if (!PyArg_ParseTuple(args, "Oi\|O:control", &ch, &nevents, &otimeout))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1501 return NULL;
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1502
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1503 if (nevents < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1504 PyErr_Format(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1505 "Length of eventlist must be 0 or positive, got %d",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1506 nevents);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1507 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1508 }
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1509
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1510 if (otimeout == Py_None \|\| otimeout == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1511 ptimeoutspec = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1512 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1513 else if (PyNumber_Check(otimeout)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1514 double timeout;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1515 long seconds;
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1516
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1517 timeout = PyFloat_AsDouble(otimeout);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1518 if (timeout == -1 && PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1519 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1520 if (timeout > (double)LONG_MAX) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1521 PyErr_SetString(PyExc_OverflowError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1522 "timeout period too long");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1523 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1524 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1525 if (timeout < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1526 PyErr_SetString(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1527 "timeout must be positive or None");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1528 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1529 }
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1530
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1531 seconds = (long)timeout;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1532 timeout = timeout - (double)seconds;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1533 timeoutspec.tv_sec = seconds;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1534 timeoutspec.tv_nsec = (long)(timeout * 1E9);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1535 ptimeoutspec = &timeoutspec;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1536 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1537 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1538 PyErr_Format(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1539 "timeout argument must be an number "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1540 "or None, got %.200s",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1541 Py_TYPE(otimeout)->tp_name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1542 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1543 }
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1544
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1545 if (ch != NULL && ch != Py_None) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1546 it = PyObject_GetIter(ch);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1547 if (it == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1548 PyErr_SetString(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1549 "changelist is not iterable");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1550 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1551 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1552 nchanges = PyObject_Size(ch);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1553 if (nchanges < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1554 goto error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1555 }
59841 d1398ff01a07 Merged revisions 77593,77702-77703,77858,77887,78113-78115,78117,78245,78385-78386,78496,78760,78771-78773,78802 via svnmerge from Georg Brandl <georg@python.org> parents: 59834 diff changeset	1556
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1557 chl = PyMem_New(struct kevent, nchanges);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1558 if (chl == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1559 PyErr_NoMemory();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1560 goto error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1561 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1562 i = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1563 while ((ei = PyIter_Next(it)) != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1564 if (!kqueue_event_Check(ei)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1565 Py_DECREF(ei);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1566 PyErr_SetString(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1567 "changelist must be an iterable of "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1568 "select.kevent objects");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1569 goto error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1570 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1571 chl[i++] = ((kqueue_event_Object *)ei)->e;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1572 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1573 Py_DECREF(ei);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1574 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1575 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1576 Py_CLEAR(it);
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1577
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1578 /* event list */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1579 if (nevents) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1580 evl = PyMem_New(struct kevent, nevents);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1581 if (evl == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1582 PyErr_NoMemory();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1583 goto error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1584 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1585 }
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1586
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1587 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1588 gotevents = kevent(self->kqfd, chl, nchanges,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1589 evl, nevents, ptimeoutspec);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1590 Py_END_ALLOW_THREADS
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1591
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1592 if (gotevents == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1593 PyErr_SetFromErrno(PyExc_OSError);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1594 goto error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1595 }
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1596
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1597 result = PyList_New(gotevents);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1598 if (result == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1599 goto error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1600 }
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1601
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1602 for (i = 0; i < gotevents; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1603 kqueue_event_Object *ch;
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1604
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1605 ch = PyObject_New(kqueue_event_Object, &kqueue_event_Type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1606 if (ch == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1607 goto error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1608 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1609 ch->e = evl[i];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1610 PyList_SET_ITEM(result, i, (PyObject *)ch);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1611 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1612 PyMem_Free(chl);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1613 PyMem_Free(evl);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1614 return result;
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1615
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1616 error:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1617 PyMem_Free(chl);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1618 PyMem_Free(evl);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1619 Py_XDECREF(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1620 Py_XDECREF(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1621 return NULL;
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1622 }
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1623
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1624 PyDoc_STRVAR(kqueue_queue_control_doc,
49241 50b1e55756a5 #3852: fix some select.kqueue and kevent docs. Georg Brandl <georg@python.org> parents: 48046 diff changeset	1625 "control(changelist, max_events[, timeout=None]) -> eventlist\n\
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1626 \n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1627 Calls the kernel kevent function.\n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1628 - changelist must be a list of kevent objects describing the changes\n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1629 to be made to the kernel's watch list or None.\n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1630 - max_events lets you specify the maximum number of events that the\n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1631 kernel will return.\n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1632 - timeout is the maximum time to wait in seconds, or else None,\n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1633 to wait forever. timeout accepts floats for smaller timeouts, too.");
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1634
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1635
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1636 static PyMethodDef kqueue_queue_methods[] = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1637 {"fromfd", (PyCFunction)kqueue_queue_fromfd,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1638 METH_VARARGS \| METH_CLASS, kqueue_queue_fromfd_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1639 {"close", (PyCFunction)kqueue_queue_close, METH_NOARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1640 kqueue_queue_close_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1641 {"fileno", (PyCFunction)kqueue_queue_fileno, METH_NOARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1642 kqueue_queue_fileno_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1643 {"control", (PyCFunction)kqueue_queue_control,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1644 METH_VARARGS , kqueue_queue_control_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1645 {NULL, NULL},
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1646 };
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1647
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1648 static PyGetSetDef kqueue_queue_getsetlist[] = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1649 {"closed", (getter)kqueue_queue_get_closed, NULL,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1650 "True if the kqueue handler is closed"},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1651 {0},
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1652 };
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1653
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1654 PyDoc_STRVAR(kqueue_queue_doc,
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1655 "Kqueue syscall wrapper.\n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1656 \n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1657 For example, to start watching a socket for input:\n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1658 >>> kq = kqueue()\n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1659 >>> sock = socket()\n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1660 >>> sock.connect((host, port))\n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1661 >>> kq.control([kevent(sock, KQ_FILTER_WRITE, KQ_EV_ADD)], 0)\n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1662 \n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1663 To wait one second for it to become writeable:\n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1664 >>> kq.control(None, 1, 1000)\n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1665 \n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1666 To stop listening:\n\
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1667 >>> kq.control([kevent(sock, KQ_FILTER_WRITE, KQ_EV_DELETE)], 0)");
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1668
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1669 static PyTypeObject kqueue_queue_Type = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1670 PyVarObject_HEAD_INIT(NULL, 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1671 "select.kqueue", /* tp_name */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1672 sizeof(kqueue_queue_Object), /* tp_basicsize */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1673 0, /* tp_itemsize */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1674 (destructor)kqueue_queue_dealloc, /* tp_dealloc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1675 0, /* tp_print */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1676 0, /* tp_getattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1677 0, /* tp_setattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1678 0, /* tp_compare */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1679 0, /* tp_repr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1680 0, /* tp_as_number */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1681 0, /* tp_as_sequence */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1682 0, /* tp_as_mapping */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1683 0, /* tp_hash */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1684 0, /* tp_call */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1685 0, /* tp_str */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1686 0, /* tp_getattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1687 0, /* tp_setattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1688 0, /* tp_as_buffer */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1689 Py_TPFLAGS_DEFAULT, /* tp_flags */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1690 kqueue_queue_doc, /* tp_doc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1691 0, /* tp_traverse */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1692 0, /* tp_clear */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1693 0, /* tp_richcompare */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1694 0, /* tp_weaklistoffset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1695 0, /* tp_iter */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1696 0, /* tp_iternext */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1697 kqueue_queue_methods, /* tp_methods */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1698 0, /* tp_members */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1699 kqueue_queue_getsetlist, /* tp_getset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1700 0, /* tp_base */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1701 0, /* tp_dict */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1702 0, /* tp_descr_get */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1703 0, /* tp_descr_set */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1704 0, /* tp_dictoffset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1705 0, /* tp_init */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1706 0, /* tp_alloc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1707 kqueue_queue_new, /* tp_new */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1708 0, /* tp_free */
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1709 };
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1710
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1711 #endif /* HAVE_KQUEUE */
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1712 /* ************************************************************************ */
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1713
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23607 diff changeset	1714 PyDoc_STRVAR(select_doc,
8570 bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	1715 "select(rlist, wlist, xlist[, timeout]) -> (rlist, wlist, xlist)\n\
bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	1716 \n\
bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	1717 Wait until one or more file descriptors are ready for some kind of I/O.\n\
30402 a430be683a7a select.select() now accepts a sequence (as defined by PySequence_Fast()) for Brett Cannon <bcannon@gmail.com> parents: 27815 diff changeset	1718 The first three arguments are sequences of file descriptors to be waited for:\n\
8570 bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	1719 rlist -- wait until ready for reading\n\
bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	1720 wlist -- wait until ready for writing\n\
bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	1721 xlist -- wait for an ``exceptional condition''\n\
bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	1722 If only one kind of condition is required, pass [] for the other lists.\n\
bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	1723 A file descriptor is either a socket or file object, or a small integer\n\
bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	1724 gotten from a fileno() method call on one of those.\n\
bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	1725 \n\
bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	1726 The optional 4th argument specifies a timeout in seconds; it may be\n\
bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	1727 a floating point number to specify fractions of seconds. If it is absent\n\
bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	1728 or None, the call will never time out.\n\
bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	1729 \n\
bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	1730 The return value is a tuple of three lists corresponding to the first three\n\
bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	1731 arguments; each contains the subset of the corresponding file descriptors\n\
bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	1732 that are ready.\n\
bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	1733 \n\
bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	1734 * IMPORTANT NOTICE *\n\
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1735 On Windows and OpenVMS, only sockets are supported; on Unix, all file\n\
46094 b51e4b50ed30 Minor docstring typos Andrew M. Kuchling <amk@amk.ca> parents: 45991 diff changeset	1736 descriptors can be used.");
8570 bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	1737
4692 cb405b9696d4 Several changes... Guido please take a look! Barry Warsaw <barry@python.org> parents: 4621 diff changeset	1738 static PyMethodDef select_methods[] = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1739 {"select", select_select, METH_VARARGS, select_doc},
81591 1d33c79d2f6b Issue #16953: Fix socket module compilation on platforms with HAVE_BROKEN_POLL. Charles-François Natali <cf.natali@gmail.com> parents: 81590 diff changeset	1740 #if defined(HAVE_POLL) && !defined(HAVE_BROKEN_POLL)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1741 {"poll", select_poll, METH_NOARGS, poll_doc},
37935 e3a8a8de355e Patch 1471761 - test for broken poll at runtime Ronald Oussoren <ronaldoussoren@mac.com> parents: 36501 diff changeset	1742 #endif /* HAVE_POLL */
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1743 {0, 0}, /* sentinel */
902 a4793ae26682 Changes for new UNIX-specific built-in module 'select' and new header for Guido van Rossum <guido@python.org> parents: diff changeset	1744 };
a4793ae26682 Changes for new UNIX-specific built-in module 'select' and new header for Guido van Rossum <guido@python.org> parents: diff changeset	1745
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23607 diff changeset	1746 PyDoc_STRVAR(module_doc,
8570 bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	1747 "This module supports asynchronous I/O on multiple file descriptors.\n\
bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	1748 \n\
bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	1749 * IMPORTANT NOTICE *\n\
39043 c67b23397f30 Patch #1516912: improve Modules support for OpenVMS. Neal Norwitz <nnorwitz@gmail.com> parents: 38716 diff changeset	1750 On Windows and OpenVMS, only sockets are supported; on Unix, all file descriptors.");
902 a4793ae26682 Changes for new UNIX-specific built-in module 'select' and new header for Guido van Rossum <guido@python.org> parents: diff changeset	1751
24363 979ff5d0ae07 Replace DL_IMPORT with PyMODINIT_FUNC and remove "/export:init..." link Mark Hammond <mhammond@skippinet.com.au> parents: 24283 diff changeset	1752 PyMODINIT_FUNC
13651 8a063423e0b7 Bunch of minor ANSIfications: 'void initfunc()' -> 'void initfunc(void)', Thomas Wouters <thomas@python.org> parents: 13593 diff changeset	1753 initselect(void)
902 a4793ae26682 Changes for new UNIX-specific built-in module 'select' and new header for Guido van Rossum <guido@python.org> parents: diff changeset	1754 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1755 PyObject *m;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1756 m = Py_InitModule3("select", select_methods, module_doc);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1757 if (m == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1758 return;
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22114 diff changeset	1759
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1760 SelectError = PyErr_NewException("select.error", NULL, NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1761 Py_INCREF(SelectError);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1762 PyModule_AddObject(m, "error", SelectError);
37935 e3a8a8de355e Patch 1471761 - test for broken poll at runtime Ronald Oussoren <ronaldoussoren@mac.com> parents: 36501 diff changeset	1763
55178 5609352fea12 #6416: Fix compilation of the select module on Windows, as well as test_subprocess: Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 55085 diff changeset	1764 #ifdef PIPE_BUF
65386 d4390b6bf7ec Merged revisions 85554 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 63608 diff changeset	1765 #ifdef HAVE_BROKEN_PIPE_BUF
d4390b6bf7ec Merged revisions 85554 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 63608 diff changeset	1766 #undef PIPE_BUF
d4390b6bf7ec Merged revisions 85554 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 63608 diff changeset	1767 #define PIPE_BUF 512
d4390b6bf7ec Merged revisions 85554 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 63608 diff changeset	1768 #endif
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60612 diff changeset	1769 PyModule_AddIntConstant(m, "PIPE_BUF", PIPE_BUF);
55178 5609352fea12 #6416: Fix compilation of the select module on Windows, as well as test_subprocess: Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 55085 diff changeset	1770 #endif
55085 9c9fe9aafba6 Adds the select.PIPE_BUF attribute to expose the system constant. Gregory P. Smith <greg@mad-scientist.com> parents: 49241 diff changeset	1771
81591 1d33c79d2f6b Issue #16953: Fix socket module compilation on platforms with HAVE_BROKEN_POLL. Charles-François Natali <cf.natali@gmail.com> parents: 81590 diff changeset	1772 #if defined(HAVE_POLL) && !defined(HAVE_BROKEN_POLL)
37935 e3a8a8de355e Patch 1471761 - test for broken poll at runtime Ronald Oussoren <ronaldoussoren@mac.com> parents: 36501 diff changeset	1773 #ifdef __APPLE__
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1774 if (select_have_broken_poll()) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1775 if (PyObject_DelAttrString(m, "poll") == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1776 PyErr_Clear();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1777 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1778 } else {
37935 e3a8a8de355e Patch 1471761 - test for broken poll at runtime Ronald Oussoren <ronaldoussoren@mac.com> parents: 36501 diff changeset	1779 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1780 {
37935 e3a8a8de355e Patch 1471761 - test for broken poll at runtime Ronald Oussoren <ronaldoussoren@mac.com> parents: 36501 diff changeset	1781 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1782 Py_TYPE(&poll_Type) = &PyType_Type;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1783 PyModule_AddIntConstant(m, "POLLIN", POLLIN);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1784 PyModule_AddIntConstant(m, "POLLPRI", POLLPRI);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1785 PyModule_AddIntConstant(m, "POLLOUT", POLLOUT);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1786 PyModule_AddIntConstant(m, "POLLERR", POLLERR);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1787 PyModule_AddIntConstant(m, "POLLHUP", POLLHUP);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1788 PyModule_AddIntConstant(m, "POLLNVAL", POLLNVAL);
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	1789
14918 914ae7f9c64c Add #ifdef's for platforms that don't have the constants POLLRDNORM and Andrew M. Kuchling <amk@amk.ca> parents: 14869 diff changeset	1790 #ifdef POLLRDNORM
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1791 PyModule_AddIntConstant(m, "POLLRDNORM", POLLRDNORM);
14918 914ae7f9c64c Add #ifdef's for platforms that don't have the constants POLLRDNORM and Andrew M. Kuchling <amk@amk.ca> parents: 14869 diff changeset	1792 #endif
914ae7f9c64c Add #ifdef's for platforms that don't have the constants POLLRDNORM and Andrew M. Kuchling <amk@amk.ca> parents: 14869 diff changeset	1793 #ifdef POLLRDBAND
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1794 PyModule_AddIntConstant(m, "POLLRDBAND", POLLRDBAND);
14918 914ae7f9c64c Add #ifdef's for platforms that don't have the constants POLLRDNORM and Andrew M. Kuchling <amk@amk.ca> parents: 14869 diff changeset	1795 #endif
914ae7f9c64c Add #ifdef's for platforms that don't have the constants POLLRDNORM and Andrew M. Kuchling <amk@amk.ca> parents: 14869 diff changeset	1796 #ifdef POLLWRNORM
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1797 PyModule_AddIntConstant(m, "POLLWRNORM", POLLWRNORM);
14918 914ae7f9c64c Add #ifdef's for platforms that don't have the constants POLLRDNORM and Andrew M. Kuchling <amk@amk.ca> parents: 14869 diff changeset	1798 #endif
914ae7f9c64c Add #ifdef's for platforms that don't have the constants POLLRDNORM and Andrew M. Kuchling <amk@amk.ca> parents: 14869 diff changeset	1799 #ifdef POLLWRBAND
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1800 PyModule_AddIntConstant(m, "POLLWRBAND", POLLWRBAND);
14918 914ae7f9c64c Add #ifdef's for platforms that don't have the constants POLLRDNORM and Andrew M. Kuchling <amk@amk.ca> parents: 14869 diff changeset	1801 #endif
14182 c85a80db6845 Not every OS that support poll seems to support POLLMSG. Sjoerd Mullender <sjoerd@acm.org> parents: 14174 diff changeset	1802 #ifdef POLLMSG
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1803 PyModule_AddIntConstant(m, "POLLMSG", POLLMSG);
14182 c85a80db6845 Not every OS that support poll seems to support POLLMSG. Sjoerd Mullender <sjoerd@acm.org> parents: 14174 diff changeset	1804 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1805 }
37935 e3a8a8de355e Patch 1471761 - test for broken poll at runtime Ronald Oussoren <ronaldoussoren@mac.com> parents: 36501 diff changeset	1806 #endif /* HAVE_POLL */
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1807
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1808 #ifdef HAVE_EPOLL
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1809 Py_TYPE(&pyEpoll_Type) = &PyType_Type;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1810 if (PyType_Ready(&pyEpoll_Type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1811 return;
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1812
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1813 Py_INCREF(&pyEpoll_Type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1814 PyModule_AddObject(m, "epoll", (PyObject *) &pyEpoll_Type);
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1815
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1816 PyModule_AddIntConstant(m, "EPOLLIN", EPOLLIN);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1817 PyModule_AddIntConstant(m, "EPOLLOUT", EPOLLOUT);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1818 PyModule_AddIntConstant(m, "EPOLLPRI", EPOLLPRI);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1819 PyModule_AddIntConstant(m, "EPOLLERR", EPOLLERR);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1820 PyModule_AddIntConstant(m, "EPOLLHUP", EPOLLHUP);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1821 PyModule_AddIntConstant(m, "EPOLLET", EPOLLET);
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1822 #ifdef EPOLLONESHOT
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1823 /* Kernel 2.6.2+ */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1824 PyModule_AddIntConstant(m, "EPOLLONESHOT", EPOLLONESHOT);
14182 c85a80db6845 Not every OS that support poll seems to support POLLMSG. Sjoerd Mullender <sjoerd@acm.org> parents: 14174 diff changeset	1825 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1826 /* PyModule_AddIntConstant(m, "EPOLL_RDHUP", EPOLLRDHUP); */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1827 PyModule_AddIntConstant(m, "EPOLLRDNORM", EPOLLRDNORM);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1828 PyModule_AddIntConstant(m, "EPOLLRDBAND", EPOLLRDBAND);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1829 PyModule_AddIntConstant(m, "EPOLLWRNORM", EPOLLWRNORM);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1830 PyModule_AddIntConstant(m, "EPOLLWRBAND", EPOLLWRBAND);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1831 PyModule_AddIntConstant(m, "EPOLLMSG", EPOLLMSG);
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1832 #endif /* HAVE_EPOLL */
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1833
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1834 #ifdef HAVE_KQUEUE
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1835 kqueue_event_Type.tp_new = PyType_GenericNew;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1836 Py_TYPE(&kqueue_event_Type) = &PyType_Type;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1837 if(PyType_Ready(&kqueue_event_Type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1838 return;
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1839
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1840 Py_INCREF(&kqueue_event_Type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1841 PyModule_AddObject(m, "kevent", (PyObject *)&kqueue_event_Type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1842
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1843 Py_TYPE(&kqueue_queue_Type) = &PyType_Type;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1844 if(PyType_Ready(&kqueue_queue_Type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1845 return;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1846 Py_INCREF(&kqueue_queue_Type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1847 PyModule_AddObject(m, "kqueue", (PyObject *)&kqueue_queue_Type);
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1848
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1849 /* event filters */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1850 PyModule_AddIntConstant(m, "KQ_FILTER_READ", EVFILT_READ);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1851 PyModule_AddIntConstant(m, "KQ_FILTER_WRITE", EVFILT_WRITE);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1852 PyModule_AddIntConstant(m, "KQ_FILTER_AIO", EVFILT_AIO);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1853 PyModule_AddIntConstant(m, "KQ_FILTER_VNODE", EVFILT_VNODE);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1854 PyModule_AddIntConstant(m, "KQ_FILTER_PROC", EVFILT_PROC);
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1855 #ifdef EVFILT_NETDEV
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1856 PyModule_AddIntConstant(m, "KQ_FILTER_NETDEV", EVFILT_NETDEV);
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1857 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1858 PyModule_AddIntConstant(m, "KQ_FILTER_SIGNAL", EVFILT_SIGNAL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1859 PyModule_AddIntConstant(m, "KQ_FILTER_TIMER", EVFILT_TIMER);
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1860
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1861 /* event flags */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1862 PyModule_AddIntConstant(m, "KQ_EV_ADD", EV_ADD);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1863 PyModule_AddIntConstant(m, "KQ_EV_DELETE", EV_DELETE);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1864 PyModule_AddIntConstant(m, "KQ_EV_ENABLE", EV_ENABLE);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1865 PyModule_AddIntConstant(m, "KQ_EV_DISABLE", EV_DISABLE);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1866 PyModule_AddIntConstant(m, "KQ_EV_ONESHOT", EV_ONESHOT);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1867 PyModule_AddIntConstant(m, "KQ_EV_CLEAR", EV_CLEAR);
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1868
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1869 PyModule_AddIntConstant(m, "KQ_EV_SYSFLAGS", EV_SYSFLAGS);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1870 PyModule_AddIntConstant(m, "KQ_EV_FLAG1", EV_FLAG1);
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1871
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1872 PyModule_AddIntConstant(m, "KQ_EV_EOF", EV_EOF);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1873 PyModule_AddIntConstant(m, "KQ_EV_ERROR", EV_ERROR);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1874
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1875 /* READ WRITE filter flag */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1876 PyModule_AddIntConstant(m, "KQ_NOTE_LOWAT", NOTE_LOWAT);
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1877
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1878 /* VNODE filter flags */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1879 PyModule_AddIntConstant(m, "KQ_NOTE_DELETE", NOTE_DELETE);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1880 PyModule_AddIntConstant(m, "KQ_NOTE_WRITE", NOTE_WRITE);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1881 PyModule_AddIntConstant(m, "KQ_NOTE_EXTEND", NOTE_EXTEND);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1882 PyModule_AddIntConstant(m, "KQ_NOTE_ATTRIB", NOTE_ATTRIB);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1883 PyModule_AddIntConstant(m, "KQ_NOTE_LINK", NOTE_LINK);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1884 PyModule_AddIntConstant(m, "KQ_NOTE_RENAME", NOTE_RENAME);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1885 PyModule_AddIntConstant(m, "KQ_NOTE_REVOKE", NOTE_REVOKE);
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1886
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1887 /* PROC filter flags */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1888 PyModule_AddIntConstant(m, "KQ_NOTE_EXIT", NOTE_EXIT);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1889 PyModule_AddIntConstant(m, "KQ_NOTE_FORK", NOTE_FORK);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1890 PyModule_AddIntConstant(m, "KQ_NOTE_EXEC", NOTE_EXEC);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1891 PyModule_AddIntConstant(m, "KQ_NOTE_PCTRLMASK", NOTE_PCTRLMASK);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1892 PyModule_AddIntConstant(m, "KQ_NOTE_PDATAMASK", NOTE_PDATAMASK);
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1893
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1894 PyModule_AddIntConstant(m, "KQ_NOTE_TRACK", NOTE_TRACK);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1895 PyModule_AddIntConstant(m, "KQ_NOTE_CHILD", NOTE_CHILD);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1896 PyModule_AddIntConstant(m, "KQ_NOTE_TRACKERR", NOTE_TRACKERR);
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1897
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1898 /* NETDEV filter flags */
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1899 #ifdef EVFILT_NETDEV
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1900 PyModule_AddIntConstant(m, "KQ_NOTE_LINKUP", NOTE_LINKUP);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1901 PyModule_AddIntConstant(m, "KQ_NOTE_LINKDOWN", NOTE_LINKDOWN);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60424 diff changeset	1902 PyModule_AddIntConstant(m, "KQ_NOTE_LINKINV", NOTE_LINKINV);
45991 728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1903 #endif
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1904
728dc13327b2 Applied patch #1657 epoll and kqueue wrappers for the select module Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	1905 #endif /* HAVE_KQUEUE */
902 a4793ae26682 Changes for new UNIX-specific built-in module 'select' and new header for Guido van Rossum <guido@python.org> parents: diff changeset	1906 }

Mercurial > cpython-lru_cache-weakref

annotate Modules/selectmodule.c @ 82251:bb5a8564e186 2.7