[pypy-svn] r46832 - pypy/dist/pypy/module/select
arigo at codespeak.net
arigo at codespeak.net
Sat Sep 22 18:54:32 CEST 2007
Author: arigo
Date: Sat Sep 22 18:54:32 2007
New Revision: 46832
Removed:
pypy/dist/pypy/module/select/_rsocket_ctypes.py
Modified:
pypy/dist/pypy/module/select/__init__.py
pypy/dist/pypy/module/select/interp_select.py
Log:
Kill _rsocket_ctypes: select works with pypy.rlib.rpoll now.
Modified: pypy/dist/pypy/module/select/__init__.py
==============================================================================
--- pypy/dist/pypy/module/select/__init__.py (original)
+++ pypy/dist/pypy/module/select/__init__.py Sat Sep 22 18:54:32 2007
@@ -13,15 +13,10 @@
}
def buildloaders(cls):
- constantnames = '''
- POLLIN POLLPRI POLLOUT POLLERR POLLHUP POLLNVAL
- POLLRDNORM POLLRDBAND POLLWRNORM POLLWEBAND POLLMSG'''.split()
-
- from _rsocket_ctypes import constants
- for name in constantnames:
- if name in constants:
- value = constants[name]
- Module.interpleveldefs[name] = "space.wrap(%r)" % value
+ from pypy.rlib import rpoll
+ for name in rpoll.eventnames:
+ value = getattr(rpoll, name)
+ Module.interpleveldefs[name] = "space.wrap(%r)" % value
super(Module, cls).buildloaders()
buildloaders = classmethod(buildloaders)
Modified: pypy/dist/pypy/module/select/interp_select.py
==============================================================================
--- pypy/dist/pypy/module/select/interp_select.py (original)
+++ pypy/dist/pypy/module/select/interp_select.py Sat Sep 22 18:54:32 2007
@@ -1,12 +1,10 @@
from pypy.interpreter.typedef import TypeDef
from pypy.interpreter.baseobjspace import Wrappable
from pypy.interpreter.gateway import W_Root, ObjSpace, interp2app
-import _rsocket_ctypes as _c
-from ctypes import POINTER, byref
-from pypy.rpython.rctypes.aerrno import geterrno
from pypy.interpreter.error import OperationError
+from pypy.rlib import rpoll
-defaultevents = _c.POLLIN | _c.POLLOUT | _c.POLLPRI
+defaultevents = rpoll.POLLIN | rpoll.POLLOUT | rpoll.POLLPRI
def poll(space):
"""Returns a polling object, which supports registering and
@@ -51,138 +49,27 @@
space.wrap(fd))
unregister.unwrap_spec = ['self', ObjSpace, W_Root]
- if hasattr(_c, 'poll'):
- def poll(self, space, w_timeout=None):
- if space.is_w(w_timeout, space.w_None):
- timeout = -1
- else:
- timeout = space.int_w(w_timeout)
-
- numfd = len(self.fddict)
- buf = _c.create_string_buffer(_c.sizeof(_c.pollfd) * numfd)
- pollfds = _c.cast(buf, POINTER(_c.pollfd))
- i = 0
- for fd, events in self.fddict.iteritems():
- pollfds[i].fd = fd
- pollfds[i].events = events
- i += 1
-
- # XXX Temporary hack for releasing the GIL
- GIL = space.threadlocals.getGIL()
- if GIL is not None: GIL.release()
- ret = _c.poll(pollfds, numfd, timeout)
- if GIL is not None: GIL.acquire(True)
-
- if ret < 0:
- errno = geterrno()
- w_module = space.getbuiltinmodule('select')
- w_errortype = space.getattr(w_module, space.wrap('error'))
- message = _c.strerror(errno)
- raise OperationError(w_errortype,
- space.newtuple([space.wrap(errno),
- space.wrap(message)]))
-
- retval_w = []
- for i in range(numfd):
- pollfd = pollfds[i]
- if pollfd.revents:
- retval_w.append(space.newtuple([space.wrap(pollfd.fd),
- space.wrap(pollfd.revents)]))
- return space.newlist(retval_w)
-
- elif hasattr(_c, 'WSAEventSelect'):
- # win32 implementation
- def poll(self, space, w_timeout=None):
- numfd = len(self.fddict)
-
- socketevents = _c.ARRAY(_c.WSAEVENT, numfd)()
-
- numevents = 0
- eventdict = {}
-
- for fd, events in self.fddict.iteritems():
- # select desired events
- wsaEvents = 0
- if events & _c.POLLIN:
- wsaEvents |= _c.FD_READ | _c.FD_ACCEPT | _c.FD_CLOSE
- if events & _c.POLLOUT:
- wsaEvents |= _c.FD_WRITE | _c.FD_CONNECT | _c.FD_CLOSE
-
- # if no events then ignore socket
- if wsaEvents == 0:
- continue
-
- # select socket for desired events
- event = _c.WSACreateEvent()
- _c.WSAEventSelect(fd, event, wsaEvents)
-
- eventdict[fd] = event
- socketevents[numevents] = event
- numevents += 1
-
- # if no sockets then return immediately
- if numevents == 0:
- return space.newlist([])
-
- # prepare timeout
- if space.is_w(w_timeout, space.w_None):
- timeout = -1
- else:
- timeout = space.int_w(w_timeout)
- if timeout < 0:
- timeout = _c.INFINITE
-
- # XXX Temporary hack for releasing the GIL
- GIL = space.threadlocals.getGIL()
- if GIL is not None: GIL.release()
- ret = _c.WSAWaitForMultipleEvents(numevents, socketevents,
- False, timeout, False)
- if GIL is not None: GIL.acquire(True)
-
- if ret == _c.WSA_WAIT_TIMEOUT:
- return space.newlist([])
-
- if ret < 0: # WSA_WAIT_FAILED is unsigned...
- errno = _c.geterrno()
- w_module = space.getbuiltinmodule('select')
- w_errortype = space.getattr(w_module, space.wrap('error'))
- message = _c.socket_strerror(errno)
- raise OperationError(w_errortype,
- space.newtuple([space.wrap(errno),
- space.wrap(message)]))
-
- retval_w = []
- info = _c.WSANETWORKEVENTS()
- for fd, event in eventdict.iteritems():
- if _c.WSAEnumNetworkEvents(fd, event, byref(info)) < 0:
- continue
- revents = 0
- if info.lNetworkEvents & _c.FD_READ:
- revents |= _c.POLLIN
- if info.lNetworkEvents & _c.FD_ACCEPT:
- revents |= _c.POLLIN
- if info.lNetworkEvents & _c.FD_WRITE:
- revents |= _c.POLLOUT
- if info.lNetworkEvents & _c.FD_CONNECT:
- if info.iErrorCode[_c.FD_CONNECT_BIT]:
- revents |= _c.POLLERR
- else:
- revents |= _c.POLLOUT
- if info.lNetworkEvents & _c.FD_CLOSE:
- if info.iErrorCode[_c.FD_CLOSE_BIT]:
- revents |= _c.POLLERR
- else:
- if self.fddict[fd] & _c.POLLIN:
- revents |= _c.POLLIN
- if self.fddict[fd] & _c.POLLOUT:
- revents |= _c.POLLOUT
- if revents:
- retval_w.append(space.newtuple([space.wrap(fd),
- space.wrap(revents)]))
-
- _c.WSACloseEvent(event)
-
- return space.newlist(retval_w)
+ def poll(self, space, w_timeout=None):
+ if space.is_w(w_timeout, space.w_None):
+ timeout = -1
+ else:
+ timeout = space.int_w(w_timeout)
+
+ try:
+ retval = rpoll.poll(self.fddict, timeout)
+ except rpoll.PollError, e:
+ w_module = space.getbuiltinmodule('select')
+ w_errortype = space.getattr(w_module, space.wrap('error'))
+ message = e.get_msg()
+ raise OperationError(w_errortype,
+ space.newtuple([space.wrap(errno),
+ space.wrap(message)]))
+
+ retval_w = []
+ for fd, revents in retval:
+ retval_w.append(space.newtuple([space.wrap(fd),
+ space.wrap(revents)]))
+ return space.newlist(retval_w)
poll.unwrap_spec = ['self', ObjSpace, W_Root]
pollmethods = {}
More information about the Pypy-commit
mailing list