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

simplify a bit

0.9.1.0-post-fixes
UbitUmarov 2018-12-02 00:41:01 +00:00
parent 9cb0c51483
commit 7a4d8017d7
1 changed files with 4 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
View File

@ -401,16 +401,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// </summary> /// </summary>
public int IncomingOrphanedPacketCount { get; protected set; } public int IncomingOrphanedPacketCount { get; protected set; }
/// <summary>
/// Record current outgoing client for monitoring purposes.
/// </summary>
protected IClientAPI m_currentOutgoingClient;
/// <summary>
/// Recording current incoming client for monitoring purposes.
/// </summary>
protected IClientAPI m_currentIncomingClient;
/// <summary> /// <summary>
/// Queue some low priority but potentially high volume async requests so that they don't overwhelm available /// Queue some low priority but potentially high volume async requests so that they don't overwhelm available
/// threadpool threads. /// threadpool threads.
@ -548,7 +538,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
ThreadPriority.Normal, ThreadPriority.Normal,
true, true,
true, true,
GetWatchdogIncomingAlarmData, null,
Watchdog.DEFAULT_WATCHDOG_TIMEOUT_MS); Watchdog.DEFAULT_WATCHDOG_TIMEOUT_MS);
} }
@ -564,7 +554,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
ThreadPriority.Normal, ThreadPriority.Normal,
true, true,
true, true,
GetWatchdogOutgoingAlarmData, null,
Watchdog.DEFAULT_WATCHDOG_TIMEOUT_MS); Watchdog.DEFAULT_WATCHDOG_TIMEOUT_MS);
} }
@ -654,27 +644,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
m_incomingPacketPoolStat = null; m_incomingPacketPoolStat = null;
} }
/// <summary> /// <summary>
/// If the outgoing UDP thread times out, then return client that was being processed to help with debugging. /// If the outgoing UDP thread times out, then return client that was being processed to help with debugging.
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
protected string GetWatchdogIncomingAlarmData()
{
return string.Format(
"Client is {0}",
m_currentIncomingClient != null ? m_currentIncomingClient.Name : "none");
}
/// <summary>
/// If the outgoing UDP thread times out, then return client that was being processed to help with debugging.
/// </summary>
/// <returns></returns>
protected string GetWatchdogOutgoingAlarmData()
{
return string.Format(
"Client is {0}",
m_currentOutgoingClient != null ? m_currentOutgoingClient.Name : "none");
}
public void AddScene(IScene scene) public void AddScene(IScene scene)
{ {
@ -2106,8 +2079,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// client. m_packetSent will be set to true if a packet is sent // client. m_packetSent will be set to true if a packet is sent
Scene.ForEachClient(clientPacketHandler); Scene.ForEachClient(clientPacketHandler);
m_currentOutgoingClient = null;
// If nothing was sent, sleep for the minimum amount of time before a // If nothing was sent, sleep for the minimum amount of time before a
// token bucket could get more tokens // token bucket could get more tokens
@ -2132,8 +2103,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
protected void ClientOutgoingPacketHandler(IClientAPI client) protected void ClientOutgoingPacketHandler(IClientAPI client)
{ {
m_currentOutgoingClient = client;
try try
{ {
if (client is LLClientView) if (client is LLClientView)
@ -2163,6 +2132,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
m_log.Error( m_log.Error(
string.Format("[LLUDPSERVER]: OutgoingPacketHandler iteration for {0} threw ", client.Name), ex); string.Format("[LLUDPSERVER]: OutgoingPacketHandler iteration for {0} threw ", client.Name), ex);
} }
client = null;
} }
#region Emergency Monitoring #region Emergency Monitoring
@ -2198,8 +2168,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if(!client.IsActive) if(!client.IsActive)
return; return;
m_currentIncomingClient = client;
try try
{ {
// Process this packet // Process this packet
@ -2220,10 +2188,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
client.Name,packet.Type), client.Name,packet.Type),
e); e);
} }
finally
{
m_currentIncomingClient = null;
}
IncomingPacketsProcessed++; IncomingPacketsProcessed++;
} }