Note about wsgi servers fixes sdiehl#14

sdiehl · sdiehl · commit a2dcf7162fbd · 2012-05-28T11:26:31.000-04:00
diff --git a/index.html b/index.html
@@ -168,6 +168,7 @@ <h3 class="author">
 <li><a href="#gevent-zeromq">Gevent ZeroMQ</a></li>
 <li><a href="#simple-telnet-servers">Simple Telnet Servers</a></li>
 <li><a href="#wsgi-servers">WSGI Servers</a></li>
+<li><a href="#streaming-servers">Streaming Servers</a></li>
 <li><a href="#long-polling">Long Polling</a></li>
 <li><a href="#websockets">Websockets</a></li>
 <li><a href="#chat-server">Chat Server</a></li>
@@ -244,9 +245,8 @@ <h2 id="synchronous-asynchronous-execution">Synchronous &amp; Asynchronous Execu
 Explicit context switch to foo again
 Implicit context switch back to bar
 </pre></code></p>
-<p>It is illuminating to visualize the control of the program or
-walk through it with a debugger to see the context switches as
-they occur.</p>
+<p>It is illuminating to visualize the control flow of the program or walk
+through it with a debugger to see the context switches as they occur.</p>
 <p><img alt="Greenlet Control Flow" src="flow.gif" /></p>
 <p>The real power of gevent comes when we use it for network and IO
 bound functions which can be cooperatively scheduled. Gevent has
@@ -338,16 +338,16 @@ <h2 id="synchronous-asynchronous-execution">Synchronous &amp; Asynchronous Execu
 Task 8 done
 Task 9 done
 Asynchronous:
-Task 2 done
+Task 1 done
 Task 6 done
+Task 5 done
+Task 0 done
+Task 9 done
 Task 8 done
-Task 3 done
-Task 4 done
 Task 7 done
-Task 1 done
-Task 9 done
-Task 0 done
-Task 5 done
+Task 4 done
+Task 3 done
+Task 2 done
 </pre></code></p>
 <p>In the synchronous case all the tasks are run sequentially,
 which results in the main programming <em>blocking</em> (
@@ -1071,11 +1071,14 @@ <h2 id="wsgi-servers">WSGI Servers</h2>
 <li>gevent.wsgi.WSGIServer</li>
 <li>gevent.pywsgi.WSGIServer</li>
 </ul>
-<p>wsgi is a Python bridge to libev's <em>very</em> fast HTTP
-server. It does one job very well. Namely shoving content down a
-network pipe as fast as possible. It is however limited in
-certain HTTP features, the key one being lack chunked transfer
-encoding.</p>
+<p>In earlier versions of gevent before 1.0.x, gevent used libevent
+instead of libev. Libevent included a fast HTTP server which was
+used by gevent's <code>wsgi</code> server. </p>
+<p>In gevent 1.0.x there is no http server included. Instead
+<code>gevent.wsgi</code> it is now an alias for the pure Python server in
+<code>gevent.pywsgi</code>.</p>
+<h2 id="streaming-servers">Streaming Servers</h2>
+<p><strong>If you are using gevent 1.0.x, this section does not apply</strong></p>
 <p>For those familiar with streaming HTTP services, the core idea is
 that in the headers we do not specify a length of the content. We
 instead hold the connection open and flush chunks down the pipe,
@@ -1139,6 +1142,9 @@ <h2 id="wsgi-servers">WSGI Servers</h2>
 <p>But regardless, performance on Gevent servers is phenomenal
 compared to other Python servers. libev is a very vetted technology
 and its derivative servers are known to perform well at scale.</p>
+<p>To benchmark, try Apache Benchmark <code>ab</code> or see this 
+<a href="http://nichol.as/benchmark-of-python-web-servers">Benchmark of Python WSGI Servers</a> 
+for comparison with other servers.</p>
 <pre>
 <code class="shell">$ ab -n 10000 -c 100 http://127.0.0.1:8000/
 </code>
diff --git a/tutorial.md b/tutorial.md
@@ -74,9 +74,8 @@ gevent.joinall([
 ]]]
 [[[end]]]
 
-It is illuminating to visualize the control of the program or
-walk through it with a debugger to see the context switches as
-they occur.
+It is illuminating to visualize the control flow of the program or walk
+through it with a debugger to see the context switches as they occur.
 
 ![Greenlet Control Flow](flow.gif)
 
@@ -822,11 +821,18 @@ Henceforth called ``wsgi`` and ``pywsgi``:
 * gevent.wsgi.WSGIServer
 * gevent.pywsgi.WSGIServer
 
-wsgi is a Python bridge to libev's *very* fast HTTP
-server. It does one job very well. Namely shoving content down a
-network pipe as fast as possible. It is however limited in
-certain HTTP features, the key one being lack chunked transfer
-encoding.
+In earlier versions of gevent before 1.0.x, gevent used libevent
+instead of libev. Libevent included a fast HTTP server which was
+used by gevent's ``wsgi`` server. 
+
+In gevent 1.0.x there is no http server included. Instead
+``gevent.wsgi`` it is now an alias for the pure Python server in
+``gevent.pywsgi``.
+
+
+## Streaming Servers
+
+**If you are using gevent 1.0.x, this section does not apply**
 
 For those familiar with streaming HTTP services, the core idea is
 that in the headers we do not specify a length of the content. We
@@ -895,6 +901,10 @@ But regardless, performance on Gevent servers is phenomenal
 compared to other Python servers. libev is a very vetted technology
 and its derivative servers are known to perform well at scale.
 
+To benchmark, try Apache Benchmark ``ab`` or see this 
+[Benchmark of Python WSGI Servers](http://nichol.as/benchmark-of-python-web-servers) 
+for comparison with other servers.
+
 <pre>
 <code class="shell">$ ab -n 10000 -c 100 http://127.0.0.1:8000/
 </code>
