From 1505c22995e411af0c7e29d0331cdf244d69fd4c Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 31 Jan 2012 21:09:26 +0000
Subject: Use Environment.TickCount & Int32.MaxValue; instead of
Util.EnvironmentTickCount(); when producing the threads report to reduce
wraparound.
This matches the tickcount masking in the thread watchdog.
For some reason, Util.EnvironmentTickCount() masks ticks by 0x3fffffff instead of 0xffffffff
---
OpenSim/Framework/Servers/BaseOpenSimServer.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 4c381d0..545e76c 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -251,7 +251,7 @@ namespace OpenSim.Framework.Servers
sb.Append(threads.Length + " threads are being tracked:" + Environment.NewLine);
- int timeNow = Util.EnvironmentTickCount();
+ int timeNow = Environment.TickCount & Int32.MaxValue;
sb.AppendFormat(reportFormat, "ID", "NAME", "LAST UPDATE (MS)", "LIFETIME (MS)", "PRIORITY", "STATE");
sb.Append(Environment.NewLine);
--
cgit v1.1
From 2f84d5397bcce4c8de0c0cf70cb65307e9e37908 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 31 Jan 2012 21:14:09 +0000
Subject: minor: remove mono compiler warning
---
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 29ad966..a7bf06d 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -9252,9 +9252,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{
param1 = Convert.ToUInt32(Utils.BytesToString(messagePacket.ParamList[1].Parameter));
}
- catch (Exception ex)
+ catch
{
-
}
}
--
cgit v1.1
From 9bd02b5da19ae758bfb7a543976b26ced0cd1ba2 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 31 Jan 2012 21:57:45 +0000
Subject: Move object delete commands into a commands region module, in
preparation for adding similar show commands.
---
.../World/Objects/Commands/ObjectCommandsModule.cs | 206 +++++++++++++++++++++
OpenSim/Region/Framework/Scenes/Scene.cs | 104 -----------
2 files changed, 206 insertions(+), 104 deletions(-)
create mode 100644 OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
diff --git a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
new file mode 100644
index 0000000..57c109e
--- /dev/null
+++ b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
@@ -0,0 +1,206 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Text;
+using log4net;
+using Mono.Addins;
+using Nini.Config;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Framework.Console;
+using OpenSim.Framework.Statistics;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+
+namespace OpenSim.Region.CoreModules.World.Objects.Commands
+{
+ ///
+ /// A module that holds commands for manipulating objects in the scene.
+ ///
+ [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "ObjectCommandsModule")]
+ public class ObjectCommandsModule : INonSharedRegionModule
+ {
+// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+ private Scene m_scene;
+
+ public string Name { get { return "Object Commands Module"; } }
+
+ public Type ReplaceableInterface { get { return null; } }
+
+ public void Initialise(IConfigSource source)
+ {
+// m_log.DebugFormat("[OBJECT COMMANDS MODULE]: INITIALIZED MODULE");
+ }
+
+ public void PostInitialise()
+ {
+// m_log.DebugFormat("[OBJECT COMMANDS MODULE]: POST INITIALIZED MODULE");
+ }
+
+ public void Close()
+ {
+// m_log.DebugFormat("[OBJECT COMMANDS MODULE]: CLOSED MODULE");
+ }
+
+ public void AddRegion(Scene scene)
+ {
+// m_log.DebugFormat("[OBJECT COMMANDS MODULE]: REGION {0} ADDED", scene.RegionInfo.RegionName);
+
+ m_scene = scene;
+ }
+
+ public void RemoveRegion(Scene scene)
+ {
+// m_log.DebugFormat("[OBJECTS COMMANDS MODULE]: REGION {0} REMOVED", scene.RegionInfo.RegionName);
+ }
+
+ public void RegionLoaded(Scene scene)
+ {
+// m_log.DebugFormat("[OBJECTS COMMANDS MODULE]: REGION {0} LOADED", scene.RegionInfo.RegionName);
+
+ MainConsole.Instance.Commands.AddCommand("region", false, "delete object owner",
+ "delete object owner ",
+ "Delete object by owner", HandleDeleteObject);
+ MainConsole.Instance.Commands.AddCommand("region", false, "delete object creator",
+ "delete object creator ",
+ "Delete object by creator", HandleDeleteObject);
+ MainConsole.Instance.Commands.AddCommand("region", false, "delete object uuid",
+ "delete object uuid ",
+ "Delete object by uuid", HandleDeleteObject);
+ MainConsole.Instance.Commands.AddCommand("region", false, "delete object name",
+ "delete object name ",
+ "Delete object by name", HandleDeleteObject);
+ MainConsole.Instance.Commands.AddCommand("region", false, "delete object outside",
+ "delete object outside",
+ "Delete all objects outside boundaries", HandleDeleteObject);
+ }
+
+ private void HandleDeleteObject(string module, string[] cmd)
+ {
+ if (cmd.Length < 3)
+ return;
+
+ string mode = cmd[2];
+ string o = "";
+
+ if (mode != "outside")
+ {
+ if (cmd.Length < 4)
+ return;
+
+ o = cmd[3];
+ }
+
+ List deletes = new List();
+
+ UUID match;
+
+ switch (mode)
+ {
+ case "owner":
+ if (!UUID.TryParse(o, out match))
+ return;
+
+ m_scene.ForEachSOG(delegate (SceneObjectGroup g)
+ {
+ if (g.OwnerID == match && !g.IsAttachment)
+ deletes.Add(g);
+ });
+
+ break;
+
+ case "creator":
+ if (!UUID.TryParse(o, out match))
+ return;
+
+ m_scene.ForEachSOG(delegate (SceneObjectGroup g)
+ {
+ if (g.RootPart.CreatorID == match && !g.IsAttachment)
+ deletes.Add(g);
+ });
+
+ break;
+
+ case "uuid":
+ if (!UUID.TryParse(o, out match))
+ return;
+
+ m_scene.ForEachSOG(delegate (SceneObjectGroup g)
+ {
+ if (g.UUID == match && !g.IsAttachment)
+ deletes.Add(g);
+ });
+
+ break;
+
+ case "name":
+ m_scene.ForEachSOG(delegate (SceneObjectGroup g)
+ {
+ if (g.RootPart.Name == o && !g.IsAttachment)
+ deletes.Add(g);
+ });
+
+ break;
+
+ case "outside":
+ m_scene.ForEachSOG(delegate (SceneObjectGroup g)
+ {
+ SceneObjectPart rootPart = g.RootPart;
+ bool delete = false;
+
+ if (rootPart.GroupPosition.Z < 0.0 || rootPart.GroupPosition.Z > 10000.0)
+ {
+ delete = true;
+ }
+ else
+ {
+ ILandObject parcel
+ = m_scene.LandChannel.GetLandObject(rootPart.GroupPosition.X, rootPart.GroupPosition.Y);
+
+ if (parcel == null || parcel.LandData.Name == "NO LAND")
+ delete = true;
+ }
+
+ if (delete && !g.IsAttachment && !deletes.Contains(g))
+ deletes.Add(g);
+ });
+
+ break;
+ }
+
+ foreach (SceneObjectGroup g in deletes)
+ {
+ MainConsole.Instance.OutputFormat("Deleting object {0}", g.UUID);
+ m_scene.DeleteSceneObject(g, false);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 975d769..df6c88f 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -600,23 +600,6 @@ namespace OpenSim.Region.Framework.Scenes
"reload estate",
"Reload the estate data", HandleReloadEstate);
- MainConsole.Instance.Commands.AddCommand("region", false, "delete object owner",
- "delete object owner ",
- "Delete object by owner", HandleDeleteObject);
- MainConsole.Instance.Commands.AddCommand("region", false, "delete object creator",
- "delete object creator ",
- "Delete object by creator", HandleDeleteObject);
- MainConsole.Instance.Commands.AddCommand("region", false, "delete object uuid",
- "delete object uuid ",
- "Delete object by uuid", HandleDeleteObject);
- MainConsole.Instance.Commands.AddCommand("region", false, "delete object name",
- "delete object name ",
- "Delete object by name", HandleDeleteObject);
-
- MainConsole.Instance.Commands.AddCommand("region", false, "delete object outside",
- "delete object outside",
- "Delete all objects outside boundaries", HandleDeleteObject);
-
//Bind Storage Manager functions to some land manager functions for this scene
EventManager.OnLandObjectAdded +=
new EventManager.LandObjectAdded(simDataService.StoreLandObject);
@@ -4860,93 +4843,6 @@ namespace OpenSim.Region.Framework.Scenes
}
}
- private void HandleDeleteObject(string module, string[] cmd)
- {
- if (cmd.Length < 3)
- return;
-
- string mode = cmd[2];
- string o = "";
-
- if (mode != "outside")
- {
- if (cmd.Length < 4)
- return;
-
- o = cmd[3];
- }
-
- List deletes = new List();
-
- UUID match;
-
- switch (mode)
- {
- case "owner":
- if (!UUID.TryParse(o, out match))
- return;
- ForEachSOG(delegate (SceneObjectGroup g)
- {
- if (g.OwnerID == match && !g.IsAttachment)
- deletes.Add(g);
- });
- break;
- case "creator":
- if (!UUID.TryParse(o, out match))
- return;
- ForEachSOG(delegate (SceneObjectGroup g)
- {
- if (g.RootPart.CreatorID == match && !g.IsAttachment)
- deletes.Add(g);
- });
- break;
- case "uuid":
- if (!UUID.TryParse(o, out match))
- return;
- ForEachSOG(delegate (SceneObjectGroup g)
- {
- if (g.UUID == match && !g.IsAttachment)
- deletes.Add(g);
- });
- break;
- case "name":
- ForEachSOG(delegate (SceneObjectGroup g)
- {
- if (g.RootPart.Name == o && !g.IsAttachment)
- deletes.Add(g);
- });
- break;
- case "outside":
- ForEachSOG(delegate (SceneObjectGroup g)
- {
- SceneObjectPart rootPart = g.RootPart;
- bool delete = false;
-
- if (rootPart.GroupPosition.Z < 0.0 || rootPart.GroupPosition.Z > 10000.0)
- {
- delete = true;
- }
- else
- {
- ILandObject parcel = LandChannel.GetLandObject(rootPart.GroupPosition.X, rootPart.GroupPosition.Y);
-
- if (parcel == null || parcel.LandData.Name == "NO LAND")
- delete = true;
- }
-
- if (delete && !g.IsAttachment && !deletes.Contains(g))
- deletes.Add(g);
- });
- break;
- }
-
- foreach (SceneObjectGroup g in deletes)
- {
- m_log.InfoFormat("[SCENE]: Deleting object {0}", g.UUID);
- DeleteSceneObject(g, false);
- }
- }
-
private void HandleReloadEstate(string module, string[] cmd)
{
if (MainConsole.Instance.ConsoleScene == null ||
--
cgit v1.1