andreacavalli/tdlib-fork
Archived
1
0
Fork 0
Code Pull Requests Releases Activity

Better error message.

Browse Source 
GitOrigin-RevId: 90f177a01b941a8fe029fb6363858260a0ca1f3b
This commit is contained in:
levlam 2018-05-10 21:39:01 +03:00
parent fa99ec2875
commit 36562f351c
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tdutils/td/utils/port/FileFd.cpp
View File

@ -345,7 +345,7 @@ Status FileFd::lock(FileFd::LockFlags flags, int32 max_tries) {
lock.l_whence = SEEK_SET; lock.l_whence = SEEK_SET;
if (fcntl(get_native_fd(), F_SETLK, &lock) == -1) { if (fcntl(get_native_fd(), F_SETLK, &lock) == -1) {
if (errno == EAGAIN && --max_tries > 0) { if (errno == EAGAIN) {
#elif TD_PORT_WINDOWS #elif TD_PORT_WINDOWS
OVERLAPPED overlapped; OVERLAPPED overlapped;
std::memset(&overlapped, 0, sizeof(overlapped)); std::memset(&overlapped, 0, sizeof(overlapped));
@ -363,10 +363,14 @@ Status FileFd::lock(FileFd::LockFlags flags, int32 max_tries) {
} }
if (!result) { if (!result) {
if (GetLastError() == ERROR_LOCK_VIOLATION && --max_tries > 0) { if (GetLastError() == ERROR_LOCK_VIOLATION) {
#endif #endif
usleep_for(100000); if (--max_tries > 0) {
continue; usleep_for(100000);
continue;
}
return OS_ERROR("Can't lock file because it is already in use; check for another program instance running");
} }
return OS_ERROR("Can't lock file"); return OS_ERROR("Can't lock file");