ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2025-01-06 18:44:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx: more lck-debug.

Browse Source
This commit is contained in:
Leo Yuriev 2017-05-18 15:36:53 +03:00
parent d2af39fd73
commit b4fd0500d1
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/lck-posix.c
View File

@ -162,7 +162,7 @@ void mdbx_lck_destroy(MDB_env *env) {
if (env->me_lfd != INVALID_HANDLE_VALUE) { if (env->me_lfd != INVALID_HANDLE_VALUE) {
/* try get exclusive access */ /* try get exclusive access */
if (env->me_lck && mdbx_lck_exclusive(env->me_lfd) == 0) { 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); int rc = pthread_mutex_destroy(&env->me_lck->mti_rmutex);
if (rc == 0) if (rc == 0)
rc = pthread_mutex_destroy(&env->me_lck->mti_wmutex); 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) { 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) { void mdbx_rdt_unlock(MDB_env *env) {
mdbx_trace(">>");
int rc = mdbx_robust_unlock(env, &env->me_lck->mti_rmutex); int rc = mdbx_robust_unlock(env, &env->me_lck->mti_rmutex);
mdbx_trace("<< rc %d", rc);
if (unlikely(MDBX_IS_ERROR(rc))) if (unlikely(MDBX_IS_ERROR(rc)))
mdbx_panic("%s() failed: errcode %d\n", mdbx_func_, rc); mdbx_panic("%s() failed: errcode %d\n", mdbx_func_, rc);
} }
int mdbx_txn_lock(MDB_env *env) { int mdbx_txn_lock(MDB_env *env) {
mdbx_trace(">>");
int rc = mdbx_robust_lock(env, &env->me_lck->mti_wmutex); int rc = mdbx_robust_lock(env, &env->me_lck->mti_wmutex);
mdbx_trace("<< rc %d", rc);
return MDBX_IS_ERROR(rc) ? rc : MDB_SUCCESS; return MDBX_IS_ERROR(rc) ? rc : MDB_SUCCESS;
} }
void mdbx_txn_unlock(MDB_env *env) { void mdbx_txn_unlock(MDB_env *env) {
mdbx_trace(">>");
int rc = mdbx_robust_unlock(env, &env->me_lck->mti_wmutex); int rc = mdbx_robust_unlock(env, &env->me_lck->mti_wmutex);
mdbx_trace("<< rc %d", rc);
if (unlikely(MDBX_IS_ERROR(rc))) if (unlikely(MDBX_IS_ERROR(rc)))
mdbx_panic("%s() failed: errcode %d\n", mdbx_func_, 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 */ #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) { if (rc != EDEADLK) {
env->me_flags |= MDB_FATAL_ERROR; env->me_flags |= MDB_FATAL_ERROR;
rc = MDB_PANIC; rc = MDB_PANIC;

2
src/mdbx.c
View File

@ -3955,7 +3955,7 @@ static int __cold mdbx_setup_lck(MDB_env *env, char *lck_pathname, int mode) {
if (rc == MDBX_RESULT_TRUE) { if (rc == MDBX_RESULT_TRUE) {
/* LY: exlcusive mode, init lck */ /* LY: exlcusive mode, init lck */
memset(env->me_lck, 0, sizeof(MDBX_lockinfo)); memset(env->me_lck, 0, size);
err = mdbx_lck_init(env); err = mdbx_lck_init(env);
if (err) if (err)
return err; return err;