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

mdbx: backport - add fallback2shared for mdbx_lck_exclusive().

Browse Source
This commit is contained in:
Leo Yuriev 2018-08-01 18:25:41 +03:00 committed by Leonid Yuriev
parent eb99480253
commit d4bfc17818
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/lck-posix.c
View File

@ -68,11 +68,19 @@ static int mdbx_lck_op(mdbx_filehandle_t fd, int op, int lck, off_t offset,
} }
} }
static __inline int mdbx_lck_exclusive(int lfd) { static __inline int mdbx_lck_exclusive(int lfd, bool fallback2shared) {
assert(lfd != INVALID_HANDLE_VALUE); assert(lfd != INVALID_HANDLE_VALUE);
if (flock(lfd, LOCK_EX | LOCK_NB)) if (flock(lfd, LOCK_EX | LOCK_NB))
return errno; return errno;
return mdbx_lck_op(lfd, F_SETLK, F_WRLCK, 0, 1); int rc = mdbx_lck_op(lfd, F_SETLK, F_WRLCK, 0, 1);
if (rc != 0 && fallback2shared) {
while (flock(lfd, LOCK_SH)) {
int rc = errno;
if (rc != EINTR)
return rc;
}
}
return rc;
} }
static __inline int mdbx_lck_shared(int lfd) { static __inline int mdbx_lck_shared(int lfd) {
@ -157,7 +165,7 @@ bailout:
void mdbx_lck_destroy(MDBX_env *env) { void mdbx_lck_destroy(MDBX_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, false) == 0) {
mdbx_info("%s: got exclusive, drown mutexes", mdbx_func_); 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)
@ -225,7 +233,7 @@ static int internal_seize_lck(int lfd) {
assert(lfd != INVALID_HANDLE_VALUE); assert(lfd != INVALID_HANDLE_VALUE);
/* try exclusive access */ /* try exclusive access */
int rc = mdbx_lck_exclusive(lfd); int rc = mdbx_lck_exclusive(lfd, false);
if (rc == 0) if (rc == 0)
/* got exclusive */ /* got exclusive */
return MDBX_RESULT_TRUE; return MDBX_RESULT_TRUE;
@ -234,7 +242,7 @@ static int internal_seize_lck(int lfd) {
rc = mdbx_lck_shared(lfd); rc = mdbx_lck_shared(lfd);
if (rc == 0) { if (rc == 0) {
/* got shared, try exclusive again */ /* got shared, try exclusive again */
rc = mdbx_lck_exclusive(lfd); rc = mdbx_lck_exclusive(lfd, true);
if (rc == 0) if (rc == 0)
/* now got exclusive */ /* now got exclusive */
return MDBX_RESULT_TRUE; return MDBX_RESULT_TRUE;