3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-06-11 07:11:41 +02:00
Code Issues Projects Releases Packages Wiki Activity

fixed deadlock in server shutdown

Browse source
This commit is contained in:
badaix 2016-11-09 11:45:35 +01:00
parent 341466ceb5
commit 935899b0a2
5 changed files with 35 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

15
server/streamreader/pipeStream.cpp
View file

@ -88,7 +88,8 @@ void PipeStream::worker()
if (count < 0)
{
setState(kIdle);
chronos::sleep(100);
if (!sleep(100))
break;
}
else if (count == 0)
throw SnapException("end of file");
@ -97,10 +98,12 @@ void PipeStream::worker()
}
while ((len < toRead) && active_);
if (!active_)
break;
if (!active_) break;
encoder_->encode(chunk.get());
if (!active_) break;
nextTick += pcmReadMs_;
chronos::addUs(tvChunk, pcmReadMs_ * 1000);
long currentTick = chronos::getTickCount();
@ -108,7 +111,8 @@ void PipeStream::worker()
if (nextTick >= currentTick)
{
setState(kPlaying);
chronos::sleep(nextTick - currentTick);
if (!sleep(nextTick - currentTick))
break;
}
else
{
@ -122,7 +126,8 @@ void PipeStream::worker()
catch(const std::exception& e)
{
logE << "(PipeStream) Exception: " << e.what() << std::endl;
chronos::sleep(100);
if (!sleep(100))
break;
}
}
}