refactor: combine two conditions into one.

panjf2000 · Sep 17, 2023 · 690300f · 690300f
1 parent d9bfc03
commit 690300f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/pool.go b/pool.go
@@ -355,17 +355,13 @@ retry:
 		return
 	}
 
-	// Otherwise, we'll have to keep them blocked and wait for at least one worker to be put back into pool.
-	if p.options.Nonblocking {
-		p.lock.Unlock()
-		return
-	}
-
-	if p.options.MaxBlockingTasks != 0 && p.Waiting() >= p.options.MaxBlockingTasks {
+	// Bail out early if it's in nonblocking mode or the number of pending callers reaches the maximum limit value.
+	if p.options.Nonblocking || (p.options.MaxBlockingTasks != 0 && p.Waiting() >= p.options.MaxBlockingTasks) {
 		p.lock.Unlock()
 		return
 	}
 
+	// Otherwise, we'll have to keep them blocked and wait for at least one worker to be put back into pool.
 	p.addWaiting(1)
 	p.cond.Wait() // block and wait for an available worker
 	p.addWaiting(-1)

diff --git a/pool_func.go b/pool_func.go
@@ -361,17 +361,13 @@ retry:
 		return
 	}
 
-	// Otherwise, we'll have to keep them blocked and wait for at least one worker to be put back into pool.
-	if p.options.Nonblocking {
-		p.lock.Unlock()
-		return
-	}
-
-	if p.options.MaxBlockingTasks != 0 && p.Waiting() >= p.options.MaxBlockingTasks {
+	// Bail out early if it's in nonblocking mode or the number of pending callers reaches the maximum limit value.
+	if p.options.Nonblocking || (p.options.MaxBlockingTasks != 0 && p.Waiting() >= p.options.MaxBlockingTasks) {
 		p.lock.Unlock()
 		return
 	}
 
+	// Otherwise, we'll have to keep them blocked and wait for at least one worker to be put back into pool.
 	p.addWaiting(1)
 	p.cond.Wait() // block and wait for an available worker
 	p.addWaiting(-1)