FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Detach socket in create_server, create_connection, and other APIs by 1st1 · Pull Request #449 · python/asyncio · GitHub

This repository was archived by the owner on Nov 23, 2017. It is now read-only.
/ asyncio Public archive

Detach socket in create_server, create_connection, and other APIs #449

Open
1st1 wants to merge 2 commits into
base: master
Choose a base branch
Could not load branches
Branch not found: {{ refName }}

Are you sure you want to change the base?

Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
from
Conversation 18 Commits 2 Checks 0 Files changed
Open

Detach socket in create_server, create_connection, and other APIs #449

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
10ca0f3
Detach socket in create_server, create_connection, and other APIs
Oct 19, 2016
f1202eb
Address Victor's comments
Oct 19, 2016
File filter

Filter by extension

Filter by extension .py  (3) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
17 changes: 14 additions & 3 deletions asyncio/base_events.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,12 @@ def _set_reuseport(sock):
'SO_REUSEPORT defined but not implemented.')


def _copy_and_detach_socket(sock):
fd = sock.detach()
new_sock = socket.socket(sock.family, sock.type, sock.proto, fd)
return new_sock


# Linux's sock.type is a bitmask that can include extra info about socket.
_SOCKET_TYPE_MASK = 0
if hasattr(socket, 'SOCK_NONBLOCK'):
Expand Down Expand Up @@ -768,9 +774,11 @@ def create_connection(self, protocol_factory, host=None, port=None, *,
raise OSError('Multiple exceptions: {}'.format(
', '.join(str(exc) for exc in exceptions)))

elif sock is None:
raise ValueError(
'host and port was not specified and no sock specified')
else:
if sock is None:
raise ValueError(
'host and port was not specified and no sock specified')
sock = _copy_and_detach_socket(sock)

transport, protocol = yield from self._create_connection_transport(
sock, protocol_factory, ssl, server_hostname)
Expand Down Expand Up @@ -828,6 +836,7 @@ def create_datagram_endpoint(self, protocol_factory,
'socket modifier keyword arguments can not be used '
'when sock is specified. ({})'.format(problems))
sock.setblocking(False)
sock = _copy_and_detach_socket(sock)
r_addr = None
else:
if not (local_addr or remote_addr):
Expand Down Expand Up @@ -1024,6 +1033,7 @@ def create_server(self, protocol_factory, host=None, port=None,
else:
if sock is None:
raise ValueError('Neither host/port nor sock were specified')
sock = _copy_and_detach_socket(sock)
sockets = [sock]

server = Server(self, sockets)
Expand All @@ -1045,6 +1055,7 @@ def connect_accepted_socket(self, protocol_factory, sock, *, ssl=None):
This method is a coroutine. When completed, the coroutine
returns a (transport, protocol) pair.
"""

transport, protocol = yield from self._create_connection_transport(
sock, protocol_factory, ssl, '', server_side=True)
if self._debug:
Expand Down
4 changes: 3 additions & 1 deletion tests/test_events.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -1240,11 +1240,13 @@ def connection_made(self, transport):
sock_ob = socket.socket(type=socket.SOCK_STREAM)
sock_ob.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
sock_ob.bind(('0.0.0.0', 0))
sock_ob_fd = sock_ob.fileno()

f = self.loop.create_server(TestMyProto, sock=sock_ob)
server = self.loop.run_until_complete(f)
sock = server.sockets[0]
self.assertIs(sock, sock_ob)
self.assertEqual(sock.fileno(), sock_ob_fd)

vstinner Oct 19, 2016

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

You should check that sock_ob is detach: sock_ob.fileno() must be equal to -1.

1st1 Oct 19, 2016

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Fixed
self.assertEqual(sock_ob.fileno(), -1)

host, port = sock.getsockname()
self.assertEqual(host, '0.0.0.0')
Expand Down
2 changes: 1 addition & 1 deletion tests/test_streams.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@ def start(self):
asyncio.start_server(self.handle_client,
sock=sock,
loop=self.loop))
return sock.getsockname()
return self.server.sockets[0].getsockname()

def handle_client_callback(self, client_reader, client_writer):
self.loop.create_task(self.handle_client(client_reader,
Expand Down
Back | FazBrowse Home | New Git URL