From 8efe4bfc2ed7086e9fdf4812297e6525f955f6ac Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 29 Jul 2013 23:18:29 +0100
Subject: Make "abnormal thread terminations" into
"ClientLogoutsDueToNoReceives" and add this to the StatsManager
This reflects the actual use of this stat - it hasn't recorded general exceptions for some time.
Make the sim extra stats collector draw the data from the stats manager rather than maintaing this data itself.
---
.../Region/ClientStack/Linden/UDP/LLUDPServer.cs | 26 +++++++++++++++++-----
1 file changed, 21 insertions(+), 5 deletions(-)
(limited to 'OpenSim/Region/ClientStack')
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 25e10be..9e6a401 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -69,9 +69,22 @@ namespace OpenSim.Region.ClientStack.LindenUDP
StatsManager.RegisterStat(
new Stat(
+ "ClientLogoutsDueToNoReceives",
+ "Number of times a client has been logged out because no packets were received before the timeout.",
+ "",
+ "",
+ "clientstack",
+ scene.Name,
+ StatType.Pull,
+ MeasuresOfInterest.None,
+ stat => stat.Value = m_udpServer.ClientLogoutsDueToNoReceives,
+ StatVerbosity.Debug));
+
+ StatsManager.RegisterStat(
+ new Stat(
"IncomingUDPReceivesCount",
"Number of UDP receives performed",
- "Number of UDP receives performed",
+ "",
"",
"clientstack",
scene.Name,
@@ -84,7 +97,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
new Stat(
"IncomingPacketsProcessedCount",
"Number of inbound LL protocol packets processed",
- "Number of inbound LL protocol packets processed",
+ "",
"",
"clientstack",
scene.Name,
@@ -97,7 +110,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
new Stat(
"OutgoingUDPSendsCount",
"Number of UDP sends performed",
- "Number of UDP sends performed",
+ "",
"",
"clientstack",
scene.Name,
@@ -149,6 +162,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// Maximum transmission unit, or UDP packet size, for the LLUDP protocol
public const int MTU = 1400;
+ /// Number of forced client logouts due to no receipt of packets before timeout.
+ public int ClientLogoutsDueToNoReceives { get; private set; }
+
///
/// Default packet debug level given to new clients
///
@@ -1037,7 +1053,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
timeoutTicks = m_pausedAckTimeout;
if (client.IsActive &&
- (Environment.TickCount & Int32.MaxValue) - udpClient.TickLastPacketReceived > timeoutTicks)
+ (Environment.TickCount & Int32.MaxValue) - udpClient.TickLastPacketReceived > -1)
{
// We must set IsActive synchronously so that we can stop the packet loop reinvoking this method, even
// though it's set later on by LLClientView.Close()
@@ -1778,7 +1794,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
"[LLUDPSERVER]: Ack timeout, disconnecting {0} agent for {1} in {2}",
client.SceneAgent.IsChildAgent ? "child" : "root", client.Name, m_scene.RegionInfo.RegionName);
- StatsManager.SimExtraStats.AddAbnormalClientThreadTermination();
+ ClientLogoutsDueToNoReceives++;
if (!client.SceneAgent.IsChildAgent)
client.Kick("Simulator logged you out due to connection timeout");
--
cgit v1.1
From 8004e6f31cb03abc9b6170622099879ccaf5570b Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 29 Jul 2013 23:38:54 +0100
Subject: Fix issue just introduced in 8efe4bfc2ed7086e9fdf4812297e6525f955f6ac
where I accidentally left in a test line to force very quick client unack
---
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Region/ClientStack')
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 9e6a401..bf50868 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1053,7 +1053,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
timeoutTicks = m_pausedAckTimeout;
if (client.IsActive &&
- (Environment.TickCount & Int32.MaxValue) - udpClient.TickLastPacketReceived > -1)
+ (Environment.TickCount & Int32.MaxValue) - udpClient.TickLastPacketReceived > timeoutTicks)
{
// We must set IsActive synchronously so that we can stop the packet loop reinvoking this method, even
// though it's set later on by LLClientView.Close()
--
cgit v1.1
From 1416c909326d89566cbe785b6dacac228e31a5a0 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 29 Jul 2013 23:53:59 +0100
Subject: minor: Add timeout secs to connection timeout message. Change
message to reflect it is a timeout due to no data received rather than an ack
issue.
---
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
(limited to 'OpenSim/Region/ClientStack')
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index bf50868..85fe1a4 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1062,7 +1062,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// Fire this out on a different thread so that we don't hold up outgoing packet processing for
// everybody else if this is being called due to an ack timeout.
// This is the same as processing as the async process of a logout request.
- Util.FireAndForget(o => DeactivateClientDueToTimeout(client));
+ Util.FireAndForget(o => DeactivateClientDueToTimeout(client, timeoutTicks));
return;
}
@@ -1786,18 +1786,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// regular client pings.
///
///
- private void DeactivateClientDueToTimeout(LLClientView client)
+ ///
+ private void DeactivateClientDueToTimeout(LLClientView client, int timeoutTicks)
{
lock (client.CloseSyncLock)
- {
- m_log.WarnFormat(
- "[LLUDPSERVER]: Ack timeout, disconnecting {0} agent for {1} in {2}",
- client.SceneAgent.IsChildAgent ? "child" : "root", client.Name, m_scene.RegionInfo.RegionName);
-
+ {
ClientLogoutsDueToNoReceives++;
+
+ m_log.WarnFormat(
+ "[LLUDPSERVER]: No packets received from {0} agent of {1} for {2}ms in {3}. Disconnecting.",
+ client.SceneAgent.IsChildAgent ? "child" : "root", client.Name, timeoutTicks, m_scene.Name);
if (!client.SceneAgent.IsChildAgent)
- client.Kick("Simulator logged you out due to connection timeout");
+ client.Kick("Simulator logged you out due to connection timeout.");
client.CloseWithoutChecks();
}
--
cgit v1.1
From 2b5419927143667048bddf0a501e42c093a71147 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 30 Jul 2013 17:26:56 -0700
Subject: After talking to lkalif on the IRC: SimulatorFeatures response:
renamed the OSDMap GridServices to OpenSimExtras, normalized the url keys
under it, and moved ExportEnabled to under it too. Melanie: change your
viewer code accordingly. Documentation at
http://opensimulator.org/wiki/SimulatorFeatures_Extras
---
.../ClientStack/Linden/Caps/SimulatorFeaturesModule.cs | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
(limited to 'OpenSim/Region/ClientStack')
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
index 7d9f935..4bd17b1 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
@@ -149,15 +149,16 @@ namespace OpenSim.Region.ClientStack.Linden
m_features["PhysicsShapeTypes"] = typesMap;
// Extra information for viewers that want to use it
- OSDMap gridServicesMap = new OSDMap();
+ OSDMap extrasMap = new OSDMap();
if (m_MapImageServerURL != string.Empty)
- gridServicesMap["map-server-url"] = m_MapImageServerURL;
+ extrasMap["map-server-url"] = m_MapImageServerURL;
if (m_SearchURL != string.Empty)
- gridServicesMap["search"] = m_SearchURL;
- m_features["GridServices"] = gridServicesMap;
-
+ extrasMap["search-server-url"] = m_SearchURL;
if (m_ExportSupported)
- m_features["ExportSupported"] = true;
+ extrasMap["ExportSupported"] = true;
+ if (extrasMap.Count > 0)
+ m_features["OpenSimExtras"] = extrasMap;
+
}
}
--
cgit v1.1
From fd050fca7caef83d72d00241d0c0db5c1ec5d1ff Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 30 Jul 2013 21:10:00 -0700
Subject: Doing the HG Map / SimulatorFeatures "the right way": moved it to
HGMapModule, hooking on to SimulatorFeatures.OnSimulatorFeaturesRequest event
(similar to what the DynamicMenuModule does). Only HG Visitors get this var,
to avoid spamming local users. The config var is now called MapTileURL, to
be consistent with the login one, and its being picked up from either
[LoginService], [HGWorldMap] or [SimulatorFeatures], just because I have a
bad memory.
---
.../ClientStack/Linden/Caps/SimulatorFeaturesModule.cs | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
(limited to 'OpenSim/Region/ClientStack')
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
index 4bd17b1..e4d8a20 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
@@ -68,7 +68,6 @@ namespace OpenSim.Region.ClientStack.Linden
///
private OSDMap m_features = new OSDMap();
- private string m_MapImageServerURL = string.Empty;
private string m_SearchURL = string.Empty;
private bool m_ExportSupported = false;
@@ -78,15 +77,7 @@ namespace OpenSim.Region.ClientStack.Linden
{
IConfig config = source.Configs["SimulatorFeatures"];
if (config != null)
- {
- m_MapImageServerURL = config.GetString("MapImageServerURI", string.Empty);
- if (m_MapImageServerURL != string.Empty)
- {
- m_MapImageServerURL = m_MapImageServerURL.Trim();
- if (!m_MapImageServerURL.EndsWith("/"))
- m_MapImageServerURL = m_MapImageServerURL + "/";
- }
-
+ {
m_SearchURL = config.GetString("SearchServerURI", string.Empty);
m_ExportSupported = config.GetBoolean("ExportSupported", m_ExportSupported);
@@ -149,13 +140,13 @@ namespace OpenSim.Region.ClientStack.Linden
m_features["PhysicsShapeTypes"] = typesMap;
// Extra information for viewers that want to use it
+ // TODO: Take these out of here into their respective modules, like map-server-url
OSDMap extrasMap = new OSDMap();
- if (m_MapImageServerURL != string.Empty)
- extrasMap["map-server-url"] = m_MapImageServerURL;
if (m_SearchURL != string.Empty)
extrasMap["search-server-url"] = m_SearchURL;
if (m_ExportSupported)
extrasMap["ExportSupported"] = true;
+
if (extrasMap.Count > 0)
m_features["OpenSimExtras"] = extrasMap;
--
cgit v1.1
From 12995924052a1804f01dceb80803447fccc1d9fe Mon Sep 17 00:00:00 2001
From: Mic Bowman
Date: Wed, 31 Jul 2013 15:37:15 -0700
Subject: Experimental comment to eneralize the handling of Linden caps when
the cap is something other than "localhost". A new interface for handling
external caps is supported with an example implemented for Simian. The only
linden cap supporting this interface right now is the GetTexture cap.
---
OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Region/ClientStack')
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
index 13415f8..54cf285 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
@@ -137,7 +137,11 @@ namespace OpenSim.Region.ClientStack.Linden
else
{
// m_log.DebugFormat("[GETTEXTURE]: {0} in region {1}", m_URL, m_scene.RegionInfo.RegionName);
- caps.RegisterHandler("GetTexture", m_URL);
+ IExternalCapsModule handler = m_scene.RequestModuleInterface();
+ if (handler != null)
+ handler.RegisterExternalUserCapsHandler(agentID,caps,"GetTexture",m_URL);
+ else
+ caps.RegisterHandler("GetTexture", m_URL);
}
}
--
cgit v1.1