phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-01-24 18:23:26 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

txgraph: (optimization) skipping end of cluster has no impact

Browse source
This commit is contained in:
Pieter Wuille 2024-11-27 16:12:10 -05:00
parent a9ce931394
commit cef85dd49a
1 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/txgraph.cpp
View file

@ -129,8 +129,9 @@ public:
std::vector<TxGraph::Ref*> GetAncestorRefs(const TxGraphImpl& graph, ClusterIndex idx) noexcept;
/** Get a vector of Refs for the descendants of a given Cluster element. */
std::vector<TxGraph::Ref*> GetDescendantRefs(const TxGraphImpl& graph, ClusterIndex idx) noexcept;
/** Get a vector of Refs for all elements of this Cluster, in linearization order. */
void GetClusterRefs(TxGraphImpl& graph, std::span<TxGraph::Ref*> range, LinearizationIndex start_pos) noexcept;
/** Get a vector of Refs for all elements of this Cluster, in linearization order. Returns
* the range ends at the end of the cluster. */
bool GetClusterRefs(TxGraphImpl& graph, std::span<TxGraph::Ref*> range, LinearizationIndex start_pos) noexcept;
/** Get the individual transaction feerate of a Cluster element. */
FeeFrac GetIndividualFeerate(ClusterIndex idx) noexcept;
/** Modify the fee of a Cluster element. */
@ -439,8 +440,8 @@ class BlockBuilderImpl final : public TxGraph::BlockBuilder
/** Vector for actual storage pointed to by TxGraph::BlockBuilder::m_current_chunk. */
std::vector<TxGraph::Ref*> m_chunkdata;
/** Which cluster the current chunk belongs to, so we can exclude further transaction from it
* when that chunk is skipped. */
Cluster* m_remaining_cluster{nullptr};
* when that chunk is skipped, or std::nullopt if we're at the end of the current cluster. */
std::optional<Cluster*> m_remaining_cluster{nullptr};
/** Clusters which we're not including further transactions from. */
std::set<Cluster*> m_excluded_clusters;
/** Iterator to the next chunk (after the current one) in the chunk index. end() if nothing
@ -1545,7 +1546,7 @@ std::vector<TxGraph::Ref*> Cluster::GetDescendantRefs(const TxGraphImpl& graph,
return ret;
}
void Cluster::GetClusterRefs(TxGraphImpl& graph, std::span<TxGraph::Ref*> range, LinearizationIndex start_pos) noexcept
bool Cluster::GetClusterRefs(TxGraphImpl& graph, std::span<TxGraph::Ref*> range, LinearizationIndex start_pos) noexcept
{
// Translate the transactions in the Cluster (in linearization order, starting at start_pos in
// the linearization) to Refs, and fill them in range.
@ -1554,6 +1555,8 @@ void Cluster::GetClusterRefs(TxGraphImpl& graph, std::span<TxGraph::Ref*> range,
Assume(entry.m_ref != nullptr);
ref = entry.m_ref;
}
// Return whether this was the end of the Cluster.
return start_pos == m_linearization.size();
}
FeeFrac Cluster::GetIndividualFeerate(ClusterIndex idx) noexcept
@ -2038,8 +2041,12 @@ void BlockBuilderImpl::Next() noexcept
// Populate m_current_chunk.
m_chunkdata.resize(chunk_data.m_chunk_count);
auto start_pos = chunk_end_entry.m_main_lin_index + 1 - chunk_data.m_chunk_count;
cluster->GetClusterRefs(*m_graph, m_chunkdata, start_pos);
m_remaining_cluster = cluster;
bool is_end = cluster->GetClusterRefs(*m_graph, m_chunkdata, start_pos);
if (is_end) {
m_remaining_cluster = std::nullopt;
} else {
m_remaining_cluster = cluster;
}
m_current_chunk.emplace(m_chunkdata, chunk_end_entry.m_main_chunk_feerate);
return;
}
@ -2081,7 +2088,9 @@ void BlockBuilderImpl::Skip() noexcept
{
// When skipping a chunk we need to not include anything more of the cluster, as that could make
// the result topologically invalid.
m_excluded_clusters.insert(m_remaining_cluster);
if (m_remaining_cluster.has_value()) {
m_excluded_clusters.insert(*m_remaining_cluster);
}
Next();
}