mirror
/
ants
mirror of https://github.com/panjf2000/ants.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

opt: calculate the interval for ReleaseTimeout() based on a default count (#327) 

This PR reverts #325 to some extent.
This commit is contained in:
Andy Pan 2024-06-17 20:13:15 +08:00 committed by GitHub
parent b2374d5ae4
commit 3ffd3daa37
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ants.go
View File

@ -97,8 +97,8 @@ var (
) )
const ( const (
nowTimeUpdateInterval = 500 * time.Millisecond nowTimeUpdateInterval = 500 * time.Millisecond
releaseTimeoutInterval = 100 * time.Millisecond releaseTimeoutCount = 10
) )
// Logger is used for logging formatted messages. // Logger is used for logging formatted messages.

3
pool.go
View File

@ -299,6 +299,7 @@ func (p *Pool) ReleaseTimeout(timeout time.Duration) error {
} }
p.Release() p.Release()
interval := timeout / releaseTimeoutCount
endTime := time.Now().Add(timeout) endTime := time.Now().Add(timeout)
for time.Now().Before(endTime) { for time.Now().Before(endTime) {
if p.Running() == 0 && if p.Running() == 0 &&
@ -306,7 +307,7 @@ func (p *Pool) ReleaseTimeout(timeout time.Duration) error {
atomic.LoadInt32(&p.ticktockDone) == 1 { atomic.LoadInt32(&p.ticktockDone) == 1 {
return nil return nil
} }
time.Sleep(releaseTimeoutInterval) time.Sleep(interval)
} }
return ErrTimeout return ErrTimeout
} }

3
pool_func.go
View File

@ -304,6 +304,7 @@ func (p *PoolWithFunc) ReleaseTimeout(timeout time.Duration) error {
} }
p.Release() p.Release()
interval := timeout / releaseTimeoutCount
endTime := time.Now().Add(timeout) endTime := time.Now().Add(timeout)
for time.Now().Before(endTime) { for time.Now().Before(endTime) {
if p.Running() == 0 && if p.Running() == 0 &&
@ -311,7 +312,7 @@ func (p *PoolWithFunc) ReleaseTimeout(timeout time.Duration) error {
atomic.LoadInt32(&p.ticktockDone) == 1 { atomic.LoadInt32(&p.ticktockDone) == 1 {
return nil return nil
} }
time.Sleep(releaseTimeoutInterval) time.Sleep(interval)
} }
return ErrTimeout return ErrTimeout
} }