From ade107f04f42f448d0a7b34ae552cf54c3bf4f7e Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Mon, 12 Jan 2009 19:37:56 +0000
Subject: * Separate starting a client thread into a separate Start() method
(which matches the existing Stop() and Restart() methods)
---
OpenSim/Framework/IClientAPI.cs | 30 ++++++++++++++--------
.../Region/ClientStack/LindenUDP/LLClientView.cs | 21 ++++++++-------
.../Region/ClientStack/LindenUDP/LLPacketServer.cs | 2 ++
.../Environment/Modules/World/NPC/NPCAvatar.cs | 4 +++
.../Region/Examples/SimpleModule/MyNpcCharacter.cs | 4 +++
OpenSim/Tests/Common/Mock/TestClient.cs | 4 +++
6 files changed, 46 insertions(+), 19 deletions(-)
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index cb60028..0d44abd 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -527,6 +527,9 @@ namespace OpenSim.Framework
/// </summary>
string Name { get; }
+ /// <value>
+ /// Determines whether the client thread is doing anything or not.
+ /// </value>
bool IsActive { get; set; }
bool SendLogoutPacketWhenClosing { set; }
@@ -749,6 +752,23 @@ namespace OpenSim.Framework
event UserInfoRequest OnUserInfoRequest;
event UpdateUserInfo OnUpdateUserInfo;
+
+ /// <summary>
+ /// Set the debug level at which packet output should be printed to console.
+ /// </summary>
+ void SetDebugPacketLevel(int newDebug);
+
+ void InPacket(object NewPack);
+ void ProcessInPacket(Packet NewPack);
+ void Close(bool ShutdownCircuit);
+ void Kick(string message);
+
+ /// <summary>
+ /// Start processing for this client.
+ /// </summary>
+ void Start();
+
+ void Stop();
// void ActivateGesture(UUID assetId, UUID gestureId);
@@ -1034,16 +1054,6 @@ namespace OpenSim.Framework
byte[] GetThrottlesPacked(float multiplier);
- /// <summary>
- /// Set the debug level at which packet output should be printed to console.
- /// </summary>
- void SetDebugPacketLevel(int newDebug);
-
- void InPacket(object NewPack);
- void ProcessInPacket(Packet NewPack);
- void Close(bool ShutdownCircuit);
- void Kick(string message);
- void Stop();
event ViewerEffectEventHandler OnViewerEffect;
event Action<IClientAPI> OnLogout;
event Action<IClientAPI> OnConnectionClosed;
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 3243c2f..ebbecb7 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -471,12 +471,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
m_PacketHandler.OnPacketStats += PopulateStats;
RegisterLocalPacketHandlers();
-
- m_clientThread = new Thread(Start);
- m_clientThread.Name = "ClientThread";
- m_clientThread.IsBackground = true;
- m_clientThread.Start();
- ThreadTracker.Add(m_clientThread);
}
public void SetDebugPacketLevel(int newDebugPacketLevel)
@@ -813,11 +807,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP
RefreshGroupMembership();
}
+ public virtual void Start()
+ {
+ m_clientThread = new Thread(RunUserSession);
+ m_clientThread.Name = "ClientThread";
+ m_clientThread.IsBackground = true;
+ m_clientThread.Start();
+ ThreadTracker.Add(m_clientThread);
+ }
+
/// <summary>
- /// Start a user session. This method lies at the base of the entire client thread.
+ /// Run a user session. This method lies at the base of the entire client thread.
/// </summary>
- protected virtual void Start()
- {
+ protected virtual void RunUserSession()
+ {
//tell this thread we are using the culture set up for the sim (currently hardcoded to en_US)
//otherwise it will override this and use the system default
Culture.SetCurrentCulture();
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
index 9f8383c..2b52220 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
@@ -160,6 +160,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
newuser.OnViewerEffect += m_scene.ClientManager.ViewerEffectHandler;
newuser.OnLogout += LogoutHandler;
newuser.OnConnectionClosed += CloseClient;
+
+ newuser.Start();
return true;
}
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
index d06f35a..f0d5de2 100644
--- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
@@ -812,6 +812,10 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
{
}
+ public void Start()
+ {
+ }
+
public void Stop()
{
}
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index 5a7d42c..3710f2c 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -800,6 +800,10 @@ namespace OpenSim.Region.Examples.SimpleModule
{
}
+ public void Start()
+ {
+ }
+
public void Stop()
{
}
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 41c2eb6..a9ee837 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -757,6 +757,10 @@ namespace OpenSim.Tests.Common.Mock
{
}
+ public void Start()
+ {
+ }
+
public void Stop()
{
}
--
cgit v1.1