mirror of
https://github.com/badaix/snapcast.git
synced 2025-07-24 03:48:32 +02:00
fixed crash during server shutdown
This commit is contained in:
badaix
parent
d98db9177a
commit
33f9557904
5 changed files with 78 additions and 64 deletions
|
|
@ -33,9 +33,8 @@ public:
|
|||
{
|
||||
std::unique_lock<std::mutex> mlock(mutex_);
|
||||
while (queue_.empty())
|
||||
{
|
||||
cond_.wait(mlock);
|
||||
}
|
||||
|
||||
auto val = queue_.front();
|
||||
queue_.pop();
|
||||
return val;
|
||||
|
|
@ -54,7 +53,10 @@ public:
|
|||
{
|
||||
std::unique_lock<std::mutex> mlock(mutex_);
|
||||
|
||||
if(!cond_.wait_for(mlock, timeout, [this] { return !queue_.empty(); }))
|
||||
if (!cond_.wait_for(mlock, timeout, [this] { return !queue_.empty(); }))
|
||||
return false;
|
||||
|
||||
if (queue_.empty())
|
||||
return false;
|
||||
|
||||
item = std::move(queue_.front());
|
||||
|
|
@ -68,6 +70,11 @@ public:
|
|||
return try_pop(item, std::chrono::duration_cast<std::chrono::microseconds>(timeout));
|
||||
}
|
||||
|
||||
void abort_wait()
|
||||
{
|
||||
cond_.notify_one();
|
||||
}
|
||||
|
||||
void pop(T& item)
|
||||
{
|
||||
std::unique_lock<std::mutex> mlock(mutex_);
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ void StreamServer::onChunkRead(const PcmStream* pcmStream, const msg::PcmChunk*
|
|||
bool isDefaultStream(pcmStream == streamManager_->getDefaultStream().get());
|
||||
|
||||
std::shared_ptr<const msg::BaseMessage> shared_message(chunk);
|
||||
std::lock_guard<std::mutex> mlock(sessionsMutex_);
|
||||
std::lock_guard<std::recursive_mutex> mlock(sessionsMutex_);
|
||||
for (auto s : sessions_)
|
||||
{
|
||||
if (!s->pcmStream() && isDefaultStream)//->getName() == "default")
|
||||
|
|
@ -73,17 +73,8 @@ void StreamServer::onResync(const PcmStream* pcmStream, double ms)
|
|||
|
||||
void StreamServer::onDisconnect(StreamSession* streamSession)
|
||||
{
|
||||
std::lock_guard<std::mutex> mlock(sessionsMutex_);
|
||||
std::shared_ptr<StreamSession> session = nullptr;
|
||||
|
||||
for (auto s: sessions_)
|
||||
{
|
||||
if (s.get() == streamSession)
|
||||
{
|
||||
session = s;
|
||||
break;
|
||||
}
|
||||
}
|
||||
std::lock_guard<std::recursive_mutex> mlock(sessionsMutex_);
|
||||
session_ptr session = getStreamSession(streamSession);
|
||||
|
||||
if (session == nullptr)
|
||||
return;
|
||||
|
|
@ -192,8 +183,8 @@ void StreamServer::onMessageReceived(ControlSession* controlSession, const std::
|
|||
clientInfo->config.streamId = streamId;
|
||||
response = clientInfo->config.streamId;
|
||||
|
||||
StreamSession* session = getStreamSession(request.getParam("client").get<string>());
|
||||
if (session != NULL)
|
||||
session_ptr session = getStreamSession(request.getParam("client").get<string>());
|
||||
if (session != nullptr)
|
||||
{
|
||||
session->add(stream->getHeader());
|
||||
session->setPcmStream(stream);
|
||||
|
|
@ -218,8 +209,8 @@ void StreamServer::onMessageReceived(ControlSession* controlSession, const std::
|
|||
serverSettings.setMuted(clientInfo->config.volume.muted);
|
||||
serverSettings.setLatency(clientInfo->config.latency);
|
||||
|
||||
StreamSession* session = getStreamSession(request.getParam("client").get<string>());
|
||||
if (session != NULL)
|
||||
session_ptr session = getStreamSession(request.getParam("client").get<string>());
|
||||
if (session != nullptr)
|
||||
session->send(&serverSettings);
|
||||
|
||||
Config::instance().save();
|
||||
|
|
@ -244,7 +235,7 @@ void StreamServer::onMessageReceived(ControlSession* controlSession, const std::
|
|||
|
||||
void StreamServer::onMessageReceived(StreamSession* connection, const msg::BaseMessage& baseMessage, char* buffer)
|
||||
{
|
||||
logD << "getNextMessage: " << baseMessage.type << ", size: " << baseMessage.size << ", id: " << baseMessage.id << ", refers: " << baseMessage.refersTo << ", sent: " << baseMessage.sent.sec << "," << baseMessage.sent.usec << ", recv: " << baseMessage.received.sec << "," << baseMessage.received.usec << "\n";
|
||||
// logD << "onMessageReceived: " << baseMessage.type << ", size: " << baseMessage.size << ", id: " << baseMessage.id << ", refers: " << baseMessage.refersTo << ", sent: " << baseMessage.sent.sec << "," << baseMessage.sent.usec << ", recv: " << baseMessage.received.sec << "," << baseMessage.received.usec << "\n";
|
||||
if (baseMessage.type == message_type::kTime)
|
||||
{
|
||||
msg::Time timeMsg;
|
||||
|
|
@ -321,16 +312,29 @@ void StreamServer::onMessageReceived(StreamSession* connection, const msg::BaseM
|
|||
}
|
||||
|
||||
|
||||
StreamSession* StreamServer::getStreamSession(const std::string& mac)
|
||||
session_ptr StreamServer::getStreamSession(StreamSession* streamSession) const
|
||||
{
|
||||
std::lock_guard<std::recursive_mutex> mlock(sessionsMutex_);
|
||||
for (auto session: sessions_)
|
||||
{
|
||||
if (session.get() == streamSession)
|
||||
return session;
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
|
||||
session_ptr StreamServer::getStreamSession(const std::string& mac) const
|
||||
{
|
||||
// logO << "getStreamSession: " << mac << "\n";
|
||||
std::lock_guard<std::recursive_mutex> mlock(sessionsMutex_);
|
||||
for (auto session: sessions_)
|
||||
{
|
||||
// logO << "getStreamSession, checking: " << session->macAddress << "\n";
|
||||
if (session->macAddress == mac)
|
||||
return session.get();
|
||||
return session;
|
||||
}
|
||||
return NULL;
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -357,12 +361,13 @@ void StreamServer::handleAccept(socket_ptr socket)
|
|||
|
||||
logS(kLogNotice) << "StreamServer::NewConnection: " << socket->remote_endpoint().address().to_string() << endl;
|
||||
shared_ptr<StreamSession> session = make_shared<StreamSession>(this, socket);
|
||||
{
|
||||
std::lock_guard<std::mutex> mlock(sessionsMutex_);
|
||||
|
||||
session->setBufferMs(settings_.bufferMs);
|
||||
session->start();
|
||||
|
||||
std::lock_guard<std::recursive_mutex> mlock(sessionsMutex_);
|
||||
sessions_.insert(session);
|
||||
}
|
||||
|
||||
startAccept();
|
||||
}
|
||||
|
||||
|
|
@ -399,12 +404,16 @@ void StreamServer::start()
|
|||
|
||||
void StreamServer::stop()
|
||||
{
|
||||
// std::lock_guard<std::mutex> mlock(sessionsMutex_);
|
||||
std::lock_guard<std::recursive_mutex> mlock(sessionsMutex_);
|
||||
for (auto session: sessions_)//it = sessions_.begin(); it != sessions_.end(); ++it)
|
||||
{
|
||||
if (session)
|
||||
{
|
||||
session->stop();
|
||||
session = nullptr;
|
||||
}
|
||||
}
|
||||
sessions_.clear();
|
||||
|
||||
if (controlServer_)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
|
||||
using asio::ip::tcp;
|
||||
typedef std::shared_ptr<tcp::socket> socket_ptr;
|
||||
|
||||
typedef std::shared_ptr<StreamSession> session_ptr;
|
||||
|
||||
struct StreamServerSettings
|
||||
{
|
||||
|
|
@ -96,9 +96,10 @@ public:
|
|||
private:
|
||||
void startAccept();
|
||||
void handleAccept(socket_ptr socket);
|
||||
StreamSession* getStreamSession(const std::string& mac);
|
||||
mutable std::mutex sessionsMutex_;
|
||||
std::set<std::shared_ptr<StreamSession>> sessions_;
|
||||
session_ptr getStreamSession(const std::string& mac) const;
|
||||
session_ptr getStreamSession(StreamSession* session) const;
|
||||
mutable std::recursive_mutex sessionsMutex_;
|
||||
std::set<session_ptr> sessions_;
|
||||
asio::io_service* io_service_;
|
||||
std::shared_ptr<tcp::acceptor> acceptor_;
|
||||
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ using namespace std;
|
|||
|
||||
|
||||
StreamSession::StreamSession(MessageReceiver* receiver, std::shared_ptr<tcp::socket> socket) :
|
||||
active_(true), messageReceiver_(receiver), pcmStream_(nullptr)
|
||||
active_(false), readerThread_(nullptr), writerThread_(nullptr), messageReceiver_(receiver), pcmStream_(nullptr)
|
||||
{
|
||||
socket_ = socket;
|
||||
}
|
||||
|
|
@ -54,16 +54,20 @@ const PcmStreamPtr StreamSession::pcmStream() const
|
|||
|
||||
void StreamSession::start()
|
||||
{
|
||||
setActive(true);
|
||||
readerThread_ = new thread(&StreamSession::reader, this);
|
||||
writerThread_ = new thread(&StreamSession::writer, this);
|
||||
std::lock_guard<std::recursive_mutex> mlock(mutex_);
|
||||
active_ = true;
|
||||
readerThread_.reset(new thread(&StreamSession::reader, this));
|
||||
writerThread_.reset(new thread(&StreamSession::writer, this));
|
||||
}
|
||||
|
||||
|
||||
void StreamSession::stop()
|
||||
{
|
||||
setActive(false);
|
||||
std::unique_lock<std::mutex> mlock(mutex_);
|
||||
std::lock_guard<std::recursive_mutex> mlock(mutex_);
|
||||
if (!active_)
|
||||
return;
|
||||
|
||||
active_ = false;
|
||||
try
|
||||
{
|
||||
std::error_code ec;
|
||||
|
|
@ -74,25 +78,25 @@ void StreamSession::stop()
|
|||
socket_->close(ec);
|
||||
if (ec) logE << "Error in socket close: " << ec.message() << "\n";
|
||||
}
|
||||
if (readerThread_)
|
||||
if (readerThread_ && readerThread_->joinable())
|
||||
{
|
||||
logD << "joining readerThread\n";
|
||||
messages_.abort_wait();
|
||||
readerThread_->join();
|
||||
delete readerThread_;
|
||||
}
|
||||
if (writerThread_)
|
||||
if (writerThread_ && writerThread_->joinable())
|
||||
{
|
||||
logD << "joining writerThread\n";
|
||||
writerThread_->join();
|
||||
delete writerThread_;
|
||||
}
|
||||
}
|
||||
catch(...)
|
||||
{
|
||||
}
|
||||
readerThread_ = NULL;
|
||||
writerThread_ = NULL;
|
||||
socket_ = NULL;
|
||||
|
||||
readerThread_ = nullptr;
|
||||
writerThread_ = nullptr;
|
||||
socket_ = nullptr;
|
||||
logD << "StreamSession stopped\n";
|
||||
}
|
||||
|
||||
|
|
@ -135,7 +139,7 @@ bool StreamSession::send(const msg::BaseMessage* message) const
|
|||
{
|
||||
//TODO on exception: set active = false
|
||||
// logO << "send: " << message->type << ", size: " << message->getSize() << ", id: " << message->id << ", refers: " << message->refersTo << "\n";
|
||||
std::unique_lock<std::mutex> mlock(mutex_);
|
||||
std::lock_guard<std::recursive_mutex> mlock(mutex_);
|
||||
if (!socket_ || !active_)
|
||||
return false;
|
||||
asio::streambuf streambuf;
|
||||
|
|
@ -169,7 +173,7 @@ void StreamSession::getNextMessage()
|
|||
tv t;
|
||||
baseMessage.received = t;
|
||||
|
||||
if (messageReceiver_ != NULL)
|
||||
if (active_ && (messageReceiver_ != NULL))
|
||||
messageReceiver_->onMessageReceived(this, baseMessage, &buffer[0]);
|
||||
}
|
||||
|
||||
|
|
@ -187,7 +191,9 @@ void StreamSession::reader()
|
|||
{
|
||||
logS(kLogErr) << "Exception in StreamSession::reader(): " << e.what() << endl;
|
||||
}
|
||||
setActive(false);
|
||||
|
||||
if (active_ && (messageReceiver_ != NULL))
|
||||
messageReceiver_->onDisconnect(this);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -224,16 +230,9 @@ void StreamSession::writer()
|
|||
{
|
||||
logS(kLogErr) << "Exception in StreamSession::writer(): " << e.what() << endl;
|
||||
}
|
||||
setActive(false);
|
||||
}
|
||||
|
||||
|
||||
void StreamSession::setActive(bool active)
|
||||
{
|
||||
std::lock_guard<std::mutex> mlock(activeMutex_);
|
||||
if (active_ && !active && (messageReceiver_ != NULL))
|
||||
if (active_ && (messageReceiver_ != NULL))
|
||||
messageReceiver_->onDisconnect(this);
|
||||
active_ = active;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -22,11 +22,11 @@
|
|||
#include <string>
|
||||
#include <thread>
|
||||
#include <atomic>
|
||||
#include <mutex>
|
||||
#include <memory>
|
||||
#include <asio.hpp>
|
||||
#include <condition_variable>
|
||||
#include <set>
|
||||
#include <mutex>
|
||||
#include "message/message.h"
|
||||
#include "common/queue.h"
|
||||
#include "streamreader/streamManager.h"
|
||||
|
|
@ -88,14 +88,12 @@ protected:
|
|||
void getNextMessage();
|
||||
void reader();
|
||||
void writer();
|
||||
void setActive(bool active);
|
||||
|
||||
mutable std::mutex activeMutex_;
|
||||
mutable std::recursive_mutex mutex_;
|
||||
std::atomic<bool> active_;
|
||||
|
||||
mutable std::mutex mutex_;
|
||||
std::thread* readerThread_;
|
||||
std::thread* writerThread_;
|
||||
std::unique_ptr<std::thread> readerThread_;
|
||||
std::unique_ptr<std::thread> writerThread_;
|
||||
std::shared_ptr<tcp::socket> socket_;
|
||||
MessageReceiver* messageReceiver_;
|
||||
Queue<std::shared_ptr<const msg::BaseMessage>> messages_;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue