Skip to content

Fix device context pool deadlock scenario #751

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

Open
wants to merge 6 commits into
base: uwp/main
Choose a base branch
from
Open

Fix device context pool deadlock scenario #751

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bb01b11
fix device context pool deadlock scenario
Jan 21, 2020
410aa6b
Revert "fix device context pool deadlock scenario"
Jan 21, 2020
6ef7c76
fix device context pool potential deadlock
Jan 21, 2020
9d7270a
Merge branch 'master' into fix-context-pool-lock
benstevens48 Nov 22, 2024
5472da9
add ref even though not strictly needed
benstevens48 Nov 22, 2024
14cb739
Merge branch 'master' into fix-context-pool-lock
benstevens48 Jan 9, 2025
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
6 changes: 5 additions & 1 deletion winrt/lib/drawing/DeviceContextPool.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,12 @@ DeviceContextLease DeviceContextPool::TakeLease()

if (m_deviceContexts.empty())
{
//Store a local copy of the non-null device pointer before unlocking.
ComPtr<ID2D1Device1> localDevice(m_d2dDevice);
//Release lock before creating the device context to avoid potential deadlock scenarios.
lock.unlock();
ComPtr<ID2D1DeviceContext1> deviceContext;
ThrowIfFailed(m_d2dDevice->CreateDeviceContext(
ThrowIfFailed(localDevice->CreateDeviceContext(
D2D1_DEVICE_CONTEXT_OPTIONS_NONE,
&deviceContext));
return DeviceContextLease(this, std::move(deviceContext));
Expand Down