Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim

19 files changed, 547 insertions, 5 deletions

diff --git a/OpenSim/Region/CoreModules/Framework/Monitoring/Alerts/DeadlockAlert.cs b/OpenSim/Region/CoreModules/Framework/Monitoring/Alerts/DeadlockAlert.cs
new file mode 100644
index 0000000..b546ccb
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Framework/Monitoring/Alerts/DeadlockAlert.cs
@@ -0,0 +1,37 @@
+using OpenSim.Region.CoreModules.Framework.Monitoring.Monitors;
+
+namespace OpenSim.Region.CoreModules.Framework.Monitoring.Alerts
+{
+    class DeadlockAlert : IAlert
+    {
+        private LastFrameTimeMonitor m_monitor;
+
+        public DeadlockAlert(LastFrameTimeMonitor m_monitor)
+        {
+            this.m_monitor = m_monitor;
+        }
+
+        #region Implementation of IAlert
+
+        public string GetName()
+        {
+            return "Potential Deadlock Alert";
+        }
+
+        public void Test()
+        {
+            if (m_monitor.GetValue() > 60 * 1000)
+            {
+                if(OnTriggerAlert != null)
+                {
+                    OnTriggerAlert(typeof (DeadlockAlert),
+                                   (int) (m_monitor.GetValue()/1000) + " second(s) since last frame processed.", true);
+                }
+            }
+        }
+
+        public event Alert OnTriggerAlert;
+
+        #endregion
+    }
+}
diff --git a/OpenSim/Region/CoreModules/Framework/Monitoring/IAlert.cs b/OpenSim/Region/CoreModules/Framework/Monitoring/IAlert.cs
new file mode 100644
index 0000000..b533df9
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Framework/Monitoring/IAlert.cs
@@ -0,0 +1,13 @@
+using System;
+
+namespace OpenSim.Region.CoreModules.Framework.Monitoring
+{
+    internal delegate void Alert(Type reporter, string reason, bool fatal);
+
+    interface IAlert
+    {
+        string GetName();
+        void Test();
+        event Alert OnTriggerAlert;
+    }
+}
diff --git a/OpenSim/Region/CoreModules/Framework/Monitoring/IMonitor.cs b/OpenSim/Region/CoreModules/Framework/Monitoring/IMonitor.cs
new file mode 100644
index 0000000..a51dccd
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Framework/Monitoring/IMonitor.cs
@@ -0,0 +1,9 @@
+namespace OpenSim.Region.CoreModules.Framework.Monitoring
+{
+    interface IMonitor
+    {
+        double GetValue();
+        string GetName();
+        string GetFriendlyValue(); // Convert to readable numbers
+    }
+}
diff --git a/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs b/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs
new file mode 100644
index 0000000..769af8d
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs
@@ -0,0 +1,93 @@
+using System.Collections.Generic;
+using System.Reflection;
+using log4net;
+using Nini.Config;
+using OpenSim.Region.CoreModules.Framework.Monitoring.Alerts;
+using OpenSim.Region.CoreModules.Framework.Monitoring.Monitors;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+
+namespace OpenSim.Region.CoreModules.Framework.Monitoring
+{
+    public class MonitorModule : IRegionModule 
+    {
+        private Scene m_scene;
+        private readonly List<IMonitor> m_monitors = new List<IMonitor>();
+        private readonly List<IAlert> m_alerts = new List<IAlert>();
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        public void DebugMonitors(string module, string[] args)
+        {
+            foreach (IMonitor monitor in m_monitors)
+            {
+                m_log.Info("[MonitorModule] " + m_scene.RegionInfo.RegionName + " reports " + monitor.GetName() + " = " + monitor.GetFriendlyValue());
+            }
+        }
+
+        public void TestAlerts()
+        {
+            foreach (IAlert alert in m_alerts)
+            {
+                alert.Test();
+            }
+        }
+
+        #region Implementation of IRegionModule
+
+        public void Initialise(Scene scene, IConfigSource source)
+        {
+            m_scene = scene;
+
+
+            m_scene.AddCommand(this, "monitor report",
+                               "monitor report",
+                               "Returns a variety of statistics about the current region and/or simulator",
+                               DebugMonitors);
+        }
+
+        public void PostInitialise()
+        {
+            m_monitors.Add(new AgentCountMonitor(m_scene));
+            m_monitors.Add(new ChildAgentCountMonitor(m_scene));
+            m_monitors.Add(new GCMemoryMonitor());
+            m_monitors.Add(new ObjectCountMonitor(m_scene));
+            m_monitors.Add(new PhysicsFrameMonitor(m_scene));
+            m_monitors.Add(new PhysicsUpdateFrameMonitor(m_scene));
+            m_monitors.Add(new PWSMemoryMonitor());
+            m_monitors.Add(new ThreadCountMonitor());
+            m_monitors.Add(new TotalFrameMonitor(m_scene));
+            m_monitors.Add(new EventFrameMonitor(m_scene));
+            m_monitors.Add(new LandFrameMonitor(m_scene));
+            m_monitors.Add(new LastFrameTimeMonitor(m_scene));
+
+            m_alerts.Add(new DeadlockAlert(m_monitors.Find(x => x is LastFrameTimeMonitor) as LastFrameTimeMonitor));
+
+            foreach (IAlert alert in m_alerts)
+            {
+                alert.OnTriggerAlert += OnTriggerAlert;
+            }
+        }
+
+        void OnTriggerAlert(System.Type reporter, string reason, bool fatal)
+        {
+            m_log.Error("[Monitor] " + reporter.Name + " for " + m_scene.RegionInfo.RegionName + " reports " + reason + " (Fatal: " + fatal + ")");
+        }
+
+        public void Close()
+        {
+            
+        }
+
+        public string Name
+        {
+            get { return "Region Health Monitoring Module"; }
+        }
+
+        public bool IsSharedModule
+        {
+            get { return false; }
+        }
+
+        #endregion
+    }
+}
diff --git a/OpenSim/Region/CoreModules/Framework/Monitoring/Monitors/AgentCountMonitor.cs b/OpenSim/Region/CoreModules/Framework/Monitoring/Monitors/AgentCountMonitor.cs
new file mode 100644
index 0000000..edc6e6b
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Framework/Monitoring/Monitors/AgentCountMonitor.cs
@@ -0,0 +1,33 @@
+using OpenSim.Region.Framework.Scenes;
+
+namespace OpenSim.Region.CoreModules.Framework.Monitoring.Monitors
+{
+    class AgentCountMonitor : IMonitor
+    {
+        private readonly Scene m_scene;
+
+        public AgentCountMonitor(Scene scene)
+        {
+            m_scene = scene;
+        }
+
+        #region Implementation of IMonitor
+
+        public double GetValue()
+        {
+            return m_scene.SceneGraph.GetRootAgentCount();
+        }
+
+        public string GetName()
+        {
+            return "Root Agent Count";
+        }
+
+        public string GetFriendlyValue()
+        {
+            return (int)GetValue() + " agent(s)";
+        }
+
+        #endregion
+    }
+}
diff --git a/OpenSim/Region/CoreModules/Framework/Monitoring/Monitors/ChildAgentCountMonitor.cs b/OpenSim/Region/CoreModules/Framework/Monitoring/Monitors/ChildAgentCountMonitor.cs
new file mode 100644
index 0000000..afe6b79
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Framework/Monitoring/Monitors/ChildAgentCountMonitor.cs
@@ -0,0 +1,33 @@
+using OpenSim.Region.Framework.Scenes;
+
+namespace OpenSim.Region.CoreModules.Framework.Monitoring.Monitors
+{
+    class ChildAgentCountMonitor : IMonitor
+    {
+        private readonly Scene m_scene;
+
+        public ChildAgentCountMonitor(Scene scene)
+        {
+            m_scene = scene;
+        }
+
+        #region Implementation of IMonitor
+
+        public double GetValue()
+        {
+            return m_scene.SceneGraph.GetChildAgentCount();
+        }
+
+        public string GetName()
+        {
+            return "Child Agent Count";
+        }
+
+        public string GetFriendlyValue()
+        {
+            return (int)GetValue() + " child agent(s)";
+        }
+
+        #endregion
+    }
+}
diff --git a/OpenSim/Region/CoreModules/Framework/Monitoring/Monitors/EventFrameMonitor.cs b/OpenSim/Region/CoreModules/Framework/Monitoring/Monitors/EventFrameMonitor.cs
new file mode 100644
index 0000000..dec5a9e
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Framework/Monitoring/Monitors/EventFrameMonitor.cs
@@ -0,0 +1,33 @@
+using OpenSim.Region.Framework.Scenes;
+
+namespace OpenSim.Region.CoreModules.Framework.Monitoring.Monitors
+{
+    class EventFrameMonitor : IMonitor
+    {
+        private readonly Scene m_scene;
+
+        public EventFrameMonitor(Scene scene)
+        {
+            m_scene = scene;
+        }
+
+        #region Implementation of IMonitor
+
+        public double GetValue()
+        {
+            return m_scene.MonitorEventTime;
+        }
+
+        public string GetName()
+        {
+            return "Total Event Frame Time";
+        }
+
+        public string GetFriendlyValue()
+        {
+            return (int)GetValue() + "ms";
+        }
+
+        #endregion
+    }
+}
diff --git a/OpenSim/Region/CoreModules/Framework/Monitoring/Monitors/GCMemoryMonitor.cs b/OpenSim/Region/CoreModules/Framework/Monitoring/Monitors/GCMemoryMonitor.cs
new file mode 100644
index 0000000..cd67fea
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Framework/Monitoring/Monitors/GCMemoryMonitor.cs
@@ -0,0 +1,26 @@
+using System;
+
+namespace OpenSim.Region.CoreModules.Framework.Monitoring.Monitors
+{
+    class GCMemoryMonitor : IMonitor
+    {
+        #region Implementation of IMonitor
+
+        public double GetValue()
+        {
+            return GC.GetTotalMemory(false);
+        }
+
+        public string GetName()
+        {
+            return "GC Reported Memory";
+        }
+
+        public string GetFriendlyValue()
+        {
+            return (int)(GetValue() / (1024*1024)) + "MB (Global)";
+        }
+
+        #endregion
+    }
+}
diff --git a/OpenSim/Region/CoreModules/Framework/Monitoring/Monitors/LandFrameMonitor.cs b/OpenSim/Region/CoreModules/Framework/Monitoring/Monitors/LandFrameMonitor.cs
new file mode 100644
index 0000000..d883fc7
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Framework/Monitoring/Monitors/LandFrameMonitor.cs
@@ -0,0 +1,33 @@
+using OpenSim.Region.Framework.Scenes;
+
+namespace OpenSim.Region.CoreModules.Framework.Monitoring.Monitors
+{
+    class LandFrameMonitor : IMonitor
+    {
+        private readonly Scene m_scene;
+
+        public LandFrameMonitor(Scene scene)
+        {
+            m_scene = scene;
+        }
+
+        #region Implementation of IMonitor
+
+        public double GetValue()
+        {
+            return m_scene.MonitorLandTime;
+        }
+
+        public string GetName()
+        {
+            return "Land Frame Time";
+        }
+
+        public string GetFriendlyValue()
+        {
+            return (int)GetValue() + "ms";
+        }
+
+        #endregion
+    }
+}
diff --git a/OpenSim/Region/CoreModules/Framework/Monitoring/Monitors/LastFrameTimeMonitor.cs b/OpenSim/Region/CoreModules/Framework/Monitoring/Monitors/LastFrameTimeMonitor.cs
new file mode 100644
index 0000000..36363f8
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Framework/Monitoring/Monitors/LastFrameTimeMonitor.cs
@@ -0,0 +1,34 @@
+using System;
+using OpenSim.Region.Framework.Scenes;
+
+namespace OpenSim.Region.CoreModules.Framework.Monitoring.Monitors
+{
+    class LastFrameTimeMonitor : IMonitor
+    {
+        private readonly Scene m_scene;
+
+        public LastFrameTimeMonitor(Scene scene)
+        {
+            m_scene = scene;
+        }
+
+        #region Implementation of IMonitor
+
+        public double GetValue()
+        {
+            return Environment.TickCount - m_scene.MonitorLastFrameTick;
+        }
+
+        public string GetName()
+        {
+            return "Last Completed Frame At";
+        }
+
+        public string GetFriendlyValue()
+        {
+            return (int)GetValue() + "ms ago";
+        }
+
+        #endregion
+    }
+}
diff --git a/OpenSim/Region/CoreModules/Framework/Monitoring/Monitors/ObjectCountMonitor.cs b/OpenSim/Region/CoreModules/Framework/Monitoring/Monitors/ObjectCountMonitor.cs
new file mode 100644
index 0000000..dd9b19d
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Framework/Monitoring/Monitors/ObjectCountMonitor.cs
@@ -0,0 +1,33 @@
+using OpenSim.Region.Framework.Scenes;
+
+namespace OpenSim.Region.CoreModules.Framework.Monitoring.Monitors
+{
+    class ObjectCountMonitor : IMonitor
+    {
+        private readonly Scene m_scene;
+
+        public ObjectCountMonitor(Scene scene)
+        {
+            m_scene = scene;
+        }
+
+        #region Implementation of IMonitor
+
+        public double GetValue()
+        {
+            return m_scene.SceneGraph.GetTotalObjectsCount();
+        }
+
+        public string GetName()
+        {
+            return "Total Objects Count";
+        }
+
+        public string GetFriendlyValue()
+        {
+            return (int)GetValue() + " Object(s)";
+        }
+
+        #endregion
+    }
+}
diff --git a/OpenSim/Region/CoreModules/Framework/Monitoring/Monitors/PWSMemoryMonitor.cs b/OpenSim/Region/CoreModules/Framework/Monitoring/Monitors/PWSMemoryMonitor.cs
new file mode 100644
index 0000000..88f2938
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Framework/Monitoring/Monitors/PWSMemoryMonitor.cs
@@ -0,0 +1,26 @@
+using System;
+
+namespace OpenSim.Region.CoreModules.Framework.Monitoring.Monitors
+{
+    class PWSMemoryMonitor : IMonitor
+    {
+        #region Implementation of IMonitor
+
+        public double GetValue()
+        {
+            return System.Diagnostics.Process.GetCurrentProcess().PrivateMemorySize64;
+        }
+
+        public string GetName()
+        {
+            return "Private Working Set Memory";
+        }
+
+        public string GetFriendlyValue()
+        {
+            return (int)(GetValue() / (1024 * 1024)) + "MB (Global)";
+        }
+
+        #endregion
+    }
+}
diff --git a/OpenSim/Region/CoreModules/Framework/Monitoring/Monitors/PhysicsFrameMonitor.cs b/OpenSim/Region/CoreModules/Framework/Monitoring/Monitors/PhysicsFrameMonitor.cs
new file mode 100644
index 0000000..4d62e4f
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Framework/Monitoring/Monitors/PhysicsFrameMonitor.cs
@@ -0,0 +1,33 @@
+using OpenSim.Region.Framework.Scenes;
+
+namespace OpenSim.Region.CoreModules.Framework.Monitoring.Monitors
+{
+    class PhysicsFrameMonitor : IMonitor
+    {
+        private readonly Scene m_scene;
+
+        public PhysicsFrameMonitor(Scene scene)
+        {
+            m_scene = scene;
+        }
+
+        #region Implementation of IMonitor
+
+        public double GetValue()
+        {
+            return m_scene.MonitorPhysicsSyncTime + m_scene.MonitorPhysicsUpdateTime;
+        }
+
+        public string GetName()
+        {
+            return "Total Physics Frame Time";
+        }
+
+        public string GetFriendlyValue()
+        {
+            return (int)GetValue() + "ms";
+        }
+
+        #endregion
+    }
+}
diff --git a/OpenSim/Region/CoreModules/Framework/Monitoring/Monitors/PhysicsUpdateFrameMonitor.cs b/OpenSim/Region/CoreModules/Framework/Monitoring/Monitors/PhysicsUpdateFrameMonitor.cs
new file mode 100644
index 0000000..91ac282
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Framework/Monitoring/Monitors/PhysicsUpdateFrameMonitor.cs
@@ -0,0 +1,33 @@
+using OpenSim.Region.Framework.Scenes;
+
+namespace OpenSim.Region.CoreModules.Framework.Monitoring.Monitors
+{
+    class PhysicsUpdateFrameMonitor : IMonitor
+    {
+        private readonly Scene m_scene;
+
+        public PhysicsUpdateFrameMonitor(Scene scene)
+        {
+            m_scene = scene;
+        }
+
+        #region Implementation of IMonitor
+
+        public double GetValue()
+        {
+            return m_scene.MonitorPhysicsUpdateTime;
+        }
+
+        public string GetName()
+        {
+            return "Physics Update Frame Time";
+        }
+
+        public string GetFriendlyValue()
+        {
+            return (int)GetValue() + "ms";
+        }
+
+        #endregion
+    }
+}
diff --git a/OpenSim/Region/CoreModules/Framework/Monitoring/Monitors/ThreadCountMonitor.cs b/OpenSim/Region/CoreModules/Framework/Monitoring/Monitors/ThreadCountMonitor.cs
new file mode 100644
index 0000000..9300a93
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Framework/Monitoring/Monitors/ThreadCountMonitor.cs
@@ -0,0 +1,25 @@
+
+namespace OpenSim.Region.CoreModules.Framework.Monitoring.Monitors
+{
+    class ThreadCountMonitor : IMonitor
+    {
+        #region Implementation of IMonitor
+
+        public double GetValue()
+        {
+            return System.Diagnostics.Process.GetCurrentProcess().Threads.Count;
+        }
+
+        public string GetName()
+        {
+            return "Total Threads";
+        }
+
+        public string GetFriendlyValue()
+        {
+            return (int)GetValue() + " Thread(s) (Global)";
+        }
+
+        #endregion
+    }
+}
diff --git a/OpenSim/Region/CoreModules/Framework/Monitoring/Monitors/TotalFrameMonitor.cs b/OpenSim/Region/CoreModules/Framework/Monitoring/Monitors/TotalFrameMonitor.cs
new file mode 100644
index 0000000..dea1f94
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Framework/Monitoring/Monitors/TotalFrameMonitor.cs
@@ -0,0 +1,33 @@
+using OpenSim.Region.Framework.Scenes;
+
+namespace OpenSim.Region.CoreModules.Framework.Monitoring.Monitors
+{
+    class TotalFrameMonitor : IMonitor
+    {
+        private readonly Scene m_scene;
+
+        public TotalFrameMonitor(Scene scene)
+        {
+            m_scene = scene;
+        }
+
+        #region Implementation of IMonitor
+
+        public double GetValue()
+        {
+            return m_scene.MonitorFrameTime;
+        }
+
+        public string GetName()
+        {
+            return "Total Frame Time";
+        }
+
+        public string GetFriendlyValue()
+        {
+            return (int)GetValue() + "ms";
+        }
+
+        #endregion
+    }
+}
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs
index 4199c98..46ee3c0 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs
@@ -193,6 +193,10 @@ namespace OpenSim.Region.CoreModules.Hypergrid
             {
                 return scene.RegionInfo;
             }
+            else if (m_scenes.Count > 0)
+            {
+                return m_scenes[0].RegionInfo;
+            }
             return null;
         }
 
@@ -248,7 +252,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid
             {
                 foreach (Scene nextScene in m_scenes)
                 {
-                    if (nextScene.RegionInfo.RegionName == regionName)
+                    if (nextScene.RegionInfo.RegionName.Equals(regionName, StringComparison.InvariantCultureIgnoreCase))
                     {
                         scene = nextScene;
                         return true;
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
index 046bee5..9c04755 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
@@ -322,10 +322,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
         {
             List<GridRegion> rinfos = new List<GridRegion>();
 
-            // Commenting until regionname exists
-            //foreach (SimpleRegionInfo r in m_HyperlinkRegions.Values)
-            //    if ((r.RegionName != null) && r.RegionName.StartsWith(name))
-            //        rinfos.Add(r);
+            if (name == string.Empty)
+                return rinfos;
+            
+            foreach (GridRegion r in m_HyperlinkRegions.Values)
+                if ((r.RegionName != null) && r.RegionName.ToLower().StartsWith(name.ToLower()))
+                    rinfos.Add(r);
 
             rinfos.AddRange(m_GridServiceConnector.GetRegionsByName(scopeID, name, maxNumber));
             return rinfos;
@@ -602,6 +604,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
         {
             CachedUserInfo uinfo = m_aScene.CommsManager.UserProfileCacheService.GetUserDetails(agentData.AgentID);
 
+            if (uinfo == null)
+                return false;
+
             if ((IsLocalUser(uinfo) && (GetHyperlinkRegion(regInfo.RegionHandle) != null)) ||
                 (!IsLocalUser(uinfo) && !IsGoingHome(uinfo, regInfo)))
             {
@@ -735,6 +740,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
         // Is the user going back to the home region or the home grid?
         protected bool IsGoingHome(CachedUserInfo uinfo, GridRegion rinfo)
         {
+            if (uinfo == null)
+                return false;
+
             if (uinfo.UserProfile == null)
                 return false;
 
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index 54acbc4..c261943 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -129,6 +129,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                             successfulAssetRestores++;
                         else
                             failedAssetRestores++;
+
+                        if ((successfulAssetRestores + failedAssetRestores) % 250 == 0)
+                            m_log.Debug("[ARCHIVER]: Loaded " + successfulAssetRestores + " assets and failed to load " + failedAssetRestores + " assets...");
                     }
                     else if (!m_merge && filePath.StartsWith(ArchiveConstants.TERRAINS_PATH))
                     {