Better create_local_lock.

GitOrigin-RevId: ce705e7258ad05bde1ac6c72cc8a045c128fa8a6
This commit is contained in:
levlam 2018-10-30 14:21:36 +03:00
parent 43ef35eb71
commit a91db513eb

View File

@ -286,7 +286,7 @@ Result<size_t> FileFd::pread(MutableSlice slice, int64 offset) const {
static std::mutex in_process_lock_mutex; static std::mutex in_process_lock_mutex;
static std::unordered_set<string> locked_files; static std::unordered_set<string> locked_files;
static Status create_local_lock(const string &path, int32 max_tries) { static Status create_local_lock(const string &path, int32 &max_tries) {
while (true) { while (true) {
{ // mutex lock scope { // mutex lock scope
std::lock_guard<std::mutex> lock(in_process_lock_mutex); std::lock_guard<std::mutex> lock(in_process_lock_mutex);
@ -298,13 +298,12 @@ static Status create_local_lock(const string &path, int32 max_tries) {
} }
if (--max_tries <= 0) { if (--max_tries <= 0) {
break; return Status::Error(
0, PSLICE() << "Can't lock file \"" << path << "\", because it is already in use by current program");
} }
usleep_for(100000); usleep_for(100000);
} }
return Status::Error(
0, PSLICE() << "Can't lock file \"" << path << "\", because it is already in use by current program");
} }
Status FileFd::lock(const LockFlags flags, const string &path, int32 max_tries) { Status FileFd::lock(const LockFlags flags, const string &path, int32 max_tries) {