Merge pull request #4890 from minrk/cleanup-channels

better cleanup channel FDs

IPython/kernel/channels.py

@@ -137,7 +137,23 b' class ZMQSocketChannel(Thread):'
         terminates. :class:`RuntimeError` will be raised if
         :meth:`~threading.Thread.start` is called again.
         """
+        if self.ioloop is not None:
+            self.ioloop.stop()
         self.join()
+        self.close()
+    
+    def close(self):
+        if self.ioloop is not None:
+            try:
+                self.ioloop.close(all_fds=True)
+            except Exception:
+                pass
+        if self.socket is not None:
+            try:
+                self.socket.close(linger=0)
+            except Exception:
+                pass
+            self.socket = None
 
     @property
     def address(self):
@@ -198,15 +214,6 b' class ShellChannel(ZMQSocketChannel):'
         self.stream = zmqstream.ZMQStream(self.socket, self.ioloop)
         self.stream.on_recv(self._handle_recv)
         self._run_loop()
-        try:
-            self.socket.close()
-        except:
-            pass
-
-    def stop(self):
-        """Stop the channel's event loop and join its thread."""
-        self.ioloop.stop()
-        super(ShellChannel, self).stop()
 
     def call_handlers(self, msg):
         """This method is called in the ioloop thread when a message arrives.
@@ -407,15 +414,6 b' class IOPubChannel(ZMQSocketChannel):'
         self.stream = zmqstream.ZMQStream(self.socket, self.ioloop)
         self.stream.on_recv(self._handle_recv)
         self._run_loop()
-        try:
-            self.socket.close()
-        except:
-            pass
-
-    def stop(self):
-        """Stop the channel's event loop and join its thread."""
-        self.ioloop.stop()
-        super(IOPubChannel, self).stop()
 
     def call_handlers(self, msg):
         """This method is called in the ioloop thread when a message arrives.
@@ -475,15 +473,6 b' class StdInChannel(ZMQSocketChannel):'
         self.stream = zmqstream.ZMQStream(self.socket, self.ioloop)
         self.stream.on_recv(self._handle_recv)
         self._run_loop()
-        try:
-            self.socket.close()
-        except:
-            pass
-
-    def stop(self):
-        """Stop the channel's event loop and join its thread."""
-        self.ioloop.stop()
-        super(StdInChannel, self).stop()
 
     def call_handlers(self, msg):
         """This method is called in the ioloop thread when a message arrives.
@@ -603,10 +592,6 b' class HBChannel(ZMQSocketChannel):'
                 # and close/reopen the socket, because the REQ/REP cycle has been broken
                 self._create_socket()
                 continue
-        try:
-            self.socket.close()
-        except:
-            pass
 
     def pause(self):
         """Pause the heartbeat."""

IPython/kernel/manager.py

@@ -246,11 +246,7 b' class KernelManager(LoggingConfigurable, ConnectionFileMixin):'
         self.stop_restarter()
 
         # FIXME: Shutdown does not work on Windows due to ZMQ errors!
-        if sys.platform == 'win32':
-            self._kill_kernel()
-            return
-
-        if now:
+        if now or sys.platform == 'win32':
             if self.has_kernel:
                 self._kill_kernel()
         else:
@@ -273,6 +269,8 b' class KernelManager(LoggingConfigurable, ConnectionFileMixin):'
             self.cleanup_ipc_files()
         else:
             self.cleanup_ipc_files()
+        
+        self._close_control_socket()
 
     def restart_kernel(self, now=False, **kw):
         """Restarts a kernel with the arguments that were used to launch it.