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

Make diagnostics server not swallow exception on debug builds #38297

Merged
merged 2 commits into from
Jun 25, 2020
Merged

Make diagnostics server not swallow exception on debug builds #38297

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9898742
Do not swallow exception on debug builds
sywhang Jun 23, 2020
5a60ebb
fix contract
sywhang Jun 24, 2020
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
5 changes: 4 additions & 1 deletion src/coreclr/src/vm/diagnosticserver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,10 @@ DWORD WINAPI DiagnosticServer::DiagnosticsServerThread(LPVOID)
STRESS_LOG2(LF_DIAGNOSTICS_PORT, LL_WARNING, "warning (%d): %s.\n", code, szMessage);
};

#ifndef DEBUG
EX_TRY
{
#endif
while (!s_shuttingDown)
{
IpcStream *pStream = IpcStreamFactory::GetNextAvailableStream(LoggingCallback);
Expand Down Expand Up @@ -97,13 +99,14 @@ DWORD WINAPI DiagnosticServer::DiagnosticsServerThread(LPVOID)
break;
}
}
#ifndef DEBUG
}
EX_CATCH
{
STRESS_LOG0(LF_DIAGNOSTICS_PORT, LL_ERROR, "Exception caught in diagnostic thread. Leaving thread now.\n");
_ASSERTE(!"Hit an error in the diagnostic server thread\n.");
}
EX_END_CATCH(SwallowAllExceptions);
#endif

return 0;
}
Expand Down