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

thread/Mutex: remove ScopeLock, use std::lock_guard directly

Browse Source
This commit is contained in:
Max Kellermann
2017-01-03 07:11:57 +01:00
parent a42021655c
commit 2e182e84c3
51 changed files with 158 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/storage/plugins/NfsStorage.cxx
View File

@@ -133,7 +133,7 @@ private:
void SetState(State _state) {
assert(GetEventLoop().IsInside());
const ScopeLock protect(mutex);
const std::lock_guard<Mutex> protect(mutex);
state = _state;
cond.broadcast();
}
@@ -141,7 +141,7 @@ private:
void SetState(State _state, std::exception_ptr &&e) {
assert(GetEventLoop().IsInside());
const ScopeLock protect(mutex);
const std::lock_guard<Mutex> protect(mutex);
state = _state;
last_exception = std::move(e);
cond.broadcast();
@@ -164,7 +164,7 @@ private:
}
void WaitConnected() {
const ScopeLock protect(mutex);
const std::lock_guard<Mutex> protect(mutex);
while (true) {
switch (state) {

8
src/storage/plugins/SmbclientStorage.cxx
View File

@@ -97,7 +97,7 @@ GetInfo(const char *path)
struct stat st;
{
const ScopeLock protect(smbclient_mutex);
const std::lock_guard<Mutex> protect(smbclient_mutex);
if (smbc_stat(path, &st) != 0)
throw MakeErrno("Failed to access file");
}
@@ -132,7 +132,7 @@ SmbclientStorage::OpenDirectory(const char *uri_utf8)
int handle;
{
const ScopeLock protect(smbclient_mutex);
const std::lock_guard<Mutex> protect(smbclient_mutex);
handle = smbc_opendir(mapped.c_str());
if (handle < 0)
throw MakeErrno("Failed to open directory");
@@ -160,7 +160,7 @@ SmbclientDirectoryReader::~SmbclientDirectoryReader()
const char *
SmbclientDirectoryReader::Read()
{
const ScopeLock protect(smbclient_mutex);
const std::lock_guard<Mutex> protect(smbclient_mutex);
struct smbc_dirent *e;
while ((e = smbc_readdir(handle)) != nullptr) {
@@ -187,7 +187,7 @@ CreateSmbclientStorageURI(gcc_unused EventLoop &event_loop, const char *base)
SmbclientInit();
const ScopeLock protect(smbclient_mutex);
const std::lock_guard<Mutex> protect(smbclient_mutex);
SMBCCTX *ctx = smbc_new_context();
if (ctx == nullptr)
throw MakeErrno("smbc_new_context() failed");