Merge branch 'avination' into ubitwork

3 files changed, 81 insertions, 24 deletions

diff --git a/OpenSim/Tools/pCampBot/Bot.cs b/OpenSim/Tools/pCampBot/Bot.cs
index da090dd..daaa3c0 100644
--- a/OpenSim/Tools/pCampBot/Bot.cs
+++ b/OpenSim/Tools/pCampBot/Bot.cs
@@ -43,6 +43,14 @@ using Timer = System.Timers.Timer;
 
 namespace pCampBot
 {
+    public enum ConnectionState
+    {
+        Disconnected,
+        Connecting,
+        Connected,
+        Disconnecting
+    }
+
     public class Bot
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -86,7 +94,7 @@ namespace pCampBot
         /// <summary>
         /// Is this bot connected to the grid?
         /// </summary>
-        public bool IsConnected { get; private set; }
+        public ConnectionState ConnectionState { get; private set; }
 
         public string FirstName { get; private set; }
         public string LastName { get; private set; }
@@ -130,6 +138,8 @@ namespace pCampBot
             BotManager bm, List<IBehaviour> behaviours,
             string firstName, string lastName, string password, string loginUri)
         {
+            ConnectionState = ConnectionState.Disconnected;
+
             behaviours.ForEach(b => b.Initialize(this));
             
             Client = new GridClient();
@@ -157,10 +167,10 @@ namespace pCampBot
                     Behaviours.ForEach(
                         b =>
                         {
+                            Thread.Sleep(Random.Next(3000, 10000));
+                        
                             // m_log.DebugFormat("[pCAMPBOT]: For {0} performing action {1}", Name, b.GetType());
                             b.Action();
-
-                            Thread.Sleep(Random.Next(1000, 10000));
                         }
                     );
         }
@@ -178,6 +188,8 @@ namespace pCampBot
         /// </summary>
         public void shutdown()
         {
+            ConnectionState = ConnectionState.Disconnecting;
+
             if (m_actionThread != null)
                 m_actionThread.Abort();
 
@@ -209,9 +221,11 @@ namespace pCampBot
             Client.Network.Disconnected += this.Network_OnDisconnected;
             Client.Objects.ObjectUpdate += Objects_NewPrim;
 
+            ConnectionState = ConnectionState.Connecting;
+
             if (Client.Network.Login(FirstName, LastName, Password, "pCampBot", "Your name"))
             {
-                IsConnected = true;
+                ConnectionState = ConnectionState.Connected;
 
                 Thread.Sleep(Random.Next(1000, 10000));
                 m_actionThread = new Thread(Action);
@@ -241,6 +255,8 @@ namespace pCampBot
             }
             else
             {
+                ConnectionState = ConnectionState.Disconnected;
+
                 m_log.ErrorFormat(
                     "{0} {1} cannot login: {2}", FirstName, LastName, Client.Network.LoginMessage);
 
@@ -439,6 +455,8 @@ namespace pCampBot
 
         public void Network_OnDisconnected(object sender, DisconnectedEventArgs args)
         {
+            ConnectionState = ConnectionState.Disconnected;
+
             m_log.DebugFormat(
                 "[BOT]: Bot {0} disconnected reason {1}, message {2}", Name, args.Reason, args.Message);
 
@@ -456,13 +474,15 @@ namespace pCampBot
                && OnDisconnected != null)
 //            if (OnDisconnected != null)
             {
-                IsConnected = false;
                 OnDisconnected(this, EventType.DISCONNECTED);
             }
         }
 
         public void Objects_NewPrim(object sender, PrimEventArgs args)
         {
+//            if (Name.EndsWith("4"))
+//                throw new Exception("Aaargh");
+
             Primitive prim = args.Prim;
 
             if (prim != null)
diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index 0f501b7..d615b3f 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -49,6 +49,14 @@ namespace pCampBot
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
+        public const int DefaultLoginDelay = 5000;
+
+        /// <summary>
+        /// Delay between logins of multiple bots.
+        /// </summary>
+        /// <remarks>TODO: This value needs to be configurable by a command line argument.</remarks>
+        public int LoginDelay { get; set; }
+
         /// <summary>
         /// Command console
         /// </summary>
@@ -84,6 +92,8 @@ namespace pCampBot
         /// </summary>
         public BotManager()
         {
+            LoginDelay = DefaultLoginDelay;
+
             Rng = new Random(Environment.TickCount);
             AssetsReceived = new Dictionary<UUID, bool>();
             RegionsKnown = new Dictionary<ulong, GridRegion>();
@@ -151,28 +161,34 @@ namespace pCampBot
             Array.ForEach<string>(
                 cs.GetString("behaviours", "p").Split(new char[] { ',' }), b => behaviourSwitches.Add(b));
 
+            MainConsole.Instance.OutputFormat(
+                "[BOT MANAGER]: Starting {0} bots connecting to {1}, named {2} {3}_<n>",
+                botcount,
+                loginUri,
+                firstName,
+                lastNameStem);
+
+            MainConsole.Instance.OutputFormat("[BOT MANAGER]: Delay between logins is {0}ms", LoginDelay);
+
             for (int i = 0; i < botcount; i++)
             {
                 string lastName = string.Format("{0}_{1}", lastNameStem, i);
 
+                // We must give each bot its own list of instantiated behaviours since they store state.
                 List<IBehaviour> behaviours = new List<IBehaviour>();
-        
+    
                 // Hard-coded for now
                 if (behaviourSwitches.Contains("p"))
                     behaviours.Add(new PhysicsBehaviour());
-        
+    
                 if (behaviourSwitches.Contains("g"))
                     behaviours.Add(new GrabbingBehaviour());
-        
+    
                 if (behaviourSwitches.Contains("t"))
                     behaviours.Add(new TeleportBehaviour());
-        
+    
                 if (behaviourSwitches.Contains("c"))
                     behaviours.Add(new CrossBehaviour());
-        
-                MainConsole.Instance.OutputFormat(
-                    "[BOT MANAGER]: Bot {0} {1} configured for behaviours {2}",
-                    firstName, lastName, string.Join(",", behaviours.ConvertAll<string>(b => b.Name).ToArray()));
 
                 StartBot(this, behaviours, firstName, lastName, password, loginUri);
             }
@@ -211,6 +227,10 @@ namespace pCampBot
              BotManager bm, List<IBehaviour> behaviours,
              string firstName, string lastName, string password, string loginUri)
         {
+            MainConsole.Instance.OutputFormat(
+                "[BOT MANAGER]: Starting bot {0} {1}, behaviours are {2}",
+                firstName, lastName, string.Join(",", behaviours.ConvertAll<string>(b => b.Name).ToArray()));
+
             Bot pb = new Bot(bm, behaviours, firstName, lastName, password, loginUri);
 
             pb.OnConnected += handlebotEvent;
@@ -222,7 +242,11 @@ namespace pCampBot
             Thread pbThread = new Thread(pb.startup);
             pbThread.Name = pb.Name;
             pbThread.IsBackground = true;
+
             pbThread.Start();
+
+            // Stagger logins
+            Thread.Sleep(LoginDelay);
         }
 
         /// <summary>
@@ -242,7 +266,7 @@ namespace pCampBot
 
                     lock (m_lBot)
                     {
-                        if (m_lBot.TrueForAll(b => !b.IsConnected))
+                        if (m_lBot.TrueForAll(b => b.ConnectionState == ConnectionState.Disconnected))
                             Environment.Exit(0);
 
                         break;
@@ -251,13 +275,21 @@ namespace pCampBot
         }
 
         /// <summary>
-        /// Shutting down all bots
+        /// Shut down all bots
         /// </summary>
+        /// <remarks>
+        /// We launch each shutdown on its own thread so that a slow shutting down bot doesn't hold up all the others.
+        /// </remarks>
         public void doBotShutdown()
         {
             lock (m_lBot)
-                foreach (Bot pb in m_lBot)
-                    pb.shutdown();
+            {
+                foreach (Bot bot in m_lBot)
+                {
+                    Bot thisBot = bot;
+                    Util.FireAndForget(o => thisBot.shutdown());
+                }
+            }
         }
 
         /// <summary>
@@ -271,11 +303,8 @@ namespace pCampBot
 
         private void HandleShutdown(string module, string[] cmd)
         {
-            Util.FireAndForget(o =>
-            {
-                m_log.Warn("[BOTMANAGER]: Shutting down bots");
-                doBotShutdown();
-            });
+            m_log.Info("[BOTMANAGER]: Shutting down bots");
+            doBotShutdown();
         }
 
         private void HandleShowRegions(string module, string[] cmd)
@@ -302,9 +331,11 @@ namespace pCampBot
             {
                 foreach (Bot pb in m_lBot)
                 {
+                    Simulator currentSim = pb.Client.Network.CurrentSim;
+
                     MainConsole.Instance.OutputFormat(
                         outputFormat,
-                        pb.Name, pb.Client.Network.CurrentSim.Name, pb.IsConnected ? "Connected" : "Disconnected");
+                        pb.Name, currentSim != null ? currentSim.Name : "(none)", pb.ConnectionState);
                 }
             }
         }
diff --git a/OpenSim/Tools/pCampBot/pCampBot.cs b/OpenSim/Tools/pCampBot/pCampBot.cs
index ec5ad04..9e82577 100644
--- a/OpenSim/Tools/pCampBot/pCampBot.cs
+++ b/OpenSim/Tools/pCampBot/pCampBot.cs
@@ -27,7 +27,9 @@
 
 using System;
 using System.Reflection;
+using System.Threading;
 using log4net;
+using log4net.Config;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
@@ -51,6 +53,8 @@ namespace pCampBot
         [STAThread]
         public static void Main(string[] args)
         {
+            XmlConfigurator.Configure();
+
             IConfig config = ParseConfig(args);
             if (config.Get("help") != null || config.Get("loginuri") == null)
             {
@@ -67,7 +71,9 @@ namespace pCampBot
                 BotManager bm = new BotManager();
 
                 //startup specified number of bots.  1 is the default
-                bm.dobotStartup(botcount, config);
+                Thread startBotThread = new Thread(o => bm.dobotStartup(botcount, config));
+                startBotThread.Name = "Initial start bots thread";
+                startBotThread.Start();
 
                 while (true)
                 {