Currently, CAddrman::Good() is rather slow because the process of moving an addr from new to tried involves looping over the new tables twice:
- In Good_(), there is a loop searching for a new bucket the addr is currently in, but this information is never used except for aborting if it is not found anywhere (since this commit it is no longer passed to MakeTried) This is unnecessary because in a non-corrupted addrman, an address that is not in New must be either in Tried or not at all in addrman, both cases in which we'd return early in Good_() and never get to this point. I removed this loop (and left a check for nRefCount as a belt-and-suspenders check).
- In MakeTried(), which is called from Good_(), another loop removes all instances of this address from new. This can be spedup by stopping the search at nRefCount==0. Further reductions in nRefCount would only lead to an assert anyway. Moreover, the search can be started at the bucket determined by the source of the addr for which Good was called, so that if it is present just once in New, no further buckets need to be checked.
Improving performance of Good_ is done by removing an unnecessary loop in Good_() and looping
through the new tables in MakeTried() more efficiently, choosing a
starting value that allow us to stop early in typical cases.
Co-authored-by: John Newbery <john@johnnewbery.com>
This is a partial backport of core#22974
https://github.com/bitcoin/bitcoin/pull/22974/commits/eb2e113df13c7b1ede279878f5cbad877af49f8e
Depends on D10855
The other two commits are not applicable due to a large stack of missing fuzz backports.