OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Retain a reference to an action thread rather than starting an infinite loop via a timer, so that we can actually abort the action thread on shutdown

remove-scene-viewer
Justin Clark-Casey (justincc) 2011-11-01 18:36:29 +00:00
parent b951c7fb1e
commit 87ec8a4ecb
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
OpenSim/Tools/pCampBot/PhysicsBot.cs
View File

@ -62,7 +62,11 @@ namespace pCampBot
public event AnEvent OnConnected; public event AnEvent OnConnected;
public event AnEvent OnDisconnected; public event AnEvent OnDisconnected;
protected Timer m_action; // Action Timer /// <summary>
/// Keep a track of the continuously acting thread so that we can abort it.
/// </summary>
private Thread m_actionThread;
protected List<uint> objectIDs = new List<uint>(); protected List<uint> objectIDs = new List<uint>();
protected Random somthing = new Random(Environment.TickCount);// We do stuff randomly here protected Random somthing = new Random(Environment.TickCount);// We do stuff randomly here
@ -98,8 +102,7 @@ namespace pCampBot
//We do our actions here. This is where one would //We do our actions here. This is where one would
//add additional steps and/or things the bot should do //add additional steps and/or things the bot should do
private void Action()
void m_action_Elapsed(object sender, ElapsedEventArgs e)
{ {
while (true) while (true)
{ {
@ -145,6 +148,9 @@ namespace pCampBot
/// </summary> /// </summary>
public void shutdown() public void shutdown()
{ {
if (m_actionThread != null)
m_actionThread.Abort();
client.Network.Logout(); client.Network.Logout();
} }
@ -177,11 +183,10 @@ namespace pCampBot
{ {
if (OnConnected != null) if (OnConnected != null)
{ {
m_action = new Timer(somthing.Next(1000, 10000)); Thread.Sleep(somthing.Next(1000, 10000));
m_action.Enabled = true; m_actionThread = new Thread(Action);
m_action.AutoReset = false; m_actionThread.Start();
m_action.Elapsed += new ElapsedEventHandler(m_action_Elapsed);
m_action.Start();
// OnConnected(this, EventType.CONNECTED); // OnConnected(this, EventType.CONNECTED);
if (wear == "save") if (wear == "save")
{ {
@ -386,6 +391,13 @@ namespace pCampBot
public void Network_OnDisconnected(object sender, DisconnectedEventArgs args) public void Network_OnDisconnected(object sender, DisconnectedEventArgs args)
{ {
// m_log.ErrorFormat("Fired Network_OnDisconnected"); // m_log.ErrorFormat("Fired Network_OnDisconnected");
// Only pass on the disconnect message when we receive a SimShutdown type shutdown. We have to ignore
// the earlier ClientInitiated shutdown callback.
// if (
// (args.Reason == NetworkManager.DisconnectType.SimShutdown
// || args.Reason == NetworkManager.DisconnectType.NetworkTimeout)
// && OnDisconnected != null)
if (OnDisconnected != null) if (OnDisconnected != null)
{ {
OnDisconnected(this, EventType.DISCONNECTED); OnDisconnected(this, EventType.DISCONNECTED);