From b4fd0500d1b3fadd13940370795055bd5cfc3d4b Mon Sep 17 00:00:00 2001
From: Leo Yuriev <leo@yuriev.ru>
Date: Thu, 18 May 2017 15:36:53 +0300
Subject: [PATCH] mdbx: more lck-debug.

---
 src/lck-posix.c | 15 ++++++++++++---
 src/mdbx.c      |  2 +-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/lck-posix.c b/src/lck-posix.c
index 40972a03..5aa818d8 100644
--- a/src/lck-posix.c
+++ b/src/lck-posix.c
@@ -162,7 +162,7 @@ void mdbx_lck_destroy(MDB_env *env) {
   if (env->me_lfd != INVALID_HANDLE_VALUE) {
     /* try get exclusive access */
     if (env->me_lck && mdbx_lck_exclusive(env->me_lfd) == 0) {
-      /* got exclusive, drown mutexes */
+      mdbx_info("%s: got exclusive, drown mutexes", mdbx_func_);
       int rc = pthread_mutex_destroy(&env->me_lck->mti_rmutex);
       if (rc == 0)
         rc = pthread_mutex_destroy(&env->me_lck->mti_wmutex);
@@ -188,22 +188,31 @@ static int mdbx_robust_unlock(MDB_env *env, pthread_mutex_t *mutex) {
 }
 
 int mdbx_rdt_lock(MDB_env *env) {
-  return mdbx_robust_lock(env, &env->me_lck->mti_rmutex);
+  mdbx_trace(">>");
+  int rc = mdbx_robust_lock(env, &env->me_lck->mti_rmutex);
+  mdbx_trace("<< rc %d", rc);
+  return rc;
 }
 
 void mdbx_rdt_unlock(MDB_env *env) {
+  mdbx_trace(">>");
   int rc = mdbx_robust_unlock(env, &env->me_lck->mti_rmutex);
+  mdbx_trace("<< rc %d", rc);
   if (unlikely(MDBX_IS_ERROR(rc)))
     mdbx_panic("%s() failed: errcode %d\n", mdbx_func_, rc);
 }
 
 int mdbx_txn_lock(MDB_env *env) {
+  mdbx_trace(">>");
   int rc = mdbx_robust_lock(env, &env->me_lck->mti_wmutex);
+  mdbx_trace("<< rc %d", rc);
   return MDBX_IS_ERROR(rc) ? rc : MDB_SUCCESS;
 }
 
 void mdbx_txn_unlock(MDB_env *env) {
+  mdbx_trace(">>");
   int rc = mdbx_robust_unlock(env, &env->me_lck->mti_wmutex);
+  mdbx_trace("<< rc %d", rc);
   if (unlikely(MDBX_IS_ERROR(rc)))
     mdbx_panic("%s() failed: errcode %d\n", mdbx_func_, rc);
 }
@@ -296,7 +305,7 @@ static int __cold mdbx_mutex_failed(MDB_env *env, mdbx_mutex_t *mutex, int rc) {
   }
 #endif /* MDB_USE_ROBUST */
 
-  mdbx_error("lock mutex failed, %s", mdbx_strerror(rc));
+  mdbx_error("mutex (un)lock failed, %s", mdbx_strerror(rc));
   if (rc != EDEADLK) {
     env->me_flags |= MDB_FATAL_ERROR;
     rc = MDB_PANIC;
diff --git a/src/mdbx.c b/src/mdbx.c
index 077281e8..8e666202 100644
--- a/src/mdbx.c
+++ b/src/mdbx.c
@@ -3955,7 +3955,7 @@ static int __cold mdbx_setup_lck(MDB_env *env, char *lck_pathname, int mode) {
 
   if (rc == MDBX_RESULT_TRUE) {
     /* LY: exlcusive mode, init lck */
-    memset(env->me_lck, 0, sizeof(MDBX_lockinfo));
+    memset(env->me_lck, 0, size);
     err = mdbx_lck_init(env);
     if (err)
       return err;