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

lmdb: fix mdb_chk doesn't account an errors, but just report it.

Browse Source 
Change-Id: Ib70784ed7dff5ca67092b2fee556ae9f5a7aa3a6
This commit is contained in:
Leo Yuriev 2015-08-06 17:11:08 +03:00
parent 1171e4d73a
commit 0ee96ec09b
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
mdb_chk.c
View File

@ -70,6 +70,15 @@ size_t maxkeysize, reclaimable_pages, freedb_pages, lastpgno;
unsigned userdb_count; unsigned userdb_count;
unsigned verbose, quiet; unsigned verbose, quiet;
struct problem {
struct problem* pr_next;
size_t count;
const char* caption;
};
struct problem* problems_list;
size_t total_problems;
static void __attribute__ ((format (printf, 1, 2))) static void __attribute__ ((format (printf, 1, 2)))
print(const char* msg, ...) { print(const char* msg, ...) {
if (! quiet) { if (! quiet) {
@ -84,6 +93,8 @@ print(const char* msg, ...) {
static void __attribute__ ((format (printf, 1, 2))) static void __attribute__ ((format (printf, 1, 2)))
error(const char* msg, ...) { error(const char* msg, ...) {
total_problems++;
if (! quiet) { if (! quiet) {
va_list args; va_list args;
@ -94,15 +105,6 @@ error(const char* msg, ...) {
} }
} }
struct problem {
struct problem* pr_next;
size_t count;
const char* caption;
};
struct problem* problems_list;
size_t total_problems;
static int pagemap_lookup_dbi(const char* dbi) { static int pagemap_lookup_dbi(const char* dbi) {
static int last; static int last;
@ -570,7 +572,7 @@ int main(int argc, char *argv[])
const char sf[] = "KMGTPEZY"; /* LY: Kilo, Mega, Giga, Tera, Peta, Exa, Zetta, Yotta! */ const char sf[] = "KMGTPEZY"; /* LY: Kilo, Mega, Giga, Tera, Peta, Exa, Zetta, Yotta! */
for(i = 0; sf[i+1] && info.me_mapsize / k > 1000.0; ++i) for(i = 0; sf[i+1] && info.me_mapsize / k > 1000.0; ++i)
k *= 1024; k *= 1024;
print(" - map size %zu (%.1f%cb)\n", info.me_mapsize, print(" - map size %zu (%.2f %cb)\n", info.me_mapsize,
info.me_mapsize / k, sf[i]); info.me_mapsize / k, sf[i]);
if (info.me_mapaddr) if (info.me_mapaddr)
print(" - mapaddr %p\n", info.me_mapaddr); print(" - mapaddr %p\n", info.me_mapaddr);
@ -601,14 +603,14 @@ int main(int argc, char *argv[])
if (! meta_lt(info.me_meta1_txnid, info.me_meta1_sign, if (! meta_lt(info.me_meta1_txnid, info.me_meta1_sign,
info.me_meta2_txnid, info.me_meta2_sign) info.me_meta2_txnid, info.me_meta2_sign)
&& info.me_meta1_txnid != info.me_last_txnid) { && info.me_meta1_txnid != info.me_last_txnid) {
print(" - meta1 txn-id mismatch\n"); print(" - meta-1 txn-id mismatch\n");
++problems_meta; ++problems_meta;
} }
if (! meta_lt(info.me_meta2_txnid, info.me_meta2_sign, if (! meta_lt(info.me_meta2_txnid, info.me_meta2_sign,
info.me_meta1_txnid, info.me_meta1_sign) info.me_meta1_txnid, info.me_meta1_sign)
&& info.me_meta2_txnid != info.me_last_txnid) { && info.me_meta2_txnid != info.me_last_txnid) {
print(" - meta2 txn-id mismatch\n"); print(" - meta-2 txn-id mismatch\n");
++problems_meta; ++problems_meta;
} }
@ -710,6 +712,7 @@ bailout:
free(pagemap); free(pagemap);
if (rc) if (rc)
return EXIT_FAILURE + 2; return EXIT_FAILURE + 2;
total_problems += problems_meta;
if (total_problems) { if (total_problems) {
print("Total %zu error(s) is detected.\n", total_problems); print("Total %zu error(s) is detected.\n", total_problems);
if (problems_meta || problems_maindb || problems_freedb) if (problems_meta || problems_maindb || problems_freedb)