Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[avstream/sampledevicemft] Fix possible deadlock while changes output stream state #935

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[avstream/sampledevicemft] Fix possible deadlock while changes output stream state #935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions avstream/sampledevicemft/common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,8 @@ class CCritSec
~CCritSec();
_Requires_lock_not_held_(m_criticalSection) _Acquires_lock_(m_criticalSection)
void Lock();
_Requires_lock_not_held_(m_criticalSection) _Acquires_lock_(m_criticalSection)
BOOL TryLock();
_Requires_lock_held_(m_criticalSection) _Releases_lock_(m_criticalSection)
void Unlock();
};
Expand All @@ -201,6 +203,22 @@ class CAutoLock
~CAutoLock();
};

class CTryLock
{
protected:
CCritSec *m_pCriticalSection;
BOOL m_bLocked;
public:
_Acquires_lock_(this->m_pCriticalSection->m_criticalSection)
CTryLock(CCritSec& crit);
_Acquires_lock_(this->m_pCriticalSection->m_criticalSection)
CTryLock(CCritSec* crit);
_Releases_lock_(this->m_pCriticalSection->m_criticalSection)
~CTryLock();

BOOL Locked();
};

//////////////////////////////////////////////////////////////////////////
// CMediaTypePrinter
// Description: Rudimentary class for printing media type!
Expand Down
6 changes: 5 additions & 1 deletion avstream/sampledevicemft/multipinmft.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -774,7 +774,11 @@ output pins and populate the corresponding MFT_OUTPUT_DATA_BUFFER with the sampl
{
DWORD dwStreamID = pOutputSamples[i].dwStreamID;
{
CAutoLock _lock(m_critSec);
CTryLock _lock(m_critSec);
if (!_lock.Locked())
{
break;
}
spOpin = nullptr;
spOpin = GetOutPin(dwStreamID);
GUID pinGuid = GUID_NULL;
Expand Down
32 changes: 32 additions & 0 deletions avstream/sampledevicemft/multipinmftutils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ void CCritSec::Lock()
EnterCriticalSection(&m_criticalSection);
}

_Requires_lock_not_held_(m_criticalSection) _Acquires_lock_(m_criticalSection)
BOOL CCritSec::TryLock()
{
return TryEnterCriticalSection(&m_criticalSection);
}

_Requires_lock_held_(m_criticalSection) _Releases_lock_(m_criticalSection)
void CCritSec::Unlock()
{
Expand All @@ -59,6 +65,32 @@ CAutoLock::~CAutoLock()
m_pCriticalSection->Unlock();
}

_Acquires_lock_(this->m_pCriticalSection->m_criticalSection)
CTryLock::CTryLock(CCritSec& crit)
{
m_pCriticalSection = &crit;
m_bLocked = m_pCriticalSection->TryLock();
}
_Acquires_lock_(this->m_pCriticalSection->m_criticalSection)
CTryLock::CTryLock(CCritSec* crit)
{
m_pCriticalSection = crit;
m_bLocked = m_pCriticalSection->TryLock();
}
_Releases_lock_(this->m_pCriticalSection->m_criticalSection)
CTryLock::~CTryLock()
{
if (m_bLocked)
{
m_pCriticalSection->Unlock();
}
}

BOOL CTryLock::Locked()
{
return m_bLocked;
}

//
//Some utility functions..
//
Expand Down