mirror of
https://github.com/python/cpython.git
synced 2025-08-03 08:34:29 +00:00
Applied patch #1657 epoll and kqueue wrappers for the select module
The patch adds wrappers for the Linux epoll syscalls and the BSD kqueue syscalls. Thanks to Thomas Herve and the Twisted people for their support and help. TODO: Finish documentation documentation
This commit is contained in:
Christian Heimes
parent
5f79446af0
commit
0e9ab5f2f0
11 changed files with 2044 additions and 22 deletions
|
|
@ -825,10 +825,12 @@ _expectations = {
|
|||
test_dl
|
||||
test_fcntl
|
||||
test_fork1
|
||||
test_epoll
|
||||
test_gdbm
|
||||
test_grp
|
||||
test_ioctl
|
||||
test_largefile
|
||||
test_kqueue
|
||||
test_mhlib
|
||||
test_openpty
|
||||
test_ossaudiodev
|
||||
|
|
@ -850,6 +852,7 @@ _expectations = {
|
|||
test_curses
|
||||
test_dl
|
||||
test_largefile
|
||||
test_kqueue
|
||||
test_ossaudiodev
|
||||
""",
|
||||
'mac':
|
||||
|
|
@ -866,10 +869,12 @@ _expectations = {
|
|||
test_dl
|
||||
test_fcntl
|
||||
test_fork1
|
||||
test_epoll
|
||||
test_grp
|
||||
test_ioctl
|
||||
test_largefile
|
||||
test_locale
|
||||
test_kqueue
|
||||
test_mmap
|
||||
test_openpty
|
||||
test_ossaudiodev
|
||||
|
|
@ -890,7 +895,9 @@ _expectations = {
|
|||
test_bsddb
|
||||
test_bsddb185
|
||||
test_dl
|
||||
test_epoll
|
||||
test_largefile
|
||||
test_kqueue
|
||||
test_minidom
|
||||
test_openpty
|
||||
test_pyexpat
|
||||
|
|
@ -902,7 +909,9 @@ _expectations = {
|
|||
test_bsddb
|
||||
test_bsddb185
|
||||
test_dl
|
||||
test_epoll
|
||||
test_largefile
|
||||
test_kqueue
|
||||
test_minidom
|
||||
test_openpty
|
||||
test_pyexpat
|
||||
|
|
@ -916,9 +925,11 @@ _expectations = {
|
|||
test_bsddb185
|
||||
test_dl
|
||||
test_fork1
|
||||
test_epoll
|
||||
test_gettext
|
||||
test_largefile
|
||||
test_locale
|
||||
test_kqueue
|
||||
test_minidom
|
||||
test_openpty
|
||||
test_pyexpat
|
||||
|
|
@ -943,10 +954,12 @@ _expectations = {
|
|||
test_dl
|
||||
test_fcntl
|
||||
test_fork1
|
||||
test_epoll
|
||||
test_gdbm
|
||||
test_grp
|
||||
test_largefile
|
||||
test_locale
|
||||
test_kqueue
|
||||
test_mmap
|
||||
test_openpty
|
||||
test_poll
|
||||
|
|
@ -967,9 +980,11 @@ _expectations = {
|
|||
test_bsddb
|
||||
test_bsddb3
|
||||
test_curses
|
||||
test_epoll
|
||||
test_gdbm
|
||||
test_largefile
|
||||
test_locale
|
||||
test_kqueue
|
||||
test_minidom
|
||||
test_ossaudiodev
|
||||
test_poll
|
||||
|
|
@ -980,6 +995,8 @@ _expectations = {
|
|||
test_bsddb185
|
||||
test_curses
|
||||
test_dbm
|
||||
test_epoll
|
||||
test_kqueue
|
||||
test_gdbm
|
||||
test_gzip
|
||||
test_openpty
|
||||
|
|
@ -992,10 +1009,12 @@ _expectations = {
|
|||
test_bsddb185
|
||||
test_curses
|
||||
test_dl
|
||||
test_epoll
|
||||
test_gdbm
|
||||
test_gzip
|
||||
test_largefile
|
||||
test_locale
|
||||
test_kqueue
|
||||
test_minidom
|
||||
test_openpty
|
||||
test_pyexpat
|
||||
|
|
@ -1009,8 +1028,10 @@ _expectations = {
|
|||
test_curses
|
||||
test_dl
|
||||
test_gdbm
|
||||
test_epoll
|
||||
test_largefile
|
||||
test_locale
|
||||
test_kqueue
|
||||
test_mhlib
|
||||
test_mmap
|
||||
test_poll
|
||||
|
|
@ -1023,7 +1044,9 @@ _expectations = {
|
|||
test_bsddb3
|
||||
test_curses
|
||||
test_dbm
|
||||
test_epoll
|
||||
test_ioctl
|
||||
test_kqueue
|
||||
test_largefile
|
||||
test_locale
|
||||
test_ossaudiodev
|
||||
|
|
@ -1037,6 +1060,8 @@ _expectations = {
|
|||
test_commands
|
||||
test_curses
|
||||
test_dl
|
||||
test_epoll
|
||||
test_kqueue
|
||||
test_largefile
|
||||
test_mhlib
|
||||
test_mmap
|
||||
|
|
@ -1050,6 +1075,7 @@ _expectations = {
|
|||
"""
|
||||
test_bsddb
|
||||
test_bsddb3
|
||||
test_epoll
|
||||
test_gdbm
|
||||
test_locale
|
||||
test_ossaudiodev
|
||||
|
|
@ -1068,8 +1094,10 @@ _expectations = {
|
|||
test_bsddb3
|
||||
test_bz2
|
||||
test_dl
|
||||
test_epoll
|
||||
test_gdbm
|
||||
test_gzip
|
||||
test_kqueue
|
||||
test_ossaudiodev
|
||||
test_tcl
|
||||
test_zipimport
|
||||
|
|
@ -1081,6 +1109,7 @@ _expectations = {
|
|||
test_bsddb3
|
||||
test_ctypes
|
||||
test_dl
|
||||
test_epoll
|
||||
test_gdbm
|
||||
test_locale
|
||||
test_normalization
|
||||
|
|
@ -1096,6 +1125,7 @@ _expectations = {
|
|||
test_ctypes
|
||||
test_curses
|
||||
test_dl
|
||||
test_epoll
|
||||
test_gdbm
|
||||
test_locale
|
||||
test_ossaudiodev
|
||||
|
|
|
|||
189
Lib/test/test_epoll.py
Normal file
189
Lib/test/test_epoll.py
Normal file
|
|
@ -0,0 +1,189 @@
|
|||
# Copyright (c) 2001-2006 Twisted Matrix Laboratories.
|
||||
#
|
||||
# Permission is hereby granted, free of charge, to any person obtaining
|
||||
# a copy of this software and associated documentation files (the
|
||||
# "Software"), to deal in the Software without restriction, including
|
||||
# without limitation the rights to use, copy, modify, merge, publish,
|
||||
# distribute, sublicense, and/or sell copies of the Software, and to
|
||||
# permit persons to whom the Software is furnished to do so, subject to
|
||||
# the following conditions:
|
||||
#
|
||||
# The above copyright notice and this permission notice shall be
|
||||
# included in all copies or substantial portions of the Software.
|
||||
#
|
||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
"""
|
||||
Tests for epoll wrapper.
|
||||
"""
|
||||
import os
|
||||
import socket
|
||||
import errno
|
||||
import time
|
||||
import select
|
||||
import tempfile
|
||||
import unittest
|
||||
|
||||
from test import test_support
|
||||
if not hasattr(select, "epoll"):
|
||||
raise test_support.TestSkipped("test works only on Linux 2.6")
|
||||
|
||||
class TestEPoll(unittest.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
self.serverSocket = socket.socket()
|
||||
self.serverSocket.bind(('127.0.0.1', 0))
|
||||
self.serverSocket.listen(1)
|
||||
self.connections = [self.serverSocket]
|
||||
|
||||
|
||||
def tearDown(self):
|
||||
for skt in self.connections:
|
||||
skt.close()
|
||||
|
||||
def _connected_pair(self):
|
||||
client = socket.socket()
|
||||
client.setblocking(False)
|
||||
try:
|
||||
client.connect(('127.0.0.1', self.serverSocket.getsockname()[1]))
|
||||
except socket.error, e:
|
||||
self.assertEquals(e.args[0], errno.EINPROGRESS)
|
||||
else:
|
||||
raise AssertionError("Connect should have raised EINPROGRESS")
|
||||
server, addr = self.serverSocket.accept()
|
||||
|
||||
self.connections.extend((client, server))
|
||||
return client, server
|
||||
|
||||
def test_create(self):
|
||||
try:
|
||||
ep = select.epoll(16)
|
||||
except OSError, e:
|
||||
raise AssertionError(str(e))
|
||||
self.assert_(ep.fileno() > 0, ep.fileno())
|
||||
self.assert_(not ep.closed)
|
||||
ep.close()
|
||||
self.assert_(ep.closed)
|
||||
self.assertRaises(ValueError, ep.fileno)
|
||||
|
||||
def test_badcreate(self):
|
||||
self.assertRaises(TypeError, select.epoll, 1, 2, 3)
|
||||
self.assertRaises(TypeError, select.epoll, 'foo')
|
||||
self.assertRaises(TypeError, select.epoll, None)
|
||||
self.assertRaises(TypeError, select.epoll, ())
|
||||
self.assertRaises(TypeError, select.epoll, ['foo'])
|
||||
self.assertRaises(TypeError, select.epoll, {})
|
||||
|
||||
def test_add(self):
|
||||
server, client = self._connected_pair()
|
||||
|
||||
ep = select.epoll(2)
|
||||
try:
|
||||
ep.register(server.fileno(), select.EPOLLIN | select.EPOLLOUT)
|
||||
ep.register(client.fileno(), select.EPOLLIN | select.EPOLLOUT)
|
||||
finally:
|
||||
ep.close()
|
||||
|
||||
def test_fromfd(self):
|
||||
server, client = self._connected_pair()
|
||||
|
||||
ep = select.epoll(2)
|
||||
ep2 = select.epoll.fromfd(ep.fileno())
|
||||
|
||||
ep2.register(server.fileno(), select.EPOLLIN | select.EPOLLOUT)
|
||||
ep2.register(client.fileno(), select.EPOLLIN | select.EPOLLOUT)
|
||||
|
||||
events = ep.poll(1, 4)
|
||||
events2 = ep2.poll(0.9, 4)
|
||||
self.assertEqual(len(events), 2)
|
||||
self.assertEqual(len(events2), 2)
|
||||
|
||||
ep.close()
|
||||
try:
|
||||
ep2.poll(1, 4)
|
||||
except IOError, e:
|
||||
self.failUnlessEqual(e.args[0], errno.EBADF, e)
|
||||
else:
|
||||
self.fail("epoll on closed fd didn't raise EBADF")
|
||||
|
||||
def test_control_and_wait(self):
|
||||
client, server = self._connected_pair()
|
||||
|
||||
ep = select.epoll(16)
|
||||
ep.register(server.fileno(),
|
||||
select.EPOLLIN | select.EPOLLOUT | select.EPOLLET)
|
||||
ep.register(client.fileno(),
|
||||
select.EPOLLIN | select.EPOLLOUT | select.EPOLLET)
|
||||
|
||||
now = time.time()
|
||||
events = ep.poll(1, 4)
|
||||
then = time.time()
|
||||
self.failIf(then - now > 0.1, then - now)
|
||||
|
||||
events.sort()
|
||||
expected = [(client.fileno(), select.EPOLLOUT),
|
||||
(server.fileno(), select.EPOLLOUT)]
|
||||
expected.sort()
|
||||
|
||||
self.assertEquals(events, expected)
|
||||
self.failIf(then - now > 0.01, then - now)
|
||||
|
||||
now = time.time()
|
||||
events = ep.poll(timeout=2.1, maxevents=4)
|
||||
then = time.time()
|
||||
self.failIf(events)
|
||||
|
||||
client.send("Hello!")
|
||||
server.send("world!!!")
|
||||
|
||||
now = time.time()
|
||||
events = ep.poll(1, 4)
|
||||
then = time.time()
|
||||
self.failIf(then - now > 0.01)
|
||||
|
||||
events.sort()
|
||||
expected = [(client.fileno(), select.EPOLLIN | select.EPOLLOUT),
|
||||
(server.fileno(), select.EPOLLIN | select.EPOLLOUT)]
|
||||
expected.sort()
|
||||
|
||||
self.assertEquals(events, expected)
|
||||
|
||||
ep.unregister(client.fileno())
|
||||
ep.modify(server.fileno(), select.EPOLLOUT)
|
||||
now = time.time()
|
||||
events = ep.poll(1, 4)
|
||||
then = time.time()
|
||||
self.failIf(then - now > 0.01)
|
||||
|
||||
expected = [(server.fileno(), select.EPOLLOUT)]
|
||||
self.assertEquals(events, expected)
|
||||
|
||||
def test_errors(self):
|
||||
self.assertRaises(ValueError, select.epoll, -2)
|
||||
self.assertRaises(ValueError, select.epoll().register, -1,
|
||||
select.EPOLLIN)
|
||||
|
||||
def test_unregister_closed(self):
|
||||
server, client = self._connected_pair()
|
||||
fd = server.fileno()
|
||||
ep = select.epoll(16)
|
||||
ep.register(server)
|
||||
|
||||
now = time.time()
|
||||
events = ep.poll(1, 4)
|
||||
then = time.time()
|
||||
self.failIf(then - now > 0.01)
|
||||
|
||||
server.close()
|
||||
ep.unregister(fd)
|
||||
|
||||
def test_main():
|
||||
test_support.run_unittest(TestEPoll)
|
||||
|
||||
if __name__ == "__main__":
|
||||
test_main()
|
||||
166
Lib/test/test_kqueue.py
Normal file
166
Lib/test/test_kqueue.py
Normal file
|
|
@ -0,0 +1,166 @@
|
|||
"""
|
||||
Tests for kqueue wrapper.
|
||||
"""
|
||||
import socket
|
||||
import errno
|
||||
import time
|
||||
import select
|
||||
import sys
|
||||
import unittest
|
||||
|
||||
from test import test_support
|
||||
if not hasattr(select, "kqueue"):
|
||||
raise test_support.TestSkipped("test works only on BSD")
|
||||
|
||||
class TestKQueue(unittest.TestCase):
|
||||
def test_create_queue(self):
|
||||
kq = select.kqueue()
|
||||
self.assert_(kq.fileno() > 0, kq.fileno())
|
||||
self.assert_(not kq.closed)
|
||||
kq.close()
|
||||
self.assert_(kq.closed)
|
||||
self.assertRaises(ValueError, kq.fileno)
|
||||
|
||||
def test_create_event(self):
|
||||
fd = sys.stderr.fileno()
|
||||
ev = select.kevent(fd)
|
||||
other = select.kevent(1000)
|
||||
self.assertEqual(ev.ident, fd)
|
||||
self.assertEqual(ev.filter, select.KQ_FILTER_READ)
|
||||
self.assertEqual(ev.flags, select.KQ_EV_ADD)
|
||||
self.assertEqual(ev.fflags, 0)
|
||||
self.assertEqual(ev.data, 0)
|
||||
self.assertEqual(ev.udata, 0)
|
||||
self.assertEqual(ev, ev)
|
||||
self.assertNotEqual(ev, other)
|
||||
self.assertEqual(cmp(ev, other), -1)
|
||||
self.assert_(ev < other)
|
||||
self.assert_(other >= ev)
|
||||
self.assertRaises(TypeError, cmp, ev, None)
|
||||
self.assertRaises(TypeError, cmp, ev, 1)
|
||||
self.assertRaises(TypeError, cmp, ev, "ev")
|
||||
|
||||
ev = select.kevent(fd, select.KQ_FILTER_WRITE)
|
||||
self.assertEqual(ev.ident, fd)
|
||||
self.assertEqual(ev.filter, select.KQ_FILTER_WRITE)
|
||||
self.assertEqual(ev.flags, select.KQ_EV_ADD)
|
||||
self.assertEqual(ev.fflags, 0)
|
||||
self.assertEqual(ev.data, 0)
|
||||
self.assertEqual(ev.udata, 0)
|
||||
self.assertEqual(ev, ev)
|
||||
self.assertNotEqual(ev, other)
|
||||
|
||||
ev = select.kevent(fd, select.KQ_FILTER_WRITE, select.KQ_EV_ONESHOT)
|
||||
self.assertEqual(ev.ident, fd)
|
||||
self.assertEqual(ev.filter, select.KQ_FILTER_WRITE)
|
||||
self.assertEqual(ev.flags, select.KQ_EV_ONESHOT)
|
||||
self.assertEqual(ev.fflags, 0)
|
||||
self.assertEqual(ev.data, 0)
|
||||
self.assertEqual(ev.udata, 0)
|
||||
self.assertEqual(ev, ev)
|
||||
self.assertNotEqual(ev, other)
|
||||
|
||||
ev = select.kevent(1, 2, 3, 4, 5, 6)
|
||||
self.assertEqual(ev.ident, 1)
|
||||
self.assertEqual(ev.filter, 2)
|
||||
self.assertEqual(ev.flags, 3)
|
||||
self.assertEqual(ev.fflags, 4)
|
||||
self.assertEqual(ev.data, 5)
|
||||
self.assertEqual(ev.udata, 6)
|
||||
self.assertEqual(ev, ev)
|
||||
self.assertNotEqual(ev, other)
|
||||
|
||||
def test_queue_event(self):
|
||||
serverSocket = socket.socket()
|
||||
serverSocket.bind(('127.0.0.1', 0))
|
||||
serverSocket.listen(1)
|
||||
client = socket.socket()
|
||||
client.setblocking(False)
|
||||
try:
|
||||
client.connect(('127.0.0.1', serverSocket.getsockname()[1]))
|
||||
except socket.error, e:
|
||||
self.assertEquals(e.args[0], errno.EINPROGRESS)
|
||||
else:
|
||||
#raise AssertionError("Connect should have raised EINPROGRESS")
|
||||
pass # FreeBSD doesn't raise an exception here
|
||||
server, addr = serverSocket.accept()
|
||||
|
||||
if sys.platform.startswith("darwin"):
|
||||
flags = select.KQ_EV_ADD | select.KQ_EV_ENABLE
|
||||
else:
|
||||
flags = 0
|
||||
|
||||
kq = select.kqueue()
|
||||
kq2 = select.kqueue.fromfd(kq.fileno())
|
||||
|
||||
ev = select.kevent(server.fileno(),
|
||||
select.KQ_FILTER_WRITE,
|
||||
select.KQ_EV_ADD | select.KQ_EV_ENABLE)
|
||||
kq.control([ev], 0)
|
||||
ev = select.kevent(server.fileno(),
|
||||
select.KQ_FILTER_READ,
|
||||
select.KQ_EV_ADD | select.KQ_EV_ENABLE)
|
||||
kq.control([ev], 0)
|
||||
ev = select.kevent(client.fileno(),
|
||||
select.KQ_FILTER_WRITE,
|
||||
select.KQ_EV_ADD | select.KQ_EV_ENABLE)
|
||||
kq2.control([ev], 0)
|
||||
ev = select.kevent(client.fileno(),
|
||||
select.KQ_FILTER_READ,
|
||||
select.KQ_EV_ADD | select.KQ_EV_ENABLE)
|
||||
kq2.control([ev], 0)
|
||||
|
||||
events = kq.control(None, 4, 1)
|
||||
events = [(e.ident, e.filter, e.flags) for e in events]
|
||||
events.sort()
|
||||
self.assertEquals(events, [
|
||||
(client.fileno(), select.KQ_FILTER_WRITE, flags),
|
||||
(server.fileno(), select.KQ_FILTER_WRITE, flags)])
|
||||
|
||||
client.send("Hello!")
|
||||
server.send("world!!!")
|
||||
|
||||
events = kq.control(None, 4, 1)
|
||||
# We may need to call it several times
|
||||
for i in range(5):
|
||||
if len(events) == 4:
|
||||
break
|
||||
events = kq.control(None, 4, 1)
|
||||
events = [(e.ident, e.filter, e.flags) for e in events]
|
||||
events.sort()
|
||||
|
||||
self.assertEquals(events, [
|
||||
(client.fileno(), select.KQ_FILTER_WRITE, flags),
|
||||
(client.fileno(), select.KQ_FILTER_READ, flags),
|
||||
(server.fileno(), select.KQ_FILTER_WRITE, flags),
|
||||
(server.fileno(), select.KQ_FILTER_READ, flags)])
|
||||
|
||||
# Remove completely client, and server read part
|
||||
ev = select.kevent(client.fileno(),
|
||||
select.KQ_FILTER_WRITE,
|
||||
select.KQ_EV_DELETE)
|
||||
kq.control([ev], 0)
|
||||
ev = select.kevent(client.fileno(),
|
||||
select.KQ_FILTER_READ,
|
||||
select.KQ_EV_DELETE)
|
||||
kq.control([ev], 0)
|
||||
ev = select.kevent(server.fileno(),
|
||||
select.KQ_FILTER_READ,
|
||||
select.KQ_EV_DELETE)
|
||||
kq.control([ev], 0, 0)
|
||||
|
||||
events = kq.control([], 4, 0.99)
|
||||
events = [(e.ident, e.filter, e.flags) for e in events]
|
||||
events.sort()
|
||||
self.assertEquals(events, [
|
||||
(server.fileno(), select.KQ_FILTER_WRITE, flags)])
|
||||
|
||||
client.close()
|
||||
server.close()
|
||||
serverSocket.close()
|
||||
|
||||
def test_main():
|
||||
test_support.run_unittest(TestKQueue)
|
||||
|
||||
if __name__ == "__main__":
|
||||
test_main()
|
||||
|
|
@ -34,7 +34,8 @@ class PollTests(unittest.TestCase):
|
|||
|
||||
for i in range(NUM_PIPES):
|
||||
rd, wr = os.pipe()
|
||||
p.register(rd, select.POLLIN)
|
||||
p.register(rd)
|
||||
p.modify(rd, select.POLLIN)
|
||||
p.register(wr, select.POLLOUT)
|
||||
readers.append(rd)
|
||||
writers.append(wr)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue