add missing benchmarks in httparse and pichohttpparser

Author: Geal

http/README.md

@@ -18,10 +18,10 @@ The benchmarks were run on a late 2013 Macbook Pro, quad core 2,3 GHz Intel Core
 | http-parser  | 606 ns/iter (+/- 367 ns) | 56,385 ns/iter (+/- 148 ns)  | 266254 ns/iter (+/- 37071 ns) | 1137 ns/iter (+/- 18 ns) |
 | attoparsec |          | 241.5 μs/iter (+/-5.7 μs)     | 1.836 ms/iter (+/- 137 μs)     |                       |
 | combine    | 1,394 ns/iter (+/- 489) = 208 MB/s | 89,875 ns/iter (+/- 12,575) = 237 MB/s | 453,297 ns/iter (+/- 260,973) = 235 MB/s | 2,076 ns/iter (+/- 436) = 338 MB/s |
-| httparse   | 213 ns/iter (+/- 39) = 1366 MB/s |   |   | 472 ns/iter (+/- 162) = 1489 MB/s |
+| httparse   | 213 ns/iter (+/- 39) = 1366 MB/s | 15,432 ns/iter (+/- 1,564) = 1385 MB/s | 78,121 ns/iter (+/- 12,476) = 1368 MB/s | 472 ns/iter (+/- 162) = 1489 MB/s |
 | nom | 889 ns/iter (+/- 411) = 327 MB/s | 59,918 ns/iter (+/- 5,372) = 356 MB/s | 333,344 ns/iter (+/- 49,823) = 320 MB/s | 1,544 ns/iter (+/- 294) = 455 MB/s |
 | nom (optimized) | 183 ns/iter (+/- 25) = 1590 MB/s | **12,253 ns/iter (+/- 2,473) = 1744 MB/s** | **61,519 ns/iter (+/- 14,660) = 1737 MB/s** | **308 ns/iter (+/- 48) = 2282 MB/s** |
-| picohttpparser | **170 ns/iter (+/- 29) = 1711 MB/s** |   |   | 350 ns/iter (+/- 76) = 2008 MB/s |
+| picohttpparser | **170 ns/iter (+/- 29) = 1711 MB/s** | 13,260 ns/iter (+/- 1,786) = 1612 MB/s  | 65,415 ns/iter (+/- 5,058) = 1634 MB/s | 350 ns/iter (+/- 76) = 2008 MB/s |
 
 (the "nom-optimized" version is an experiment to match httparse and picohttparser APIs, and bring
 in SIMD based parsing in nom)

http/httparse/src/main.rs

@@ -50,13 +50,35 @@ Cookie: wp_ozh_wsa_visits=2; wp_ozh_wsa_visit_lasttime=xxxxxxxxxx; __utma=xxxxxx
   parse(b, data)
 }
 
+fn small_test(b: &mut Bencher) {
+  let data = include_bytes!("../../http-requests.txt");
+  b.bytes = data.len() as u64;
+  parse(b, data)
+}
+
+fn bigger_test(b: &mut Bencher) {
+  let data = include_bytes!("../../bigger.txt");
+  b.bytes = data.len() as u64;
+  parse(b, data)
+}
 
 fn parse(b: &mut Bencher, buffer: &[u8]) {
-  let mut headers = [httparse::Header{ name: "", value: &[] }; 16];
-  let mut req = httparse::Request::new(&mut headers);
   b.iter(|| {
       let mut buf = black_box(buffer);
-      assert_eq!(req.parse(buf).unwrap(), httparse::Status::Complete(buf.len()));
+      let mut index = 0;
+      let len = buf.len();
+      while  index < len {
+        let slice = &buf[index..];
+
+        let mut headers = [httparse::Header{ name: "", value: &[] }; 16];
+        let mut req = httparse::Request::new(&mut headers);
+
+        if let httparse::Status::Complete(sz) = req.parse(buf).unwrap() {
+          index += sz;
+        } else {
+          panic!("parse error");
+        }
+      }
   });
 
   /*
@@ -81,5 +103,5 @@ fn parse(b: &mut Bencher, buffer: &[u8]) {
   */
 }
 
-benchmark_group!(http, one_test, httparse_example_test);
+benchmark_group!(http, one_test, small_test, bigger_test, httparse_example_test);
 benchmark_main!(http);

http/picohttpparser/src/main.rs

@@ -50,6 +50,17 @@ Cookie: wp_ozh_wsa_visits=2; wp_ozh_wsa_visit_lasttime=xxxxxxxxxx; __utma=xxxxxx
   parse(b, data)
 }
 
+fn small_test(b: &mut Bencher) {
+  let data = include_bytes!("../../http-requests.txt");
+  b.bytes = data.len() as u64;
+  parse(b, data)
+}
+
+fn bigger_test(b: &mut Bencher) {
+  let data = include_bytes!("../../bigger.txt");
+  b.bytes = data.len() as u64;
+  parse(b, data)
+}
 
 fn parse(b: &mut Bencher, buffer: &[u8]) {
   use std::mem;
@@ -60,34 +71,47 @@ fn parse(b: &mut Bencher, buffer: &[u8]) {
 
   #[repr(C)]
   struct Headers<'a>(&'a mut [Header<'a>]);
-  let method = [0i8; 16];
-  let path = [0i8; 100];
-  let mut minor_version = 0;
-  let mut h = [Header(&[], &[]); 16];
-  let mut h_len = h.len();
-  let headers = Headers(&mut h);
-  let prev_buf_len = 0;
 
   b.bytes = buffer.len() as u64;
   b.iter(|| {
     let mut buf = black_box(buffer);
-    let ret = unsafe {
-      pico::ffi::phr_parse_request(
-        buf.as_ptr() as *const _,
-        buf.len(),
-        &mut method.as_ptr(),
-        &mut 16,
-        &mut path.as_ptr(),
-        &mut 100,
-        &mut minor_version,
-        mem::transmute::<*mut Header, *mut pico::ffi::phr_header>(headers.0.as_mut_ptr()),
-        &mut h_len as *mut usize as *mut _,
-        prev_buf_len
-      )
-    };
-    assert_eq!(ret, buf.len() as i32);
+    let mut index = 0;
+    let len = buf.len();
+    while  index < len {
+      let slice = &buf[index..];
+
+      let method = [0i8; 16];
+      let path = [0i8; 100];
+      let mut minor_version = 0;
+      let mut h = [Header(&[], &[]); 16];
+      let mut h_len = h.len();
+      let headers = Headers(&mut h);
+      let prev_buf_len = 0;
+
+      let ret = unsafe {
+        pico::ffi::phr_parse_request(
+          slice.as_ptr() as *const _,
+          slice.len(),
+          &mut method.as_ptr(),
+          &mut 16,
+          &mut path.as_ptr(),
+          &mut 100,
+          &mut minor_version,
+          mem::transmute::<*mut Header, *mut pico::ffi::phr_header>(headers.0.as_mut_ptr()),
+          &mut h_len as *mut usize as *mut _,
+          prev_buf_len
+        )
+      };
+
+      if ret < 0 {
+        println!("error: ret = {}", ret);
+        break;
+      }
+
+      index += ret as usize;
+    }
   });
 }
 
-benchmark_group!(http, one_test, httparse_example_test);
+benchmark_group!(http, one_test, small_test, bigger_test, httparse_example_test);
 benchmark_main!(http);