Merge pull request #2990 from secondlife/viewer-2921

More detailed frame time logging in ViewerStats

Author: vir-linden

indra/llcommon/llstatsaccumulator.h

@@ -59,7 +59,12 @@ class LLStatsAccumulator
 
     inline F32 getSum() const
     {
-        return mSum;
+        return F32(mSum);
+    }
+
+    inline F32 getSumOfSquares() const
+    {
+        return F32(mSumOfSquares);
     }
 
     inline F32 getMean() const
@@ -79,8 +84,16 @@ class LLStatsAccumulator
 
     inline F32 getStdDev() const
     {
-        const F32 mean = getMean();
-        return (mCount < 2) ? 0.f : sqrt(llmax(0.f, mSumOfSquares / mCount - (mean * mean)));
+        const F64 mean = getMean();
+        if (mCount < 2)
+        {
+            return 0.f;
+        }
+        else
+        {
+            F32 variance = F32 (mSumOfSquares / mCount - (mean * mean));
+            return sqrt(llmax(0.f, variance));
+        }
     }
 
     inline U32 getCount() const
@@ -100,21 +113,47 @@ class LLStatsAccumulator
     inline LLSD asLLSD() const
     {
         LLSD data;
+        data["count"] = S32(getCount());
+        data["sum"] = getSum();
+        data["sum_of_squares"] = getSumOfSquares();
         data["mean"] = getMean();
         data["std_dev"] = getStdDev();
-        data["count"] = (S32)mCount;
         data["min"] = getMinValue();
         data["max"] = getMaxValue();
         return data;
     }
 
 private:
     S32 mCount;
-    F32 mSum;
-    F32 mSumOfSquares;
+    F64 mSum;
+    F64 mSumOfSquares;
     F32 mMinValue;
     F32 mMaxValue;
     U32 mCountOfNextUpdatesToIgnore;
 };
 
+// Assumes the samples are frame times
+inline F32 fps(LLStatsAccumulator& accum)
+{
+    F32 mean = accum.getMean();
+    if (mean > 0.f)
+    {
+        return 1.0f/mean;
+    }
+    return 0.0f;
+}
+
+// Assumes the samples are frame times
+// ofr = observed frame rate, which has frame times weighted by length, since long frames count more toward user experience.
+inline F32 ofr(LLStatsAccumulator& accum)
+{
+    F32 sum = accum.getSum();
+    F32 sum_of_squares = accum.getSumOfSquares();
+    if (sum_of_squares > 0.0f)
+    {
+        return sum/sum_of_squares;
+    }
+    return 0.0f;
+}
+
 #endif

indra/newview/llviewerstats.cpp

@@ -274,6 +274,16 @@ void LLViewerStats::updateFrameStats(const F64Seconds time_diff)
         // old stats that were never really used
         F64Seconds jit = (F64Seconds)std::fabs((mLastTimeDiff - time_diff));
         sample(LLStatViewer::FRAMETIME_JITTER, jit);
+
+        if (gFocusMgr.getAppHasFocus())
+        {
+            mForegroundFrameStats.push(F32(time_diff));
+        }
+        else
+        {
+            mBackgroundFrameStats.push(F32(time_diff));
+        }
+
     }
 
     mLastTimeDiff = time_diff;
@@ -525,7 +535,8 @@ void send_viewer_stats(bool include_preferences)
 
 LLSD capture_viewer_stats(bool include_preferences)
 {
-    LLViewerStats& vstats{ LLViewerStats::instance() };
+    LLViewerStats& vstats = LLViewerStats::instance();
+
     vstats.getRecording().pause();
     LL::scope_exit cleanup([&vstats]{ vstats.getRecording().resume(); });
 
@@ -536,8 +547,6 @@ LLSD capture_viewer_stats(bool include_preferences)
     time(&ltime);
     F32 run_time = F32(LLFrameTimer::getElapsedSeconds());
 
-    agent["start_time"] = S32(ltime - S32(run_time));
-
     // The first stat set must have a 0 run time if it doesn't actually
     // contain useful data in terms of FPS, etc.  We use half the
     // SEND_STATS_PERIOD seconds as the point at which these statistics become
@@ -552,8 +561,19 @@ LLSD capture_viewer_stats(bool include_preferences)
         agent["run_time"] = run_time;
     }
 
+    agent["start_time"] = S32(ltime - S32(run_time));
+
+    agent["fg_frame_stats"] = vstats.mForegroundFrameStats.asLLSD();
+    agent["fg_frame_stats"]["ofr"] = ofr(vstats.mForegroundFrameStats);
+    agent["fg_frame_stats"]["fps"] = fps(vstats.mForegroundFrameStats);
+
+    agent["bg_frame_stats"] = vstats.mBackgroundFrameStats.asLLSD();
+    agent["bg_frame_stats"]["ofr"] = ofr(vstats.mBackgroundFrameStats);
+    agent["bg_frame_stats"]["fps"] = fps(vstats.mBackgroundFrameStats);
+
     // report time the viewer has spent in the foreground
     agent["foreground_time"] = gForegroundTime.getElapsedTimeF32();
+    agent["foreground_frame_count"] = (S32) gForegroundFrameCount;
 
     // send fps only for time app spends in foreground
     agent["fps"] = (F32)gForegroundFrameCount / gForegroundTime.getElapsedTimeF32();

indra/newview/llviewerstats.h

@@ -271,9 +271,14 @@ class LLViewerStats : public LLSingleton<LLViewerStats>
     LLTrace::Recording& getRecording() { return mRecording; }
     const LLTrace::Recording& getRecording() const { return mRecording; }
 
+public:
+    StatsAccumulator mForegroundFrameStats;
+    StatsAccumulator mBackgroundFrameStats;
+
 private:
     LLTrace::Recording              mRecording;
 
+
     F64Seconds mLastTimeDiff;  // used for time stat updates
 };