- open OnWriteBufferRelease for http

lesismal · Jul 3, 2021 · 5a8ed7b · 5a8ed7b
1 parent 5083379
commit 5a8ed7b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/go.mod b/go.mod
@@ -5,6 +5,6 @@ go 1.16
 require (
 	github.com/gorilla/websocket v1.4.2
 	github.com/julienschmidt/httprouter v1.3.0
-	github.com/lesismal/llib v1.0.3
+	github.com/lesismal/llib v1.0.4
 	github.com/valyala/fasthttp v1.24.0
 )
diff --git a/go.sum b/go.sum
@@ -14,6 +14,8 @@ github.com/lesismal/llib v1.0.2 h1:7tj63E7oGHpzn+j2i/UsqOR8zdnWb1zzbrOA09cG1vo=
 github.com/lesismal/llib v1.0.2/go.mod h1:3vmCrIMrpkaoA3bDu/sI+J7EyEUMPbOvmAxb7PlzilM=
 github.com/lesismal/llib v1.0.3 h1:FAiXf4GSCNveBw+dpH/mC9/tmsopi3ifC/GDwV2IDP0=
 github.com/lesismal/llib v1.0.3/go.mod h1:3vmCrIMrpkaoA3bDu/sI+J7EyEUMPbOvmAxb7PlzilM=
+github.com/lesismal/llib v1.0.4 h1:hZ+gHeDAIiSfk3QMHuNxAX6nHCZB5sVdZdsbJGcMpJM=
+github.com/lesismal/llib v1.0.4/go.mod h1:3vmCrIMrpkaoA3bDu/sI+J7EyEUMPbOvmAxb7PlzilM=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=

diff --git a/mempool/mempool.go b/mempool/mempool.go
@@ -206,12 +206,15 @@ func (c *ChosMemPool) Realloc(buf []byte, size int) []byte {
 	}
 	newBuf := c.Malloc(size)
 	copy(newBuf, buf)
-	// c.pool.Put(buf)
+	c.pool.Put(buf)
 	return newBuf[:size]
 }
 
 // Free .
 func (c *ChosMemPool) Free(buf []byte) error {
+	if cap(buf) < c.minSize {
+		return nil
+	}
 	atomic.AddInt64(&freeCnt, 1)
 	atomic.AddInt64(&freeCntSize, int64(cap(buf)))
 	c.pool.Put(buf)

diff --git a/nbhttp/server.go b/nbhttp/server.go
@@ -343,9 +343,9 @@ func NewServer(conf Config, handler http.Handler, messageHandlerExecutor func(in
 	// 	return mempool.Malloc(int(conf.ReadBufferSize))
 	// })
 	// g.OnReadBufferFree(func(c *nbio.Conn, buffer []byte) {})
-	// g.OnWriteBufferRelease(func(c *nbio.Conn, buffer []byte) {
-	// 	mempool.Free(buffer)
-	// })
+	g.OnWriteBufferRelease(func(c *nbio.Conn, buffer []byte) {
+		mempool.Free(buffer)
+	})
 
 	g.OnStop(func() {
 		svr._onStop()
@@ -535,9 +535,9 @@ func NewServerTLS(conf Config, handler http.Handler, messageHandlerExecutor func
 	// 	return mempool.Malloc(int(conf.ReadBufferSize))
 	// })
 	// g.OnReadBufferFree(func(c *nbio.Conn, buffer []byte) {})
-	// g.OnWriteBufferRelease(func(c *nbio.Conn, buffer []byte) {
-	// 	mempool.Free(buffer)
-	// })
+	g.OnWriteBufferRelease(func(c *nbio.Conn, buffer []byte) {
+		mempool.Free(buffer)
+	})
 
 	g.OnStop(func() {
 		svr._onStop()