1 files changed, 68 insertions, 35 deletions

diff --git a/linden/indra/newview/llappviewerlinux.cpp b/linden/indra/newview/llappviewerlinux.cpp
index 659fbf49..084df9b 100644
--- a/linden/indra/newview/llappviewerlinux.cpp
+++ b/linden/indra/newview/llappviewerlinux.cpp
@@ -31,28 +31,50 @@
 
 #include "llviewerprecompiledheaders.h"
 
-#include "llmemtype.h"
 #include "llappviewerlinux.h"
 
+#include "llcommandlineparser.h"
+
+#include "llmemtype.h"
 #include "llviewernetwork.h"
 #include "llmd5.h"
 
-  #if LL_LINUX
-  #     include <dlfcn.h>               // RTLD_LAZY
-  #     include <execinfo.h>            // backtrace - glibc only
-  #     ifndef LL_ELFBIN
-  #define LL_ELFBIN 1
-  #     endif // LL_ELFBIN
-  #     if LL_ELFBIN
-  #          include <cxxabi.h>         // for symbol demangling
-  #          include "ELFIO.h"          // for better backtraces
-  #     endif // LL_ELFBIN
-  #elif LL_SOLARIS
-  #     include <sys/types.h>
-  #     include <unistd.h>
-  #     include <fcntl.h>
-  #     include <ucontext.h>
-  #endif
+#include <exception>
+
+#if LL_LINUX
+# include <dlfcn.h>             // RTLD_LAZY
+# include <execinfo.h>            // backtrace - glibc only
+# ifndef LL_ELFBIN
+#  define LL_ELFBIN 1
+# endif // LL_ELFBIN
+# if LL_ELFBIN
+#  include <cxxabi.h>         // for symbol demangling
+#  include "ELFIO.h"          // for better backtraces
+# endif // LL_ELFBIN
+#elif LL_SOLARIS
+# include <sys/types.h>
+# include <unistd.h>
+# include <fcntl.h>
+# include <ucontext.h>
+#endif
+
+namespace
+{
+        int gArgC = 0;
+        char **gArgV = NULL;
+        void (*gOldTerminateHandler)() = NULL;
+}
+
+static void exceptionTerminateHandler()
+{
+        // reinstall default terminate() handler in case we re-terminate.
+        if (gOldTerminateHandler) std::set_terminate(gOldTerminateHandler);
+        // treat this like a regular viewer crash, with nice stacktrace etc.
+        LLAppViewer::handleSyncViewerCrash();
+        LLAppViewer::handleViewerCrash();
+        // we've probably been killed-off before now, but...
+        gOldTerminateHandler(); // call old terminate() handler
+}
 
 int main( int argc, char **argv ) 
 {
@@ -62,18 +84,18 @@ int main( int argc, char **argv )
         asm ("ta\t6");           // NOTE:  Make sure memory alignment is enforced on SPARC
 #endif
 
+        gArgC = argc;
+        gArgV = argv;
+
         LLAppViewer* viewer_app_ptr = new LLAppViewerLinux();
 
+        // install unexpected exception handler
+        gOldTerminateHandler = std::set_terminate(exceptionTerminateHandler);
+        // install crash handlers
         viewer_app_ptr->setErrorHandler(LLAppViewer::handleViewerCrash);
+        viewer_app_ptr->setSyncErrorHandler(LLAppViewer::handleSyncViewerCrash);
 
-        bool ok = viewer_app_ptr->tempStoreCommandOptions(argc, argv);
-        if(!ok)
-        {
-                llwarns << "Unable to parse command line." << llendl;
-                return -1;
-        }
-
-        ok = viewer_app_ptr->init();
+        bool ok = viewer_app_ptr->init();
         if(!ok)
         {
                 llwarns << "Application init failed." << llendl;
@@ -297,19 +319,22 @@ bool LLAppViewerLinux::init()
         return LLAppViewer::init();
 }
 
-void LLAppViewerLinux::handleCrashReporting()
+void LLAppViewerLinux::handleSyncCrashTrace()
 {
+        // This backtrace writes into stack_trace.log
+#  if LL_ELFBIN
+        do_elfio_glibc_backtrace(); // more useful backtrace
+#  else
+        do_basic_glibc_backtrace(); // only slightly useful backtrace
+#  endif // LL_ELFBIN
+}
 
+void LLAppViewerLinux::handleCrashReporting()
+{
         // Always generate the report, have the logger do the asking, and
         // don't wait for the logger before exiting (-> total cleanup).
         if (CRASH_BEHAVIOR_NEVER_SEND != LLAppViewer::instance()->getCrashBehavior())
         {       
-                // This backtrace writes into stack_trace.log
-#  if LL_ELFBIN
-                do_elfio_glibc_backtrace(); // more useful backtrace
-#  else
-                do_basic_glibc_backtrace(); // only slightly useful backtrace
-#  endif // LL_ELFBIN
                 // launch the actual crash logger
                 char* ask_dialog = "-dialog";
                 if (CRASH_BEHAVIOR_ASK != LLAppViewer::instance()->getCrashBehavior())
@@ -321,10 +346,11 @@ void LLAppViewerLinux::handleCrashReporting()
                         {(char*)cmd.c_str(),
                          ask_dialog,
                          (char*)"-user",
-                         (char*)gGridName,
+                         (char*)gGridName.c_str(),
                          (char*)"-name",
                          (char*)LLAppViewer::instance()->getSecondLifeTitle().c_str(),
                          NULL};
+                fflush(NULL);
                 pid_t pid = fork();
                 if (pid == 0)
                 { // child
@@ -348,9 +374,10 @@ void LLAppViewerLinux::handleCrashReporting()
                         }
                 }
         }
-        // Sometimes signals don't seem to quit the viewer.  
+        // Sometimes signals don't seem to quit the viewer.  Also, we may
+        // have been called explicitly instead of from a signal handler.
         // Make sure we exit so as to not totally confuse the user.
-        exit(1);
+        _exit(1); // avoid atexit(), else we may re-crash in dtors.
 }
 
 bool LLAppViewerLinux::beingDebugged()
@@ -403,6 +430,12 @@ bool LLAppViewerLinux::initLogging()
         return LLAppViewer::initLogging();
 }
 
+bool LLAppViewerLinux::initParseCommandLine(LLCommandLineParser& clp)
+{
+        clp.parseCommandLine(gArgC, gArgV);
+        return true;
+}
+
 std::string LLAppViewerLinux::generateSerialNumber()
 {
         char serial_md5[MD5HEX_STR_SIZE];