GithubStar/MMKV
1
0
Fork 0
mirror of https://github.com/Tencent/MMKV.git synced 2026-10-17 04:30:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix rare lock conflict on checkProcessMode() again

Browse Source
This commit is contained in:
guoling
2020-09-11 19:25:27 +08:00
parent 339d038ab8
commit 81187a86bc
4 changed files with 53 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Core/InterProcessLock_Android.cpp
+4 -1
View File
@@ -45,7 +45,7 @@ static short LockType2FlockType(LockType lockType) {
}
}
bool FileLock::ashmemLock(LockType lockType, bool wait, bool unLockFirstIfNeeded) {
bool FileLock::ashmemLock(LockType lockType, bool wait, bool unLockFirstIfNeeded, bool *tryAgain) {
m_lockInfo.l_type = LockType2FlockType(lockType);
if (unLockFirstIfNeeded) {
// try lock
@@ -66,6 +66,9 @@ bool FileLock::ashmemLock(LockType lockType, bool wait, bool unLockFirstIfNeeded
int cmd = wait ? F_SETLKW : F_SETLK;
auto ret = fcntl(m_fd, cmd, &m_lockInfo);
if (ret != 0) {
if (tryAgain) {
*tryAgain = (errno == EAGAIN);
}
if (wait) {
MMKVError("fail to lock fd=%d, ret=%d, error:%s", m_fd, ret, strerror(errno));
}