Simplify locking and move a typedef.

* Make DatabaseCon's lock private and expose a scoped lock_guard.
* Get rid of DeprecatedRecursiveMutex and DeprecatedScopedLock entirely.
* Move CancelCallback to Job where it logically belongs.
This commit is contained in:
Tom Ritchford
2014-07-22 14:47:12 -04:00
committed by Vinnie Falco
parent 02c2029ac1
commit 6335e34395
16 changed files with 85 additions and 81 deletions

View File

@@ -117,7 +117,7 @@ AmendmentTableImpl::getCreate (uint256 const& amendmentHash, bool create)
query.append (to_string (amendmentHash));
query.append ("';");
DeprecatedScopedLock sl (getApp().getWalletDB ()->getDBLock ());
auto sl (getApp().getWalletDB ()->lock ());
Database* db = getApp().getWalletDB ()->getDB ();
if (db->executeSQL (query) && db->startIterRows ())
@@ -373,7 +373,7 @@ AmendmentTableImpl::reportValidations (const AmendmentSet& set)
if (!changedAmendments.empty())
{
DeprecatedScopedLock sl (getApp().getWalletDB ()->getDBLock ());
auto sl (getApp().getWalletDB ()->lock ());
Database* db = getApp().getWalletDB ()->getDB ();
db->executeSQL ("BEGIN TRANSACTION;");