vbatts/shadowsocks
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

optimize eventloop

Browse source
This commit is contained in:
clowwindy 2015-08-02 14:45:15 +08:00
parent 111acf66c1
commit 02120e3402
4 changed files with 17 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
shadowsocks/asyncdns.py
View file

@ -357,7 +357,7 @@ class DNSResolver(object):
return
if event & eventloop.POLL_ERR:
logging.error('dns socket err')
self._loop.remove(self._sock, self)
self._loop.remove(self._sock)
self._sock.close()
# TODO when dns server is IPv6
self._sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM,
@ -380,7 +380,7 @@ class DNSResolver(object):
del self._cb_to_hostname[callback]
arr = self._hostname_to_cb.get(hostname, None)
if arr:
arr.remove(callback, self)
arr.remove(callback)
if not arr:
del self._hostname_to_cb[hostname]
if hostname in self._hostname_status:
@ -427,7 +427,7 @@ class DNSResolver(object):
if self._sock:
if self._loop:
self._loop.remove_periodic(self.handle_periodic)
self._loop.remove(self._sock, self)
self._loop.remove(self._sock)
self._sock.close()
self._sock = None

20
shadowsocks/eventloop.py
View file

@ -150,8 +150,7 @@ class EventLoop(object):
else:
raise Exception('can not find any available functions in select '
'package')
self._fd_to_f = {}
self._fd_to_handler = {}
self._fdmap = {} # (f, handler)
self._last_time = time.time()
self._periodic_callbacks = []
self._stopping = False
@ -159,20 +158,17 @@ class EventLoop(object):
def poll(self, timeout=None):
events = self._impl.poll(timeout)
return [(self._fd_to_f[fd], fd, event) for fd, event in events]
return [(self._fdmap[fd][0], fd, event) for fd, event in events]
def add(self, f, mode, handler):
fd = f.fileno()
self._fd_to_f[fd] = f
self._fdmap[fd] = (f, handler)
self._impl.register(fd, mode)
self._fd_to_handler[fd] = handler
def remove(self, f, handler):
def remove(self, f):
fd = f.fileno()
del self._fd_to_f[fd]
del self._fdmap[fd]
self._impl.unregister(fd)
if handler is not None:
del self._fd_to_handler[fd]
def add_periodic(self, callback):
self._periodic_callbacks.append(callback)
@ -182,9 +178,8 @@ class EventLoop(object):
def modify(self, f, mode, handler):
fd = f.fileno()
self._fdmap[fd] = (f, handler)
self._impl.modify(fd, mode)
if handler is not None:
self._fd_to_handler[fd] = handler
def stop(self):
self._stopping = True
@ -209,8 +204,9 @@ class EventLoop(object):
continue
for sock, fd, event in events:
handler = self._fd_to_handler.get(fd, None)
handler = self._fdmap.get(fd, None)
if handler is not None:
handler = handler[1]
try:
handler.handle_event(sock, fd, event)
except (OSError, IOError) as e:

8
shadowsocks/tcprelay.py
View file

@ -534,13 +534,13 @@ class TCPRelayHandler(object):
logging.debug('destroy')
if self._remote_sock:
logging.debug('destroying remote')
self._loop.remove(self._remote_sock, self._server)
self._loop.remove(self._remote_sock)
del self._fd_to_handlers[self._remote_sock.fileno()]
self._remote_sock.close()
self._remote_sock = None
if self._local_sock:
logging.debug('destroying local')
self._loop.remove(self._local_sock, self._server)
self._loop.remove(self._local_sock)
del self._fd_to_handlers[self._local_sock.fileno()]
self._local_sock.close()
self._local_sock = None
@ -691,7 +691,7 @@ class TCPRelay(object):
def handle_periodic(self):
if self._closed:
if self._server_socket:
self._eventloop.remove(self._server_socket, self)
self._eventloop.remove(self._server_socket)
self._server_socket.close()
self._server_socket = None
logging.info('closed TCP port %d', self._listen_port)
@ -706,5 +706,5 @@ class TCPRelay(object):
if not next_tick:
if self._eventloop:
self._eventloop.remove_periodic(self.handle_periodic)
self._eventloop.remove(self._server_socket, self)
self._eventloop.remove(self._server_socket)
self._server_socket.close()

4
shadowsocks/udprelay.py
View file

@ -135,7 +135,7 @@ class UDPRelay(object):
def _close_client(self, client):
if hasattr(client, 'close'):
self._sockets.remove(client.fileno())
self._eventloop.remove(client, self)
self._eventloop.remove(client)
client.close()
else:
# just an address
@ -288,5 +288,5 @@ class UDPRelay(object):
if not next_tick:
if self._eventloop:
self._eventloop.remove_periodic(self.handle_periodic)
self._eventloop.remove(self._server_socket, self)
self._eventloop.remove(self._server_socket)
self._server_socket.close()