1 files changed, 105 insertions, 331 deletions

diff --git a/indra/newview/llappviewerlinux.cpp b/indra/newview/llappviewerlinux.cpp
index ed291c16a8..f5742b29cf 100644..100755
--- a/indra/newview/llappviewerlinux.cpp
+++ b/indra/newview/llappviewerlinux.cpp
@@ -2,31 +2,25 @@
  * @file llappviewerlinux.cpp
  * @brief The LLAppViewerLinux class definitions
  *
- * $LicenseInfo:firstyear=2007&license=viewergpl$
- * 
- * Copyright (c) 2007-2009, Linden Research, Inc.
- * 
+ * $LicenseInfo:firstyear=2007&license=viewerlgpl$
  * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * Copyright (C) 2010, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
  * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at
- * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */ 
 
@@ -36,7 +30,7 @@
 
 #include "llcommandlineparser.h"
 
-#include "llmemtype.h"
+#include "lldiriterator.h"
 #include "llurldispatcher.h"		// SLURL from other app instance
 #include "llviewernetwork.h"
 #include "llviewercontrol.h"
@@ -46,23 +40,6 @@
 
 #include <exception>
 
-#if LL_LINUX
-# include <dlfcn.h>		// RTLD_LAZY
-# include <execinfo.h>  // backtrace - glibc only
-#elif LL_SOLARIS
-# include <sys/types.h>
-# include <unistd.h>
-# include <fcntl.h>
-# include <ucontext.h>
-#endif
-
-#ifdef LL_ELFBIN
-# ifdef __GNUC__
-#  include <cxxabi.h>			// for symbol demangling
-# endif
-# include "ELFIO/ELFIO.h"		// for better backtraces
-#endif
-
 #if LL_DBUS_ENABLED
 # include "llappviewerlinux_api_dbus.h"
 
@@ -81,21 +58,21 @@ namespace
 	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();
+    long *null_ptr;
+    null_ptr = 0;
+    *null_ptr = 0xDEADBEEF; //Force an exception that will trigger breakpad.
 	// we've probably been killed-off before now, but...
 	gOldTerminateHandler(); // call old terminate() handler
 }
 
 int main( int argc, char **argv ) 
 {
-	LLMemType mt1(LLMemType::MTYPE_STARTUP);
-
 #if LL_SOLARIS && defined(__sparc)
 	asm ("ta\t6");		 // NOTE:  Make sure memory alignment is enforced on SPARC
 #endif
@@ -109,12 +86,11 @@ int main( int argc, char **argv )
 	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->init();
 	if(!ok)
 	{
-		llwarns << "Application init failed." << llendl;
+		LL_WARNS() << "Application init failed." << LL_ENDL;
 		return -1;
 	}
 
@@ -138,201 +114,6 @@ int main( int argc, char **argv )
 	return 0;
 }
 
-#ifdef LL_SOLARIS
-static inline BOOL do_basic_glibc_backtrace()
-{
-	BOOL success = FALSE;
-
-	std::string strace_filename = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"stack_trace.log");
-	llinfos << "Opening stack trace file " << strace_filename << llendl;
-	LLFILE* StraceFile = LLFile::fopen(strace_filename, "w");
-	if (!StraceFile)
-	{
-		llinfos << "Opening stack trace file " << strace_filename << " failed. Using stderr." << llendl;
-		StraceFile = stderr;
-	}
-
-	printstack(fileno(StraceFile));
-
-	if (StraceFile != stderr)
-		fclose(StraceFile);
-
-	return success;
-}
-#else
-#define MAX_STACK_TRACE_DEPTH 40
-// This uses glibc's basic built-in stack-trace functions for a not very
-// amazing backtrace.
-static inline BOOL do_basic_glibc_backtrace()
-{
-	void *stackarray[MAX_STACK_TRACE_DEPTH];
-	size_t size;
-	char **strings;
-	size_t i;
-	BOOL success = FALSE;
-
-	size = backtrace(stackarray, MAX_STACK_TRACE_DEPTH);
-	strings = backtrace_symbols(stackarray, size);
-
-	std::string strace_filename = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"stack_trace.log");
-	llinfos << "Opening stack trace file " << strace_filename << llendl;
-	LLFILE* StraceFile = LLFile::fopen(strace_filename, "w");		// Flawfinder: ignore
-        if (!StraceFile)
-	{
-		llinfos << "Opening stack trace file " << strace_filename << " failed. Using stderr." << llendl;
-		StraceFile = stderr;
-	}
-
-	if (size)
-	{
-		for (i = 0; i < size; i++)
-		{
-			// the format of the StraceFile is very specific, to allow (kludgy) machine-parsing
-			fprintf(StraceFile, "%-3d ", i);
-			fprintf(StraceFile, "%-32s\t", "unknown");
-			fprintf(StraceFile, "%p ", stackarray[i]);
-			fprintf(StraceFile, "%s\n", strings[i]);
-		}
-
-		success = TRUE;
-	}
-	
-	if (StraceFile != stderr)
-		fclose(StraceFile);
-
-	free (strings);
-	return success;
-}
-
-#if LL_ELFBIN
-// This uses glibc's basic built-in stack-trace functions together with
-// ELFIO's ability to parse the .symtab ELF section for better symbol
-// extraction without exporting symbols (which'd cause subtle, fatal bugs).
-static inline BOOL do_elfio_glibc_backtrace()
-{
-	void *stackarray[MAX_STACK_TRACE_DEPTH];
-	size_t btsize;
-	char **strings;
-	BOOL success = FALSE;
-
-	std::string appfilename = gDirUtilp->getExecutablePathAndName();
-
-	std::string strace_filename = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"stack_trace.log");
-	llinfos << "Opening stack trace file " << strace_filename << llendl;
-	LLFILE* StraceFile = LLFile::fopen(strace_filename, "w");		// Flawfinder: ignore
-        if (!StraceFile)
-	{
-		llinfos << "Opening stack trace file " << strace_filename << " failed. Using stderr." << llendl;
-		StraceFile = stderr;
-	}
-
-	// get backtrace address list and basic symbol info
-	btsize = backtrace(stackarray, MAX_STACK_TRACE_DEPTH);
-	strings = backtrace_symbols(stackarray, btsize);
-
-	// create ELF reader for our app binary
-	IELFI* pReader;
-	const IELFISection* pSec = NULL;
-	IELFISymbolTable* pSymTbl = 0;
-	if (ERR_ELFIO_NO_ERROR != ELFIO::GetInstance()->CreateELFI(&pReader) ||
-	    ERR_ELFIO_NO_ERROR != pReader->Load(appfilename.c_str()) ||
-	    // find symbol table, create reader-object
-	    NULL == (pSec = pReader->GetSection( ".symtab" )) ||
-	    ERR_ELFIO_NO_ERROR != pReader->CreateSectionReader(IELFI::ELFI_SYMBOL, pSec, (void**)&pSymTbl) )
-	{
-		// Failed to open our binary and read its symbol table somehow
-		llinfos << "Could not initialize ELF symbol reading - doing basic backtrace." << llendl;
-		if (StraceFile != stderr)
-			fclose(StraceFile);
-		// note that we may be leaking some of the above ELFIO
-		// objects now, but it's expected that we'll be dead soon
-		// and we want to tread delicately until we get *some* kind
-		// of useful backtrace.
-		return do_basic_glibc_backtrace();
-	}
-
-	// iterate over trace and symtab, looking for plausible symbols
-	std::string   name;
-	Elf32_Addr    value;
-	Elf32_Word    ssize;
-	unsigned char bind;
-	unsigned char type;
-	Elf32_Half    section;
-	int nSymNo = pSymTbl->GetSymbolNum();
-	size_t btpos;
-	for (btpos = 0; btpos < btsize; ++btpos)
-	{
-		// the format of the StraceFile is very specific, to allow (kludgy) machine-parsing
-		fprintf(StraceFile, "%-3d ", btpos);
-		int symidx;
-		for (symidx = 0; symidx < nSymNo; ++symidx)
-		{
-			if (ERR_ELFIO_NO_ERROR ==
-			    pSymTbl->GetSymbol(symidx, name, value, ssize,
-					       bind, type, section))
-			{
-				// check if trace address within symbol range
-				if (uintptr_t(stackarray[btpos]) >= value &&
-				    uintptr_t(stackarray[btpos]) < value+ssize)
-				{
-					// symbol is inside viewer
-					fprintf(StraceFile, "%-32s\t", "com.secondlife.indra.viewer");
-					fprintf(StraceFile, "%p ", stackarray[btpos]);
-
-					char *demangled_str = NULL;
-					int demangle_result = 1;
-					demangled_str =
-						abi::__cxa_demangle
-						(name.c_str(), NULL, NULL,
-						 &demangle_result);
-					if (0 == demangle_result &&
-					    NULL != demangled_str) {
-						fprintf(StraceFile,
-							"%s", demangled_str);
-						free(demangled_str);
-					}
-					else // failed demangle; print it raw
-					{
-						fprintf(StraceFile,
-							"%s", name.c_str());
-					}
-					// print offset from symbol start
-					fprintf(StraceFile,
-						" + %lu\n",
-						uintptr_t(stackarray[btpos]) -
-						value);
-					goto got_sym; // early escape
-				}
-			}
-		}
-		// Fallback:
-		// Didn't find a suitable symbol in the binary - it's probably
-		// a symbol in a DSO; use glibc's idea of what it should be.
-		fprintf(StraceFile, "%-32s\t", "unknown");
-		fprintf(StraceFile, "%p ", stackarray[btpos]);
-		fprintf(StraceFile, "%s\n", strings[btpos]);
-	got_sym:;
-	}
-	
-	if (StraceFile != stderr)
-		fclose(StraceFile);
-
-	pSymTbl->Release();
-	pSec->Release();
-	pReader->Release();
-
-	free(strings);
-
-	llinfos << "Finished generating stack trace." << llendl;
-
-	success = TRUE;
-	return success;
-}
-#endif // LL_ELFBIN
-
-#endif // LL_SOLARIS
-
-
 LLAppViewerLinux::LLAppViewerLinux()
 {
 }
@@ -349,12 +130,22 @@ bool LLAppViewerLinux::init()
 	// really early in app startup!
 	if (!g_thread_supported ()) g_thread_init (NULL);
 	
-	return LLAppViewer::init();
+	bool success = LLAppViewer::init();
+
+#if LL_SEND_CRASH_REPORTS
+    if (success)
+    {
+        LLAppViewer* pApp = LLAppViewer::instance();
+        pApp->initCrashReporting();
+    }
+#endif
+
+	return success;
 }
 
 bool LLAppViewerLinux::restoreErrorTrap()
 {
-	// *NOTE:Mani there is a case for implementing this or the mac.
+	// *NOTE:Mani there is a case for implementing this on the mac.
 	// Linux doesn't need it to my knowledge.
 	return true;
 }
@@ -429,7 +220,7 @@ void viewerappapi_init(ViewerAppAPI *server)
 			}
 			else 
 			{
-				llwarns << "Unable to register service name: " << error->message << llendl;
+				LL_WARNS() << "Unable to register service name: " << error->message << LL_ENDL;
 			}
 	
 			g_object_unref(serverproxy);
@@ -448,12 +239,12 @@ gboolean viewer_app_api_GoSLURL(ViewerAppAPI *obj, gchar *slurl, gboolean **succ
 {
 	bool success = false;
 
-	llinfos << "Was asked to go to slurl: " << slurl << llendl;
+	LL_INFOS() << "Was asked to go to slurl: " << slurl << LL_ENDL;
 
 	std::string url = slurl;
 	LLMediaCtrl* web = NULL;
 	const bool trusted_browser = false;
-	if (LLURLDispatcher::dispatch(url, web, trusted_browser))
+	if (LLURLDispatcher::dispatch(url, "", web, trusted_browser))
 	{
 		// bring window to foreground, as it has just been "launched" from a URL
 		// todo: hmm, how to get there from here?
@@ -514,14 +305,14 @@ bool LLAppViewerLinux::sendURLToOtherInstance(const std::string& url)
 		}
 		else
 		{
-			llinfos << "Call-out to other instance failed (perhaps not running): " << error->message << llendl;
+			LL_INFOS() << "Call-out to other instance failed (perhaps not running): " << error->message << LL_ENDL;
 		}
 
 		g_object_unref(G_OBJECT(remote_object));
 	}
 	else
 	{
-		llwarns << "Couldn't connect to session bus: " << error->message << llendl;
+		LL_WARNS() << "Couldn't connect to session bus: " << error->message << LL_ENDL;
 	}
 
 	if (error)
@@ -541,17 +332,7 @@ bool LLAppViewerLinux::sendURLToOtherInstance(const std::string& url)
 }
 #endif // LL_DBUS_ENABLED
 
-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(bool reportFreeze)
+void LLAppViewerLinux::initCrashReporting(bool reportFreeze)
 {
 	std::string cmd =gDirUtilp->getExecutableDir();
 	cmd += gDirUtilp->getDirDelimiter();
@@ -563,80 +344,52 @@ void LLAppViewerLinux::handleCrashReporting(bool reportFreeze)
 # error Unknown platform
 #endif
 
-	if(reportFreeze)
-	{
-		char* const cmdargv[] =
-			{(char*)cmd.c_str(),
-			 (char*)"-previous",
-			 NULL};
-
-		fflush(NULL); // flush all buffers before the child inherits them
-		pid_t pid = fork();
-		if (pid == 0)
-		{ // child
-			execv(cmd.c_str(), cmdargv);		/* Flawfinder: Ignore */
-			llwarns << "execv failure when trying to start " << cmd << llendl;
-			_exit(1); // avoid atexit()
-		} else {
-			if (pid > 0)
-			{
-				// wait for child proc to die
-				int childExitStatus;
-				waitpid(pid, &childExitStatus, 0);
-			} else {
-				llwarns << "fork failure." << llendl;
-			}
-		}
-	}
+    std::stringstream pid_str;
+    pid_str <<  LLApp::getPid();
+    std::string logdir = gDirUtilp->getExpandedFilename(LL_PATH_DUMP, "");
+    std::string appname = gDirUtilp->getExecutableFilename();
+	// launch the actual crash logger
+	const char * cmdargv[] =
+		{cmd.c_str(),
+		 "-user",
+		 (char*)LLGridManager::getInstance()->getGridId().c_str(),
+		 "-name",
+		 LLAppViewer::instance()->getSecondLifeTitle().c_str(),
+		 "-pid", 
+		 pid_str.str().c_str(),
+		 "-dumpdir",
+		 logdir.c_str(),
+		 "-procname",
+		 appname.c_str(),
+		 NULL};
+	fflush(NULL);
+
+	pid_t pid = fork();
+	if (pid == 0)
+	{ // child
+		execv(cmd.c_str(), (char* const*) cmdargv);		/* Flawfinder: ignore */
+		LL_WARNS() << "execv failure when trying to start " << cmd << LL_ENDL;
+		_exit(1); // avoid atexit()
+	} 
 	else
 	{
-		const S32 cb = gCrashSettings.getS32(CRASH_BEHAVIOR_SETTING);
-
-		// 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 != cb)
-		{	
-			// launch the actual crash logger
-			const char* ask_dialog = "-dialog";
-			if (CRASH_BEHAVIOR_ASK != cb)
-				ask_dialog = ""; // omit '-dialog' option
-			const char * cmdargv[] =
-				{cmd.c_str(),
-				 ask_dialog,
-				 "-user",
-				 (char*)LLViewerLogin::getInstance()->getGridLabel().c_str(),
-				 "-name",
-				 LLAppViewer::instance()->getSecondLifeTitle().c_str(),
-				 NULL};
-			fflush(NULL);
-			pid_t pid = fork();
-			if (pid == 0)
-			{ // child
-				execv(cmd.c_str(), (char* const*) cmdargv);		/* Flawfinder: ignore */
-				llwarns << "execv failure when trying to start " << cmd << llendl;
-				_exit(1); // avoid atexit()
-			} 
-			else
-			{
-				if (pid > 0)
-				{
-					// DO NOT wait for child proc to die; we want
-					// the logger to outlive us while we quit to
-					// free up the screen/keyboard/etc.
-					////int childExitStatus;
-					////waitpid(pid, &childExitStatus, 0);
-				} 
-				else
-				{
-					llwarns << "fork failure." << llendl;
-				}
-			}
+		if (pid > 0)
+		{
+			// DO NOT wait for child proc to die; we want
+			// the logger to outlive us while we quit to
+			// free up the screen/keyboard/etc.
+			////int childExitStatus;
+			////waitpid(pid, &childExitStatus, 0);
+		} 
+		else
+		{
+			LL_WARNS() << "fork failure." << LL_ENDL;
 		}
-		// 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); // avoid atexit(), else we may re-crash in dtors.
 	}
+	// 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); // avoid atexit(), else we may re-crash in dtors.
 }
 
 bool LLAppViewerLinux::beingDebugged()
@@ -683,14 +436,16 @@ bool LLAppViewerLinux::beingDebugged()
 #endif
 }
 
-bool LLAppViewerLinux::initLogging()
+void LLAppViewerLinux::initLoggingAndGetLastDuration()
 {
 	// Remove the last stack trace, if any
+	// This file is no longer created, since the move to Google Breakpad
+	// The code is left here to clean out any old state in the log dir
 	std::string old_stack_file =
 		gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"stack_trace.log");
 	LLFile::remove(old_stack_file);
 
-	return LLAppViewer::initLogging();
+	LLAppViewer::initLoggingAndGetLastDuration();
 }
 
 bool LLAppViewerLinux::initParseCommandLine(LLCommandLineParser& clp)
@@ -727,8 +482,27 @@ std::string LLAppViewerLinux::generateSerialNumber()
 {
 	char serial_md5[MD5HEX_STR_SIZE];
 	serial_md5[0] = 0;
+	std::string best;
+	std::string uuiddir("/dev/disk/by-uuid/");
+
+	// trawl /dev/disk/by-uuid looking for a good-looking UUID to grab
+	std::string this_name;
+
+	LLDirIterator iter(uuiddir, "*");
+	while (iter.next(this_name))
+	{
+		if (this_name.length() > best.length() ||
+		    (this_name.length() == best.length() &&
+		     this_name > best))
+		{
+			// longest (and secondarily alphabetically last) so far
+			best = this_name;
+		}
+	}
 
-	// TODO
+	// we don't return the actual serial number, just a hash of it.
+	LLMD5 md5( reinterpret_cast<const unsigned char*>(best.c_str()) );
+	md5.hex_digest(serial_md5);
 
 	return serial_md5;
 }