13 files changed, 270 insertions, 5 deletions

diff --git a/linden/indra/llcommon/files.lst b/linden/indra/llcommon/files.lst
index 6a48752..0474cbb 100644
--- a/linden/indra/llcommon/files.lst
+++ b/linden/indra/llcommon/files.lst
@@ -18,6 +18,7 @@ llcommon/llliveappconfig.cpp
 llcommon/lllivefile.cpp
 llcommon/llmemory.cpp
 llcommon/llmemorystream.cpp
+llcommon/llmetrics.cpp
 llcommon/llmortician.cpp
 llcommon/llprocessor.cpp
 llcommon/llqueuedthread.cpp
diff --git a/linden/indra/llcommon/llcommon.vcproj b/linden/indra/llcommon/llcommon.vcproj
index ca91e18..399dae3 100644
--- a/linden/indra/llcommon/llcommon.vcproj
+++ b/linden/indra/llcommon/llcommon.vcproj
@@ -215,6 +215,9 @@
                                 RelativePath=".\llmemorystream.cpp">
                         </File>
                         <File
+                                RelativePath=".\llmetrics.cpp">
+                        </File>
+                        <File
                                 RelativePath=".\llmortician.cpp">
                         </File>
                         <File
@@ -433,6 +436,9 @@
                                 RelativePath=".\llmemtype.h">
                         </File>
                         <File
+                                RelativePath=".\llmetrics.h">
+                        </File>
+                        <File
                                 RelativePath=".\llmortician.h">
                         </File>
                         <File
diff --git a/linden/indra/llcommon/llerror.cpp b/linden/indra/llcommon/llerror.cpp
index 9bcb415..714a265 100644
--- a/linden/indra/llcommon/llerror.cpp
+++ b/linden/indra/llcommon/llerror.cpp
@@ -40,6 +40,7 @@ extern apr_thread_mutex_t *gLogMutexp;
 #include "lllivefile.h"
 #include "llsd.h"
 #include "llsdserialize.h"
+#include "llstl.h"
 
 #include <algorithm>
 #include <cctype>
@@ -397,6 +398,12 @@ namespace LLError
                                 shouldLogCallCounter(0)
                         { }
                 
+                ~Settings()
+                {
+                        for_each(recorders.begin(), recorders.end(),
+                                         DeletePointer());
+                }
+                
                 static Settings*& getPtr();
         };
         
diff --git a/linden/indra/llcommon/llevent.h b/linden/indra/llcommon/llevent.h
index 18b0596..cab8817 100644
--- a/linden/indra/llcommon/llevent.h
+++ b/linden/indra/llcommon/llevent.h
@@ -88,12 +88,12 @@ public:
 class LLSimpleListener : public LLEventListener
 {
 public:
-        virtual ~LLSimpleListener();
         void clearDispatchers();
         virtual bool handleAttach(LLEventDispatcher *dispatcher);
         virtual bool handleDetach(LLEventDispatcher *dispatcher);
 
 protected:
+        ~LLSimpleListener();
         std::vector<LLEventDispatcher *> mDispatchers;
 };
 
diff --git a/linden/indra/llcommon/llframetimer.cpp b/linden/indra/llcommon/llframetimer.cpp
index 5ae4a6b..2b53e8c 100644
--- a/linden/indra/llcommon/llframetimer.cpp
+++ b/linden/indra/llcommon/llframetimer.cpp
@@ -70,6 +70,12 @@ void LLFrameTimer::reset()
         mExpiry = sFrameTime;
 }
 
+void LLFrameTimer::resetWithExpiry(F32 expiration)
+{
+        reset();
+        setTimerExpirySec(expiration);
+}
+
 // Don't combine pause/unpause with start/stop
 // Useage:
 //  LLFrameTime foo; // starts automatically
diff --git a/linden/indra/llcommon/llframetimer.h b/linden/indra/llcommon/llframetimer.h
index 0366e09..de550e2 100644
--- a/linden/indra/llcommon/llframetimer.h
+++ b/linden/indra/llcommon/llframetimer.h
@@ -75,6 +75,7 @@ public:
         void start();
         void stop();
         void reset();
+        void resetWithExpiry(F32 expiration);
         void pause();
         void unpause();
         void setTimerExpirySec(F32 expiration);
diff --git a/linden/indra/llcommon/llmetrics.cpp b/linden/indra/llcommon/llmetrics.cpp
new file mode 100644
index 0000000..583f840
--- /dev/null
+++ b/linden/indra/llcommon/llmetrics.cpp
@@ -0,0 +1,165 @@
+/** 
+ * @file llmetrics.cpp
+ * @author Kelly
+ * @date 2007-05-25
+ * @brief Metrics accumulation and associated functions
+ *
+ * Copyright (c) 2007-2007, 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://secondlife.com/developers/opensource/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://secondlife.com/developers/opensource/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.
+ */
+
+#include "linden_common.h"
+#include "llmetrics.h"
+
+#include "llsd.h"
+#include "llsdserialize.h"
+#include "llframetimer.h"
+
+class LLMetricsImpl
+{
+public:
+        LLMetricsImpl() { }
+        ~LLMetricsImpl();
+
+        void recordEvent(const std::string& location, const std::string& mesg, bool success);
+        void printTotals(LLSD metadata);
+        void recordEventDetails(const std::string& location, 
+                                                                        const std::string& mesg, 
+                                                                        bool success, 
+                                                                        LLSD stats);
+private:
+        LLFrameTimer mLastPrintTimer;
+        LLSD mMetricsMap;
+};
+
+LLMetricsImpl::~LLMetricsImpl()
+{
+}
+
+void LLMetricsImpl::recordEventDetails(const std::string& location, 
+                                                                        const std::string& mesg, 
+                                                                        bool success, 
+                                                                        LLSD stats)
+{
+        recordEvent(location,mesg,success);
+
+        LLSD metrics = LLSD::emptyMap();
+        metrics["location"] = location;
+        metrics["stats"]  = stats;
+        
+        llinfos << "LLMETRICS: " << LLSDOStreamer<LLSDNotationFormatter>(metrics) << llendl; 
+}
+
+// Store this:
+// [ {'location_1':{'mesg_1':{'success':i10, 'fail':i0},
+//                                      'mesg_2':{'success':i10, 'fail':i0}},
+//   {'location_2',{'mesg_3':{'success':i10, 'fail':i0}} ]
+void LLMetricsImpl::recordEvent(const std::string& location, const std::string& mesg, bool success)
+{
+        LLSD& stats = mMetricsMap[location][mesg];
+        if (success)
+        {
+                stats["success"] = stats["success"].asInteger() + 1;
+        }
+        else
+        {
+                stats["fail"] = stats["fail"].asInteger() + 1;
+        }
+}
+
+// Print this:
+// { 'meta':
+//              { 'elapsed_time':r3600.000 }
+//   'stats':
+//              [ {'location':'location_1', 'mesg':'mesg_1', 'success':i10, 'fail':i0},
+//                {'location':'location_1', 'mesg':'mesg_2', 'success':i10, 'fail':i0},
+//                {'location':'location_2', 'mesg':'mesg_3', 'success':i10, 'fail':i0} ] }
+void LLMetricsImpl::printTotals(LLSD metadata)
+{
+        F32 elapsed_time = mLastPrintTimer.getElapsedTimeAndResetF32();
+        metadata["elapsed_time"] = elapsed_time;
+
+        LLSD out_sd = LLSD::emptyMap();
+        out_sd["meta"] = metadata;
+                
+        LLSD stats = LLSD::emptyArray();
+
+        LLSD::map_const_iterator loc_it = mMetricsMap.beginMap();
+        LLSD::map_const_iterator loc_end = mMetricsMap.endMap();
+        for ( ; loc_it != loc_end; ++loc_it)
+        {
+                const std::string& location = (*loc_it).first;
+                
+                const LLSD& loc_map = (*loc_it).second;
+                LLSD::map_const_iterator mesg_it = loc_map.beginMap();
+                LLSD::map_const_iterator mesg_end = loc_map.endMap();
+                for ( ; mesg_it != mesg_end; ++mesg_it)
+                {
+                        const std::string& mesg = (*mesg_it).first;
+                        const LLSD& mesg_map = (*mesg_it).second;
+
+                        LLSD entry = LLSD::emptyMap();
+                        entry["location"] = location;
+                        entry["mesg"] = mesg;
+                        entry["success"] = mesg_map["success"];
+                        entry["fail"] = mesg_map["fail"];
+                
+                        stats.append(entry);
+                }
+        }
+
+        out_sd["stats"] = stats;
+
+        llinfos << "LLMETRICS: AGGREGATE: " << LLSDOStreamer<LLSDNotationFormatter>(out_sd) << llendl;
+}
+
+LLMetrics::LLMetrics()
+{
+        mImpl = new LLMetricsImpl();
+}
+
+LLMetrics::~LLMetrics()
+{
+        delete mImpl;
+        mImpl = NULL;
+}
+
+void LLMetrics::recordEvent(const std::string& location, const std::string& mesg, bool success)
+{
+        if (mImpl) mImpl->recordEvent(location,mesg,success);
+}
+
+void LLMetrics::printTotals(LLSD meta)
+{
+        if (mImpl) mImpl->printTotals(meta);
+}
+
+
+void LLMetrics::recordEventDetails(const std::string& location, 
+                                                                        const std::string& mesg, 
+                                                                        bool success, 
+                                                                        LLSD stats)
+{
+        if (mImpl) mImpl->recordEventDetails(location,mesg,success,stats);
+}
+
diff --git a/linden/indra/llcommon/llmetrics.h b/linden/indra/llcommon/llmetrics.h
new file mode 100644
index 0000000..2c216c3
--- /dev/null
+++ b/linden/indra/llcommon/llmetrics.h
@@ -0,0 +1,62 @@
+/**
+ * @file llmetrics.h
+ * @author Kelly
+ * @date 2007-05-25
+ * @brief Declaration of metrics accumulation and associated functions
+ *
+ * Copyright (c) 2007-2007, 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://secondlife.com/developers/opensource/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://secondlife.com/developers/opensource/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.
+ */
+
+#ifndef LL_LLMETRICS_H
+#define LL_LLMETRICS_H
+
+class LLMetricsImpl;
+class LLSD;
+
+class LLMetrics
+{
+public:
+        LLMetrics();
+        virtual ~LLMetrics();
+
+        // Adds this event to aggregate totals and records details to syslog (llinfos)
+        virtual void recordEventDetails(const std::string& location, 
+                                                const std::string& mesg, 
+                                                bool success, 
+                                                LLSD stats);
+
+        // Adds this event to aggregate totals
+        virtual void recordEvent(const std::string& location, const std::string& mesg, bool success);
+
+        // Prints aggregate totals and resets the counts.
+        virtual void printTotals(LLSD meta);
+
+
+private:
+        
+        LLMetricsImpl* mImpl;
+};
+
+#endif
+
diff --git a/linden/indra/llcommon/llprocessor.cpp b/linden/indra/llcommon/llprocessor.cpp
index d269e35..40dc00c 100644
--- a/linden/indra/llcommon/llprocessor.cpp
+++ b/linden/indra/llcommon/llprocessor.cpp
@@ -277,7 +277,7 @@ bool CProcessor::AnalyzeIntelProcessor()
 
         // Only override the brand if we have it in the lookup table.  We should
         // already have a string here from GetCPUInfo().  JC
-        if (CPUInfo.uiBrandID < sizeof(INTEL_BRAND))
+        if (CPUInfo.uiBrandID < (sizeof(INTEL_BRAND)/sizeof(INTEL_BRAND[0])))
         {
                 strcpy(CPUInfo.strBrandID, INTEL_BRAND[CPUInfo.uiBrandID]);
 
diff --git a/linden/indra/llcommon/llsdutil.cpp b/linden/indra/llcommon/llsdutil.cpp
index d30afc7..85718ba 100644
--- a/linden/indra/llcommon/llsdutil.cpp
+++ b/linden/indra/llcommon/llsdutil.cpp
@@ -285,3 +285,16 @@ char* ll_print_sd(const LLSD& sd)
         buffer[bufferSize - 1] = '\0';
         return buffer;
 }
+
+char* ll_pretty_print_sd(const LLSD& sd)
+{
+        const U32 bufferSize = 10 * 1024;
+        static char buffer[bufferSize];
+        std::ostringstream stream;
+        //stream.rdbuf()->pubsetbuf(buffer, bufferSize);
+        stream << LLSDOStreamer<LLSDXMLFormatter>(sd, LLSDFormatter::OPTIONS_PRETTY);
+        stream << std::ends;
+        strncpy(buffer, stream.str().c_str(), bufferSize);
+        buffer[bufferSize - 1] = '\0';
+        return buffer;
+}
\ No newline at end of file
diff --git a/linden/indra/llcommon/llsdutil.h b/linden/indra/llcommon/llsdutil.h
index 6344c50..38a7b83 100644
--- a/linden/indra/llcommon/llsdutil.h
+++ b/linden/indra/llcommon/llsdutil.h
@@ -85,4 +85,7 @@ LLSD ll_binary_from_string(const LLSD& sd);
 // Serializes sd to static buffer and returns pointer, useful for gdb debugging.
 char* ll_print_sd(const LLSD& sd);
 
+// Serializes sd to static buffer and returns pointer, using "pretty printing" mode.
+char* ll_pretty_print_sd(const LLSD& sd);
+
 #endif // LL_LLSDUTIL_H
diff --git a/linden/indra/llcommon/llthread.h b/linden/indra/llcommon/llthread.h
index adb04a5..c863322 100644
--- a/linden/indra/llcommon/llthread.h
+++ b/linden/indra/llcommon/llthread.h
@@ -239,8 +239,9 @@ private:
 // Pure virtual class
 class LLResponder : public LLThreadSafeRefCount
 {
-public:
+protected:
         virtual ~LLResponder();
+public:
         virtual void completed(bool success) = 0;
 };
 
diff --git a/linden/indra/llcommon/llversion.h b/linden/indra/llcommon/llversion.h
index f2ea20d..57b1512 100644
--- a/linden/indra/llcommon/llversion.h
+++ b/linden/indra/llcommon/llversion.h
@@ -30,8 +30,8 @@
 #define LL_LLVERSION_H
 
 const S32 LL_VERSION_MAJOR = 1;
-const S32 LL_VERSION_MINOR = 16;
+const S32 LL_VERSION_MINOR = 17;
 const S32 LL_VERSION_PATCH = 0;
-const S32 LL_VERSION_BUILD = 5;
+const S32 LL_VERSION_BUILD = 12;
 
 #endif