X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=e2reactor.py;h=4f069f91622c52717e281f37a1684aa1087f0618;hb=c917eef3dc01ada59fc5f3f1e63036ee6fcb5bba;hp=1ecd40e836812ca40309192c3894ea7420d6b61d;hpb=2c10049e10195f88b1eefec26f70f5019d316cc8;p=vuplus_dvbapp diff --git a/e2reactor.py b/e2reactor.py index 1ecd40e..4f069f9 100644 --- a/e2reactor.py +++ b/e2reactor.py @@ -27,6 +27,7 @@ POLL_DISCONNECTED = (select.POLLHUP | select.POLLERR | select.POLLNVAL) class E2SharedPoll: def __init__(self): self.dict = { } + self.eApp = getApplication() def register(self, fd, eventmask = select.POLLIN | select.POLLERR | select.POLLOUT): self.dict[fd] = eventmask @@ -35,7 +36,8 @@ class E2SharedPoll: del self.dict[fd] def poll(self, timeout = None): - return getApplication().poll(timeout, self.dict) + r = self.eApp.poll(timeout, self.dict) + return r poller = E2SharedPoll() @@ -56,6 +58,9 @@ class PollReactor(posixbase.PosixReactorBase): poller.register(fd, mask) else: if selectables.has_key(fd): del selectables[fd] + + + poller.eApp.interruptPoll() def _dictRemove(self, selectable, mdict): try: @@ -131,6 +136,7 @@ class PollReactor(posixbase.PosixReactorBase): POLLIN=select.POLLIN, POLLOUT=select.POLLOUT): """Poll the poller for new events.""" + if timeout is not None: timeout = int(timeout * 1000) # convert seconds to milliseconds @@ -183,6 +189,9 @@ class PollReactor(posixbase.PosixReactorBase): if why: self._disconnectSelectable(selectable, why, inRead) + def callLater(self, *args, **kwargs): + poller.eApp.interruptPoll() + return posixbase.PosixReactorBase.callLater(self, *args, **kwargs) def install(): """Install the poll() reactor."""