]> git.sesse.net Git - casparcg/blobdiff - protocol/util/AsyncEventServer.cpp
Enabled TCP keep alive on TCP connections to clients. This might help in discovering...
[casparcg] / protocol / util / AsyncEventServer.cpp
index 59de842688aff457f778caa5beb4cef01a78ed9f..d404becdbb9c5711f5d6f2203a8a14864ef49441 100644 (file)
@@ -19,7 +19,7 @@
 * Author: Robert Nagy, ronag89@gmail.com
 */
 
-#include "..\stdafx.h"
+#include "../StdAfx.h"
 
 #include "AsyncEventServer.h"
 
 #include <string>
 #include <set>
 #include <memory>
+#include <functional>
 
 #include <boost/asio.hpp>
-#include <boost/thread.hpp>
 #include <boost/lexical_cast.hpp>
 
-#include <tbb\mutex.h>
-#include <tbb\concurrent_hash_map.h>
+#include <tbb/mutex.h>
+#include <tbb/concurrent_hash_map.h>
+#include <tbb/concurrent_queue.h>
 
 using boost::asio::ip::tcp;
 
@@ -47,83 +48,120 @@ typedef std::set<spl::shared_ptr<connection>> connection_set;
 class connection : public spl::enable_shared_from_this<connection>
 {   
        typedef tbb::concurrent_hash_map<std::wstring, std::shared_ptr<void>> lifecycle_map_type;
+       typedef tbb::concurrent_queue<std::string>      send_queue;
 
     const spl::shared_ptr<tcp::socket>                         socket_; 
-       boost::asio::io_service&                                                service_;
+       std::shared_ptr<boost::asio::io_service>                service_;
+       const std::wstring                                                              listen_port_;
        const spl::shared_ptr<connection_set>                   connection_set_;
-       const std::wstring                                                              name_;
        protocol_strategy_factory<char>::ptr                    protocol_factory_;
        std::shared_ptr<protocol_strategy<char>>                protocol_;
 
        std::array<char, 32768>                                                 data_;
-       //std::map<std::wstring, std::shared_ptr<void>> lifecycle_bound_objects_;
-       lifecycle_map_type lifecycle_bound_objects_;
+       lifecycle_map_type                                                              lifecycle_bound_objects_;
+       send_queue                                                                              send_queue_;
+       bool                                                                                    is_writing_;
 
        class connection_holder : public client_connection<char>
        {
                std::weak_ptr<connection> connection_;
        public:
-               explicit connection_holder(std::weak_ptr<connection> conn) : connection_(conn)
+               explicit connection_holder(std::weak_ptr<connection> conn) : connection_(std::move(conn))
                {}
 
-               virtual void send(std::basic_string<char>&& data)
+               void send(std::basic_string<char>&& data) override
                {
-                       //TODO: need to implement a send-queue
                        auto conn = connection_.lock();
-                       conn->send(std::move(data));
+
+                       if (conn)
+                               conn->send(std::move(data));
                }
-               virtual void disconnect()
+
+               void disconnect() override
                {
                        auto conn = connection_.lock();
-                       conn->disconnect();
+
+                       if (conn)
+                               conn->disconnect();
                }
-               virtual std::wstring print() const
+
+               std::wstring address() const override
                {
                        auto conn = connection_.lock();
-                       return conn->print();
+
+                       if (conn)
+                               return conn->ipv4_address();
+                       else
+                               return L"[destroyed-connection]";
                }
 
-               virtual void add_lifecycle_bound_object(const std::wstring& key, const std::shared_ptr<void>& lifecycle_bound)
+               void add_lifecycle_bound_object(const std::wstring& key, const std::shared_ptr<void>& lifecycle_bound) override
                {
                        auto conn = connection_.lock();
-                       return conn->add_lifecycle_bound_object(key, lifecycle_bound);
+
+                       if (conn)
+                               return conn->add_lifecycle_bound_object(key, lifecycle_bound);
                }
-               virtual std::shared_ptr<void> remove_lifecycle_bound_object(const std::wstring& key)
+
+               std::shared_ptr<void> remove_lifecycle_bound_object(const std::wstring& key) override
                {
                        auto conn = connection_.lock();
-                       return conn->remove_lifecycle_bound_object(key);
+
+                       if (conn)
+                               return conn->remove_lifecycle_bound_object(key);
+                       else
+                               return std::shared_ptr<void>();
                }
        };
 
 public:
-    static spl::shared_ptr<connection> create(spl::shared_ptr<tcp::socket> socket, const protocol_strategy_factory<char>::ptr& protocol, spl::shared_ptr<connection_set> connection_set)
+       static spl::shared_ptr<connection> create(std::shared_ptr<boost::asio::io_service> service, spl::shared_ptr<tcp::socket> socket, const protocol_strategy_factory<char>::ptr& protocol, spl::shared_ptr<connection_set> connection_set)
        {
-               spl::shared_ptr<connection> con(new connection(std::move(socket), std::move(protocol), std::move(connection_set)));
+               spl::shared_ptr<connection> con(new connection(std::move(service), std::move(socket), std::move(protocol), std::move(connection_set)));
+               con->init();
                con->read_some();
                return con;
     }
 
+       void init()
+       {
+               protocol_ = protocol_factory_->create(spl::make_shared<connection_holder>(shared_from_this()));
+       }
+
        ~connection()
        {
-               CASPAR_LOG(info) << print() << L" connection destroyed.";
+               CASPAR_LOG(debug) << print() << L" connection destroyed.";
        }
 
        std::wstring print() const
        {
-               return L"[" + name_ + L"]";
+               return L"async_event_server[:" + listen_port_ + L"]";
+       }
+
+       std::wstring address() const
+       {
+               return u16(socket_->local_endpoint().address().to_string());
        }
        
-       virtual void send(std::string&& data)
+       std::wstring ipv4_address() const
        {
-               write_some(std::move(data));
+               return socket_->is_open() ? u16(socket_->remote_endpoint().address().to_string()) : L"no-address";
        }
 
-       virtual void disconnect()
+       void send(std::string&& data)
        {
-               service_.dispatch([=] { stop(); });
+               send_queue_.push(std::move(data));
+               auto self = shared_from_this();
+               service_->dispatch([=] { self->do_write(); });
        }
 
-       void add_lifecycle_bound_object(const std::wstring& key, const std::shared_ptr<void> lifecycle_bound)
+       void disconnect()
+       {
+               auto self = shared_from_this();
+               service_->dispatch([=] { self->stop(); });
+       }
+
+       void add_lifecycle_bound_object(const std::wstring& key, const std::shared_ptr<void>& lifecycle_bound)
        {
                //thread-safe tbb_concurrent_hash_map
                lifecycle_bound_objects_.insert(std::pair<std::wstring, std::shared_ptr<void>>(key, lifecycle_bound));
@@ -141,47 +179,48 @@ public:
                return std::shared_ptr<void>();
        }
 
-       /**************/
 private:
-       void stop()
+       void do_write() //always called from the asio-service-thread
+       {
+               if(!is_writing_)
+               {
+                       std::string data;
+                       if(send_queue_.try_pop(data))
+                       {
+                               write_some(std::move(data));
+                       }
+               }
+       }
+
+       void stop()     //always called from the asio-service-thread
        {
                connection_set_->erase(shared_from_this());
+
+               CASPAR_LOG(info) << print() << L" Client " << ipv4_address() << L" disconnected (" << connection_set_->size() << L" connections).";
+
                try
                {
+                       socket_->cancel();
                        socket_->close();
                }
                catch(...)
                {
                        CASPAR_LOG_CURRENT_EXCEPTION();
                }
-               
-               CASPAR_LOG(info) << print() << L" Disconnected.";
-       }
-
-       const std::string ipv4_address() const
-       {
-               return socket_->is_open() ? socket_->local_endpoint().address().to_string() : "no-address";
        }
 
-    connection(const spl::shared_ptr<tcp::socket>& socket, const protocol_strategy_factory<char>::ptr& protocol_factory, const spl::shared_ptr<connection_set>& connection_set) 
+    connection(const std::shared_ptr<boost::asio::io_service>& service, const spl::shared_ptr<tcp::socket>& socket, const protocol_strategy_factory<char>::ptr& protocol_factory, const spl::shared_ptr<connection_set>& connection_set) 
                : socket_(socket)
-               , service_(socket->get_io_service())
-               , name_((socket_->is_open() ? u16(socket_->local_endpoint().address().to_string() + ":" + boost::lexical_cast<std::string>(socket_->local_endpoint().port())) : L"no-address"))
+               , service_(service)
+               , listen_port_(socket_->is_open() ? boost::lexical_cast<std::wstring>(socket_->local_endpoint().port()) : L"no-port")
                , connection_set_(connection_set)
                , protocol_factory_(protocol_factory)
+               , is_writing_(false)
        {
-               CASPAR_LOG(info) << print() << L" Connected.";
+               CASPAR_LOG(info) << print() << L" Accepted connection from " << ipv4_address() << L" (" << (connection_set_->size() + 1) << L" connections).";
     }
-
-       protocol_strategy<char>& protocol()
-       {
-               if (!protocol_)
-                       protocol_ = protocol_factory_->create(spl::make_shared<connection_holder>(shared_from_this()));
-
-               return *protocol_;
-       }
                        
-    void handle_read(const boost::system::error_code& error, size_t bytes_transferred) 
+    void handle_read(const boost::system::error_code& error, size_t bytes_transferred)         //always called from the asio-service-thread
        {               
                if(!error)
                {
@@ -189,9 +228,7 @@ private:
                        {
                                std::string data(data_.begin(), data_.begin() + bytes_transferred);
 
-                               CASPAR_LOG(trace) << print() << L" Received: " << u16(data);
-
-                               protocol().parse(data);
+                               protocol_->parse(data);
                        }
                        catch(...)
                        {
@@ -204,23 +241,33 @@ private:
                        stop();         
     }
 
-    void handle_write(const spl::shared_ptr<std::string>& data, const boost::system::error_code& error, size_t bytes_transferred)
+    void handle_write(const spl::shared_ptr<std::string>& str, const boost::system::error_code& error, size_t bytes_transferred)       //always called from the asio-service-thread
        {
                if(!error)
                {
-                       CASPAR_LOG(trace) << print() << L" Sent: " << (data->size() < 512 ? u16(*data) : L"more than 512 bytes.");              
+                       if(bytes_transferred != str->size())
+                       {
+                               str->assign(str->substr(bytes_transferred));
+                               socket_->async_write_some(boost::asio::buffer(str->data(), str->size()), std::bind(&connection::handle_write, shared_from_this(), str, std::placeholders::_1, std::placeholders::_2));
+                       }
+                       else
+                       {
+                               is_writing_ = false;
+                               do_write();
+                       }
                }
-               else if (error != boost::asio::error::operation_aborted)                
+               else if (error != boost::asio::error::operation_aborted && socket_->is_open())          
                        stop();
     }
 
-       void read_some()
+       void read_some()        //always called from the asio-service-thread
        {
                socket_->async_read_some(boost::asio::buffer(data_.data(), data_.size()), std::bind(&connection::handle_read, shared_from_this(), std::placeholders::_1, std::placeholders::_2));
        }
        
-       void write_some(std::string&& data)
+       void write_some(std::string&& data)     //always called from the asio-service-thread
        {
+               is_writing_ = true;
                auto str = spl::make_shared<std::string>(std::move(data));
                socket_->async_write_some(boost::asio::buffer(str->data(), str->size()), std::bind(&connection::handle_write, shared_from_this(), str, std::placeholders::_1, std::placeholders::_2));
        }
@@ -228,49 +275,51 @@ private:
        friend struct AsyncEventServer::implementation;
 };
 
-struct AsyncEventServer::implementation
+struct AsyncEventServer::implementation : public spl::enable_shared_from_this<implementation>
 {
-       boost::asio::io_service                                 service_;
-       tcp::acceptor                                                   acceptor_;
-       protocol_strategy_factory<char>::ptr    protocol_factory_;
-       spl::shared_ptr<connection_set>                 connection_set_;
-       boost::thread                                                   thread_;
-       std::vector<lifecycle_factory_t>                lifecycle_factories_;
-       tbb::mutex mutex_;
-
-       implementation(const protocol_strategy_factory<char>::ptr& protocol, unsigned short port)
-               : acceptor_(service_, tcp::endpoint(tcp::v4(), port))
+       std::shared_ptr<boost::asio::io_service>        service_;
+       tcp::acceptor                                                           acceptor_;
+       protocol_strategy_factory<char>::ptr            protocol_factory_;
+       spl::shared_ptr<connection_set>                         connection_set_;
+       std::vector<lifecycle_factory_t>                        lifecycle_factories_;
+       tbb::mutex                                                                      mutex_;
+
+       implementation(std::shared_ptr<boost::asio::io_service> service, const protocol_strategy_factory<char>::ptr& protocol, unsigned short port)
+               : service_(std::move(service))
+               , acceptor_(*service_, tcp::endpoint(tcp::v4(), port))
                , protocol_factory_(protocol)
-               , thread_(std::bind(&boost::asio::io_service::run, &service_))
        {
-               start_accept();
        }
 
-       ~implementation()
+       void stop()
        {
                try
                {
-                       acceptor_.close();                      
+                       acceptor_.cancel();
+                       acceptor_.close();
                }
-               catch(...)
+               catch (...)
                {
                        CASPAR_LOG_CURRENT_EXCEPTION();
                }
+       }
+
+       ~implementation()
+       {
+               auto conns_set = connection_set_;
 
-               service_.post([=]
+               service_->post([conns_set]
                {
-                       auto connections = *connection_set_;
-                       BOOST_FOREACH(auto& connection, connections)
-                               connection->stop();                             
+                       auto connections = *conns_set;
+                       for (auto& connection : connections)
+                               connection->stop();
                });
-
-               thread_.join();
        }
                
-    void start_accept() 
+       void start_accept() 
        {
-               spl::shared_ptr<tcp::socket> socket(new tcp::socket(service_));
-               acceptor_.async_accept(*socket, std::bind(&implementation::handle_accept, this, socket, std::placeholders::_1));
+               spl::shared_ptr<tcp::socket> socket(new tcp::socket(*service_));
+               acceptor_.async_accept(*socket, std::bind(&implementation::handle_accept, shared_from_this(), socket, std::placeholders::_1));
     }
 
        void handle_accept(const spl::shared_ptr<tcp::socket>& socket, const boost::system::error_code& error) 
@@ -280,29 +329,48 @@ struct AsyncEventServer::implementation
                
         if (!error)
                {
-                       auto conn = connection::create(socket, protocol_factory_, connection_set_);
+                       boost::system::error_code ec;
+                       socket->set_option(boost::asio::socket_base::keep_alive(true), ec);
+
+                       if (ec)
+                               CASPAR_LOG(warning) << print() << L" Failed to enable TCP keep-alive on socket";
+                       
+                       auto conn = connection::create(service_, socket, protocol_factory_, connection_set_);
                        connection_set_->insert(conn);
 
-                       BOOST_FOREACH(auto& lifecycle_factory, lifecycle_factories_)
+                       for (auto& lifecycle_factory : lifecycle_factories_)
                        {
-                               auto lifecycle_bound = lifecycle_factory(conn->ipv4_address());
+                               auto lifecycle_bound = lifecycle_factory(u8(conn->ipv4_address()));
                                conn->add_lifecycle_bound_object(lifecycle_bound.first, lifecycle_bound.second);
                        }
                }
                start_accept();
     }
 
+       std::wstring print() const
+       {
+               return L"async_event_server[:" + boost::lexical_cast<std::wstring>(acceptor_.local_endpoint().port()) + L"]";
+       }
+
        void add_client_lifecycle_object_factory(const lifecycle_factory_t& factory)
        {
-               service_.post([=]{ lifecycle_factories_.push_back(factory); });
+               auto self = shared_from_this();
+               service_->post([=]{ self->lifecycle_factories_.push_back(factory); });
        }
 };
 
 AsyncEventServer::AsyncEventServer(
-               const protocol_strategy_factory<char>::ptr& protocol, unsigned short port)
-       : impl_(new implementation(protocol, port)) {}
+               std::shared_ptr<boost::asio::io_service> service, const protocol_strategy_factory<char>::ptr& protocol, unsigned short port)
+       : impl_(new implementation(std::move(service), protocol, port))
+{
+       impl_->start_accept();
+}
+
+AsyncEventServer::~AsyncEventServer()
+{
+       impl_->stop();
+}
 
-AsyncEventServer::~AsyncEventServer() {}
 void AsyncEventServer::add_client_lifecycle_object_factory(const lifecycle_factory_t& factory) { impl_->add_client_lifecycle_object_factory(factory); }
 
-}}
\ No newline at end of file
+}}