From 14f98775bb8fc19c5a138ed3e42ef1bcfa81d12b Mon Sep 17 00:00:00 2001 From: anutosh491 Date: Tue, 26 Mar 2024 14:48:42 +0530 Subject: [PATCH] Addressed the reviews --- include/xeus-zmq/xclient_zmq.hpp | 1 + src/xclient_zmq.cpp | 5 +++++ src/xclient_zmq_impl.cpp | 7 +------ src/xclient_zmq_impl.hpp | 1 - xeus-zmqConfig.cmake.in | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/xeus-zmq/xclient_zmq.hpp b/include/xeus-zmq/xclient_zmq.hpp index cd2274c..9eed125 100644 --- a/include/xeus-zmq/xclient_zmq.hpp +++ b/include/xeus-zmq/xclient_zmq.hpp @@ -47,6 +47,7 @@ namespace xeus void notify_control_listener(xmessage msg); void notify_iopub_listener(xmessage msg); + std::size_t iopub_queue_size() const; std::optional pop_iopub_message(); void connect(); void stop_channels(); diff --git a/src/xclient_zmq.cpp b/src/xclient_zmq.cpp index 8f09cb3..ad9dc54 100644 --- a/src/xclient_zmq.cpp +++ b/src/xclient_zmq.cpp @@ -73,6 +73,11 @@ namespace xeus p_client_impl->notify_iopub_listener(std::move(msg)); } + std::size_t xclient_zmq::iopub_queue_size() const + { + return p_client_impl->iopub_queue_size(); + } + std::optional xclient_zmq::pop_iopub_message() { return p_client_impl->pop_iopub_message(); diff --git a/src/xclient_zmq_impl.cpp b/src/xclient_zmq_impl.cpp index edc7fc1..699ade0 100644 --- a/src/xclient_zmq_impl.cpp +++ b/src/xclient_zmq_impl.cpp @@ -93,11 +93,6 @@ namespace xeus m_iopub_listener = l; } - xclient_messenger& xclient_zmq_impl::get_client_messenger() - { - return p_messenger; - } - void xclient_zmq_impl::connect() { p_messenger.connect(); @@ -171,7 +166,7 @@ namespace xeus void xclient_zmq_impl::start() { start_iopub_thread(); - // TODO + // TODO : Introduce a client, xheartbeat_client that runs on its own thread, m_heartbeat_thread. } void xclient_zmq_impl::start_iopub_thread() diff --git a/src/xclient_zmq_impl.hpp b/src/xclient_zmq_impl.hpp index c85f4d2..30cfdcb 100644 --- a/src/xclient_zmq_impl.hpp +++ b/src/xclient_zmq_impl.hpp @@ -64,7 +64,6 @@ namespace xeus // TODO // client messenger - xclient_messenger& get_client_messenger(); void connect(); void stop_channels(); diff --git a/xeus-zmqConfig.cmake.in b/xeus-zmqConfig.cmake.in index b858e13..66bc431 100644 --- a/xeus-zmqConfig.cmake.in +++ b/xeus-zmqConfig.cmake.in @@ -22,7 +22,7 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR};${CMAKE_MODULE_PATH}") @XEUS_ZMQ_CONFIG_CODE@ include(CMakeFindDependencyMacro) -find_dependency(nlohmann_json @nlohmann_json_REQUIRED_VERSION@ EXACT) +find_dependency(nlohmann_json @nlohmann_json_VERSION@ EXACT) find_dependency(xeus @xeus_REQUIRED_VERSION@) # On Unix platforms, ZeroMQ is built with autotools and pkg-config is