boostorg/beast
1
0
Fork 1
mirror of https://github.com/boostorg/beast.git synced 2025-08-02 06:15:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Tidy up websocket service

Browse Source
This commit is contained in:
Vinnie Falco
2019-02-27 16:39:47 -08:00
parent 92ad50a8e7
commit ef5282ebcf
3 changed files with 74 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/boost/beast/src.hpp
View File

@@ -46,6 +46,7 @@ the program, with the macro BOOST_BEAST_SPLIT_COMPILATION defined.
#include <boost/beast/http/impl/verb.ipp> #include <boost/beast/http/impl/verb.ipp>
#include <boost/beast/websocket/detail/prng.ipp> #include <boost/beast/websocket/detail/prng.ipp>
#include <boost/beast/websocket/detail/service.ipp>
#include <boost/beast/websocket/impl/error.ipp> #include <boost/beast/websocket/impl/error.ipp>
#include <boost/beast/zlib/detail/deflate_stream.ipp> #include <boost/beast/zlib/detail/deflate_stream.ipp>

36
include/boost/beast/websocket/detail/service.hpp
View File

@@ -36,25 +36,13 @@ public:
public: public:
virtual ~impl_type() = default; virtual ~impl_type() = default;
BOOST_BEAST_DECL
explicit explicit
impl_type(net::execution_context& ctx) impl_type(net::execution_context& ctx);
: svc_(net::use_service<service>(ctx))
{
std::lock_guard<std::mutex> g(svc_.m_);
index_ = svc_.v_.size();
svc_.v_.push_back(this);
}
BOOST_BEAST_DECL BOOST_BEAST_DECL
void void
remove() remove();
{
std::lock_guard<std::mutex> g(svc_.m_);
auto& other = *svc_.v_.back();
other.index_ = index_;
svc_.v_[index_] = &other;
svc_.v_.pop_back();
}
virtual virtual
void void
@@ -67,19 +55,7 @@ private:
BOOST_BEAST_DECL BOOST_BEAST_DECL
void void
shutdown() override shutdown() override;
{
std::vector<boost::weak_ptr<impl_type>> v;
{
std::lock_guard<std::mutex> g(m_);
v.reserve(v_.size());
for(auto p : v_)
v.emplace_back(p->weak_from_this());
}
for(auto wp : v)
if(auto sp = wp.lock())
sp->shutdown();
}
public: public:
BOOST_BEAST_DECL BOOST_BEAST_DECL
@@ -95,4 +71,8 @@ public:
} // beast } // beast
} // boost } // boost
#if BOOST_BEAST_HEADER_ONLY
#include <boost/beast/websocket/detail/service.ipp>
#endif
#endif #endif

65
include/boost/beast/websocket/detail/service.ipp Normal file
View File

@@ -0,0 +1,65 @@
//
// Copyright (c) 2016-2019 Vinnie Falco (vinnie dot falco at gmail dot com)
//
// Distributed under the Boost Software License, Version 1.0. (See accompanying
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
//
// Official repository: https://github.com/boostorg/beast
//
#ifndef BOOST_BEAST_WEBSOCKET_DETAIL_SERVICE_IPP
#define BOOST_BEAST_WEBSOCKET_DETAIL_SERVICE_IPP
#include <boost/beast/websocket/detail/service.hpp>
namespace boost {
namespace beast {
namespace websocket {
namespace detail {
service::
impl_type::
impl_type(net::execution_context& ctx)
: svc_(net::use_service<service>(ctx))
{
std::lock_guard<std::mutex> g(svc_.m_);
index_ = svc_.v_.size();
svc_.v_.push_back(this);
}
void
service::
impl_type::
remove()
{
std::lock_guard<std::mutex> g(svc_.m_);
auto& other = *svc_.v_.back();
other.index_ = index_;
svc_.v_[index_] = &other;
svc_.v_.pop_back();
}
//---
void
service::
shutdown()
{
std::vector<boost::weak_ptr<impl_type>> v;
{
std::lock_guard<std::mutex> g(m_);
v.reserve(v_.size());
for(auto p : v_)
v.emplace_back(p->weak_from_this());
}
for(auto wp : v)
if(auto sp = wp.lock())
sp->shutdown();
}
} // detail
} // websocket
} // beast
} // boost
#endif