highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-01-19 23:03:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

txgraph: remove unnecessary m_group_oversized (simplification)

Browse Source
This commit is contained in:
Greg Sanders
2025-05-21 14:02:51 -04:00
committed by Pieter Wuille
parent 19b14e61ea
commit eabcd0eb6f
1 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/txgraph.cpp
View File

@@ -231,9 +231,6 @@ private:
std::vector<GroupEntry> m_groups;
/** Which clusters are to be merged. GroupEntry::m_cluster_offset indexes into this. */
std::vector<Cluster*> m_group_clusters;
/** Whether at least one of the groups cannot be applied because it would result in a
* Cluster that violates the max cluster count or size limit. */
bool m_group_oversized;
};
/** The collection of all Clusters in main or staged. */
@@ -257,9 +254,7 @@ private:
GraphIndex m_txcount{0};
/** Total number of individually oversized transactions in the graph. */
GraphIndex m_txcount_oversized{0};
/** Whether this graph is oversized (if known). This roughly matches
* m_group_data->m_group_oversized || (m_txcount_oversized > 0), but may be known even if
* m_group_data is not. */
/** Whether this graph is oversized (if known). */
std::optional<bool> m_oversized{false};
ClusterSet() noexcept = default;
@@ -1463,9 +1458,9 @@ void TxGraphImpl::GroupClusters(int level) noexcept
// back to m_deps_to_add.
clusterset.m_group_data = GroupData{};
clusterset.m_group_data->m_group_clusters.reserve(an_clusters.size());
clusterset.m_group_data->m_group_oversized = false;
clusterset.m_deps_to_add.clear();
clusterset.m_deps_to_add.reserve(an_deps.size());
clusterset.m_oversized = false;
auto an_deps_it = an_deps.begin();
auto an_clusters_it = an_clusters.begin();
while (an_clusters_it != an_clusters.end()) {
@@ -1495,12 +1490,11 @@ void TxGraphImpl::GroupClusters(int level) noexcept
}
// Detect oversizedness.
if (total_count > m_max_cluster_count || total_size > m_max_cluster_size) {
clusterset.m_group_data->m_group_oversized = true;
clusterset.m_oversized = true;
}
}
Assume(an_deps_it == an_deps.end());
Assume(an_clusters_it == an_clusters.end());
clusterset.m_oversized = clusterset.m_group_data->m_group_oversized;
Compact();
}
@@ -2366,13 +2360,6 @@ void TxGraphImpl::SanityCheck() const
if (!clusterset.m_to_remove.empty()) compact_possible = false;
if (!clusterset.m_removed.empty()) compact_possible = false;
// If m_group_data exists, and no outstanding removals remain, m_group_oversized must match
// m_group_oversized || (m_txcount_oversized > 0).
if (clusterset.m_group_data.has_value() && clusterset.m_to_remove.empty()) {
assert(clusterset.m_oversized ==
(clusterset.m_group_data->m_group_oversized || (clusterset.m_txcount_oversized > 0)));
}
// For non-top levels, m_oversized must be known (as it cannot change until the level
// on top is gone).
if (level < GetTopLevel()) assert(clusterset.m_oversized.has_value());