refactor: eliminate the local function spawnWorker() and use the code…

… directly below p.Cap().
panjf2000 · Sep 17, 2023 · a92f6c8 · a92f6c8
1 parent 690300f
commit a92f6c8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/pool.go b/pool.go
@@ -333,11 +333,6 @@ func (p *Pool) addWaiting(delta int) {
 
 // retrieveWorker returns an available worker to run the tasks.
 func (p *Pool) retrieveWorker() (w worker) {
-	spawnWorker := func() {
-		w = p.workerCache.Get().(*goWorker)
-		w.run()
-	}
-
 	p.lock.Lock()
 
 retry:
@@ -351,7 +346,8 @@ retry:
 	// then just spawn a new worker goroutine.
 	if capacity := p.Cap(); capacity == -1 || capacity > p.Running() {
 		p.lock.Unlock()
-		spawnWorker()
+		w = p.workerCache.Get().(*goWorker)
+		w.run()
 		return
 	}
 

diff --git a/pool_func.go b/pool_func.go
@@ -339,11 +339,6 @@ func (p *PoolWithFunc) addWaiting(delta int) {
 
 // retrieveWorker returns an available worker to run the tasks.
 func (p *PoolWithFunc) retrieveWorker() (w worker) {
-	spawnWorker := func() {
-		w = p.workerCache.Get().(*goWorkerWithFunc)
-		w.run()
-	}
-
 	p.lock.Lock()
 
 retry:
@@ -357,7 +352,8 @@ retry:
 	// then just spawn a new worker goroutine.
 	if capacity := p.Cap(); capacity == -1 || capacity > p.Running() {
 		p.lock.Unlock()
-		spawnWorker()
+		w = p.workerCache.Get().(*goWorkerWithFunc)
+		w.run()
 		return
 	}