1 files changed, 152 insertions, 67 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
index 0eab898..8918c3b 100755
--- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
+++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
@@ -61,6 +61,10 @@ namespace OpenSim.Region.Framework.Scenes
 
         private YourStatsAreWrong handlerStatsIncorrect;
 
+        // Determines the size of the array that is used to collect StatBlocks
+        // for sending to the SimStats and SimExtraStatsCollector
+        private const int m_statisticArraySize = 27;
+
         /// <summary>
         /// These are the IDs of stats sent in the StatsPacket to the viewer.
         /// </summary>
@@ -104,7 +108,12 @@ namespace OpenSim.Region.Framework.Scenes
             ScriptEps = 31,
             SimSpareMs = 32,
             SimSleepMs = 33,
-            SimIoPumpTime = 34
+            SimIoPumpTime = 34,
+            FrameDilation = 35,
+            UsersLoggingIn = 36,
+            TotalGeoPrim = 37,
+            TotalMesh = 38,
+            ThreadCount = 39
         }
 
         /// <summary>
@@ -175,7 +184,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         // saved last reported value so there is something available for llGetRegionFPS 
         private float lastReportedSimFPS;
-        private float[] lastReportedSimStats = new float[22];
+        private float[] lastReportedSimStats = new float[m_statisticArraySize];
         private float m_pfps;
 
         /// <summary>
@@ -202,6 +211,8 @@ namespace OpenSim.Region.Framework.Scenes
         private int m_rootAgents;
         private int m_childAgents;
         private int m_numPrim;
+        private int m_numGeoPrim;
+        private int m_numMesh;
         private int m_inPacketsPerSecond;
         private int m_outPacketsPerSecond;
         private int m_activePrim;
@@ -214,26 +225,33 @@ namespace OpenSim.Region.Framework.Scenes
         private int m_objectCapacity = 45000;
 
         // This is the number of frames that will be stored and then averaged for
-        // the Total, Simulation, Physics, and Network Frame Time; It is set to 
-        // 10 by default but can be changed by the OpenSim.ini configuration file 
+        // the Total, Simulation, Physics, and Network Frame Time; It is set to
+        // 10 by default but can be changed by the OpenSim.ini configuration file
         // NumberOfFrames parameter
         private int m_numberFramesStored = Scene.m_defaultNumberFramesStored;
 
-        // The arrays that will hold the time it took to run the past N frames, 
+        // The arrays that will hold the time it took to run the past N frames,
         // where N is the num_frames_to_average given by the configuration file
         private double[] m_totalFrameTimeMilliseconds;
         private double[] m_simulationFrameTimeMilliseconds;
         private double[] m_physicsFrameTimeMilliseconds;
         private double[] m_networkFrameTimeMilliseconds;
 
-        // The location of the next time in milliseconds that will be 
+        // The location of the next time in milliseconds that will be
         // (over)written when the next frame completes
         private int m_nextLocation = 0;
 
         // The correct number of frames that have completed since the last stats
         // update for physics
         private int m_numberPhysicsFrames;
-        
+
+        // The current number of users attempting to login to the region
+        private int m_usersLoggingIn;
+
+        // The last reported value of threads from the SmartThreadPool inside of
+        // XEngine
+        private int m_inUseThreads;
+
         private Scene m_scene;
 
         private RegionInfo ReportingRegion;
@@ -246,11 +264,13 @@ namespace OpenSim.Region.Framework.Scenes
         {
             // Initialize the different frame time arrays to the correct sizes
             m_totalFrameTimeMilliseconds = new double[m_numberFramesStored];
-            m_simulationFrameTimeMilliseconds = new 
-                double[m_numberFramesStored];
+            m_simulationFrameTimeMilliseconds = new double[m_numberFramesStored];
             m_physicsFrameTimeMilliseconds = new double[m_numberFramesStored];
             m_networkFrameTimeMilliseconds = new double[m_numberFramesStored];
-        
+
+            // Initialize the current number of users logging into the region
+            m_usersLoggingIn = 0;
+
             m_scene = scene;
             m_reportedFpsCorrectionFactor = scene.MinFrameSeconds * m_nominalReportedFps;
             m_statsUpdateFactor = (float)(m_statsUpdatesEveryMS / 1000);
@@ -284,13 +304,14 @@ namespace OpenSim.Region.Framework.Scenes
             StatsManager.RegisterStat(SlowFramesStat);
         }
 
+
         public SimStatsReporter(Scene scene, int numberOfFrames) : this (scene)
         {
-            // Store the number of frames from the OpenSim.ini configuration 
-            // file
-            m_numberFramesStored = numberOfFrames;           
+            // Store the number of frames from the OpenSim.ini configuration file
+            m_numberFramesStored = numberOfFrames;
         }
-        
+
+
         public void Close()
         {
             m_report.Elapsed -= TriggerStatsHeartbeat;
@@ -328,11 +349,17 @@ namespace OpenSim.Region.Framework.Scenes
             double simulationSumFrameTime;
             double physicsSumFrameTime;
             double networkSumFrameTime;
-        
+            float frameDilation;
+            int currentFrame;
+
             if (!m_scene.Active)
                 return;
 
-            SimStatsPacket.StatBlock[] sb = new SimStatsPacket.StatBlock[22];
+            // Create arrays to hold the statistics for this current scene,
+            // these will be passed to the SimExtraStatsCollector, they are also
+            // sent to the SimStats class
+            SimStatsPacket.StatBlock[] sb = new
+                SimStatsPacket.StatBlock[m_statisticArraySize];
             SimStatsPacket.RegionBlock rb = new SimStatsPacket.RegionBlock();
             
             // Know what's not thread safe in Mono... modifying timers.
@@ -354,21 +381,21 @@ namespace OpenSim.Region.Framework.Scenes
 
 #region various statistic googly moogly
 
-                // ORIGINAL code commented out until we have time to add our own
-                // statistics to the statistics window, this will be done as a
-                // new section given the title of our current project
+               // ORIGINAL code commented out until we have time to add our own
+               // statistics to the statistics window, this will be done as a
+               // new section given the title of our current project
                 // We're going to lie about the FPS because we've been lying since 2008.  The actual FPS is currently
                 // locked at a maximum of 11.  Maybe at some point this can change so that we're not lying.
                 //int reportedFPS = (int)(m_fps * m_reportedFpsCorrectionFactor);
-                int reportedFPS = m_fps;
-                
+               int reportedFPS = m_fps;
+
                 // save the reported value so there is something available for llGetRegionFPS 
                 lastReportedSimFPS = reportedFPS / m_statsUpdateFactor;
 
-                // ORIGINAL code commented out until we have time to add our own
-                // statistics to the statistics window
+               // ORIGINAL code commented out until we have time to add our own
+               // statistics to the statistics window
                 //float physfps = ((m_pfps / 1000));
-                float physfps = m_numberPhysicsFrames;
+               float physfps = m_numberPhysicsFrames;
 
                 //if (physfps > 600)
                 //physfps = physfps - (physfps - 600);
@@ -381,6 +408,8 @@ namespace OpenSim.Region.Framework.Scenes
                 m_rootAgents = m_scene.SceneGraph.GetRootAgentCount();
                 m_childAgents = m_scene.SceneGraph.GetChildAgentCount();
                 m_numPrim = m_scene.SceneGraph.GetTotalObjectsCount();
+                m_numGeoPrim = m_scene.SceneGraph.GetTotalPrimObjectsCount();
+                m_numMesh = m_scene.SceneGraph.GetTotalMeshObjectsCount();
                 m_activePrim = m_scene.SceneGraph.GetActiveObjectsCount();
                 m_activeScripts = m_scene.SceneGraph.GetActiveScriptsCount();
 
@@ -406,11 +435,11 @@ namespace OpenSim.Region.Framework.Scenes
                 if (framesUpdated == 0)
                     framesUpdated = 1;
 
-                for (int i = 0; i < 22; i++)
+                for (int i = 0; i < m_statisticArraySize; i++)
                 {
                     sb[i] = new SimStatsPacket.StatBlock();
                 }
-                
+
                 // Resetting the sums of the frame times to prevent any errors
                 // in calculating the moving average for frame time
                 totalSumFrameTime = 0;
@@ -425,12 +454,25 @@ namespace OpenSim.Region.Framework.Scenes
                     // Sum up each frame time in order to calculate the moving
                     // average of frame time
                     totalSumFrameTime += m_totalFrameTimeMilliseconds[i];
-                    simulationSumFrameTime += 
+                    simulationSumFrameTime +=
                         m_simulationFrameTimeMilliseconds[i];
                     physicsSumFrameTime += m_physicsFrameTimeMilliseconds[i];
                     networkSumFrameTime += m_networkFrameTimeMilliseconds[i];
                 }
-                
+
+                // Get the index that represents the current frame based on the next one known; go back
+                // to the last index if next one is stated to restart at 0
+                if (m_nextLocation == 0)
+                    currentFrame = m_numberFramesStored - 1;
+                else
+                    currentFrame = m_nextLocation - 1;
+
+                // Calculate the frame dilation; which is currently based on the ratio between the sum of the
+                // physics and simulation rate, and the set minimum time to run a scene's frame
+                frameDilation = (float)(m_simulationFrameTimeMilliseconds[currentFrame] +
+                   m_physicsFrameTimeMilliseconds[currentFrame]) / m_scene.MinFrameTicks;
+
+                // ORIGINAL code commented out until we have time to add our own
                 sb[0].StatID = (uint) Stats.TimeDilation;
                 sb[0].StatValue = (Single.IsNaN(m_timeDilation)) ? 0.1f : m_timeDilation ; //((((m_timeDilation + (0.10f * statsUpdateFactor)) /10)  / statsUpdateFactor));
 
@@ -455,31 +497,28 @@ namespace OpenSim.Region.Framework.Scenes
                 sb[7].StatID = (uint) Stats.ActivePrim;
                 sb[7].StatValue = m_activePrim;
 
-                // ORIGINAL code commented out until we have time to add our own
-                // statistics to the statistics window
+               // ORIGINAL code commented out until we have time to add our own
+               // statistics to the statistics window
                 sb[8].StatID = (uint)Stats.FrameMS;
                 //sb[8].StatValue = m_frameMS / framesUpdated;
-                sb[8].StatValue = (float) totalSumFrameTime / 
-                    m_numberFramesStored;
+               sb[8].StatValue = (float) totalSumFrameTime / m_numberFramesStored;
 
                 sb[9].StatID = (uint)Stats.NetMS;
                 //sb[9].StatValue = m_netMS / framesUpdated;
-                sb[9].StatValue = (float) networkSumFrameTime / 
-                    m_numberFramesStored;
+               sb[9].StatValue = (float) networkSumFrameTime / m_numberFramesStored;
 
                 sb[10].StatID = (uint)Stats.PhysicsMS;
                 //sb[10].StatValue = m_physicsMS / framesUpdated;
-                sb[10].StatValue = (float) physicsSumFrameTime / 
-                    m_numberFramesStored;
+               sb[10].StatValue = (float) physicsSumFrameTime / m_numberFramesStored;
 
                 sb[11].StatID = (uint)Stats.ImageMS ;
                 sb[11].StatValue = m_imageMS / framesUpdated;
 
                 sb[12].StatID = (uint)Stats.OtherMS;
                 //sb[12].StatValue = m_otherMS / framesUpdated;
-                sb[12].StatValue = (float) simulationSumFrameTime / 
-                    m_numberFramesStored;
-                
+               sb[12].StatValue = (float) simulationSumFrameTime /
+                  m_numberFramesStored;
+
                 sb[13].StatID = (uint)Stats.InPacketsPerSecond;
                 sb[13].StatValue = (m_inPacketsPerSecond / m_statsUpdateFactor);
 
@@ -507,7 +546,28 @@ namespace OpenSim.Region.Framework.Scenes
                 sb[21].StatID = (uint)Stats.SimSpareMs;
                 sb[21].StatValue = m_spareMS / framesUpdated;
 
-                for (int i = 0; i < 22; i++)
+                // Current ratio between the sum of physics and sim rate, and the
+                // minimum time to run a scene's frame
+                sb[22].StatID = (uint)Stats.FrameDilation;
+                sb[22].StatValue = frameDilation;
+
+                // Current number of users currently attemptint to login to region
+                sb[23].StatID = (uint)Stats.UsersLoggingIn;
+                sb[23].StatValue = m_usersLoggingIn;
+
+                // Total number of geometric primitives in the scene
+                sb[24].StatID = (uint)Stats.TotalGeoPrim;
+                sb[24].StatValue = m_numGeoPrim;
+
+                // Total number of mesh objects in the scene
+                sb[25].StatID = (uint)Stats.TotalMesh;
+                sb[25].StatValue = m_numMesh;
+
+                // Current number of threads that XEngine is using
+                sb[26].StatID = (uint)Stats.ThreadCount;
+                sb[26].StatValue = m_inUseThreads;
+
+                for (int i = 0; i < m_statisticArraySize; i++)
                 {
                     lastReportedSimStats[i] = sb[i].StatValue;
                 }
@@ -554,8 +614,8 @@ namespace OpenSim.Region.Framework.Scenes
         {
             // Reset the number of frames that the physics library has
             // processed since the last stats report
-            m_numberPhysicsFrames = 0;   
-        
+            m_numberPhysicsFrames = 0;
+
             m_timeDilation = 0;
             m_fps = 0;
             m_pfps = 0;
@@ -686,32 +746,32 @@ namespace OpenSim.Region.Framework.Scenes
             m_otherMS += ms;
         }
 
-        public void addPhysicsFrame(int frames)
-        {
-            // Add the number of physics frames to the correct total physics
-            // frames
-            m_numberPhysicsFrames += frames;
-        }
-
-        public void addFrameTimeMilliseconds(double total, double simulation, 
-            double physics, double network)
-        {
-            // Save the frame times from the current frame into the appropriate 
-            // arrays
-            m_totalFrameTimeMilliseconds[m_nextLocation] = total;
-            m_simulationFrameTimeMilliseconds[m_nextLocation] = simulation;
-            m_physicsFrameTimeMilliseconds[m_nextLocation] = physics;
-            m_networkFrameTimeMilliseconds[m_nextLocation] = network;
-
-            // Update to the next location in the list
-            m_nextLocation++;
+      public void addPhysicsFrame(int frames)
+      {
+         // Add the number of physics frames to the correct total physics
+         // frames
+         m_numberPhysicsFrames += frames;
+      }
+
+      public void addFrameTimeMilliseconds(double total, double simulation,
+         double physics, double network)
+      {
+         // Save the frame times from the current frame into the appropriate
+         // arrays
+         m_totalFrameTimeMilliseconds[m_nextLocation] = total;
+         m_simulationFrameTimeMilliseconds[m_nextLocation] = simulation;
+         m_physicsFrameTimeMilliseconds[m_nextLocation] = physics;
+         m_networkFrameTimeMilliseconds[m_nextLocation] = network;
+
+         // Update to the next location in the list
+         m_nextLocation++;
+
+         // Since the list will begin to overwrite the oldest frame values
+         // first, the next location needs to loop back to the beginning of the
+         // list whenever it reaches the end
+         m_nextLocation = m_nextLocation % m_numberFramesStored;
+      }
 
-            // Since the list will begin to overwrite the oldest frame values
-            // first, the next location needs to loop back to the beginning of the
-            // list whenever it reaches the end
-            m_nextLocation = m_nextLocation % m_numberFramesStored;
-        }
-        
         public void AddPendingDownloads(int count)
         {
             m_pendingDownloads += count;
@@ -734,6 +794,31 @@ namespace OpenSim.Region.Framework.Scenes
             AddunAckedBytes(unAckedBytes);
         }
 
+        public void UpdateUsersLoggingIn(bool isLoggingIn)
+        {
+            // Determine whether the user has started logging in or has completed
+            // logging into the region
+            if (isLoggingIn)
+            {
+                // The user is starting to login to the region so increment the
+                // number of users attempting to login to the region
+                m_usersLoggingIn++;
+            }
+            else
+            {
+                // The user has finished logging into the region so decrement the
+                // number of users logging into the region
+                m_usersLoggingIn--;
+            }
+        }
+
+        public void SetThreadCount(int inUseThreads)
+        {
+            // Save the new number of threads to our member variable to send to
+            // the extra stats collector
+            m_inUseThreads = inUseThreads;
+        }
+
         #endregion
 
         public Dictionary<string, float> GetExtraSimStats()