Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-08-14 23:25:34 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2349

Browse source 
1914c999 txpool: update db tx metadata when it changes (moneromooo)
4dbf29bd txpool: add tx size median to the pool stats (moneromooo)
This commit is contained in:
Riccardo Spagni 2017-08-27 18:15:13 +02:00
commit 72b5f37f58
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
3 changed files with 23 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/cryptonote_core/tx_pool.cpp
View file

@ -571,7 +571,10 @@ namespace cryptonote
const uint64_t now = time(NULL);
std::map<uint64_t, txpool_histo> agebytes;
stats.txs_total = m_blockchain.get_txpool_tx_count();
m_blockchain.for_all_txpool_txes([&stats, now, &agebytes](const crypto::hash &txid, const txpool_tx_meta_t &meta, const cryptonote::blobdata *bd){
std::vector<uint32_t> sizes;
sizes.reserve(stats.txs_total);
m_blockchain.for_all_txpool_txes([&stats, &sizes, now, &agebytes](const crypto::hash &txid, const txpool_tx_meta_t &meta, const cryptonote::blobdata *bd){
sizes.push_back(meta.blob_size);
stats.bytes_total += meta.blob_size;
if (!stats.bytes_min || meta.blob_size < stats.bytes_min)
stats.bytes_min = meta.blob_size;
@ -591,6 +594,7 @@ namespace cryptonote
agebytes[age].bytes += meta.blob_size;
return true;
});
stats.bytes_med = epee::misc_utils::median(sizes);
if (stats.txs_total > 1)
{
/* looking for 98th percentile */
@ -916,7 +920,21 @@ namespace cryptonote
// Skip transactions that are not ready to be
// included into the blockchain or that are
// missing key images
if (!is_transaction_ready_to_go(meta, tx))
const cryptonote::txpool_tx_meta_t original_meta = meta;
bool ready = is_transaction_ready_to_go(meta, tx);
if (memcmp(&original_meta, &meta, sizeof(meta)))
{
try
{
m_blockchain.update_txpool_tx(sorted_it->second, meta);
}
catch (const std::exception &e)
{
MERROR("Failed to update tx meta: " << e.what());
// continue, not fatal
}
}
if (!ready)
{
LOG_PRINT_L2(" not ready to go");
sorted_it++;