From 634682856f3cde7412f0e77b4859ea18218c4af6 Mon Sep 17 00:00:00 2001
From: Andy Pan <panjf2000@gmail.com>
Date: Tue, 24 Jul 2018 22:30:37 +0800
Subject: [PATCH] Merge branch 'develop'

---
 pool.go      | 50 ++++++++++++++++++++++++--------------------------
 pool_func.go | 50 ++++++++++++++++++++++++--------------------------
 2 files changed, 48 insertions(+), 52 deletions(-)

diff --git a/pool.go b/pool.go
index 8b87400..aec9573 100644
--- a/pool.go
+++ b/pool.go
@@ -63,32 +63,30 @@ type Pool struct {
 
 func (p *Pool) periodicallyPurge() {
 	heartbeat := time.NewTicker(p.expiryDuration)
-	go func() {
-		for range heartbeat.C {
-			currentTime := time.Now()
-			p.lock.Lock()
-			idleWorkers := p.workers
-			if len(idleWorkers) == 0 && p.Running() == 0 && len(p.release) > 0 {
-				p.lock.Unlock()
-				return
-			}
-			n := 0
-			for i, w := range idleWorkers {
-				if currentTime.Sub(w.recycleTime) <= p.expiryDuration {
-					break
-				}
-				n = i
-				<-p.freeSignal
-				w.task <- nil
-				idleWorkers[i] = nil
-			}
-			if n > 0 {
-				n++
-				p.workers = idleWorkers[n:]
-			}
+	for range heartbeat.C {
+		currentTime := time.Now()
+		p.lock.Lock()
+		idleWorkers := p.workers
+		if len(idleWorkers) == 0 && p.Running() == 0 && len(p.release) > 0 {
 			p.lock.Unlock()
+			return
 		}
-	}()
+		n := 0
+		for i, w := range idleWorkers {
+			if currentTime.Sub(w.recycleTime) <= p.expiryDuration {
+				break
+			}
+			n = i
+			<-p.freeSignal
+			w.task <- nil
+			idleWorkers[i] = nil
+		}
+		if n > 0 {
+			n++
+			p.workers = idleWorkers[n:]
+		}
+		p.lock.Unlock()
+	}
 }
 
 // NewPool generates a instance of ants pool
@@ -110,7 +108,7 @@ func NewTimingPool(size, expiry int) (*Pool, error) {
 		release:        make(chan sig, 1),
 		expiryDuration: time.Duration(expiry) * time.Second,
 	}
-	p.periodicallyPurge()
+	go p.periodicallyPurge()
 	return p, nil
 }
 
@@ -208,7 +206,7 @@ func (p *Pool) getWorker() *Worker {
 	} else if w == nil {
 		w = &Worker{
 			pool: p,
-			task: make(chan f),
+			task: make(chan f, 1),
 		}
 		w.run()
 	}
diff --git a/pool_func.go b/pool_func.go
index b469b0e..c3f20a7 100644
--- a/pool_func.go
+++ b/pool_func.go
@@ -64,32 +64,30 @@ type PoolWithFunc struct {
 
 func (p *PoolWithFunc) periodicallyPurge() {
 	heartbeat := time.NewTicker(p.expiryDuration)
-	go func() {
-		for range heartbeat.C {
-			currentTime := time.Now()
-			p.lock.Lock()
-			idleWorkers := p.workers
-			if len(idleWorkers) == 0 && p.Running() == 0 && len(p.release) > 0 {
-				p.lock.Unlock()
-				return
-			}
-			n := 0
-			for i, w := range idleWorkers {
-				if currentTime.Sub(w.recycleTime) <= p.expiryDuration {
-					break
-				}
-				n = i
-				<-p.freeSignal
-				w.args <- nil
-				idleWorkers[i] = nil
-			}
-			if n > 0 {
-				n++
-				p.workers = idleWorkers[n:]
-			}
+	for range heartbeat.C {
+		currentTime := time.Now()
+		p.lock.Lock()
+		idleWorkers := p.workers
+		if len(idleWorkers) == 0 && p.Running() == 0 && len(p.release) > 0 {
 			p.lock.Unlock()
+			return
 		}
-	}()
+		n := 0
+		for i, w := range idleWorkers {
+			if currentTime.Sub(w.recycleTime) <= p.expiryDuration {
+				break
+			}
+			n = i
+			<-p.freeSignal
+			w.args <- nil
+			idleWorkers[i] = nil
+		}
+		if n > 0 {
+			n++
+			p.workers = idleWorkers[n:]
+		}
+		p.lock.Unlock()
+	}
 }
 
 // NewPoolWithFunc generates a instance of ants pool with a specific function
@@ -112,7 +110,7 @@ func NewTimingPoolWithFunc(size, expiry int, f pf) (*PoolWithFunc, error) {
 		expiryDuration: time.Duration(expiry) * time.Second,
 		poolFunc:       f,
 	}
-	p.periodicallyPurge()
+	go p.periodicallyPurge()
 	return p, nil
 }
 
@@ -213,7 +211,7 @@ func (p *PoolWithFunc) getWorker() *WorkerWithFunc {
 	} else if w == nil {
 		w = &WorkerWithFunc{
 			pool: p,
-			args: make(chan interface{}),
+			args: make(chan interface{}, 1),
 		}
 		w.run()
 	}