diff options
author | Justin Clark-Casey (justincc) | 2014-11-04 00:55:48 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-11-25 23:23:10 +0000 |
commit | ec8d21c434a39f46518ee9cf9f5539d1790eacc0 (patch) | |
tree | 2aa340fb34c6f6e8e8f2e31c2034b5841307a7bf /OpenSim/Region/ClientStack | |
parent | Add "show threadpool calls" command to show count of all labelled smartthread... (diff) | |
download | opensim-SC-ec8d21c434a39f46518ee9cf9f5539d1790eacc0.zip opensim-SC-ec8d21c434a39f46518ee9cf9f5539d1790eacc0.tar.gz opensim-SC-ec8d21c434a39f46518ee9cf9f5539d1790eacc0.tar.bz2 opensim-SC-ec8d21c434a39f46518ee9cf9f5539d1790eacc0.tar.xz |
Label all threadpool calls being made in core OpenSimulator. This is to add problem diagnosis.
"show threadpool calls" now also returns named (labelled), anonymous (unlabelled) and total call stats.
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 9 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 8 |
3 files changed, 11 insertions, 8 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index c8c00c8..516327c 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -1161,7 +1161,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1161 | /// <param name="map">heightmap</param> | 1161 | /// <param name="map">heightmap</param> |
1162 | public virtual void SendLayerData(float[] map) | 1162 | public virtual void SendLayerData(float[] map) |
1163 | { | 1163 | { |
1164 | Util.FireAndForget(DoSendLayerData, m_scene.Heightmap.GetTerrainData()); | 1164 | Util.FireAndForget(DoSendLayerData, m_scene.Heightmap.GetTerrainData(), "LLClientView.DoSendLayerData"); |
1165 | } | 1165 | } |
1166 | 1166 | ||
1167 | /// <summary> | 1167 | /// <summary> |
@@ -1373,7 +1373,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1373 | /// <param name="windSpeeds">16x16 array of wind speeds</param> | 1373 | /// <param name="windSpeeds">16x16 array of wind speeds</param> |
1374 | public virtual void SendWindData(Vector2[] windSpeeds) | 1374 | public virtual void SendWindData(Vector2[] windSpeeds) |
1375 | { | 1375 | { |
1376 | Util.FireAndForget(DoSendWindData, windSpeeds); | 1376 | Util.FireAndForget(DoSendWindData, windSpeeds, "LLClientView.SendWindData"); |
1377 | } | 1377 | } |
1378 | 1378 | ||
1379 | /// <summary> | 1379 | /// <summary> |
@@ -1382,7 +1382,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1382 | /// <param name="windSpeeds">16x16 array of cloud densities</param> | 1382 | /// <param name="windSpeeds">16x16 array of cloud densities</param> |
1383 | public virtual void SendCloudData(float[] cloudDensity) | 1383 | public virtual void SendCloudData(float[] cloudDensity) |
1384 | { | 1384 | { |
1385 | Util.FireAndForget(DoSendCloudData, cloudDensity); | 1385 | Util.FireAndForget(DoSendCloudData, cloudDensity, "LLClientView.SendCloudData"); |
1386 | } | 1386 | } |
1387 | 1387 | ||
1388 | /// <summary> | 1388 | /// <summary> |
@@ -8093,7 +8093,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
8093 | { | 8093 | { |
8094 | // This requests the asset if needed | 8094 | // This requests the asset if needed |
8095 | HandleSimInventoryTransferRequestWithPermsCheck(sender, transfer); | 8095 | HandleSimInventoryTransferRequestWithPermsCheck(sender, transfer); |
8096 | }); | 8096 | }, null, "LLClientView.HandleTransferRequest"); |
8097 | |||
8097 | return true; | 8098 | return true; |
8098 | } | 8099 | } |
8099 | } | 8100 | } |
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs index b70d861..8f14806 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs | |||
@@ -732,7 +732,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
732 | if (!m_udpServer.OqrEngine.IsRunning) | 732 | if (!m_udpServer.OqrEngine.IsRunning) |
733 | { | 733 | { |
734 | // Asynchronously run the callback | 734 | // Asynchronously run the callback |
735 | Util.FireAndForget(FireQueueEmpty, categories); | 735 | Util.FireAndForget(FireQueueEmpty, categories, "LLUDPClient.BeginFireQueueEmpty"); |
736 | } | 736 | } |
737 | else | 737 | else |
738 | { | 738 | { |
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs index aa10301..61e1d6a 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | |||
@@ -991,7 +991,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
991 | // Fire this out on a different thread so that we don't hold up outgoing packet processing for | 991 | // Fire this out on a different thread so that we don't hold up outgoing packet processing for |
992 | // everybody else if this is being called due to an ack timeout. | 992 | // everybody else if this is being called due to an ack timeout. |
993 | // This is the same as processing as the async process of a logout request. | 993 | // This is the same as processing as the async process of a logout request. |
994 | Util.FireAndForget(o => DeactivateClientDueToTimeout(client, timeoutTicks)); | 994 | Util.FireAndForget( |
995 | o => DeactivateClientDueToTimeout(client, timeoutTicks), null, "LLUDPServer.DeactivateClientDueToTimeout"); | ||
995 | 996 | ||
996 | return; | 997 | return; |
997 | } | 998 | } |
@@ -1225,7 +1226,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1225 | // buffer. | 1226 | // buffer. |
1226 | object[] array = new object[] { new IPEndPoint(endPoint.Address, endPoint.Port), packet }; | 1227 | object[] array = new object[] { new IPEndPoint(endPoint.Address, endPoint.Port), packet }; |
1227 | 1228 | ||
1228 | Util.FireAndForget(HandleUseCircuitCode, array); | 1229 | Util.FireAndForget(HandleUseCircuitCode, array, "LLUDPServer.HandleUseCircuitCode"); |
1229 | 1230 | ||
1230 | return; | 1231 | return; |
1231 | } | 1232 | } |
@@ -1238,7 +1239,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1238 | // buffer. | 1239 | // buffer. |
1239 | object[] array = new object[] { new IPEndPoint(endPoint.Address, endPoint.Port), packet }; | 1240 | object[] array = new object[] { new IPEndPoint(endPoint.Address, endPoint.Port), packet }; |
1240 | 1241 | ||
1241 | Util.FireAndForget(HandleCompleteMovementIntoRegion, array); | 1242 | Util.FireAndForget( |
1243 | HandleCompleteMovementIntoRegion, array, "LLUDPServer.HandleCompleteMovementIntoRegion"); | ||
1242 | 1244 | ||
1243 | return; | 1245 | return; |
1244 | } | 1246 | } |