Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 8 additions & 1 deletion ipykernel/comm/comm.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# Copyright (c) IPython Development Team.
# Distributed under the terms of the Modified BSD License.

import threading
import uuid
from typing import Optional
from warnings import warn
Expand All @@ -11,6 +12,7 @@
import traitlets.config
from traitlets import Bool, Bytes, Instance, Unicode, default

from ipykernel.control import CONTROL_THREAD_NAME
from ipykernel.jsonutil import json_clean
from ipykernel.kernelbase import Kernel

Expand All @@ -30,6 +32,11 @@ def publish_msg(self, msg_type, data=None, metadata=None, buffers=None, **keys):
metadata = {} if metadata is None else metadata
content = json_clean(dict(data=data, comm_id=self.comm_id, **keys))

if threading.current_thread().name == CONTROL_THREAD_NAME:
channel_from_which_to_get_parent_header = "control"
else:
channel_from_which_to_get_parent_header = "shell"

if self.kernel is None:
self.kernel = Kernel.instance()

Expand All @@ -38,7 +45,7 @@ def publish_msg(self, msg_type, data=None, metadata=None, buffers=None, **keys):
msg_type,
content,
metadata=json_clean(metadata),
parent=self.kernel.get_parent("shell"),
parent=self.kernel.get_parent(channel_from_which_to_get_parent_header),
ident=self.topic,
buffers=buffers,
)
Expand Down
6 changes: 4 additions & 2 deletions ipykernel/control.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,22 @@

from tornado.ioloop import IOLoop

CONTROL_THREAD_NAME = "Control"


class ControlThread(Thread):
"""A thread for a control channel."""

def __init__(self, **kwargs):
"""Initialize the thread."""
Thread.__init__(self, name="Control", **kwargs)
Thread.__init__(self, name=CONTROL_THREAD_NAME, **kwargs)
self.io_loop = IOLoop(make_current=False)
self.pydev_do_not_trace = True
self.is_pydev_daemon_thread = True

def run(self):
"""Run the thread."""
self.name = "Control"
self.name = CONTROL_THREAD_NAME
try:
self.io_loop.start()
finally:
Expand Down