From 063e9b206979d1500dd0c68af6f4d3ac327a0e64 Mon Sep 17 00:00:00 2001
From: Kaipeng Deng <dengkaipeng@baidu.com>
Date: Wed, 8 Apr 2020 19:21:32 +0800
Subject: [PATCH] fix threads not exit on ctrl+c (#463)

---
 ppdet/data/parallel_map.py | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/ppdet/data/parallel_map.py b/ppdet/data/parallel_map.py
index c9d74880e..0577d4c1a 100644
--- a/ppdet/data/parallel_map.py
+++ b/ppdet/data/parallel_map.py
@@ -35,6 +35,7 @@ import traceback
 
 logger = logging.getLogger(__name__)
 
+main_pid = os.getpid()
 worker_set = set()
 
 
@@ -131,7 +132,8 @@ class ParallelMap(object):
             self._consumers.append(p)
             p.daemon = True
             setattr(p, 'id', consumer_id)
-            worker_set.add(p)
+            if use_process:
+                worker_set.add(p)
 
         self._epoch = -1
         self._feeding_ev = Event()
@@ -288,12 +290,22 @@ class ParallelMap(object):
 signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
 
 
+# FIXME(dkp): KeyboardInterrupt should be handled inside ParallelMap
+# and do such as: 1. exit workers 2. close queues 3. release shared
+# memory, HACK KeyboardInterrupt with global signal.SIGINT handler
+# here, should be refined later
 def _term_workers(sig_num, frame):
-    global worker_set
-    logger.info("main proc {} exit, kill subprocess {}".format(
-        pid, [w.pid for w in worker_set]))
+    global worker_set, main_pid
+    # only do subporcess killing in main process
+    if os.getpid() != main_pid:
+        return
+
+    logger.info("KeyboardInterrupt: main proc {} exit, kill subprocess {}" \
+                .format(os.getpid(), [w.pid for w in worker_set]))
     for w in worker_set:
-        os.kill(w, signal.SIGKILL)
+        if w.pid is not None:
+            os.kill(w.pid, signal.SIGINT)
+    sys.exit()
 
 
 signal.signal(signal.SIGINT, _term_workers)
-- 
GitLab