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

decoder/Control: improve locking in Start() and Seek()

Browse Source 
Previously, both methods accessed a lot of attributes which require
mutex protection.
This commit is contained in:
Max Kellermann
2017-02-05 13:37:20 +01:00
parent e716b1f4d7
commit 43348a3e13
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/decoder/DecoderControl.cxx
View File

@@ -95,6 +95,8 @@ DecoderControl::Start(DetachedSong *_song,
SongTime _start_time, SongTime _end_time, SongTime _start_time, SongTime _end_time,
MusicBuffer &_buffer, MusicPipe &_pipe) MusicBuffer &_buffer, MusicPipe &_pipe)
{ {
const std::lock_guard<Mutex> protect(mutex);
assert(_song != nullptr); assert(_song != nullptr);
assert(_pipe.IsEmpty()); assert(_pipe.IsEmpty());
@@ -105,7 +107,8 @@ DecoderControl::Start(DetachedSong *_song,
buffer = &_buffer; buffer = &_buffer;
pipe = &_pipe; pipe = &_pipe;
LockSynchronousCommand(DecoderCommand::START); ClearError();
SynchronousCommandLocked(DecoderCommand::START);
} }
void void
@@ -127,6 +130,8 @@ DecoderControl::Stop()
void void
DecoderControl::Seek(SongTime t) DecoderControl::Seek(SongTime t)
{ {
const std::lock_guard<Mutex> protect(mutex);
assert(state != DecoderState::START); assert(state != DecoderState::START);
assert(state != DecoderState::ERROR); assert(state != DecoderState::ERROR);
@@ -149,7 +154,7 @@ DecoderControl::Seek(SongTime t)
seek_time = t; seek_time = t;
seek_error = false; seek_error = false;
LockSynchronousCommand(DecoderCommand::SEEK); SynchronousCommandLocked(DecoderCommand::SEEK);
if (seek_error) if (seek_error)
throw std::runtime_error("Decoder failed to seek"); throw std::runtime_error("Decoder failed to seek");