opt: fix the potential goroutine leak after calling Release() (#287)

Co-authored-by: EL <evnldn9321@gmail.com>
panjf2000 · Jul 6, 2023 · 2806c4a · 2806c4a
1 parent 45a0390
commit 2806c4a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/pool.go b/pool.go
@@ -276,6 +276,14 @@ func (p *Pool) Release() {
 	if !atomic.CompareAndSwapInt32(&p.state, OPENED, CLOSED) {
 		return
 	}
+
+	if p.stopPurge != nil {
+		p.stopPurge()
+		p.stopPurge = nil
+	}
+	p.stopTicktock()
+	p.stopTicktock = nil
+
 	p.lock.Lock()
 	p.workers.reset()
 	p.lock.Unlock()
@@ -289,13 +297,6 @@ func (p *Pool) ReleaseTimeout(timeout time.Duration) error {
 	if p.IsClosed() || (!p.options.DisablePurge && p.stopPurge == nil) || p.stopTicktock == nil {
 		return ErrPoolClosed
 	}
-
-	if p.stopPurge != nil {
-		p.stopPurge()
-		p.stopPurge = nil
-	}
-	p.stopTicktock()
-	p.stopTicktock = nil
 	p.Release()
 
 	endTime := time.Now().Add(timeout)

diff --git a/pool_func.go b/pool_func.go
@@ -282,6 +282,14 @@ func (p *PoolWithFunc) Release() {
 	if !atomic.CompareAndSwapInt32(&p.state, OPENED, CLOSED) {
 		return
 	}
+
+	if p.stopPurge != nil {
+		p.stopPurge()
+		p.stopPurge = nil
+	}
+	p.stopTicktock()
+	p.stopTicktock = nil
+
 	p.lock.Lock()
 	p.workers.reset()
 	p.lock.Unlock()
@@ -295,13 +303,6 @@ func (p *PoolWithFunc) ReleaseTimeout(timeout time.Duration) error {
 	if p.IsClosed() || (!p.options.DisablePurge && p.stopPurge == nil) || p.stopTicktock == nil {
 		return ErrPoolClosed
 	}
-
-	if p.stopPurge != nil {
-		p.stopPurge()
-		p.stopPurge = nil
-	}
-	p.stopTicktock()
-	p.stopTicktock = nil
 	p.Release()
 
 	endTime := time.Now().Add(timeout)