🙄 Improvement in periodicallyPurge

panjf2000 · Apr 14, 2019 · d6076c0 · d6076c0
1 parent 00294fd
commit d6076c0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/pool.go b/pool.go
@@ -69,13 +69,12 @@ func (p *Pool) periodicallyPurge() {
 	defer heartbeat.Stop()
 
 	for range heartbeat.C {
+		if CLOSED == atomic.LoadInt32(&p.release) {
+			break
+		}
 		currentTime := time.Now()
 		p.lock.Lock()
 		idleWorkers := p.workers
-		if CLOSED == atomic.LoadInt32(&p.release) {
-			p.lock.Unlock()
-			return
-		}
 		n := -1
 		for i, w := range idleWorkers {
 			if currentTime.Sub(w.recycleTime) <= p.expiryDuration {

diff --git a/pool_func.go b/pool_func.go
@@ -72,13 +72,12 @@ func (p *PoolWithFunc) periodicallyPurge() {
 	defer heartbeat.Stop()
 
 	for range heartbeat.C {
+		if CLOSED == atomic.LoadInt32(&p.release) {
+			break
+		}
 		currentTime := time.Now()
 		p.lock.Lock()
 		idleWorkers := p.workers
-		if CLOSED == atomic.LoadInt32(&p.release) {
-			p.lock.Unlock()
-			return
-		}
 		n := -1
 		for i, w := range idleWorkers {
 			if currentTime.Sub(w.recycleTime) <= p.expiryDuration {