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

annotate Modules/selectmodule.c @ 78315:efade142ef01 3.2

Issue #15467: Move helpers for __sizeof__ tests into test_support. Patch by Serhiy Storchaka.

author	Martin v. Löwis <martin@v.loewis.de>
date	Sun, 29 Jul 2012 16:33:05 +0200
parents	bc9b2956bb8b
children	87ccf2635ad7 9985b4651436

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

Mercurial > cpython-lru_cache-weakref

annotate Modules/selectmodule.c @ 78315:efade142ef01 3.2