Fix bugs in reactor network model

panjf2000 · Sep 14, 2019 · 28f1132 · 28f1132
1 parent 54d17b3
commit 28f1132
Show file tree

Hide file tree

Showing 574 changed files with 285,231 additions and 590 deletions.
diff --git a/benchmarks/README.md b/benchmarks/README.md
@@ -4,14 +4,12 @@ Required tools:
 
 - [bombardier](https://github.com/codesenberg/bombardier) for HTTP
 - [tcpkali](https://github.com/machinezone/tcpkali) for Echo
-- [Redis](http://redis.io) for Redis
 
 Required Go packages:
 
 ```
 go get gonum.org/v1/plot/...
 go get -u github.com/valyala/fasthttp
-go get -u github.com/tidwall/redcon
 ```
 
 And of course [Go](https://golang.org) is required.

diff --git a/benchmarks/analyze.go b/benchmarks/analyze.go
@@ -42,7 +42,7 @@ func autoplot() {
 }
 
 func analyze() {
-	lines := readlines("out/http.txt", "out/echo.txt", "out/redis1.txt", "out/redis8.txt", "out/redis16.txt")
+	lines := readlines("out/http.txt", "out/echo.txt")
 	var err error
 	for _, line := range lines {
 		rlines := strings.Split(line, "\r")
@@ -91,12 +91,6 @@ func analyze() {
 					must(err)
 					output()
 				}
-			case strings.HasPrefix(category, "redis"):
-				if strings.HasPrefix(line, "PING_INLINE: ") {
-					rate, err = strconv.ParseFloat(strings.Split(strings.Split(line, ": ")[1], " ")[0], 64)
-					must(err)
-					output()
-				}
 			}
 		}
 	}

diff --git a/benchmarks/bench-redis.sh b/benchmarks/bench-redis.sh
diff --git a/benchmarks/bench.sh b/benchmarks/bench.sh
@@ -8,8 +8,5 @@ mkdir -p out/
 
 ./bench-http.sh 2>&1 | tee out/http.txt
 ./bench-echo.sh 2>&1 | tee out/echo.txt
-./bench-redis.sh 1 2>&1 | tee out/redis1.txt
-./bench-redis.sh 8 2>&1 | tee out/redis8.txt
-./bench-redis.sh 16 2>&1 | tee out/redis16.txt
 
 go run analyze.go
diff --git a/benchmarks/out/echo.png b/benchmarks/out/echo.png
diff --git a/benchmarks/out/echo.txt b/benchmarks/out/echo.txt
diff --git a/benchmarks/out/http.png b/benchmarks/out/http.png
diff --git a/benchmarks/out/http.txt b/benchmarks/out/http.txt
diff --git a/benchmarks/out/redis1.txt b/benchmarks/out/redis1.txt
diff --git a/benchmarks/out/redis16.txt b/benchmarks/out/redis16.txt
diff --git a/benchmarks/out/redis8.txt b/benchmarks/out/redis8.txt
diff --git a/benchmarks/out/redis_pipeline_1.png b/benchmarks/out/redis_pipeline_1.png
diff --git a/benchmarks/out/redis_pipeline_16.png b/benchmarks/out/redis_pipeline_16.png
diff --git a/benchmarks/out/redis_pipeline_8.png b/benchmarks/out/redis_pipeline_8.png
diff --git a/conn_unix.go b/conn_unix.go
@@ -8,6 +8,7 @@ package gnet
 import (
 	"io"
 	"net"
+	"syscall"
 
 	"github.com/panjf2000/gnet/ringbuffer"
 	"golang.org/x/sys/unix"
@@ -28,14 +29,31 @@ type conn struct {
 	loop       *loop         // connected loop
 }
 
+func (c *conn) sendOut(buf []byte) {
+	if !c.outBuf.IsFull() && !c.outBuf.IsEmpty() {
+		_, _ = c.outBuf.Write(buf)
+		return
+	}
+
+	n, err := syscall.Write(c.fd, buf)
+	if err != nil {
+		_, _ = c.outBuf.Write(buf)
+		return
+	}
+
+	if n < len(buf) {
+		_, _ = c.outBuf.Write(buf[n:])
+	}
+}
+
 func (c *conn) Context() interface{}       { return c.ctx }
 func (c *conn) SetContext(ctx interface{}) { c.ctx = ctx }
 func (c *conn) AddrIndex() int             { return c.addrIndex }
 func (c *conn) LocalAddr() net.Addr        { return c.localAddr }
 func (c *conn) RemoteAddr() net.Addr       { return c.remoteAddr }
 func (c *conn) Wake() {
 	if c.loop != nil {
-		sniffError(c.loop.poll.Trigger(c))
+		sniffError(c.loop.poller.Trigger(c))
 	}
 }
 

diff --git a/examples/echo-server/main.go b/examples/echo-server/main.go
@@ -11,6 +11,7 @@ import (
 	"strings"
 
 	"github.com/panjf2000/gnet"
+	"github.com/panjf2000/gnet/ringbuffer"
 )
 
 func main() {
@@ -19,14 +20,12 @@ func main() {
 	var udp bool
 	var trace bool
 	var reuseport bool
-	var stdlib bool
 
 	flag.IntVar(&port, "port", 5000, "server port")
 	flag.BoolVar(&udp, "udp", false, "listen on udp")
 	flag.BoolVar(&reuseport, "reuseport", false, "reuseport (SO_REUSEPORT)")
 	flag.BoolVar(&trace, "trace", false, "print packets to console")
 	flag.IntVar(&loops, "loops", 0, "num loops")
-	flag.BoolVar(&stdlib, "stdlib", false, "use stdlib")
 	flag.Parse()
 
 	var events gnet.Events
@@ -36,24 +35,21 @@ func main() {
 		if reuseport {
 			log.Printf("reuseport")
 		}
-		if stdlib {
-			log.Printf("stdlib")
-		}
 		return
 	}
-	events.React = func(c gnet.Conn, in []byte) (out []byte, action gnet.Action) {
+	events.React = func(c gnet.Conn, inBuf *ringbuffer.RingBuffer) (out []byte, action gnet.Action) {
+		n := inBuf.Length()
+		defer inBuf.Move(n)
+		//out = inBuf.Bytes()
+		defer ringbuffer.Recycle(out)
 		if trace {
-			log.Printf("%s", strings.TrimSpace(string(in)))
+			log.Printf("%s", strings.TrimSpace(string(out)))
 		}
-		out = in
 		return
 	}
 	scheme := "tcp"
 	if udp {
 		scheme = "udp"
 	}
-	if stdlib {
-		scheme += "-net"
-	}
 	log.Fatal(gnet.Serve(events, fmt.Sprintf("%s://:%d?reuseport=%t", scheme, port, reuseport)))
 }