9 files changed, 253 insertions, 100 deletions

diff --git a/OpenSim/Tools/pCampBot/Behaviours/AbstractBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/AbstractBehaviour.cs
index 9a9371d..c1ba36b 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/AbstractBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/AbstractBehaviour.cs
@@ -29,21 +29,36 @@ using OpenMetaverse;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using pCampBot.Interfaces;
 
 namespace pCampBot
 {
-    public class AbstractBehaviour : IBehaviour
+    public abstract class AbstractBehaviour : IBehaviour
     {
+        /// <summary>
+        /// Abbreviated name of this behaviour. 
+        /// </summary>
+        public string AbbreviatedName { get; protected set; }
+
         public string Name { get; protected set; }
 
         public Bot Bot { get; protected set; }
 
-        public virtual void Action() {}
+        public abstract void Action();
+
+        public virtual void Interrupt() {}
+
+        protected AutoResetEvent m_interruptEvent = new AutoResetEvent(false);
 
         public virtual void Initialize(Bot bot)
         {
             Bot = bot;
         }
+
+        public virtual void Close() 
+        {
+            Interrupt();
+        }
     }
 }
diff --git a/OpenSim/Tools/pCampBot/Behaviours/CrossBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/CrossBehaviour.cs
index 1e01c64..4d806fc 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/CrossBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/CrossBehaviour.cs
@@ -47,7 +47,11 @@ namespace pCampBot
 
         public const int m_regionCrossingTimeout = 1000 * 60;
 
-        public CrossBehaviour() { Name = "Cross"; }
+        public CrossBehaviour() 
+        { 
+            AbbreviatedName = "c";
+            Name = "Cross"; 
+        }
 
         public override void Action()
         {
diff --git a/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs
index 66a336a..59f6244 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs
@@ -29,6 +29,7 @@ using OpenMetaverse;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using pCampBot.Interfaces;
 
 namespace pCampBot
@@ -41,7 +42,11 @@ namespace pCampBot
     /// </remarks>
     public class GrabbingBehaviour : AbstractBehaviour
     {
-        public GrabbingBehaviour() { Name = "Grabbing"; }
+        public GrabbingBehaviour() 
+        { 
+            AbbreviatedName = "g";
+            Name = "Grabbing"; 
+        }
 
         public override void Action()
         {
@@ -56,6 +61,8 @@ namespace pCampBot
             Bot.Client.Self.Grab(prim.LocalID);
             Bot.Client.Self.GrabUpdate(prim.ID, Vector3.Zero);
             Bot.Client.Self.DeGrab(prim.LocalID);
+
+            Thread.Sleep(1000);
         }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Tools/pCampBot/Behaviours/InventoryDownloadBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/InventoryDownloadBehaviour.cs
new file mode 100644
index 0000000..521415c
--- /dev/null
+++ b/OpenSim/Tools/pCampBot/Behaviours/InventoryDownloadBehaviour.cs
@@ -0,0 +1,121 @@
+/*
+ * 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 OpenMetaverse;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Threading;
+using System.Linq;
+using pCampBot.Interfaces;
+
+namespace pCampBot
+{
+    /// <summary>
+    /// Do nothing
+    /// </summary>
+    public class InventoryDownloadBehaviour : AbstractBehaviour
+    {
+        private bool m_initialized;
+        private int m_Requests = 2;
+        private Stopwatch m_StopWatch = new Stopwatch();
+        private List<UUID> m_processed = new List<UUID>();
+
+        public InventoryDownloadBehaviour() 
+        { 
+            AbbreviatedName = "inv";
+            Name = "Inventory";
+        }
+
+        public override void Action()
+        {
+            if (!m_initialized)
+            {
+                m_initialized = true;
+                Bot.Client.Settings.HTTP_INVENTORY = true;
+                Bot.Client.Settings.FETCH_MISSING_INVENTORY = true;
+                Bot.Client.Inventory.FolderUpdated += Inventory_FolderUpdated;
+                Console.WriteLine("Lib owner is " + Bot.Client.Inventory.Store.LibraryRootNode.Data.OwnerID);
+                m_StopWatch.Start();
+                Bot.Client.Inventory.RequestFolderContents(Bot.Client.Inventory.Store.RootFolder.UUID, Bot.Client.Self.AgentID, true, true, InventorySortOrder.ByDate);
+                Bot.Client.Inventory.RequestFolderContents(Bot.Client.Inventory.Store.LibraryRootNode.Data.UUID, Bot.Client.Inventory.Store.LibraryRootNode.Data.OwnerID, true, true, InventorySortOrder.ByDate);
+            }
+
+            Thread.Sleep(1000);
+            Console.WriteLine("Total items: " + Bot.Client.Inventory.Store.Items.Count + "; Total requests: " + m_Requests + "; Time: " + m_StopWatch.Elapsed);
+
+        }
+
+        void Inventory_FolderUpdated(object sender, FolderUpdatedEventArgs e)
+        {
+            if (e.Success)
+            {
+                //Console.WriteLine("Folder " + e.FolderID + " updated");
+                bool fetch = false;
+                lock (m_processed)
+                {
+                    if (!m_processed.Contains(e.FolderID))
+                    {
+                        m_processed.Add(e.FolderID);
+                        fetch = true;
+                    }
+                }
+
+                if (fetch)
+                {
+                    List<InventoryFolder> m_foldersToFetch = new List<InventoryFolder>();
+                    foreach (InventoryBase item in Bot.Client.Inventory.Store.GetContents(e.FolderID))
+                    {
+                        if (item is InventoryFolder)
+                        {
+                            InventoryFolder f = new InventoryFolder(item.UUID);
+                            f.OwnerID = item.OwnerID;
+                            m_foldersToFetch.Add(f);
+                        }
+                    }
+                    if (m_foldersToFetch.Count > 0)
+                    {
+                        m_Requests += 1;
+                        Bot.Client.Inventory.RequestFolderContentsCap(m_foldersToFetch, Bot.Client.Network.CurrentSim.Caps.CapabilityURI("FetchInventoryDescendents2"), true, true, InventorySortOrder.ByDate);
+                    }
+                }
+
+                if (Bot.Client.Inventory.Store.Items.Count >= 15739)
+                {
+                    m_StopWatch.Stop();
+                    Console.WriteLine("Stop! Total items: " + Bot.Client.Inventory.Store.Items.Count + "; Total requests: " + m_Requests + "; Time: " + m_StopWatch.Elapsed);
+                }
+            }
+
+        }
+
+        public override void Interrupt() 
+        {
+            m_interruptEvent.Set();
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Physics/POSPlugin/POSPlugin.cs b/OpenSim/Tools/pCampBot/Behaviours/NoneBehaviour.cs
index e6b42e6..0d43781 100644
--- a/OpenSim/Region/Physics/POSPlugin/POSPlugin.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/NoneBehaviour.cs
@@ -25,40 +25,36 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using OpenMetaverse;
 using System;
 using System.Collections.Generic;
-using Nini.Config;
-using OpenSim.Framework;
-using OpenSim.Region.Physics.Manager;
+using System.Linq;
+using pCampBot.Interfaces;
 
-namespace OpenSim.Region.Physics.POSPlugin
+namespace pCampBot
 {
     /// <summary>
-    /// for now will be a very POS physics engine
+    /// Do nothing
     /// </summary>
-    public class POSPlugin : IPhysicsPlugin
+    public class NoneBehaviour : AbstractBehaviour
     {
-        public POSPlugin()
-        {
-        }
-
-        public bool Init()
-        {
-            return true;
-        }
-
-        public PhysicsScene GetScene(string sceneIdentifier)
-        {
-            return new POSScene(sceneIdentifier);
+        public NoneBehaviour() 
+        { 
+            AbbreviatedName = "n";
+            Name = "None"; 
         }
 
-        public string GetName()
+        public override void Action()
         {
-            return ("POS");
+            Bot.Client.Self.Jump(false);
+            Bot.Client.Self.Movement.Stop = true;
+            m_interruptEvent.WaitOne();
+            Bot.Client.Self.Movement.Stop = false;
         }
 
-        public void Dispose()
+        public override void Interrupt() 
         {
+            m_interruptEvent.Set();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs
index daa7485..98ab931 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs
@@ -46,6 +46,7 @@ namespace pCampBot
 
         public PhysicsBehaviour()
         {
+            AbbreviatedName = "p";
             Name = "Physics";
             talkarray = readexcuses();
         }
@@ -77,6 +78,14 @@ namespace pCampBot
                 Bot.Client.Self.Chat(randomf, 0, ChatType.Normal);
         }
 
+        public override void Close()
+        {
+            if (Bot.ConnectionState == ConnectionState.Connected)
+                Bot.Client.Self.Jump(false);
+
+            base.Close();
+        }
+
         private string[] readexcuses()
         {
             string allexcuses = "";
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour2.cs
index 478dd95..1ec2046 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour2.cs
@@ -25,66 +25,62 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using OpenMetaverse;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Reflection;
-using System.Runtime.InteropServices;
 using System.Threading;
-using System.IO;
-using System.Diagnostics;
 using log4net;
-using Nini.Config;
-using Ode.NET;
-using OpenSim.Framework;
-using OpenSim.Region.Physics.Manager;
-using OpenMetaverse;
+using pCampBot.Interfaces;
 
-namespace OpenSim.Region.Physics.OdePlugin
+namespace pCampBot
 {
     /// <summary>
-    /// ODE plugin
+    /// This behavior is for the systematic study of some performance improvements made
+    /// for OSCC'13.
+    /// Walk around, sending AgentUpdate packets all the time.
     /// </summary>
-    public class OdePlugin : IPhysicsPlugin
+    public class PhysicsBehaviour2 : AbstractBehaviour
     {
-        private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
-
-        private OdeScene m_scene;
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        public bool Init()
-        {
-            return true;
+        public PhysicsBehaviour2() 
+        { 
+            AbbreviatedName = "ph2";
+            Name = "Physics2"; 
         }
 
-        public PhysicsScene GetScene(String sceneIdentifier)
+        private const int TIME_WALKING = 5 * 10; // 5 seconds
+        private int counter = 0;
+
+        public override void Action()
         {
-            if (m_scene == null)
+
+            if (counter >= TIME_WALKING)
             {
-                // We do this so that OpenSimulator on Windows loads the correct native ODE library depending on whether
-                // it's running as a 32-bit process or a 64-bit one.  By invoking LoadLibary here, later DLLImports
-                // will find it already loaded later on.
-                //
-                // This isn't necessary for other platforms (e.g. Mac OSX and Linux) since the DLL used can be
-                // controlled in Ode.NET.dll.config
-                if (Util.IsWindows())
-                    Util.LoadArchSpecificWindowsDll("ode.dll");
+                counter = 0;
 
-                // Initializing ODE only when a scene is created allows alternative ODE plugins to co-habit (according to
-                // http://opensimulator.org/mantis/view.php?id=2750).
-                d.InitODE();
-                
-                m_scene = new OdeScene(sceneIdentifier);
-            }
+                Vector3 target = new Vector3(Bot.Random.Next(1, 254), Bot.Random.Next(1, 254), Bot.Client.Self.SimPosition.Z);
+                MyTurnToward(target);
 
-            return m_scene;
-        }
+                Bot.Client.Self.Movement.AtPos = true;
 
-        public string GetName()
-        {
-            return ("OpenDynamicsEngine");
+            }
+            else
+                counter++;
+            // In any case, send an update
+            Bot.Client.Self.Movement.SendUpdate();
         }
 
-        public void Dispose()
+        private void MyTurnToward(Vector3 target)
         {
+            Quaternion between = Vector3.RotationBetween(Vector3.UnitX, Vector3.Normalize(target - Bot.Client.Self.SimPosition));
+            Quaternion rot = between ;
+
+            Bot.Client.Self.Movement.BodyRotation = rot;
+            Bot.Client.Self.Movement.HeadRotation = rot;
+            Bot.Client.Self.Movement.Camera.LookAt(Bot.Client.Self.SimPosition, target);
         }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Tools/pCampBot/Behaviours/TeleportBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/TeleportBehaviour.cs
index fbb4e96..81f250d 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/TeleportBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/TeleportBehaviour.cs
@@ -29,6 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using System.Threading;
 using log4net;
 using OpenMetaverse;
 using pCampBot.Interfaces;
@@ -42,7 +43,11 @@ namespace pCampBot
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        public TeleportBehaviour() { Name = "Teleport"; }
+        public TeleportBehaviour() 
+        {
+            AbbreviatedName = "t";
+            Name = "Teleport"; 
+        }
 
         public override void Action()
         {
@@ -70,6 +75,8 @@ namespace pCampBot
                 Bot.Name, sourceRegion.Name, Bot.Client.Self.SimPosition, destRegion.Name, destPosition);
 
             Bot.Client.Self.Teleport(destRegion.RegionHandle, destPosition);
+
+            Thread.Sleep(Bot.Random.Next(3000, 10000));
         }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Tests/Clients/InstantMessage/IMClient.cs b/OpenSim/Tools/pCampBot/Behaviours/TwitchyBehaviour.cs
index e7304a2..7b4639d 100644
--- a/OpenSim/Tests/Clients/InstantMessage/IMClient.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/TwitchyBehaviour.cs
@@ -25,51 +25,49 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using OpenMetaverse;
 using System;
 using System.Collections.Generic;
-using System.Text;
+using System.Linq;
 using System.Reflection;
-
-using OpenMetaverse;
 using log4net;
-using log4net.Appender;
-using log4net.Layout;
+using pCampBot.Interfaces;
 
-using OpenSim.Framework;
-using OpenSim.Services.Interfaces;
-using OpenSim.Services.Connectors.InstantMessage;
-
-namespace OpenSim.Tests.Clients.InstantMessage
+namespace pCampBot
 {
-    public class IMClient
+    /// <summary>
+    /// This behavior is for the systematic study of some performance improvements made
+    /// for OSCC'13.
+    /// Do nothing, but send AgentUpdate packets all the time that have only slightly 
+    /// different state. The delta of difference will be filtered by OpenSim early on
+    /// in the packet processing pipeline. These filters did not exist before OSCC'13.
+    /// </summary>
+    public class TwitchyBehaviour : AbstractBehaviour
     {
-        private static readonly ILog m_log =
-                LogManager.GetLogger(
-                MethodBase.GetCurrentMethod().DeclaringType);
-        
-        public static void Main(string[] args)
-        {
-            ConsoleAppender consoleAppender = new ConsoleAppender();
-            consoleAppender.Layout =
-                new PatternLayout("%date [%thread] %-5level %logger [%property{NDC}] - %message%newline");
-            log4net.Config.BasicConfigurator.Configure(consoleAppender);
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-            string serverURI = "http://127.0.0.1:8002"; 
-            GridInstantMessage im = new GridInstantMessage();
-            im.fromAgentID = new Guid();
-            im.toAgentID = new Guid();
-            im.message = "Hello";
-            im.imSessionID = new Guid();
+        public TwitchyBehaviour() 
+        { 
+            AbbreviatedName = "tw";
+            Name = "Twitchy"; 
+        }
+
+        private const float TWITCH = 0.0001f;
+        private int direction = 1;
+
+        public override void Action()
+        {
+            Bot.Client.Self.Movement.BodyRotation = new Quaternion(Bot.Client.Self.Movement.BodyRotation.X + direction * TWITCH,
+                Bot.Client.Self.Movement.BodyRotation.Y,
+                Bot.Client.Self.Movement.BodyRotation.Z,
+                Bot.Client.Self.Movement.BodyRotation.W);
 
-            bool success = InstantMessageServiceConnector.SendInstantMessage(serverURI, im);
+            //m_log.DebugFormat("[TWITCH]: BodyRot {0}", Bot.Client.Self.Movement.BodyRotation);
+            direction = -direction;
 
-            if (success)
-                m_log.InfoFormat("[IM CLIENT]: Successfully IMed {0}", serverURI);
-            else
-                m_log.InfoFormat("[IM CLIENT]: failed to IM {0}", serverURI);
+            Bot.Client.Self.Movement.SendUpdate();
 
-            System.Console.WriteLine("\n");
         }
 
     }
-}
+}
\ No newline at end of file