Merge pull request #43 from JohanMabille/middleware_impl

Moved zmq dependent part of xmiddleware to src
jupyter-xeus · Apr 11, 2024 · b33fd19 · b33fd19
2 parents f1c73eb + 8712151
commit b33fd19
Show file tree

Hide file tree

Showing 11 changed files with 56 additions and 40 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -124,30 +124,42 @@ find_package(OpenSSL REQUIRED)
 
 set(XEUS_ZMQ_HEADERS
     ${XEUS_ZMQ_INCLUDE_DIR}/xeus-zmq/xauthentication.hpp
+    ${XEUS_ZMQ_INCLUDE_DIR}/xeus-zmq/xclient_zmq.hpp
+    ${XEUS_ZMQ_INCLUDE_DIR}/xeus-zmq/xdap_tcp_client.hpp
     ${XEUS_ZMQ_INCLUDE_DIR}/xeus-zmq/xdebugger_base.hpp
     ${XEUS_ZMQ_INCLUDE_DIR}/xeus-zmq/xeus-zmq.hpp
-    ${XEUS_ZMQ_INCLUDE_DIR}/xeus-zmq/xdap_tcp_client.hpp
     ${XEUS_ZMQ_INCLUDE_DIR}/xeus-zmq/xmiddleware.hpp
     ${XEUS_ZMQ_INCLUDE_DIR}/xeus-zmq/xserver_zmq.hpp
     ${XEUS_ZMQ_INCLUDE_DIR}/xeus-zmq/xthread.hpp
     ${XEUS_ZMQ_INCLUDE_DIR}/xeus-zmq/xzmq_context.hpp
     ${XEUS_ZMQ_INCLUDE_DIR}/xeus-zmq/xzmq_serializer.hpp
-    ${XEUS_ZMQ_INCLUDE_DIR}/xeus-zmq/xclient_zmq.hpp
 )
 
 set(XEUS_ZMQ_SOURCES
     ${XEUS_ZMQ_SOURCE_DIR}/xauthentication.cpp
+    ${XEUS_ZMQ_SOURCE_DIR}/xclient_zmq.cpp
+    ${XEUS_ZMQ_SOURCE_DIR}/xclient_messenger.hpp
+    ${XEUS_ZMQ_SOURCE_DIR}/xclient_messenger.cpp
+    ${XEUS_ZMQ_SOURCE_DIR}/xclient_zmq_impl.hpp
+    ${XEUS_ZMQ_SOURCE_DIR}/xclient_zmq_impl.cpp
     ${XEUS_ZMQ_SOURCE_DIR}/xcontrol.hpp
     ${XEUS_ZMQ_SOURCE_DIR}/xcontrol.cpp
     ${XEUS_ZMQ_SOURCE_DIR}/xdap_tcp_client.cpp
     ${XEUS_ZMQ_SOURCE_DIR}/xdap_tcp_client_impl.cpp
     ${XEUS_ZMQ_SOURCE_DIR}/xdap_tcp_client_impl.hpp
+    ${XEUS_ZMQ_SOURCE_DIR}/xdealer_channel.hpp
+    ${XEUS_ZMQ_SOURCE_DIR}/xdealer_channel.cpp
     ${XEUS_ZMQ_SOURCE_DIR}/xdebugger_base.cpp
     ${XEUS_ZMQ_SOURCE_DIR}/xdebugger_middleware.cpp
     ${XEUS_ZMQ_SOURCE_DIR}/xdebugger_middleware.hpp
     ${XEUS_ZMQ_SOURCE_DIR}/xheartbeat.cpp
     ${XEUS_ZMQ_SOURCE_DIR}/xheartbeat.hpp
+    ${XEUS_ZMQ_SOURCE_DIR}/xheartbeat_client.hpp
+    ${XEUS_ZMQ_SOURCE_DIR}/xheartbeat_client.cpp
+    ${XEUS_ZMQ_SOURCE_DIR}/xiopub_client.hpp
+    ${XEUS_ZMQ_SOURCE_DIR}/xiopub_client.cpp
     ${XEUS_ZMQ_SOURCE_DIR}/xmiddleware.cpp
+    ${XEUS_ZMQ_SOURCE_DIR}/xmiddleware_impl.hpp
     ${XEUS_ZMQ_SOURCE_DIR}/xpublisher.cpp
     ${XEUS_ZMQ_SOURCE_DIR}/xpublisher.hpp
     ${XEUS_ZMQ_SOURCE_DIR}/xserver_control_main.cpp
@@ -169,17 +181,6 @@ set(XEUS_ZMQ_SOURCES
     ${XEUS_ZMQ_SOURCE_DIR}/xzmq_messenger.hpp
     ${XEUS_ZMQ_SOURCE_DIR}/xzmq_messenger.cpp
     ${XEUS_ZMQ_SOURCE_DIR}/xzmq_serializer.cpp
-    ${XEUS_ZMQ_SOURCE_DIR}/xclient_zmq.cpp
-    ${XEUS_ZMQ_SOURCE_DIR}/xclient_messenger.hpp
-    ${XEUS_ZMQ_SOURCE_DIR}/xclient_messenger.cpp
-    ${XEUS_ZMQ_SOURCE_DIR}/xclient_zmq_impl.hpp
-    ${XEUS_ZMQ_SOURCE_DIR}/xclient_zmq_impl.cpp
-    ${XEUS_ZMQ_SOURCE_DIR}/xdealer_channel.hpp
-    ${XEUS_ZMQ_SOURCE_DIR}/xdealer_channel.cpp
-    ${XEUS_ZMQ_SOURCE_DIR}/xiopub_client.hpp
-    ${XEUS_ZMQ_SOURCE_DIR}/xiopub_client.cpp
-    ${XEUS_ZMQ_SOURCE_DIR}/xheartbeat_client.hpp
-    ${XEUS_ZMQ_SOURCE_DIR}/xheartbeat_client.cpp
 )
 
 # Targets and link

diff --git a/include/xeus-zmq/xmiddleware.hpp b/include/xeus-zmq/xmiddleware.hpp
@@ -12,7 +12,6 @@
 
 #include <string>
 
-#include "zmq.hpp"
 #include "xeus-zmq.hpp"
 
 namespace xeus
@@ -31,17 +30,6 @@ namespace xeus
     XEUS_ZMQ_API
     int get_socket_linger();
 
-    XEUS_ZMQ_API
-    void init_socket(zmq::socket_t& socket,
-                     const std::string& transport,
-                     const std::string& ip,
-                     const std::string& port);
-    XEUS_ZMQ_API
-    void init_socket(zmq::socket_t& socket, const std::string& end_point);
-
-    XEUS_ZMQ_API
-    std::string get_socket_port(const zmq::socket_t& socket);
-
     XEUS_ZMQ_API
     std::string find_free_port(std::size_t max_tries = 100, int start = 49152, int stop = 65536);
 }

diff --git a/src/xcontrol.cpp b/src/xcontrol.cpp
@@ -11,8 +11,7 @@
 #include <chrono>
 #include <iostream>
 
-#include "xeus-zmq/xmiddleware.hpp"
-
+#include "xmiddleware_impl.hpp"
 #include "xserver_zmq_split.hpp"
 #include "xcontrol.hpp"
 

diff --git a/src/xheartbeat.cpp b/src/xheartbeat.cpp
@@ -11,7 +11,7 @@
 #include <string>
 
 #include "zmq_addon.hpp"
-#include "xeus-zmq/xmiddleware.hpp"
+#include "xmiddleware_impl.hpp"
 #include "xheartbeat.hpp"
 
 namespace xeus

diff --git a/src/xheartbeat_client.cpp b/src/xheartbeat_client.cpp
@@ -9,8 +9,7 @@
 
 #include "xheartbeat_client.hpp"
 #include "xclient_zmq_impl.hpp"
-
-#include "xeus-zmq/xmiddleware.hpp"
+#include "xmiddleware_impl.hpp"
 
 namespace xeus
 {
@@ -78,4 +77,4 @@ namespace xeus
             std::this_thread::sleep_for(std::chrono::milliseconds(100));
         }
     }
-}
+}
diff --git a/src/xiopub_client.cpp b/src/xiopub_client.cpp
@@ -9,11 +9,11 @@
 
 #include <iostream>
 
+#include "xeus-zmq/xzmq_serializer.hpp"
+
 #include "xiopub_client.hpp"
 #include "xclient_zmq_impl.hpp"
-
-#include "xeus-zmq/xzmq_serializer.hpp"
-#include "xeus-zmq/xmiddleware.hpp"
+#include "xmiddleware_impl.hpp"
 
 namespace xeus
 {
@@ -80,4 +80,4 @@ namespace xeus
             }
         }
     }
-}
+}
diff --git a/src/xmiddleware.cpp b/src/xmiddleware.cpp
@@ -11,7 +11,7 @@
 #include <random>
 
 #include "zmq_addon.hpp"
-#include "xeus-zmq/xmiddleware.hpp"
+#include "xmiddleware_impl.hpp"
 
 namespace xeus
 {

diff --git a/src/xmiddleware_impl.hpp b/src/xmiddleware_impl.hpp
@@ -0,0 +1,30 @@
+/***************************************************************************
+* Copyright (c) 2016, Johan Mabille, Sylvain Corlay, Martin Renou          *
+* Copyright (c) 2016, QuantStack                                           *
+*                                                                          *
+* Distributed under the terms of the BSD 3-Clause License.                 *
+*                                                                          *
+* The full license is in the file LICENSE, distributed with this software. *
+****************************************************************************/
+
+#ifndef XEUS_MIDDLEWARE_IMPL_HPP
+#define XEUS_MIDDLEWARE_IMPL_HPP
+
+#include <string>
+#include "zmq.hpp"
+
+#include "xeus-zmq/xmiddleware.hpp"
+
+namespace xeus
+{
+    void init_socket(zmq::socket_t& socket,
+                     const std::string& transport,
+                     const std::string& ip,
+                     const std::string& port);
+
+    void init_socket(zmq::socket_t& socket, const std::string& end_point);
+
+    std::string get_socket_port(const zmq::socket_t& socket);
+}
+
+#endif
diff --git a/src/xpublisher.cpp b/src/xpublisher.cpp
@@ -10,7 +10,7 @@
 #include <iostream>
 #include <string>
 
-#include "xeus-zmq/xmiddleware.hpp"
+#include "xmiddleware_impl.hpp"
 #include "xpublisher.hpp"
 
 namespace xeus

diff --git a/src/xserver_zmq_default.cpp b/src/xserver_zmq_default.cpp
@@ -12,9 +12,9 @@
 
 #include "xeus/xguid.hpp"
 #include "xeus-zmq/xauthentication.hpp"
-#include "xeus-zmq/xmiddleware.hpp"
 #include "xeus-zmq/xzmq_serializer.hpp"
 #include "xserver_zmq_default.hpp"
+#include "xmiddleware_impl.hpp"
 #include "xpublisher.hpp"
 #include "xheartbeat.hpp"
 #include "xtrivial_messenger.hpp"

diff --git a/src/xshell.cpp b/src/xshell.cpp
@@ -11,9 +11,8 @@
 #include <chrono>
 #include <iostream>
 
-#include "xeus-zmq/xmiddleware.hpp"
-
 #include "xserver_zmq_split.hpp"
+#include "xmiddleware_impl.hpp"
 #include "xshell.hpp"
 
 namespace xeus