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-chk: refine user-break (ctrl+c) handling.

Browse Source 
Change-Id: I5b1a71a2945990091c0f472d5e2256ace8dc2065
This commit is contained in:
Leonid Yuriev 2019-11-23 14:51:14 +03:00
parent e69a7c1ba2
commit 9bd88d80d0
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/tools/mdbx_chk.c
View File

@ -42,7 +42,7 @@ const flagbit dbflags[] = {{MDBX_DUPSORT, "dupsort"},
static volatile BOOL user_break; static volatile BOOL user_break;
static BOOL WINAPI ConsoleBreakHandlerRoutine(DWORD dwCtrlType) { static BOOL WINAPI ConsoleBreakHandlerRoutine(DWORD dwCtrlType) {
(void)dwCtrlType; (void)dwCtrlType;
user_break = true; user_break = 1;
return true; return true;
} }
@ -131,6 +131,18 @@ static void __printf_args(1, 2) error(const char *msg, ...) {
} }
} }
static int check_user_break(void) {
switch (user_break) {
case 0:
return MDBX_SUCCESS;
case 1:
print(" - interrupted by signal\n");
fflush(NULL);
user_break = 2;
}
return MDBX_EINTR;
}
static void pagemap_cleanup(void) { static void pagemap_cleanup(void) {
for (size_t i = CORE_DBS + /* account pseudo-entry for meta */ 1; for (size_t i = CORE_DBS + /* account pseudo-entry for meta */ 1;
i < ARRAY_LENGTH(walk.dbi); ++i) { i < ARRAY_LENGTH(walk.dbi); ++i) {
@ -387,7 +399,7 @@ static int pgvisitor(const uint64_t pgno, const unsigned pgnumber,
} }
} }
return user_break ? MDBX_EINTR : MDBX_SUCCESS; return check_user_break();
} }
typedef int(visitor)(const uint64_t record_number, const MDBX_val *key, typedef int(visitor)(const uint64_t record_number, const MDBX_val *key,
@ -400,7 +412,7 @@ static int handle_userdb(const uint64_t record_number, const MDBX_val *key,
(void)record_number; (void)record_number;
(void)key; (void)key;
(void)data; (void)data;
return MDBX_SUCCESS; return check_user_break();
} }
static int handle_freedb(const uint64_t record_number, const MDBX_val *key, static int handle_freedb(const uint64_t record_number, const MDBX_val *key,
@ -443,6 +455,8 @@ static int handle_freedb(const uint64_t record_number, const MDBX_val *key,
pgno_t prev = MDBX_PNL_ASCENDING ? NUM_METAS - 1 : txn->mt_next_pgno; pgno_t prev = MDBX_PNL_ASCENDING ? NUM_METAS - 1 : txn->mt_next_pgno;
pgno_t span = 1; pgno_t span = 1;
for (unsigned i = 0; i < number; ++i) { for (unsigned i = 0; i < number; ++i) {
if (check_user_break())
return MDBX_EINTR;
const pgno_t pgno = iptr[i]; const pgno_t pgno = iptr[i];
if (pgno < NUM_METAS) if (pgno < NUM_METAS)
problem_add("entry", txnid, "wrong idl entry", problem_add("entry", txnid, "wrong idl entry",
@ -503,7 +517,7 @@ static int handle_freedb(const uint64_t record_number, const MDBX_val *key,
} }
} }
return MDBX_SUCCESS; return check_user_break();
} }
static int handle_maindb(const uint64_t record_number, const MDBX_val *key, static int handle_maindb(const uint64_t record_number, const MDBX_val *key,
@ -641,12 +655,9 @@ static int process_db(MDBX_dbi dbi_handle, char *dbi_name, visitor *handler,
prev_data.iov_len = 0; prev_data.iov_len = 0;
rc = mdbx_cursor_get(mc, &key, &data, MDBX_FIRST); rc = mdbx_cursor_get(mc, &key, &data, MDBX_FIRST);
while (rc == MDBX_SUCCESS) { while (rc == MDBX_SUCCESS) {
if (user_break) { rc = check_user_break();
print(" - interrupted by signal\n"); if (rc)
fflush(NULL);
rc = MDBX_EINTR;
goto bailout; goto bailout;
}
bool bad_key = false; bool bad_key = false;
if (key.iov_len > maxkeysize) { if (key.iov_len > maxkeysize) {
@ -1244,12 +1255,8 @@ int main(int argc, char *argv[]) {
traversal_problems = problems_pop(saved_list); traversal_problems = problems_pop(saved_list);
if (rc) { if (rc) {
if (rc == MDBX_EINTR && user_break) { if (rc != MDBX_EINTR || !check_user_break())
print(" - interrupted by signal\n");
fflush(NULL);
} else {
error("mdbx_env_pgwalk failed, error %d %s\n", rc, mdbx_strerror(rc)); error("mdbx_env_pgwalk failed, error %d %s\n", rc, mdbx_strerror(rc));
}
goto bailout; goto bailout;
} }