haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a hack to avoid spamming sentry events due to recursive asserts

This commit is contained in:
Marek Roszko 2023-10-29 22:39:45 -04:00
parent b5d904b45d
commit d0b26ae600
1 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
common/pgm_base.cpp
View File

@ -914,6 +914,28 @@ void PGM_BASE::HandleException( std::exception_ptr aPtr )
} }
#ifdef KICAD_USE_SENTRY
struct SENTRY_ASSERT_CACHE_KEY
{
wxString file;
int line;
wxString func;
wxString cond;
wxString msg;
};
bool operator<( const SENTRY_ASSERT_CACHE_KEY& aKey1, const SENTRY_ASSERT_CACHE_KEY& aKey2 )
{
return aKey1.file < aKey2.file ||
aKey1.line < aKey2.line ||
aKey1.func < aKey2.func ||
aKey1.cond < aKey2.cond ||
aKey1.msg < aKey2.msg;
}
#endif
void PGM_BASE::HandleAssert( const wxString& aFile, int aLine, const wxString& aFunc, void PGM_BASE::HandleAssert( const wxString& aFile, int aLine, const wxString& aFunc,
const wxString& aCond, const wxString& aMsg ) const wxString& aCond, const wxString& aMsg )
{ {
@ -936,6 +958,11 @@ void PGM_BASE::HandleAssert( const wxString& aFile, int aLine, const wxString& a
#ifdef KICAD_USE_SENTRY #ifdef KICAD_USE_SENTRY
if( IsSentryOptedIn() ) if( IsSentryOptedIn() )
{
static std::set<SENTRY_ASSERT_CACHE_KEY> assertCache;
SENTRY_ASSERT_CACHE_KEY key = { aFile, aLine, aFunc, aCond, aMsg };
if( assertCache.find( key ) == assertCache.end() )
{ {
sentry_value_t exc = sentry_value_new_exception( "assert", assertStr ); sentry_value_t exc = sentry_value_new_exception( "assert", assertStr );
sentry_value_set_stacktrace( exc, NULL, 0 ); sentry_value_set_stacktrace( exc, NULL, 0 );
@ -943,6 +970,8 @@ void PGM_BASE::HandleAssert( const wxString& aFile, int aLine, const wxString& a
sentry_value_t sentryEvent = sentry_value_new_event(); sentry_value_t sentryEvent = sentry_value_new_event();
sentry_event_add_exception( sentryEvent, exc ); sentry_event_add_exception( sentryEvent, exc );
sentry_capture_event( sentryEvent ); sentry_capture_event( sentryEvent );
assertCache.insert( key );
}
} }
#endif #endif
} }