diff options
| author | MeshCollider <dobsonsa68@gmail.com> | 2019-02-06 10:09:24 +1300 |
|---|---|---|
| committer | MeshCollider <dobsonsa68@gmail.com> | 2019-02-06 10:10:51 +1300 |
| commit | 30e799a5f7053d4050280aced2c9d8c5f0fea20e (patch) | |
| tree | 481c7755a0a3117a30ff47cd4b149eab928ecf4d /src/util | |
| parent | 3a573fd46c75ed76df38580d45cc36c6d598f3ea (diff) | |
| parent | d3bf3b930d34da7d121ae35b4fb75865ed73208c (diff) | |
Merge #15297: wallet: Releases dangling files on BerkeleyEnvironment::Close
d3bf3b930 qa: Test .walletlock file is closed (João Barbosa)
2f8b8f479 wallet: Close wallet env lock file (João Barbosa)
8602a1e6a wallet: Close dbenv error file db.log (João Barbosa)
Pull request description:
This PR closes `db.log` and removes `.walletlock` files when `BerkeleyEnvironment` is closed.
Fixes https://github.com/bitcoin/bitcoin/issues/15291#issuecomment-459131886.
Tree-SHA512: 05d8b027feea914e0ba873e75d117857473d1fd7b400e41bd473d638171fa39d5be048990bf685dc0807f7d92418579b763056dc2a6dcf6b96777d5688ddee04
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/system.cpp | 6 | ||||
| -rw-r--r-- | src/util/system.h | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/util/system.cpp b/src/util/system.cpp index 789dcfaba9..bb9fcab59e 100644 --- a/src/util/system.cpp +++ b/src/util/system.cpp @@ -111,6 +111,12 @@ bool LockDirectory(const fs::path& directory, const std::string lockfile_name, b return true; } +void UnlockDirectory(const fs::path& directory, const std::string& lockfile_name) +{ + std::lock_guard<std::mutex> lock(cs_dir_locks); + dir_locks.erase((directory / lockfile_name).string()); +} + void ReleaseDirectoryLocks() { std::lock_guard<std::mutex> ulock(cs_dir_locks); diff --git a/src/util/system.h b/src/util/system.h index 5932e55793..17723d427d 100644 --- a/src/util/system.h +++ b/src/util/system.h @@ -70,6 +70,7 @@ int RaiseFileDescriptorLimit(int nMinFD); void AllocateFileRange(FILE *file, unsigned int offset, unsigned int length); bool RenameOver(fs::path src, fs::path dest); bool LockDirectory(const fs::path& directory, const std::string lockfile_name, bool probe_only=false); +void UnlockDirectory(const fs::path& directory, const std::string& lockfile_name); bool DirIsWritable(const fs::path& directory); /** Release all directory locks. This is used for unit testing only, at runtime |