Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package Registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
ac2604a0
Commit
ac2604a0
authored
6 years ago
by
Nat Goodspeed
Browse files
Options
Downloads
Patches
Plain Diff
SL-821: Avoid Breakpad (and signal handling in general) for BugSplat.
Pass LL_BUGSPLAT into llapp.cpp compile to be able to detect that.
parent
ab9a3db3
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/llcommon/CMakeLists.txt
+5
-0
5 additions, 0 deletions
indra/llcommon/CMakeLists.txt
indra/llcommon/llapp.cpp
+16
-7
16 additions, 7 deletions
indra/llcommon/llapp.cpp
with
21 additions
and
7 deletions
indra/llcommon/CMakeLists.txt
+
5
−
0
View file @
ac2604a0
...
...
@@ -255,6 +255,11 @@ set(llcommon_HEADER_FILES
set_source_files_properties
(
${
llcommon_HEADER_FILES
}
PROPERTIES HEADER_FILE_ONLY TRUE
)
if
(
DEFINED ENV{BUGSPLAT_DB}
)
set_source_files_properties
(
llapp.cpp
PROPERTIES COMPILE_DEFINITIONS
"LL_BUGSPLAT"
)
endif
(
DEFINED ENV{BUGSPLAT_DB}
)
list
(
APPEND llcommon_SOURCE_FILES
${
llcommon_HEADER_FILES
}
)
if
(
LLCOMMON_LINK_SHARED
)
...
...
This diff is collapsed.
Click to expand it.
indra/llcommon/llapp.cpp
+
16
−
7
View file @
ac2604a0
...
...
@@ -392,7 +392,7 @@ void LLApp::setupErrorHandling(bool second_instance)
#if LL_WINDOWS
#if LL_SEND_CRASH_REPORTS
#if LL_SEND_CRASH_REPORTS
&& ! defined(LL_BUGSPLAT)
EnableCrashingOnCrashes
();
// This sets a callback to handle w32 signals to the console window.
...
...
@@ -454,8 +454,15 @@ void LLApp::setupErrorHandling(bool second_instance)
mExceptionHandler
->
set_handle_debug_exceptions
(
true
);
}
}
#endif
#else
#endif // LL_SEND_CRASH_REPORTS && ! defined(LL_BUGSPLAT)
#else // ! LL_WINDOWS
#if defined(LL_BUGSPLAT)
// Don't install our own signal handlers -- BugSplat needs to hook them,
// or it's completely ineffectual.
bool
installHandler
=
false
;
#else // ! LL_BUGSPLAT
//
// Start up signal handling.
//
...
...
@@ -463,9 +470,11 @@ void LLApp::setupErrorHandling(bool second_instance)
// thread, asynchronous signals can be delivered to any thread (in theory)
//
setup_signals
();
// Add google breakpad exception handler configured for Darwin/Linux.
bool
installHandler
=
true
;
#endif // ! LL_BUGSPLAT
#if LL_DARWIN
// For the special case of Darwin, we do not want to install the handler if
// the process is being debugged as the app will exit with value ABRT (6) if
...
...
@@ -498,7 +507,7 @@ void LLApp::setupErrorHandling(bool second_instance)
// installing the handler.
installHandler
=
true
;
}
#endif
#endif
// ! LL_RELEASE_FOR_DOWNLOAD
if
(
installHandler
&&
(
mExceptionHandler
==
0
))
{
...
...
@@ -514,9 +523,9 @@ void LLApp::setupErrorHandling(bool second_instance)
google_breakpad
::
MinidumpDescriptor
desc
(
mDumpPath
);
mExceptionHandler
=
new
google_breakpad
::
ExceptionHandler
(
desc
,
NULL
,
unix_minidump_callback
,
NULL
,
true
,
-
1
);
}
#endif
#endif
// LL_LINUX
#endif
#endif
// ! LL_WINDOWS
startErrorThread
();
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment