From 9c652079361f496c46640ed67e964ee6164ce06e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 3 Sep 2013 17:07:57 +0100
Subject: Show behaviours of pCampbot bots in "show bots" and "show bot"
console commands
---
.../Tools/pCampBot/Behaviours/AbstractBehaviour.cs | 5 +++++
.../Tools/pCampBot/Behaviours/CrossBehaviour.cs | 6 +++++-
.../Tools/pCampBot/Behaviours/GrabbingBehaviour.cs | 6 +++++-
OpenSim/Tools/pCampBot/Behaviours/NoneBehaviour.cs | 6 +++++-
.../Tools/pCampBot/Behaviours/PhysicsBehaviour.cs | 1 +
.../Tools/pCampBot/Behaviours/TeleportBehaviour.cs | 6 +++++-
OpenSim/Tools/pCampBot/BotManager.cs | 22 ++++++++++++++--------
OpenSim/Tools/pCampBot/Interfaces/IBehaviour.cs | 5 +++++
8 files changed, 45 insertions(+), 12 deletions(-)
(limited to 'OpenSim/Tools')
diff --git a/OpenSim/Tools/pCampBot/Behaviours/AbstractBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/AbstractBehaviour.cs
index 9a9371d..66d5542 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/AbstractBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/AbstractBehaviour.cs
@@ -35,6 +35,11 @@ namespace pCampBot
{
public class AbstractBehaviour : IBehaviour
{
+ ///
+ /// Abbreviated name of this behaviour.
+ ///
+ public string AbbreviatedName { get; protected set; }
+
public string Name { get; protected set; }
public Bot Bot { get; protected set; }
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..6acc27d 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs
@@ -41,7 +41,11 @@ namespace pCampBot
///
public class GrabbingBehaviour : AbstractBehaviour
{
- public GrabbingBehaviour() { Name = "Grabbing"; }
+ public GrabbingBehaviour()
+ {
+ AbbreviatedName = "g";
+ Name = "Grabbing";
+ }
public override void Action()
{
diff --git a/OpenSim/Tools/pCampBot/Behaviours/NoneBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/NoneBehaviour.cs
index 9cf8a54..9a3075c 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/NoneBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/NoneBehaviour.cs
@@ -38,6 +38,10 @@ namespace pCampBot
///
public class NoneBehaviour : AbstractBehaviour
{
- public NoneBehaviour() { Name = "None"; }
+ public NoneBehaviour()
+ {
+ AbbreviatedName = "n";
+ Name = "None";
+ }
}
}
\ No newline at end of file
diff --git a/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs
index daa7485..47b4d46 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();
}
diff --git a/OpenSim/Tools/pCampBot/Behaviours/TeleportBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/TeleportBehaviour.cs
index fbb4e96..5f7edda 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/TeleportBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/TeleportBehaviour.cs
@@ -42,7 +42,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()
{
diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index 5c3835b..35a24d1 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -572,10 +572,11 @@ namespace pCampBot
private void HandleShowBotsStatus(string module, string[] cmd)
{
ConsoleDisplayTable cdt = new ConsoleDisplayTable();
- cdt.AddColumn("Name", 30);
- cdt.AddColumn("Region", 30);
- cdt.AddColumn("Status", 14);
- cdt.AddColumn("Connections", 11);
+ cdt.AddColumn("Name", 24);
+ cdt.AddColumn("Region", 24);
+ cdt.AddColumn("Status", 13);
+ cdt.AddColumn("Conns", 5);
+ cdt.AddColumn("Behaviours", 20);
Dictionary totals = new Dictionary();
foreach (object o in Enum.GetValues(typeof(ConnectionState)))
@@ -583,13 +584,17 @@ namespace pCampBot
lock (m_bots)
{
- foreach (Bot pb in m_bots)
+ foreach (Bot bot in m_bots)
{
- Simulator currentSim = pb.Client.Network.CurrentSim;
- totals[pb.ConnectionState]++;
+ Simulator currentSim = bot.Client.Network.CurrentSim;
+ totals[bot.ConnectionState]++;
cdt.AddRow(
- pb.Name, currentSim != null ? currentSim.Name : "(none)", pb.ConnectionState, pb.SimulatorsCount);
+ bot.Name,
+ currentSim != null ? currentSim.Name : "(none)",
+ bot.ConnectionState,
+ bot.SimulatorsCount,
+ string.Join(",", bot.Behaviours.ConvertAll(behaviour => behaviour.AbbreviatedName)));
}
}
@@ -645,6 +650,7 @@ namespace pCampBot
MainConsole.Instance.Output("Settings");
ConsoleDisplayList statusCdl = new ConsoleDisplayList();
+ statusCdl.AddRow("Behaviours", string.Join(", ", bot.Behaviours.ConvertAll(b => b.Name)));
GridClient botClient = bot.Client;
statusCdl.AddRow("SEND_AGENT_UPDATES", botClient.Settings.SEND_AGENT_UPDATES);
diff --git a/OpenSim/Tools/pCampBot/Interfaces/IBehaviour.cs b/OpenSim/Tools/pCampBot/Interfaces/IBehaviour.cs
index 9c984be..f8a661b 100644
--- a/OpenSim/Tools/pCampBot/Interfaces/IBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Interfaces/IBehaviour.cs
@@ -32,6 +32,11 @@ namespace pCampBot.Interfaces
public interface IBehaviour
{
///
+ /// Abbreviated name of this behaviour.
+ ///
+ string AbbreviatedName { get; }
+
+ ///
/// Name of this behaviour.
///
string Name { get; }
--
cgit v1.1
From a89c56dcf1e2645554f8b81b6f1e517b829cc3a4 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 3 Sep 2013 17:53:29 +0100
Subject: Fix build break from last commit 9c65207. Mono 2.4 lacks
string.join(string, List), or some auto casting is missing
---
OpenSim/Tools/pCampBot/BotManager.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Tools')
diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index 35a24d1..7d4af13 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -594,7 +594,7 @@ namespace pCampBot
currentSim != null ? currentSim.Name : "(none)",
bot.ConnectionState,
bot.SimulatorsCount,
- string.Join(",", bot.Behaviours.ConvertAll(behaviour => behaviour.AbbreviatedName)));
+ string.Join(",", bot.Behaviours.ConvertAll(behaviour => behaviour.AbbreviatedName).ToArray()));
}
}
--
cgit v1.1
From 01cb8033a42514728835a18a38f2a18349e83638 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 3 Sep 2013 17:55:20 +0100
Subject: And fix break in "show bot" from commit 9c65207
---
OpenSim/Tools/pCampBot/BotManager.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Tools')
diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index 7d4af13..3e446af 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -650,7 +650,7 @@ namespace pCampBot
MainConsole.Instance.Output("Settings");
ConsoleDisplayList statusCdl = new ConsoleDisplayList();
- statusCdl.AddRow("Behaviours", string.Join(", ", bot.Behaviours.ConvertAll(b => b.Name)));
+ statusCdl.AddRow("Behaviours", string.Join(", ", bot.Behaviours.ConvertAll(b => b.Name).ToArray()));
GridClient botClient = bot.Client;
statusCdl.AddRow("SEND_AGENT_UPDATES", botClient.Settings.SEND_AGENT_UPDATES);
--
cgit v1.1
From 9bd62715704685738c55c6de8127b16cc6695bdb Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 3 Sep 2013 18:51:55 +0100
Subject: Add ability to adjust pCampbot bot behaviours whilst running with
"add behaviour " console commad
---
OpenSim/Tools/pCampBot/Bot.cs | 51 ++++++++----
OpenSim/Tools/pCampBot/BotManager.cs | 147 ++++++++++++++++++++++++++++-------
2 files changed, 157 insertions(+), 41 deletions(-)
(limited to 'OpenSim/Tools')
diff --git a/OpenSim/Tools/pCampBot/Bot.cs b/OpenSim/Tools/pCampBot/Bot.cs
index d418288..6037516 100644
--- a/OpenSim/Tools/pCampBot/Bot.cs
+++ b/OpenSim/Tools/pCampBot/Bot.cs
@@ -72,9 +72,10 @@ namespace pCampBot
/// Behaviours implemented by this bot.
///
///
- /// Lock this list before manipulating it.
+ /// Indexed by abbreviated name. There can only be one instance of a particular behaviour.
+ /// Lock this structure before manipulating it.
///
- public List Behaviours { get; private set; }
+ public Dictionary Behaviours { get; private set; }
///
/// Objects that the bot has discovered.
@@ -165,8 +166,6 @@ namespace pCampBot
{
ConnectionState = ConnectionState.Disconnected;
- behaviours.ForEach(b => b.Initialize(this));
-
Random = new Random(Environment.TickCount);// We do stuff randomly here
FirstName = firstName;
LastName = lastName;
@@ -176,12 +175,31 @@ namespace pCampBot
StartLocation = startLocation;
Manager = bm;
- Behaviours = behaviours;
+
+ Behaviours = new Dictionary();
+ foreach (IBehaviour behaviour in behaviours)
+ AddBehaviour(behaviour);
// Only calling for use as a template.
CreateLibOmvClient();
}
+ public bool AddBehaviour(IBehaviour behaviour)
+ {
+ lock (Behaviours)
+ {
+ if (!Behaviours.ContainsKey(behaviour.AbbreviatedName))
+ {
+ behaviour.Initialize(this);
+ Behaviours.Add(behaviour.AbbreviatedName, behaviour);
+
+ return true;
+ }
+ }
+
+ return false;
+ }
+
private void CreateLibOmvClient()
{
GridClient newClient = new GridClient();
@@ -237,16 +255,21 @@ namespace pCampBot
private void Action()
{
while (ConnectionState != ConnectionState.Disconnecting)
+ {
lock (Behaviours)
- Behaviours.ForEach(
- b =>
- {
- Thread.Sleep(Random.Next(3000, 10000));
-
- // m_log.DebugFormat("[pCAMPBOT]: For {0} performing action {1}", Name, b.GetType());
- b.Action();
- }
- );
+ {
+ foreach (IBehaviour behaviour in Behaviours.Values)
+ {
+ Thread.Sleep(Random.Next(3000, 10000));
+
+ // m_log.DebugFormat("[pCAMPBOT]: For {0} performing action {1}", Name, b.GetType());
+ behaviour.Action();
+ }
+ }
+
+ // XXX: This is a really shitty way of yielding so that behaviours can be added/removed
+ Thread.Sleep(100);
+ }
}
///
diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index 3e446af..51c5ff4 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -140,7 +140,7 @@ namespace pCampBot
///
/// Behaviour switches for bots.
///
- private HashSet m_behaviourSwitches = new HashSet();
+ private HashSet m_defaultBehaviourSwitches = new HashSet();
///
/// Constructor Creates MainConsole.Instance to take commands and provide the place to write data
@@ -195,6 +195,18 @@ namespace pCampBot
HandleDisconnect);
m_console.Commands.AddCommand(
+ "bot", false, "add behaviour", "add behaviour ",
+ "Add a behaviour to a bot",
+ "Can be performed on connected or disconnected bots.",
+ HandleAddBehaviour);
+
+// m_console.Commands.AddCommand(
+// "bot", false, "remove behaviour", "remove behaviour ",
+// "Remove a behaviour from a bot",
+// "Can be performed on connected or disconnected bots.",
+// HandleRemoveBehaviour);
+
+ m_console.Commands.AddCommand(
"bot", false, "sit", "sit", "Sit all bots on the ground.",
HandleSit);
@@ -235,7 +247,7 @@ namespace pCampBot
m_startUri = ParseInputStartLocationToUri(startupConfig.GetString("start", "last"));
Array.ForEach(
- startupConfig.GetString("behaviours", "p").Split(new char[] { ',' }), b => m_behaviourSwitches.Add(b));
+ startupConfig.GetString("behaviours", "p").Split(new char[] { ',' }), b => m_defaultBehaviourSwitches.Add(b));
for (int i = 0; i < botcount; i++)
{
@@ -243,28 +255,50 @@ namespace pCampBot
{
string lastName = string.Format("{0}_{1}", m_lastNameStem, i + m_fromBotNumber);
- // We must give each bot its own list of instantiated behaviours since they store state.
- List behaviours = new List();
-
- // Hard-coded for now
- if (m_behaviourSwitches.Contains("c"))
- behaviours.Add(new CrossBehaviour());
+ CreateBot(
+ this,
+ CreateBehavioursFromAbbreviatedNames(m_defaultBehaviourSwitches),
+ m_firstName, lastName, m_password, m_loginUri, m_startUri, m_wearSetting);
+ }
+ }
+ }
+
+ private List CreateBehavioursFromAbbreviatedNames(HashSet abbreviatedNames)
+ {
+ // We must give each bot its own list of instantiated behaviours since they store state.
+ List behaviours = new List();
+
+ // Hard-coded for now
+ foreach (string abName in abbreviatedNames)
+ {
+ IBehaviour newBehaviour = null;
+
+ if (abName == "c")
+ newBehaviour = new CrossBehaviour();
+
+ if (abName == "g")
+ newBehaviour = new GrabbingBehaviour();
- if (m_behaviourSwitches.Contains("g"))
- behaviours.Add(new GrabbingBehaviour());
+ if (abName == "n")
+ newBehaviour = new NoneBehaviour();
- if (m_behaviourSwitches.Contains("n"))
- behaviours.Add(new NoneBehaviour());
+ if (abName == "p")
+ newBehaviour = new PhysicsBehaviour();
- if (m_behaviourSwitches.Contains("p"))
- behaviours.Add(new PhysicsBehaviour());
-
- if (m_behaviourSwitches.Contains("t"))
- behaviours.Add(new TeleportBehaviour());
+ if (abName == "t")
+ newBehaviour = new TeleportBehaviour();
- CreateBot(this, behaviours, m_firstName, lastName, m_password, m_loginUri, m_startUri, m_wearSetting);
+ if (newBehaviour != null)
+ {
+ behaviours.Add(newBehaviour);
+ }
+ else
+ {
+ MainConsole.Instance.OutputFormat("No behaviour with abbreviated name {0} found", abName);
}
}
+
+ return behaviours;
}
public void ConnectBots(int botcount)
@@ -453,6 +487,44 @@ namespace pCampBot
}
}
+ private void HandleAddBehaviour(string module, string[] cmd)
+ {
+ if (cmd.Length != 4)
+ {
+ MainConsole.Instance.OutputFormat("Usage: add behaviour ");
+ return;
+ }
+
+ string rawBehaviours = cmd[2];
+ int botNumber;
+
+ if (!ConsoleUtil.TryParseConsoleNaturalInt(MainConsole.Instance, cmd[3], out botNumber))
+ return;
+
+ Bot bot = GetBotFromNumber(botNumber);
+
+ if (bot == null)
+ {
+ MainConsole.Instance.OutputFormat("Error: No bot found with number {0}", botNumber);
+ return;
+ }
+
+ HashSet rawAbbreviatedSwitchesToAdd = new HashSet();
+ Array.ForEach(rawBehaviours.Split(new char[] { ',' }), b => rawAbbreviatedSwitchesToAdd.Add(b));
+
+ List behavioursAdded = new List();
+
+ foreach (IBehaviour behaviour in CreateBehavioursFromAbbreviatedNames(rawAbbreviatedSwitchesToAdd))
+ {
+ if (bot.AddBehaviour(behaviour))
+ behavioursAdded.Add(behaviour);
+ }
+
+ MainConsole.Instance.OutputFormat(
+ "Added behaviours {0} to bot {1}",
+ string.Join(", ", behavioursAdded.ConvertAll(b => b.Name).ToArray()), bot.Name);
+ }
+
private void HandleDisconnect(string module, string[] cmd)
{
lock (m_bots)
@@ -594,7 +666,7 @@ namespace pCampBot
currentSim != null ? currentSim.Name : "(none)",
bot.ConnectionState,
bot.SimulatorsCount,
- string.Join(",", bot.Behaviours.ConvertAll(behaviour => behaviour.AbbreviatedName).ToArray()));
+ string.Join(",", bot.Behaviours.Keys.ToArray()));
}
}
@@ -621,16 +693,11 @@ namespace pCampBot
if (!ConsoleUtil.TryParseConsoleInt(MainConsole.Instance, cmd[2], out botNumber))
return;
- string name = string.Format("{0} {1}_{2}", m_firstName, m_lastNameStem, botNumber);
-
- Bot bot;
-
- lock (m_bots)
- bot = m_bots.Find(b => b.Name == name);
+ Bot bot = GetBotFromNumber(botNumber);
if (bot == null)
{
- MainConsole.Instance.Output("No bot found with name {0}", name);
+ MainConsole.Instance.OutputFormat("Error: No bot found with number {0}", botNumber);
return;
}
@@ -650,13 +717,39 @@ namespace pCampBot
MainConsole.Instance.Output("Settings");
ConsoleDisplayList statusCdl = new ConsoleDisplayList();
- statusCdl.AddRow("Behaviours", string.Join(", ", bot.Behaviours.ConvertAll(b => b.Name).ToArray()));
+
+ statusCdl.AddRow(
+ "Behaviours",
+ string.Join(", ", bot.Behaviours.Values.ToList().ConvertAll(b => b.Name).ToArray()));
+
GridClient botClient = bot.Client;
statusCdl.AddRow("SEND_AGENT_UPDATES", botClient.Settings.SEND_AGENT_UPDATES);
MainConsole.Instance.Output(statusCdl.ToString());
}
+ ///
+ /// Get a specific bot from its number.
+ ///
+ /// null if no bot was found
+ ///
+ private Bot GetBotFromNumber(int botNumber)
+ {
+ string name = GenerateBotNameFromNumber(botNumber);
+
+ Bot bot;
+
+ lock (m_bots)
+ bot = m_bots.Find(b => b.Name == name);
+
+ return bot;
+ }
+
+ private string GenerateBotNameFromNumber(int botNumber)
+ {
+ return string.Format("{0} {1}_{2}", m_firstName, m_lastNameStem, botNumber);
+ }
+
internal void Grid_GridRegion(object o, GridRegionEventArgs args)
{
lock (RegionsKnown)
--
cgit v1.1
From 1a2627031d8a80b1d5e21fd2d13e4dc2b123c0b4 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 3 Sep 2013 19:05:54 +0100
Subject: Add pCampbot "remove behaviour" console command for removing bot
behaviours during operation.
Doesn't currently work very well as stopping physics, for instance, can leave bot travelling in old direction
---
OpenSim/Tools/pCampBot/Bot.cs | 12 ++++++++
OpenSim/Tools/pCampBot/BotManager.cs | 53 ++++++++++++++++++++++++++++++++----
2 files changed, 60 insertions(+), 5 deletions(-)
(limited to 'OpenSim/Tools')
diff --git a/OpenSim/Tools/pCampBot/Bot.cs b/OpenSim/Tools/pCampBot/Bot.cs
index 6037516..0bd8151 100644
--- a/OpenSim/Tools/pCampBot/Bot.cs
+++ b/OpenSim/Tools/pCampBot/Bot.cs
@@ -184,6 +184,12 @@ namespace pCampBot
CreateLibOmvClient();
}
+ public bool TryGetBehaviour(string abbreviatedName, out IBehaviour behaviour)
+ {
+ lock (Behaviours)
+ return Behaviours.TryGetValue(abbreviatedName, out behaviour);
+ }
+
public bool AddBehaviour(IBehaviour behaviour)
{
lock (Behaviours)
@@ -200,6 +206,12 @@ namespace pCampBot
return false;
}
+ public bool RemoveBehaviour(string abbreviatedName)
+ {
+ lock (Behaviours)
+ return Behaviours.Remove(abbreviatedName);
+ }
+
private void CreateLibOmvClient()
{
GridClient newClient = new GridClient();
diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index 51c5ff4..6433c2e 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -200,11 +200,11 @@ namespace pCampBot
"Can be performed on connected or disconnected bots.",
HandleAddBehaviour);
-// m_console.Commands.AddCommand(
-// "bot", false, "remove behaviour", "remove behaviour ",
-// "Remove a behaviour from a bot",
-// "Can be performed on connected or disconnected bots.",
-// HandleRemoveBehaviour);
+ m_console.Commands.AddCommand(
+ "bot", false, "remove behaviour", "remove behaviour ",
+ "Remove a behaviour from a bot",
+ "Can be performed on connected or disconnected bots.",
+ HandleRemoveBehaviour);
m_console.Commands.AddCommand(
"bot", false, "sit", "sit", "Sit all bots on the ground.",
@@ -525,6 +525,49 @@ namespace pCampBot
string.Join(", ", behavioursAdded.ConvertAll(b => b.Name).ToArray()), bot.Name);
}
+ private void HandleRemoveBehaviour(string module, string[] cmd)
+ {
+ if (cmd.Length != 4)
+ {
+ MainConsole.Instance.OutputFormat("Usage: remove behaviour ");
+ return;
+ }
+
+ string rawBehaviours = cmd[2];
+ int botNumber;
+
+ if (!ConsoleUtil.TryParseConsoleNaturalInt(MainConsole.Instance, cmd[3], out botNumber))
+ return;
+
+ Bot bot = GetBotFromNumber(botNumber);
+
+ if (bot == null)
+ {
+ MainConsole.Instance.OutputFormat("Error: No bot found with number {0}", botNumber);
+ return;
+ }
+
+ HashSet abbreviatedBehavioursToRemove = new HashSet();
+ List behavioursRemoved = new List();
+
+ Array.ForEach(rawBehaviours.Split(new char[] { ',' }), b => abbreviatedBehavioursToRemove.Add(b));
+
+ foreach (string b in abbreviatedBehavioursToRemove)
+ {
+ IBehaviour behaviour;
+
+ if (bot.TryGetBehaviour(b, out behaviour))
+ {
+ bot.RemoveBehaviour(b);
+ behavioursRemoved.Add(behaviour);
+ }
+ }
+
+ MainConsole.Instance.OutputFormat(
+ "Removed behaviours {0} to bot {1}",
+ string.Join(", ", behavioursRemoved.ConvertAll(b => b.Name).ToArray()), bot.Name);
+ }
+
private void HandleDisconnect(string module, string[] cmd)
{
lock (m_bots)
--
cgit v1.1
From 3dbe7313d1c3fc28f0642531fbb6e238a98ac821 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 3 Sep 2013 19:33:17 +0100
Subject: Add Close() method to IBehaviour to allow behaviours to cleanup when
removed or bot it disconnected.
In this case, it is used to turn off jump when physics testing behaviour is removed.
---
OpenSim/Tools/pCampBot/Behaviours/AbstractBehaviour.cs | 2 ++
OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs | 5 +++++
OpenSim/Tools/pCampBot/Bot.cs | 16 +++++++++++++++-
OpenSim/Tools/pCampBot/Interfaces/IBehaviour.cs | 8 ++++++++
4 files changed, 30 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Tools')
diff --git a/OpenSim/Tools/pCampBot/Behaviours/AbstractBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/AbstractBehaviour.cs
index 66d5542..9bc8512 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/AbstractBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/AbstractBehaviour.cs
@@ -50,5 +50,7 @@ namespace pCampBot
{
Bot = bot;
}
+
+ public virtual void Close() {}
}
}
diff --git a/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs
index 47b4d46..65a7c90 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs
@@ -78,6 +78,11 @@ namespace pCampBot
Bot.Client.Self.Chat(randomf, 0, ChatType.Normal);
}
+ public override void Close()
+ {
+ Bot.Client.Self.Jump(false);
+ }
+
private string[] readexcuses()
{
string allexcuses = "";
diff --git a/OpenSim/Tools/pCampBot/Bot.cs b/OpenSim/Tools/pCampBot/Bot.cs
index 0bd8151..f871b77 100644
--- a/OpenSim/Tools/pCampBot/Bot.cs
+++ b/OpenSim/Tools/pCampBot/Bot.cs
@@ -209,7 +209,17 @@ namespace pCampBot
public bool RemoveBehaviour(string abbreviatedName)
{
lock (Behaviours)
- return Behaviours.Remove(abbreviatedName);
+ {
+ IBehaviour behaviour;
+
+ if (!Behaviours.TryGetValue(abbreviatedName, out behaviour))
+ return false;
+
+ behaviour.Close();
+ Behaviours.Remove(abbreviatedName);
+
+ return true;
+ }
}
private void CreateLibOmvClient()
@@ -282,6 +292,10 @@ namespace pCampBot
// XXX: This is a really shitty way of yielding so that behaviours can be added/removed
Thread.Sleep(100);
}
+
+ lock (Behaviours)
+ foreach (IBehaviour b in Behaviours.Values)
+ b.Close();
}
///
diff --git a/OpenSim/Tools/pCampBot/Interfaces/IBehaviour.cs b/OpenSim/Tools/pCampBot/Interfaces/IBehaviour.cs
index f8a661b..0ed4825 100644
--- a/OpenSim/Tools/pCampBot/Interfaces/IBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Interfaces/IBehaviour.cs
@@ -51,6 +51,14 @@ namespace pCampBot.Interfaces
void Initialize(Bot bot);
///
+ /// Close down this behaviour.
+ ///
+ ///
+ /// This is triggered if a behaviour is removed via explicit command and when a bot is disconnected
+ ///
+ void Close();
+
+ ///
/// Action to take when this behaviour is invoked.
///
///
--
cgit v1.1
From 76bd2e2d727a15e5d3bc9045bdef6faaeca4a08f Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 3 Sep 2013 19:41:12 +0100
Subject: Consistently give responsibility for thread sleeping to behaviours
rather than controlling from the main action loop
This is to avoid excessive and inconsistent delays between behaviours that currently need to embed sleeps in other actions (e.g. physics) and other behaviours.
Might need a more sophisticated approach in the long term.
---
OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs | 3 +++
OpenSim/Tools/pCampBot/Behaviours/TeleportBehaviour.cs | 3 +++
OpenSim/Tools/pCampBot/Bot.cs | 2 +-
3 files changed, 7 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Tools')
diff --git a/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs
index 6acc27d..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
@@ -60,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/TeleportBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/TeleportBehaviour.cs
index 5f7edda..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;
@@ -74,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/Tools/pCampBot/Bot.cs b/OpenSim/Tools/pCampBot/Bot.cs
index f871b77..d0a4ef3 100644
--- a/OpenSim/Tools/pCampBot/Bot.cs
+++ b/OpenSim/Tools/pCampBot/Bot.cs
@@ -282,7 +282,7 @@ namespace pCampBot
{
foreach (IBehaviour behaviour in Behaviours.Values)
{
- Thread.Sleep(Random.Next(3000, 10000));
+// Thread.Sleep(Random.Next(3000, 10000));
// m_log.DebugFormat("[pCAMPBOT]: For {0} performing action {1}", Name, b.GetType());
behaviour.Action();
--
cgit v1.1
From 9c3c9b7f5f62a7ed892f691180b765a9190cbbcc Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 3 Sep 2013 19:57:34 +0100
Subject: Make pCampbot "add behaviour" and "remove behaviour" console commands
work for all bots if no bot number is given
---
OpenSim/Tools/pCampBot/BotManager.cs | 123 ++++++++++++++++++++++-------------
1 file changed, 78 insertions(+), 45 deletions(-)
(limited to 'OpenSim/Tools')
diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index 6433c2e..3c1b11e 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -195,15 +195,17 @@ namespace pCampBot
HandleDisconnect);
m_console.Commands.AddCommand(
- "bot", false, "add behaviour", "add behaviour ",
+ "bot", false, "add behaviour", "add behaviour []",
"Add a behaviour to a bot",
- "Can be performed on connected or disconnected bots.",
+ "If no bot number is specified then behaviour is added to all bots.\n"
+ + "Can be performed on connected or disconnected bots.",
HandleAddBehaviour);
m_console.Commands.AddCommand(
- "bot", false, "remove behaviour", "remove behaviour ",
+ "bot", false, "remove behaviour", "remove behaviour []",
"Remove a behaviour from a bot",
- "Can be performed on connected or disconnected bots.",
+ "If no bot number is specified then behaviour is added to all bots.\n"
+ + "Can be performed on connected or disconnected bots.",
HandleRemoveBehaviour);
m_console.Commands.AddCommand(
@@ -224,7 +226,7 @@ namespace pCampBot
"bot", false, "show bots", "show bots", "Shows the status of all bots", HandleShowBotsStatus);
m_console.Commands.AddCommand(
- "bot", false, "show bot", "show bot ",
+ "bot", false, "show bot", "show bot ",
"Shows the detailed status and settings of a particular bot.", HandleShowBotStatus);
m_bots = new List();
@@ -489,83 +491,114 @@ namespace pCampBot
private void HandleAddBehaviour(string module, string[] cmd)
{
- if (cmd.Length != 4)
+ if (cmd.Length < 3 || cmd.Length > 4)
{
- MainConsole.Instance.OutputFormat("Usage: add behaviour ");
+ MainConsole.Instance.OutputFormat("Usage: add behaviour []");
return;
}
string rawBehaviours = cmd[2];
- int botNumber;
-
- if (!ConsoleUtil.TryParseConsoleNaturalInt(MainConsole.Instance, cmd[3], out botNumber))
- return;
- Bot bot = GetBotFromNumber(botNumber);
+ List botsToEffect = new List();
- if (bot == null)
+ if (cmd.Length == 3)
{
- MainConsole.Instance.OutputFormat("Error: No bot found with number {0}", botNumber);
- return;
+ lock (m_bots)
+ botsToEffect.AddRange(m_bots);
}
+ else
+ {
+ int botNumber;
+ if (!ConsoleUtil.TryParseConsoleNaturalInt(MainConsole.Instance, cmd[3], out botNumber))
+ return;
+
+ Bot bot = GetBotFromNumber(botNumber);
+
+ if (bot == null)
+ {
+ MainConsole.Instance.OutputFormat("Error: No bot found with number {0}", botNumber);
+ return;
+ }
+
+ botsToEffect.Add(bot);
+ }
+
HashSet rawAbbreviatedSwitchesToAdd = new HashSet();
Array.ForEach(rawBehaviours.Split(new char[] { ',' }), b => rawAbbreviatedSwitchesToAdd.Add(b));
- List behavioursAdded = new List();
-
- foreach (IBehaviour behaviour in CreateBehavioursFromAbbreviatedNames(rawAbbreviatedSwitchesToAdd))
+ foreach (Bot bot in botsToEffect)
{
- if (bot.AddBehaviour(behaviour))
- behavioursAdded.Add(behaviour);
- }
+ List behavioursAdded = new List();
- MainConsole.Instance.OutputFormat(
- "Added behaviours {0} to bot {1}",
- string.Join(", ", behavioursAdded.ConvertAll(b => b.Name).ToArray()), bot.Name);
+ foreach (IBehaviour behaviour in CreateBehavioursFromAbbreviatedNames(rawAbbreviatedSwitchesToAdd))
+ {
+ if (bot.AddBehaviour(behaviour))
+ behavioursAdded.Add(behaviour);
+ }
+
+ MainConsole.Instance.OutputFormat(
+ "Added behaviours {0} to bot {1}",
+ string.Join(", ", behavioursAdded.ConvertAll(b => b.Name).ToArray()), bot.Name);
+ }
}
private void HandleRemoveBehaviour(string module, string[] cmd)
{
- if (cmd.Length != 4)
+ if (cmd.Length < 3 || cmd.Length > 4)
{
- MainConsole.Instance.OutputFormat("Usage: remove behaviour ");
+ MainConsole.Instance.OutputFormat("Usage: remove behaviour []");
return;
}
string rawBehaviours = cmd[2];
- int botNumber;
-
- if (!ConsoleUtil.TryParseConsoleNaturalInt(MainConsole.Instance, cmd[3], out botNumber))
- return;
- Bot bot = GetBotFromNumber(botNumber);
+ List botsToEffect = new List();
- if (bot == null)
+ if (cmd.Length == 3)
{
- MainConsole.Instance.OutputFormat("Error: No bot found with number {0}", botNumber);
- return;
+ lock (m_bots)
+ botsToEffect.AddRange(m_bots);
}
+ else
+ {
+ int botNumber;
+ if (!ConsoleUtil.TryParseConsoleNaturalInt(MainConsole.Instance, cmd[3], out botNumber))
+ return;
- HashSet abbreviatedBehavioursToRemove = new HashSet();
- List behavioursRemoved = new List();
+ Bot bot = GetBotFromNumber(botNumber);
+
+ if (bot == null)
+ {
+ MainConsole.Instance.OutputFormat("Error: No bot found with number {0}", botNumber);
+ return;
+ }
+ botsToEffect.Add(bot);
+ }
+
+ HashSet abbreviatedBehavioursToRemove = new HashSet();
Array.ForEach(rawBehaviours.Split(new char[] { ',' }), b => abbreviatedBehavioursToRemove.Add(b));
- foreach (string b in abbreviatedBehavioursToRemove)
+ foreach (Bot bot in botsToEffect)
{
- IBehaviour behaviour;
+ List behavioursRemoved = new List();
- if (bot.TryGetBehaviour(b, out behaviour))
+ foreach (string b in abbreviatedBehavioursToRemove)
{
- bot.RemoveBehaviour(b);
- behavioursRemoved.Add(behaviour);
+ IBehaviour behaviour;
+
+ if (bot.TryGetBehaviour(b, out behaviour))
+ {
+ bot.RemoveBehaviour(b);
+ behavioursRemoved.Add(behaviour);
+ }
}
- }
- MainConsole.Instance.OutputFormat(
- "Removed behaviours {0} to bot {1}",
- string.Join(", ", behavioursRemoved.ConvertAll(b => b.Name).ToArray()), bot.Name);
+ MainConsole.Instance.OutputFormat(
+ "Removed behaviours {0} to bot {1}",
+ string.Join(", ", behavioursRemoved.ConvertAll(b => b.Name).ToArray()), bot.Name);
+ }
}
private void HandleDisconnect(string module, string[] cmd)
--
cgit v1.1
From b781a23c445bea0fd199eb756ebf6143959256a6 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 3 Sep 2013 19:58:27 +0100
Subject: In pCampbot PhysicsBehaviour.Close(), only cancel jumping if bot is
connected
---
OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Tools')
diff --git a/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs
index 65a7c90..6fd2b7c 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs
@@ -80,7 +80,8 @@ namespace pCampBot
public override void Close()
{
- Bot.Client.Self.Jump(false);
+ if (Bot.ConnectionState == ConnectionState.Connected)
+ Bot.Client.Self.Jump(false);
}
private string[] readexcuses()
--
cgit v1.1