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

wallet: Add lock annotation for mapAddressBook #15365

Merged

Conversation

Projects
None yet
4 participants
@MarcoFalke
Copy link
Member

commented Feb 7, 2019

This adds lock annotations for mapAddressBook and also moves one lock from inside GetDestValues to the caller to be in line with the other methods (eraseDestData, addDestData, ...)

@MarcoFalke MarcoFalke force-pushed the MarcoFalke:Mf1902-LockAnnotmapAddressBook branch from fa2d07e to faa4647 Feb 7, 2019

@DrahtBot

This comment has been minimized.

Copy link
Contributor

commented Feb 7, 2019

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Conflicts

Reviewers, this pull request conflicts with the following ones:

  • #14898 (nextpagepointer flag for listtransactions by hosseinamin)

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

@practicalswift

This comment has been minimized.

Copy link
Member

commented Feb 7, 2019

Concept ACK

@promag

This comment has been minimized.

Copy link
Member

commented Feb 8, 2019

utACK faa4647.

@practicalswift

This comment has been minimized.

Copy link
Member

commented Feb 8, 2019

utACK faa4647

MarcoFalke added a commit to MarcoFalke/bitcoin that referenced this pull request Feb 8, 2019

Merge bitcoin#15365: wallet: Add lock annotation for mapAddressBook
faa4647 wallet: Add lock annotation for mapAddressBook (MarcoFalke)

Pull request description:

  This adds lock annotations for `mapAddressBook` and also moves one lock from inside `GetDestValues` to the caller to be in line with the other methods (`eraseDestData`, `addDestData`, ...)

Tree-SHA512: cef9397523e2f5717d4a9a6b2da1fe07042484a51b3c067ae64425768637f334350a2c3db4ab7e00af99b2a587f6b656b68ee1195f6a3db6d47298d0b2b6174a

@MarcoFalke MarcoFalke merged commit faa4647 into bitcoin:master Feb 8, 2019

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@MarcoFalke MarcoFalke deleted the MarcoFalke:Mf1902-LockAnnotmapAddressBook branch Feb 8, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.