Merge lp:~asac/lava-dispatcher/send-signal-for-fastmodel-shutdown into lp:lava-dispatcher

[Alexander Sack]

I sometimes overserved problems of fast models not shutting down when using the "pexpect.close(...)" feature.

This change uses SIGINT and SIGKILL to shut down RTSM; the draining thread for the fastmodel process will die automatically once RTSM process closes its IO.

Unmerged revisions

373. By Alexander Sack on 2012-08-20

implement killing RTSM process gracefully from mainthread by sending SIGINT and SIGKILL

=== modified file 'lava_dispatcher/client/fastmodel.py'
--- lava_dispatcher/client/fastmodel.py	2012-08-10 15:25:36 +0000
+++ lava_dispatcher/client/fastmodel.py	2012-08-20 12:23:01 +0000
@@ -29,6 +29,8 @@
 import stat
 import threading
 import time
+import sys
+import signal
 
 from lava_dispatcher.client.base import (
     CommandRunner,
@@ -215,11 +217,35 @@
             self._sim_binary, self._axf, self._sd_image, options)
 
     def _stop(self):
-        if self.proc is not None:
-            self.proc.close()
-        if self._sim_proc is not None:
-            self._sim_proc.close()
-
+        if self._sim_proc is None or self.proc is None:
+            return
+        __pid = self._sim_proc.pid
+        try:
+            os.kill (__pid, signal.SIGINT)
+        except:
+            logging.info ("Error terminating process: %s", sys.exc_info())
+        for i in range(30):
+            time.sleep(2)
+            try:
+                os.kill(__pid, 0)
+                logging.info ("FastModel pid(%d) still needs to shutdown..." % __pid)
+            except:
+                logging.info ("FastModel done!")
+                return
+            logging.warn ("FastModel failed to shut down ... continuing anyway!")
+
+        try:
+            logging.warn ("FastModel failed to shut down ... giving up; sending SIGKILL!")
+            os.kill (__pid, signal.SIGKILL)
+        except:
+            logging.info ("Error killing process: %s", sys.exc_info())
+
+        try:
+            self.proc.close(True)
+        except:
+            logging.info ("Error closing telnet session: %s", sys.exc_info())
+
+ 
     def _drain_sim_proc(self):
         '''pexpect will continue to get data for the simproc process. We need
         to keep this pipe drained so that it won't get full and then stop block