Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-28 01:59:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

core: add some locking around pool use

Browse Source
This commit is contained in:
moneromooo-monero 2016-07-31 20:09:44 +01:00
parent 2c9d9519f1
commit 0263dd2d23
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cryptonote_core/blockchain.cpp
View File

@ -2869,6 +2869,8 @@ void Blockchain::return_tx_to_pool(const std::vector<transaction> &txs)
//------------------------------------------------------------------ //------------------------------------------------------------------
bool Blockchain::flush_txes_from_pool(const std::list<crypto::hash> &txids) bool Blockchain::flush_txes_from_pool(const std::list<crypto::hash> &txids)
{ {
CRITICAL_REGION_LOCAL(m_tx_pool);
bool res = true; bool res = true;
for (const auto &txid: txids) for (const auto &txid: txids)
{ {
@ -2877,7 +2879,7 @@ bool Blockchain::flush_txes_from_pool(const std::list<crypto::hash> &txids)
uint64_t fee; uint64_t fee;
bool relayed; bool relayed;
LOG_PRINT_L1("Removing txid " << txid << " from the pool"); LOG_PRINT_L1("Removing txid " << txid << " from the pool");
if(!m_tx_pool.take_tx(txid, tx, blob_size, fee, relayed)) if(m_tx_pool.have_tx(txid) && !m_tx_pool.take_tx(txid, tx, blob_size, fee, relayed))
{ {
LOG_PRINT_L0("Failed to remove txid " << txid << " from the pool"); LOG_PRINT_L0("Failed to remove txid " << txid << " from the pool");
res = false; res = false;

1
src/cryptonote_core/tx_pool.cpp
View File

@ -662,6 +662,7 @@ namespace cryptonote
//--------------------------------------------------------------------------------- //---------------------------------------------------------------------------------
size_t tx_memory_pool::validate(uint8_t version) size_t tx_memory_pool::validate(uint8_t version)
{ {
CRITICAL_REGION_LOCAL(m_transactions_lock);
size_t n_removed = 0; size_t n_removed = 0;
size_t tx_size_limit = (version < 2 ? TRANSACTION_SIZE_LIMIT_V1 : TRANSACTION_SIZE_LIMIT_V2); size_t tx_size_limit = (version < 2 ? TRANSACTION_SIZE_LIMIT_V1 : TRANSACTION_SIZE_LIMIT_V2);
for (auto it = m_transactions.begin(); it != m_transactions.end(); ) { for (auto it = m_transactions.begin(); it != m_transactions.end(); ) {