hayodea/salmanoff
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Qutex: currOwner should use registered sh_ptr to Lockvoker

Browse Source 
This ensures that the Lockvoker object we access from currOwner
remains valid past the lifetime of the Lockvoker object that
gets copied and invoked by boost::asio
This commit is contained in:
Hayodea Hekol
2025-09-29 14:37:16 -04:00
parent 462247d743
commit 2a60fdd9df
7 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
smocore/qutex.cpp
+7 -3
View File
@@ -44,7 +44,9 @@ bool Qutex::tryAcquire(
{
isOwned = true;
#ifdef CONFIG_ENABLE_DEBUG_LOCKS
currOwner = const_cast<LockerAndInvokerBase*>(&tryingLockvoker);
// Use the stored iterator from the LockSet
auto it = tryingLockvoker.getLockvokerIteratorForQutex(*this);
currOwner = *it;
#endif
lock.release();
return true;
@@ -59,7 +61,7 @@ bool Qutex::tryAcquire(
{
isOwned = true;
#ifdef CONFIG_ENABLE_DEBUG_LOCKS
currOwner = const_cast<LockerAndInvokerBase*>(&tryingLockvoker);
currOwner = queue.front();
#endif
ret = true;
}
@@ -96,7 +98,9 @@ bool Qutex::tryAcquire(
// Not found in rear portion - must be in top X%, so succeed
isOwned = true;
#ifdef CONFIG_ENABLE_DEBUG_LOCKS
currOwner = const_cast<LockerAndInvokerBase*>(&tryingLockvoker);
// Use the stored iterator from the LockSet
auto it = tryingLockvoker.getLockvokerIteratorForQutex(*this);
currOwner = *it;
#endif
lock.release();
return true;
smocore/serializedAsynchronousContinuation.cpp
+8 -7
View File
@@ -27,9 +27,9 @@ SerializedAsynchronousContinuation<OriginalCbFnT>
* lockvoker.
*/
for (std::shared_ptr<AsynchronousContinuationChainLink> currContin =
this->serializedContinuation.getCallersContinuation();
this->serializedContinuation.getCallersContinuationShPtr();
currContin != nullptr;
currContin = currContin->getCallersContinuation())
currContin = currContin->getCallersContinuationShPtr())
{
auto serializedCont = std::dynamic_pointer_cast<
SerializedAsynchronousContinuation<OriginalCbFnT>>(currContin);
@@ -94,13 +94,14 @@ SerializedAsynchronousContinuation<OriginalCbFnT>
* Hence, we have a gridlock.
*/
LockerAndInvokerBase* foreignOwnerPtr = firstFailedQutex.getCurrOwner();
std::shared_ptr<LockerAndInvokerBase> foreignOwnerShPtr =
firstFailedQutex.getCurrOwner();
// If no current owner, can't be a gridlock
if (foreignOwnerPtr == nullptr)
if (foreignOwnerShPtr == nullptr)
{ return false; }
// Use reference for the rest of the function for safety.
LockerAndInvokerBase& foreignOwner = *foreignOwnerPtr;
LockerAndInvokerBase &foreignOwner = *foreignOwnerShPtr;
/* For each lock in the foreign owner's LockSet, check if we hold it
* in any of our previous continuations (excluding our most immediate one)
@@ -128,9 +129,9 @@ SerializedAsynchronousContinuation<OriginalCbFnT>
* should eventually be able to acquire that lock.
*/
for (std::shared_ptr<AsynchronousContinuationChainLink> currContin =
this->serializedContinuation.getCallersContinuation();
this->serializedContinuation.getCallersContinuationShPtr();
currContin != nullptr;
currContin = currContin->getCallersContinuation())
currContin = currContin->getCallersContinuationShPtr())
{
auto serializedCont = std::dynamic_pointer_cast<
SerializedAsynchronousContinuation<OriginalCbFnT>>(currContin);