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

Merge branch 'develop'

This commit is contained in:
andy pan 2018-06-15 11:28:33 +08:00
parent b92dc131a8 8c76e9fa87
commit d172d8355e
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pool_func.go
View File

@ -145,6 +145,7 @@ func (p *PoolWithFunc) getWorker() *WorkerWithFunc {
p.running++ p.running++
} }
} else { } else {
<-p.freeSignal
w = workers[n] w = workers[n]
workers[n] = nil workers[n] = nil
p.workers = workers[:n] p.workers = workers[:n]
@ -153,20 +154,13 @@ func (p *PoolWithFunc) getWorker() *WorkerWithFunc {
if waiting { if waiting {
<-p.freeSignal <-p.freeSignal
for {
p.lock.Lock() p.lock.Lock()
workers = p.workers workers = p.workers
l := len(workers) - 1 l := len(workers) - 1
if l < 0 {
p.lock.Unlock()
continue
}
w = workers[l] w = workers[l]
workers[l] = nil workers[l] = nil
p.workers = workers[:l] p.workers = workers[:l]
p.lock.Unlock() p.lock.Unlock()
break
}
} else if w == nil { } else if w == nil {
w = &WorkerWithFunc{ w = &WorkerWithFunc{
pool: p, pool: p,