Merge branch 'develop'

This commit is contained in:
andy pan 2018-06-15 11:27:00 +08:00
commit b92dc131a8
2 changed files with 11 additions and 17 deletions

View File

@ -34,8 +34,8 @@ import (
var sum int32
func myFunc(i interface{}) error {
n := i.(int)
atomic.AddInt32(&sum, int32(n))
n := i.(int32)
atomic.AddInt32(&sum, n)
fmt.Printf("run with %d\n", n)
return nil
}
@ -73,7 +73,7 @@ func main() {
// submit tasks
for i := 0; i < runTimes; i++ {
wg.Add(1)
p.Serve(i)
p.Serve(int32(i))
}
wg.Wait()
fmt.Printf("running goroutines: %d\n", p.Running())

View File

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