From: Ben Darnell <ben@bendarnell.com>
Date: Sat, 19 Apr 2014 22:51:36 +0000 (-0400)
Subject: Use add_callback_from_signal in benchmark.py's sigchld handler.
X-Git-Tag: v4.0.0b1~91^2~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e239a8a73603fda37b1849cf7e11ea835a7d5553;p=thirdparty%2Ftornado.git

Use add_callback_from_signal in benchmark.py's sigchld handler.

This would manifest as an occasional deadlock when an 'ab' process
finished.
---

diff --git a/demos/benchmark/benchmark.py b/demos/benchmark/benchmark.py
index ca92e7155..218ab8ed7 100755
--- a/demos/benchmark/benchmark.py
+++ b/demos/benchmark/benchmark.py
@@ -49,7 +49,7 @@ class RootHandler(RequestHandler):
         pass
 
 def handle_sigchld(sig, frame):
-    IOLoop.instance().add_callback(IOLoop.instance().stop)
+    IOLoop.instance().add_callback_from_signal(IOLoop.instance().stop)
 
 def main():
     parse_command_line()