ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2025-10-31 15:38:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx: cleanup mdbx_mutex_failed().

Browse Source
This commit is contained in:
Leo Yuriev
2017-04-21 19:00:07 +03:00
parent ebb404e5bc
commit 36f1491ba8
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/lck-posix.c
View File

@@ -208,11 +208,9 @@ static int mdbx_lck_op(mdbx_filehandle_t fd, int op, int lck, off_t offset) {
static int __cold mdbx_mutex_failed(MDB_env *env, mdbx_mutex_t *mutex, int rc) {
#if MDB_USE_ROBUST
if (unlikely(rc == EOWNERDEAD)) {
int rlocked, rc2;
/* We own the mutex. Clean up after dead previous owner. */
rc = MDBX_RESULT_TRUE;
rlocked = (mutex == &env->me_txns->mti_rmutex);
rc = MDB_SUCCESS;
int rlocked = (mutex == &env->me_txns->mti_rmutex);
if (!rlocked) {
/* env is hosed if the dead thread was ours */
if (env->me_txn) {
@@ -223,7 +221,7 @@ static int __cold mdbx_mutex_failed(MDB_env *env, mdbx_mutex_t *mutex, int rc) {
}
mdbx_debug("%cmutex owner died, %s", (rlocked ? 'r' : 'w'),
(rc ? "this process' env is hosed" : "recovering"));
rc2 = mdbx_reader_check0(env, rlocked, NULL);
int rc2 = mdbx_reader_check0(env, rlocked, NULL);
if (rc2 == 0)
#if __GLIBC_PREREQ(2, 12)
rc2 = pthread_mutex_consistent(mutex);