Paths

Table of Contentst

Differential D4891

Free BerkeleyEnvironment instances when not in use
ClosedPublic
Actions

Authored by Fabien on Jan 10 2020, 21:21.

Tags

None

Subscribers

Details

Reviewers

deadalnix
jasonbcox

Group Reviewers

Restricted Project

Commits

rSTAGINGa3de297b55ec: Free BerkeleyEnvironment instances when not in use
rABCa3de297b55ec: Free BerkeleyEnvironment instances when not in use

Summary

Instead of adding BerkeleyEnvironment objects permanently to the
g_dbenvs map, use reference counted shared pointers and remove map
entries when the
last BerkeleyEnvironment reference goes out of scope.

Backport of core PR11911 and PR15322:
https://github.com/bitcoin/bitcoin/pull/11911/files
https://github.com/bitcoin/bitcoin/pull/15322/files

This should fix ASAN and TSAN.

Depends on D4888.

Test Plan

ninja all check
./test/functional/test_runner.py wallet_*

ABC_BUILD_NAME=build-asan ./contrib/teamcity/build-configurations.sh
ABC_BUILD_NAME=build-tsan ./contrib/teamcity/build-configurations.sh

Diff Detail

Repository

rABC Bitcoin ABC

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

Fabien created this revision.Jan 10 2020, 21:21

Herald added a reviewer: Restricted Project. · View Herald TranscriptJan 10 2020, 21:21

Herald added a reviewer: deadalnix. · View Herald Transcript

Build Bitcoin-ABC / Diffs / Diff Testing started.

Build Bitcoin-ABC / Diffs / Diff Testing started.

Build Bitcoin-ABC / Diffs (Resource Intensive) / Resource Intensive Diff Testing started.

Build Bitcoin-ABC / Diffs / Diff Testing passed.

Harbormaster completed remote builds in B8843: Diff 15315.Jan 10 2020, 22:09

Build Bitcoin-ABC / Diffs (Resource Intensive) / Resource Intensive Diff Testing passed.

Build Bitcoin-ABC / Diffs / Diff Testing passed.

Everything looks good except for the one missed line in the comment.

src/wallet/db.cpp
62 ↗	(On Diff #15315)	`s/ open//g`

This revision now requires changes to proceed.Jan 10 2020, 22:36

Fabien added inline comments.Jan 11 2020, 05:58

src/wallet/db.cpp
62 ↗	(On Diff #15315)	Good catch !

Fix comment.

Build Bitcoin-ABC / Diffs / Diff Testing started.

Build Bitcoin-ABC / Diffs / Diff Testing passed.

Harbormaster completed remote builds in B8848: Diff 15327.Jan 11 2020, 06:06

deadalnix accepted this revision.Jan 11 2020, 13:11

deadalnix added inline comments.

contrib/teamcity/build-configurations.sh
76 ↗	(On Diff #15327)
108 ↗	(On Diff #15327)

jasonbcox accepted this revision.Jan 11 2020, 16:50

This revision is now accepted and ready to land.Jan 11 2020, 16:50

Closed by commit rABCa3de297b55ec: Free BerkeleyEnvironment instances when not in use (authored by Russell Yanofsky <russ@yanofsky.org>, committed by Fabien). · Explain WhyJan 13 2020, 07:13

This revision was automatically updated to reflect the committed changes.

Fabien added a commit: rABCa3de297b55ec: Free BerkeleyEnvironment instances when not in use.

Fabien mentioned this in D4919: Fix -Wshadow warnings.Jan 13 2020, 12:40

Fabien mentioned this in rABCa383e5ddf95a: Fix -Wshadow warnings.Jan 13 2020, 12:43

Fabien added a commit: rSTAGINGa3de297b55ec: Free BerkeleyEnvironment instances when not in use.Apr 7 2020, 22:24

Fabien mentioned this in rSTAGINGa383e5ddf95a: Fix -Wshadow warnings.

Revision Contents
Changeset List

Path

Size

contrib/

teamcity/

build-configurations.sh

4 lines

src/

Makefile.test.include

1 line

test/

1 line

wallet/

40 lines

72 lines

test/

77 lines

5 lines

Diff 15385

contrib/teamcity/build-configurations.sh

Loading...

src/Makefile.test.include

Loading...

src/test/CMakeLists.txt

Loading...

src/wallet/db.h

Loading...

src/wallet/db.cpp

Loading...

src/wallet/test/db_tests.cpp

Loading...

src/wallet/wallet.cpp

Loading...