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

mdbx: rework prefer_max_scatter inside mdbx_update_gc().

Browse Source 
Change-Id: I6deceb73f8578d9306528e0204ba0895781057fe
This commit is contained in:
Leonid Yuriev 2018-09-17 01:24:57 +03:00
parent 79633ecfd7
commit 940138fbda
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/mdbx.c
View File

@ -3963,7 +3963,7 @@ retry:
if (0 >= (int)left) if (0 >= (int)left)
break; break;
const unsigned max_spread = 10; const unsigned prefer_max_scatter = 257;
txnid_t reservation_gc_id; txnid_t reservation_gc_id;
if (lifo) { if (lifo) {
assert(txn->mt_lifo_reclaimed != NULL); assert(txn->mt_lifo_reclaimed != NULL);
@ -3976,7 +3976,7 @@ retry:
} }
if (head_gc_id > 1 && if (head_gc_id > 1 &&
MDBX_PNL_SIZE(txn->mt_lifo_reclaimed) < max_spread && MDBX_PNL_SIZE(txn->mt_lifo_reclaimed) < prefer_max_scatter &&
left > ((unsigned)MDBX_PNL_SIZE(txn->mt_lifo_reclaimed) - left > ((unsigned)MDBX_PNL_SIZE(txn->mt_lifo_reclaimed) -
reused_gc_slots) * reused_gc_slots) *
env->me_maxgc_ov1page) { env->me_maxgc_ov1page) {
@ -4005,7 +4005,7 @@ retry:
" to lifo-reclaimed, cleaned-gc-slot = %u", " to lifo-reclaimed, cleaned-gc-slot = %u",
dbg_prefix_mode, head_gc_id, cleaned_gc_slot); dbg_prefix_mode, head_gc_id, cleaned_gc_slot);
} while (head_gc_id > 1 && } while (head_gc_id > 1 &&
MDBX_PNL_SIZE(txn->mt_lifo_reclaimed) < max_spread && MDBX_PNL_SIZE(txn->mt_lifo_reclaimed) < prefer_max_scatter &&
left > ((unsigned)MDBX_PNL_SIZE(txn->mt_lifo_reclaimed) - left > ((unsigned)MDBX_PNL_SIZE(txn->mt_lifo_reclaimed) -
reused_gc_slots) * reused_gc_slots) *
env->me_maxgc_ov1page); env->me_maxgc_ov1page);
@ -4045,7 +4045,10 @@ retry:
if (chunk < env->me_maxgc_ov1page * 2) if (chunk < env->me_maxgc_ov1page * 2)
chunk /= 2; chunk /= 2;
else { else {
const unsigned threshold = env->me_maxgc_ov1page * avail_gs_slots; const unsigned threshold =
env->me_maxgc_ov1page * ((avail_gs_slots < prefer_max_scatter)
? avail_gs_slots
: prefer_max_scatter);
if (left < threshold) if (left < threshold)
chunk = env->me_maxgc_ov1page; chunk = env->me_maxgc_ov1page;
else { else {
@ -4071,7 +4074,7 @@ retry:
chunk = (avail >= tail) ? tail - span chunk = (avail >= tail) ? tail - span
: (avail_gs_slots > 3 && : (avail_gs_slots > 3 &&
reused_gc_slots < max_spread - 3) reused_gc_slots < prefer_max_scatter - 3)
? avail - span ? avail - span
: tail; : tail;
} }
@ -4112,6 +4115,14 @@ retry:
settled += chunk; settled += chunk;
mdbx_trace("%s.settled %u (+%u), continue", dbg_prefix_mode, settled, mdbx_trace("%s.settled %u (+%u), continue", dbg_prefix_mode, settled,
chunk); chunk);
if (txn->mt_lifo_reclaimed &&
unlikely(amount < MDBX_PNL_SIZE(env->me_reclaimed_pglist))) {
mdbx_notice("** restart: reclaimed-list growth %u -> %u", amount,
(unsigned)MDBX_PNL_SIZE(env->me_reclaimed_pglist));
goto retry;
}
continue; continue;
} }