Merge pull request chris-morgan#22 from Manishearth/rustup_20140618

Update to latest Rust

Author: metajack

.gitignore

@@ -10,6 +10,8 @@ doc/src/http/
 doc/.lock
 doc/*.js
 doc/*.css
+doc/*.woff
+doc/implementors/
 lib/
 .rust/
 Makefile

README.rst

@@ -1,3 +1,20 @@
+OBSOLETION NOTICE
+=================
+
+This library is on the way out. It was a useful experiment and is now being
+replaced under the scope of the `Teepee <http://teepee.rs>`_ project.
+
+For more information on what’s happening with it all,
+see http://chrismorgan.info/blog/introducing-teepee.html.
+
+Until Teepee is ready for use, rust-http will be maintained so you can use it
+with Rust master, but no new work is being done on it. After that, it will
+probably wind down fairly quickly with a migration guide to help you change to
+Teepee. So long as you haven’t built a massive program with it (not advised!),
+migration should not be terribly difficult.
+
+But for now, if you want to play with HTTP in Rust, this is the library to use.
+
 Rust HTTP library
 =================
 
@@ -51,6 +68,10 @@ Getting started
 This is developed on Ubuntu and is aimed at the moving target of Rust's master
 branch.
 
+Configure the makefile::
+
+   ./configure
+
 Build everything::
 
    make all

comparisons/run.py

@@ -1,10 +1,20 @@
+#!/usr/bin/env python
+# (python2 or python3, don’t mind which)
 '''Comparison benchmarker.'''
 
+from __future__ import print_function
+from __future__ import unicode_literals
+
 import os
 import subprocess
 import sys
 import time
-import urllib2
+try:
+    from urllib.request import urlopen
+    from urllib.error import URLError
+except ImportError:  # py2k
+    from urllib2 import urlopen
+    from urllib2 import URLError
 from contextlib import contextmanager
 
 
@@ -69,12 +79,12 @@ def spawn_server(self):
         args = self.get_server_process_details()
         process = subprocess.Popen(args,
             stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        for _ in xrange(int(self.START_CHECK_TIMEOUT /
-                            self.START_CHECK_FREQUENCY)):
+        for _ in range(int(self.START_CHECK_TIMEOUT /
+                           self.START_CHECK_FREQUENCY)):
             time.sleep(self.START_CHECK_FREQUENCY)
             try:
-                urllib2.urlopen(self.root_url)
-            except urllib2.URLError:
+                urlopen(self.root_url)
+            except URLError:
                 pass
             else:
                 break
@@ -129,9 +139,9 @@ class RustServerRunner(ServerRunner):
     PLATFORM = 'rust'
 
     # e.g. x86_64-unknown-linux-gnu
-    HOST = subprocess.Popen(('rustc', '--version'),
-                            stdout=subprocess.PIPE).communicate()[0].split(
-                                    'host: ')[1].rstrip()
+    rustc_version = subprocess.Popen(('rustc', '--version'),
+                                     stdout=subprocess.PIPE).communicate()[0]
+    HOST = rustc_version.split(b'host: ')[1].rstrip()
 
     def __init__(self, *args, **kwargs):
         super(RustServerRunner, self).__init__(*args, **kwargs)
@@ -142,6 +152,8 @@ def __init__(self, *args, **kwargs):
     def compile_server(self):
         subprocess.Popen(('rustc',
             '--opt-level=3', self.source,
+            '-Z', 'lto',
+            #'-Z', 'no-landing-pads',
             #'--out-dir', self.build_dir,
             '-L', '../build', # '../build/{}/http/'.format(RustServerRunner.HOST),
             # Just in case it was built with openssl support. This should
@@ -224,23 +236,52 @@ class ApacheBenchServerBencher(ServerBencher):
 
     TOOL = 'ab'
 
-    def __init__(self, bin='ab'):
+    def __init__(self, bin='ab', keep_alive=False):
         self.bin = bin
+        self.keep_alive = keep_alive
+        if keep_alive:
+            self.TOOL = 'ab-keep-alive'
 
     def bench(self, server_runner, concurrency):
-        process = subprocess.Popen(
-            (self.bin, '-n', '100000', '-c', str(concurrency),
-                server_runner.root_url),
-            stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        args = [self.bin, '-n', '100000', '-c', str(concurrency)]
+        if self.keep_alive:
+            args.append('-k')
+        args.append(server_runner.root_url)
+        process = subprocess.Popen(args, stdout=subprocess.PIPE,
+                                   stderr=subprocess.PIPE)
         stdout, stderr = process.communicate()
         # Might fail here if it failed. Meh; no point catching it, let it fail.
-        rps_line = next(line for line in stdout.split('\n')
-                        if line.startswith('Requests per second:'))
+        rps_line = next(line for line in stdout.split(b'\n')
+                        if line.startswith(b'Requests per second:'))
         # Matches the 2323.84 part of:
         # Requests per second:    2323.84 [#/sec] (mean)
         return float(rps_line.split()[3])
 
 
+class WrkServerBencher(ServerBencher):
+
+    TOOL = 'wrk'
+
+    def __init__(self, bin='wrk'):
+        self.bin = bin
+
+    def bench(self, server_runner, concurrency):
+        process = subprocess.Popen(
+            # defaults: --duration 10s --threads 2 --connections 10
+            (self.bin,
+             '--threads', str(concurrency),
+             '--connections', str(concurrency),
+             server_runner.root_url),
+            stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        stdout, stderr = process.communicate()
+        # Might fail here if it failed. Meh; no point catching it, let it fail.
+        rps_line = next(line for line in stdout.split(b'\n')
+                        if line.startswith(b'Requests/sec: '))
+        # Matches the 106353.48 part of:
+        # Requests/sec: 106353.48
+        return float(rps_line.split()[1])
+
+
 def runners_benchers_cross_product(runners, benchers, concurrency):
     '''
     Run all combinations of runners (a :class:`ServerRunnerCollection`) and
@@ -254,9 +295,10 @@ def runners_benchers_cross_product(runners, benchers, concurrency):
 
 
 def main():
-    ab = ApacheBenchServerBencher()
-    #wrk = WrkServerBencher()
-    benchers = [ab]
+    ab = ApacheBenchServerBencher(keep_alive=False)
+    ab_k = ApacheBenchServerBencher(keep_alive=True)
+    wrk = WrkServerBencher()
+    benchers = [ab, ab_k, wrk]
 
     for server_name in ('apache_fake',):
         runners = ServerRunnerCollection(
@@ -269,10 +311,11 @@ def main():
                     .format(runner.PLATFORM, runner.name)):
                 runner.compile_server()
 
-        for concurrency in (1, 2, 3, 4, 8):
+        for concurrency in (1, 2, 3, 4, 8, 16, 32):
             for runner, bencher, result in runners_benchers_cross_product(
                     runners, benchers, concurrency):
-                print runner.PLATFORM, concurrency, bencher.TOOL, result
+                print(' '.join((runner.PLATFORM, str(concurrency),
+                                bencher.TOOL, str(result))))
 
 
 if __name__ == '__main__':

src/codegen/branchify.rs

@@ -100,7 +100,7 @@ pub fn generate_branchified_method(
         )
         for &c in branch.matches.iter() {
             let next_prefix = format!("{}{}", prefix, c as char);
-            w!(format!("Ok(b) if b == '{}' as u8 => match {} \\{", c as char, read_call));
+            w!(format!("Ok(b) if b == '{}' as u8 => match {} {{", c as char, read_call));
             for b in branch.children.iter() {
                 try!(r(writer, b, next_prefix.as_slice(), indent + 1, read_call, end, max_len, valid, unknown));
             }
@@ -124,7 +124,7 @@ pub fn generate_branchified_method(
         }
     )
 
-    w!(format!("let (s, next_byte) = match {} \\{", read_call));
+    w!(format!("let (s, next_byte) = match {} {{", read_call));
     for b in branches.iter() {
         try!(r(writer, b, "", indent + 1, read_call, end, max_len, valid, unknown));
     }
@@ -136,10 +136,10 @@ pub fn generate_branchified_method(
     w!(       ("let mut s = String::from_str(s);"));
     w!(       ("s.push_char(next_byte as char);"));
     w!(       ("loop {"));
-    w!(format!("    match {} \\{", read_call));
+    w!(format!("    match {} {{", read_call));
     w!(format!("        Ok(b) if b == {} => return Ok({}),", end, unknown.replace("{}", "s")));
-    w!(format!("        Ok(b) if {} => \\{", valid));
-    w!(format!("            if s.len() == {} \\{", max_len));
+    w!(format!("        Ok(b) if {} => {{", valid));
+    w!(format!("            if s.len() == {} {{", max_len));
     w!(       ("                // Too long; bad request"));
     w!(       ("                return Err(::std::io::IoError { kind: ::std::io::OtherIoError, desc: \"too long, bad request\", detail: None });"));
     w!(       ("            }"));

src/codegen/main.rs

@@ -2,8 +2,6 @@
 
 #![feature(macro_rules)]
 
-extern crate collections;
-
 use std::io::{File, Truncate, Write};
 use std::os;