All of lore.kernel.org
 help / color / mirror / Atom feed
From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: Willian Rampazzo <wrampazz@redhat.com>,
	Eric Blake <eblake@redhat.com>,
	Markus Armbruster <armbru@redhat.com>,
	Wainer dos Santos Moschetta <wainersm@redhat.com>,
	"Niteesh G . S ." <niteesh.gs@gmail.com>,
	Stefan Hajnoczi <stefanha@redhat.com>,
	Cleber Rosa <crosa@redhat.com>, John Snow <jsnow@redhat.com>,
	Eduardo Habkost <ehabkost@redhat.com>
Subject: [PATCH v3 09/25] python/aqmp: add AsyncProtocol.accept() method
Date: Tue,  3 Aug 2021 14:29:25 -0400	[thread overview]
Message-ID: <20210803182941.504537-10-jsnow@redhat.com> (raw)
In-Reply-To: <20210803182941.504537-1-jsnow@redhat.com>

It's a little messier than connect, because it wasn't designed to accept
*precisely one* connection. Such is life.

Signed-off-by: John Snow <jsnow@redhat.com>
---
 python/qemu/aqmp/protocol.py | 89 ++++++++++++++++++++++++++++++++++--
 1 file changed, 85 insertions(+), 4 deletions(-)

diff --git a/python/qemu/aqmp/protocol.py b/python/qemu/aqmp/protocol.py
index 77b330627b3..7eca65aa265 100644
--- a/python/qemu/aqmp/protocol.py
+++ b/python/qemu/aqmp/protocol.py
@@ -243,6 +243,24 @@ async def runstate_changed(self) -> Runstate:
         await self._runstate_event.wait()
         return self.runstate
 
+    @upper_half
+    @require(Runstate.IDLE)
+    async def accept(self, address: Union[str, Tuple[str, int]],
+                     ssl: Optional[SSLContext] = None) -> None:
+        """
+        Accept a connection and begin processing message queues.
+
+        If this call fails, `runstate` is guaranteed to be set back to `IDLE`.
+
+        :param address:
+            Address to listen to; UNIX socket path or TCP address/port.
+        :param ssl: SSL context to use, if any.
+
+        :raise StateError: When the `Runstate` is not `IDLE`.
+        :raise ConnectError: If a connection could not be accepted.
+        """
+        await self._new_session(address, ssl, accept=True)
+
     @upper_half
     @require(Runstate.IDLE)
     async def connect(self, address: Union[str, Tuple[str, int]],
@@ -308,7 +326,8 @@ def _set_state(self, state: Runstate) -> None:
     @upper_half
     async def _new_session(self,
                            address: Union[str, Tuple[str, int]],
-                           ssl: Optional[SSLContext] = None) -> None:
+                           ssl: Optional[SSLContext] = None,
+                           accept: bool = False) -> None:
         """
         Establish a new connection and initialize the session.
 
@@ -317,9 +336,10 @@ async def _new_session(self,
         to be set back to `IDLE`.
 
         :param address:
-            Address to connect to;
+            Address to connect to/listen on;
             UNIX socket path or TCP address/port.
         :param ssl: SSL context to use, if any.
+        :param accept: Accept a connection instead of connecting when `True`.
 
         :raise ConnectError:
             When a connection or session cannot be established.
@@ -333,7 +353,7 @@ async def _new_session(self,
 
         try:
             phase = "connection"
-            await self._establish_connection(address, ssl)
+            await self._establish_connection(address, ssl, accept)
 
             phase = "session"
             await self._establish_session()
@@ -367,6 +387,7 @@ async def _establish_connection(
             self,
             address: Union[str, Tuple[str, int]],
             ssl: Optional[SSLContext] = None,
+            accept: bool = False
     ) -> None:
         """
         Establish a new connection.
@@ -375,6 +396,7 @@ async def _establish_connection(
             Address to connect to/listen on;
             UNIX socket path or TCP address/port.
         :param ssl: SSL context to use, if any.
+        :param accept: Accept a connection instead of connecting when `True`.
         """
         assert self.runstate == Runstate.IDLE
         self._set_state(Runstate.CONNECTING)
@@ -384,7 +406,66 @@ async def _establish_connection(
         # otherwise yield.
         await asyncio.sleep(0)
 
-        await self._do_connect(address, ssl)
+        if accept:
+            await self._do_accept(address, ssl)
+        else:
+            await self._do_connect(address, ssl)
+
+    @upper_half
+    async def _do_accept(self, address: Union[str, Tuple[str, int]],
+                         ssl: Optional[SSLContext] = None) -> None:
+        """
+        Acting as the transport server, accept a single connection.
+
+        :param address:
+            Address to listen on; UNIX socket path or TCP address/port.
+        :param ssl: SSL context to use, if any.
+
+        :raise OSError: For stream-related errors.
+        """
+        self.logger.debug("Awaiting connection on %s ...", address)
+        connected = asyncio.Event()
+        server: Optional[asyncio.AbstractServer] = None
+
+        async def _client_connected_cb(reader: asyncio.StreamReader,
+                                       writer: asyncio.StreamWriter) -> None:
+            """Used to accept a single incoming connection, see below."""
+            nonlocal server
+            nonlocal connected
+
+            # A connection has been accepted; stop listening for new ones.
+            assert server is not None
+            server.close()
+            await server.wait_closed()
+            server = None
+
+            # Register this client as being connected
+            self._reader, self._writer = (reader, writer)
+
+            # Signal back: We've accepted a client!
+            connected.set()
+
+        if isinstance(address, tuple):
+            coro = asyncio.start_server(
+                _client_connected_cb,
+                host=address[0],
+                port=address[1],
+                ssl=ssl,
+                backlog=1,
+            )
+        else:
+            coro = asyncio.start_unix_server(
+                _client_connected_cb,
+                path=address,
+                ssl=ssl,
+                backlog=1,
+            )
+
+        server = await coro     # Starts listening
+        await connected.wait()  # Waits for the callback to fire (and finish)
+        assert server is None
+
+        self.logger.debug("Connection accepted.")
 
     @upper_half
     async def _do_connect(self, address: Union[str, Tuple[str, int]],
-- 
2.31.1



  parent reply	other threads:[~2021-08-03 18:36 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-03 18:29 [PATCH v3 00/25] python: introduce Asynchronous QMP package John Snow
2021-08-03 18:29 ` [PATCH v3 01/25] python/aqmp: add asynchronous QMP (AQMP) subpackage John Snow
2021-08-03 18:29 ` [PATCH v3 02/25] python/aqmp: add error classes John Snow
2021-08-03 18:29 ` [PATCH v3 03/25] python/pylint: Add exception for TypeVar names ('T') John Snow
2021-08-03 18:29 ` [PATCH v3 04/25] python/aqmp: add asyncio compatibility wrappers John Snow
2021-08-03 18:29 ` [PATCH v3 05/25] python/aqmp: add generic async message-based protocol support John Snow
2021-08-03 18:29 ` [PATCH v3 06/25] python/aqmp: add runstate state machine to AsyncProtocol John Snow
2021-08-05 21:02   ` Eric Blake
2021-08-05 21:30     ` John Snow
2021-08-03 18:29 ` [PATCH v3 07/25] python/aqmp: Add logging utility helpers John Snow
2021-08-17 19:14   ` Eric Blake
2021-08-03 18:29 ` [PATCH v3 08/25] python/aqmp: add logging to AsyncProtocol John Snow
2021-08-17 19:18   ` Eric Blake
2021-08-03 18:29 ` John Snow [this message]
2021-08-17 19:29   ` [PATCH v3 09/25] python/aqmp: add AsyncProtocol.accept() method Eric Blake
2021-08-18 14:24     ` John Snow
2021-08-19 14:50       ` Eric Blake
2021-08-19 15:48         ` John Snow
2021-08-19 16:43           ` Eduardo Habkost
2021-08-03 18:29 ` [PATCH v3 10/25] python/aqmp: add configurable read buffer limit John Snow
2021-08-17 19:30   ` Eric Blake
2021-08-03 18:29 ` [PATCH v3 11/25] python/aqmp: add _cb_inbound and _cb_outbound logging hooks John Snow
2021-08-17 19:32   ` Eric Blake
2021-08-03 18:29 ` [PATCH v3 12/25] python/aqmp: add AsyncProtocol._readline() method John Snow
2021-08-17 19:36   ` Eric Blake
2021-08-03 18:29 ` [PATCH v3 13/25] python/aqmp: add QMP Message format John Snow
2021-08-17 19:47   ` Eric Blake
2021-08-18 14:31     ` John Snow
2021-08-03 18:29 ` [PATCH v3 14/25] python/aqmp: add well-known QMP object models John Snow
2021-08-03 18:29 ` [PATCH v3 15/25] python/aqmp: add QMP event support John Snow
2021-08-03 18:29 ` [PATCH v3 16/25] python/pylint: disable too-many-function-args John Snow
2021-08-03 18:29 ` [PATCH v3 17/25] python/aqmp: add QMP protocol support John Snow
2021-08-03 18:29 ` [PATCH v3 18/25] python/pylint: disable no-member check John Snow
2021-08-03 18:29 ` [PATCH v3 19/25] python/aqmp: Add message routing to QMP protocol John Snow
2021-08-03 18:29 ` [PATCH v3 20/25] python/aqmp: add execute() interfaces John Snow
2021-08-03 18:29 ` [PATCH v3 21/25] python/aqmp: add _raw() execution interface John Snow
2021-08-03 18:29 ` [PATCH v3 22/25] python/aqmp: add asyncio_run compatibility wrapper John Snow
2021-08-03 18:29 ` [PATCH v3 23/25] python/aqmp: add scary message John Snow
2021-08-03 18:29 ` [PATCH v3 24/25] python: bump avocado to v90.0 John Snow
2021-08-03 18:29 ` [PATCH v3 25/25] python/aqmp: add AsyncProtocol unit tests John Snow
2021-08-04 18:41   ` John Snow
2021-08-16 21:44 ` [PATCH v3 00/25] python: introduce Asynchronous QMP package John Snow

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210803182941.504537-10-jsnow@redhat.com \
    --to=jsnow@redhat.com \
    --cc=armbru@redhat.com \
    --cc=crosa@redhat.com \
    --cc=eblake@redhat.com \
    --cc=ehabkost@redhat.com \
    --cc=niteesh.gs@gmail.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    --cc=wainersm@redhat.com \
    --cc=wrampazz@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.