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

input/nfs: use class ScopeUnlock

Browse Source
This commit is contained in:
Max Kellermann 2016-09-16 16:51:36 +02:00
parent 220d9528a3
commit 687ea53616
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/input/plugins/NfsInputPlugin.cxx
View File

@ -96,10 +96,13 @@ NfsInputStream::DoRead()
size_t nbytes = std::min<size_t>(std::min<uint64_t>(remaining, 32768),
buffer_space);
mutex.unlock();
Error error;
bool success = NfsFileReader::Read(next_offset, nbytes, error);
mutex.lock();
bool success;
{
const ScopeUnlock unlock(mutex);
success = NfsFileReader::Read(next_offset, nbytes, error);
}
if (!success) {
PostponeError(std::move(error));
@ -135,9 +138,10 @@ NfsInputStream::DoResume()
void
NfsInputStream::DoSeek(offset_type new_offset)
{
mutex.unlock();
{
const ScopeUnlock unlock(mutex);
NfsFileReader::CancelRead();
mutex.lock();
}
next_offset = offset = new_offset;
SeekDone();