ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2025-01-04 16:14:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx: корректировка префиксов имён osal-ipc функций.

Browse Source
This commit is contained in:
Леонид Юрьев (Leonid Yuriev) 2023-11-12 00:23:26 +03:00
parent 97418d5c9c
commit eddade7b99
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lck-posix.c
View File

@ -875,7 +875,7 @@ MDBX_INTERNAL_FUNC int osal_check_tid4bionic(void) {
} }
#endif /* __ANDROID_API__ || ANDROID) || BIONIC */ #endif /* __ANDROID_API__ || ANDROID) || BIONIC */
static int mdbx_ipclock_lock(MDBX_env *env, osal_ipclock_t *ipc, static int osal_ipclock_lock(MDBX_env *env, osal_ipclock_t *ipc,
const bool dont_wait) { const bool dont_wait) {
#if MDBX_LOCKING == MDBX_LOCKING_POSIX2001 || \ #if MDBX_LOCKING == MDBX_LOCKING_POSIX2001 || \
MDBX_LOCKING == MDBX_LOCKING_POSIX2008 MDBX_LOCKING == MDBX_LOCKING_POSIX2008
@ -915,7 +915,7 @@ static int mdbx_ipclock_lock(MDBX_env *env, osal_ipclock_t *ipc,
return rc; return rc;
} }
static int mdbx_ipclock_unlock(MDBX_env *env, osal_ipclock_t *ipc) { int osal_ipclock_unlock(MDBX_env *env, osal_ipclock_t *ipc) {
#if MDBX_LOCKING == MDBX_LOCKING_POSIX2001 || \ #if MDBX_LOCKING == MDBX_LOCKING_POSIX2001 || \
MDBX_LOCKING == MDBX_LOCKING_POSIX2008 MDBX_LOCKING == MDBX_LOCKING_POSIX2008
int rc = pthread_mutex_unlock(ipc); int rc = pthread_mutex_unlock(ipc);
@ -940,14 +940,14 @@ static int mdbx_ipclock_unlock(MDBX_env *env, osal_ipclock_t *ipc) {
MDBX_INTERNAL_FUNC int osal_rdt_lock(MDBX_env *env) { MDBX_INTERNAL_FUNC int osal_rdt_lock(MDBX_env *env) {
TRACE("%s", ">>"); TRACE("%s", ">>");
jitter4testing(true); jitter4testing(true);
int rc = mdbx_ipclock_lock(env, &env->me_lck->mti_rlock, false); int rc = osal_ipclock_lock(env, &env->me_lck->mti_rlock, false);
TRACE("<< rc %d", rc); TRACE("<< rc %d", rc);
return rc; return rc;
} }
MDBX_INTERNAL_FUNC void osal_rdt_unlock(MDBX_env *env) { MDBX_INTERNAL_FUNC void osal_rdt_unlock(MDBX_env *env) {
TRACE("%s", ">>"); TRACE("%s", ">>");
int rc = mdbx_ipclock_unlock(env, &env->me_lck->mti_rlock); int rc = osal_ipclock_unlock(env, &env->me_lck->mti_rlock);
TRACE("<< rc %d", rc); TRACE("<< rc %d", rc);
if (unlikely(rc != MDBX_SUCCESS)) if (unlikely(rc != MDBX_SUCCESS))
mdbx_panic("%s() failed: err %d\n", __func__, rc); mdbx_panic("%s() failed: err %d\n", __func__, rc);
@ -957,7 +957,7 @@ MDBX_INTERNAL_FUNC void osal_rdt_unlock(MDBX_env *env) {
int osal_txn_lock(MDBX_env *env, bool dont_wait) { int osal_txn_lock(MDBX_env *env, bool dont_wait) {
TRACE("%swait %s", dont_wait ? "dont-" : "", ">>"); TRACE("%swait %s", dont_wait ? "dont-" : "", ">>");
jitter4testing(true); jitter4testing(true);
const int err = mdbx_ipclock_lock(env, &env->me_lck->mti_wlock, dont_wait); const int err = osal_ipclock_lock(env, &env->me_lck->mti_wlock, dont_wait);
int rc = err; int rc = err;
if (likely(!MDBX_IS_ERROR(err))) { if (likely(!MDBX_IS_ERROR(err))) {
eASSERT(env, !env->me_txn0->mt_owner || eASSERT(env, !env->me_txn0->mt_owner ||
@ -975,7 +975,7 @@ void osal_txn_unlock(MDBX_env *env) {
TRACE("%s", ">>"); TRACE("%s", ">>");
eASSERT(env, env->me_txn0->mt_owner == osal_thread_self()); eASSERT(env, env->me_txn0->mt_owner == osal_thread_self());
env->me_txn0->mt_owner = 0; env->me_txn0->mt_owner = 0;
int err = mdbx_ipclock_unlock(env, &env->me_lck->mti_wlock); int err = osal_ipclock_unlock(env, &env->me_lck->mti_wlock);
TRACE("<< err %d", err); TRACE("<< err %d", err);
if (unlikely(err != MDBX_SUCCESS)) if (unlikely(err != MDBX_SUCCESS))
mdbx_panic("%s() failed: err %d\n", __func__, err); mdbx_panic("%s() failed: err %d\n", __func__, err);