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

lib/smbclient/Context: add global Mutex for smbc_{new,free}_context()

Browse Source 
Preparing to replace `smbclient_mutex`, for finer-grained locking.
This commit is contained in:
Max Kellermann
2020-07-20 22:29:18 +02:00
parent 7d97d0ae87
commit bb3f487ee5
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib/smbclient/Context.cxx
View File

@@ -24,6 +24,8 @@
#include <string.h> #include <string.h>
Mutex SmbclientContext::global_mutex;
static void static void
mpd_smbc_get_auth_data([[maybe_unused]] const char *srv, mpd_smbc_get_auth_data([[maybe_unused]] const char *srv,
[[maybe_unused]] const char *shr, [[maybe_unused]] const char *shr,
@@ -40,7 +42,13 @@ mpd_smbc_get_auth_data([[maybe_unused]] const char *srv,
SmbclientContext SmbclientContext
SmbclientContext::New() SmbclientContext::New()
{ {
SMBCCTX *ctx = smbc_new_context(); SMBCCTX *ctx;
{
const std::lock_guard<Mutex> protect(global_mutex);
ctx = smbc_new_context();
}
if (ctx == nullptr) if (ctx == nullptr)
throw MakeErrno("smbc_new_context() failed"); throw MakeErrno("smbc_new_context() failed");

14
src/lib/smbclient/Context.hxx
View File

@@ -20,6 +20,8 @@
#ifndef MPD_SMBCLIENT_CONTEXT_HXX #ifndef MPD_SMBCLIENT_CONTEXT_HXX
#define MPD_SMBCLIENT_CONTEXT_HXX #define MPD_SMBCLIENT_CONTEXT_HXX
#include "thread/Mutex.hxx"
#include <libsmbclient.h> #include <libsmbclient.h>
#include <utility> #include <utility>
@@ -28,6 +30,14 @@
* Wrapper for `SMBCCTX*`. * Wrapper for `SMBCCTX*`.
*/ */
class SmbclientContext { class SmbclientContext {
/**
* This mutex protects the libsmbclient functions
* smbc_new_context() and smbc_free_context() which need to be
* serialized. We need to do this because we can't use
* smbc_thread_posix(), which is not exported by libsmbclient.
*/
static Mutex global_mutex;
SMBCCTX *ctx = nullptr; SMBCCTX *ctx = nullptr;
explicit SmbclientContext(SMBCCTX *_ctx) noexcept explicit SmbclientContext(SMBCCTX *_ctx) noexcept
@@ -37,8 +47,10 @@ public:
SmbclientContext() = default; SmbclientContext() = default;
~SmbclientContext() noexcept { ~SmbclientContext() noexcept {
if (ctx != nullptr) if (ctx != nullptr) {
const std::lock_guard<Mutex> protect(global_mutex);
smbc_free_context(ctx, 1); smbc_free_context(ctx, 1);
}
} }
SmbclientContext(SmbclientContext &&src) noexcept SmbclientContext(SmbclientContext &&src) noexcept