From 91a6e84caba43733ad2af15e98501bdf10b07368 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9B=D0=B5=D0=BE=D0=BD=D0=B8=D0=B4=20=D0=AE=D1=80=D1=8C?= =?UTF-8?q?=D0=B5=D0=B2=20=28Leonid=20Yuriev=29?= Date: Thu, 3 Nov 2022 12:57:18 +0300 Subject: [PATCH] =?UTF-8?q?mdbx-windows:=20=D0=BF=D0=BE=D0=BF=D1=8B=D1=82?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=B1=D0=BE=D1=80=D1=8C=D0=B1=D1=8B=20=D1=81=20?= =?UTF-8?q?=D0=BB=D0=BE=D0=B6=D0=BD=D0=BE-=D0=BF=D0=BE=D0=BB=D0=BE=D0=B6?= =?UTF-8?q?=D0=B8=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D1=8B=D0=BC=D0=B8=20=D0=BA?= =?UTF-8?q?=D0=BE=D0=BD=D1=84=D0=BB=D0=B8=D0=BA=D1=82=D0=B0=D0=BC=D0=B8=20?= =?UTF-8?q?`LockFileEx()`.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lck-windows.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/lck-windows.c b/src/lck-windows.c index 7038854e..96d416ad 100644 --- a/src/lck-windows.c +++ b/src/lck-windows.c @@ -203,6 +203,16 @@ int mdbx_txn_lock(MDBX_env *env, bool dontwait) { dontwait ? (LCK_EXCLUSIVE | LCK_DONTWAIT) : (LCK_EXCLUSIVE | LCK_WAITFOR), DXB_BODY); + if (rc == ERROR_LOCK_VIOLATION && dontwait) { + SleepEx(0, true); + rc = flock_with_event(env->me_fd4data, env->me_data_lock_event, + LCK_EXCLUSIVE | LCK_DONTWAIT, DXB_BODY); + if (rc == ERROR_LOCK_VIOLATION) { + SleepEx(0, true); + rc = flock_with_event(env->me_fd4data, env->me_data_lock_event, + LCK_EXCLUSIVE | LCK_DONTWAIT, DXB_BODY); + } + } if (rc == MDBX_SUCCESS) return rc;