Don't fail on "try" fns if failed to get spinLock
In SharedSpinLock: Only fail on "try" fns after spinLock was acquired and condition is not met.
This commit is contained in:
parent
e189628d5e
commit
c798cac80b
1 changed files with 54 additions and 38 deletions
|
@ -40,14 +40,18 @@ UDPC::LockObj<false> UDPC::SharedSpinLock::spin_read_lock() {
|
|||
}
|
||||
|
||||
UDPC::LockObj<false> UDPC::SharedSpinLock::try_spin_read_lock() {
|
||||
bool expected = false;
|
||||
if (spinLock.compare_exchange_weak(expected, true, std::memory_order_acquire, std::memory_order_relaxed)) {
|
||||
if (!write) {
|
||||
++read;
|
||||
spinLock.store(false, std::memory_order_release);
|
||||
return LockObj<false>(selfWeakPtr, Badge{});
|
||||
} else {
|
||||
spinLock.store(false, std::memory_order_release);
|
||||
bool expected;
|
||||
while (true) {
|
||||
expected = false;
|
||||
if (spinLock.compare_exchange_weak(expected, true, std::memory_order_acquire, std::memory_order_relaxed)) {
|
||||
if (!write) {
|
||||
++read;
|
||||
spinLock.store(false, std::memory_order_release);
|
||||
return LockObj<false>(selfWeakPtr, Badge{});
|
||||
} else {
|
||||
spinLock.store(false, std::memory_order_release);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
return LockObj<false>{};
|
||||
|
@ -87,14 +91,18 @@ UDPC::LockObj<true> UDPC::SharedSpinLock::spin_write_lock() {
|
|||
}
|
||||
|
||||
UDPC::LockObj<true> UDPC::SharedSpinLock::try_spin_write_lock() {
|
||||
bool expected = false;
|
||||
if (spinLock.compare_exchange_weak(expected, true, std::memory_order_acquire, std::memory_order_relaxed)) {
|
||||
if (!write && read == 0) {
|
||||
write = true;
|
||||
spinLock.store(false, std::memory_order_release);
|
||||
return LockObj<true>(selfWeakPtr, Badge{});
|
||||
} else {
|
||||
spinLock.store(false, std::memory_order_release);
|
||||
bool expected;
|
||||
while (true) {
|
||||
expected = false;
|
||||
if (spinLock.compare_exchange_weak(expected, true, std::memory_order_acquire, std::memory_order_relaxed)) {
|
||||
if (!write && read == 0) {
|
||||
write = true;
|
||||
spinLock.store(false, std::memory_order_release);
|
||||
return LockObj<true>(selfWeakPtr, Badge{});
|
||||
} else {
|
||||
spinLock.store(false, std::memory_order_release);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
return LockObj<true>{};
|
||||
|
@ -142,17 +150,21 @@ UDPC::LockObj<false> UDPC::SharedSpinLock::trade_write_for_read_lock(UDPC::LockO
|
|||
|
||||
UDPC::LockObj<false> UDPC::SharedSpinLock::try_trade_write_for_read_lock(UDPC::LockObj<true> &lockObj) {
|
||||
if (lockObj.isValid() && lockObj.badge.isValid) {
|
||||
bool expected = false;
|
||||
if (spinLock.compare_exchange_weak(expected, true, std::memory_order_acquire, std::memory_order_relaxed)) {
|
||||
if (write && read == 0) {
|
||||
read = 1;
|
||||
write = false;
|
||||
lockObj.isLocked = false;
|
||||
lockObj.badge.isValid = false;
|
||||
spinLock.store(false, std::memory_order_release);
|
||||
return LockObj<false>(selfWeakPtr, Badge{});
|
||||
} else {
|
||||
spinLock.store(false, std::memory_order_release);
|
||||
bool expected;
|
||||
while (true) {
|
||||
expected = false;
|
||||
if (spinLock.compare_exchange_weak(expected, true, std::memory_order_acquire, std::memory_order_relaxed)) {
|
||||
if (write && read == 0) {
|
||||
read = 1;
|
||||
write = false;
|
||||
lockObj.isLocked = false;
|
||||
lockObj.badge.isValid = false;
|
||||
spinLock.store(false, std::memory_order_release);
|
||||
return LockObj<false>(selfWeakPtr, Badge{});
|
||||
} else {
|
||||
spinLock.store(false, std::memory_order_release);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -184,17 +196,21 @@ UDPC::LockObj<true> UDPC::SharedSpinLock::trade_read_for_write_lock(UDPC::LockOb
|
|||
|
||||
UDPC::LockObj<true> UDPC::SharedSpinLock::try_trade_read_for_write_lock(UDPC::LockObj<false> &lockObj) {
|
||||
if (lockObj.isValid() && lockObj.badge.isValid) {
|
||||
bool expected = false;
|
||||
if (spinLock.compare_exchange_weak(expected, true, std::memory_order_acquire, std::memory_order_relaxed)) {
|
||||
if (!write && read == 1) {
|
||||
read = 0;
|
||||
write = true;
|
||||
lockObj.isLocked = false;
|
||||
lockObj.badge.isValid = false;
|
||||
spinLock.store(false, std::memory_order_release);
|
||||
return LockObj<true>(selfWeakPtr, Badge{});
|
||||
} else {
|
||||
spinLock.store(false, std::memory_order_release);
|
||||
bool expected;
|
||||
while (true) {
|
||||
expected = false;
|
||||
if (spinLock.compare_exchange_weak(expected, true, std::memory_order_acquire, std::memory_order_relaxed)) {
|
||||
if (!write && read == 1) {
|
||||
read = 0;
|
||||
write = true;
|
||||
lockObj.isLocked = false;
|
||||
lockObj.badge.isValid = false;
|
||||
spinLock.store(false, std::memory_order_release);
|
||||
return LockObj<true>(selfWeakPtr, Badge{});
|
||||
} else {
|
||||
spinLock.store(false, std::memory_order_release);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue