📚Refactor the blocking logic in retrieveWorker function

panjf2000 · Jul 27, 2019 · 61660e2 · 61660e2
1 parent 9cfc9fa
commit 61660e2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 30 deletions.
diff --git a/pool.go b/pool.go
@@ -211,7 +211,6 @@ func (p *Pool) retrieveWorker() *Worker {
 	p.lock.Lock()
 	idleWorkers := p.workers
 	n := len(idleWorkers) - 1
-RESUME:
 	if n >= 0 {
 		w = idleWorkers[n]
 		idleWorkers[n] = nil
@@ -229,21 +228,16 @@ RESUME:
 		}
 		w.run()
 	} else {
-		for {
-			if p.Running() == 0 {
-				goto RESUME
-			}
-			p.cond.Wait()
-			l := len(p.workers) - 1
-			if l < 0 {
-				continue
-			}
-			w = p.workers[l]
-			p.workers[l] = nil
-			p.workers = p.workers[:l]
-			break
+	Reentry:
+		p.cond.Wait()
+		l := len(p.workers) - 1
+		if l < 0 {
+			goto Reentry
 		}
-		p.lock.Unlock()
+		w = p.workers[l]
+		p.workers[l] = nil
+		p.workers = p.workers[:l]
+	p.lock.Unlock()
 	}
 	return w
 }

diff --git a/pool_func.go b/pool_func.go
@@ -216,7 +216,6 @@ func (p *PoolWithFunc) retrieveWorker() *WorkerWithFunc {
 	p.lock.Lock()
 	idleWorkers := p.workers
 	n := len(idleWorkers) - 1
-RESUME:
 	if n >= 0 {
 		w = idleWorkers[n]
 		idleWorkers[n] = nil
@@ -234,21 +233,16 @@ RESUME:
 		}
 		w.run()
 	} else {
-		for {
-			if p.Running() == 0 {
-				goto RESUME
-			}
-			p.cond.Wait()
-			l := len(p.workers) - 1
-			if l < 0 {
-				continue
-			}
-			w = p.workers[l]
-			p.workers[l] = nil
-			p.workers = p.workers[:l]
-			break
+	Reentry:
+		p.cond.Wait()
+		l := len(p.workers) - 1
+		if l < 0 {
+			goto Reentry
 		}
-		p.lock.Unlock()
+		w = p.workers[l]
+		p.workers[l] = nil
+		p.workers = p.workers[:l]
+	p.lock.Unlock()
 	}
 	return w
 }