Imported existing code

indra/mac_crash_logger/CMakeLists.txt

@@ -0,0 +1,76 @@
+# -*- cmake -*-
+
+project(mac_crash_logger)
+
+include(00-Common)
+include(LLCommon)
+include(LLCrashLogger)
+include(LLMath)
+include(LLMessage)
+include(LLVFS)
+include(LLXML)
+include(Linking)
+
+include_directories(
+    ${LLCOMMON_INCLUDE_DIRS}
+    ${LLCRASHLOGGER_INCLUDE_DIRS}
+    ${LLMATH_INCLUDE_DIRS}
+    ${LLVFS_INCLUDE_DIRS}
+    ${LLXML_INCLUDE_DIRS}
+    )
+
+set(mac_crash_logger_SOURCE_FILES
+    mac_crash_logger.cpp
+    llcrashloggermac.cpp
+    )
+
+set(mac_crash_logger_HEADER_FILES
+    CMakeLists.txt
+
+    llcrashloggermac.h
+    )
+
+set_source_files_properties(${mac_crash_logger_HEADER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+list(APPEND mac_crash_logger_SOURCE_FILES ${mac_crash_logger_HEADER_FILES})
+
+set(mac_crash_logger_RESOURCE_FILES
+  CrashReporter.nib/
+  )
+set_source_files_properties(
+  ${mac_crash_logger_RESOURCE_FILES}
+  PROPERTIES
+  HEADER_FILE_ONLY TRUE
+  )
+SOURCE_GROUP("Resources" FILES ${mac_crash_logger_RESOURCE_FILES})
+list(APPEND mac_crash_logger_SOURCE_FILES ${mac_crash_logger_RESOURCE_FILES})
+
+add_executable(mac-crash-logger
+  MACOSX_BUNDLE
+  ${mac_crash_logger_SOURCE_FILES})
+
+set_target_properties(mac-crash-logger
+  PROPERTIES
+  MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist
+  )
+
+target_link_libraries(mac-crash-logger
+    ${LLCRASHLOGGER_LIBRARIES}
+    ${LLVFS_LIBRARIES}
+    ${LLXML_LIBRARIES}
+    ${LLMESSAGE_LIBRARIES}
+    ${LLVFS_LIBRARIES}
+    ${LLMATH_LIBRARIES}
+    ${LLCOMMON_LIBRARIES}
+    )
+
+add_custom_command(
+  TARGET mac-crash-logger POST_BUILD
+  COMMAND ${CMAKE_COMMAND}
+  ARGS
+    -E
+    copy_directory
+    ${CMAKE_CURRENT_SOURCE_DIR}/CrashReporter.nib
+    ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/mac-crash-logger.app/Contents/Resources/CrashReporter.nib
+  )
+

indra/mac_crash_logger/CrashReporter.nib/classes.nib

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IBVersion</key>
+	<string>1</string>
+</dict>
+</plist>

indra/mac_crash_logger/CrashReporter.nib/info.nib

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IBFramework Version</key>
+	<string>629</string>
+	<key>IBLastKnownRelativeProjectPath</key>
+	<string>../../build-darwin-i386/SecondLife.xcodeproj</string>
+	<key>IBOldestOS</key>
+	<integer>5</integer>
+	<key>IBOpenObjects</key>
+	<array/>
+	<key>IBSystem Version</key>
+	<string>9E17</string>
+	<key>targetFramework</key>
+	<string>IBCarbonFramework</string>
+</dict>
+</plist>

indra/mac_crash_logger/CrashReporter.nib/objects.xib

@@ -0,0 +1,68 @@
+<?xml version="1.0" standalone="yes"?>
+<object class="NSIBObjectData">
+  <object name="rootObject" class="NSCustomObject" id="1">
+  </object>
+  <array count="7" name="allObjects">
+    <object class="IBCarbonButton" id="182">
+      <ostype name="command">ok  </ostype>
+      <string name="title">Send Report</string>
+      <string name="bounds">414 273 434 378 </string>
+    </object>
+    <object class="IBCarbonButton" id="183">
+      <ostype name="command">not!</ostype>
+      <int name="buttonType">2</int>
+      <string name="title">Don&apos;t Send</string>
+      <string name="bounds">414 390 434 487 </string>
+    </object>
+    <object class="IBCarbonStaticText" id="181">
+      <string name="title">Second Life appears to have crashed or frozen the last time it ran.&#10;&#10;This crash reporter collects information about your computer&apos;s hardware configuration, operating system, and some Second Life logs, all of which are used for debugging purposes only.&#10;&#10;In the space below, please briefly describe what you were doing or trying to do just prior to the crash. Thank you for your help!&#10;&#10;This report is NOT read by Customer Support. If you have billing or other questions, please go to: http://www.secondlife.com/support/&#10;&#10;If you don&apos;t wish to send Linden Lab a crash report, press Cancel.&#10;</string>
+      <string name="bounds">20 20 231 487 </string>
+    </object>
+    <object class="IBCarbonWindow" id="166">
+      <int name="carbonWindowClass">2</int>
+      <int name="themeBrush">3</int>
+      <int name="windowPosition">7</int>
+      <string name="title">Second Life Crash Logger</string>
+      <object name="rootControl" class="IBCarbonRootControl" id="167">
+        <array count="5" name="subviews">
+          <reference idRef="181"/>
+          <reference idRef="182"/>
+          <reference idRef="183"/>
+          <object class="IBCarbonEditText" id="185">
+            <ostype name="controlSignature">text</ostype>
+            <boolean name="isUnicode">TRUE</boolean>
+            <string name="bounds">242 23 391 484 </string>
+          </object>
+          <object class="IBCarbonCheckBox" id="193">
+            <ostype name="controlSignature">remb</ostype>
+            <string name="title">Remember This Choice</string>
+            <string name="bounds">415 20 433 186 </string>
+          </object>
+        </array>
+        <string name="bounds">0 0 454 507 </string>
+      </object>
+      <string name="windowRect">257 653 711 1160 </string>
+      <string name="ScreenRectAtEncodeTime">0 0 768 1024 </string>
+    </object>
+    <reference idRef="185"/>
+    <reference idRef="167"/>
+    <reference idRef="193"/>
+  </array>
+  <array count="7" name="allParents">
+    <reference idRef="167"/>
+    <reference idRef="167"/>
+    <reference idRef="167"/>
+    <reference idRef="1"/>
+    <reference idRef="167"/>
+    <reference idRef="166"/>
+    <reference idRef="167"/>
+  </array>
+  <dictionary count="2" name="nameTable">
+    <string>CrashReporter</string>
+    <reference idRef="166"/>
+    <string>File&apos;s Owner</string>
+    <reference idRef="1"/>
+  </dictionary>
+  <string name="targetFramework">IBCarbonFramework</string>
+  <unsigned_int name="nextObjectID">194</unsigned_int>
+</object>

indra/mac_crash_logger/Info.plist

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>mac-crash-logger</string>
+	<key>CFBundleGetInfoString</key>
+	<string></string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string>com.secondlife.indra.crashreporter</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string></string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0.0</string>
+</dict>
+</plist>

indra/mac_crash_logger/llcrashloggermac.cpp

@@ -0,0 +1,345 @@
+/** 
+ * @file llcrashloggermac.cpp
+ * @brief Mac OSX crash logger implementation
+ *
+ * $LicenseInfo:firstyear=2003&license=viewergpl$
+ * 
+ * Copyright (c) 2003-2009, Linden Research, Inc.
+ * 
+ * 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
+ * 
+ * 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
+ * 
+ * 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.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+
+#include "llcrashloggermac.h"
+
+#include <Carbon/Carbon.h>
+#include <iostream>
+#include <sstream>
+
+#include "boost/tokenizer.hpp"
+
+#include "indra_constants.h"	// CRASH_BEHAVIOR_ASK, CRASH_SETTING_NAME
+#include "llerror.h"
+#include "llfile.h"
+#include "lltimer.h"
+#include "llstring.h"
+#include "lldir.h"
+#include "llsdserialize.h"
+
+#define MAX_LOADSTRING 100
+const char* const SETTINGS_FILE_HEADER = "version";
+const S32 SETTINGS_FILE_VERSION = 101;
+
+// Windows Message Handlers
+
+BOOL gFirstDialog = TRUE;	// Are we currently handling the Send/Don't Send dialog?
+LLFILE *gDebugFile = NULL;
+
+WindowRef gWindow = NULL;
+EventHandlerRef gEventHandler = NULL;
+std::string gUserNotes = "";
+bool gSendReport = false;
+bool gRememberChoice = false;
+IBNibRef nib = NULL;
+
+OSStatus dialogHandler(EventHandlerCallRef handler, EventRef event, void *userdata)
+{
+	OSStatus result = eventNotHandledErr;
+	OSStatus err;
+	UInt32 evtClass = GetEventClass(event);
+	UInt32 evtKind = GetEventKind(event);
+	if((evtClass == kEventClassCommand) && (evtKind == kEventCommandProcess))
+	{
+		HICommand cmd;
+		err = GetEventParameter(event, kEventParamDirectObject, typeHICommand, NULL, sizeof(cmd), NULL, &cmd);
+		
+
+		
+		if(err == noErr)
+		{
+			//Get the value of the checkbox
+			ControlID id;
+			ControlRef checkBox = NULL;
+			id.signature = 'remb';
+			id.id = 0;
+			err = GetControlByID(gWindow, &id, &checkBox);
+			
+			if(err == noErr)
+			{
+				if(GetControl32BitValue(checkBox) == kControlCheckBoxCheckedValue)
+				{
+					gRememberChoice = true;
+				}
+				else
+				{
+					gRememberChoice = false;
+				}
+			}	
+			switch(cmd.commandID)
+			{
+				case kHICommandOK:
+				{
+					char buffer[65535];		/* Flawfinder: ignore */
+					Size size = sizeof(buffer) - 1;
+					ControlRef textField = NULL;
+
+					id.signature = 'text';
+					id.id = 0;
+
+					err = GetControlByID(gWindow, &id, &textField);
+					if(err == noErr)
+					{
+						// Get the user response text
+						err = GetControlData(textField, kControlNoPart, kControlEditTextTextTag, size, (Ptr)buffer, &size);
+					}
+					if(err == noErr)
+					{
+						// Make sure the string is terminated.
+						buffer[size] = 0;
+						gUserNotes = buffer;
+
+						llinfos << buffer << llendl;
+					}
+					
+					// Send the report.
+
+					QuitAppModalLoopForWindow(gWindow);
+					gSendReport = true;
+					result = noErr;
+				}
+				break;
+				
+				case kHICommandCancel:
+					QuitAppModalLoopForWindow(gWindow);
+					result = noErr;
+				break;
+				default:
+					result = eventNotHandledErr;
+			}
+		}
+	}
+
+	return(result);
+}
+
+
+LLCrashLoggerMac::LLCrashLoggerMac(void)
+{
+}
+
+LLCrashLoggerMac::~LLCrashLoggerMac(void)
+{
+}
+
+bool LLCrashLoggerMac::init(void)
+{	
+	bool ok = LLCrashLogger::init();
+	if(!ok) return false;
+	if(mCrashBehavior != CRASH_BEHAVIOR_ASK) return true;
+	
+	// Real UI...
+	OSStatus err;
+	
+	err = CreateNibReference(CFSTR("CrashReporter"), &nib);
+	
+	if(err == noErr)
+	{
+		err = CreateWindowFromNib(nib, CFSTR("CrashReporter"), &gWindow);
+	}
+
+	if(err == noErr)
+	{
+		// Set focus to the edit text area
+		ControlRef textField = NULL;
+		ControlID id;
+
+		id.signature = 'text';
+		id.id = 0;
+		
+		// Don't set err if any of this fails, since it's non-critical.
+		if(GetControlByID(gWindow, &id, &textField) == noErr)
+		{
+			SetKeyboardFocus(gWindow, textField, kControlFocusNextPart);
+		}
+	}
+	
+	if(err == noErr)
+	{
+		ShowWindow(gWindow);
+	}
+	
+	if(err == noErr)
+	{
+		// Set up an event handler for the window.
+		EventTypeSpec handlerEvents[] = 
+		{
+			{ kEventClassCommand, kEventCommandProcess }
+		};
+
+		InstallWindowEventHandler(
+				gWindow, 
+				NewEventHandlerUPP(dialogHandler), 
+				GetEventTypeCount (handlerEvents), 
+				handlerEvents, 
+				0, 
+				&gEventHandler);
+	}
+	return true;
+}
+
+void LLCrashLoggerMac::gatherPlatformSpecificFiles()
+{
+	updateApplication("Gathering hardware information...");
+	char path[MAX_PATH];		
+	FSRef folder;
+	
+	if(FSFindFolder(kUserDomain, kLogsFolderType, false, &folder) == noErr)
+	{
+		// folder is an FSRef to ~/Library/Logs/
+		if(FSRefMakePath(&folder, (UInt8*)&path, sizeof(path)) == noErr)
+		{
+			struct stat dw_stat;
+			std::string mBuf;
+			bool isLeopard = false;
+			// Try the 10.3 path first...
+			std::string dw_file_name = std::string(path) + std::string("/CrashReporter/Second Life.crash.log");
+			int res = stat(dw_file_name.c_str(), &dw_stat);
+
+			if (res)
+			{
+				// Try the 10.2 one next...
+				dw_file_name = std::string(path) + std::string("/Second Life.crash.log");
+				res = stat(dw_file_name.c_str(), &dw_stat);
+			}
+	
+			if(res)
+			{
+				//10.5: Like 10.3+, except it puts the crash time in the file instead of dividing it up
+				//using asterisks. Get a directory listing, search for files starting with second life,
+				//use the last one found.
+				std::string old_file_name, current_file_name, pathname, mask;
+				pathname = std::string(path) + std::string("/CrashReporter/");
+				mask = "Second Life*";
+				while(gDirUtilp->getNextFileInDir(pathname, mask, current_file_name, false))
+				{
+					old_file_name = current_file_name;
+				}
+				if(old_file_name != "")
+				{
+					dw_file_name = pathname + old_file_name;
+					res=stat(dw_file_name.c_str(), &dw_stat);
+					isLeopard = true;
+				}
+			}
+			
+			if (!res)
+			{
+				std::ifstream fp(dw_file_name.c_str());
+				std::stringstream str;
+				if(!fp.is_open()) return;
+				str << fp.rdbuf();
+				mBuf = str.str();
+				
+				if(!isLeopard)
+				{
+					// Crash logs consist of a number of entries, one per crash.
+					// Each entry is preceeded by "**********" on a line by itself.
+					// We want only the most recent (i.e. last) one.
+					const char *sep = "**********";
+					const char *start = mBuf.c_str();
+					const char *cur = start;
+					const char *temp = strstr(cur, sep);
+				
+					while(temp != NULL)
+					{
+						// Skip past the marker we just found
+						cur = temp + strlen(sep);		/* Flawfinder: ignore */
+						
+						// and try to find another
+						temp = strstr(cur, sep);
+					}
+				
+					// If there's more than one entry in the log file, strip all but the last one.
+					if(cur != start)
+					{
+						mBuf.erase(0, cur - start);
+					}
+				}
+				mCrashInfo["CrashLog"] = mBuf;
+			}
+			else
+			{
+				llwarns << "Couldn't find any CrashReporter files..." << llendl;
+			}
+		}
+	}
+}
+
+bool LLCrashLoggerMac::mainLoop()
+{
+	OSStatus err = noErr;
+				
+	if(err == noErr && mCrashBehavior == CRASH_BEHAVIOR_ASK)
+	{
+		RunAppModalLoopForWindow(gWindow);
+	}
+	else if (mCrashBehavior == CRASH_BEHAVIOR_ALWAYS_SEND)
+	{
+		gSendReport = true;
+	}
+	
+	if(gRememberChoice)
+	{
+		if(gSendReport) saveCrashBehaviorSetting(CRASH_BEHAVIOR_ALWAYS_SEND);
+		else saveCrashBehaviorSetting(CRASH_BEHAVIOR_NEVER_SEND);
+	}
+	
+	if(gSendReport)
+	{
+		setUserText(gUserNotes);
+		sendCrashLogs();
+	}		
+	
+	if(gWindow != NULL)
+	{
+		DisposeWindow(gWindow);
+	}
+	
+	if(nib != NULL)
+	{
+		DisposeNibReference(nib);
+	}
+	
+	return true;
+}
+
+void LLCrashLoggerMac::updateApplication(const std::string& message)
+{
+	LLCrashLogger::updateApplication();
+}
+
+bool LLCrashLoggerMac::cleanup()
+{
+	return true;
+}

indra/mac_crash_logger/llcrashloggermac.h

@@ -0,0 +1,52 @@
+/** 
+ * @file llcrashloggermac.h
+ * @brief Mac OSX crash logger definition
+ *
+ * $LicenseInfo:firstyear=2003&license=viewergpl$
+ * 
+ * Copyright (c) 2003-2009, Linden Research, Inc.
+ * 
+ * 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
+ * 
+ * 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
+ * 
+ * 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.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LLCRASHLOGGERMAC_H
+#define LLCRASHLOGGERMAC_H
+
+#include "linden_common.h"
+#include "llcrashlogger.h"
+#include "llstring.h"
+
+class LLCrashLoggerMac : public LLCrashLogger
+{
+public:
+	LLCrashLoggerMac(void);
+	~LLCrashLoggerMac(void);
+	virtual bool init();
+	virtual bool mainLoop();
+	virtual void updateApplication(const std::string& message = LLStringUtil::null);
+	virtual bool cleanup();
+	virtual void gatherPlatformSpecificFiles();
+};
+
+#endif

indra/mac_crash_logger/mac_crash_logger.cpp

@@ -0,0 +1,52 @@
+/** 
+ * @file mac_crash_logger.cpp
+ * @brief Mac OSX crash logger implementation
+ *
+ * $LicenseInfo:firstyear=2003&license=viewergpl$
+ * 
+ * Copyright (c) 2003-2009, Linden Research, Inc.
+ * 
+ * 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
+ * 
+ * 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
+ * 
+ * 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.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "linden_common.h"
+
+#include "llcrashloggermac.h"
+
+int main(int argc, char **argv)
+{
+	//time(&gLaunchTime);
+	
+	llinfos << "Starting Second Life Viewer Crash Reporter" << llendl;
+
+	LLCrashLoggerMac app;
+	app.parseCommandOptions(argc, argv);
+	if(!app.init())
+	{
+		return 0;
+	}
+	app.mainLoop();
+		
+	return 0;
+}