ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Reduce SHAMapTreeNode copying during SHAMap unsharing:"

Browse Source 
This reverts commit 47c6ab0ced.
This commit is contained in:
Mark Travis
2015-05-30 13:55:20 -07:00
committed by Vinnie Falco
parent aaf209485c
commit 52879d964e
4 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ripple/app/ledger/impl/LedgerMaster.cpp
View File

@@ -413,9 +413,8 @@ public:
} }
if (didApply) if (didApply)
{ {
ledger->setImmutable (); // So the next line doesn't have to copy mCurrentLedger.set (ledger);
mCurrentLedger.set (ledger); getApp().getOPs ().pubProposedTransaction (ledger, txn, result);
getApp().getOPs ().pubProposedTransaction (ledger, txn, result);
} }
return result; return result;
} }

1
src/ripple/app/main/Application.cpp
View File

@@ -1068,7 +1068,6 @@ void ApplicationImp::startNewLedger ()
firstLedger->updateHash (); firstLedger->updateHash ();
firstLedger->setClosed (); firstLedger->setClosed ();
firstLedger->setAccepted (); firstLedger->setAccepted ();
firstLedger->setImmutable();
m_ledgerMaster->pushLedger (firstLedger); m_ledgerMaster->pushLedger (firstLedger);
Ledger::pointer secondLedger = std::make_shared<Ledger> (true, std::ref (*firstLedger)); Ledger::pointer secondLedger = std::make_shared<Ledger> (true, std::ref (*firstLedger));

1
src/ripple/shamap/SHAMap.h
View File

@@ -278,7 +278,6 @@ void
SHAMap::setImmutable () SHAMap::setImmutable ()
{ {
assert (state_ != SHAMapState::Invalid); assert (state_ != SHAMapState::Invalid);
unshare ();
state_ = SHAMapState::Immutable; state_ = SHAMapState::Immutable;
} }

2
src/ripple/shamap/impl/SHAMap.cpp
View File

@@ -75,7 +75,7 @@ SHAMap::snapShot (bool isMutable) const
newMap.seq_ = seq_ + 1; newMap.seq_ = seq_ + 1;
newMap.root_ = root_; newMap.root_ = root_;
if ((state_ != SHAMapState::Immutable) || isMutable) if ((state_ != SHAMapState::Immutable) || !isMutable)
{ {
// If either map may change, they cannot share nodes // If either map may change, they cannot share nodes
newMap.unshare (); newMap.unshare ();