opt: calculate the interval for ReleaseTimeout() based on a default c…

…ount This PR reverts #325 to some extent.
panjf2000 · Jun 17, 2024 · 7e41896 · 7e41896
1 parent b2374d5
commit 7e41896
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/ants.go b/ants.go
@@ -97,8 +97,8 @@ var (
 )
 
 const (
-	nowTimeUpdateInterval  = 500 * time.Millisecond
-	releaseTimeoutInterval = 100 * time.Millisecond
+	nowTimeUpdateInterval = 500 * time.Millisecond
+	releaseTimeoutCount   = 10
 )
 
 // Logger is used for logging formatted messages.

diff --git a/pool.go b/pool.go
@@ -299,14 +299,15 @@ func (p *Pool) ReleaseTimeout(timeout time.Duration) error {
 	}
 	p.Release()
 
+	interval := timeout / releaseTimeoutCount
 	endTime := time.Now().Add(timeout)
 	for time.Now().Before(endTime) {
 		if p.Running() == 0 &&
 			(p.options.DisablePurge || atomic.LoadInt32(&p.purgeDone) == 1) &&
 			atomic.LoadInt32(&p.ticktockDone) == 1 {
 			return nil
 		}
-		time.Sleep(releaseTimeoutInterval)
+		time.Sleep(interval)
 	}
 	return ErrTimeout
 }

diff --git a/pool_func.go b/pool_func.go
@@ -304,14 +304,15 @@ func (p *PoolWithFunc) ReleaseTimeout(timeout time.Duration) error {
 	}
 	p.Release()
 
+	interval := timeout / releaseTimeoutCount
 	endTime := time.Now().Add(timeout)
 	for time.Now().Before(endTime) {
 		if p.Running() == 0 &&
 			(p.options.DisablePurge || atomic.LoadInt32(&p.purgeDone) == 1) &&
 			atomic.LoadInt32(&p.ticktockDone) == 1 {
 			return nil
 		}
-		time.Sleep(releaseTimeoutInterval)
+		time.Sleep(interval)
 	}
 	return ErrTimeout
 }