ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2024-10-30 11:29:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx: minors.

Browse Source 
Change-Id: Id1d8ed5bf6ce253dc73b2e69e8701bffa83f7e12
This commit is contained in:
Leo Yuriev 2016-03-11 20:35:53 +03:00
parent ded1ada9eb
commit eb429da210
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lmdb.h
View File

@ -1658,7 +1658,7 @@ int mdb_reader_check(MDB_env *env, int *dead);
* @param[out] percent Percentage of page allocation in the database. * @param[out] percent Percentage of page allocation in the database.
* @return Number of transactions committed after the given was started for read, or -1 on failure. * @return Number of transactions committed after the given was started for read, or -1 on failure.
*/ */
int mdbx_txn_straggler(MDB_txn *txnm, int *percent); int mdbx_txn_straggler(MDB_txn *txn, int *percent);
/** @brief A callback function for killing a laggard readers, /** @brief A callback function for killing a laggard readers,
* called in case of MDB_MAP_FULL error. * called in case of MDB_MAP_FULL error.

21
mdb.c
View File

@ -108,7 +108,7 @@
# define MDB_DBG_EXTRA 0 # define MDB_DBG_EXTRA 0
# define MDB_DBG_AUDIT 0 # define MDB_DBG_AUDIT 0
# define MDB_DBG_EDGE 0 # define MDB_DBG_EDGE 0
#endif #endif /* ! MDBX_MODE_ENABLED */
#if (BYTE_ORDER == LITTLE_ENDIAN) == (BYTE_ORDER == BIG_ENDIAN) #if (BYTE_ORDER == LITTLE_ENDIAN) == (BYTE_ORDER == BIG_ENDIAN)
# error "Unknown or unsupported endianness (BYTE_ORDER)" # error "Unknown or unsupported endianness (BYTE_ORDER)"
@ -2862,9 +2862,8 @@ mdb_txn_renew0(MDB_txn *txn, unsigned flags)
#ifdef __SANITIZE_THREAD__ #ifdef __SANITIZE_THREAD__
pthread_mutex_lock(&tsan_mutex); pthread_mutex_lock(&tsan_mutex);
#endif #endif
if (i == nr) { if (i == nr)
env->me_txns->mti_numreaders = ++nr; env->me_txns->mti_numreaders = ++nr;
}
if (env->me_close_readers < nr) if (env->me_close_readers < nr)
env->me_close_readers = nr; env->me_close_readers = nr;
r->mr_pid = pid; r->mr_pid = pid;
@ -4871,9 +4870,9 @@ mdb_env_setup_locks(MDB_env *env, char *lpath, int mode, int *excl)
# error "Persistent DB flags & env flags overlap, but both go in mm_flags" # error "Persistent DB flags & env flags overlap, but both go in mm_flags"
#endif #endif
#if !MDBX_MODE_ENABLED #if ! MDBX_MODE_ENABLED
static static
#endif /* !MDBX_MODE_ENABLED*/ #endif /* ! MDBX_MODE_ENABLED */
int __cold int __cold
mdbx_env_open_ex(MDB_env *env, const char *path, unsigned flags, mode_t mode, int *exclusive) mdbx_env_open_ex(MDB_env *env, const char *path, unsigned flags, mode_t mode, int *exclusive)
{ {
@ -5101,9 +5100,9 @@ mdb_env_close0(MDB_env *env)
env->me_flags &= ~(MDB_ENV_ACTIVE|MDB_ENV_TXKEY); env->me_flags &= ~(MDB_ENV_ACTIVE|MDB_ENV_TXKEY);
} }
#if !MDBX_MODE_ENABLED #if ! MDBX_MODE_ENABLED
static static
#endif /* !MDBX_MODE_ENABLED*/ #endif /* ! MDBX_MODE_ENABLED */
int __cold int __cold
mdbx_env_close_ex(MDB_env *env, int dont_sync) mdbx_env_close_ex(MDB_env *env, int dont_sync)
{ {
@ -9680,9 +9679,9 @@ mdb_stat0(MDB_env *env, MDB_db *db, MDB_stat *arg)
return MDB_SUCCESS; return MDB_SUCCESS;
} }
#if !MDBX_MODE_ENABLED #if ! MDBX_MODE_ENABLED
static static
#endif /* !MDBX_MODE_ENABLED*/ #endif /* ! MDBX_MODE_ENABLED */
int __cold int __cold
mdbx_env_stat(MDB_env *env, MDBX_stat *arg, size_t bytes) mdbx_env_stat(MDB_env *env, MDBX_stat *arg, size_t bytes)
{ {
@ -9703,9 +9702,9 @@ mdb_env_stat(MDB_env *env, MDB_stat *arg)
return mdbx_env_stat(env, (MDBX_stat *) arg, sizeof(MDB_stat)); return mdbx_env_stat(env, (MDBX_stat *) arg, sizeof(MDB_stat));
} }
#if !MDBX_MODE_ENABLED #if ! MDBX_MODE_ENABLED
static static
#endif /* !MDBX_MODE_ENABLED*/ #endif /* ! MDBX_MODE_ENABLED */
int __cold mdbx_env_info(MDB_env *env, MDBX_envinfo *arg, size_t bytes) int __cold mdbx_env_info(MDB_env *env, MDBX_envinfo *arg, size_t bytes)
{ {
MDB_meta *meta; MDB_meta *meta;