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

mdbx: auto-setup MDBX_opt_txn_dp_limit.

Browse Source 
Related to https://github.com/erthink/libmdbx/issues/186

Change-Id: I8f8c4f1a2600462bc25b4fad3010a4e6ac70b386
This commit is contained in:
Leonid Yuriev 2021-04-27 23:08:52 +03:00
parent 6134220b8a
commit 89558657ea
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/core.c
View File

@ -10698,6 +10698,28 @@ static void __cold mdbx_setup_pagesize(MDBX_env *env, const size_t pagesize) {
mdbx_assert(env, bytes2pgno(env, pagesize + pagesize) == 2);
const pgno_t max_pgno = bytes2pgno(env, MAX_MAPSIZE);
if (!env->me_options.flags.non_auto.dp_limit) {
/* auto-setup dp_limit by "The42" ;-) */
intptr_t total_ram_pages, avail_ram_pages;
int err = mdbx_get_sysraminfo(nullptr, &total_ram_pages, &avail_ram_pages);
if (unlikely(err != MDBX_SUCCESS))
mdbx_error("mdbx_get_sysraminfo(), rc %d", err);
else {
size_t reasonable_dpl_limit =
(size_t)(total_ram_pages + avail_ram_pages) / 42;
if (pagesize > env->me_os_psize)
reasonable_dpl_limit /= pagesize / env->me_os_psize;
else if (pagesize < env->me_os_psize)
reasonable_dpl_limit *= env->me_os_psize / pagesize;
reasonable_dpl_limit = (reasonable_dpl_limit < MDBX_PGL_LIMIT)
? reasonable_dpl_limit
: MDBX_PGL_LIMIT;
reasonable_dpl_limit = (reasonable_dpl_limit > CURSOR_STACK * 4)
? reasonable_dpl_limit
: CURSOR_STACK * 4;
env->me_options.dp_limit = (unsigned)reasonable_dpl_limit;
}
}
if (env->me_options.dp_limit > max_pgno - NUM_METAS)
env->me_options.dp_limit = max_pgno - NUM_METAS;
if (env->me_options.dp_initial > env->me_options.dp_limit)
@ -21471,12 +21493,15 @@ __cold int mdbx_env_set_option(MDBX_env *env, const MDBX_option_t option,
if (option == MDBX_opt_txn_dp_initial &&
env->me_options.dp_initial != value32) {
env->me_options.dp_initial = value32;
if (env->me_options.dp_limit < value32)
if (env->me_options.dp_limit < value32) {
env->me_options.dp_limit = value32;
env->me_options.flags.non_auto.dp_limit = 1;
}
}
if (option == MDBX_opt_txn_dp_limit &&
env->me_options.dp_limit != value32) {
env->me_options.dp_limit = value32;
env->me_options.flags.non_auto.dp_limit = 1;
if (env->me_options.dp_initial > value32)
env->me_options.dp_initial = value32;
}

7
src/internals.h
View File

@ -1176,6 +1176,13 @@ struct MDBX_env {
uint8_t spill_max_denominator;
uint8_t spill_min_denominator;
uint8_t spill_parent4child_denominator;
union {
unsigned all;
/* tracks options with non-auto values but tuned by user */
struct {
unsigned dp_limit : 1;
} non_auto;
} flags;
} me_options;
/* struct me_dbgeo used for accepting db-geo params from user for the new