forsakenfirer/ants
1
0
Fork 0
mirror of https://github.com/panjf2000/ants.git synced 2025-12-16 18:11:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: rename the internal method in workerQueue

Browse Source
This commit is contained in:
Andy Pan 2023-04-04 13:01:14 +08:00
parent 650c9db322
commit 73defa0289
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pool.go
View File

@ -91,7 +91,7 @@ func (p *Pool) purgeStaleWorkers(ctx context.Context) {
} }
p.lock.Lock() p.lock.Lock()
staleWorkers := p.workers.staleWorkers(p.options.ExpiryDuration) staleWorkers := p.workers.refresh(p.options.ExpiryDuration)
p.lock.Unlock() p.lock.Unlock()
// Notify obsolete workers to stop. // Notify obsolete workers to stop.

2
pool_func.go
View File

@ -92,7 +92,7 @@ func (p *PoolWithFunc) purgeStaleWorkers(ctx context.Context) {
} }
p.lock.Lock() p.lock.Lock()
staleWorkers := p.workers.staleWorkers(p.options.ExpiryDuration) staleWorkers := p.workers.refresh(p.options.ExpiryDuration)
p.lock.Unlock() p.lock.Unlock()
// Notify obsolete workers to stop. // Notify obsolete workers to stop.

2
worker_loop_queue.go
View File

@ -78,7 +78,7 @@ func (wq *loopQueue) detach() worker {
return w return w
} }
func (wq *loopQueue) staleWorkers(duration time.Duration) []worker { func (wq *loopQueue) refresh(duration time.Duration) []worker {
expiryTime := time.Now().Add(-duration) expiryTime := time.Now().Add(-duration)
index := wq.binarySearch(expiryTime) index := wq.binarySearch(expiryTime)
if index == -1 { if index == -1 {

8
worker_loop_queue_test.go
View File

@ -45,7 +45,7 @@ func TestLoopQueue(t *testing.T) {
err := q.insert(&goWorker{lastUsed: time.Now()}) err := q.insert(&goWorker{lastUsed: time.Now()})
assert.Error(t, err, "Enqueue, error") assert.Error(t, err, "Enqueue, error")
q.staleWorkers(time.Second) q.refresh(time.Second)
assert.EqualValuesf(t, 6, q.len(), "Len error: %d", q.len()) assert.EqualValuesf(t, 6, q.len(), "Len error: %d", q.len())
} }
@ -138,7 +138,7 @@ func TestRetrieveExpiry(t *testing.T) {
for i := 0; i < size/2; i++ { for i := 0; i < size/2; i++ {
_ = q.insert(&goWorker{lastUsed: time.Now()}) _ = q.insert(&goWorker{lastUsed: time.Now()})
} }
workers := q.staleWorkers(u) workers := q.refresh(u)
assert.EqualValues(t, expirew, workers, "expired workers aren't right") assert.EqualValues(t, expirew, workers, "expired workers aren't right")
@ -151,7 +151,7 @@ func TestRetrieveExpiry(t *testing.T) {
expirew = expirew[:0] expirew = expirew[:0]
expirew = append(expirew, q.items[size/2:]...) expirew = append(expirew, q.items[size/2:]...)
workers2 := q.staleWorkers(u) workers2 := q.refresh(u)
assert.EqualValues(t, expirew, workers2, "expired workers aren't right") assert.EqualValues(t, expirew, workers2, "expired workers aren't right")
@ -171,7 +171,7 @@ func TestRetrieveExpiry(t *testing.T) {
expirew = append(expirew, q.items[0:3]...) expirew = append(expirew, q.items[0:3]...)
expirew = append(expirew, q.items[size/2:]...) expirew = append(expirew, q.items[size/2:]...)
workers3 := q.staleWorkers(u) workers3 := q.refresh(u)
assert.EqualValues(t, expirew, workers3, "expired workers aren't right") assert.EqualValues(t, expirew, workers3, "expired workers aren't right")
} }

2
worker_queue.go
View File

@ -26,7 +26,7 @@ type workerQueue interface {
isEmpty() bool isEmpty() bool
insert(worker) error insert(worker) error
detach() worker detach() worker
staleWorkers(duration time.Duration) []worker refresh(duration time.Duration) []worker // clean up the stale workers and return them
reset() reset()
} }

2
worker_stack.go
View File

@ -39,7 +39,7 @@ func (wq *workerStack) detach() worker {
return w return w
} }
func (wq *workerStack) staleWorkers(duration time.Duration) []worker { func (wq *workerStack) refresh(duration time.Duration) []worker {
n := wq.len() n := wq.len()
if n == 0 { if n == 0 {
return nil return nil

2
worker_stack_test.go
View File

@ -45,7 +45,7 @@ func TestWorkerStack(t *testing.T) {
} }
} }
assert.EqualValues(t, 12, q.len(), "Len error") assert.EqualValues(t, 12, q.len(), "Len error")
q.staleWorkers(time.Second) q.refresh(time.Second)
assert.EqualValues(t, 6, q.len(), "Len error") assert.EqualValues(t, 6, q.len(), "Len error")
} }