diff --git a/.nant/local.include b/.nant/local.include
index 0c23e50eed..4fa3e4df4b 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -111,6 +111,17 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 984058c902..975d769947 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1943,6 +1943,7 @@ namespace OpenSim.Region.Framework.Scenes
/// If true, the object is made persistent into the scene.
/// If false, the object will not persist over server restarts
///
+ /// true if the object was added. false if not
public bool AddNewSceneObject(SceneObjectGroup sceneObject, bool attachToBackup)
{
return AddNewSceneObject(sceneObject, attachToBackup, true);
@@ -1960,6 +1961,7 @@ namespace OpenSim.Region.Framework.Scenes
/// If true, updates for the new scene object are sent to all viewers in range.
/// If false, it is left to the caller to schedule the update
///
+ /// true if the object was added. false if not
public bool AddNewSceneObject(SceneObjectGroup sceneObject, bool attachToBackup, bool sendClientUpdates)
{
if (m_sceneGraph.AddNewSceneObject(sceneObject, attachToBackup, sendClientUpdates))
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 36a454eb75..006f9c62a7 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -357,7 +357,13 @@ namespace OpenSim.Region.Framework.Scenes
return false;
if (Entities.ContainsKey(sceneObject.UUID))
+ {
+// m_log.DebugFormat(
+// "[SCENEGRAPH]: Scene graph for {0} already contains object {1} in AddSceneObject()",
+// m_parentScene.RegionInfo.RegionName, sceneObject.UUID);
+
return false;
+ }
// m_log.DebugFormat(
// "[SCENEGRAPH]: Adding scene object {0} {1}, with {2} parts on {3}",
diff --git a/OpenSim/Tests/Torture/ObjectTortureTests.cs b/OpenSim/Tests/Torture/ObjectTortureTests.cs
new file mode 100644
index 0000000000..cdbaa66c63
--- /dev/null
+++ b/OpenSim/Tests/Torture/ObjectTortureTests.cs
@@ -0,0 +1,126 @@
+/*
+ * 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.Diagnostics;
+using System.Reflection;
+using log4net;
+using NUnit.Framework;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Tests.Common;
+using OpenSim.Tests.Common.Mock;
+
+namespace OpenSim.Tests.Torture
+{
+ ///
+ /// Object torture tests
+ ///
+ ///
+ /// Don't rely on the numbers given by these tests - they will vary a lot depending on what is already cached,
+ /// how much memory is free, etc. In some cases, later larger tests will apparently take less time than smaller
+ /// earlier tests.
+ ///
+ [TestFixture]
+ public class ObjectTortureTests
+ {
+// [Test]
+// public void Test0000Clean()
+// {
+// TestHelpers.InMethod();
+//// log4net.Config.XmlConfigurator.Configure();
+//
+// TestAddObjects(200000);
+// }
+
+ [Test]
+ public void Test0001TenThousandObjects()
+ {
+ TestHelpers.InMethod();
+// log4net.Config.XmlConfigurator.Configure();
+
+ TestAddObjects(10000);
+ }
+
+ [Test]
+ public void Test0002OneHundredThousandObjects()
+ {
+ TestHelpers.InMethod();
+// log4net.Config.XmlConfigurator.Configure();
+
+ TestAddObjects(100000);
+ }
+
+ [Test]
+ public void Test0003TwoHundredThousandObjects()
+ {
+ TestHelpers.InMethod();
+// log4net.Config.XmlConfigurator.Configure();
+
+ TestAddObjects(200000);
+ }
+
+ private void TestAddObjects(int objectsToAdd)
+ {
+ UUID ownerId = new UUID("F0000000-0000-0000-0000-000000000000");
+
+ TestScene scene = SceneHelpers.SetupScene();
+
+ Process process = Process.GetCurrentProcess();
+// long startProcessMemory = process.PrivateMemorySize64;
+ long startGcMemory = GC.GetTotalMemory(true);
+ DateTime start = DateTime.Now;
+
+ for (int i = 1; i <= objectsToAdd; i++)
+ {
+ SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, ownerId, "part_", i);
+ Assert.That(scene.AddNewSceneObject(so, false), Is.True, string.Format("Object {0} was not created", i));
+ }
+
+ TimeSpan elapsed = DateTime.Now - start;
+// long processMemoryAlloc = process.PrivateMemorySize64 - startProcessMemory;
+ long processGcAlloc = GC.GetTotalMemory(false) - startGcMemory;
+
+ for (int i = 1; i <= objectsToAdd; i++)
+ {
+ Assert.That(
+ scene.GetSceneObjectGroup(TestHelpers.ParseTail(i)),
+ Is.Not.Null,
+ string.Format("Object {0} could not be retrieved", i));
+ }
+
+// Console.WriteLine(
+// "Took {0}ms, {1}MB to create {2} single prim scene objects",
+// elapsed.Milliseconds, processGcAlloc / 1024 / 1024, objectsToAdd);
+
+ Console.WriteLine(
+ "Took {0}MB to create {1} single prim scene objects",
+ processGcAlloc / 1024 / 1024, objectsToAdd);
+ }
+ }
+}
\ No newline at end of file
diff --git a/bin/OpenSim.Tests.Torture.dll.config b/bin/OpenSim.Tests.Torture.dll.config
new file mode 100644
index 0000000000..a3f681d89e
--- /dev/null
+++ b/bin/OpenSim.Tests.Torture.dll.config
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/prebuild.xml b/prebuild.xml
index eebb9f92a5..65383ee18f 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2822,7 +2822,6 @@
-
@@ -3259,6 +3258,39 @@
+
+
+
+ ../../../bin/
+
+
+
+
+ ../../../bin/
+
+
+
+ ../../../bin/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+