rpc: decrease memory usage a bit in getblocks.bin

This commit is contained in:
moneromooo-monero 2017-08-25 18:59:29 +01:00
parent 0fe4b0282a
commit 20bedf320e
No known key found for this signature in database
GPG key ID: 686F07454D6CEFC3

View file

@ -205,14 +205,17 @@ namespace cryptonote
} }
size_t txidx = 0; size_t txidx = 0;
ntxes += bd.second.size(); ntxes += bd.second.size();
for(const auto& t: bd.second) for (std::list<cryptonote::blobdata>::iterator i = bd.second.begin(); i != bd.second.end(); ++i)
{ {
unpruned_size += i->size();
if (req.prune) if (req.prune)
res.blocks.back().txs.push_back(get_pruned_tx_blob(t)); res.blocks.back().txs.push_back(get_pruned_tx_blob(std::move(*i)));
else else
res.blocks.back().txs.push_back(t); res.blocks.back().txs.push_back(std::move(*i));
i->clear();
i->shrink_to_fit();
pruned_size += res.blocks.back().txs.back().size(); pruned_size += res.blocks.back().txs.back().size();
unpruned_size += t.size();
res.output_indices.back().indices.push_back(COMMAND_RPC_GET_BLOCKS_FAST::tx_output_indices()); res.output_indices.back().indices.push_back(COMMAND_RPC_GET_BLOCKS_FAST::tx_output_indices());
bool r = m_core.get_tx_outputs_gindexs(b.tx_hashes[txidx++], res.output_indices.back().indices.back().indices); bool r = m_core.get_tx_outputs_gindexs(b.tx_hashes[txidx++], res.output_indices.back().indices.back().indices);
if (!r) if (!r)