From: Ben Darnell <ben@bendarnell.com>
Date: Sat, 10 May 2014 17:27:46 +0000 (-0400)
Subject: Improve performance by using Future interface when writing HTTP responses.
X-Git-Tag: v4.0.0b1~80
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=302f57eef4eedcf1c3657ea4aee4b998483f26e3;p=thirdparty%2Ftornado.git

Improve performance by using Future interface when writing HTTP responses.

Previously, we passed a callback to IOStream.write() and also checked
IOStream.writing() to see if the write completed synchronously (which is
the common case).  If it did, we would complete the request immediately
but the write callback would remain on the IOLoop until its next iteration,
keeping the request state from being garbage collected.

In benchmarks, this would manifest as as something like a memory leak,
since benchmarks often handle many requests in one IOLoop iteration.
This slowed things down (by about 10% in my benchmarks) by increasing
pressure on the garbage collector.
---

diff --git a/tornado/http1connection.py b/tornado/http1connection.py
index f23c76742..0eda8b2dd 100644
--- a/tornado/http1connection.py
+++ b/tornado/http1connection.py
@@ -106,6 +106,8 @@ class HTTP1Connection(httputil.HTTPConnection):
         # While reading a body with a content-length, this is the
         # amount left to read.
         self._expected_content_remaining = None
+        # A Future for our outgoing writes, returned by IOStream.write.
+        self._pending_write = None
 
     def read_response(self, delegate):
         """Read a single HTTP response.
@@ -324,7 +326,8 @@ class HTTP1Connection(httputil.HTTPConnection):
             data = b"\r\n".join(lines) + b"\r\n\r\n"
             if chunk:
                 data += self._format_chunk(chunk)
-            self.stream.write(data, self._on_write_complete)
+            self._pending_write = self.stream.write(data)
+            self._pending_write.add_done_callback(self._on_write_complete)
         return self._write_future
 
     def _format_chunk(self, chunk):
@@ -349,17 +352,18 @@ class HTTP1Connection(httputil.HTTPConnection):
         skip `write_headers` and instead call `write()` with a
         pre-encoded header block.
         """
+        future = None
         if self.stream.closed():
-            self._write_future = Future()
+            future = self._write_future = Future()
             self._write_future.set_exception(iostream.StreamClosedError())
         else:
             if callback is not None:
                 self._write_callback = stack_context.wrap(callback)
             else:
-                self._write_future = Future()
-            self.stream.write(self._format_chunk(chunk),
-                              self._on_write_complete)
-        return self._write_future
+                future = self._write_future = Future()
+            self._pending_write = self.stream.write(self._format_chunk(chunk))
+            self._pending_write.add_done_callback(self._on_write_complete)
+        return future
 
     def finish(self):
         """Implements `.HTTPConnection.finish`."""
@@ -372,7 +376,8 @@ class HTTP1Connection(httputil.HTTPConnection):
                 self._expected_content_remaining)
         if self._chunking_output:
             if not self.stream.closed():
-                self.stream.write(b"0\r\n\r\n", self._on_write_complete)
+                self._pending_write = self.stream.write(b"0\r\n\r\n")
+                self._pending_write.add_done_callback(self._on_write_complete)
         self._write_finished = True
         # If the app finished the request while we're still reading,
         # divert any remaining data away from the delegate and
@@ -384,27 +389,20 @@ class HTTP1Connection(httputil.HTTPConnection):
         # No more data is coming, so instruct TCP to send any remaining
         # data immediately instead of waiting for a full packet or ack.
         self.stream.set_nodelay(True)
-        if not self.stream.writing():
-            self._finish_request()
+        if self._pending_write is None:
+            self._finish_request(None)
+        else:
+            self._pending_write.add_done_callback(self._finish_request)
 
-    def _on_write_complete(self):
+    def _on_write_complete(self, future):
         if self._write_callback is not None:
             callback = self._write_callback
             self._write_callback = None
-            callback()
+            self.stream.io_loop.add_callback(callback)
         if self._write_future is not None:
             future = self._write_future
             self._write_future = None
             future.set_result(None)
-        # _on_write_complete is enqueued on the IOLoop whenever the
-        # IOStream's write buffer becomes empty, but it's possible for
-        # another callback that runs on the IOLoop before it to
-        # simultaneously write more data and finish the request.  If
-        # there is still data in the IOStream, a future
-        # _on_write_complete will be responsible for calling
-        # _finish_request.
-        if self._write_finished and not self.stream.writing():
-            self._finish_request()
 
     def _can_keep_alive(self, start_line, headers):
         if self.params.no_keep_alive:
@@ -419,7 +417,7 @@ class HTTP1Connection(httputil.HTTPConnection):
             return connection_header == "keep-alive"
         return False
 
-    def _finish_request(self):
+    def _finish_request(self, future):
         self._clear_callbacks()
         if not self.is_client and self._disconnect_on_finish:
             self.close()