Page MenuHomePhabricator
Differential D6132

[backport#16033] Hold cs_main when reading chainActive via getTipLocator(). Remove assumeLocked()
ClosedPublic
Actions

Authored by majcosta on May 19 2020, 00:14.

Details

Reviewers
deadalnix
Group Reviewers
Restricted Project
Commits
rSTAGING8a2bca9d854d: [backport#16033] Hold cs_main when reading chainActive via getTipLocator().
rABC8a2bca9d854d: [backport#16033] Hold cs_main when reading chainActive via getTipLocator().
Summary

https://github.com/bitcoin/bitcoin/pull/16033/commits/593a8e8a2ce177c41a7809479c0086ae0fee4b4e wallet: Use chain.lock() instead of temporary chain.assumeLocked()
https://github.com/bitcoin/bitcoin/pull/16033/commits/9402ef0739fdcd8e989c07c0595095e9608b243c Remove temporary method assumeLocked(). Remove LockingStateImpl. Remove redundant cs_main locks.

This is a backport of Core PR16033

Test Plan
ninja check

Diff Detail

Repository
rABC Bitcoin ABC
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

majcosta created this revision.May 19 2020, 00:14
Herald added a reviewer: Restricted Project. · View Herald TranscriptMay 19 2020, 00:14
majcosta requested review of this revision.May 19 2020, 00:14
teamcity edited the summary of this revision. (Show Details)May 19 2020, 00:14

[Bot Message]
One or more PR numbers were detected in the summary.
Links to those PRs have been inserted into the summary for reference.

teamcity added a comment.May 19 2020, 00:15

Build Bitcoin-ABC / Diffs / Diff Testing (build-werror) started.

teamcity added a comment.May 19 2020, 00:15

Build Bitcoin-ABC / Diffs / Diff Testing (build-without-wallet) started.

teamcity added a comment.May 19 2020, 00:15

Build Bitcoin-ABC / Diffs / Diff Testing (build-diff) started.

teamcity added a comment.May 19 2020, 00:16

Build Bitcoin-ABC / Diffs / Diff Testing (build-werror) passed.

teamcity added a comment.May 19 2020, 00:18

Build Bitcoin-ABC / Diffs / Diff Testing (build-without-wallet) passed.

teamcity added a comment.May 19 2020, 00:25

Build Bitcoin-ABC / Diffs / Diff Testing (build-diff) passed.

Harbormaster completed remote builds in B10845: Diff 20254.May 19 2020, 00:26
deadalnix requested changes to this revision.May 19 2020, 12:14
deadalnix added a subscriber: deadalnix.
deadalnix added inline comments.
src/interfaces/chain.cpp
266 ↗(On Diff #20254)

Please backport the std::move . Especially since this changes the comment. If you had the patch up then I'd say no problem, but I don't see it, so that's effectively introducing a gotcha.

This revision now requires changes to proceed.May 19 2020, 12:14
deadalnix accepted this revision.May 19 2020, 12:53

It was removed on the advice of the compiler, so we are good.

This revision is now accepted and ready to land.May 19 2020, 12:53
Closed by commit rABC8a2bca9d854d: [backport#16033] Hold cs_main when reading chainActive via getTipLocator(). (authored by practicalswift <practicalswift@users.noreply.github.com>, committed by majcosta). · Explain WhyMay 19 2020, 13:19
This revision was automatically updated to reflect the committed changes.
majcosta added a commit: rABC8a2bca9d854d: [backport#16033] Hold cs_main when reading chainActive via getTipLocator()..
majcosta added a commit: rSTAGING8a2bca9d854d: [backport#16033] Hold cs_main when reading chainActive via getTipLocator()..

Revision Contents
Changeset List

PathSize
src/
interfaces/
5 lines
10 lines
wallet/
test/
37 lines
3 lines

Diff 20266

View Options

src/interfaces/chain.h

Loading...
View Options

src/interfaces/chain.cpp

Loading...
View Options

src/wallet/test/wallet_tests.cpp

Loading...
View Options

src/wallet/wallet.cpp

Loading...