worker: decRunning when revertWorker is false

Signed-off-by: Cholerae Hu <[email protected]>
panjf2000 · Sep 12, 2019 · d6cd5a7 · d6cd5a7
1 parent 280ac34
commit d6cd5a7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/worker.go b/worker.go
@@ -48,9 +48,8 @@ func (w *goWorker) run() {
 	w.pool.incRunning()
 	go func() {
 		defer func() {
+			w.pool.decRunning()
 			if p := recover(); p != nil {
-				w.pool.decRunning()
-				w.pool.workerCache.Put(w)
 				if w.pool.panicHandler != nil {
 					w.pool.panicHandler(p)
 				} else {
@@ -60,17 +59,16 @@ func (w *goWorker) run() {
 					log.Printf("worker exits from panic: %s\n", string(buf[:n]))
 				}
 			}
+			w.pool.workerCache.Put(w)
 		}()
 
 		for f := range w.task {
 			if f == nil {
-				w.pool.decRunning()
-				w.pool.workerCache.Put(w)
 				return
 			}
 			f()
 			if ok := w.pool.revertWorker(w); !ok {
-				break
+				return
 			}
 		}
 	}()

diff --git a/worker_func.go b/worker_func.go
@@ -48,9 +48,8 @@ func (w *goWorkerWithFunc) run() {
 	w.pool.incRunning()
 	go func() {
 		defer func() {
+			w.pool.decRunning()
 			if p := recover(); p != nil {
-				w.pool.decRunning()
-				w.pool.workerCache.Put(w)
 				if w.pool.panicHandler != nil {
 					w.pool.panicHandler(p)
 				} else {
@@ -60,17 +59,16 @@ func (w *goWorkerWithFunc) run() {
 					log.Printf("worker with func exits from panic: %s\n", string(buf[:n]))
 				}
 			}
+			w.pool.workerCache.Put(w)
 		}()
 
 		for args := range w.args {
 			if args == nil {
-				w.pool.decRunning()
-				w.pool.workerCache.Put(w)
 				return
 			}
 			w.pool.poolFunc(args)
 			if ok := w.pool.revertWorker(w); !ok {
-				break
+				return
 			}
 		}
 	}()