Add native http benchmark

Author: ry

src/ops.rs

@@ -1190,10 +1190,8 @@ fn op_http_listen(
     // TODO properly parse addr
     let addr = SocketAddr::from_str(address).unwrap();
 
-    let http_server = http_server::create_and_bind(&addr).unwrap();
+    let http_server = http_server::create_and_bind(&addr)?;
     let resource = resources::add_http_server(http_server);
-    // tokio_util::spawn(server_fut);
-    //tokio::spawn(server_fut);
 
     let builder = &mut FlatBufferBuilder::new();
     let inner = msg::HttpListenRes::create(

tests/http_bench.ts

@@ -1,35 +1,12 @@
 // Used for benchmarking Deno's networking. See tools/http_benchmark.py
-// TODO Replace this with a real HTTP server once
-// https://github.com/denoland/deno/issues/726 is completed.
 // Note: this is a keep-alive server.
 import * as deno from "deno";
-const addr = deno.args[1] || "127.0.0.1:4500";
-const listener = deno.listen("tcp", addr);
-const response = new TextEncoder().encode(
-  "HTTP/1.1 200 OK\r\nContent-Length: 12\r\n\r\nHello World\n"
-);
+const addr = deno.args[1] || "0.0.0.0:4500";
+const resBody = new TextEncoder().encode("Hello World\n");
 
-async function handle(conn: deno.Conn): Promise<void> {
-  const buffer = new Uint8Array(1024);
-  try {
-    while (true) {
-      const r = await conn.read(buffer);
-      if (r.eof) {
-        break;
-      }
-      await conn.write(response);
-    }
-  } finally {
-    conn.close();
-  }
-}
-
-async function main(): Promise<void> {
-  console.log("Listening on", addr);
-  while (true) {
-    const conn = await listener.accept();
-    handle(conn);
-  }
-}
-
-main();
+const server = deno.httpListen(addr);
+server.serve((req: deno.ServerRequest, res: deno.ServerResponse) => {
+  res.status = 200;
+  res.headers = [["server", "ryans server"], ["content-type", "text/plain"]];
+  res.writeResponse(resBody);
+});

tests/tcp_bench.ts

@@ -0,0 +1,33 @@
+// Used for benchmarking Deno's networking. See tools/http_benchmark.py
+// Note: this is a keep-alive server.
+import * as deno from "deno";
+const addr = deno.args[1] || "127.0.0.1:4500";
+const listener = deno.listen("tcp", addr);
+const response = new TextEncoder().encode(
+  "HTTP/1.1 200 OK\r\nContent-Length: 12\r\n\r\nHello World\n"
+);
+
+async function handle(conn: deno.Conn): Promise<void> {
+  const buffer = new Uint8Array(1024);
+  try {
+    while (true) {
+      const r = await conn.read(buffer);
+      if (r.eof) {
+        break;
+      }
+      await conn.write(response);
+    }
+  } finally {
+    conn.close();
+  }
+}
+
+async function main(): Promise<void> {
+  console.log("Listening on", addr);
+  while (true) {
+    const conn = await listener.accept();
+    handle(conn);
+  }
+}
+
+main();

tools/http_benchmark.py

@@ -10,9 +10,15 @@
 DURATION = "10s"
 
 
+def deno_tcp_benchmark(deno_exe):
+    deno_cmd = [deno_exe, "--allow-net", "tests/tcp_bench.ts", ADDR]
+    print "http_benchmark testing DENO TCP."
+    return run(deno_cmd)
+
+
 def deno_http_benchmark(deno_exe):
     deno_cmd = [deno_exe, "--allow-net", "tests/http_bench.ts", ADDR]
-    print "http_benchmark testing DENO."
+    print "http_benchmark testing DENO HTTP."
     return run(deno_cmd)
 
 
@@ -37,7 +43,8 @@ def hyper_http_benchmark(hyper_hello_exe):
 def http_benchmark(deno_exe, hyper_hello_exe):
     r = {}
     # TODO Rename to "deno_tcp"
-    r["deno"] = deno_http_benchmark(deno_exe)
+    r["deno"] = deno_tcp_benchmark(deno_exe)
+    r["deno_http"] = deno_http_benchmark(deno_exe)
     r["node"] = node_http_benchmark()
     r["node_tcp"] = node_tcp_benchmark()
     r["hyper"] = hyper_http_benchmark(hyper_hello_exe)