From 055a783ef0b819e894a92f9eaedd9832471e5d98 Mon Sep 17 00:00:00 2001
From: Sean McArthur <sean.monstar@gmail.com>
Date: Tue, 2 Sep 2014 20:52:29 -0700
Subject: [PATCH] adding a custom header to benches

---
 benches/client.rs | 68 ++++++++++++++++++++++++++++++-----------------
 src/lib.rs        |  1 +
 src/server/mod.rs | 12 ++++++---
 3 files changed, 53 insertions(+), 28 deletions(-)

diff --git a/benches/client.rs b/benches/client.rs
index eea156f9..c7a8605e 100644
--- a/benches/client.rs
+++ b/benches/client.rs
@@ -4,26 +4,15 @@ extern crate hyper;
 
 extern crate test;
 
+use std::fmt::{mod, Show};
+use std::str::{SendStr, Slice};
 use std::io::IoResult;
-use std::time::Duration;
-use std::io::timer::sleep;
 use std::io::net::ip::Ipv4Addr;
-use std::sync::{Once, ONCE_INIT};
 use hyper::server::{Request, Response, Server};
 
-static mut SERVER: Once = ONCE_INIT;
-
-fn listen() {
-    unsafe {
-        SERVER.doit(|| {
-            let server = Server::http(Ipv4Addr(127, 0, 0, 1), 1337);
-            let listening = server.listen(handle).unwrap();
-            spawn(proc() {
-                sleep(Duration::seconds(20));
-                listening.close().unwrap();
-            });
-        })
-    }
+fn listen() -> hyper::server::Listening {
+    let server = Server::http(Ipv4Addr(127, 0, 0, 1), 0);
+    server.listen(handle).unwrap()
 }
 
 fn handle(_req: Request, mut res: Response) -> IoResult<()> {
@@ -34,35 +23,66 @@ fn handle(_req: Request, mut res: Response) -> IoResult<()> {
 
 #[bench]
 fn bench_curl(b: &mut test::Bencher) {
-    listen();
+    let listening = listen();
+    let s = format!("http://{}/", listening.socket_addr);
+    let url = s.as_slice();
     b.iter(|| {
-        curl::http::handle().get("http://127.0.0.1:1337/").exec().unwrap()
+        curl::http::handle()
+            .get(url)
+            .header("X-Foo", "Bar")
+            .exec()
+            .unwrap()
     });
+    listening.close().unwrap()
+}
+
+struct Foo;
+
+impl hyper::header::Header for Foo {
+    fn header_name(_: Option<Foo>) -> SendStr {
+        Slice("x-foo")
+    }
+    fn parse_header(_: &[Vec<u8>]) -> Option<Foo> {
+        None
+    }
+    fn fmt_header(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+        "Bar".fmt(fmt)
+    }
 }
 
 #[bench]
 fn bench_hyper(b: &mut test::Bencher) {
-    listen();
+    let listening = listen();
+    let s = format!("http://{}/", listening.socket_addr);
+    let url = s.as_slice();
     b.iter(|| {
-        hyper::get(hyper::Url::parse("http://127.0.0.1:1337/").unwrap()).unwrap()
+        let mut req = hyper::get(hyper::Url::parse(url).unwrap()).unwrap();
+        req.headers.set(Foo);
+
+        req
             .send().unwrap()
             .read_to_string().unwrap()
     });
+    listening.close().unwrap()
 }
 
 #[bench]
 fn bench_http(b: &mut test::Bencher) {
-    listen();
+    let listening = listen();
+    let s = format!("http://{}/", listening.socket_addr);
+    let url = s.as_slice();
     b.iter(|| {
-        let req: http::client::RequestWriter = http::client::RequestWriter::new(
+        let mut req: http::client::RequestWriter = http::client::RequestWriter::new(
             http::method::Get,
-            hyper::Url::parse("http://127.0.0.1:1337/").unwrap()
+            hyper::Url::parse(url).unwrap()
         ).unwrap();
+        req.headers.extensions.insert("x-foo".to_string(), "Bar".to_string());
         // cant unwrap because Err contains RequestWriter, which does not implement Show
         let mut res = match req.read_response() {
             Ok(res) => res,
             Err(..) => fail!("http response failed")
         };
         res.read_to_string().unwrap();
-    })
+    });
+    listening.close().unwrap()
 }
diff --git a/src/lib.rs b/src/lib.rs
index c46465c8..5e79811d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -53,6 +53,7 @@ pub mod version;
 mod rfc7230;
 
 mod mimewrapper {
+    /// Re-exporting the mime crate, for convenience.
     extern crate mime;
 }
 
diff --git a/src/server/mod.rs b/src/server/mod.rs
index 7ad0d094..d99588c1 100644
--- a/src/server/mod.rs
+++ b/src/server/mod.rs
@@ -1,7 +1,7 @@
 //! HTTP Server
 use std::io::net::tcp::{TcpListener, TcpAcceptor};
 use std::io::{Acceptor, Listener, IoResult, EndOfFile};
-use std::io::net::ip::{IpAddr, Port};
+use std::io::net::ip::{IpAddr, Port, SocketAddr};
 
 pub use self::request::Request;
 pub use self::response::Response;
@@ -31,7 +31,8 @@ impl Server {
 
     /// Binds to a socket, and starts handling connections.
     pub fn listen<H: Handler + 'static>(&self, mut handler: H) -> IoResult<Listening> {
-        let listener = try!(TcpListener::bind(self.ip.to_string().as_slice(), self.port));
+        let mut listener = try!(TcpListener::bind(self.ip.to_string().as_slice(), self.port));
+        let socket = try!(listener.socket_name());
         let acceptor = try!(listener.listen());
         let worker = acceptor.clone();
 
@@ -68,7 +69,8 @@ impl Server {
         });
 
         Ok(Listening {
-            acceptor: acceptor
+            acceptor: acceptor,
+            socket_addr: socket,
         })
     }
 
@@ -76,7 +78,9 @@ impl Server {
 
 /// A listening server, which can later be closed.
 pub struct Listening {
-    acceptor: TcpAcceptor
+    acceptor: TcpAcceptor,
+    /// The socket address that the server is bound to.
+    pub socket_addr: SocketAddr,
 }
 
 impl Listening {