NextGraph
/
lmdb
mirror of https://github.com/nextgraph-org/lmdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Log txnID in msgs

Browse Source
vmware
Howard Chu 14 years ago
parent 421ee6bb1d
commit fe703b0ee0
1 changed files with 8 additions and 6 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 14
      libraries/libmdb/mdb.c

14
libraries/libmdb/mdb.c
Unescape View File

@ -504,7 +504,7 @@ mdb_txn_begin(MDB_env *env, int rdonly, MDB_txn **ret)
txn->mt_next_pgno = env->me_meta.mm_last_pg+1; txn->mt_next_pgno = env->me_meta.mm_last_pg+1;
txn->mt_first_pgno = txn->mt_next_pgno; txn->mt_first_pgno = txn->mt_next_pgno;
txn->mt_root = env->me_meta.mm_root; txn->mt_root = env->me_meta.mm_root;
DPRINTF("begin transaction on mdbenv %p, root page %lu", env, txn->mt_root); DPRINTF("begin transaction %lu on mdbenv %p, root page %lu", txn->mt_txnid, env, txn->mt_root);
*ret = txn; *ret = txn;
return MDB_SUCCESS; return MDB_SUCCESS;
@ -520,7 +520,7 @@ mdb_txn_abort(MDB_txn *txn)
return; return;
env = txn->mt_env; env = txn->mt_env;
DPRINTF("abort transaction on mdbenv %p, root page %lu", env, txn->mt_root); DPRINTF("abort transaction %lu on mdbenv %p, root page %lu", txn->mt_txnid, env, txn->mt_root);
if (F_ISSET(txn->mt_flags, MDB_TXN_RDONLY)) { if (F_ISSET(txn->mt_flags, MDB_TXN_RDONLY)) {
txn->mt_u.reader->mr_txnid = 0; txn->mt_u.reader->mr_txnid = 0;
@ -586,8 +586,8 @@ mdb_txn_commit(MDB_txn *txn)
if (SIMPLEQ_EMPTY(txn->mt_u.dirty_queue)) if (SIMPLEQ_EMPTY(txn->mt_u.dirty_queue))
goto done; goto done;
DPRINTF("committing transaction on mdbenv %p, root page %lu", DPRINTF("committing transaction %lu on mdbenv %p, root page %lu",
env, txn->mt_root); txn->mt_txnid, env, txn->mt_root);
/* Commit up to MDB_COMMIT_PAGES dirty pages to disk until done. /* Commit up to MDB_COMMIT_PAGES dirty pages to disk until done.
*/ */
@ -843,8 +843,10 @@ mdbenv_read_meta(MDB_env *env)
if (meta[0]->mm_txnid < meta[1]->mm_txnid) if (meta[0]->mm_txnid < meta[1]->mm_txnid)
toggle = 1; toggle = 1;
bcopy(meta[toggle], &env->me_meta, sizeof(env->me_meta)); if (meta[toggle]->mm_txnid > env->me_meta.mm_txnid) {
env->me_metatoggle = toggle; bcopy(meta[toggle], &env->me_meta, sizeof(env->me_meta));
env->me_metatoggle = toggle;
}
DPRINTF("Using meta page %d", toggle); DPRINTF("Using meta page %d", toggle);

Write Preview
Loading…
Cancel
Save