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

test: refine oom-callback.

Browse Source
This commit is contained in:
Leo Yuriev 2017-05-25 09:51:26 +03:00
parent 5519d568f0
commit 89b5b53193
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/test.cc
View File

@ -100,9 +100,10 @@ int testcase::oom_callback(MDBX_env *env, int pid, mdbx_tid_t tid, uint64_t txn,
", txn #%" PRIu64 ", gap %d",
pid, (size_t)tid, txn, gap);
if (retry > 0 && self->should_continue()) {
if (self->should_continue(true)) {
osal_yield();
osal_udelay(retry * 100);
if (retry > 0)
osal_udelay(retry * 100);
return 1 /* always retry */;
}
@ -308,7 +309,7 @@ bool testcase::teardown() {
return true;
}
bool testcase::should_continue() const {
bool testcase::should_continue(bool check_timeout_only) const {
bool result = true;
if (config.params.test_duration) {
@ -319,7 +320,8 @@ bool testcase::should_continue() const {
result = false;
}
if (config.params.test_nops && nops_completed >= config.params.test_nops)
if (!check_timeout_only && config.params.test_nops &&
nops_completed >= config.params.test_nops)
result = false;
if (result && global::config::progress_indicator)

2
test/test.h
View File

@ -117,7 +117,7 @@ protected:
bool wait4start();
void report(size_t nops_done);
void signal();
bool should_continue() const;
bool should_continue(bool check_timeout_only = false) const;
void generate_pair(const keygen::serial_t serial, keygen::buffer &key,
keygen::buffer &value, keygen::serial_t data_age = 0) {