mirror of
https://github.com/Xahau/xahaud.git
synced 2025-12-06 17:27:52 +00:00
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:
committed by
Vinnie Falco
parent
02c2029ac1
commit
6335e34395
@@ -1918,7 +1918,7 @@ NetworkOPs::AccountTxs NetworkOPsImp::getAccountTxs (
|
||||
|
||||
{
|
||||
Database* db = getApp().getTxnDB ()->getDB ();
|
||||
DeprecatedScopedLock sl (getApp().getTxnDB ()->getDBLock ());
|
||||
auto sl (getApp().getTxnDB ()->lock ());
|
||||
|
||||
SQL_FOREACH (db, sql)
|
||||
{
|
||||
@@ -1967,7 +1967,7 @@ std::vector<NetworkOPsImp::txnMetaLedgerType> NetworkOPsImp::getAccountTxsB (
|
||||
|
||||
{
|
||||
Database* db = getApp().getTxnDB ()->getDB ();
|
||||
DeprecatedScopedLock sl (getApp().getTxnDB ()->getDBLock ());
|
||||
auto sl (getApp().getTxnDB ()->lock ());
|
||||
|
||||
SQL_FOREACH (db, sql)
|
||||
{
|
||||
@@ -2060,7 +2060,7 @@ NetworkOPsImp::getTxsAccount (const RippleAddress& account, std::int32_t minLedg
|
||||
% queryLimit);
|
||||
{
|
||||
Database* db = getApp().getTxnDB ()->getDB ();
|
||||
DeprecatedScopedLock sl (getApp().getTxnDB ()->getDBLock ());
|
||||
auto sl (getApp().getTxnDB ()->lock ());
|
||||
|
||||
SQL_FOREACH (db, sql)
|
||||
{
|
||||
@@ -2168,7 +2168,7 @@ NetworkOPsImp::getTxsAccountB (const RippleAddress& account, std::int32_t minLed
|
||||
% queryLimit);
|
||||
{
|
||||
Database* db = getApp().getTxnDB ()->getDB ();
|
||||
DeprecatedScopedLock sl (getApp().getTxnDB ()->getDBLock ());
|
||||
auto sl (getApp().getTxnDB ()->lock ());
|
||||
|
||||
SQL_FOREACH (db, sql)
|
||||
{
|
||||
@@ -2231,7 +2231,7 @@ NetworkOPsImp::getLedgerAffectedAccounts (std::uint32_t ledgerSeq)
|
||||
RippleAddress acct;
|
||||
{
|
||||
Database* db = getApp().getTxnDB ()->getDB ();
|
||||
DeprecatedScopedLock sl (getApp().getTxnDB ()->getDBLock ());
|
||||
auto sl (getApp().getTxnDB ()->lock ());
|
||||
SQL_FOREACH (db, sql)
|
||||
{
|
||||
if (acct.setAccountID (db->getStrBinary ("Account")))
|
||||
|
||||
Reference in New Issue
Block a user