ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-19 18:45:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't use ScopedLock where the lighter recursive_mutex::ScopedLock will do.

Browse Source
This commit is contained in:
JoelKatz
2011-12-13 15:30:33 -08:00
parent 2836efa104
commit 3d8dab3ae9
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Ledger.cpp
View File

@@ -118,7 +118,7 @@ Transaction::pointer Ledger::getTransaction(const uint256& transID)
Ledger::TransResult Ledger::applyTransaction(Transaction::pointer trans)
{
ScopedLock l(mLock);
boost::recursive_mutex::scoped_lock sl(mLock);
if(trans->getSourceLedger()>mLedgerSeq) return TR_BADLSEQ;
if(trans->getAmount()<trans->getFee())
@@ -187,7 +187,7 @@ Ledger::TransResult Ledger::applyTransaction(Transaction::pointer trans)
Ledger::TransResult Ledger::removeTransaction(Transaction::pointer trans)
{ // high-level - reverse application of transaction
ScopedLock l(mLock);
boost::recursive_mutex::scoped_lock sl(mLock);
if(!mTransactionMap || !mAccountStateMap) return TR_ERROR;
try
{
@@ -226,7 +226,7 @@ Ledger::TransResult Ledger::removeTransaction(Transaction::pointer trans)
Ledger::TransResult Ledger::hasTransaction(Transaction::pointer trans)
{
ScopedLock l(mLock);
boost::recursive_mutex::scoped_lock sl(mLock);
if(mTransactionMap==NULL) return TR_ERROR;
try
{

20
SHAMap.cpp
View File

@@ -183,13 +183,13 @@ SHAMapItem::SHAMapItem(const uint160& tag, const std::vector<unsigned char>& dat
SHAMapItem::pointer SHAMap::peekFirstItem()
{
ScopedLock sl(mLock);
boost::recursive_mutex::scoped_lock sl(mLock);
return firstBelow(root);
}
SHAMapItem::pointer SHAMap::peekLastItem()
{
ScopedLock sl(mLock);
boost::recursive_mutex::scoped_lock sl(mLock);
return lastBelow(root);
}
@@ -238,7 +238,7 @@ SHAMapItem::pointer SHAMap::firstBelow(SHAMapInnerNode::pointer node)
SHAMapItem::pointer SHAMap::lastBelow(SHAMapInnerNode::pointer node)
{
ScopedLock sl(mLock);
boost::recursive_mutex::scoped_lock sl(mLock);
const uint256 zero;
int i;
@@ -271,7 +271,7 @@ SHAMapItem::pointer SHAMap::lastBelow(SHAMapInnerNode::pointer node)
SHAMapItem::pointer SHAMap::peekNextItem(const uint256& id)
{ // Get a pointer to the next item in the tree after a given item - item must be in tree
ScopedLock sl(mLock);
boost::recursive_mutex::scoped_lock sl(mLock);
SHAMapLeafNode::pointer leaf=walkToLeaf(id, false, false);
if(!leaf)
@@ -331,7 +331,7 @@ SHAMapItem::pointer SHAMap::peekNextItem(const uint256& id)
SHAMapItem::pointer SHAMap::peekPrevItem(const uint256& id)
{
ScopedLock sl(mLock);
boost::recursive_mutex::scoped_lock sl(mLock);
SHAMapLeafNode::pointer leaf=walkToLeaf(id, false, false);
if(!leaf) return SHAMapItem::pointer();
@@ -403,7 +403,7 @@ SHAMapLeafNode::pointer SHAMap::createLeaf(const SHAMapInnerNode& lowestParent,
SHAMapItem::pointer SHAMap::peekItem(const uint256& id)
{
ScopedLock sl(mLock);
boost::recursive_mutex::scoped_lock sl(mLock);
SHAMapLeafNode::pointer leaf=walkToLeaf(id, false, false);
if(!leaf) return SHAMapItem::pointer();
return leaf->findItem(id);
@@ -411,7 +411,7 @@ SHAMapItem::pointer SHAMap::peekItem(const uint256& id)
bool SHAMap::hasItem(const uint256& id)
{ // does the tree have an item with this ID
ScopedLock sl(mLock);
boost::recursive_mutex::scoped_lock sl(mLock);
SHAMapLeafNode::pointer leaf=walkToLeaf(id, false, false);
if(!leaf) return false;
SHAMapItem::pointer item=leaf->findItem(id);
@@ -420,7 +420,7 @@ bool SHAMap::hasItem(const uint256& id)
bool SHAMap::delItem(const uint256& id)
{ // delete the item with this ID
ScopedLock sl(mLock);
boost::recursive_mutex::scoped_lock sl(mLock);
SHAMapLeafNode::pointer leaf=walkToLeaf(id, false, false);
if(!leaf) return false;
if(!leaf->delItem(id)) return false;
@@ -430,7 +430,7 @@ bool SHAMap::delItem(const uint256& id)
bool SHAMap::addGiveItem(const SHAMapItem::pointer item)
{ // add the specified item, does not update
ScopedLock sl(mLock);
boost::recursive_mutex::scoped_lock sl(mLock);
SHAMapLeafNode::pointer leaf=walkToLeaf(item->getTag(), true, true);
if(!leaf)
{
@@ -460,7 +460,7 @@ bool SHAMap::addItem(const SHAMapItem& i)
bool SHAMap::updateGiveItem(SHAMapItem::pointer item)
{
ScopedLock sl(mLock);
boost::recursive_mutex::scoped_lock sl(mLock);
SHAMapLeafNode::pointer leaf=walkToLeaf(item->getTag(), true, true);
if(!leaf) return false;
if(!leaf->addUpdateItem(item)) return false;