Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve performance of transport in-use list. #472

Merged
merged 2 commits into from
Aug 26, 2015
Merged

Improve performance of transport in-use list. #472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b1cefe
Improve performance of transport in-use list.
Aug 22, 2015
1e8714f
Fix tests
Aug 22, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions aiohttp/connector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ def __init__(self, *, conn_timeout=None, keepalive_timeout=30,
self._source_traceback = traceback.extract_stack(sys._getframe(1))

self._conns = {}
self._acquired = defaultdict(list)
self._acquired = defaultdict(set)
self._conn_timeout = conn_timeout
self._keepalive_timeout = keepalive_timeout
if share_cookies:
Expand Down Expand Up @@ -304,7 +304,7 @@ def connect(self, req):
raise ClientOSError(
'Cannot connect to host %s:%s ssl:%s' % key) from exc

self._acquired[key].append(transport)
self._acquired[key].add(transport)
conn = Connection(self, key, req, transport, proto, self._loop)
return conn

Expand All @@ -330,7 +330,7 @@ def _release(self, key, req, transport, protocol, *, should_close=False):
acquired = self._acquired[key]
try:
acquired.remove(transport)
except ValueError: # pragma: no cover
except KeyError: # pragma: no cover
# this may be result of undetermenistic order of objects
# finalization due garbage collection.
pass
Expand Down Expand Up @@ -672,7 +672,7 @@ def _create_connection(self, req):
key = (req.host, req.port, req.ssl)
conn = Connection(self, key, proxy_req,
transport, proto, self._loop)
self._acquired[key].append(conn._transport)
self._acquired[key].add(conn._transport)
proxy_resp = proxy_req.send(conn.writer, conn.reader)
try:
resp = yield from proxy_resp.start(conn, True)
Expand Down
12 changes: 6 additions & 6 deletions tests/test_connector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ def test_release(self):

tr, proto = unittest.mock.Mock(), unittest.mock.Mock()
key = 1
conn._acquired[key].append(tr)
conn._acquired[key].add(tr)
conn._release(key, req, tr, proto)
self.assertEqual(conn._conns[1][0], (tr, proto, 10))
self.assertTrue(conn._start_cleanup_task.called)
Expand All @@ -273,7 +273,7 @@ def test_release_close(self):

tr, proto = unittest.mock.Mock(), unittest.mock.Mock()
key = 1
conn._acquired[key].append(tr)
conn._acquired[key].add(tr)
conn._release(key, req, tr, proto)
self.assertFalse(conn._conns)
self.assertTrue(tr.close.called)
Expand All @@ -291,7 +291,7 @@ def test_release_pop_empty_conns(self):
conn._conns[key] = []

tr, proto = unittest.mock.Mock(), unittest.mock.Mock()
conn._acquired[key].append(tr)
conn._acquired[key].add(tr)
conn._release(key, req, tr, proto)
self.assertEqual({}, conn._conns)
self.assertTrue(tr.close.called)
Expand All @@ -309,7 +309,7 @@ def test_release_close_do_not_delete_existing_connections(self):
req.response = resp

tr, proto = unittest.mock.Mock(), unittest.mock.Mock()
conn._acquired[key].append(tr1)
conn._acquired[key].add(tr1)
conn._release(key, req, tr, proto)
self.assertEqual(conn._conns[key], [(tr1, proto1, 1)])
self.assertTrue(tr.close.called)
Expand All @@ -324,7 +324,7 @@ def test_release_not_started(self):

tr, proto = unittest.mock.Mock(), unittest.mock.Mock()
key = 1
conn._acquired[key].append(tr)
conn._acquired[key].add(tr)
conn._release(key, req, tr, proto)
self.assertEqual(conn._conns, {1: [(tr, proto, 10)]})
self.assertFalse(tr.close.called)
Expand All @@ -338,7 +338,7 @@ def test_release_not_opened(self):

tr, proto = unittest.mock.Mock(), unittest.mock.Mock()
key = 1
conn._acquired[key].append(tr)
conn._acquired[key].add(tr)
conn._release(key, req, tr, proto)
self.assertTrue(tr.close.called)

Expand Down