From 4e0d7c92dfe1f185d01a7c0439f666366c725dad Mon Sep 17 00:00:00 2001 From: Namjae Kim Date: Thu, 29 Aug 2024 16:50:49 +0900 Subject: [PATCH] FIX: Add proxy_lock_count for multiple proxy in a process --- libmemcached/arcus.cc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libmemcached/arcus.cc b/libmemcached/arcus.cc index d7e59572..97a17335 100644 --- a/libmemcached/arcus.cc +++ b/libmemcached/arcus.cc @@ -74,6 +74,10 @@ static pthread_mutex_t azk_mtx = PTHREAD_MUTEX_INITIALIZER; static pthread_cond_t azk_cond = PTHREAD_COND_INITIALIZER; static int azk_count; +/* When using multiple arcus_proxy, ensure that they use different locks name */ +static pthread_mutex_t proxy_lock_mtx = PTHREAD_MUTEX_INITIALIZER; +static int proxy_lock_count; + pthread_mutex_t lock_arcus = PTHREAD_MUTEX_INITIALIZER; pthread_cond_t cond_arcus = PTHREAD_COND_INITIALIZER; @@ -223,15 +227,18 @@ static inline arcus_return_t do_arcus_proxy_create(memcached_st *mc, arcus->proxy.data->mutex.locked = 0; arcus->proxy.data->mutex.fname = NULL; + pthread_mutex_lock(&proxy_lock_mtx); char ap_lock_fname[64]; - snprintf(ap_lock_fname, 64, ".arcus_proxy_lock.%d", getpid()); + snprintf(ap_lock_fname, 64, ".arcus_proxy_lock.%d.%d", getpid(), ++proxy_lock_count); if (proc_mutex_create(&arcus->proxy.data->mutex, ap_lock_fname) != 0) { ZOO_LOG_ERROR(("Cannot create the proxy lock file. You might have to" " delete the lock file manually. file=%s error=%s(%d)", ap_lock_fname, strerror(errno), errno)); + pthread_mutex_unlock(&proxy_lock_mtx); return ARCUS_ERROR; } + pthread_mutex_unlock(&proxy_lock_mtx); return ARCUS_SUCCESS; }