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

input/InputStreams: pass std::unique_lock<> to various methods

Browse Source
This commit is contained in:
Max Kellermann
2019-04-26 19:19:45 +02:00
parent 040573c636
commit 1b5c1f75a4
33 changed files with 212 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/archive/plugins/Bzip2ArchivePlugin.cxx
View File

@@ -72,7 +72,8 @@ public:
/* virtual methods from InputStream */
bool IsEOF() noexcept override;
size_t Read(void *ptr, size_t size) override;
size_t Read(std::unique_lock<Mutex> &lock,
void *ptr, size_t size) override;
private:
void Open();
@@ -147,7 +148,7 @@ Bzip2InputStream::FillBuffer()
}
size_t
Bzip2InputStream::Read(void *ptr, size_t length)
Bzip2InputStream::Read(std::unique_lock<Mutex> &, void *ptr, size_t length)
{
const ScopeUnlock unlock(mutex);

6
src/archive/plugins/Iso9660ArchivePlugin.cxx
View File

@@ -157,7 +157,8 @@ public:
/* virtual methods from InputStream */
bool IsEOF() noexcept override;
size_t Read(void *ptr, size_t size) override;
size_t Read(std::unique_lock<Mutex> &lock,
void *ptr, size_t size) override;
};
InputStreamPtr
@@ -174,7 +175,8 @@ Iso9660ArchiveFile::OpenStream(const char *pathname,
}
size_t
Iso9660InputStream::Read(void *ptr, size_t read_size)
Iso9660InputStream::Read(std::unique_lock<Mutex> &,
void *ptr, size_t read_size)
{
const ScopeUnlock unlock(mutex);

9
src/archive/plugins/ZzipArchivePlugin.cxx
View File

@@ -111,8 +111,9 @@ public:
/* virtual methods from InputStream */
bool IsEOF() noexcept override;
size_t Read(void *ptr, size_t size) override;
void Seek(offset_type offset) override;
size_t Read(std::unique_lock<Mutex> &lock,
void *ptr, size_t size) override;
void Seek(std::unique_lock<Mutex> &lock, offset_type offset) override;
};
InputStreamPtr
@@ -130,7 +131,7 @@ ZzipArchiveFile::OpenStream(const char *pathname,
}
size_t
ZzipInputStream::Read(void *ptr, size_t read_size)
ZzipInputStream::Read(std::unique_lock<Mutex> &, void *ptr, size_t read_size)
{
const ScopeUnlock unlock(mutex);
@@ -149,7 +150,7 @@ ZzipInputStream::IsEOF() noexcept
}
void
ZzipInputStream::Seek(offset_type new_offset)
ZzipInputStream::Seek(std::unique_lock<Mutex> &, offset_type new_offset)
{
const ScopeUnlock unlock(mutex);