simplify and optimize goroutine-worker

This commit is contained in:
Andy Pan 2018-07-15 00:52:18 +08:00
parent ebb86ab67f
commit 3afa151dd9
2 changed files with 4 additions and 14 deletions

View File

@ -74,7 +74,7 @@ func (p *Pool) monitorAndClear() {
break break
} }
n = i n = i
w.stop() w.task <- nil
idleWorkers[i] = nil idleWorkers[i] = nil
p.running-- p.running--
} }
@ -118,7 +118,7 @@ func (p *Pool) Submit(task f) error {
return ErrPoolClosed return ErrPoolClosed
} }
w := p.getWorker() w := p.getWorker()
w.sendTask(task) w.task <- task
return nil return nil
} }
@ -143,7 +143,7 @@ func (p *Pool) Release() error {
p.release <- sig{} p.release <- sig{}
running := p.Running() running := p.Running()
for i := 0; i < running; i++ { for i := 0; i < running; i++ {
p.getWorker().stop() p.getWorker().task <- nil
} }
for i := range p.workers { for i := range p.workers {
p.workers[i] = nil p.workers[i] = nil
@ -157,7 +157,7 @@ func (p *Pool) ReSize(size int) {
if size < p.Cap() { if size < p.Cap() {
diff := p.Cap() - size diff := p.Cap() - size
for i := 0; i < diff; i++ { for i := 0; i < diff; i++ {
p.getWorker().stop() p.getWorker().task <- nil
} }
} else if size == p.Cap() { } else if size == p.Cap() {
return return

View File

@ -56,13 +56,3 @@ func (w *Worker) run() {
} }
}() }()
} }
// stop this worker.
func (w *Worker) stop() {
w.sendTask(nil)
}
// sendTask sends a task to this worker.
func (w *Worker) sendTask(task f) {
w.task <- task
}