Merge branch 'master' into develop

This commit is contained in:
Andy Pan 2018-10-02 22:39:31 +08:00
commit 418888be9d
2 changed files with 4 additions and 8 deletions

View File

@ -146,10 +146,8 @@ func (p *Pool) ReSize(size int) {
} }
atomic.StoreInt32(&p.capacity, int32(size)) atomic.StoreInt32(&p.capacity, int32(size))
diff := p.Running() - size diff := p.Running() - size
if diff > 0 { for i := 0; i < diff; i++ {
for i := 0; i < diff; i++ { p.getWorker().task <- nil
p.getWorker().task <- nil
}
} }
} }

View File

@ -148,10 +148,8 @@ func (p *PoolWithFunc) ReSize(size int) {
} }
atomic.StoreInt32(&p.capacity, int32(size)) atomic.StoreInt32(&p.capacity, int32(size))
diff := p.Running() - size diff := p.Running() - size
if diff > 0 { for i := 0; i < diff; i++ {
for i := 0; i < diff; i++ { p.getWorker().args <- nil
p.getWorker().args <- nil
}
} }
} }