Skip to content

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

Merged
laanwj merged 1 commit into
bitcoin:masterfrom
sipa:fastselect
Aug 26, 2015
Merged

laanwj merged 1 commit into
bitcoin:masterfrom
sipa:fastselect

Conversation

@sipa

@sipa sipa commented Aug 6, 2015

Copy link
Copy Markdown
Member

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 August 6, 2015 18:43
@dgenr8

dgenr8 commented Aug 7, 2015

Copy link
Copy Markdown
Contributor

utACK

@TheBlueMatt

Copy link
Copy Markdown
Contributor

utACK

@gmaxwell

Copy link
Copy Markdown
Contributor

ACK

Comment thread src/addrman.cpp Outdated

Copy link
Copy Markdown
Member

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
Copy Markdown
Member Author

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
Copy Markdown
Contributor

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.

6 participants