Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

UWP: Crash report UI

Browse source
This commit is contained in:
Paul Rouget 2020-08-03 17:23:30 +02:00
parent 0c00022ae0
commit 52f01a8a14
9 changed files with 196 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

50
support/hololens/ServoApp/ServoControl/ServoControl.cpp
View file

@ -418,34 +418,48 @@ void ServoControl::Loop() {
while (true) {
EnterCriticalSection(&mGLLock);
while (mTasks.size() == 0 && !mAnimating && mLooping) {
SleepConditionVariableCS(&mGLCondVar, &mGLLock, INFINITE);
}
if (!mLooping) {
try {
while (mTasks.size() == 0 && !mAnimating && mLooping) {
SleepConditionVariableCS(&mGLCondVar, &mGLLock, INFINITE);
}
if (!mLooping) {
LeaveCriticalSection(&mGLLock);
break;
}
for (auto &&task : mTasks) {
task();
}
mTasks.clear();
LeaveCriticalSection(&mGLLock);
break;
mServo->PerformUpdates();
} catch (hresult_error const &e) {
log(L"GL Thread exception: %s", e.message().c_str());
throw e;
} catch (...) {
log(L"GL Thread exception");
throw winrt::hresult_error(E_FAIL, L"GL Thread exception");
}
for (auto &&task : mTasks) {
task();
}
mTasks.clear();
LeaveCriticalSection(&mGLLock);
mServo->PerformUpdates();
}
mServo->DeInit();
}
void ServoControl::StartRenderLoop() {
if (mLooping) {
#if defined _DEBUG
throw winrt::hresult_error(E_FAIL, L"GL thread is already looping");
#else
return;
#endif
}
mLooping = true;
log(L"BrowserPage::StartRenderLoop(). UI thread: %i", GetCurrentThreadId());
auto task = Concurrency::create_task([=] { Loop(); });
auto task = Concurrency::create_task([=] {
try {
Loop();
} catch (...) {
// Do our best to recover. Exception has been logged at that point.
mLooping = false;
mLoopTask.reset();
mServo.reset();
LeaveCriticalSection(&mGLLock);
}
});
mLoopTask = std::make_unique<Concurrency::task<void>>(task);
}
@ -502,6 +516,10 @@ bool ServoControl::OnServoAllowNavigation(hstring uri) {
return !mTransient;
}
void ServoControl::OnServoPanic(hstring backtrace) {
RunOnUIThread([=] { mOnServoPanic(*this, backtrace); });
}
void ServoControl::OnServoAnimatingChanged(bool animating) {
EnterCriticalSection(&mGLLock);
mAnimating = animating;