annotate Modules/selectmodule.c @ 86127:a3d09c19bb93

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