3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-05-20 12:36:17 +02:00
Code Issues Projects Releases Packages Wiki Activity

switch from deprecated io_service to io_context

Browse source
This commit is contained in:
badaix 2019-09-28 10:53:58 +02:00
parent c4a61dff47
commit 1974afc176
7 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/clientConnection.cpp
View file

@ -70,11 +70,11 @@ std::string ClientConnection::getMacAddress() const
void ClientConnection::start() void ClientConnection::start()
{ {
tcp::resolver resolver(io_service_); tcp::resolver resolver(io_context_);
tcp::resolver::query query(host_, cpt::to_string(port_), asio::ip::resolver_query_base::numeric_service); tcp::resolver::query query(host_, cpt::to_string(port_), asio::ip::resolver_query_base::numeric_service);
auto iterator = resolver.resolve(query); auto iterator = resolver.resolve(query);
LOG(DEBUG) << "Connecting\n"; LOG(DEBUG) << "Connecting\n";
socket_.reset(new tcp::socket(io_service_)); socket_.reset(new tcp::socket(io_context_));
// struct timeval tv; // struct timeval tv;
// tv.tv_sec = 5; // tv.tv_sec = 5;
// tv.tv_usec = 0; // tv.tv_usec = 0;

2
client/clientConnection.h
View file

@ -112,7 +112,7 @@ protected:
void socketRead(void* to, size_t bytes); void socketRead(void* to, size_t bytes);
void getNextMessage(); void getNextMessage();
asio::io_service io_service_; asio::io_context io_context_;
mutable std::mutex socketMutex_; mutable std::mutex socketMutex_;
std::shared_ptr<tcp::socket> socket_; std::shared_ptr<tcp::socket> socket_;
std::atomic<bool> active_; std::atomic<bool> active_;

12
server/controlServer.cpp
View file

@ -30,8 +30,8 @@ using namespace std;
using json = nlohmann::json; using json = nlohmann::json;
ControlServer::ControlServer(asio::io_service* io_service, size_t port, ControlMessageReceiver* controlMessageReceiver) ControlServer::ControlServer(asio::io_context* io_context, size_t port, ControlMessageReceiver* controlMessageReceiver)
: acceptor_v4_(nullptr), acceptor_v6_(nullptr), io_service_(io_service), port_(port), controlMessageReceiver_(controlMessageReceiver) : acceptor_v4_(nullptr), acceptor_v6_(nullptr), io_context_(io_context), port_(port), controlMessageReceiver_(controlMessageReceiver)
{ {
} }
@ -106,12 +106,12 @@ void ControlServer::startAccept()
{ {
if (acceptor_v4_) if (acceptor_v4_)
{ {
socket_ptr socket_v4 = make_shared<tcp::socket>(*io_service_); socket_ptr socket_v4 = make_shared<tcp::socket>(*io_context_);
acceptor_v4_->async_accept(*socket_v4, bind(&ControlServer::handleAccept, this, socket_v4)); acceptor_v4_->async_accept(*socket_v4, bind(&ControlServer::handleAccept, this, socket_v4));
} }
if (acceptor_v6_) if (acceptor_v6_)
{ {
socket_ptr socket_v6 = make_shared<tcp::socket>(*io_service_); socket_ptr socket_v6 = make_shared<tcp::socket>(*io_context_);
acceptor_v6_->async_accept(*socket_v6, bind(&ControlServer::handleAccept, this, socket_v6)); acceptor_v6_->async_accept(*socket_v6, bind(&ControlServer::handleAccept, this, socket_v6));
} }
} }
@ -150,7 +150,7 @@ void ControlServer::start()
tcp::endpoint endpoint_v6(tcp::v6(), port_); tcp::endpoint endpoint_v6(tcp::v6(), port_);
try try
{ {
acceptor_v6_ = make_shared<tcp::acceptor>(*io_service_, endpoint_v6); acceptor_v6_ = make_shared<tcp::acceptor>(*io_context_, endpoint_v6);
error_code ec; error_code ec;
acceptor_v6_->set_option(asio::ip::v6_only(false), ec); acceptor_v6_->set_option(asio::ip::v6_only(false), ec);
asio::ip::v6_only option; asio::ip::v6_only option;
@ -168,7 +168,7 @@ void ControlServer::start()
tcp::endpoint endpoint_v4(tcp::v4(), port_); tcp::endpoint endpoint_v4(tcp::v4(), port_);
try try
{ {
acceptor_v4_ = make_shared<tcp::acceptor>(*io_service_, endpoint_v4); acceptor_v4_ = make_shared<tcp::acceptor>(*io_context_, endpoint_v4);
} }
catch (const asio::system_error& e) catch (const asio::system_error& e)
{ {

4
server/controlServer.h
View file

@ -46,7 +46,7 @@ typedef std::shared_ptr<tcp::socket> socket_ptr;
class ControlServer : public ControlMessageReceiver class ControlServer : public ControlMessageReceiver
{ {
public: public:
ControlServer(asio::io_service* io_service, size_t port, ControlMessageReceiver* controlMessageReceiver = nullptr); ControlServer(asio::io_context* io_context, size_t port, ControlMessageReceiver* controlMessageReceiver = nullptr);
virtual ~ControlServer(); virtual ~ControlServer();
void start(); void start();
@ -68,7 +68,7 @@ private:
std::shared_ptr<tcp::acceptor> acceptor_v4_; std::shared_ptr<tcp::acceptor> acceptor_v4_;
std::shared_ptr<tcp::acceptor> acceptor_v6_; std::shared_ptr<tcp::acceptor> acceptor_v6_;
asio::io_service* io_service_; asio::io_context* io_context_;
size_t port_; size_t port_;
ControlMessageReceiver* controlMessageReceiver_; ControlMessageReceiver* controlMessageReceiver_;
}; };

10
server/snapServer.cpp
View file

@ -201,17 +201,17 @@ int main(int argc, char* argv[])
if (settings.bufferMs < 400) if (settings.bufferMs < 400)
settings.bufferMs = 400; settings.bufferMs = 400;
asio::io_service io_service; asio::io_context io_context;
std::unique_ptr<StreamServer> streamServer(new StreamServer(&io_service, settings)); std::unique_ptr<StreamServer> streamServer(new StreamServer(&io_context, settings));
streamServer->start(); streamServer->start();
auto func = [](asio::io_service* ioservice) -> void { ioservice->run(); }; auto func = [](asio::io_context* ioservice) -> void { ioservice->run(); };
std::thread t(func, &io_service); std::thread t(func, &io_context);
while (!g_terminated) while (!g_terminated)
chronos::sleep(100); chronos::sleep(100);
io_service.stop(); io_context.stop();
t.join(); t.join();
LOG(INFO) << "Stopping streamServer" << endl; LOG(INFO) << "Stopping streamServer" << endl;

14
server/streamServer.cpp
View file

@ -29,8 +29,8 @@ using namespace std;
using json = nlohmann::json; using json = nlohmann::json;
StreamServer::StreamServer(asio::io_service* io_service, const StreamServerSettings& streamServerSettings) StreamServer::StreamServer(asio::io_context* io_context, const StreamServerSettings& streamServerSettings)
: io_service_(io_service), acceptor_v4_(nullptr), acceptor_v6_(nullptr), settings_(streamServerSettings) : io_context_(io_context), acceptor_v4_(nullptr), acceptor_v6_(nullptr), settings_(streamServerSettings)
{ {
} }
@ -721,12 +721,12 @@ void StreamServer::startAccept()
{ {
if (acceptor_v4_) if (acceptor_v4_)
{ {
socket_ptr socket_v4 = make_shared<tcp::socket>(*io_service_); socket_ptr socket_v4 = make_shared<tcp::socket>(*io_context_);
acceptor_v4_->async_accept(*socket_v4, bind(&StreamServer::handleAccept, this, socket_v4)); acceptor_v4_->async_accept(*socket_v4, bind(&StreamServer::handleAccept, this, socket_v4));
} }
if (acceptor_v6_) if (acceptor_v6_)
{ {
socket_ptr socket_v6 = make_shared<tcp::socket>(*io_service_); socket_ptr socket_v6 = make_shared<tcp::socket>(*io_context_);
acceptor_v6_->async_accept(*socket_v6, bind(&StreamServer::handleAccept, this, socket_v6)); acceptor_v6_->async_accept(*socket_v6, bind(&StreamServer::handleAccept, this, socket_v6));
} }
} }
@ -766,7 +766,7 @@ void StreamServer::start()
{ {
try try
{ {
controlServer_.reset(new ControlServer(io_service_, settings_.controlPort, this)); controlServer_.reset(new ControlServer(io_context_, settings_.controlPort, this));
controlServer_->start(); controlServer_->start();
streamManager_.reset(new StreamManager(this, settings_.sampleFormat, settings_.codec, settings_.streamReadMs)); streamManager_.reset(new StreamManager(this, settings_.sampleFormat, settings_.codec, settings_.streamReadMs));
@ -783,7 +783,7 @@ void StreamServer::start()
tcp::endpoint endpoint_v6(tcp::v6(), settings_.port); tcp::endpoint endpoint_v6(tcp::v6(), settings_.port);
try try
{ {
acceptor_v6_ = make_shared<tcp::acceptor>(*io_service_, endpoint_v6); acceptor_v6_ = make_shared<tcp::acceptor>(*io_context_, endpoint_v6);
error_code ec; error_code ec;
acceptor_v6_->set_option(asio::ip::v6_only(false), ec); acceptor_v6_->set_option(asio::ip::v6_only(false), ec);
asio::ip::v6_only option; asio::ip::v6_only option;
@ -801,7 +801,7 @@ void StreamServer::start()
tcp::endpoint endpoint_v4(tcp::v4(), settings_.port); tcp::endpoint endpoint_v4(tcp::v4(), settings_.port);
try try
{ {
acceptor_v4_ = make_shared<tcp::acceptor>(*io_service_, endpoint_v4); acceptor_v4_ = make_shared<tcp::acceptor>(*io_context_, endpoint_v4);
} }
catch (const asio::system_error& e) catch (const asio::system_error& e)
{ {

4
server/streamServer.h
View file

@ -69,7 +69,7 @@ struct StreamServerSettings
class StreamServer : public MessageReceiver, ControlMessageReceiver, PcmListener class StreamServer : public MessageReceiver, ControlMessageReceiver, PcmListener
{ {
public: public:
StreamServer(asio::io_service* io_service, const StreamServerSettings& streamServerSettings); StreamServer(asio::io_context* io_context, const StreamServerSettings& streamServerSettings);
virtual ~StreamServer(); virtual ~StreamServer();
void start(); void start();
@ -99,7 +99,7 @@ private:
void ProcessRequest(const jsonrpcpp::request_ptr request, jsonrpcpp::entity_ptr& response, jsonrpcpp::notification_ptr& notification) const; void ProcessRequest(const jsonrpcpp::request_ptr request, jsonrpcpp::entity_ptr& response, jsonrpcpp::notification_ptr& notification) const;
mutable std::recursive_mutex sessionsMutex_; mutable std::recursive_mutex sessionsMutex_;
std::set<session_ptr> sessions_; std::set<session_ptr> sessions_;
asio::io_service* io_service_; asio::io_context* io_context_;
std::shared_ptr<tcp::acceptor> acceptor_v4_; std::shared_ptr<tcp::acceptor> acceptor_v4_;
std::shared_ptr<tcp::acceptor> acceptor_v6_; std::shared_ptr<tcp::acceptor> acceptor_v6_;