3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-05-15 18:16:44 +02:00
Code Issues Projects Releases Packages Wiki Activity

remove session in thread

Browse source 
git-svn-id: svn://elaine/murooma/trunk@332 d8a302eb-03bc-478d-80e4-98257eca68ef
This commit is contained in:
(no author) 2014-12-30 09:09:24 +00:00
parent 7a5483a101
commit b26952f5d1
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
server/controlServer.cpp
View file

@ -17,12 +17,14 @@ ControlServer::ControlServer(unsigned short port) : port_(port), headerChunk(NUL
void ControlServer::send(shared_ptr<msg::BaseMessage> message) void ControlServer::send(shared_ptr<msg::BaseMessage> message)
{ {
std::unique_lock<std::mutex> mlock(mutex); std::unique_lock<std::mutex> mlock(mutex);
for (std::set<shared_ptr<ServerSession>>::iterator it = sessions.begin(); it != sessions.end(); ) for (auto it = sessions.begin(); it != sessions.end(); )
{ {
if (!(*it)->active()) if (!(*it)->active())
{ {
logO << "Session inactive. Removing\n"; logO << "Session inactive. Removing\n";
(*it)->stop(); auto func = [](shared_ptr<ServerSession> s)->void{s->stop();};
std::thread t(func, *it);
t.detach();
sessions.erase(it++); sessions.erase(it++);
} }
else else

1
server/snapServer.cpp
View file

@ -128,6 +128,7 @@ int main(int argc, char* argv[])
do do
{ {
int count = read(fd, chunk->payload + len, toRead - len); int count = read(fd, chunk->payload + len, toRead - len);
//continue;
if (count == 0) if (count == 0)
throw ServerException("count = 0"); throw ServerException("count = 0");
else if (count == -1) else if (count == -1)