single proc

kiven-li · Nov 3, 2017 · da18955 · da18955
1 parent 3b33b0c
commit da18955
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 20 deletions.
diff --git a/benchmarks/bench-echo.sh b/benchmarks/bench-echo.sh
@@ -3,19 +3,18 @@
 #set -e
 
 echo ""
-echo "--- ECHO START ---"
+echo "--- BENCH ECHO START ---"
 echo ""
 
 cd $(dirname "${BASH_SOURCE[0]}")
 function cleanup {
-    echo "--- ECHO DONE ---"
+    echo "--- BENCH ECHO DONE ---"
     kill $(jobs -rp)
     wait $(jobs -rp) 2>/dev/null
 }
 trap cleanup EXIT
 
 mkdir -p bin
-
 $(pkill net-echo-server || printf "")
 $(pkill evio-echo-server || printf "")
 
@@ -24,12 +23,11 @@ function gobench {
     if [ "$3" != "" ]; then
         go build -o $2 $3
     fi
-    $2 -port $4 &
+    GOMAXPROCS=1 $2 --port $4 &
     sleep 1
     echo "Sending 6 byte packets, 50 connections"
     nl=$'\r\n'
     tcpkali -c 50 -m "PING{$nl}" 127.0.0.1:$4
-    echo "--- DONE ---"
     echo ""
 }
 

diff --git a/benchmarks/bench-http.sh b/benchmarks/bench-http.sh
@@ -25,11 +25,10 @@ function gobench {
     if [ "$3" != "" ]; then
         go build -o $2 $3
     fi
-    $2 -port $4 &
+    GOMAXPROCS=1 $2 --port $4 &
     sleep 1
-    echo "Using 4 threads, 50 connections, 10 seconds"
-    wrk -t4 -c50 -d10 http://127.0.0.1:$4
-    echo "--- DONE ---"
+    echo "Using 50 connections, 10 seconds"
+    wrk -t1 -c50 -d10 http://127.0.0.1:$4
     echo ""
 }
 

diff --git a/benchmarks/bench-redis.sh b/benchmarks/bench-redis.sh
@@ -3,20 +3,18 @@
 #set -e
 
 echo ""
-echo "--- REDIS START ---"
+echo "--- BENCH REDIS START ---"
 echo ""
 
-
 cd $(dirname "${BASH_SOURCE[0]}")
 function cleanup {
-    echo "--- REDIS DONE ---"
+    echo "--- BENCH REDIS DONE ---"
     kill $(jobs -rp)
     wait $(jobs -rp) 2>/dev/null
 }
 trap cleanup EXIT
 
 mkdir -p bin
-
 $(pkill redis-server || printf "")
 $(pkill evio-redis-server || printf "")
 
@@ -25,15 +23,14 @@ function gobench {
     if [ "$3" != "" ]; then
         go build -o $2 $3
     fi
-    $2 --port $4 &
+    GOMAXPROCS=1 $2 --port $4 &
     sleep 1
     echo "Sending pings, 50 connections, 1 packet pipeline"
     redis-benchmark -p $4 -t ping -q -P 1
     echo "Sending pings, 50 connections, 10 packet pipeline"
     redis-benchmark -p $4 -t ping -q -P 10
     echo "Sending pings, 50 connections, 20 packet pipeline"
     redis-benchmark -p $4 -t ping -q -P 20
-    echo "--- DONE ---"
     echo ""
 }
 gobench "real/redis" redis-server "" 6392

diff --git a/evio_unix.go → evio_loop.go b/evio_unix.go → evio_loop.go
diff --git a/evio_test.go b/evio_test.go
@@ -477,9 +477,6 @@ func TestBadAddresses(t *testing.T) {
 	if err := Serve(events, "howdy"); err == nil {
 		t.Fatalf("expected error")
 	}
-	if err := Serve(events, "unix://"); err == nil {
-		t.Fatalf("expected error")
-	}
 	if err := Serve(events, "tcp://"); err != nil {
 		t.Fatalf("expected nil, got '%v'", err)
 	}
@@ -670,7 +667,7 @@ func testTranslate(network, addr string, kind string, stdlib bool) {
 		func(id int, addr Addr) bool {
 			return true
 		},
-		func(rw io.ReadWriter) io.ReadWriter {
+		func(id int, rw io.ReadWriter) io.ReadWriter {
 			switch kind {
 			case "passthrough":
 				return rw
@@ -690,7 +687,7 @@ func testTranslate(network, addr string, kind string, stdlib bool) {
 		func(id int, addr Addr) bool {
 			return false
 		},
-		func(rw io.ReadWriter) io.ReadWriter {
+		func(id int, rw io.ReadWriter) io.ReadWriter {
 			return rw
 		},
 	)

diff --git a/examples/http-server/main.go b/examples/http-server/main.go
@@ -37,11 +37,13 @@ func main() {
 	var tlsport int
 	var tlspem string
 	var aaaa bool
+	var noparse bool
 
 	flag.IntVar(&port, "port", 8080, "server port")
 	flag.IntVar(&tlsport, "tlsport", 4443, "tls port")
 	flag.StringVar(&tlspem, "tlscert", "", "tls pem cert/key file")
 	flag.BoolVar(&aaaa, "aaaa", false, "aaaaa....")
+	flag.BoolVar(&noparse, "noparse", true, "do not parse requests")
 	flag.Parse()
 
 	if aaaa {
@@ -78,6 +80,10 @@ func main() {
 		if in == nil {
 			return
 		}
+		if noparse {
+			out = []byte("HTTP/1.1 200 OK\r\nServer: evio\r\nDate: Fri, 03 Nov 2017 11:37:00 GMT\r\nContent-Length: 14\r\n\r\nHello World!\r\n")
+			return
+		}
 		c := conns[id]
 		data := c.is.Begin(in)
 		// process the pipeline