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

annotate Modules/selectmodule.c @ 70817:dd775b1561ba

Fix markup.

author	Georg Brandl <georg@python.org>
date	Tue, 14 Jun 2011 21:09:55 +0200
parents	3982be773b54
children	ddb8a29a6bc5

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
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	10 #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	11 /* 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	12 * 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	13 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	14 #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	15 #endif
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	16
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	17 /* 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	18 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	19 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	20 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	21 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	22 */
e11c12323ebf SF bug 110843: Low FD_SETSIZE limit on Win32 (PR#41). Boosted to 512. Tim Peters <tim.peters@gmail.com> parents: 14918 diff changeset	23 #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	24 #define FD_SETSIZE 512
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	25 #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	26
18603 b9d47d083d2c [Bug #438050] Andrew M. Kuchling <amk@amk.ca> parents: 17873 diff changeset	27 #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	28 #include <poll.h>
18603 b9d47d083d2c [Bug #438050] Andrew M. Kuchling <amk@amk.ca> parents: 17873 diff changeset	29 #elif defined(HAVE_SYS_POLL_H)
b9d47d083d2c [Bug #438050] Andrew M. Kuchling <amk@amk.ca> parents: 17873 diff changeset	30 #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	31 #endif
4600 d36250aefb82 Keep gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	32
4621 a2f171ce25f8 Add ``extern void bzero();'' for SGI, to keep gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4600 diff changeset	33 #ifdef __sgi
a2f171ce25f8 Add ``extern void bzero();'' for SGI, to keep gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4600 diff changeset	34 /* 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	35 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	36 #endif
a2f171ce25f8 Add ``extern void bzero();'' for SGI, to keep gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4600 diff changeset	37
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	38 #ifdef HAVE_SYS_TYPES_H
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1392 diff changeset	39 #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	40 #endif
3675 d617de15774b Yet another pass at fd2obj -- this time for Windows Guido van Rossum <guido@python.org> parents: 2611 diff changeset	41
22114 c454b76d51e7 OS/2 EMX port changes (Modules part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 21712 diff changeset	42 #if defined(PYOS_OS2) && !defined(PYCC_GCC)
6626 5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6367 diff changeset	43 #include <sys/time.h>
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6367 diff changeset	44 #include <utils.h>
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6367 diff changeset	45 #endif
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6367 diff changeset	46
3738 ce74bba8a6a6 Slightly different Windows ifdefs Guido van Rossum <guido@python.org> parents: 3675 diff changeset	47 #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	48 # define WIN32_LEAN_AND_MEAN
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	49 # include <winsock.h>
3675 d617de15774b Yet another pass at fd2obj -- this time for Windows Guido van Rossum <guido@python.org> parents: 2611 diff changeset	50 #else
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	51 # define SOCKET int
42645 a5e984eda45a Remove support for BeOS Skip Montanaro <skip@pobox.com> parents: 42334 diff changeset	52 # if defined(__VMS)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	53 # include <socket.h>
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	54 # endif
8823 f2a4a2b60860 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8616 diff changeset	55 #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	56
4692 cb405b9696d4 Several changes... Guido please take a look! Barry Warsaw <barry@python.org> parents: 4621 diff changeset	57 static PyObject *SelectError;
902 a4793ae26682 Changes for new UNIX-specific built-in module 'select' and new header for Guido van Rossum <guido@python.org> parents: diff changeset	58
4700 825038d98ab6 Reworked to eliminate all potential memory problems, including Barry Warsaw <barry@python.org> parents: 4692 diff changeset	59 /* 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	60 typedef struct {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	61 PyObject obj; / owned reference */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	62 SOCKET fd;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	63 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	64 } pylist;
d617de15774b Yet another pass at fd2obj -- this time for Windows Guido van Rossum <guido@python.org> parents: 2611 diff changeset	65
4700 825038d98ab6 Reworked to eliminate all potential memory problems, including Barry Warsaw <barry@python.org> parents: 4692 diff changeset	66 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	67 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	68 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	69 int i;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	70 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	71 Py_XDECREF(fd2obj[i].obj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	72 fd2obj[i].obj = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	73 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	74 fd2obj[0].sentinel = -1;
4700 825038d98ab6 Reworked to eliminate all potential memory problems, including Barry Warsaw <barry@python.org> parents: 4692 diff changeset	75 }
825038d98ab6 Reworked to eliminate all potential memory problems, including Barry Warsaw <barry@python.org> parents: 4692 diff changeset	76
825038d98ab6 Reworked to eliminate all potential memory problems, including Barry Warsaw <barry@python.org> parents: 4692 diff changeset	77
4692 cb405b9696d4 Several changes... Guido please take a look! Barry Warsaw <barry@python.org> parents: 4621 diff changeset	78 /* 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	79 returns a number >= 0
cb405b9696d4 Several changes... Guido please take a look! Barry Warsaw <barry@python.org> parents: 4621 diff changeset	80 */
3675 d617de15774b Yet another pass at fd2obj -- this time for Windows Guido van Rossum <guido@python.org> parents: 2611 diff changeset	81 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	82 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	83 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	84 int max = -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	85 int index = 0;
67347 3bf4d9f1660a Issue #9566: use Py_ssize_t instead of int Victor Stinner <victor.stinner@haypocalc.com> parents: 65384 diff changeset	86 Py_ssize_t i, len = -1;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	87 PyObject* fast_seq = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	88 PyObject* o = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	89
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	90 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	91 FD_ZERO(set);
4700 825038d98ab6 Reworked to eliminate all potential memory problems, including Barry Warsaw <barry@python.org> parents: 4692 diff changeset	92
62579 a857dd407964 Merged revisions 79894-79895,80098,80120 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 61466 diff changeset	93 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	94 if (!fast_seq)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	95 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	96
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	97 len = PySequence_Fast_GET_SIZE(fast_seq);
2611 01687ce43708 fix subtle refcnt bug Guido van Rossum <guido@python.org> parents: 2061 diff changeset	98
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	99 for (i = 0; i < len; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	100 SOCKET v;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	101
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	102 /* 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	103 if (!(o = PySequence_Fast_GET_ITEM(fast_seq, i)))
30402 a430be683a7a select.select() now accepts a sequence (as defined by PySequence_Fast()) for Brett Cannon <bcannon@gmail.com> parents: 27815 diff changeset	104 return -1;
a430be683a7a select.select() now accepts a sequence (as defined by PySequence_Fast()) for Brett Cannon <bcannon@gmail.com> parents: 27815 diff changeset	105
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	106 Py_INCREF(o);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	107 v = PyObject_AsFileDescriptor( o );
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	108 if (v == -1) goto finally;
4700 825038d98ab6 Reworked to eliminate all potential memory problems, including Barry Warsaw <barry@python.org> parents: 4692 diff changeset	109
11656 db756d31e727 According to Ron Bickers, and with apparent approval of Chris Guido van Rossum <guido@python.org> parents: 11243 diff changeset	110 #if defined(_MSC_VER)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	111 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	112 #else /* !_MSC_VER */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	113 if (v < 0 \|\| v >= FD_SETSIZE) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	114 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	115 "filedescriptor out of range in select()");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	116 goto finally;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	117 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	118 if (v > max)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	119 max = v;
4700 825038d98ab6 Reworked to eliminate all potential memory problems, including Barry Warsaw <barry@python.org> parents: 4692 diff changeset	120 #endif /* _MSC_VER */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	121 FD_SET(v, set);
4700 825038d98ab6 Reworked to eliminate all potential memory problems, including Barry Warsaw <barry@python.org> parents: 4692 diff changeset	122
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	123 /* 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	124 if (index >= FD_SETSIZE) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	125 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	126 "too many file descriptors in select()");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	127 goto finally;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	128 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	129 fd2obj[index].obj = o;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	130 fd2obj[index].fd = v;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	131 fd2obj[index].sentinel = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	132 fd2obj[++index].sentinel = -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	133 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	134 Py_DECREF(fast_seq);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	135 return max+1;
4700 825038d98ab6 Reworked to eliminate all potential memory problems, including Barry Warsaw <barry@python.org> parents: 4692 diff changeset	136
825038d98ab6 Reworked to eliminate all potential memory problems, including Barry Warsaw <barry@python.org> parents: 4692 diff changeset	137 finally:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	138 Py_XDECREF(o);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	139 Py_DECREF(fast_seq);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	140 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	141 }
a4793ae26682 Changes for new UNIX-specific built-in module 'select' and new header for Guido van Rossum <guido@python.org> parents: diff changeset	142
4692 cb405b9696d4 Several changes... Guido please take a look! Barry Warsaw <barry@python.org> parents: 4621 diff changeset	143 /* 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	144 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	145 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	146 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	147 int i, j, count=0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	148 PyObject list, o;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	149 SOCKET fd;
4692 cb405b9696d4 Several changes... Guido please take a look! Barry Warsaw <barry@python.org> parents: 4621 diff changeset	150
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	151 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	152 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	153 count++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	154 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	155 list = PyList_New(count);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	156 if (!list)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	157 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	158
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	159 i = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	160 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	161 fd = fd2obj[j].fd;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	162 if (FD_ISSET(fd, set)) {
3675 d617de15774b Yet another pass at fd2obj -- this time for Windows Guido van Rossum <guido@python.org> parents: 2611 diff changeset	163 #ifndef _MSC_VER
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	164 if (fd > FD_SETSIZE) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	165 PyErr_SetString(PyExc_SystemError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	166 "filedescriptor out of range returned in select()");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	167 goto finally;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	168 }
3675 d617de15774b Yet another pass at fd2obj -- this time for Windows Guido van Rossum <guido@python.org> parents: 2611 diff changeset	169 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	170 o = fd2obj[j].obj;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	171 fd2obj[j].obj = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	172 /* transfer ownership */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	173 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	174 goto finally;
4700 825038d98ab6 Reworked to eliminate all potential memory problems, including Barry Warsaw <barry@python.org> parents: 4692 diff changeset	175
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	176 i++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	177 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	178 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	179 return list;
4700 825038d98ab6 Reworked to eliminate all potential memory problems, including Barry Warsaw <barry@python.org> parents: 4692 diff changeset	180 finally:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	181 Py_DECREF(list);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	182 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	183 }
4700 825038d98ab6 Reworked to eliminate all potential memory problems, including Barry Warsaw <barry@python.org> parents: 4692 diff changeset	184
19310 6cb9f538dce4 select_select(): Closing bug #448351 the easy way, i.e. by changing Barry Warsaw <barry@python.org> parents: 18754 diff changeset	185 #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	186 #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	187 #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	188 #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	189
4692 cb405b9696d4 Several changes... Guido please take a look! Barry Warsaw <barry@python.org> parents: 4621 diff changeset	190 static PyObject *
13502 7348cceee8fa ANSI-fication Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13256 diff changeset	191 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	192 {
19310 6cb9f538dce4 select_select(): Closing bug #448351 the easy way, i.e. by changing Barry Warsaw <barry@python.org> parents: 18754 diff changeset	193 #ifdef SELECT_USES_HEAP
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	194 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	195 #else /* !SELECT_USES_HEAP */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	196 /* 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	197 * - 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	198 * - add one
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	199 * - that's the size
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	200 * See: Stevens, APitUE, $12.5.1
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	201 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	202 pylist rfd2obj[FD_SETSIZE + 1];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	203 pylist wfd2obj[FD_SETSIZE + 1];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	204 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	205 #endif /* SELECT_USES_HEAP */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	206 PyObject ifdlist, ofdlist, *efdlist;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	207 PyObject *ret = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	208 PyObject *tout = Py_None;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	209 fd_set ifdset, ofdset, efdset;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	210 double timeout;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	211 struct timeval tv, *tvp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	212 long seconds;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	213 int imax, omax, emax, max;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	214 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	215
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	216 /* convert arguments */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	217 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	218 &ifdlist, &ofdlist, &efdlist, &tout))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	219 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	220
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	221 if (tout == Py_None)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	222 tvp = (struct timeval *)0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	223 else if (!PyNumber_Check(tout)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	224 PyErr_SetString(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	225 "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	226 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	227 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	228 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	229 timeout = PyFloat_AsDouble(tout);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	230 if (timeout == -1 && PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	231 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	232 if (timeout > (double)LONG_MAX) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	233 PyErr_SetString(PyExc_OverflowError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	234 "timeout period too long");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	235 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	236 }
69224 3982be773b54 Issue #11757: select.select() now raises ValueError when a negative timeout Antoine Pitrou <solipsis@pitrou.net> parents: 68257 diff changeset	237 if (timeout < 0) {
3982be773b54 Issue #11757: select.select() now raises ValueError when a negative timeout Antoine Pitrou <solipsis@pitrou.net> parents: 68257 diff changeset	238 PyErr_SetString(PyExc_ValueError,
3982be773b54 Issue #11757: select.select() now raises ValueError when a negative timeout Antoine Pitrou <solipsis@pitrou.net> parents: 68257 diff changeset	239 "timeout must be non-negative");
3982be773b54 Issue #11757: select.select() now raises ValueError when a negative timeout Antoine Pitrou <solipsis@pitrou.net> parents: 68257 diff changeset	240 return NULL;
3982be773b54 Issue #11757: select.select() now raises ValueError when a negative timeout Antoine Pitrou <solipsis@pitrou.net> parents: 68257 diff changeset	241 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	242 seconds = (long)timeout;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	243 timeout = timeout - (double)seconds;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	244 tv.tv_sec = seconds;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	245 tv.tv_usec = (long)(timeout * 1E6);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	246 tvp = &tv;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	247 }
4692 cb405b9696d4 Several changes... Guido please take a look! Barry Warsaw <barry@python.org> parents: 4621 diff changeset	248
902 a4793ae26682 Changes for new UNIX-specific built-in module 'select' and new header for Guido van Rossum <guido@python.org> parents: diff changeset	249
19310 6cb9f538dce4 select_select(): Closing bug #448351 the easy way, i.e. by changing Barry Warsaw <barry@python.org> parents: 18754 diff changeset	250 #ifdef SELECT_USES_HEAP
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	251 /* Allocate memory for the lists */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	252 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	253 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	254 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	255 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	256 if (rfd2obj) PyMem_DEL(rfd2obj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	257 if (wfd2obj) PyMem_DEL(wfd2obj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	258 if (efd2obj) PyMem_DEL(efd2obj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	259 return PyErr_NoMemory();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	260 }
19310 6cb9f538dce4 select_select(): Closing bug #448351 the easy way, i.e. by changing Barry Warsaw <barry@python.org> parents: 18754 diff changeset	261 #endif /* SELECT_USES_HEAP */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	262 /* 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	263 * 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	264 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	265 rfd2obj[0].sentinel = -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	266 wfd2obj[0].sentinel = -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	267 efd2obj[0].sentinel = -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	268 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	269 goto finally;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	270 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	271 goto finally;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	272 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	273 goto finally;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	274 max = imax;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	275 if (omax > max) max = omax;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	276 if (emax > max) max = emax;
4692 cb405b9696d4 Several changes... Guido please take a look! Barry Warsaw <barry@python.org> parents: 4621 diff changeset	277
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	278 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	279 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	280 Py_END_ALLOW_THREADS
4692 cb405b9696d4 Several changes... Guido please take a look! Barry Warsaw <barry@python.org> parents: 4621 diff changeset	281
25399 97424b99df91 On Windows, call WSAGetLastError() to retrieve the error number. Thomas Heller <theller@ctypes.org> parents: 24408 diff changeset	282 #ifdef MS_WINDOWS
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	283 if (n == SOCKET_ERROR) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	284 PyErr_SetExcFromWindowsErr(SelectError, WSAGetLastError());
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	285 }
25399 97424b99df91 On Windows, call WSAGetLastError() to retrieve the error number. Thomas Heller <theller@ctypes.org> parents: 24408 diff changeset	286 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	287 if (n < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	288 PyErr_SetFromErrno(SelectError);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	289 }
25399 97424b99df91 On Windows, call WSAGetLastError() to retrieve the error number. Thomas Heller <theller@ctypes.org> parents: 24408 diff changeset	290 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	291 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	292 /* 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	293 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	294 is that acceptable?
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	295 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	296 ifdlist = set2list(&ifdset, rfd2obj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	297 ofdlist = set2list(&ofdset, wfd2obj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	298 efdlist = set2list(&efdset, efd2obj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	299 if (PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	300 ret = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	301 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	302 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	303
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	304 Py_DECREF(ifdlist);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	305 Py_DECREF(ofdlist);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	306 Py_DECREF(efdlist);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	307 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	308
4700 825038d98ab6 Reworked to eliminate all potential memory problems, including Barry Warsaw <barry@python.org> parents: 4692 diff changeset	309 finally:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	310 reap_obj(rfd2obj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	311 reap_obj(wfd2obj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	312 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	313 #ifdef SELECT_USES_HEAP
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	314 PyMem_DEL(rfd2obj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	315 PyMem_DEL(wfd2obj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	316 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	317 #endif /* SELECT_USES_HEAP */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	318 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	319 }
a4793ae26682 Changes for new UNIX-specific built-in module 'select' and new header for Guido van Rossum <guido@python.org> parents: diff changeset	320
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	321 #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	322 /*
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	323 * poll() support
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	324 */
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	325
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	326 typedef struct {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	327 PyObject_HEAD
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	328 PyObject *dict;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	329 int ufd_uptodate;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	330 int ufd_len;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	331 struct pollfd *ufds;
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	332 } pollObject;
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	333
24280 1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 23832 diff changeset	334 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	335
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	336 /* 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	337 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	338 */
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	339
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	340 static int
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	341 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	342 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	343 Py_ssize_t i, pos;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	344 PyObject key, value;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	345 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	346
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	347 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	348 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	349 if (self->ufds == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	350 self->ufds = old_ufds;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	351 PyErr_NoMemory();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	352 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	353 }
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	354
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	355 i = pos = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	356 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	357 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	358 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	359 i++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	360 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	361 self->ufd_uptodate = 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	362 return 1;
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	363 }
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	364
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23607 diff changeset	365 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	366 "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	367 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	368 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	369 int.\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23607 diff changeset	370 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	371
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	372 static PyObject *
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	373 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	374 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	375 PyObject o, key, *value;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	376 int fd, events = POLLIN \| POLLPRI \| POLLOUT;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	377 int err;
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	378
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	379 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	380 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	381 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	382
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	383 fd = PyObject_AsFileDescriptor(o);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	384 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	385
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	386 /* 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	387 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	388 key = PyLong_FromLong(fd);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	389 if (key == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	390 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	391 value = PyLong_FromLong(events);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	392 if (value == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	393 Py_DECREF(key);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	394 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	395 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	396 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	397 Py_DECREF(key);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	398 Py_DECREF(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	399 if (err < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	400 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	401
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	402 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	403
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	404 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	405 return Py_None;
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	406 }
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	407
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	408 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	409 "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	410 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	411 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	412 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	413 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	414
376b5cb8a014 Merged revisions 61687-61688,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 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	416 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	417 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	418 PyObject o, key, *value;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	419 int fd, events;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	420 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	421
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	422 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	423 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	424 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	425
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	426 fd = PyObject_AsFileDescriptor(o);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	427 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	428
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	429 /* Modify registered fd */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	430 key = PyLong_FromLong(fd);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	431 if (key == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	432 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	433 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	434 errno = ENOENT;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	435 PyErr_SetFromErrno(PyExc_IOError);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	436 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	437 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	438 value = PyLong_FromLong(events);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	439 if (value == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	440 Py_DECREF(key);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	441 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	442 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	443 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	444 Py_DECREF(key);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	445 Py_DECREF(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	446 if (err < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	447 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	448
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	449 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	450
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	451 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	452 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	453 }
376b5cb8a014 Merged revisions 61687-61688,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
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	455
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23607 diff changeset	456 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	457 "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	458 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	459
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	460 static PyObject *
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	461 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	462 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	463 PyObject *key;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	464 int fd;
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	465
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	466 fd = PyObject_AsFileDescriptor( o );
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	467 if (fd == -1)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	468 return NULL;
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 /* 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	471 key = PyLong_FromLong(fd);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	472 if (key == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	473 return NULL;
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	474
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	475 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	476 Py_DECREF(key);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	477 /* 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	478 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	479 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	480 }
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	481
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	482 Py_DECREF(key);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	483 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	484
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	485 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	486 return Py_None;
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	487 }
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	488
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23607 diff changeset	489 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	490 "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	491 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	492 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	493
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	494 static PyObject *
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	495 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	496 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	497 PyObject result_list = NULL, tout = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	498 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	499 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	500
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	501 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	502 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	503 }
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 /* Check values for timeout */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	506 if (tout == NULL \|\| tout == Py_None)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	507 timeout = -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	508 else if (!PyNumber_Check(tout)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	509 PyErr_SetString(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	510 "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	511 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	512 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	513 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	514 tout = PyNumber_Long(tout);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	515 if (!tout)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	516 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	517 timeout = PyLong_AsLong(tout);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	518 Py_DECREF(tout);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	519 if (timeout == -1 && PyErr_Occurred())
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 }
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	522
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	523 /* 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	524 if (!self->ufd_uptodate)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	525 if (update_ufd_array(self) == 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	526 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	527
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	528 /* call poll() */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	529 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	530 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	531 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	532
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	533 if (poll_result < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	534 PyErr_SetFromErrno(SelectError);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	535 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	536 }
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	537
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	538 /* 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	539
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	540 result_list = PyList_New(poll_result);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	541 if (!result_list)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	542 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	543 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	544 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	545 /* skip to the next fired descriptor */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	546 while (!self->ufds[i].revents) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	547 i++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	548 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	549 /* 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	550 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	551 clean up result_list */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	552 value = PyTuple_New(2);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	553 if (value == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	554 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	555 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	556 if (num == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	557 Py_DECREF(value);
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 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	560 PyTuple_SET_ITEM(value, 0, num);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	561
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	562 /* 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	563 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	564 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	565 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	566 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	567 if (num == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	568 Py_DECREF(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	569 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	570 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	571 PyTuple_SET_ITEM(value, 1, num);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	572 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	573 Py_DECREF(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	574 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	575 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	576 i++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	577 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	578 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	579 return result_list;
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	580
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	581 error:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	582 Py_DECREF(result_list);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	583 return NULL;
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
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	586 static PyMethodDef poll_methods[] = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	587 {"register", (PyCFunction)poll_register,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	588 METH_VARARGS, poll_register_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	589 {"modify", (PyCFunction)poll_modify,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	590 METH_VARARGS, poll_modify_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	591 {"unregister", (PyCFunction)poll_unregister,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	592 METH_O, poll_unregister_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	593 {"poll", (PyCFunction)poll_poll,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	594 METH_VARARGS, poll_poll_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	595 {NULL, NULL} /* sentinel */
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	596 };
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	597
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	598 static pollObject *
14277 984abd20eec2 Peter Schneider-Kamp <nowonder@nowonder.de>: Fred Drake <fdrake@acm.org> parents: 14182 diff changeset	599 newPollObject(void)
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	600 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	601 pollObject *self;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	602 self = PyObject_New(pollObject, &poll_Type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	603 if (self == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	604 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	605 /* 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	606 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	607 self->ufd_uptodate = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	608 self->ufds = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	609 self->dict = PyDict_New();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	610 if (self->dict == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	611 Py_DECREF(self);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	612 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	613 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	614 return self;
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	615 }
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	616
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	617 static void
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	618 poll_dealloc(pollObject *self)
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	619 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	620 if (self->ufds != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	621 PyMem_DEL(self->ufds);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	622 Py_XDECREF(self->dict);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	623 PyObject_Del(self);
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	624 }
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	625
24283 c0a67a1cab09 Removed more stray instances of statichere, but left _sre.c alone. Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	626 static PyTypeObject poll_Type = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	627 /* 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	628 * 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	629 PyVarObject_HEAD_INIT(NULL, 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	630 "select.poll", /tp_name/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	631 sizeof(pollObject), /tp_basicsize/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	632 0, /tp_itemsize/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	633 /* methods */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	634 (destructor)poll_dealloc, /tp_dealloc/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	635 0, /tp_print/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	636 0, /tp_getattr/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	637 0, /tp_setattr/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	638 0, /tp_reserved/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	639 0, /tp_repr/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	640 0, /tp_as_number/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	641 0, /tp_as_sequence/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	642 0, /tp_as_mapping/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	643 0, /tp_hash/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	644 0, /tp_call/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	645 0, /tp_str/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	646 0, /tp_getattro/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	647 0, /tp_setattro/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	648 0, /tp_as_buffer/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	649 Py_TPFLAGS_DEFAULT, /tp_flags/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	650 0, /tp_doc/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	651 0, /tp_traverse/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	652 0, /tp_clear/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	653 0, /tp_richcompare/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	654 0, /tp_weaklistoffset/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	655 0, /tp_iter/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	656 0, /tp_iternext/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	657 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	658 };
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	659
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23607 diff changeset	660 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	661 "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	662 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	663
35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	664 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	665 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	666 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	667 return (PyObject *)newPollObject();
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	668 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	669
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	670 #ifdef __APPLE__
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	671 /*
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	672 * 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	673 * 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	674 * 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	675 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	676 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	677 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	678 int poll_test;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	679 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	680
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	681 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	682
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	683 /* 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	684 if (pipe(filedes) < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	685 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	686 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	687 poll_struct.fd = filedes[0];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	688 close(filedes[0]);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	689 close(filedes[1]);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	690 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	691 if (poll_test < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	692 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	693 } 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	694 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	695 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	696 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	697 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	698 #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	699
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	700 #endif /* HAVE_POLL */
14174 35b7989ba20c Add interface to poll() system call (SF patch #100852) Andrew M. Kuchling <amk@amk.ca> parents: 13761 diff changeset	701
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	702 #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	703 /* **************************************************************************
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	704 * 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	705 *
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	706 * 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	707 * 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	708 */
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	709
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	710 #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	711 #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	712 #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	713
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	714 typedef struct {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	715 PyObject_HEAD
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	716 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	717 } 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	718
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	719 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	720 #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	721
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	722 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	723 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	724 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	725 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	726 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	727 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	728
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	729 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	730 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	731 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	732 int save_errno = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	733 if (self->epfd >= 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	734 int epfd = self->epfd;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	735 self->epfd = -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	736 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	737 if (close(epfd) < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	738 save_errno = errno;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	739 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	740 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	741 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	742 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	743
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	744 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	745 newPyEpoll_Object(PyTypeObject *type, int sizehint, 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	746 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	747 pyEpoll_Object *self;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	748
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	749 if (sizehint == -1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	750 sizehint = FD_SETSIZE-1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	751 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	752 else if (sizehint < 1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	753 PyErr_Format(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	754 "sizehint must be greater zero, got %d",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	755 sizehint);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	756 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	757 }
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	758
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	759 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	760 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	761 if (self == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	762 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	763
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	764 if (fd == -1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	765 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	766 self->epfd = epoll_create(sizehint);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	767 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	768 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	769 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	770 self->epfd = fd;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	771 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	772 if (self->epfd < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	773 Py_DECREF(self);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	774 PyErr_SetFromErrno(PyExc_IOError);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	775 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	776 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	777 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	778 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	779
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	780
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	781 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	782 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	783 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	784 int sizehint = -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	785 static char *kwlist[] = {"sizehint", 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	786
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	787 if (!PyArg_ParseTupleAndKeywords(args, kwds, "\|i:epoll", kwlist,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	788 &sizehint))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	789 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	790
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	791 return newPyEpoll_Object(type, sizehint, -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	792 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	793
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	794
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	795 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	796 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	797 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	798 (void)pyepoll_internal_close(self);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	799 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	800 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	801
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	802 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	803 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	804 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	805 errno = pyepoll_internal_close(self);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	806 if (errno < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	807 PyErr_SetFromErrno(PyExc_IOError);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	808 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	809 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	810 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	811 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	812
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	813 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	814 "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	815 \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	816 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	817 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	818
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	819 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	820 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	821 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	822 if (self->epfd < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	823 Py_RETURN_TRUE;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	824 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	825 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	826 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	827
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	828 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	829 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	830 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	831 if (self->epfd < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	832 return pyepoll_err_closed();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	833 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	834 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	835
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	836 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	837 "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	838 \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	839 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	840
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	841 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	842 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	843 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	844 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	845
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	846 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	847 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	848
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	849 return newPyEpoll_Object((PyTypeObject*)cls, -1, 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	850 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	851
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	852 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	853 "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	854 \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	855 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	856
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	857 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	858 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	859 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	860 struct epoll_event ev;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	861 int result;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	862 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	863
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	864 if (epfd < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	865 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	866
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	867 fd = PyObject_AsFileDescriptor(pfd);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	868 if (fd == -1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	869 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	870 }
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	871
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	872 switch(op) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	873 case EPOLL_CTL_ADD:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	874 case EPOLL_CTL_MOD:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	875 ev.events = events;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	876 ev.data.fd = fd;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	877 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	878 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	879 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	880 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	881 case EPOLL_CTL_DEL:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	882 /* 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	883 * 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	884 * though this argument is ignored. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	885 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	886 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	887 if (errno == EBADF) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	888 /* fd already closed */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	889 result = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	890 errno = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	891 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	892 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	893 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	894 default:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	895 result = -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	896 errno = EINVAL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	897 }
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	898
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	899 if (result < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	900 PyErr_SetFromErrno(PyExc_IOError);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	901 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	902 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	903 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	904 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	905
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	906 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	907 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	908 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	909 PyObject *pfd;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	910 unsigned int events = EPOLLIN \| EPOLLOUT \| EPOLLPRI;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	911 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	912
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	913 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	914 &pfd, &events)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	915 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	916 }
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	917
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	918 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	919 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	920
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	921 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	922 "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	923 \n\
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	924 Registers a new fd or modifies an already registered fd.\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	925 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	926 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	927 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	928 \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	929 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	930
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	931 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	932 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	933 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	934 PyObject *pfd;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	935 unsigned int events;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	936 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	937
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	938 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	939 &pfd, &events)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	940 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	941 }
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	942
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	943 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	944 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	945
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	946 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	947 "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	948 \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	949 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	950 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	951
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	952 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	953 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	954 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	955 PyObject *pfd;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	956 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	957
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	958 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	959 &pfd)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	960 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	961 }
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	962
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	963 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	964 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	965
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	966 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	967 "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	968 \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	969 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	970
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	971 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	972 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	973 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	974 double dtimeout = -1.;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	975 int timeout;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	976 int maxevents = -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	977 int nfds, i;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	978 PyObject elist = NULL, etuple = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	979 struct epoll_event *evs = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	980 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	981
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	982 if (self->epfd < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	983 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	984
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	985 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	986 &dtimeout, &maxevents)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	987 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	988 }
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	989
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	990 if (dtimeout < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	991 timeout = -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	992 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	993 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	994 PyErr_SetString(PyExc_OverflowError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	995 "timeout is too large");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	996 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	997 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	998 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	999 timeout = (int)(dtimeout * 1000.0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1000 }
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	1001
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1002 if (maxevents == -1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1003 maxevents = FD_SETSIZE-1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1004 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1005 else if (maxevents < 1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1006 PyErr_Format(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1007 "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	1008 maxevents);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1009 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1010 }
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	1011
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1012 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	1013 if (evs == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1014 Py_DECREF(self);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1015 PyErr_NoMemory();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1016 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1017 }
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	1018
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1019 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1020 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	1021 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1022 if (nfds < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1023 PyErr_SetFromErrno(PyExc_IOError);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1024 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1025 }
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	1026
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1027 elist = PyList_New(nfds);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1028 if (elist == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1029 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1030 }
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	1031
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1032 for (i = 0; i < nfds; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1033 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	1034 if (etuple == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1035 Py_CLEAR(elist);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1036 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1037 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1038 PyList_SET_ITEM(elist, i, etuple);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1039 }
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	1040
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	1041 error:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1042 PyMem_Free(evs);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1043 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	1044 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1045
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1046 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	1047 "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	1048 \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	1049 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	1050 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	1051 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	1052
376b5cb8a014 Merged revisions 61687-61688,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 static PyMethodDef pyepoll_methods[] = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1054 {"fromfd", (PyCFunction)pyepoll_fromfd,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1055 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	1056 {"close", (PyCFunction)pyepoll_close, METH_NOARGS,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1057 pyepoll_close_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1058 {"fileno", (PyCFunction)pyepoll_fileno, METH_NOARGS,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1059 pyepoll_fileno_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1060 {"modify", (PyCFunction)pyepoll_modify,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1061 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	1062 {"register", (PyCFunction)pyepoll_register,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1063 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	1064 {"unregister", (PyCFunction)pyepoll_unregister,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1065 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	1066 {"poll", (PyCFunction)pyepoll_poll,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1067 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	1068 {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	1069 };
376b5cb8a014 Merged revisions 61687-61688,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
376b5cb8a014 Merged revisions 61687-61688,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 static PyGetSetDef pyepoll_getsetlist[] = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1072 {"closed", (getter)pyepoll_get_closed, NULL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1073 "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	1074 {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	1075 };
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1076
376b5cb8a014 Merged revisions 61687-61688,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 PyDoc_STRVAR(pyepoll_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	1078 "select.epoll([sizehint=-1])\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	1079 \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	1080 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	1081 \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	1082 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	1083 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	1084 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	1085
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1086 static PyTypeObject pyEpoll_Type = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1087 PyVarObject_HEAD_INIT(NULL, 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1088 "select.epoll", /* tp_name */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1089 sizeof(pyEpoll_Object), /* tp_basicsize */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1090 0, /* tp_itemsize */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1091 (destructor)pyepoll_dealloc, /* tp_dealloc */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1092 0, /* tp_print */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1093 0, /* tp_getattr */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1094 0, /* tp_setattr */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1095 0, /* tp_reserved */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1096 0, /* tp_repr */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1097 0, /* tp_as_number */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1098 0, /* tp_as_sequence */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1099 0, /* tp_as_mapping */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1100 0, /* tp_hash */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1101 0, /* tp_call */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1102 0, /* tp_str */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1103 PyObject_GenericGetAttr, /* tp_getattro */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1104 0, /* tp_setattro */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1105 0, /* tp_as_buffer */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1106 Py_TPFLAGS_DEFAULT, /* tp_flags */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1107 pyepoll_doc, /* tp_doc */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1108 0, /* tp_traverse */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1109 0, /* tp_clear */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1110 0, /* tp_richcompare */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1111 0, /* tp_weaklistoffset */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1112 0, /* tp_iter */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1113 0, /* tp_iternext */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1114 pyepoll_methods, /* tp_methods */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1115 0, /* tp_members */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1116 pyepoll_getsetlist, /* tp_getset */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1117 0, /* tp_base */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1118 0, /* tp_dict */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1119 0, /* tp_descr_get */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1120 0, /* tp_descr_set */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1121 0, /* tp_dictoffset */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1122 0, /* tp_init */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1123 0, /* tp_alloc */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1124 pyepoll_new, /* tp_new */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1125 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	1126 };
376b5cb8a014 Merged revisions 61687-61688,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
376b5cb8a014 Merged revisions 61687-61688,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 #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	1129
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1130 #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	1131 /* **************************************************************************
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1132 * 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	1133 *
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1134 * 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	1135 * 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	1136 *
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1137 * 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	1138 * 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	1139 * 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	1140 * 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	1141 * 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	1142 * 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	1143 * 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	1144 * 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	1145 *
376b5cb8a014 Merged revisions 61687-61688,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 * 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	1147 * 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	1148 * 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	1149 * 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	1150 * 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	1151 * 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	1152 * 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	1153 * 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	1154 * 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	1155 * 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	1156 * 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	1157 */
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1158
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1159 #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	1160 #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	1161 #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	1162
376b5cb8a014 Merged revisions 61687-61688,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 PyDoc_STRVAR(kqueue_event_doc,
58026 e078579984a4 Merged revisions 77167 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 55618 diff changeset	1164 "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	1165 \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 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	1167 \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	1168 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	1169 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	1170 \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	1171 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	1172 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	1173 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	1174 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	1175 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	1176 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	1177 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	1178
376b5cb8a014 Merged revisions 61687-61688,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 typedef struct {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1180 PyObject_HEAD
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1181 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	1182 } 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	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 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	1185
376b5cb8a014 Merged revisions 61687-61688,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 #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	1187
376b5cb8a014 Merged revisions 61687-61688,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 typedef struct {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1189 PyObject_HEAD
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1190 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	1191 } 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	1192
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1193 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	1194
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1195 #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	1196
57113 f89a93a778a8 Merged revisions 76108 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55301 diff changeset	1197 #if (SIZEOF_UINTPTR_T != SIZEOF_VOID_P)
f89a93a778a8 Merged revisions 76108 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55301 diff changeset	1198 # error uintptr_t does not match void *!
f89a93a778a8 Merged revisions 76108 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55301 diff changeset	1199 #elif (SIZEOF_UINTPTR_T == SIZEOF_LONG_LONG)
f89a93a778a8 Merged revisions 76108 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55301 diff changeset	1200 # define T_UINTPTRT T_ULONGLONG
f89a93a778a8 Merged revisions 76108 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55301 diff changeset	1201 # define T_INTPTRT T_LONGLONG
f89a93a778a8 Merged revisions 76108 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55301 diff changeset	1202 # define PyLong_AsUintptr_t PyLong_AsUnsignedLongLong
f89a93a778a8 Merged revisions 76108 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55301 diff changeset	1203 # define UINTPTRT_FMT_UNIT "K"
f89a93a778a8 Merged revisions 76108 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55301 diff changeset	1204 # define INTPTRT_FMT_UNIT "L"
f89a93a778a8 Merged revisions 76108 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55301 diff changeset	1205 #elif (SIZEOF_UINTPTR_T == SIZEOF_LONG)
f89a93a778a8 Merged revisions 76108 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55301 diff changeset	1206 # define T_UINTPTRT T_ULONG
f89a93a778a8 Merged revisions 76108 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55301 diff changeset	1207 # define T_INTPTRT T_LONG
f89a93a778a8 Merged revisions 76108 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55301 diff changeset	1208 # define PyLong_AsUintptr_t PyLong_AsUnsignedLong
f89a93a778a8 Merged revisions 76108 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55301 diff changeset	1209 # define UINTPTRT_FMT_UNIT "k"
f89a93a778a8 Merged revisions 76108 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55301 diff changeset	1210 # define INTPTRT_FMT_UNIT "l"
f89a93a778a8 Merged revisions 76108 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55301 diff changeset	1211 #elif (SIZEOF_UINTPTR_T == SIZEOF_INT)
f89a93a778a8 Merged revisions 76108 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55301 diff changeset	1212 # define T_UINTPTRT T_UINT
f89a93a778a8 Merged revisions 76108 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55301 diff changeset	1213 # define T_INTPTRT T_INT
f89a93a778a8 Merged revisions 76108 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55301 diff changeset	1214 # define PyLong_AsUintptr_t PyLong_AsUnsignedLong
f89a93a778a8 Merged revisions 76108 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55301 diff changeset	1215 # define UINTPTRT_FMT_UNIT "I"
f89a93a778a8 Merged revisions 76108 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55301 diff changeset	1216 # define INTPTRT_FMT_UNIT "i"
f89a93a778a8 Merged revisions 76108 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55301 diff changeset	1217 #else
f89a93a778a8 Merged revisions 76108 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55301 diff changeset	1218 # 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	1219 #endif
f89a93a778a8 Merged revisions 76108 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 55301 diff changeset	1220
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	1221 /* 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	1222 * 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	1223 * 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	1224 */
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1225
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1226 #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	1227 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	1228 {"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	1229 {"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	1230 {"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	1231 {"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	1232 {"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	1233 {"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	1234 {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	1235 };
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1236 #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	1237
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1238 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	1239
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	1240 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	1241 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1242 char buf[1024];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1243 PyOS_snprintf(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1244 buf, sizeof(buf),
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1245 "<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	1246 "data=0x%zd udata=%p>",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1247 (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	1248 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	1249 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	1250 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1251
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1252 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	1253 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	1254 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1255 PyObject *pfd;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1256 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	1257 "data", "udata", NULL};
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1258 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	1259
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1260 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	1261
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1262 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	1263 &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	1264 &(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	1265 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1266 }
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	1267
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1268 if (PyLong_Check(pfd)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1269 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	1270 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1271 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1272 self->e.ident = PyObject_AsFileDescriptor(pfd);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1273 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1274 if (PyErr_Occurred()) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1275 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1276 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1277 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	1278 }
376b5cb8a014 Merged revisions 61687-61688,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 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	1282 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	1283 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1284 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	1285
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1286 if (!kqueue_event_Check(o)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1287 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	1288 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	1289 Py_INCREF(res);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1290 return res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1291 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1292 PyErr_Format(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1293 "can't compare %.200s to %.200s",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1294 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	1295 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1296 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1297 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	1298 ((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	1299 ((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	1300 ((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	1301 ((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	1302 ((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	1303 ) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1304 result = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1305 }
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 switch (op) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1308 case Py_EQ:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1309 result = (result == 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1310 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1311 case Py_NE:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1312 result = (result != 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1313 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1314 case Py_LE:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1315 result = (result <= 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1316 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1317 case Py_GE:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1318 result = (result >= 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1319 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1320 case Py_LT:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1321 result = (result < 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1322 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1323 case Py_GT:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1324 result = (result > 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1325 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1326 }
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1327 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	1328 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1329
376b5cb8a014 Merged revisions 61687-61688,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 static PyTypeObject kqueue_event_Type = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1331 PyVarObject_HEAD_INIT(NULL, 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1332 "select.kevent", /* tp_name */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1333 sizeof(kqueue_event_Object), /* tp_basicsize */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1334 0, /* tp_itemsize */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1335 0, /* tp_dealloc */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1336 0, /* tp_print */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1337 0, /* tp_getattr */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1338 0, /* tp_setattr */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1339 0, /* tp_reserved */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1340 (reprfunc)kqueue_event_repr, /* tp_repr */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1341 0, /* tp_as_number */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1342 0, /* tp_as_sequence */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1343 0, /* tp_as_mapping */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1344 0, /* tp_hash */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1345 0, /* tp_call */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1346 0, /* tp_str */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1347 0, /* tp_getattro */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1348 0, /* tp_setattro */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1349 0, /* tp_as_buffer */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1350 Py_TPFLAGS_DEFAULT, /* tp_flags */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1351 kqueue_event_doc, /* tp_doc */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1352 0, /* tp_traverse */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1353 0, /* tp_clear */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1354 (richcmpfunc)kqueue_event_richcompare, /* tp_richcompare */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1355 0, /* tp_weaklistoffset */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1356 0, /* tp_iter */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1357 0, /* tp_iternext */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1358 0, /* tp_methods */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1359 kqueue_event_members, /* tp_members */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1360 0, /* tp_getset */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1361 0, /* tp_base */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1362 0, /* tp_dict */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1363 0, /* tp_descr_get */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1364 0, /* tp_descr_set */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1365 0, /* tp_dictoffset */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1366 (initproc)kqueue_event_init, /* tp_init */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1367 0, /* tp_alloc */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1368 0, /* tp_new */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1369 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	1370 };
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1371
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1372 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	1373 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	1374 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1375 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	1376 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	1377 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1378
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1379 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	1380 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	1381 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1382 int save_errno = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1383 if (self->kqfd >= 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1384 int kqfd = self->kqfd;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1385 self->kqfd = -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1386 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1387 if (close(kqfd) < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1388 save_errno = errno;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1389 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1390 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1391 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	1392 }
376b5cb8a014 Merged revisions 61687-61688,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 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	1395 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	1396 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1397 kqueue_queue_Object *self;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1398 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	1399 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	1400 if (self == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1401 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1402 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1403
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1404 if (fd == -1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1405 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1406 self->kqfd = kqueue();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1407 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1408 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1409 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1410 self->kqfd = fd;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1411 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1412 if (self->kqfd < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1413 Py_DECREF(self);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1414 PyErr_SetFromErrno(PyExc_IOError);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1415 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1416 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1417 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	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 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	1421 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	1422 {
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1423
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1424 if ((args != NULL && PyObject_Size(args)) \|\|
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1425 (kwds != NULL && PyObject_Size(kwds))) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1426 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1427 "select.kqueue doesn't accept arguments");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1428 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1429 }
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	1430
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1431 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	1432 }
376b5cb8a014 Merged revisions 61687-61688,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
376b5cb8a014 Merged revisions 61687-61688,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 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	1435 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	1436 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1437 kqueue_queue_internal_close(self);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1438 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	1439 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1440
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1441 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	1442 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	1443 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1444 errno = kqueue_queue_internal_close(self);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1445 if (errno < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1446 PyErr_SetFromErrno(PyExc_IOError);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1447 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1448 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1449 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	1450 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1451
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1452 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	1453 "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	1454 \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	1455 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	1456 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	1457
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1458 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	1459 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	1460 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1461 if (self->kqfd < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1462 Py_RETURN_TRUE;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1463 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1464 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	1465 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1466
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1467 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	1468 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	1469 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1470 if (self->kqfd < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1471 return kqueue_queue_err_closed();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1472 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	1473 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1474
376b5cb8a014 Merged revisions 61687-61688,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 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	1476 "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	1477 \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	1478 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	1479
376b5cb8a014 Merged revisions 61687-61688,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 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	1481 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	1482 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1483 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	1484
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1485 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	1486 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	1487
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1488 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	1489 }
376b5cb8a014 Merged revisions 61687-61688,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
376b5cb8a014 Merged revisions 61687-61688,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 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	1492 "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	1493 \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	1494 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	1495
376b5cb8a014 Merged revisions 61687-61688,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 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	1497 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	1498 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1499 int nevents = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1500 int gotevents = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1501 int nchanges = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1502 int i = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1503 PyObject *otimeout = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1504 PyObject *ch = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1505 PyObject it = NULL, ei = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1506 PyObject *result = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1507 struct kevent *evl = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1508 struct kevent *chl = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1509 struct timespec timeoutspec;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1510 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	1511
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1512 if (self->kqfd < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1513 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	1514
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1515 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	1516 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	1517
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1518 if (nevents < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1519 PyErr_Format(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1520 "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	1521 nevents);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1522 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1523 }
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	1524
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1525 if (otimeout == Py_None \|\| otimeout == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1526 ptimeoutspec = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1527 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1528 else if (PyNumber_Check(otimeout)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1529 double timeout;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1530 long seconds;
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
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1532 timeout = PyFloat_AsDouble(otimeout);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1533 if (timeout == -1 && PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1534 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1535 if (timeout > (double)LONG_MAX) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1536 PyErr_SetString(PyExc_OverflowError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1537 "timeout period too long");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1538 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1539 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1540 if (timeout < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1541 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1542 "timeout must be positive or None");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1543 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1544 }
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	1545
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1546 seconds = (long)timeout;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1547 timeout = timeout - (double)seconds;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1548 timeoutspec.tv_sec = seconds;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1549 timeoutspec.tv_nsec = (long)(timeout * 1E9);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1550 ptimeoutspec = &timeoutspec;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1551 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1552 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1553 PyErr_Format(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1554 "timeout argument must be an number "
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1555 "or None, got %.200s",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1556 Py_TYPE(otimeout)->tp_name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1557 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1558 }
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	1559
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1560 if (ch != NULL && ch != Py_None) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1561 it = PyObject_GetIter(ch);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1562 if (it == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1563 PyErr_SetString(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1564 "changelist is not iterable");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1565 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1566 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1567 nchanges = PyObject_Size(ch);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1568 if (nchanges < 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1569 goto error;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1570 }
59616 9cf702c91a9e Merged revisions 78101,78115,78117,78182,78188,78245,78386,78496 via svnmerge from Georg Brandl <georg@python.org> parents: 58022 diff changeset	1571
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1572 chl = PyMem_New(struct kevent, nchanges);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1573 if (chl == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1574 PyErr_NoMemory();
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1575 goto error;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1576 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1577 i = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1578 while ((ei = PyIter_Next(it)) != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1579 if (!kqueue_event_Check(ei)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1580 Py_DECREF(ei);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1581 PyErr_SetString(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1582 "changelist must be an iterable of "
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1583 "select.kevent objects");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1584 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1585 } else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1586 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	1587 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1588 Py_DECREF(ei);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1589 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1590 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1591 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	1592
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1593 /* event list */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1594 if (nevents) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1595 evl = PyMem_New(struct kevent, nevents);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1596 if (evl == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1597 PyErr_NoMemory();
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1598 goto error;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1599 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1600 }
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	1601
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1602 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1603 gotevents = kevent(self->kqfd, chl, nchanges,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1604 evl, nevents, ptimeoutspec);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1605 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	1606
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1607 if (gotevents == -1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1608 PyErr_SetFromErrno(PyExc_OSError);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1609 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1610 }
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	1611
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1612 result = PyList_New(gotevents);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1613 if (result == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1614 goto error;
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
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1617 for (i = 0; i < gotevents; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1618 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	1619
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1620 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	1621 if (ch == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1622 goto error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1623 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1624 ch->e = evl[i];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1625 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	1626 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1627 PyMem_Free(chl);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1628 PyMem_Free(evl);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1629 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	1630
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1631 error:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1632 PyMem_Free(chl);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1633 PyMem_Free(evl);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1634 Py_XDECREF(result);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1635 Py_XDECREF(it);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1636 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	1637 }
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1638
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1639 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	1640 "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	1641 \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	1642 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	1643 - 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	1644 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	1645 - 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	1646 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	1647 - 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	1648 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	1649
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1650
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1651 static PyMethodDef kqueue_queue_methods[] = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1652 {"fromfd", (PyCFunction)kqueue_queue_fromfd,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1653 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	1654 {"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	1655 kqueue_queue_close_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1656 {"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	1657 kqueue_queue_fileno_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1658 {"control", (PyCFunction)kqueue_queue_control,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1659 METH_VARARGS , kqueue_queue_control_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1660 {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	1661 };
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1662
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1663 static PyGetSetDef kqueue_queue_getsetlist[] = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1664 {"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	1665 "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	1666 {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	1667 };
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1668
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1669 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	1670 "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	1671 \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	1672 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	1673 >>> 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	1674 >>> 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	1675 >>> 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	1676 >>> 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	1677 \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	1678 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	1679 >>> 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	1680 \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	1681 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	1682 >>> 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	1683
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1684 static PyTypeObject kqueue_queue_Type = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1685 PyVarObject_HEAD_INIT(NULL, 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1686 "select.kqueue", /* tp_name */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1687 sizeof(kqueue_queue_Object), /* tp_basicsize */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1688 0, /* tp_itemsize */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1689 (destructor)kqueue_queue_dealloc, /* tp_dealloc */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1690 0, /* tp_print */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1691 0, /* tp_getattr */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1692 0, /* tp_setattr */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1693 0, /* tp_reserved */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1694 0, /* tp_repr */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1695 0, /* tp_as_number */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1696 0, /* tp_as_sequence */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1697 0, /* tp_as_mapping */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1698 0, /* tp_hash */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1699 0, /* tp_call */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1700 0, /* tp_str */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1701 0, /* tp_getattro */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1702 0, /* tp_setattro */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1703 0, /* tp_as_buffer */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1704 Py_TPFLAGS_DEFAULT, /* tp_flags */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1705 kqueue_queue_doc, /* tp_doc */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1706 0, /* tp_traverse */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1707 0, /* tp_clear */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1708 0, /* tp_richcompare */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1709 0, /* tp_weaklistoffset */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1710 0, /* tp_iter */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1711 0, /* tp_iternext */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1712 kqueue_queue_methods, /* tp_methods */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1713 0, /* tp_members */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1714 kqueue_queue_getsetlist, /* tp_getset */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1715 0, /* tp_base */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1716 0, /* tp_dict */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1717 0, /* tp_descr_get */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1718 0, /* tp_descr_set */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1719 0, /* tp_dictoffset */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1720 0, /* tp_init */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1721 0, /* tp_alloc */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1722 kqueue_queue_new, /* tp_new */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1723 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	1724 };
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1725
376b5cb8a014 Merged revisions 61687-61688,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 #endif /* 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	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
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23607 diff changeset	1729 PyDoc_STRVAR(select_doc,
8570 bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	1730 "select(rlist, wlist, xlist[, timeout]) -> (rlist, wlist, xlist)\n\
bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	1731 \n\
bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	1732 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	1733 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	1734 rlist -- wait until ready for reading\n\
bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	1735 wlist -- wait until ready for writing\n\
bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	1736 xlist -- wait for an ``exceptional condition''\n\
bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	1737 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	1738 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	1739 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	1740 \n\
bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	1741 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	1742 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	1743 or None, the call will never time out.\n\
bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	1744 \n\
bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	1745 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	1746 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	1747 that are ready.\n\
bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	1748 \n\
bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	1749 * IMPORTANT NOTICE *\n\
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	1750 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	1751 descriptors can be used.");
8570 bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	1752
4692 cb405b9696d4 Several changes... Guido please take a look! Barry Warsaw <barry@python.org> parents: 4621 diff changeset	1753 static PyMethodDef select_methods[] = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1754 {"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	1755 #ifdef HAVE_POLL
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1756 {"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	1757 #endif /* HAVE_POLL */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1758 {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	1759 };
a4793ae26682 Changes for new UNIX-specific built-in module 'select' and new header for Guido van Rossum <guido@python.org> parents: diff changeset	1760
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23607 diff changeset	1761 PyDoc_STRVAR(module_doc,
8570 bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	1762 "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	1763 \n\
bd695de18ecf Added doc strings. Guido van Rossum <guido@python.org> parents: 6626 diff changeset	1764 * IMPORTANT NOTICE *\n\
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1765 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	1766
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	1767
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	1768 static struct PyModuleDef selectmodule = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1769 PyModuleDef_HEAD_INIT,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1770 "select",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1771 module_doc,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1772 -1,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1773 select_methods,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1774 NULL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1775 NULL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1776 NULL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1777 NULL
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	1778 };
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	1779
24363 979ff5d0ae07 Replace DL_IMPORT with PyMODINIT_FUNC and remove "/export:init..." link Mark Hammond <mhammond@skippinet.com.au> parents: 24283 diff changeset	1780 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	1781 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	1782 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1783 PyObject *m;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1784 m = PyModule_Create(&selectmodule);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1785 if (m == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1786 return NULL;
22729 cdff3c7c1a76 Use the PyModule_Add() APIs instead of manipulating the module dict Fred Drake <fdrake@acm.org>* parents: 22114 diff changeset	1787
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1788 SelectError = PyErr_NewException("select.error", NULL, NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1789 Py_INCREF(SelectError);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1790 PyModule_AddObject(m, "error", SelectError);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	1791
55179 e89faaafa3ee Merged revisions 73916 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 55099 diff changeset	1792 #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	1793 #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	1794 #undef PIPE_BUF
3c4225bf87b4 #9862: On AIX PIPE_BUF is broken. Make it 512. R. David Murray <rdmurray@bitdance.com> parents: 63589 diff changeset	1795 #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	1796 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60423 diff changeset	1797 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	1798 #endif
55099 06b360a33d57 Merged revisions 73818 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 51271 diff changeset	1799
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	1800 #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	1801 #ifdef __APPLE__
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1802 if (select_have_broken_poll()) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1803 if (PyObject_DelAttrString(m, "poll") == -1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1804 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1805 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1806 } 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	1807 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1808 {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	1809 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1810 if (PyType_Ready(&poll_Type) < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1811 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1812 PyModule_AddIntConstant(m, "POLLIN", POLLIN);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1813 PyModule_AddIntConstant(m, "POLLPRI", POLLPRI);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1814 PyModule_AddIntConstant(m, "POLLOUT", POLLOUT);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1815 PyModule_AddIntConstant(m, "POLLERR", POLLERR);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1816 PyModule_AddIntConstant(m, "POLLHUP", POLLHUP);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1817 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	1818
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	1819 #ifdef POLLRDNORM
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1820 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	1821 #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	1822 #ifdef POLLRDBAND
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1823 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	1824 #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	1825 #ifdef POLLWRNORM
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1826 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	1827 #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	1828 #ifdef POLLWRBAND
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1829 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	1830 #endif
14182 c85a80db6845 Not every OS that support poll seems to support POLLMSG. Sjoerd Mullender <sjoerd@acm.org> parents: 14174 diff changeset	1831 #ifdef POLLMSG
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1832 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	1833 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1834 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	1835 #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	1836
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1837 #ifdef HAVE_EPOLL
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1838 Py_TYPE(&pyEpoll_Type) = &PyType_Type;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1839 if (PyType_Ready(&pyEpoll_Type) < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1840 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	1841
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1842 Py_INCREF(&pyEpoll_Type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1843 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	1844
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1845 PyModule_AddIntConstant(m, "EPOLLIN", EPOLLIN);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1846 PyModule_AddIntConstant(m, "EPOLLOUT", EPOLLOUT);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1847 PyModule_AddIntConstant(m, "EPOLLPRI", EPOLLPRI);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1848 PyModule_AddIntConstant(m, "EPOLLERR", EPOLLERR);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1849 PyModule_AddIntConstant(m, "EPOLLHUP", EPOLLHUP);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1850 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	1851 #ifdef EPOLLONESHOT
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1852 /* Kernel 2.6.2+ */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1853 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	1854 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1855 /* PyModule_AddIntConstant(m, "EPOLL_RDHUP", EPOLLRDHUP); */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1856 PyModule_AddIntConstant(m, "EPOLLRDNORM", EPOLLRDNORM);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1857 PyModule_AddIntConstant(m, "EPOLLRDBAND", EPOLLRDBAND);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1858 PyModule_AddIntConstant(m, "EPOLLWRNORM", EPOLLWRNORM);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1859 PyModule_AddIntConstant(m, "EPOLLWRBAND", EPOLLWRBAND);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1860 PyModule_AddIntConstant(m, "EPOLLMSG", EPOLLMSG);
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	1861 #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	1862
376b5cb8a014 Merged revisions 61687-61688,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 #ifdef HAVE_KQUEUE
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1864 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	1865 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	1866 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	1867 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	1868
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1869 Py_INCREF(&kqueue_event_Type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1870 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	1871
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1872 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	1873 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	1874 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1875 Py_INCREF(&kqueue_queue_Type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1876 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	1877
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1878 /* event filters */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1879 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	1880 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	1881 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	1882 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	1883 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	1884 #ifdef EVFILT_NETDEV
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1885 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	1886 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1887 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	1888 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	1889
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1890 /* event flags */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1891 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	1892 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	1893 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	1894 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	1895 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	1896 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	1897
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1898 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	1899 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	1900
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1901 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	1902 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	1903
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1904 /* READ WRITE filter flag */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1905 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	1906
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1907 /* VNODE filter flags */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1908 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	1909 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	1910 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	1911 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	1912 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	1913 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	1914 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	1915
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1916 /* PROC filter flags */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1917 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	1918 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	1919 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	1920 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	1921 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	1922
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1923 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	1924 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	1925 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	1926
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1927 /* 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	1928 #ifdef EVFILT_NETDEV
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1929 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	1930 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	1931 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	1932 #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	1933
376b5cb8a014 Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44469 diff changeset	1934 #endif /* HAVE_KQUEUE */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60425 diff changeset	1935 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	1936 }

Mercurial > cpython-lru_cache-weakref

annotate Modules/selectmodule.c @ 70817:dd775b1561ba