Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve addrman Select() performance when buckets are nearly empty #6530

Merged
merged 1 commit into from Aug 26, 2015

Conversation

sipa
Copy link
Member

@sipa sipa commented Aug 6, 2015

Earlier, when there are only a few entries in the addrman tables, Select() could spin for long periods of time (~200ms), resulting in high CPU usage (up to 40% here). This reduces it to around 0.3ms (0.5% CPU).

@sipa sipa force-pushed the fastselect branch 2 times, most recently from f1abc1b to 9ddf0fd Compare Aug 6, 2015
@dgenr8
Copy link
Contributor

dgenr8 commented Aug 7, 2015

utACK

@TheBlueMatt
Copy link
Contributor

TheBlueMatt commented Aug 8, 2015

utACK

@gmaxwell
Copy link
Contributor

gmaxwell commented Aug 22, 2015

ACK

@@ -341,8 +341,11 @@ CAddrInfo CAddrMan::Select_()
while (1) {
int nKBucket = GetRandInt(ADDRMAN_TRIED_BUCKET_COUNT);
int nKBucketPos = GetRandInt(ADDRMAN_BUCKET_SIZE);
if (vvTried[nKBucket][nKBucketPos] == -1)
continue;
while (1) {
Copy link
Member

@laanwj laanwj Aug 24, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Equivalent but maybe slightly more readable:

while(vvTried[nKBucket][nKBucketPos] == -1) {
    nKBucket = (nKBucket + insecure_rand()) % ADDRMAN_TRIED_BUCKET_COUNT;
    nKBucketPos = (nKBucketPos + insecure_rand()) % ADDRMAN_BUCKET_SIZE;
}

Copy link
Member Author

@sipa sipa Aug 26, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit addressed.

@dcousens
Copy link
Contributor

dcousens commented Aug 26, 2015

utACK

@laanwj laanwj merged commit c33c11e into bitcoin:master Aug 26, 2015
laanwj added a commit that referenced this pull request Aug 26, 2015
c33c11e Improve addrman Select() performance when buckets are nearly empty (Pieter Wuille)
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants