Merge pull request #14 from JohanMabille/more_cleanup

Removed old commented code

Author: JohanMabille

include/xq/xq_qt_poller.hpp

@@ -52,38 +52,5 @@ namespace xeus
     };
 }
 
-/*
-class XQ_API WorkerThread : public QThread
-{
-public:
-
-    Q_OBJECT
-
-public:
-
-    
-    WorkerThread(QObject* parent,
-                 zmq::socket_t* p_shell,
-                 zmq::socket_t* p_controller,
-                 xeus::xauthentication* p_auth);
-    void run();
-    void stop();
-
-protected:
-
-    zmq::socket_t m_shell;
-    zmq::socket_t m_controller;
-    zmq::socket_t* p_shell;
-    zmq::socket_t* p_controller;
-    xeus::xauthentication* p_auth;
-    std::atomic<bool> m_request_stop;
-
-signals:
-
-    void received_shell_msg_signal(xeus::xmessage* msg);
-    void received_controll_msg_signal(xeus::xmessage* msg);
-};
-
-*/
 #endif
 

include/xq/xq_server.hpp

@@ -48,59 +48,3 @@ namespace xeus
 
 #endif
 
-
-
-/*
-#include <iostream>
-
-#include "zmq.hpp"
-#include "zmq_addon.hpp"
-
-#include <xeus/xmessage.hpp>
-#include <xeus/xkernel_configuration.hpp>
-
-#include <xeus-zmq/xserver_zmq.hpp>
-
-#include "xq.hpp"
-#include "xq_qt_poller.hpp"
-
-#include <QList>
-#include <QSharedPointer>
-#include <QSocketNotifier>
-#include <QSharedData>
-
-
-class XQ_API xq_server : public xeus::xserver_zmq, public QObject
-{
-public:
-
-    using socket_notifier_ptr = QSharedPointer<QSocketNotifier>;
-
-    xq_server(zmq::context_t& context,
-             const xeus::xconfiguration& config,
-             nl::json::error_handler_t eh);
-
-    virtual ~xq_server() = default;
-
-protected:
-
-    void start_impl(xeus::xpub_message message) override;
-    void stop_impl() override;
-    void start_poller_qthread();
-
-protected slots:
-
-    void on_received_shell_msg(xeus::xmessage* msg);
-    void on_received_controll_msg(xeus::xmessage* msg);
-
-private:
-
-    WorkerThread m_worker_thread;
-};
-
-XQ_API std::unique_ptr<xeus::xserver> make_xq_server(xeus::xcontext& context,
-                                                     const xeus::xconfiguration& config,
-                                                     nl::json::error_handler_t eh);
-
-#endif
-*/

src/xq_qt_poller.cpp

@@ -53,65 +53,3 @@ namespace xeus
     }
 }
 
-/*WorkerThread::WorkerThread(QObject* parent,
-                           zmq::socket_t* p_shell,
-                           zmq::socket_t* p_controller,
-                           xeus::xauthentication* auth)
-    :
-    QThread(parent),
-    p_shell(p_shell),
-    p_controller(p_controller),
-    m_request_stop(false)
-{
-    std::cout << "starting thread" << std::endl;
-    p_auth = auth;
-}
-
-void WorkerThread::stop()
-{
-    m_request_stop = true;
-}
-
-void WorkerThread::run()
-{
-    zmq::pollitem_t items[]
-        = { { *p_controller, 0, ZMQ_POLLIN, 0 }, { *p_shell, 0, ZMQ_POLLIN, 0 } };
-
-    while(!m_request_stop.load())
-    {
-        zmq::poll(&items[0], 2, std::chrono::milliseconds(10));
-        {
-            try
-            {
-                if (items[0].revents & ZMQ_POLLIN)
-                {
-                    zmq::multipart_t  wire_msg;
-                    std::cout << "msg inside poll" << std::endl;
-                    wire_msg.recv(*p_controller);
-                    xeus::xmessage msg = xeus::xzmq_serializer::deserialize(wire_msg, *p_auth);
-
-                    // signals do not like the move semantics so
-                    // we need to put in a pointer and delete it on the receiving end
-                    xeus::xmessage* pmsg = new xeus::xmessage(std::move(msg));
-                    emit received_controll_msg_signal(pmsg);
-                }
-
-                if (!m_request_stop.load() && (items[1].revents & ZMQ_POLLIN))
-                {
-                    zmq::multipart_t  wire_msg;
-                    wire_msg.recv(*p_shell);
-                    xeus::xmessage msg = xeus::xzmq_serializer::deserialize(wire_msg, *p_auth);
-
-                    // signals do not like the move semantics so 
-                    // we need to put in a pointer and delete it on the receiving end
-                    xeus::xmessage * pmsg = new xeus::xmessage(std::move(msg));
-                    emit received_shell_msg_signal(pmsg);
-                }
-            }
-            catch (std::exception& e)
-            {
-                std::cerr << e.what() << std::endl;
-            }
-        }
-    }
-}*/

src/xq_server.cpp

@@ -66,72 +66,3 @@ namespace xeus
     }
 }
 
-/*#include <memory>
-#include <thread>
-#include <iostream>
-
-#include <zmq_addon.hpp>
-
-#include <xeus-zmq/xserver_zmq.hpp>
-#include "xeus-zmq/xzmq_serializer.hpp"
-
-#include "xq/xq_server.hpp"
-#include "xq/xq_qt_poller.hpp"
-
-#include <QDebug>
-#include <QTimer>
-
-xq_server::xq_server(zmq::context_t& context,
-                     const xeus::xconfiguration& c,
-                     nl::json::error_handler_t eh)
-    :
-    xserver_zmq(context, c, eh),
-    m_worker_thread(this, &m_shell, &m_controller, p_auth.get())
-{
-}
-
-void xq_server::start_impl(xeus::xpub_message message)
-{
-    start_publisher_thread();
-    start_heartbeat_thread();
-
-    publish(std::move(message), xeus::channel::SHELL);
-
-    start_poller_qthread();
-}
-
-void xq_server::stop_impl()
-{
-    xserver_zmq::stop_impl();
-    m_worker_thread.stop();
-    m_worker_thread.wait();
-    this->stop_channels();
-}
-
-std::unique_ptr<xeus::xserver> make_xq_server(xeus::xcontext& context,
-                                              const xeus::xconfiguration& config,
-                                              nl::json::error_handler_t eh)
-{
-    return std::make_unique<xq_server>(context.get_wrapped_context<zmq::context_t>(), config, eh);
-}
-
-void xq_server::start_poller_qthread()
-{
-    connect(&m_worker_thread, &WorkerThread::received_shell_msg_signal, this, &xq_server::on_received_shell_msg);
-    connect(&m_worker_thread, &WorkerThread::received_controll_msg_signal, this, &xq_server::on_received_controll_msg);
-    m_worker_thread.start();
-}
-
-void xq_server::on_received_controll_msg(xeus::xmessage * pmsg)
-{
-    xeus::xmessage msg(std::move(*pmsg));
-    xeus::xserver::notify_control_listener(std::move(msg));
-    delete pmsg;
-}
-
-void xq_server::on_received_shell_msg(xeus::xmessage * pmsg)
-{
-    xeus::xmessage msg( std::move(*pmsg));
-    xeus::xserver::notify_shell_listener(std::move(msg));
-    delete pmsg;
-}*/