oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

input/{cdio,ffmpeg,file,smbclient}: unlock the mutex during blocking I/O

Browse Source 
InputStream::Read() and InputStream::Seek() are called with the mutex
locked.  That means the implementation must not block, or unlock the
mutex before calling into blocking code.

Previously, a slow CD drive could stall the whole MPD process,
including the main thread, due to this problem.

Closes #149
This commit is contained in:
Max Kellermann
2017-11-13 17:08:00 +01:00
parent f82e1453e4
commit 31ab78ae8e
5 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/input/plugins/FfmpegInputPlugin.cxx
View File

@@ -104,7 +104,13 @@ input_ffmpeg_open(const char *uri,
size_t
FfmpegInputStream::Read(void *ptr, size_t read_size)
{
auto result = avio_read(h, (unsigned char *)ptr, read_size);
int result;
{
const ScopeUnlock unlock(mutex);
result = avio_read(h, (unsigned char *)ptr, read_size);
}
if (result <= 0) {
if (result < 0)
throw MakeFfmpegError(result, "avio_read() failed");
@@ -126,7 +132,12 @@ FfmpegInputStream::IsEOF() noexcept
void
FfmpegInputStream::Seek(offset_type new_offset)
{
auto result = avio_seek(h, new_offset, SEEK_SET);
int64_t result;
{
const ScopeUnlock unlock(mutex);
result = avio_seek(h, new_offset, SEEK_SET);
}
if (result < 0)
throw MakeFfmpegError(result, "avio_seek() failed");