Skip to content

publish IOPub from a background thread #85

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

Merged
takluyver merged 13 commits into from
Jan 19, 2016
+266 −145
Merged

publish IOPub from a background thread #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b511a66
publish IOPub from a background thread
minrk Dec 8, 2015
76c78dc
flush-scheduling fixes
minrk Dec 9, 2015
5078b5c
backward-compat: handle IOStream created from regular socket
minrk Dec 18, 2015
35c68c4
Don't make `pipe=True` the default on IOThread
minrk Dec 21, 2015
f15d8b0
Don't need special iostream for inprocess anymore
minrk Dec 21, 2015
86517b2
call_later is new in tornado 4
minrk Dec 21, 2015
f30a648
add wait in subprocess print test
minrk Dec 21, 2015
ca35389
log failure to write on output pipe
minrk Dec 21, 2015
f11b49f
pass iopub_thread handle to Kernel
minrk Jan 19, 2016
7868e68
deprecate passthrough Socket attr-access on BackgroundSocket
minrk Jan 19, 2016
eed48d2
use iopub_thread API in inprocess kernel
minrk Jan 19, 2016
4c7611b
require tornado 4.0 for call_later
minrk Jan 19, 2016
ce94ffe
IOStream review
minrk Jan 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions ipykernel/inprocess/ipkernel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
from ipykernel.zmqshell import ZMQInteractiveShell

from .socket import DummySocket
from ..iostream import OutStream, BackgroundSocket, IOPubThread

#-----------------------------------------------------------------------------
# Main kernel class
Expand Down Expand Up @@ -49,13 +50,23 @@ class InProcessKernel(IPythonKernel):
shell_class = Type(allow_none=True)
shell_streams = List()
control_stream = Any()
iopub_socket = Instance(DummySocket, ())
_underlying_iopub_socket = Instance(DummySocket, ())
iopub_thread = Instance(IOPubThread)
def _iopub_thread_default(self):
thread = IOPubThread(self._underlying_iopub_socket)
thread.start()
return thread

iopub_socket = Instance(BackgroundSocket)
def _iopub_socket_default(self):
return self.iopub_thread.background_socket

stdin_socket = Instance(DummySocket, ())

def __init__(self, **traits):
super(InProcessKernel, self).__init__(**traits)

self.iopub_socket.on_trait_change(self._io_dispatch, 'message_sent')
self._underlying_iopub_socket.on_trait_change(self._io_dispatch, 'message_sent')
self.shell.kernel = self

def execute_request(self, stream, ident, parent):
Expand Down Expand Up @@ -128,12 +139,10 @@ def _shell_class_default(self):
return InProcessInteractiveShell

def _stdout_default(self):
from ipykernel.iostream import OutStream
return OutStream(self.session, self.iopub_socket, u'stdout', pipe=False)
return OutStream(self.session, self.iopub_thread, u'stdout')

def _stderr_default(self):
from ipykernel.iostream import OutStream
return OutStream(self.session, self.iopub_socket, u'stderr', pipe=False)
return OutStream(self.session, self.iopub_thread, u'stderr')

#-----------------------------------------------------------------------------
# Interactive shell subclass
Expand Down
Loading