Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Block until kernel termination after sending a kill signal #2369

Merged
merged 1 commit into from
Sep 27, 2012
Merged

Block until kernel termination after sending a kill signal #2369

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 20 additions & 8 deletions IPython/zmq/kernelmanager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -812,8 +812,9 @@ def start_kernel(self, **kw):
self.kernel = launch_kernel(fname=self.connection_file, **kw)

def shutdown_kernel(self, restart=False):
""" Attempts to the stop the kernel process cleanly. If the kernel
cannot be stopped, it is killed, if possible.
""" Attempts to the stop the kernel process cleanly.

If the kernel cannot be stopped and the kernel is local, it is killed.
"""
# FIXME: Shutdown does not work on Windows due to ZMQ errors!
if sys.platform == 'win32':
Expand Down Expand Up @@ -894,13 +895,17 @@ def has_kernel(self):
return self.kernel is not None

def kill_kernel(self):
""" Kill the running kernel. """
""" Kill the running kernel.

This method blocks until the kernel process has terminated.
"""
if self.has_kernel:
# Pause the heart beat channel if it exists.
if self._hb_channel is not None:
self._hb_channel.pause()

# Attempt to kill the kernel.
# Signal the kernel to terminate (sends SIGKILL on Unix and calls
# TerminateProcess() on Win32).
try:
self.kernel.kill()
except OSError as e:
Expand All @@ -915,13 +920,18 @@ def kill_kernel(self):
from errno import ESRCH
if e.errno != ESRCH:
raise

# Block until the kernel terminates.
self.kernel.wait()
self.kernel = None
else:
raise RuntimeError("Cannot kill kernel. No kernel is running!")

def interrupt_kernel(self):
""" Interrupts the kernel. Unlike ``signal_kernel``, this operation is
well supported on all platforms.
""" Interrupts the kernel.

Unlike ``signal_kernel``, this operation is well supported on all
platforms.
"""
if self.has_kernel:
if sys.platform == 'win32':
Expand All @@ -933,8 +943,10 @@ def interrupt_kernel(self):
raise RuntimeError("Cannot interrupt kernel. No kernel is running!")

def signal_kernel(self, signum):
""" Sends a signal to the kernel. Note that since only SIGTERM is
supported on Windows, this function is only useful on Unix systems.
""" Sends a signal to the kernel.

Note that since only SIGTERM is supported on Windows, this function is
only useful on Unix systems.
"""
if self.has_kernel:
self.kernel.send_signal(signum)
Expand Down