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

annotate Modules/selectmodule.c @ 80779:10d04bdb05ab 3.3

Issue #16248: Disable code execution from the user's home directory by tkinter when the -E flag is passed to Python. Patch by Zachary Ware.

author	Antoine Pitrou <solipsis@pitrou.net>
date	Sun, 09 Dec 2012 14:46:46 +0100
parents	717660ec8f67
children	8f10c9eae183 823898ef37ce

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.
3675 d617de15774b Yet another pass at fd2obj -- this time for Windows Guido van Rossum <guido@python.org> parents: 2611 diff changeset	5 */
902 a4793ae26682 Changes for new UNIX-specific built-in module 'select' and new header for Guido van Rossum <guido@python.org> parents: diff changeset	6
4692 cb405b9696d4 Several changes... Guido please take a look! Barry Warsaw <barry@python.org> parents: 4621 diff changeset	7 #include "Python.h"
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	8 #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	9
73549 8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	10 #ifdef HAVE_SYS_DEVPOLL_H
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	11 #include <sys/resource.h>
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	12 #include <sys/devpoll.h>
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	13 #include <sys/types.h>
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	14 #include <sys/stat.h>
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	15 #include <fcntl.h>
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	16 #endif
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	17
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	18 #ifdef __APPLE__
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	19 /* Perform runtime testing for a broken poll on OSX to make it easier
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	20 * to use the same binary on multiple releases of the OS.
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	21 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	22 #undef HAVE_BROKEN_POLL
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	23 #endif
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	24
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	25 /* 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	26 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	27 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	28 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	29 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	30 */
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	31 #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	32 #define FD_SETSIZE 512
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	33 #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	34
18603 b9d47d083d2c [Bug #438050] Andrew M. Kuchling <amk@amk.ca> parents: 17873 diff changeset	35 #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	36 #include <poll.h>
18603 b9d47d083d2c [Bug #438050] Andrew M. Kuchling <amk@amk.ca> parents: 17873 diff changeset	37 #elif defined(HAVE_SYS_POLL_H)
b9d47d083d2c [Bug #438050] Andrew M. Kuchling <amk@amk.ca> parents: 17873 diff changeset	38 #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	39 #endif
4600 d36250aefb82 Keep gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	40
4621 a2f171ce25f8 Add ``extern void bzero();'' for SGI, to keep gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4600 diff changeset	41 #ifdef __sgi
a2f171ce25f8 Add ``extern void bzero();'' for SGI, to keep gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4600 diff changeset	42 /* 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	43 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	44 #endif
a2f171ce25f8 Add ``extern void bzero();'' for SGI, to keep gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4600 diff changeset	45
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	46 #ifdef HAVE_SYS_TYPES_H
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1392 diff changeset	47 #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	48 #endif
3675 d617de15774b Yet another pass at fd2obj -- this time for Windows Guido van Rossum <guido@python.org> parents: 2611 diff changeset	49
22114 c454b76d51e7 OS/2 EMX port changes (Modules part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21712 diff changeset	50 #if defined(PYOS_OS2) && !defined(PYCC_GCC)
6626 5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6367 diff changeset	51 #include <sys/time.h>
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6367 diff changeset	52 #include <utils.h>
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6367 diff changeset	53 #endif
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6367 diff changeset	54
3738 ce74bba8a6a6 Slightly different Windows ifdefs Guido van Rossum <guido@python.org> parents: 3675 diff changeset	55 #ifdef MS_WINDOWS
44469 5d7d2af59afe Some VS 6.0 compatibility fixes from Hirokazu Yamamoto which are also useful for later versions of MSVC. VS6 claims that fortran is a reserved word Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	56 # define WIN32_LEAN_AND_MEAN
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	57 # include <winsock.h>
3675 d617de15774b Yet another pass at fd2obj -- this time for Windows Guido van Rossum <guido@python.org> parents: 2611 diff changeset	58 #else
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	59 # define SOCKET int
42645 a5e984eda45a Remove support for BeOS Skip Montanaro <skip@pobox.com> parents: 42334 diff changeset	60 # if defined(__VMS)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	61 # include <socket.h>
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	62 # endif
8823 f2a4a2b60860 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8616 diff changeset	63 #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	64
4700 825038d98ab6 Reworked to eliminate all potential memory problems, including Barry Warsaw <barry@python.org> parents: 4692 diff changeset	65 /* 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	66 typedef struct {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	67 PyObject obj; / owned reference */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	68 SOCKET fd;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	69 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	70 } pylist;
d617de15774b Yet another pass at fd2obj -- this time for Windows Guido van Rossum <guido@python.org> parents: 2611 diff changeset	71
4700 825038d98ab6 Reworked to eliminate all potential memory problems, including Barry Warsaw <barry@python.org> parents: 4692 diff changeset	72 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	73 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	74 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	75 int i;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	76 for (i = 0; i < FD_SETSIZE + 1 && fd2obj[i].sentinel >= 0; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	77 Py_XDECREF(fd2obj[i].obj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	78 fd2obj[i].obj = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	79 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	80 fd2obj[0].sentinel = -1;
4700 825038d98ab6 Reworked to eliminate all potential memory problems, including Barry Warsaw <barry@python.org> parents: 4692 diff changeset	81 }
825038d98ab6 Reworked to eliminate all potential memory problems, including Barry Warsaw <barry@python.org> parents: 4692 diff changeset	82
825038d98ab6 Reworked to eliminate all potential memory problems, including Barry Warsaw <barry@python.org> parents: 4692 diff changeset	83
4692 cb405b9696d4 Several changes... Guido please take a look! Barry Warsaw <barry@python.org> parents: 4621 diff changeset	84 /* 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	85 returns a number >= 0
cb405b9696d4 Several changes... Guido please take a look! Barry Warsaw <barry@python.org> parents: 4621 diff changeset	86 */
3675 d617de15774b Yet another pass at fd2obj -- this time for Windows Guido van Rossum <guido@python.org> parents: 2611 diff changeset	87 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	88 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	89 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	90 int max = -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	91 int index = 0;
80161 87ccf2635ad7 Issue #16230: Fix a crash in select.select() when one the lists changes size while iterated on. Antoine Pitrou <solipsis@pitrou.net> parents: 78182 diff changeset	92 Py_ssize_t i;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	93 PyObject* fast_seq = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	94 PyObject* o = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	95
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	96 fd2obj[0].obj = (PyObject)0; / set list to zero size */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	97 FD_ZERO(set);
4700 825038d98ab6 Reworked to eliminate all potential memory problems, including Barry Warsaw <barry@python.org> parents: 4692 diff changeset	98
62579 a857dd407964 Merged revisions 79894-79895,80098,80120 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 61466 diff changeset	99 fast_seq = PySequence_Fast(seq, "arguments 1-3 must be sequences");
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	100 if (!fast_seq)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	101 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	102
80161 87ccf2635ad7 Issue #16230: Fix a crash in select.select() when one the lists changes size while iterated on. Antoine Pitrou <solipsis@pitrou.net> parents: 78182 diff changeset	103 for (i = 0; i < PySequence_Fast_GET_SIZE(fast_seq); i++) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	104 SOCKET v;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	105
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	106 /* any intervening fileno() calls could decr this refcnt */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	107 if (!(o = PySequence_Fast_GET_ITEM(fast_seq, i)))
78182 bc9b2956bb8b Closes #15395: memory leaks in selectmodule.c Jesus Cea <jcea@jcea.es> parents: 72115 diff changeset	108 goto finally;
30402 a430be683a7a select.select() now accepts a sequence (as defined by PySequence_Fast()) for Brett Cannon <bcannon@gmail.com> parents: 27815 diff changeset	109
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	110 Py_INCREF(o);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	111 v = PyObject_AsFileDescriptor( o );
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	112 if (v == -1) goto finally;
4700 825038d98ab6 Reworked to eliminate all potential memory problems, including Barry Warsaw <barry@python.org> parents: 4692 diff changeset	113
11656 db756d31e727 According to Ron Bickers, and with apparent approval of Chris Guido van Rossum <guido@python.org> parents: 11243 diff changeset	114 #if defined(_MSC_VER)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	115 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	116 #else /* !_MSC_VER */
72115 852ca32eb18d Issue #12287: Fix a stack corruption in ossaudiodev module when the FD is Charles-François Natali <neologix@free.fr> parents: 71001 diff changeset	117 if (!_PyIsSelectable_fd(v)) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	118 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	119 "filedescriptor out of range in select()");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	120 goto finally;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	121 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	122 if (v > max)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	123 max = v;
4700 825038d98ab6 Reworked to eliminate all potential memory problems, including Barry Warsaw <barry@python.org> parents: 4692 diff changeset	124 #endif /* _MSC_VER */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	125 FD_SET(v, set);
4700 825038d98ab6 Reworked to eliminate all potential memory problems, including Barry Warsaw <barry@python.org> parents: 4692 diff changeset	126
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	127 /* add object and its file descriptor to the list */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	128 if (index >= FD_SETSIZE) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	129 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	130 "too many file descriptors in select()");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	131 goto finally;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	132 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	133 fd2obj[index].obj = o;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	134 fd2obj[index].fd = v;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	135 fd2obj[index].sentinel = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	136 fd2obj[++index].sentinel = -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	137 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	138 Py_DECREF(fast_seq);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	139 return max+1;
4700 825038d98ab6 Reworked to eliminate all potential memory problems, including Barry Warsaw <barry@python.org> parents: 4692 diff changeset	140
825038d98ab6 Reworked to eliminate all potential memory problems, including Barry Warsaw <barry@python.org> parents: 4692 diff changeset	141 finally:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	142 Py_XDECREF(o);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	143 Py_DECREF(fast_seq);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	144 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	145 }
a4793ae26682 Changes for new UNIX-specific built-in module 'select' and new header for Guido van Rossum <guido@python.org> parents: diff changeset	146
4692 cb405b9696d4 Several changes... Guido please take a look! Barry Warsaw <barry@python.org> parents: 4621 diff changeset	147 /* 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	148 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	149 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	150 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	151 int i, j, count=0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	152 PyObject list, o;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	153 SOCKET fd;
4692 cb405b9696d4 Several changes... Guido please take a look! Barry Warsaw <barry@python.org> parents: 4621 diff changeset	154
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	155 for (j = 0; fd2obj[j].sentinel >= 0; j++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	156 if (FD_ISSET(fd2obj[j].fd, set))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	157 count++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	158 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	159 list = PyList_New(count);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	160 if (!list)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	161 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	162
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	163 i = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	164 for (j = 0; fd2obj[j].sentinel >= 0; j++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	165 fd = fd2obj[j].fd;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	166 if (FD_ISSET(fd, set)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	167 o = fd2obj[j].obj;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	168 fd2obj[j].obj = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	169 /* transfer ownership */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	170 if (PyList_SetItem(list, i, o) < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	171 goto finally;
4700 825038d98ab6 Reworked to eliminate all potential memory problems, including Barry Warsaw <barry@python.org> parents: 4692 diff changeset	172
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	173 i++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	174 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	175 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	176 return list;
4700 825038d98ab6 Reworked to eliminate all potential memory problems, including Barry Warsaw <barry@python.org> parents: 4692 diff changeset	177 finally:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	178 Py_DECREF(list);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	179 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	180 }
4700 825038d98ab6 Reworked to eliminate all potential memory problems, including Barry Warsaw <barry@python.org> parents: 4692 diff changeset	181
19310 6cb9f538dce4 select_select(): Closing bug #448351 the easy way, i.e. by changing Barry Warsaw <barry@python.org> parents: 18754 diff changeset	182 #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	183 #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	184 #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	185 #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	186
4692 cb405b9696d4 Several changes... Guido please take a look! Barry Warsaw <barry@python.org> parents: 4621 diff changeset	187 static PyObject *
13502 7348cceee8fa ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13256 diff changeset	188 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	189 {
19310 6cb9f538dce4 select_select(): Closing bug #448351 the easy way, i.e. by changing Barry Warsaw <barry@python.org> parents: 18754 diff changeset	190 #ifdef SELECT_USES_HEAP
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	191 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	192 #else /* !SELECT_USES_HEAP */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	193 /* XXX: All this should probably be implemented as follows:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	194 * - find the highest descriptor we're interested in
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	195 * - add one
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	196 * - that's the size
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	197 * See: Stevens, APitUE, $12.5.1
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	198 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	199 pylist rfd2obj[FD_SETSIZE + 1];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	200 pylist wfd2obj[FD_SETSIZE + 1];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	201 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	202 #endif /* SELECT_USES_HEAP */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	203 PyObject ifdlist, ofdlist, *efdlist;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	204 PyObject *ret = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	205 PyObject *tout = Py_None;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	206 fd_set ifdset, ofdset, efdset;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	207 struct timeval tv, *tvp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	208 int imax, omax, emax, max;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	209 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	210
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	211 /* convert arguments */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	212 if (!PyArg_UnpackTuple(args, "select", 3, 4,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	213 &ifdlist, &ofdlist, &efdlist, &tout))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	214 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	215
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	216 if (tout == Py_None)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	217 tvp = (struct timeval *)0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	218 else if (!PyNumber_Check(tout)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	219 PyErr_SetString(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	220 "timeout must be a float or None");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	221 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	222 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	223 else {
75613 a0d101220f96 Issue #14180: Fix the select module to handle correctly the Windows timeval Victor Stinner <victor.stinner@gmail.com> parents: 75593 diff changeset	224 #ifdef MS_WINDOWS
a0d101220f96 Issue #14180: Fix the select module to handle correctly the Windows timeval Victor Stinner <victor.stinner@gmail.com> parents: 75593 diff changeset	225 time_t sec;
a0d101220f96 Issue #14180: Fix the select module to handle correctly the Windows timeval Victor Stinner <victor.stinner@gmail.com> parents: 75593 diff changeset	226 if (_PyTime_ObjectToTimeval(tout, &sec, &tv.tv_usec) == -1)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	227 return NULL;
75613 a0d101220f96 Issue #14180: Fix the select module to handle correctly the Windows timeval Victor Stinner <victor.stinner@gmail.com> parents: 75593 diff changeset	228 assert(sizeof(tv.tv_sec) == sizeof(long));
a0d101220f96 Issue #14180: Fix the select module to handle correctly the Windows timeval Victor Stinner <victor.stinner@gmail.com> parents: 75593 diff changeset	229 #if SIZEOF_TIME_T > SIZEOF_LONG
a0d101220f96 Issue #14180: Fix the select module to handle correctly the Windows timeval Victor Stinner <victor.stinner@gmail.com> parents: 75593 diff changeset	230 if (sec > LONG_MAX) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	231 PyErr_SetString(PyExc_OverflowError,
75613 a0d101220f96 Issue #14180: Fix the select module to handle correctly the Windows timeval Victor Stinner <victor.stinner@gmail.com> parents: 75593 diff changeset	232 "timeout is too large");
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	233 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	234 }
75613 a0d101220f96 Issue #14180: Fix the select module to handle correctly the Windows timeval Victor Stinner <victor.stinner@gmail.com> parents: 75593 diff changeset	235 #endif
a0d101220f96 Issue #14180: Fix the select module to handle correctly the Windows timeval Victor Stinner <victor.stinner@gmail.com> parents: 75593 diff changeset	236 tv.tv_sec = (long)sec;
a0d101220f96 Issue #14180: Fix the select module to handle correctly the Windows timeval Victor Stinner <victor.stinner@gmail.com> parents: 75593 diff changeset	237 #else
76156 3028c8d46c00 struct timeval.tv_usec is 4 bytes on 64-bit OS X as it should be, but Brett Cannon <brett@python.org> parents: 75613 diff changeset	238 /* 64-bit OS X has struct timeval.tv_usec as an int (and thus still 4
3028c8d46c00 struct timeval.tv_usec is 4 bytes on 64-bit OS X as it should be, but Brett Cannon <brett@python.org> parents: 75613 diff changeset	239 bytes as required), but no longer defined by a long. */
78994 6cdc72f4d82c remove useless and defined initialization (closes #15921) Benjamin Peterson <benjamin@python.org> parents: 78183 diff changeset	240 long tv_usec;
76156 3028c8d46c00 struct timeval.tv_usec is 4 bytes on 64-bit OS X as it should be, but Brett Cannon <brett@python.org> parents: 75613 diff changeset	241 if (_PyTime_ObjectToTimeval(tout, &tv.tv_sec, &tv_usec) == -1)
75613 a0d101220f96 Issue #14180: Fix the select module to handle correctly the Windows timeval Victor Stinner <victor.stinner@gmail.com> parents: 75593 diff changeset	242 return NULL;
76156 3028c8d46c00 struct timeval.tv_usec is 4 bytes on 64-bit OS X as it should be, but Brett Cannon <brett@python.org> parents: 75613 diff changeset	243 tv.tv_usec = tv_usec;
75613 a0d101220f96 Issue #14180: Fix the select module to handle correctly the Windows timeval Victor Stinner <victor.stinner@gmail.com> parents: 75593 diff changeset	244 #endif
75590 1e9cc1a03365 Close #14180: Factorize code to convert a number of seconds to time_t, timeval or timespec Victor Stinner <vstinner@wyplay.com> parents: 74188 diff changeset	245 if (tv.tv_sec < 0) {
1e9cc1a03365 Close #14180: Factorize code to convert a number of seconds to time_t, timeval or timespec Victor Stinner <vstinner@wyplay.com> parents: 74188 diff changeset	246 PyErr_SetString(PyExc_ValueError, "timeout must be non-negative");
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	247 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	248 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	249 tvp = &tv;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	250 }
4692 cb405b9696d4 Several changes... Guido please take a look! Barry Warsaw <barry@python.org> parents: 4621 diff changeset	251
902 a4793ae26682 Changes for new UNIX-specific built-in module 'select' and new header for Guido van Rossum <guido@python.org> parents: diff changeset	252
19310 6cb9f538dce4 select_select(): Closing bug #448351 the easy way, i.e. by changing Barry Warsaw <barry@python.org> parents: 18754 diff changeset	253 #ifdef SELECT_USES_HEAP
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	254 /* Allocate memory for the lists */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	255 rfd2obj = PyMem_NEW(pylist, FD_SETSIZE + 1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	256 wfd2obj = PyMem_NEW(pylist, FD_SETSIZE + 1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	257 efd2obj = PyMem_NEW(pylist, FD_SETSIZE + 1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	258 if (rfd2obj == NULL \|\| wfd2obj == NULL \|\| efd2obj == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	259 if (rfd2obj) PyMem_DEL(rfd2obj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	260 if (wfd2obj) PyMem_DEL(wfd2obj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	261 if (efd2obj) PyMem_DEL(efd2obj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	262 return PyErr_NoMemory();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	263 }
19310 6cb9f538dce4 select_select(): Closing bug #448351 the easy way, i.e. by changing Barry Warsaw <barry@python.org> parents: 18754 diff changeset	264 #endif /* SELECT_USES_HEAP */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	265 /* Convert sequences to fd_sets, and get maximum fd number
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	266 * propagates the Python exception set in seq2set()
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	267 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	268 rfd2obj[0].sentinel = -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	269 wfd2obj[0].sentinel = -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	270 efd2obj[0].sentinel = -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	271 if ((imax=seq2set(ifdlist, &ifdset, rfd2obj)) < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	272 goto finally;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	273 if ((omax=seq2set(ofdlist, &ofdset, wfd2obj)) < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	274 goto finally;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	275 if ((emax=seq2set(efdlist, &efdset, efd2obj)) < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	276 goto finally;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	277 max = imax;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	278 if (omax > max) max = omax;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	279 if (emax > max) max = emax;
4692 cb405b9696d4 Several changes... Guido please take a look! Barry Warsaw <barry@python.org> parents: 4621 diff changeset	280
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	281 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	282 n = select(max, &ifdset, &ofdset, &efdset, tvp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	283 Py_END_ALLOW_THREADS
4692 cb405b9696d4 Several changes... Guido please take a look! Barry Warsaw <barry@python.org> parents: 4621 diff changeset	284
25399 97424b99df91 On Windows, call WSAGetLastError() to retrieve the error number. Thomas Heller <theller@ctypes.org> parents: 24408 diff changeset	285 #ifdef MS_WINDOWS
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	286 if (n == SOCKET_ERROR) {
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72116 diff changeset	287 PyErr_SetExcFromWindowsErr(PyExc_OSError, WSAGetLastError());
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	288 }
25399 97424b99df91 On Windows, call WSAGetLastError() to retrieve the error number. Thomas Heller <theller@ctypes.org> parents: 24408 diff changeset	289 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	290 if (n < 0) {
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72116 diff changeset	291 PyErr_SetFromErrno(PyExc_OSError);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	292 }
25399 97424b99df91 On Windows, call WSAGetLastError() to retrieve the error number. Thomas Heller <theller@ctypes.org> parents: 24408 diff changeset	293 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	294 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	295 /* any of these three calls can raise an exception. it's more
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	296 convenient to test for this after all three calls... but
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	297 is that acceptable?
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	298 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	299 ifdlist = set2list(&ifdset, rfd2obj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	300 ofdlist = set2list(&ofdset, wfd2obj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	301 efdlist = set2list(&efdset, efd2obj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	302 if (PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	303 ret = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	304 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	305 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	306
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	307 Py_DECREF(ifdlist);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	308 Py_DECREF(ofdlist);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	309 Py_DECREF(efdlist);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	310 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	311
4700 825038d98ab6 Reworked to eliminate all potential memory problems, including Barry Warsaw <barry@python.org> parents: 4692 diff changeset	312 finally:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	313 reap_obj(rfd2obj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	314 reap_obj(wfd2obj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	315 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	316 #ifdef SELECT_USES_HEAP
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	317 PyMem_DEL(rfd2obj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	318 PyMem_DEL(wfd2obj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	319 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	320 #endif /* SELECT_USES_HEAP */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	321 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	322 }
a4793ae26682 Changes for new UNIX-specific built-in module 'select' and new header for Guido van Rossum <guido@python.org> parents: diff changeset	323
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	324 #if defined(HAVE_POLL) && !defined(HAVE_BROKEN_POLL)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	325 /*
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	326 * poll() support
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 typedef struct {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	330 PyObject_HEAD
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	331 PyObject *dict;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	332 int ufd_uptodate;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	333 int ufd_len;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	334 struct pollfd *ufds;
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	335 } pollObject;
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	336
24280 1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 23832 diff changeset	337 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	338
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	339 /* 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	340 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	341 */
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	342
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	343 static int
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	344 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	345 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	346 Py_ssize_t i, pos;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	347 PyObject key, value;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	348 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	349
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	350 self->ufd_len = PyDict_Size(self->dict);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	351 PyMem_RESIZE(self->ufds, struct pollfd, self->ufd_len);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	352 if (self->ufds == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	353 self->ufds = old_ufds;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	354 PyErr_NoMemory();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	355 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	356 }
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	357
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	358 i = pos = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	359 while (PyDict_Next(self->dict, &pos, &key, &value)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	360 self->ufds[i].fd = PyLong_AsLong(key);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	361 self->ufds[i].events = (short)PyLong_AsLong(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	362 i++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	363 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	364 self->ufd_uptodate = 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	365 return 1;
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	366 }
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	367
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23607 diff changeset	368 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	369 "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	370 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	371 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	372 int.\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23607 diff changeset	373 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	374
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	375 static PyObject *
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	376 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	377 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	378 PyObject o, key, *value;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	379 int fd, events = POLLIN \| POLLPRI \| POLLOUT;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	380 int err;
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	381
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	382 if (!PyArg_ParseTuple(args, "O\|i:register", &o, &events)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	383 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	384 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	385
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	386 fd = PyObject_AsFileDescriptor(o);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	387 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	388
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	389 /* Add entry to the internal dictionary: the key is the
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	390 file descriptor, and the value is the event mask. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	391 key = PyLong_FromLong(fd);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	392 if (key == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	393 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	394 value = PyLong_FromLong(events);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	395 if (value == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	396 Py_DECREF(key);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	397 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	398 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	399 err = PyDict_SetItem(self->dict, key, value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	400 Py_DECREF(key);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	401 Py_DECREF(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	402 if (err < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	403 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	404
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	405 self->ufd_uptodate = 0;
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	406
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	407 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	408 return Py_None;
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	409 }
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	410
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	411 PyDoc_STRVAR(poll_modify_doc,
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	412 "modify(fd, eventmask) -> None\n\n\
46115 1b6c0ff134fa Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45996 diff changeset	413 Modify an already registered file descriptor.\n\
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	414 fd -- either an integer, or an object with a fileno() method returning an\n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	415 int.\n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	416 events -- an optional bitmask describing the type of events to check for");
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	417
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	418 static PyObject *
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	419 poll_modify(pollObject self, PyObject args)
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	420 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	421 PyObject o, key, *value;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	422 int fd, events;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	423 int err;
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	424
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	425 if (!PyArg_ParseTuple(args, "Oi:modify", &o, &events)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	426 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	427 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	428
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	429 fd = PyObject_AsFileDescriptor(o);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	430 if (fd == -1) return NULL;
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	431
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	432 /* Modify registered fd */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	433 key = PyLong_FromLong(fd);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	434 if (key == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	435 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	436 if (PyDict_GetItem(self->dict, key) == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	437 errno = ENOENT;
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72116 diff changeset	438 PyErr_SetFromErrno(PyExc_OSError);
78182 bc9b2956bb8b Closes #15395: memory leaks in selectmodule.c Jesus Cea <jcea@jcea.es> parents: 72115 diff changeset	439 Py_DECREF(key);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	440 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	441 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	442 value = PyLong_FromLong(events);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	443 if (value == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	444 Py_DECREF(key);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	445 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	446 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	447 err = PyDict_SetItem(self->dict, key, value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	448 Py_DECREF(key);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	449 Py_DECREF(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	450 if (err < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	451 return NULL;
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	452
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	453 self->ufd_uptodate = 0;
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	454
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	455 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	456 return Py_None;
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	457 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	458
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	459
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23607 diff changeset	460 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	461 "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	462 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	463
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	464 static PyObject *
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	465 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	466 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	467 PyObject *key;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	468 int fd;
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	469
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	470 fd = PyObject_AsFileDescriptor( o );
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	471 if (fd == -1)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	472 return NULL;
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	473
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	474 /* Check whether the fd is already in the array */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	475 key = PyLong_FromLong(fd);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	476 if (key == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	477 return NULL;
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	478
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	479 if (PyDict_DelItem(self->dict, key) == -1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	480 Py_DECREF(key);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	481 /* This will simply raise the KeyError set by PyDict_DelItem
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	482 if the file descriptor isn't registered. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	483 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	484 }
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	485
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	486 Py_DECREF(key);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	487 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	488
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	489 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	490 return Py_None;
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	491 }
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	492
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23607 diff changeset	493 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	494 "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	495 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	496 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	497
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	498 static PyObject *
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	499 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	500 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	501 PyObject result_list = NULL, tout = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	502 int timeout = 0, poll_result, i, j;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	503 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	504
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	505 if (!PyArg_UnpackTuple(args, "poll", 0, 1, &tout)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	506 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	507 }
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	508
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	509 /* Check values for timeout */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	510 if (tout == NULL \|\| tout == Py_None)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	511 timeout = -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	512 else if (!PyNumber_Check(tout)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	513 PyErr_SetString(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	514 "timeout must be an integer or None");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	515 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	516 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	517 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	518 tout = PyNumber_Long(tout);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	519 if (!tout)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	520 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	521 timeout = PyLong_AsLong(tout);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	522 Py_DECREF(tout);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	523 if (timeout == -1 && PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	524 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	525 }
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	526
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	527 /* Ensure the ufd array is up to date */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	528 if (!self->ufd_uptodate)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	529 if (update_ufd_array(self) == 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	530 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	531
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	532 /* call poll() */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	533 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	534 poll_result = poll(self->ufds, self->ufd_len, timeout);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	535 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	536
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	537 if (poll_result < 0) {
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72116 diff changeset	538 PyErr_SetFromErrno(PyExc_OSError);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	539 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	540 }
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	541
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	542 /* 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	543
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	544 result_list = PyList_New(poll_result);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	545 if (!result_list)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	546 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	547 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	548 for (i = 0, j = 0; j < poll_result; j++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	549 /* skip to the next fired descriptor */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	550 while (!self->ufds[i].revents) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	551 i++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	552 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	553 /* if we hit a NULL return, set value to NULL
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	554 and break out of loop; code at end will
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	555 clean up result_list */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	556 value = PyTuple_New(2);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	557 if (value == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	558 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	559 num = PyLong_FromLong(self->ufds[i].fd);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	560 if (num == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	561 Py_DECREF(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	562 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	563 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	564 PyTuple_SET_ITEM(value, 0, num);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	565
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	566 /* The &0xffff is a workaround for AIX. 'revents'
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	567 is a 16-bit short, and IBM assigned POLLNVAL
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	568 to be 0x8000, so the conversion to int results
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	569 in a negative number. See SF bug #923315. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	570 num = PyLong_FromLong(self->ufds[i].revents & 0xffff);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	571 if (num == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	572 Py_DECREF(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	573 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	574 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	575 PyTuple_SET_ITEM(value, 1, num);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	576 if ((PyList_SetItem(result_list, j, value)) == -1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	577 Py_DECREF(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	578 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	579 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	580 i++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	581 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	582 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	583 return result_list;
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	584
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	585 error:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	586 Py_DECREF(result_list);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	587 return NULL;
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	588 }
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 static PyMethodDef poll_methods[] = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	591 {"register", (PyCFunction)poll_register,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	592 METH_VARARGS, poll_register_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	593 {"modify", (PyCFunction)poll_modify,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	594 METH_VARARGS, poll_modify_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	595 {"unregister", (PyCFunction)poll_unregister,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	596 METH_O, poll_unregister_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	597 {"poll", (PyCFunction)poll_poll,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	598 METH_VARARGS, poll_poll_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	599 {NULL, NULL} /* sentinel */
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	600 };
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	601
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	602 static pollObject *
14277 984abd20eec2 Peter Schneider-Kamp <nowonder@nowonder.de>: Fred Drake <fdrake@acm.org> parents: 14182 diff changeset	603 newPollObject(void)
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	604 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	605 pollObject *self;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	606 self = PyObject_New(pollObject, &poll_Type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	607 if (self == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	608 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	609 /* ufd_uptodate is a Boolean, denoting whether the
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	610 array pointed to by ufds matches the contents of the dictionary. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	611 self->ufd_uptodate = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	612 self->ufds = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	613 self->dict = PyDict_New();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	614 if (self->dict == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	615 Py_DECREF(self);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	616 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	617 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	618 return self;
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	619 }
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	620
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	621 static void
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	622 poll_dealloc(pollObject *self)
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	623 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	624 if (self->ufds != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	625 PyMem_DEL(self->ufds);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	626 Py_XDECREF(self->dict);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	627 PyObject_Del(self);
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	628 }
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	629
24283 c0a67a1cab09 Removed more stray instances of statichere, but left _sre.c alone. Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	630 static PyTypeObject poll_Type = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	631 /* The ob_type field must be initialized in the module init function
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	632 * to be portable to Windows without using C++. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	633 PyVarObject_HEAD_INIT(NULL, 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	634 "select.poll", /tp_name/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	635 sizeof(pollObject), /tp_basicsize/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	636 0, /tp_itemsize/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	637 /* methods */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	638 (destructor)poll_dealloc, /tp_dealloc/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	639 0, /tp_print/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	640 0, /tp_getattr/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	641 0, /tp_setattr/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	642 0, /tp_reserved/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	643 0, /tp_repr/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	644 0, /tp_as_number/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	645 0, /tp_as_sequence/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	646 0, /tp_as_mapping/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	647 0, /tp_hash/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	648 0, /tp_call/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	649 0, /tp_str/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	650 0, /tp_getattro/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	651 0, /tp_setattro/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	652 0, /tp_as_buffer/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	653 Py_TPFLAGS_DEFAULT, /tp_flags/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	654 0, /tp_doc/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	655 0, /tp_traverse/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	656 0, /tp_clear/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	657 0, /tp_richcompare/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	658 0, /tp_weaklistoffset/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	659 0, /tp_iter/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	660 0, /tp_iternext/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	661 poll_methods, /tp_methods/
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	662 };
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	663
73549 8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	664 #ifdef HAVE_SYS_DEVPOLL_H
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	665 typedef struct {
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	666 PyObject_HEAD
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	667 int fd_devpoll;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	668 int max_n_fds;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	669 int n_fds;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	670 struct pollfd *fds;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	671 } devpollObject;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	672
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	673 static PyTypeObject devpoll_Type;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	674
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	675 static int devpoll_flush(devpollObject *self)
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	676 {
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	677 int size, n;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	678
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	679 if (!self->n_fds) return 0;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	680
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	681 size = sizeof(struct pollfd)*self->n_fds;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	682 self->n_fds = 0;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	683
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	684 Py_BEGIN_ALLOW_THREADS
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	685 n = write(self->fd_devpoll, self->fds, size);
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	686 Py_END_ALLOW_THREADS
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	687
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	688 if (n == -1 ) {
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	689 PyErr_SetFromErrno(PyExc_IOError);
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	690 return -1;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	691 }
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	692 if (n < size) {
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	693 /*
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	694 ** Data writed to /dev/poll is a binary data structure. It is not
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	695 ** clear what to do if a partial write occurred. For now, raise
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	696 ** an exception and see if we actually found this problem in
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	697 ** the wild.
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	698 ** See http://bugs.python.org/issue6397.
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	699 */
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	700 PyErr_Format(PyExc_IOError, "failed to write all pollfds. "
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	701 "Please, report at http://bugs.python.org/. "
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	702 "Data to report: Size tried: %d, actual size written: %d.",
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	703 size, n);
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	704 return -1;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	705 }
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	706 return 0;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	707 }
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	708
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	709 static PyObject *
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	710 internal_devpoll_register(devpollObject self, PyObject args, int remove)
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	711 {
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	712 PyObject *o;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	713 int fd, events = POLLIN \| POLLPRI \| POLLOUT;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	714
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	715 if (!PyArg_ParseTuple(args, "O\|i:register", &o, &events)) {
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	716 return NULL;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	717 }
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	718
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	719 fd = PyObject_AsFileDescriptor(o);
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	720 if (fd == -1) return NULL;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	721
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	722 if (remove) {
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	723 self->fds[self->n_fds].fd = fd;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	724 self->fds[self->n_fds].events = POLLREMOVE;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	725
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	726 if (++self->n_fds == self->max_n_fds) {
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	727 if (devpoll_flush(self))
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	728 return NULL;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	729 }
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	730 }
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	731
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	732 self->fds[self->n_fds].fd = fd;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	733 self->fds[self->n_fds].events = events;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	734
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	735 if (++self->n_fds == self->max_n_fds) {
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	736 if (devpoll_flush(self))
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	737 return NULL;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	738 }
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	739
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	740 Py_RETURN_NONE;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	741 }
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	742
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	743 PyDoc_STRVAR(devpoll_register_doc,
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	744 "register(fd [, eventmask] ) -> None\n\n\
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	745 Register a file descriptor with the polling object.\n\
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	746 fd -- either an integer, or an object with a fileno() method returning an\n\
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	747 int.\n\
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	748 events -- an optional bitmask describing the type of events to check for");
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	749
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	750 static PyObject *
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	751 devpoll_register(devpollObject self, PyObject args)
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	752 {
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	753 return internal_devpoll_register(self, args, 0);
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	754 }
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	755
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	756 PyDoc_STRVAR(devpoll_modify_doc,
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	757 "modify(fd[, eventmask]) -> None\n\n\
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	758 Modify a possible already registered file descriptor.\n\
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	759 fd -- either an integer, or an object with a fileno() method returning an\n\
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	760 int.\n\
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	761 events -- an optional bitmask describing the type of events to check for");
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	762
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	763 static PyObject *
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	764 devpoll_modify(devpollObject self, PyObject args)
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	765 {
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	766 return internal_devpoll_register(self, args, 1);
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	767 }
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	768
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	769
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	770 PyDoc_STRVAR(devpoll_unregister_doc,
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	771 "unregister(fd) -> None\n\n\
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	772 Remove a file descriptor being tracked by the polling object.");
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	773
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	774 static PyObject *
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	775 devpoll_unregister(devpollObject self, PyObject o)
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	776 {
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	777 int fd;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	778
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	779 fd = PyObject_AsFileDescriptor( o );
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	780 if (fd == -1)
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	781 return NULL;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	782
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	783 self->fds[self->n_fds].fd = fd;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	784 self->fds[self->n_fds].events = POLLREMOVE;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	785
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	786 if (++self->n_fds == self->max_n_fds) {
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	787 if (devpoll_flush(self))
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	788 return NULL;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	789 }
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	790
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	791 Py_RETURN_NONE;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	792 }
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	793
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	794 PyDoc_STRVAR(devpoll_poll_doc,
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	795 "poll( [timeout] ) -> list of (fd, event) 2-tuples\n\n\
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	796 Polls the set of registered file descriptors, returning a list containing \n\
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	797 any descriptors that have events or errors to report.");
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	798
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	799 static PyObject *
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	800 devpoll_poll(devpollObject self, PyObject args)
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	801 {
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	802 struct dvpoll dvp;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	803 PyObject result_list = NULL, tout = NULL;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	804 int poll_result, i;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	805 long timeout;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	806 PyObject value, num1, *num2;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	807
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	808 if (!PyArg_UnpackTuple(args, "poll", 0, 1, &tout)) {
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	809 return NULL;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	810 }
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	811
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	812 /* Check values for timeout */
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	813 if (tout == NULL \|\| tout == Py_None)
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	814 timeout = -1;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	815 else if (!PyNumber_Check(tout)) {
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	816 PyErr_SetString(PyExc_TypeError,
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	817 "timeout must be an integer or None");
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	818 return NULL;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	819 }
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	820 else {
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	821 tout = PyNumber_Long(tout);
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	822 if (!tout)
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	823 return NULL;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	824 timeout = PyLong_AsLong(tout);
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	825 Py_DECREF(tout);
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	826 if (timeout == -1 && PyErr_Occurred())
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	827 return NULL;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	828 }
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	829
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	830 if ((timeout < -1) \|\| (timeout > INT_MAX)) {
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	831 PyErr_SetString(PyExc_OverflowError,
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	832 "timeout is out of range");
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	833 return NULL;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	834 }
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	835
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	836 if (devpoll_flush(self))
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	837 return NULL;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	838
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	839 dvp.dp_fds = self->fds;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	840 dvp.dp_nfds = self->max_n_fds;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	841 dvp.dp_timeout = timeout;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	842
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	843 /* call devpoll() */
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	844 Py_BEGIN_ALLOW_THREADS
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	845 poll_result = ioctl(self->fd_devpoll, DP_POLL, &dvp);
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	846 Py_END_ALLOW_THREADS
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	847
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	848 if (poll_result < 0) {
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	849 PyErr_SetFromErrno(PyExc_IOError);
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	850 return NULL;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	851 }
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	852
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	853 /* build the result list */
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	854
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	855 result_list = PyList_New(poll_result);
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	856 if (!result_list)
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	857 return NULL;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	858 else {
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	859 for (i = 0; i < poll_result; i++) {
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	860 num1 = PyLong_FromLong(self->fds[i].fd);
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	861 num2 = PyLong_FromLong(self->fds[i].revents);
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	862 if ((num1 == NULL) \|\| (num2 == NULL)) {
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	863 Py_XDECREF(num1);
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	864 Py_XDECREF(num2);
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	865 goto error;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	866 }
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	867 value = PyTuple_Pack(2, num1, num2);
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	868 Py_DECREF(num1);
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	869 Py_DECREF(num2);
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	870 if (value == NULL)
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	871 goto error;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	872 if ((PyList_SetItem(result_list, i, value)) == -1) {
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	873 Py_DECREF(value);
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	874 goto error;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	875 }
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	876 }
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	877 }
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	878
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	879 return result_list;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	880
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	881 error:
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	882 Py_DECREF(result_list);
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	883 return NULL;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	884 }
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	885
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	886 static PyMethodDef devpoll_methods[] = {
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	887 {"register", (PyCFunction)devpoll_register,
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	888 METH_VARARGS, devpoll_register_doc},
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	889 {"modify", (PyCFunction)devpoll_modify,
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	890 METH_VARARGS, devpoll_modify_doc},
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	891 {"unregister", (PyCFunction)devpoll_unregister,
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	892 METH_O, devpoll_unregister_doc},
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	893 {"poll", (PyCFunction)devpoll_poll,
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	894 METH_VARARGS, devpoll_poll_doc},
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	895 {NULL, NULL} /* sentinel */
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	896 };
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	897
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	898 static devpollObject *
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	899 newDevPollObject(void)
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	900 {
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	901 devpollObject *self;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	902 int fd_devpoll, limit_result;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	903 struct pollfd *fds;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	904 struct rlimit limit;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	905
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	906 Py_BEGIN_ALLOW_THREADS
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	907 /*
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	908 ** If we try to process more that getrlimit()
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	909 ** fds, the kernel will give an error, so
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	910 ** we set the limit here. It is a dynamic
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	911 ** value, because we can change rlimit() anytime.
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	912 */
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	913 limit_result = getrlimit(RLIMIT_NOFILE, &limit);
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	914 if (limit_result != -1)
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	915 fd_devpoll = open("/dev/poll", O_RDWR);
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	916 Py_END_ALLOW_THREADS
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	917
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	918 if (limit_result == -1) {
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	919 PyErr_SetFromErrno(PyExc_OSError);
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	920 return NULL;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	921 }
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	922 if (fd_devpoll == -1) {
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	923 PyErr_SetFromErrnoWithFilename(PyExc_IOError, "/dev/poll");
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	924 return NULL;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	925 }
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	926
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	927 fds = PyMem_NEW(struct pollfd, limit.rlim_cur);
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	928 if (fds == NULL) {
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	929 close(fd_devpoll);
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	930 PyErr_NoMemory();
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	931 return NULL;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	932 }
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	933
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	934 self = PyObject_New(devpollObject, &devpoll_Type);
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	935 if (self == NULL) {
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	936 close(fd_devpoll);
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	937 PyMem_DEL(fds);
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	938 return NULL;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	939 }
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	940 self->fd_devpoll = fd_devpoll;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	941 self->max_n_fds = limit.rlim_cur;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	942 self->n_fds = 0;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	943 self->fds = fds;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	944
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	945 return self;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	946 }
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	947
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	948 static void
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	949 devpoll_dealloc(devpollObject *self)
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	950 {
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	951 Py_BEGIN_ALLOW_THREADS
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	952 close(self->fd_devpoll);
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	953 Py_END_ALLOW_THREADS
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	954
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	955 PyMem_DEL(self->fds);
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	956
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	957 PyObject_Del(self);
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	958 }
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	959
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	960 static PyTypeObject devpoll_Type = {
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	961 /* The ob_type field must be initialized in the module init function
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	962 * to be portable to Windows without using C++. */
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	963 PyVarObject_HEAD_INIT(NULL, 0)
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	964 "select.devpoll", /tp_name/
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	965 sizeof(devpollObject), /tp_basicsize/
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	966 0, /tp_itemsize/
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	967 /* methods */
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	968 (destructor)devpoll_dealloc, /tp_dealloc/
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	969 0, /tp_print/
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	970 0, /tp_getattr/
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	971 0, /tp_setattr/
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	972 0, /tp_reserved/
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	973 0, /tp_repr/
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	974 0, /tp_as_number/
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	975 0, /tp_as_sequence/
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	976 0, /tp_as_mapping/
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	977 0, /tp_hash/
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	978 0, /tp_call/
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	979 0, /tp_str/
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	980 0, /tp_getattro/
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	981 0, /tp_setattro/
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	982 0, /tp_as_buffer/
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	983 Py_TPFLAGS_DEFAULT, /tp_flags/
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	984 0, /tp_doc/
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	985 0, /tp_traverse/
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	986 0, /tp_clear/
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	987 0, /tp_richcompare/
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	988 0, /tp_weaklistoffset/
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	989 0, /tp_iter/
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	990 0, /tp_iternext/
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	991 devpoll_methods, /tp_methods/
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	992 };
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	993 #endif /* HAVE_SYS_DEVPOLL_H */
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	994
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	995
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	996
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23607 diff changeset	997 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	998 "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	999 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	1000
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	1001 static PyObject *
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1002 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	1003 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1004 return (PyObject *)newPollObject();
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	1005 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	1006
73549 8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	1007 #ifdef HAVE_SYS_DEVPOLL_H
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	1008 PyDoc_STRVAR(devpoll_doc,
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	1009 "Returns a polling object, which supports registering and\n\
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	1010 unregistering file descriptors, and then polling them for I/O events.");
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	1011
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	1012 static PyObject *
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	1013 select_devpoll(PyObject self, PyObject unused)
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	1014 {
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	1015 return (PyObject *)newDevPollObject();
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	1016 }
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	1017 #endif
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	1018
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	1019
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	1020 #ifdef __APPLE__
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1021 /*
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	1022 * On some systems poll() sets errno on invalid file descriptors. We test
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	1023 * for this at runtime because this bug may be fixed or introduced between
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	1024 * OS releases.
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	1025 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	1026 static int select_have_broken_poll(void)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	1027 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1028 int poll_test;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1029 int filedes[2];
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	1030
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1031 struct pollfd poll_struct = { 0, POLLIN\|POLLPRI\|POLLOUT, 0 };
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	1032
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1033 /* Create a file descriptor to make invalid */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1034 if (pipe(filedes) < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1035 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1036 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1037 poll_struct.fd = filedes[0];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1038 close(filedes[0]);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1039 close(filedes[1]);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1040 poll_test = poll(&poll_struct, 1, 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1041 if (poll_test < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1042 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1043 } else if (poll_test == 0 && poll_struct.revents != POLLNVAL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1044 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1045 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1046 return 0;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	1047 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	1048 #endif /* __APPLE__ */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	1049
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	1050 #endif /* HAVE_POLL */
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	1051
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1052 #ifdef HAVE_EPOLL
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1053 /* **************************************************************************
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1054 * epoll interface for Linux 2.6
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1055 *
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1056 * Written by Christian Heimes
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1057 * Inspired by Twisted's _epoll.pyx and select.poll()
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1058 */
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1059
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1060 #ifdef HAVE_SYS_EPOLL_H
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1061 #include <sys/epoll.h>
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1062 #endif
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1063
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1064 typedef struct {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1065 PyObject_HEAD
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1066 SOCKET epfd; /* epoll control file descriptor */
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1067 } pyEpoll_Object;
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1068
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1069 static PyTypeObject pyEpoll_Type;
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1070 #define pyepoll_CHECK(op) (PyObject_TypeCheck((op), &pyEpoll_Type))
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1071
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1072 static PyObject *
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1073 pyepoll_err_closed(void)
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1074 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1075 PyErr_SetString(PyExc_ValueError, "I/O operation on closed epoll fd");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1076 return NULL;
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1077 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1078
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1079 static int
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1080 pyepoll_internal_close(pyEpoll_Object *self)
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1081 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1082 int save_errno = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1083 if (self->epfd >= 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1084 int epfd = self->epfd;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1085 self->epfd = -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1086 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1087 if (close(epfd) < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1088 save_errno = errno;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1089 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1090 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1091 return save_errno;
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1092 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1093
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1094 static PyObject *
74187 0f9276411dce fix for old kernels which don't have epoll_create1 Benjamin Peterson <benjamin@python.org> parents: 74183 diff changeset	1095 newPyEpoll_Object(PyTypeObject *type, int sizehint, int flags, SOCKET fd)
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1096 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1097 pyEpoll_Object *self;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1098
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1099 assert(type != NULL && type->tp_alloc != NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1100 self = (pyEpoll_Object *) type->tp_alloc(type, 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1101 if (self == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1102 return NULL;
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1103
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1104 if (fd == -1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1105 Py_BEGIN_ALLOW_THREADS
74187 0f9276411dce fix for old kernels which don't have epoll_create1 Benjamin Peterson <benjamin@python.org> parents: 74183 diff changeset	1106 #ifdef HAVE_EPOLL_CREATE1
74188 4aa7b25f9509 try to always use the old API Benjamin Peterson <benjamin@python.org> parents: 74187 diff changeset	1107 if (flags)
4aa7b25f9509 try to always use the old API Benjamin Peterson <benjamin@python.org> parents: 74187 diff changeset	1108 self->epfd = epoll_create1(flags);
4aa7b25f9509 try to always use the old API Benjamin Peterson <benjamin@python.org> parents: 74187 diff changeset	1109 else
4aa7b25f9509 try to always use the old API Benjamin Peterson <benjamin@python.org> parents: 74187 diff changeset	1110 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1111 self->epfd = epoll_create(sizehint);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1112 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1113 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1114 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1115 self->epfd = fd;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1116 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1117 if (self->epfd < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1118 Py_DECREF(self);
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72116 diff changeset	1119 PyErr_SetFromErrno(PyExc_OSError);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1120 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1121 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1122 return (PyObject *)self;
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1123 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1124
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1125
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1126 static PyObject *
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1127 pyepoll_new(PyTypeObject type, PyObject args, PyObject *kwds)
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1128 {
74188 4aa7b25f9509 try to always use the old API Benjamin Peterson <benjamin@python.org> parents: 74187 diff changeset	1129 int flags = 0, sizehint = FD_SETSIZE - 1;
74183 b30a94f7e053 add a flags parameter to select.epoll Benjamin Peterson <benjamin@python.org> parents: 73549 diff changeset	1130 static char *kwlist[] = {"sizehint", "flags", NULL};
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1131
74183 b30a94f7e053 add a flags parameter to select.epoll Benjamin Peterson <benjamin@python.org> parents: 73549 diff changeset	1132 if (!PyArg_ParseTupleAndKeywords(args, kwds, "\|ii:epoll", kwlist,
b30a94f7e053 add a flags parameter to select.epoll Benjamin Peterson <benjamin@python.org> parents: 73549 diff changeset	1133 &sizehint, &flags))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1134 return NULL;
74183 b30a94f7e053 add a flags parameter to select.epoll Benjamin Peterson <benjamin@python.org> parents: 73549 diff changeset	1135 if (sizehint < 0) {
b30a94f7e053 add a flags parameter to select.epoll Benjamin Peterson <benjamin@python.org> parents: 73549 diff changeset	1136 PyErr_SetString(PyExc_ValueError, "negative sizehint");
b30a94f7e053 add a flags parameter to select.epoll Benjamin Peterson <benjamin@python.org> parents: 73549 diff changeset	1137 return NULL;
b30a94f7e053 add a flags parameter to select.epoll Benjamin Peterson <benjamin@python.org> parents: 73549 diff changeset	1138 }
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1139
74187 0f9276411dce fix for old kernels which don't have epoll_create1 Benjamin Peterson <benjamin@python.org> parents: 74183 diff changeset	1140 return newPyEpoll_Object(type, sizehint, flags, -1);
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1141 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1142
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1143
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1144 static void
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1145 pyepoll_dealloc(pyEpoll_Object *self)
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1146 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1147 (void)pyepoll_internal_close(self);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1148 Py_TYPE(self)->tp_free(self);
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1149 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1150
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1151 static PyObject*
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1152 pyepoll_close(pyEpoll_Object *self)
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1153 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1154 errno = pyepoll_internal_close(self);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1155 if (errno < 0) {
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72116 diff changeset	1156 PyErr_SetFromErrno(PyExc_OSError);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1157 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1158 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1159 Py_RETURN_NONE;
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1160 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1161
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1162 PyDoc_STRVAR(pyepoll_close_doc,
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1163 "close() -> None\n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1164 \n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1165 Close the epoll control file descriptor. Further operations on the epoll\n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1166 object will raise an exception.");
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1167
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1168 static PyObject*
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1169 pyepoll_get_closed(pyEpoll_Object *self)
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1170 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1171 if (self->epfd < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1172 Py_RETURN_TRUE;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1173 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1174 Py_RETURN_FALSE;
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1175 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1176
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1177 static PyObject*
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1178 pyepoll_fileno(pyEpoll_Object *self)
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1179 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1180 if (self->epfd < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1181 return pyepoll_err_closed();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1182 return PyLong_FromLong(self->epfd);
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1183 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1184
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1185 PyDoc_STRVAR(pyepoll_fileno_doc,
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1186 "fileno() -> int\n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1187 \n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1188 Return the epoll control file descriptor.");
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1189
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1190 static PyObject*
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1191 pyepoll_fromfd(PyObject cls, PyObject args)
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1192 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1193 SOCKET fd;
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1194
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1195 if (!PyArg_ParseTuple(args, "i:fromfd", &fd))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1196 return NULL;
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1197
74187 0f9276411dce fix for old kernels which don't have epoll_create1 Benjamin Peterson <benjamin@python.org> parents: 74183 diff changeset	1198 return newPyEpoll_Object((PyTypeObject*)cls, FD_SETSIZE - 1, 0, fd);
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1199 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1200
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1201 PyDoc_STRVAR(pyepoll_fromfd_doc,
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1202 "fromfd(fd) -> epoll\n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1203 \n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1204 Create an epoll object from a given control fd.");
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1205
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1206 static PyObject *
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1207 pyepoll_internal_ctl(int epfd, int op, PyObject *pfd, unsigned int events)
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1208 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1209 struct epoll_event ev;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1210 int result;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1211 int fd;
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1212
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1213 if (epfd < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1214 return pyepoll_err_closed();
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1215
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1216 fd = PyObject_AsFileDescriptor(pfd);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1217 if (fd == -1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1218 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1219 }
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1220
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1221 switch(op) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1222 case EPOLL_CTL_ADD:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1223 case EPOLL_CTL_MOD:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1224 ev.events = events;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1225 ev.data.fd = fd;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1226 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1227 result = epoll_ctl(epfd, op, fd, &ev);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1228 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1229 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1230 case EPOLL_CTL_DEL:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1231 /* In kernel versions before 2.6.9, the EPOLL_CTL_DEL
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1232 * operation required a non-NULL pointer in event, even
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1233 * though this argument is ignored. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1234 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1235 result = epoll_ctl(epfd, op, fd, &ev);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1236 if (errno == EBADF) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1237 /* fd already closed */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1238 result = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1239 errno = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1240 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1241 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1242 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1243 default:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1244 result = -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1245 errno = EINVAL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1246 }
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1247
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1248 if (result < 0) {
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72116 diff changeset	1249 PyErr_SetFromErrno(PyExc_OSError);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1250 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1251 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1252 Py_RETURN_NONE;
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1253 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1254
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1255 static PyObject *
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1256 pyepoll_register(pyEpoll_Object self, PyObject args, PyObject *kwds)
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1257 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1258 PyObject *pfd;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1259 unsigned int events = EPOLLIN \| EPOLLOUT \| EPOLLPRI;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1260 static char *kwlist[] = {"fd", "eventmask", NULL};
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1261
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1262 if (!PyArg_ParseTupleAndKeywords(args, kwds, "O\|I:register", kwlist,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1263 &pfd, &events)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1264 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1265 }
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1266
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1267 return pyepoll_internal_ctl(self->epfd, EPOLL_CTL_ADD, pfd, events);
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1268 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1269
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1270 PyDoc_STRVAR(pyepoll_register_doc,
65116 90e1735df4d9 Merged revisions 83561,83563,83565-83566,83569,83571,83574-83575,83580,83584,83599,83612,83659,83977,84015-84018,84020,84141 via svnmerge from Georg Brandl <georg@python.org> parents: 61467 diff changeset	1271 "register(fd[, eventmask]) -> None\n\
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1272 \n\
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72116 diff changeset	1273 Registers a new fd or raises an OSError if the fd is already registered.\n\
46115 1b6c0ff134fa Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45996 diff changeset	1274 fd is the target file descriptor of the operation.\n\
1b6c0ff134fa Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45996 diff changeset	1275 events is a bit set composed of the various EPOLL constants; the default\n\
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1276 is EPOLL_IN \| EPOLL_OUT \| EPOLL_PRI.\n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1277 \n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1278 The epoll interface supports all file descriptors that support poll.");
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1279
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1280 static PyObject *
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1281 pyepoll_modify(pyEpoll_Object self, PyObject args, PyObject *kwds)
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1282 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1283 PyObject *pfd;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1284 unsigned int events;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1285 static char *kwlist[] = {"fd", "eventmask", NULL};
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1286
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1287 if (!PyArg_ParseTupleAndKeywords(args, kwds, "OI:modify", kwlist,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1288 &pfd, &events)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1289 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1290 }
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1291
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1292 return pyepoll_internal_ctl(self->epfd, EPOLL_CTL_MOD, pfd, events);
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1293 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1294
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1295 PyDoc_STRVAR(pyepoll_modify_doc,
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1296 "modify(fd, eventmask) -> None\n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1297 \n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1298 fd is the target file descriptor of the operation\n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1299 events is a bit set composed of the various EPOLL constants");
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1300
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1301 static PyObject *
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1302 pyepoll_unregister(pyEpoll_Object self, PyObject args, PyObject *kwds)
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1303 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1304 PyObject *pfd;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1305 static char *kwlist[] = {"fd", NULL};
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1306
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1307 if (!PyArg_ParseTupleAndKeywords(args, kwds, "O:unregister", kwlist,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1308 &pfd)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1309 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1310 }
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1311
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1312 return pyepoll_internal_ctl(self->epfd, EPOLL_CTL_DEL, pfd, 0);
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1313 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1314
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1315 PyDoc_STRVAR(pyepoll_unregister_doc,
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1316 "unregister(fd) -> None\n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1317 \n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1318 fd is the target file descriptor of the operation.");
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1319
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1320 static PyObject *
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1321 pyepoll_poll(pyEpoll_Object self, PyObject args, PyObject *kwds)
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1322 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1323 double dtimeout = -1.;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1324 int timeout;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1325 int maxevents = -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1326 int nfds, i;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1327 PyObject elist = NULL, etuple = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1328 struct epoll_event *evs = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1329 static char *kwlist[] = {"timeout", "maxevents", NULL};
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1330
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1331 if (self->epfd < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1332 return pyepoll_err_closed();
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1333
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1334 if (!PyArg_ParseTupleAndKeywords(args, kwds, "\|di:poll", kwlist,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1335 &dtimeout, &maxevents)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1336 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1337 }
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1338
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1339 if (dtimeout < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1340 timeout = -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1341 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1342 else if (dtimeout * 1000.0 > INT_MAX) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1343 PyErr_SetString(PyExc_OverflowError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1344 "timeout is too large");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1345 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1346 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1347 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1348 timeout = (int)(dtimeout * 1000.0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1349 }
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1350
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1351 if (maxevents == -1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1352 maxevents = FD_SETSIZE-1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1353 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1354 else if (maxevents < 1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1355 PyErr_Format(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1356 "maxevents must be greater than 0, got %d",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1357 maxevents);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1358 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1359 }
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1360
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1361 evs = PyMem_New(struct epoll_event, maxevents);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1362 if (evs == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1363 Py_DECREF(self);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1364 PyErr_NoMemory();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1365 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1366 }
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1367
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1368 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1369 nfds = epoll_wait(self->epfd, evs, maxevents, timeout);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1370 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1371 if (nfds < 0) {
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72116 diff changeset	1372 PyErr_SetFromErrno(PyExc_OSError);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1373 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1374 }
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1375
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1376 elist = PyList_New(nfds);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1377 if (elist == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1378 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1379 }
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1380
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1381 for (i = 0; i < nfds; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1382 etuple = Py_BuildValue("iI", evs[i].data.fd, evs[i].events);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1383 if (etuple == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1384 Py_CLEAR(elist);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1385 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1386 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1387 PyList_SET_ITEM(elist, i, etuple);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1388 }
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1389
46115 1b6c0ff134fa Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45996 diff changeset	1390 error:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1391 PyMem_Free(evs);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1392 return elist;
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1393 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1394
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1395 PyDoc_STRVAR(pyepoll_poll_doc,
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1396 "poll([timeout=-1[, maxevents=-1]]) -> [(fd, events), (...)]\n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1397 \n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1398 Wait for events on the epoll file descriptor for a maximum time of timeout\n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1399 in seconds (as float). -1 makes poll wait indefinitely.\n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1400 Up to maxevents are returned to the caller.");
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1401
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1402 static PyMethodDef pyepoll_methods[] = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1403 {"fromfd", (PyCFunction)pyepoll_fromfd,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1404 METH_VARARGS \| METH_CLASS, pyepoll_fromfd_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1405 {"close", (PyCFunction)pyepoll_close, METH_NOARGS,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1406 pyepoll_close_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1407 {"fileno", (PyCFunction)pyepoll_fileno, METH_NOARGS,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1408 pyepoll_fileno_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1409 {"modify", (PyCFunction)pyepoll_modify,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1410 METH_VARARGS \| METH_KEYWORDS, pyepoll_modify_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1411 {"register", (PyCFunction)pyepoll_register,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1412 METH_VARARGS \| METH_KEYWORDS, pyepoll_register_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1413 {"unregister", (PyCFunction)pyepoll_unregister,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1414 METH_VARARGS \| METH_KEYWORDS, pyepoll_unregister_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1415 {"poll", (PyCFunction)pyepoll_poll,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1416 METH_VARARGS \| METH_KEYWORDS, pyepoll_poll_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1417 {NULL, NULL},
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1418 };
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1419
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1420 static PyGetSetDef pyepoll_getsetlist[] = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1421 {"closed", (getter)pyepoll_get_closed, NULL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1422 "True if the epoll handler is closed"},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1423 {0},
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1424 };
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1425
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1426 PyDoc_STRVAR(pyepoll_doc,
74183 b30a94f7e053 add a flags parameter to select.epoll Benjamin Peterson <benjamin@python.org> parents: 73549 diff changeset	1427 "select.epoll(sizehint=-1, flags=0)\n\
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1428 \n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1429 Returns an epolling object\n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1430 \n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1431 sizehint must be a positive integer or -1 for the default size. The\n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1432 sizehint is used to optimize internal data structures. It doesn't limit\n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1433 the maximum number of monitored events.");
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1434
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1435 static PyTypeObject pyEpoll_Type = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1436 PyVarObject_HEAD_INIT(NULL, 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1437 "select.epoll", /* tp_name */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1438 sizeof(pyEpoll_Object), /* tp_basicsize */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1439 0, /* tp_itemsize */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1440 (destructor)pyepoll_dealloc, /* tp_dealloc */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1441 0, /* tp_print */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1442 0, /* tp_getattr */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1443 0, /* tp_setattr */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1444 0, /* tp_reserved */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1445 0, /* tp_repr */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1446 0, /* tp_as_number */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1447 0, /* tp_as_sequence */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1448 0, /* tp_as_mapping */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1449 0, /* tp_hash */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1450 0, /* tp_call */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1451 0, /* tp_str */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1452 PyObject_GenericGetAttr, /* tp_getattro */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1453 0, /* tp_setattro */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1454 0, /* tp_as_buffer */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1455 Py_TPFLAGS_DEFAULT, /* tp_flags */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1456 pyepoll_doc, /* tp_doc */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1457 0, /* tp_traverse */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1458 0, /* tp_clear */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1459 0, /* tp_richcompare */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1460 0, /* tp_weaklistoffset */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1461 0, /* tp_iter */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1462 0, /* tp_iternext */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1463 pyepoll_methods, /* tp_methods */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1464 0, /* tp_members */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1465 pyepoll_getsetlist, /* tp_getset */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1466 0, /* tp_base */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1467 0, /* tp_dict */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1468 0, /* tp_descr_get */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1469 0, /* tp_descr_set */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1470 0, /* tp_dictoffset */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1471 0, /* tp_init */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1472 0, /* tp_alloc */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1473 pyepoll_new, /* tp_new */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1474 0, /* tp_free */
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1475 };
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1476
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1477 #endif /* HAVE_EPOLL */
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1478
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1479 #ifdef HAVE_KQUEUE
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1480 /* **************************************************************************
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1481 * kqueue interface for BSD
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1482 *
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1483 * Copyright (c) 2000 Doug White, 2006 James Knight, 2007 Christian Heimes
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1484 * All rights reserved.
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1485 *
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1486 * Redistribution and use in source and binary forms, with or without
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1487 * modification, are permitted provided that the following conditions
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1488 * are met:
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1489 * 1. Redistributions of source code must retain the above copyright
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1490 * notice, this list of conditions and the following disclaimer.
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1491 * 2. Redistributions in binary form must reproduce the above copyright
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1492 * notice, this list of conditions and the following disclaimer in the
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1493 * documentation and/or other materials provided with the distribution.
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1494 *
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1495 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1496 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1497 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1498 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1499 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1500 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1501 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1502 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1503 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1504 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1505 * SUCH DAMAGE.
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1506 */
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1507
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1508 #ifdef HAVE_SYS_EVENT_H
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1509 #include <sys/event.h>
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1510 #endif
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1511
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1512 PyDoc_STRVAR(kqueue_event_doc,
58026 e078579984a4 Merged revisions 77167 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 55618 diff changeset	1513 "kevent(ident, filter=KQ_FILTER_READ, flags=KQ_EV_ADD, fflags=0, data=0, udata=0)\n\
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1514 \n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1515 This object is the equivalent of the struct kevent for the C API.\n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1516 \n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1517 See the kqueue manpage for more detailed information about the meaning\n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1518 of the arguments.\n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1519 \n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1520 One minor note: while you might hope that udata could store a\n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1521 reference to a python object, it cannot, because it is impossible to\n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1522 keep a proper reference count of the object once it's passed into the\n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1523 kernel. Therefore, I have restricted it to only storing an integer. I\n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1524 recommend ignoring it and simply using the 'ident' field to key off\n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1525 of. You could also set up a dictionary on the python side to store a\n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1526 udata->object mapping.");
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1527
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1528 typedef struct {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1529 PyObject_HEAD
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1530 struct kevent e;
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1531 } kqueue_event_Object;
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1532
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1533 static PyTypeObject kqueue_event_Type;
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1534
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1535 #define kqueue_event_Check(op) (PyObject_TypeCheck((op), &kqueue_event_Type))
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1536
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1537 typedef struct {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1538 PyObject_HEAD
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1539 SOCKET kqfd; /* kqueue control fd */
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1540 } kqueue_queue_Object;
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1541
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1542 static PyTypeObject kqueue_queue_Type;
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1543
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1544 #define kqueue_queue_Check(op) (PyObject_TypeCheck((op), &kqueue_queue_Type))
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1545
57113 f89a93a778a8 Merged revisions 76108 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55301 diff changeset	1546 #if (SIZEOF_UINTPTR_T != SIZEOF_VOID_P)
f89a93a778a8 Merged revisions 76108 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55301 diff changeset	1547 # error uintptr_t does not match void *!
f89a93a778a8 Merged revisions 76108 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55301 diff changeset	1548 #elif (SIZEOF_UINTPTR_T == SIZEOF_LONG_LONG)
f89a93a778a8 Merged revisions 76108 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55301 diff changeset	1549 # define T_UINTPTRT T_ULONGLONG
f89a93a778a8 Merged revisions 76108 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55301 diff changeset	1550 # define T_INTPTRT T_LONGLONG
f89a93a778a8 Merged revisions 76108 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55301 diff changeset	1551 # define PyLong_AsUintptr_t PyLong_AsUnsignedLongLong
f89a93a778a8 Merged revisions 76108 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55301 diff changeset	1552 # define UINTPTRT_FMT_UNIT "K"
f89a93a778a8 Merged revisions 76108 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55301 diff changeset	1553 # define INTPTRT_FMT_UNIT "L"
f89a93a778a8 Merged revisions 76108 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55301 diff changeset	1554 #elif (SIZEOF_UINTPTR_T == SIZEOF_LONG)
f89a93a778a8 Merged revisions 76108 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55301 diff changeset	1555 # define T_UINTPTRT T_ULONG
f89a93a778a8 Merged revisions 76108 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55301 diff changeset	1556 # define T_INTPTRT T_LONG
f89a93a778a8 Merged revisions 76108 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55301 diff changeset	1557 # define PyLong_AsUintptr_t PyLong_AsUnsignedLong
f89a93a778a8 Merged revisions 76108 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55301 diff changeset	1558 # define UINTPTRT_FMT_UNIT "k"
f89a93a778a8 Merged revisions 76108 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55301 diff changeset	1559 # define INTPTRT_FMT_UNIT "l"
f89a93a778a8 Merged revisions 76108 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55301 diff changeset	1560 #elif (SIZEOF_UINTPTR_T == SIZEOF_INT)
f89a93a778a8 Merged revisions 76108 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55301 diff changeset	1561 # define T_UINTPTRT T_UINT
f89a93a778a8 Merged revisions 76108 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55301 diff changeset	1562 # define T_INTPTRT T_INT
f89a93a778a8 Merged revisions 76108 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55301 diff changeset	1563 # define PyLong_AsUintptr_t PyLong_AsUnsignedLong
f89a93a778a8 Merged revisions 76108 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55301 diff changeset	1564 # define UINTPTRT_FMT_UNIT "I"
f89a93a778a8 Merged revisions 76108 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55301 diff changeset	1565 # define INTPTRT_FMT_UNIT "i"
f89a93a778a8 Merged revisions 76108 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55301 diff changeset	1566 #else
f89a93a778a8 Merged revisions 76108 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55301 diff changeset	1567 # error uintptr_t does not match int, long, or long long!
f89a93a778a8 Merged revisions 76108 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55301 diff changeset	1568 #endif
f89a93a778a8 Merged revisions 76108 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55301 diff changeset	1569
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1570 /* Unfortunately, we can't store python objects in udata, because
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1571 * kevents in the kernel can be removed without warning, which would
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1572 * forever lose the refcount on the object stored with it.
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1573 */
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1574
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1575 #define KQ_OFF(x) offsetof(kqueue_event_Object, x)
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1576 static struct PyMemberDef kqueue_event_members[] = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1577 {"ident", T_UINTPTRT, KQ_OFF(e.ident)},
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1578 {"filter", T_SHORT, KQ_OFF(e.filter)},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1579 {"flags", T_USHORT, KQ_OFF(e.flags)},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1580 {"fflags", T_UINT, KQ_OFF(e.fflags)},
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1581 {"data", T_INTPTRT, KQ_OFF(e.data)},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1582 {"udata", T_UINTPTRT, KQ_OFF(e.udata)},
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1583 {NULL} /* Sentinel */
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1584 };
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1585 #undef KQ_OFF
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1586
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1587 static PyObject *
59616 9cf702c91a9e Merged revisions 78101,78115,78117,78182,78188,78245,78386,78496 via svnmerge from Georg Brandl <georg@python.org> parents: 58022 diff changeset	1588
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1589 kqueue_event_repr(kqueue_event_Object *s)
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1590 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1591 char buf[1024];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1592 PyOS_snprintf(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1593 buf, sizeof(buf),
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1594 "<select.kevent ident=%zu filter=%d flags=0x%x fflags=0x%x "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1595 "data=0x%zd udata=%p>",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1596 (size_t)(s->e.ident), s->e.filter, s->e.flags,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1597 s->e.fflags, (Py_ssize_t)(s->e.data), s->e.udata);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1598 return PyUnicode_FromString(buf);
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1599 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1600
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1601 static int
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1602 kqueue_event_init(kqueue_event_Object self, PyObject args, PyObject *kwds)
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1603 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1604 PyObject *pfd;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1605 static char *kwlist[] = {"ident", "filter", "flags", "fflags",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1606 "data", "udata", NULL};
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1607 static char *fmt = "O\|hhi" INTPTRT_FMT_UNIT UINTPTRT_FMT_UNIT ":kevent";
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1608
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1609 EV_SET(&(self->e), 0, EVFILT_READ, EV_ADD, 0, 0, 0); /* defaults */
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1610
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1611 if (!PyArg_ParseTupleAndKeywords(args, kwds, fmt, kwlist,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1612 &pfd, &(self->e.filter), &(self->e.flags),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1613 &(self->e.fflags), &(self->e.data), &(self->e.udata))) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1614 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1615 }
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1616
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1617 if (PyLong_Check(pfd)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1618 self->e.ident = PyLong_AsUintptr_t(pfd);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1619 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1620 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1621 self->e.ident = PyObject_AsFileDescriptor(pfd);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1622 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1623 if (PyErr_Occurred()) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1624 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1625 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1626 return 0;
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1627 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1628
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1629 static PyObject *
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1630 kqueue_event_richcompare(kqueue_event_Object s, kqueue_event_Object o,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1631 int op)
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1632 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1633 Py_intptr_t result = 0;
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1634
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1635 if (!kqueue_event_Check(o)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1636 if (op == Py_EQ \|\| op == Py_NE) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1637 PyObject *res = op == Py_EQ ? Py_False : Py_True;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1638 Py_INCREF(res);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1639 return res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1640 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1641 PyErr_Format(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1642 "can't compare %.200s to %.200s",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1643 Py_TYPE(s)->tp_name, Py_TYPE(o)->tp_name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1644 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1645 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1646 if (((result = s->e.ident - o->e.ident) == 0) &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1647 ((result = s->e.filter - o->e.filter) == 0) &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1648 ((result = s->e.flags - o->e.flags) == 0) &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1649 ((result = s->e.fflags - o->e.fflags) == 0) &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1650 ((result = s->e.data - o->e.data) == 0) &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1651 ((result = s->e.udata - o->e.udata) == 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1652 ) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1653 result = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1654 }
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1655
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1656 switch (op) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1657 case Py_EQ:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1658 result = (result == 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1659 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1660 case Py_NE:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1661 result = (result != 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1662 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1663 case Py_LE:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1664 result = (result <= 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1665 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1666 case Py_GE:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1667 result = (result >= 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1668 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1669 case Py_LT:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1670 result = (result < 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1671 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1672 case Py_GT:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1673 result = (result > 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1674 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1675 }
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1676 return PyBool_FromLong((long)result);
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1677 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1678
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1679 static PyTypeObject kqueue_event_Type = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1680 PyVarObject_HEAD_INIT(NULL, 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1681 "select.kevent", /* tp_name */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1682 sizeof(kqueue_event_Object), /* tp_basicsize */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1683 0, /* tp_itemsize */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1684 0, /* tp_dealloc */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1685 0, /* tp_print */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1686 0, /* tp_getattr */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1687 0, /* tp_setattr */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1688 0, /* tp_reserved */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1689 (reprfunc)kqueue_event_repr, /* tp_repr */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1690 0, /* tp_as_number */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1691 0, /* tp_as_sequence */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1692 0, /* tp_as_mapping */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1693 0, /* tp_hash */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1694 0, /* tp_call */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1695 0, /* tp_str */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1696 0, /* tp_getattro */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1697 0, /* tp_setattro */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1698 0, /* tp_as_buffer */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1699 Py_TPFLAGS_DEFAULT, /* tp_flags */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1700 kqueue_event_doc, /* tp_doc */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1701 0, /* tp_traverse */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1702 0, /* tp_clear */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1703 (richcmpfunc)kqueue_event_richcompare, /* tp_richcompare */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1704 0, /* tp_weaklistoffset */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1705 0, /* tp_iter */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1706 0, /* tp_iternext */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1707 0, /* tp_methods */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1708 kqueue_event_members, /* tp_members */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1709 0, /* tp_getset */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1710 0, /* tp_base */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1711 0, /* tp_dict */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1712 0, /* tp_descr_get */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1713 0, /* tp_descr_set */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1714 0, /* tp_dictoffset */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1715 (initproc)kqueue_event_init, /* tp_init */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1716 0, /* tp_alloc */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1717 0, /* tp_new */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1718 0, /* tp_free */
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1719 };
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1720
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1721 static PyObject *
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1722 kqueue_queue_err_closed(void)
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1723 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1724 PyErr_SetString(PyExc_ValueError, "I/O operation on closed kqueue fd");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1725 return NULL;
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1726 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1727
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1728 static int
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1729 kqueue_queue_internal_close(kqueue_queue_Object *self)
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1730 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1731 int save_errno = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1732 if (self->kqfd >= 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1733 int kqfd = self->kqfd;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1734 self->kqfd = -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1735 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1736 if (close(kqfd) < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1737 save_errno = errno;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1738 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1739 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1740 return save_errno;
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1741 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1742
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1743 static PyObject *
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1744 newKqueue_Object(PyTypeObject *type, SOCKET fd)
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1745 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1746 kqueue_queue_Object *self;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1747 assert(type != NULL && type->tp_alloc != NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1748 self = (kqueue_queue_Object *) type->tp_alloc(type, 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1749 if (self == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1750 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1751 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1752
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1753 if (fd == -1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1754 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1755 self->kqfd = kqueue();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1756 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1757 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1758 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1759 self->kqfd = fd;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1760 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1761 if (self->kqfd < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1762 Py_DECREF(self);
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72116 diff changeset	1763 PyErr_SetFromErrno(PyExc_OSError);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1764 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1765 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1766 return (PyObject *)self;
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1767 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1768
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1769 static PyObject *
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1770 kqueue_queue_new(PyTypeObject type, PyObject args, PyObject *kwds)
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1771 {
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1772
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1773 if ((args != NULL && PyObject_Size(args)) \|\|
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1774 (kwds != NULL && PyObject_Size(kwds))) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1775 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1776 "select.kqueue doesn't accept arguments");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1777 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1778 }
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1779
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1780 return newKqueue_Object(type, -1);
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1781 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1782
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1783 static void
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1784 kqueue_queue_dealloc(kqueue_queue_Object *self)
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1785 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1786 kqueue_queue_internal_close(self);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1787 Py_TYPE(self)->tp_free(self);
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1788 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1789
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1790 static PyObject*
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1791 kqueue_queue_close(kqueue_queue_Object *self)
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1792 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1793 errno = kqueue_queue_internal_close(self);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1794 if (errno < 0) {
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72116 diff changeset	1795 PyErr_SetFromErrno(PyExc_OSError);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1796 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1797 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1798 Py_RETURN_NONE;
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1799 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1800
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1801 PyDoc_STRVAR(kqueue_queue_close_doc,
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1802 "close() -> None\n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1803 \n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1804 Close the kqueue control file descriptor. Further operations on the kqueue\n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1805 object will raise an exception.");
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1806
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1807 static PyObject*
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1808 kqueue_queue_get_closed(kqueue_queue_Object *self)
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1809 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1810 if (self->kqfd < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1811 Py_RETURN_TRUE;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1812 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1813 Py_RETURN_FALSE;
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1814 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1815
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1816 static PyObject*
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1817 kqueue_queue_fileno(kqueue_queue_Object *self)
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1818 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1819 if (self->kqfd < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1820 return kqueue_queue_err_closed();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1821 return PyLong_FromLong(self->kqfd);
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1822 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1823
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1824 PyDoc_STRVAR(kqueue_queue_fileno_doc,
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1825 "fileno() -> int\n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1826 \n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1827 Return the kqueue control file descriptor.");
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1828
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1829 static PyObject*
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1830 kqueue_queue_fromfd(PyObject cls, PyObject args)
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1831 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1832 SOCKET fd;
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1833
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1834 if (!PyArg_ParseTuple(args, "i:fromfd", &fd))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1835 return NULL;
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1836
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1837 return newKqueue_Object((PyTypeObject*)cls, fd);
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1838 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1839
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1840 PyDoc_STRVAR(kqueue_queue_fromfd_doc,
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1841 "fromfd(fd) -> kqueue\n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1842 \n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1843 Create a kqueue object from a given control fd.");
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1844
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1845 static PyObject *
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1846 kqueue_queue_control(kqueue_queue_Object self, PyObject args)
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1847 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1848 int nevents = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1849 int gotevents = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1850 int nchanges = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1851 int i = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1852 PyObject *otimeout = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1853 PyObject *ch = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1854 PyObject it = NULL, ei = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1855 PyObject *result = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1856 struct kevent *evl = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1857 struct kevent *chl = NULL;
75592 1eaf6e899f02 Issue #14180: Fix select.select() compilation on BSD and a typo in kqueue_queue_control() Victor Stinner <vstinner@wyplay.com> parents: 75590 diff changeset	1858 struct timespec timeout;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1859 struct timespec *ptimeoutspec;
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1860
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1861 if (self->kqfd < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1862 return kqueue_queue_err_closed();
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1863
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1864 if (!PyArg_ParseTuple(args, "Oi\|O:control", &ch, &nevents, &otimeout))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1865 return NULL;
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1866
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1867 if (nevents < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1868 PyErr_Format(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1869 "Length of eventlist must be 0 or positive, got %d",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1870 nevents);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1871 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1872 }
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1873
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1874 if (otimeout == Py_None \|\| otimeout == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1875 ptimeoutspec = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1876 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1877 else if (PyNumber_Check(otimeout)) {
75590 1e9cc1a03365 Close #14180: Factorize code to convert a number of seconds to time_t, timeval or timespec Victor Stinner <vstinner@wyplay.com> parents: 74188 diff changeset	1878 if (_PyTime_ObjectToTimespec(otimeout,
1e9cc1a03365 Close #14180: Factorize code to convert a number of seconds to time_t, timeval or timespec Victor Stinner <vstinner@wyplay.com> parents: 74188 diff changeset	1879 &timeout.tv_sec, &timeout.tv_nsec) == -1)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1880 return NULL;
75590 1e9cc1a03365 Close #14180: Factorize code to convert a number of seconds to time_t, timeval or timespec Victor Stinner <vstinner@wyplay.com> parents: 74188 diff changeset	1881
1e9cc1a03365 Close #14180: Factorize code to convert a number of seconds to time_t, timeval or timespec Victor Stinner <vstinner@wyplay.com> parents: 74188 diff changeset	1882 if (timeout.tv_sec < 0) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1883 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1884 "timeout must be positive or None");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1885 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1886 }
75593 cb1c877a27f2 Issue #14180: Fix another typo in kqueue_queue_control() Victor Stinner <vstinner@wyplay.com> parents: 75592 diff changeset	1887 ptimeoutspec = &timeout;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1888 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1889 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1890 PyErr_Format(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1891 "timeout argument must be an number "
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1892 "or None, got %.200s",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1893 Py_TYPE(otimeout)->tp_name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1894 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1895 }
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1896
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1897 if (ch != NULL && ch != Py_None) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1898 it = PyObject_GetIter(ch);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1899 if (it == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1900 PyErr_SetString(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1901 "changelist is not iterable");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1902 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1903 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1904 nchanges = PyObject_Size(ch);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1905 if (nchanges < 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1906 goto error;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1907 }
59616 9cf702c91a9e Merged revisions 78101,78115,78117,78182,78188,78245,78386,78496 via svnmerge from Georg Brandl <georg@python.org> parents: 58022 diff changeset	1908
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1909 chl = PyMem_New(struct kevent, nchanges);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1910 if (chl == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1911 PyErr_NoMemory();
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1912 goto error;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1913 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1914 i = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1915 while ((ei = PyIter_Next(it)) != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1916 if (!kqueue_event_Check(ei)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1917 Py_DECREF(ei);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1918 PyErr_SetString(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1919 "changelist must be an iterable of "
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1920 "select.kevent objects");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1921 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1922 } else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1923 chl[i++] = ((kqueue_event_Object *)ei)->e;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1924 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1925 Py_DECREF(ei);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1926 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1927 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1928 Py_CLEAR(it);
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1929
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1930 /* event list */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1931 if (nevents) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1932 evl = PyMem_New(struct kevent, nevents);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1933 if (evl == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1934 PyErr_NoMemory();
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1935 goto error;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1936 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1937 }
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1938
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1939 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1940 gotevents = kevent(self->kqfd, chl, nchanges,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1941 evl, nevents, ptimeoutspec);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1942 Py_END_ALLOW_THREADS
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1943
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1944 if (gotevents == -1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1945 PyErr_SetFromErrno(PyExc_OSError);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1946 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1947 }
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1948
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1949 result = PyList_New(gotevents);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1950 if (result == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1951 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1952 }
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1953
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1954 for (i = 0; i < gotevents; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1955 kqueue_event_Object *ch;
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1956
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1957 ch = PyObject_New(kqueue_event_Object, &kqueue_event_Type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1958 if (ch == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1959 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1960 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1961 ch->e = evl[i];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1962 PyList_SET_ITEM(result, i, (PyObject *)ch);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1963 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1964 PyMem_Free(chl);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1965 PyMem_Free(evl);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1966 return result;
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1967
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1968 error:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1969 PyMem_Free(chl);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1970 PyMem_Free(evl);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1971 Py_XDECREF(result);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1972 Py_XDECREF(it);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1973 return NULL;
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1974 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1975
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1976 PyDoc_STRVAR(kqueue_queue_control_doc,
49274 1d5c3bcf35ad Merged revisions 66508,66510,66512-66513,66523-66526,66529-66530,66532,66535,66538,66544,66546 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48565 diff changeset	1977 "control(changelist, max_events[, timeout=None]) -> eventlist\n\
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1978 \n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1979 Calls the kernel kevent function.\n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1980 - changelist must be a list of kevent objects describing the changes\n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1981 to be made to the kernel's watch list or None.\n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1982 - max_events lets you specify the maximum number of events that the\n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1983 kernel will return.\n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1984 - timeout is the maximum time to wait in seconds, or else None,\n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1985 to wait forever. timeout accepts floats for smaller timeouts, too.");
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1986
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1987
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1988 static PyMethodDef kqueue_queue_methods[] = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1989 {"fromfd", (PyCFunction)kqueue_queue_fromfd,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1990 METH_VARARGS \| METH_CLASS, kqueue_queue_fromfd_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1991 {"close", (PyCFunction)kqueue_queue_close, METH_NOARGS,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1992 kqueue_queue_close_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1993 {"fileno", (PyCFunction)kqueue_queue_fileno, METH_NOARGS,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1994 kqueue_queue_fileno_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1995 {"control", (PyCFunction)kqueue_queue_control,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1996 METH_VARARGS , kqueue_queue_control_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1997 {NULL, NULL},
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1998 };
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1999
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2000 static PyGetSetDef kqueue_queue_getsetlist[] = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2001 {"closed", (getter)kqueue_queue_get_closed, NULL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2002 "True if the kqueue handler is closed"},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2003 {0},
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2004 };
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2005
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2006 PyDoc_STRVAR(kqueue_queue_doc,
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2007 "Kqueue syscall wrapper.\n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2008 \n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2009 For example, to start watching a socket for input:\n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2010 >>> kq = kqueue()\n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2011 >>> sock = socket()\n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2012 >>> sock.connect((host, port))\n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2013 >>> kq.control([kevent(sock, KQ_FILTER_WRITE, KQ_EV_ADD)], 0)\n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2014 \n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2015 To wait one second for it to become writeable:\n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2016 >>> kq.control(None, 1, 1000)\n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2017 \n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2018 To stop listening:\n\
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2019 >>> kq.control([kevent(sock, KQ_FILTER_WRITE, KQ_EV_DELETE)], 0)");
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2020
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2021 static PyTypeObject kqueue_queue_Type = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2022 PyVarObject_HEAD_INIT(NULL, 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2023 "select.kqueue", /* tp_name */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2024 sizeof(kqueue_queue_Object), /* tp_basicsize */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2025 0, /* tp_itemsize */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2026 (destructor)kqueue_queue_dealloc, /* tp_dealloc */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2027 0, /* tp_print */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2028 0, /* tp_getattr */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2029 0, /* tp_setattr */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2030 0, /* tp_reserved */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2031 0, /* tp_repr */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2032 0, /* tp_as_number */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2033 0, /* tp_as_sequence */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2034 0, /* tp_as_mapping */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2035 0, /* tp_hash */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2036 0, /* tp_call */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2037 0, /* tp_str */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2038 0, /* tp_getattro */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2039 0, /* tp_setattro */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2040 0, /* tp_as_buffer */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2041 Py_TPFLAGS_DEFAULT, /* tp_flags */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2042 kqueue_queue_doc, /* tp_doc */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2043 0, /* tp_traverse */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2044 0, /* tp_clear */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2045 0, /* tp_richcompare */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2046 0, /* tp_weaklistoffset */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2047 0, /* tp_iter */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2048 0, /* tp_iternext */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2049 kqueue_queue_methods, /* tp_methods */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2050 0, /* tp_members */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2051 kqueue_queue_getsetlist, /* tp_getset */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2052 0, /* tp_base */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2053 0, /* tp_dict */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2054 0, /* tp_descr_get */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2055 0, /* tp_descr_set */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2056 0, /* tp_dictoffset */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2057 0, /* tp_init */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2058 0, /* tp_alloc */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2059 kqueue_queue_new, /* tp_new */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2060 0, /* tp_free */
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2061 };
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2062
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2063 #endif /* HAVE_KQUEUE */
73549 8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	2064
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	2065
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	2066
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	2067
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	2068
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2069 /* ************************************************************************ */
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2070
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23607 diff changeset	2071 PyDoc_STRVAR(select_doc,
8570 bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	2072 "select(rlist, wlist, xlist[, timeout]) -> (rlist, wlist, xlist)\n\
bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	2073 \n\
bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	2074 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	2075 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	2076 rlist -- wait until ready for reading\n\
bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	2077 wlist -- wait until ready for writing\n\
bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	2078 xlist -- wait for an ``exceptional condition''\n\
bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	2079 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	2080 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	2081 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	2082 \n\
bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	2083 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	2084 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	2085 or None, the call will never time out.\n\
bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	2086 \n\
bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	2087 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	2088 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	2089 that are ready.\n\
bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	2090 \n\
bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	2091 * IMPORTANT NOTICE *\n\
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2092 On Windows and OpenVMS, only sockets are supported; on Unix, all file\n\
46115 1b6c0ff134fa Merged revisions 61913,61915-61916,61918-61919,61922-61926,61928-61929,61931,61935,61938,61943 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45996 diff changeset	2093 descriptors can be used.");
8570 bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	2094
4692 cb405b9696d4 Several changes... Guido please take a look! Barry Warsaw <barry@python.org> parents: 4621 diff changeset	2095 static PyMethodDef select_methods[] = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2096 {"select", select_select, METH_VARARGS, select_doc},
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2097 #ifdef HAVE_POLL
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2098 {"poll", select_poll, METH_NOARGS, poll_doc},
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	2099 #endif /* HAVE_POLL */
73549 8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	2100 #ifdef HAVE_SYS_DEVPOLL_H
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	2101 {"devpoll", select_devpoll, METH_NOARGS, devpoll_doc},
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	2102 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2103 {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	2104 };
a4793ae26682 Changes for new UNIX-specific built-in module 'select' and new header for Guido van Rossum <guido@python.org> parents: diff changeset	2105
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23607 diff changeset	2106 PyDoc_STRVAR(module_doc,
8570 bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	2107 "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	2108 \n\
bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	2109 * IMPORTANT NOTICE *\n\
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2110 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	2111
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	2112
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	2113 static struct PyModuleDef selectmodule = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2114 PyModuleDef_HEAD_INIT,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2115 "select",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2116 module_doc,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2117 -1,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2118 select_methods,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2119 NULL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2120 NULL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2121 NULL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2122 NULL
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	2123 };
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	2124
73549 8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	2125
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	2126
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	2127
24363 979ff5d0ae07 Replace DL_IMPORT with PyMODINIT_FUNC and remove "/export:init..." link Mark Hammond <mhammond@skippinet.com.au> parents: 24283 diff changeset	2128 PyMODINIT_FUNC
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	2129 PyInit_select(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	2130 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2131 PyObject *m;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2132 m = PyModule_Create(&selectmodule);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2133 if (m == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2134 return NULL;
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22114 diff changeset	2135
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72116 diff changeset	2136 Py_INCREF(PyExc_OSError);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72116 diff changeset	2137 PyModule_AddObject(m, "error", PyExc_OSError);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	2138
55179 e89faaafa3ee Merged revisions 73916 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 55099 diff changeset	2139 #ifdef PIPE_BUF
65384 3c4225bf87b4 #9862: On AIX PIPE_BUF is broken. Make it 512. R. David Murray <rdmurray@bitdance.com> parents: 63589 diff changeset	2140 #ifdef HAVE_BROKEN_PIPE_BUF
3c4225bf87b4 #9862: On AIX PIPE_BUF is broken. Make it 512. R. David Murray <rdmurray@bitdance.com> parents: 63589 diff changeset	2141 #undef PIPE_BUF
3c4225bf87b4 #9862: On AIX PIPE_BUF is broken. Make it 512. R. David Murray <rdmurray@bitdance.com> parents: 63589 diff changeset	2142 #define PIPE_BUF 512
3c4225bf87b4 #9862: On AIX PIPE_BUF is broken. Make it 512. R. David Murray <rdmurray@bitdance.com> parents: 63589 diff changeset	2143 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	2144 PyModule_AddIntConstant(m, "PIPE_BUF", PIPE_BUF);
55179 e89faaafa3ee Merged revisions 73916 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 55099 diff changeset	2145 #endif
55099 06b360a33d57 Merged revisions 73818 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 51271 diff changeset	2146
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2147 #if defined(HAVE_POLL)
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	2148 #ifdef __APPLE__
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2149 if (select_have_broken_poll()) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2150 if (PyObject_DelAttrString(m, "poll") == -1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2151 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2152 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2153 } else {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	2154 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2155 {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	2156 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2157 if (PyType_Ready(&poll_Type) < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2158 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2159 PyModule_AddIntConstant(m, "POLLIN", POLLIN);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2160 PyModule_AddIntConstant(m, "POLLPRI", POLLPRI);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2161 PyModule_AddIntConstant(m, "POLLOUT", POLLOUT);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2162 PyModule_AddIntConstant(m, "POLLERR", POLLERR);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2163 PyModule_AddIntConstant(m, "POLLHUP", POLLHUP);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2164 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	2165
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	2166 #ifdef POLLRDNORM
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2167 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	2168 #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	2169 #ifdef POLLRDBAND
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2170 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	2171 #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	2172 #ifdef POLLWRNORM
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2173 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	2174 #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	2175 #ifdef POLLWRBAND
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2176 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	2177 #endif
14182 c85a80db6845 Not every OS that support poll seems to support POLLMSG. Sjoerd Mullender <sjoerd@acm.org> parents: 14174 diff changeset	2178 #ifdef POLLMSG
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2179 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	2180 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2181 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	2182 #endif /* HAVE_POLL */
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2183
73549 8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	2184 #ifdef HAVE_SYS_DEVPOLL_H
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	2185 if (PyType_Ready(&devpoll_Type) < 0)
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	2186 return NULL;
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	2187 #endif
8f7ab4bf7ad9 Issue #6397: Support '/dev/poll' polling objects in select module, under Solaris & derivatives. Jesus Cea <jcea@jcea.es> parents: 72879 diff changeset	2188
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2189 #ifdef HAVE_EPOLL
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2190 Py_TYPE(&pyEpoll_Type) = &PyType_Type;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2191 if (PyType_Ready(&pyEpoll_Type) < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2192 return NULL;
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2193
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2194 Py_INCREF(&pyEpoll_Type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2195 PyModule_AddObject(m, "epoll", (PyObject *) &pyEpoll_Type);
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2196
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2197 PyModule_AddIntConstant(m, "EPOLLIN", EPOLLIN);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2198 PyModule_AddIntConstant(m, "EPOLLOUT", EPOLLOUT);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2199 PyModule_AddIntConstant(m, "EPOLLPRI", EPOLLPRI);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2200 PyModule_AddIntConstant(m, "EPOLLERR", EPOLLERR);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2201 PyModule_AddIntConstant(m, "EPOLLHUP", EPOLLHUP);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2202 PyModule_AddIntConstant(m, "EPOLLET", EPOLLET);
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2203 #ifdef EPOLLONESHOT
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2204 /* Kernel 2.6.2+ */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2205 PyModule_AddIntConstant(m, "EPOLLONESHOT", EPOLLONESHOT);
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2206 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2207 /* PyModule_AddIntConstant(m, "EPOLL_RDHUP", EPOLLRDHUP); */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2208 PyModule_AddIntConstant(m, "EPOLLRDNORM", EPOLLRDNORM);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2209 PyModule_AddIntConstant(m, "EPOLLRDBAND", EPOLLRDBAND);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2210 PyModule_AddIntConstant(m, "EPOLLWRNORM", EPOLLWRNORM);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2211 PyModule_AddIntConstant(m, "EPOLLWRBAND", EPOLLWRBAND);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2212 PyModule_AddIntConstant(m, "EPOLLMSG", EPOLLMSG);
74183 b30a94f7e053 add a flags parameter to select.epoll Benjamin Peterson <benjamin@python.org> parents: 73549 diff changeset	2213
74187 0f9276411dce fix for old kernels which don't have epoll_create1 Benjamin Peterson <benjamin@python.org> parents: 74183 diff changeset	2214 #ifdef EPOLL_CLOEXEC
74183 b30a94f7e053 add a flags parameter to select.epoll Benjamin Peterson <benjamin@python.org> parents: 73549 diff changeset	2215 PyModule_AddIntConstant(m, "EPOLL_CLOEXEC", EPOLL_CLOEXEC);
74187 0f9276411dce fix for old kernels which don't have epoll_create1 Benjamin Peterson <benjamin@python.org> parents: 74183 diff changeset	2216 #endif
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2217 #endif /* HAVE_EPOLL */
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2218
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2219 #ifdef HAVE_KQUEUE
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2220 kqueue_event_Type.tp_new = PyType_GenericNew;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2221 Py_TYPE(&kqueue_event_Type) = &PyType_Type;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2222 if(PyType_Ready(&kqueue_event_Type) < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2223 return NULL;
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2224
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2225 Py_INCREF(&kqueue_event_Type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2226 PyModule_AddObject(m, "kevent", (PyObject *)&kqueue_event_Type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2227
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2228 Py_TYPE(&kqueue_queue_Type) = &PyType_Type;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2229 if(PyType_Ready(&kqueue_queue_Type) < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2230 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2231 Py_INCREF(&kqueue_queue_Type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2232 PyModule_AddObject(m, "kqueue", (PyObject *)&kqueue_queue_Type);
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2233
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2234 /* event filters */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2235 PyModule_AddIntConstant(m, "KQ_FILTER_READ", EVFILT_READ);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2236 PyModule_AddIntConstant(m, "KQ_FILTER_WRITE", EVFILT_WRITE);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2237 PyModule_AddIntConstant(m, "KQ_FILTER_AIO", EVFILT_AIO);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2238 PyModule_AddIntConstant(m, "KQ_FILTER_VNODE", EVFILT_VNODE);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2239 PyModule_AddIntConstant(m, "KQ_FILTER_PROC", EVFILT_PROC);
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2240 #ifdef EVFILT_NETDEV
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2241 PyModule_AddIntConstant(m, "KQ_FILTER_NETDEV", EVFILT_NETDEV);
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2242 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2243 PyModule_AddIntConstant(m, "KQ_FILTER_SIGNAL", EVFILT_SIGNAL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2244 PyModule_AddIntConstant(m, "KQ_FILTER_TIMER", EVFILT_TIMER);
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2245
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2246 /* event flags */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2247 PyModule_AddIntConstant(m, "KQ_EV_ADD", EV_ADD);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2248 PyModule_AddIntConstant(m, "KQ_EV_DELETE", EV_DELETE);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2249 PyModule_AddIntConstant(m, "KQ_EV_ENABLE", EV_ENABLE);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2250 PyModule_AddIntConstant(m, "KQ_EV_DISABLE", EV_DISABLE);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2251 PyModule_AddIntConstant(m, "KQ_EV_ONESHOT", EV_ONESHOT);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2252 PyModule_AddIntConstant(m, "KQ_EV_CLEAR", EV_CLEAR);
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2253
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2254 PyModule_AddIntConstant(m, "KQ_EV_SYSFLAGS", EV_SYSFLAGS);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2255 PyModule_AddIntConstant(m, "KQ_EV_FLAG1", EV_FLAG1);
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2256
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2257 PyModule_AddIntConstant(m, "KQ_EV_EOF", EV_EOF);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2258 PyModule_AddIntConstant(m, "KQ_EV_ERROR", EV_ERROR);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2259
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2260 /* READ WRITE filter flag */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2261 PyModule_AddIntConstant(m, "KQ_NOTE_LOWAT", NOTE_LOWAT);
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2262
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2263 /* VNODE filter flags */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2264 PyModule_AddIntConstant(m, "KQ_NOTE_DELETE", NOTE_DELETE);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2265 PyModule_AddIntConstant(m, "KQ_NOTE_WRITE", NOTE_WRITE);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2266 PyModule_AddIntConstant(m, "KQ_NOTE_EXTEND", NOTE_EXTEND);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2267 PyModule_AddIntConstant(m, "KQ_NOTE_ATTRIB", NOTE_ATTRIB);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2268 PyModule_AddIntConstant(m, "KQ_NOTE_LINK", NOTE_LINK);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2269 PyModule_AddIntConstant(m, "KQ_NOTE_RENAME", NOTE_RENAME);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2270 PyModule_AddIntConstant(m, "KQ_NOTE_REVOKE", NOTE_REVOKE);
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2271
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2272 /* PROC filter flags */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2273 PyModule_AddIntConstant(m, "KQ_NOTE_EXIT", NOTE_EXIT);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2274 PyModule_AddIntConstant(m, "KQ_NOTE_FORK", NOTE_FORK);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2275 PyModule_AddIntConstant(m, "KQ_NOTE_EXEC", NOTE_EXEC);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2276 PyModule_AddIntConstant(m, "KQ_NOTE_PCTRLMASK", NOTE_PCTRLMASK);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2277 PyModule_AddIntConstant(m, "KQ_NOTE_PDATAMASK", NOTE_PDATAMASK);
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2278
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2279 PyModule_AddIntConstant(m, "KQ_NOTE_TRACK", NOTE_TRACK);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2280 PyModule_AddIntConstant(m, "KQ_NOTE_CHILD", NOTE_CHILD);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2281 PyModule_AddIntConstant(m, "KQ_NOTE_TRACKERR", NOTE_TRACKERR);
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2282
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2283 /* NETDEV filter flags */
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2284 #ifdef EVFILT_NETDEV
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2285 PyModule_AddIntConstant(m, "KQ_NOTE_LINKUP", NOTE_LINKUP);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2286 PyModule_AddIntConstant(m, "KQ_NOTE_LINKDOWN", NOTE_LINKDOWN);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2287 PyModule_AddIntConstant(m, "KQ_NOTE_LINKINV", NOTE_LINKINV);
45996 376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2288 #endif
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2289
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	2290 #endif /* HAVE_KQUEUE */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	2291 return m;
902 a4793ae26682 Changes for new UNIX-specific built-in module 'select' and new header for Guido van Rossum <guido@python.org> parents: diff changeset	2292 }

Mercurial > cpython-lru_cache-weakref

annotate Modules/selectmodule.c @ 80779:10d04bdb05ab 3.3