Use Cython 'async def' coroutines without @asyncio.coroutine

This commit boosts the performance of 'async def' coroutines
compiled with Cython up to 50%.

Author: 1st1

Makefile

@@ -26,12 +26,14 @@ distclean: clean clean-libuv
 compile: clean
 	echo "DEF DEBUG = 0" > uvloop/__debug.pxi
 	cython -3 uvloop/loop.pyx; rm uvloop/__debug.*
+	@echo "$$UVLOOP_BUILD_PATCH_SCRIPT" | python
 	python setup.py build_ext --inplace
 
 
 debug: clean
 	echo "DEF DEBUG = 1" > uvloop/__debug.pxi
 	cython -3 -a -p uvloop/loop.pyx; rm uvloop/__debug.*
+	@echo "$$UVLOOP_BUILD_PATCH_SCRIPT" | python
 	python setup.py build_ext --inplace
 
 
@@ -50,3 +52,39 @@ sdist: clean compile test sdist-libuv
 
 release: clean compile test sdist-libuv
 	python setup.py sdist upload
+
+
+# Script to patch Cython 'async def' coroutines to have a 'tp_iter' slot,
+# which makes them compatible with 'yield from' without the
+# `asyncio.coroutine` decorator.
+define UVLOOP_BUILD_PATCH_SCRIPT
+import re
+
+with open('uvloop/loop.c', 'rt') as f:
+    src = f.read()
+
+src = re.sub(
+    r'''
+    \s* offsetof\(__pyx_CoroutineObject,\s*gi_weakreflist\),
+    \s* 0,
+    \s* 0,
+    \s* __pyx_Coroutine_methods,
+    \s* __pyx_Coroutine_memberlist,
+    \s* __pyx_Coroutine_getsets,
+    ''',
+
+    r'''
+    offsetof(__pyx_CoroutineObject, gi_weakreflist),
+    __Pyx_Coroutine_await, /* tp_iter */
+    0,
+    __pyx_Coroutine_methods,
+    __pyx_Coroutine_memberlist,
+    __pyx_Coroutine_getsets,
+    ''',
+
+    src, flags=re.X)
+
+with open('uvloop/loop.c', 'wt') as f:
+    f.write(src)
+endef
+export UVLOOP_BUILD_PATCH_SCRIPT

tests/test_sockets.py

@@ -1,3 +1,4 @@
+import asyncio
 import socket
 
 from uvloop import _testbase as tb
@@ -22,12 +23,15 @@ def srv_gen():
             yield tb.write(b'O')
             yield tb.write(b'K')
 
-        async def client(sock, addr):
-            await self.loop.sock_connect(sock, addr)
-            data = await self.recv_all(sock, 4)
+        # We use @asyncio.coroutine & `yield from` to test
+        # the compatibility of Cython's 'async def' coroutines.
+        @asyncio.coroutine
+        def client(sock, addr):
+            yield from self.loop.sock_connect(sock, addr)
+            data = yield from self.recv_all(sock, 4)
             self.assertEqual(data, b'helo')
-            await self.loop.sock_sendall(sock, b'ehlo' * _SIZE)
-            data = await self.recv_all(sock, 2)
+            yield from self.loop.sock_sendall(sock, b'ehlo' * _SIZE)
+            data = yield from self.recv_all(sock, 2)
             self.assertEqual(data, b'OK')
 
         with tb.tcp_server(srv_gen) as srv:

uvloop/includes/stdlib.pxi

@@ -23,7 +23,6 @@ cdef aio_ensure_future = asyncio.ensure_future
 cdef aio_gather = asyncio.gather
 cdef aio_wait = asyncio.wait
 cdef aio_logger = asyncio.log.logger
-cdef aio_coroutine = asyncio.coroutine
 cdef aio__check_resolved_address = asyncio.base_events._check_resolved_address
 cdef aio_iscoroutine = asyncio.iscoroutine
 cdef aio_iscoroutinefunction = asyncio.iscoroutinefunction

uvloop/loop.pyx

@@ -1034,7 +1034,6 @@ cdef class Loop:
 
         return self._getaddrinfo(host, port, family, type, proto, flags, 1)
 
-    @aio_coroutine
     async def getnameinfo(self, sockaddr, int flags=0):
         cdef:
             AddrInfo ai_cnt
@@ -1089,7 +1088,6 @@ cdef class Loop:
 
         return await self._getnameinfo(ai.ai_addr, flags)
 
-    @aio_coroutine
     async def create_server(self, protocol_factory, host=None, port=None,
                             *,
                             int family=uv.AF_UNSPEC,
@@ -1215,7 +1213,6 @@ cdef class Loop:
 
         return server
 
-    @aio_coroutine
     async def create_connection(self, protocol_factory, host=None, port=None, *,
                                 ssl=None, family=0, proto=0, flags=0, sock=None,
                                 local_addr=None, server_hostname=None):
@@ -1365,7 +1362,6 @@ cdef class Loop:
         else:
             return tr, protocol
 
-    @aio_coroutine
     async def create_unix_server(self, protocol_factory, str path=None,
                                  *, backlog=100, sock=None, ssl=None):
         """A coroutine which creates a UNIX Domain Socket server.
@@ -1432,7 +1428,6 @@ cdef class Loop:
         server._add_server(pipe)
         return server
 
-    @aio_coroutine
     async def create_unix_connection(self, protocol_factory, path, *,
                                      ssl=None, sock=None,
                                      server_hostname=None):
@@ -1712,7 +1707,6 @@ cdef class Loop:
     def set_default_executor(self, executor):
         self._default_executor = executor
 
-    @aio_coroutine
     async def __subprocess_run(self, protocol_factory, args,
                                stdin=subprocess_PIPE,
                                stdout=subprocess_PIPE,
@@ -1803,7 +1797,6 @@ cdef class Loop:
         return self.__subprocess_run(protocol_factory, args, shell=False,
                                      **kwargs)
 
-    @aio_coroutine
     async def connect_read_pipe(self, proto_factory, pipe):
         """Register read pipe in event loop. Set the pipe to non-blocking mode.
 
@@ -1829,7 +1822,6 @@ cdef class Loop:
             raise
         return transp, proto
 
-    @aio_coroutine
     async def connect_write_pipe(self, proto_factory, pipe):
         """Register write pipe in event loop.
 
@@ -1929,7 +1921,6 @@ cdef class Loop:
 
         return True
 
-    @aio_coroutine
     async def create_datagram_endpoint(self, protocol_factory,
                                        local_addr=None, remote_addr=None, *,
                                        family=0, proto=0, flags=0,

uvloop/server.pyx

@@ -32,7 +32,6 @@ cdef class Server:
     def __repr__(self):
         return '<%s sockets=%r>' % (self.__class__.__name__, self.sockets)
 
-    @aio_coroutine
     async def wait_closed(self):
         if self._servers is None or self._waiters is None:
             return