wallet: Close wallet env lock file

promag · promag · commit 2e9e904a5d58 · 2019-03-12T23:24:11.000Z
Close .walletlock file when a BerkeleyEnvironment is deleted. Github-Pull: bitcoin#15297 Rebased-From: 2f8b8f4
diff --git a/src/util.cpp b/src/util.cpp
@@ -174,6 +174,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.h b/src/util.h
@@ -77,6 +77,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
diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp
@@ -136,6 +136,8 @@ void BerkeleyEnvironment::Close()
         DbEnv((u_int32_t)0).remove(strPath.c_str(), 0);
 
     if (error_file) fclose(error_file);
+
+    UnlockDirectory(strPath, ".walletlock");
 }
 
 void BerkeleyEnvironment::Reset()

Original file line number	Diff line number	Diff line change
`@@ -174,6 +174,12 @@ bool LockDirectory(const fs::path& directory, const std::string lockfile_name, b`
`174`	`174`	`return true;`
`175`	`175`	`}`
`176`	`176`
	`177`	`+void UnlockDirectory(const fs::path& directory, const std::string& lockfile_name)`
	`178`	`+{`
	`179`	`+ std::lock_guard<std::mutex> lock(cs_dir_locks);`
	`180`	`+ dir_locks.erase((directory / lockfile_name).string());`
	`181`	`+}`
	`182`	`+`
`177`	`183`	`void ReleaseDirectoryLocks()`
`178`	`184`	`{`
`179`	`185`	`std::lock_guard<std::mutex> ulock(cs_dir_locks);`
Original file line number	Diff line number	Diff line change
`@@ -136,6 +136,8 @@ void BerkeleyEnvironment::Close()`
`136`	`136`	`DbEnv((u_int32_t)0).remove(strPath.c_str(), 0);`
`137`	`137`
`138`	`138`	`if (error_file) fclose(error_file);`
	`139`	`+`
	`140`	`+ UnlockDirectory(strPath, ".walletlock");`
`139`	`141`	`}`
`140`	`142`
`141`	`143`	`void BerkeleyEnvironment::Reset()`