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

reopen pipe on error

Browse source
This commit is contained in:
badaix 2016-02-08 12:49:09 +01:00
parent 8ac895eeb3
commit 73a9223c6f
1 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

22
server/pcmreader/pipeReader.cpp
View file

@ -25,6 +25,7 @@
#include "../encoder/encoderFactory.h"
#include "common/log.h"
#include "common/snapException.h"
#include "common/compat.h"
using namespace std;
@ -32,18 +33,17 @@ using namespace std;
PipeReader::PipeReader(PcmListener* pcmListener, const ReaderUri& uri) : PcmReader(pcmListener, uri)
PipeReader::PipeReader(PcmListener* pcmListener, const ReaderUri& uri) : PcmReader(pcmListener, uri), fd_(-1)
{
umask(0);
mkfifo(uri_.path.c_str(), 0666);
fd_ = open(uri_.path.c_str(), O_RDONLY | O_NONBLOCK);
if (fd_ == -1)
throw SnapException("failed to open fifo: \"" + uri_.path + "\"");
if ((mkfifo(uri_.path.c_str(), 0666) != 0) && (errno != EEXIST))
throw SnapException("failed to make fifo \"" + uri_.path + "\": " + cpt::to_string(errno));
}
PipeReader::~PipeReader()
{
if (fd_ != -1)
close(fd_);
}
@ -55,11 +55,17 @@ void PipeReader::worker()
while (active_)
{
if (fd_ != -1)
close(fd_);
fd_ = open(uri_.path.c_str(), O_RDONLY | O_NONBLOCK);
gettimeofday(&tvChunk, NULL);
tvEncodedChunk_ = tvChunk;
long nextTick = chronos::getTickCount();
try
{
if (fd_ == -1)
throw SnapException("failed to open fifo: \"" + uri_.path + "\"");
while (active_)
{
chunk->timestamp.sec = tvChunk.tv_sec;
@ -69,9 +75,10 @@ void PipeReader::worker()
do
{
int count = read(fd_, chunk->payload + len, toRead - len);
if (count <= 0)
if (count < 0)
usleep(100*1000);
else if (count == 0)
throw SnapException("end of file");
else
len += count;
}
@ -99,6 +106,7 @@ void PipeReader::worker()
catch(const std::exception& e)
{
logE << "Exception: " << e.what() << std::endl;
usleep(100*1000);
}
}
}