[sldev-commits] r1699 - in branches/maint-viewer: doc indra/llcommon indra/newview indra/newview/English.lproj indra/newview/res

cg.linden at svn.secondlife.com cg.linden at svn.secondlife.com
Tue Jan 20 21:24:46 PST 2009


Author: cg.linden
Date: 2009-01-20 23:24:46 -0600 (Tue, 20 Jan 2009)
New Revision: 1699

Modified:
   branches/maint-viewer/doc/asset_urls.txt
   branches/maint-viewer/indra/llcommon/llversionserver.h
   branches/maint-viewer/indra/llcommon/llversionviewer.h
   branches/maint-viewer/indra/newview/English.lproj/InfoPlist.strings
   branches/maint-viewer/indra/newview/Info-SecondLife.plist
   branches/maint-viewer/indra/newview/llappviewerlinux.cpp
   branches/maint-viewer/indra/newview/res/viewerRes.rc
Trac: http://svn.secondlife.com/trac/linden/changeset/1699
Log:
Snapshot of internal branch maint-viewer
Internal URL: http://svn.lindenlab.com/svn/linden/branches/maint-viewer/maint-viewer-12
Revision Range: 108413 to 108413

Supplementary files:
  http://secondlife.com/developers/opensource/downloads/2009/01/maint-viewer/slviewer-darwin-libs-maint-viewer-1.22.0.108413.tar.gz
  http://secondlife.com/developers/opensource/downloads/2009/01/maint-viewer/slviewer-linux-libs-maint-viewer-1.22.0.108413.tar.gz
  http://secondlife.com/developers/opensource/downloads/2009/01/maint-viewer/slviewer-win32-libs-maint-viewer-1.22.0.108413.zip
  http://secondlife.com/developers/opensource/downloads/2009/01/maint-viewer/slviewer-artwork-maint-viewer-1.22.0.108413.zip
  http://secondlife.com/developers/opensource/downloads/2009/01/maint-viewer/md5sums-maint-viewer-1.22.0.108413.txt
Source tarballs - redundant to this svn:
  http://secondlife.com/developers/opensource/downloads/2009/01/maint-viewer/slviewer-src-maint-viewer-1.22.0.108413.tar.gz
  http://secondlife.com/developers/opensource/downloads/2009/01/maint-viewer/slviewer-src-maint-viewer-1.22.0.108413.zip


Modified: branches/maint-viewer/doc/asset_urls.txt
===================================================================
--- branches/maint-viewer/doc/asset_urls.txt	2009-01-21 02:48:47 UTC (rev 1698)
+++ branches/maint-viewer/doc/asset_urls.txt	2009-01-21 05:24:46 UTC (rev 1699)
@@ -1,5 +1,5 @@
-SLASSET_LIBS_DARWIN=http://secondlife.com/developers/opensource/downloads/2009/01/maint-viewer/slviewer-darwin-libs-maint-viewer-1.22.0.108395.tar.gz
-SLASSET_LIBS_LINUXI386=http://secondlife.com/developers/opensource/downloads/2009/01/maint-viewer/slviewer-linux-libs-maint-viewer-1.22.0.108395.tar.gz
-SLASSET_LIBS_WIN32=http://secondlife.com/developers/opensource/downloads/2009/01/maint-viewer/slviewer-win32-libs-maint-viewer-1.22.0.108395.zip
-SLASSET_ART=http://secondlife.com/developers/opensource/downloads/2009/01/maint-viewer/slviewer-artwork-maint-viewer-1.22.0.108395.zip
-SLASSET_MD5=http://secondlife.com/developers/opensource/downloads/2009/01/maint-viewer/md5sums-maint-viewer-1.22.0.108395.txt
+SLASSET_LIBS_DARWIN=http://secondlife.com/developers/opensource/downloads/2009/01/maint-viewer/slviewer-darwin-libs-maint-viewer-1.22.0.108413.tar.gz
+SLASSET_LIBS_LINUXI386=http://secondlife.com/developers/opensource/downloads/2009/01/maint-viewer/slviewer-linux-libs-maint-viewer-1.22.0.108413.tar.gz
+SLASSET_LIBS_WIN32=http://secondlife.com/developers/opensource/downloads/2009/01/maint-viewer/slviewer-win32-libs-maint-viewer-1.22.0.108413.zip
+SLASSET_ART=http://secondlife.com/developers/opensource/downloads/2009/01/maint-viewer/slviewer-artwork-maint-viewer-1.22.0.108413.zip
+SLASSET_MD5=http://secondlife.com/developers/opensource/downloads/2009/01/maint-viewer/md5sums-maint-viewer-1.22.0.108413.txt

Modified: branches/maint-viewer/indra/llcommon/llversionserver.h
===================================================================
--- branches/maint-viewer/indra/llcommon/llversionserver.h	2009-01-21 02:48:47 UTC (rev 1698)
+++ branches/maint-viewer/indra/llcommon/llversionserver.h	2009-01-21 05:24:46 UTC (rev 1699)
@@ -35,7 +35,7 @@
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 25;
 const S32 LL_VERSION_PATCH = 0;
-const S32 LL_VERSION_BUILD = 108395;
+const S32 LL_VERSION_BUILD = 108413;
 
 const char * const LL_CHANNEL = "Second Life Server";
 

Modified: branches/maint-viewer/indra/llcommon/llversionviewer.h
===================================================================
--- branches/maint-viewer/indra/llcommon/llversionviewer.h	2009-01-21 02:48:47 UTC (rev 1698)
+++ branches/maint-viewer/indra/llcommon/llversionviewer.h	2009-01-21 05:24:46 UTC (rev 1699)
@@ -35,7 +35,7 @@
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 22;
 const S32 LL_VERSION_PATCH = 0;
-const S32 LL_VERSION_BUILD = 108395;
+const S32 LL_VERSION_BUILD = 108413;
 
 const char * const LL_CHANNEL = "Second Life Release";
 

Modified: branches/maint-viewer/indra/newview/English.lproj/InfoPlist.strings
===================================================================
--- branches/maint-viewer/indra/newview/English.lproj/InfoPlist.strings	2009-01-21 02:48:47 UTC (rev 1698)
+++ branches/maint-viewer/indra/newview/English.lproj/InfoPlist.strings	2009-01-21 05:24:46 UTC (rev 1699)
@@ -1,6 +1,6 @@
 /* Localized versions of Info.plist keys */
 
 CFBundleName = "Second Life";
-CFBundleShortVersionString = "Second Life version 1.22.0.108395";
-CFBundleGetInfoString = "Second Life version 1.22.0.108395, Copyright 2004-2008 Linden Research, Inc.";
+CFBundleShortVersionString = "Second Life version 1.22.0.108413";
+CFBundleGetInfoString = "Second Life version 1.22.0.108413, Copyright 2004-2008 Linden Research, Inc.";
 

Modified: branches/maint-viewer/indra/newview/Info-SecondLife.plist
===================================================================
--- branches/maint-viewer/indra/newview/Info-SecondLife.plist	2009-01-21 02:48:47 UTC (rev 1698)
+++ branches/maint-viewer/indra/newview/Info-SecondLife.plist	2009-01-21 05:24:46 UTC (rev 1699)
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.22.0.108395</string>
+	<string>1.22.0.108413</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 </dict>

Modified: branches/maint-viewer/indra/newview/llappviewerlinux.cpp
===================================================================
--- branches/maint-viewer/indra/newview/llappviewerlinux.cpp	2009-01-21 02:48:47 UTC (rev 1698)
+++ branches/maint-viewer/indra/newview/llappviewerlinux.cpp	2009-01-21 05:24:46 UTC (rev 1699)
@@ -164,14 +164,14 @@
 // amazing backtrace.
 static inline BOOL do_basic_glibc_backtrace()
 {
-	void *array[MAX_STACK_TRACE_DEPTH];
+	void *stackarray[MAX_STACK_TRACE_DEPTH];
 	size_t size;
 	char **strings;
 	size_t i;
 	BOOL success = FALSE;
 
-	size = backtrace(array, MAX_STACK_TRACE_DEPTH);
-	strings = backtrace_symbols(array, size);
+	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;
@@ -185,8 +185,13 @@
 	if (size)
 	{
 		for (i = 0; i < size; i++)
-			fputs((std::string(strings[i])+"\n").c_str(),
-			      StraceFile);
+		{
+			// 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;
 	}
@@ -204,7 +209,7 @@
 // extraction without exporting symbols (which'd cause subtle, fatal bugs).
 static inline BOOL do_elfio_glibc_backtrace()
 {
-	void *array[MAX_STACK_TRACE_DEPTH];
+	void *stackarray[MAX_STACK_TRACE_DEPTH];
 	size_t btsize;
 	char **strings;
 	BOOL success = FALSE;
@@ -221,8 +226,8 @@
 	}
 
 	// get backtrace address list and basic symbol info
-	btsize = backtrace(array, MAX_STACK_TRACE_DEPTH);
-	strings = backtrace_symbols(array, btsize);
+	btsize = backtrace(stackarray, MAX_STACK_TRACE_DEPTH);
+	strings = backtrace_symbols(stackarray, btsize);
 
 	// create ELF reader for our app binary
 	IELFI* pReader;
@@ -256,7 +261,8 @@
 	size_t btpos;
 	for (btpos = 0; btpos < btsize; ++btpos)
 	{
-		fprintf(StraceFile, "%d:\t", 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)
 		{
@@ -265,9 +271,13 @@
 					       bind, type, section))
 			{
 				// check if trace address within symbol range
-				if (uintptr_t(array[btpos]) >= value &&
-				    uintptr_t(array[btpos]) < value+ssize)
+				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 =
@@ -277,20 +287,19 @@
 					if (0 == demangle_result &&
 					    NULL != demangled_str) {
 						fprintf(StraceFile,
-							"ELF(%s", demangled_str);
+							"%s", demangled_str);
 						free(demangled_str);
 					}
 					else // failed demangle; print it raw
 					{
 						fprintf(StraceFile,
-							"ELF(%s", name.c_str());
+							"%s", name.c_str());
 					}
 					// print offset from symbol start
 					fprintf(StraceFile,
-						"+0x%lx) [%p]\n",
-						uintptr_t(array[btpos]) -
-						value,
-						array[btpos]);
+						" + %lu\n",
+						uintptr_t(stackarray[btpos]) -
+						value);
 					goto got_sym; // early escape
 				}
 			}
@@ -298,6 +307,8 @@
 		// 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:;
 	}

Modified: branches/maint-viewer/indra/newview/res/viewerRes.rc
===================================================================
--- branches/maint-viewer/indra/newview/res/viewerRes.rc	2009-01-21 02:48:47 UTC (rev 1698)
+++ branches/maint-viewer/indra/newview/res/viewerRes.rc	2009-01-21 05:24:46 UTC (rev 1699)
@@ -138,8 +138,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,22,0,108395
- PRODUCTVERSION 1,22,0,108395
+ FILEVERSION 1,22,0,108413
+ PRODUCTVERSION 1,22,0,108413
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -156,12 +156,12 @@
         BEGIN
             VALUE "CompanyName", "Linden Lab"
             VALUE "FileDescription", "Second Life"
-            VALUE "FileVersion", "1.22.0.108395"
+            VALUE "FileVersion", "1.22.0.108413"
             VALUE "InternalName", "Second Life"
             VALUE "LegalCopyright", "Copyright © 2001-2008, Linden Research, Inc."
             VALUE "OriginalFilename", "SecondLife.exe"
             VALUE "ProductName", "Second Life"
-            VALUE "ProductVersion", "1.22.0.108395"
+            VALUE "ProductVersion", "1.22.0.108413"
         END
     END
     BLOCK "VarFileInfo"



More information about the sldev-commits mailing list