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

Stop DoSing users with renderer errors #13995

Merged
5 commits merged into from
Sep 16, 2022
Merged

Stop DoSing users with renderer errors #13995

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a8c9776
Stop DoSing users with renderer errors
lhecker Sep 14, 2022
a6cf48c
Fix test failures
lhecker Sep 15, 2022
f14ae33
Fix test failures
lhecker Sep 15, 2022
7b7cf1a
Fix namespace issue
lhecker Sep 16, 2022
899c23a
Whoops
lhecker Sep 16, 2022
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
39 changes: 20 additions & 19 deletions src/renderer/base/renderer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,29 +75,30 @@ Renderer::~Renderer()
}

const auto hr = _PaintFrameForEngine(pEngine);
if (E_PENDING == hr)
if (SUCCEEDED(hr))
{
if (--tries == 0)
break;
}

LOG_HR_IF(hr, hr != E_PENDING);

if (--tries == 0)
{
// Stop trying.
_pThread->DisablePainting();
if (_pfnRendererEnteredErrorState)
{
// Stop trying.
_pThread->DisablePainting();
if (_pfnRendererEnteredErrorState)
{
_pfnRendererEnteredErrorState();
}
// If there's no callback, we still don't want to FAIL_FAST: the renderer going black
// isn't near as bad as the entire application aborting. We're a component. We shouldn't
// abort applications that host us.
return S_FALSE;
_pfnRendererEnteredErrorState();
}

// Add a bit of backoff.
// Sleep 150ms, 300ms, 450ms before failing out and disabling the renderer.
Sleep(renderBackoffBaseTimeMilliseconds * (maxRetriesForRenderEngine - tries));
continue;
// If there's no callback, we still don't want to FAIL_FAST: the renderer going black
// isn't near as bad as the entire application aborting. We're a component. We shouldn't
// abort applications that host us.
return S_FALSE;
}
LOG_IF_FAILED(hr);
break;

// Add a bit of backoff.
// Sleep 150ms, 300ms, 450ms before failing out and disabling the renderer.
Sleep(renderBackoffBaseTimeMilliseconds * (maxRetriesForRenderEngine - tries));
}
}

Expand Down