ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 17:55:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add IncomingPacketsProcessedCount stat for diagnostics.

Browse Source 
Also puts some packet processing counts in a container named after the scene so that stats can be collected from more than one scene.
This commit is contained in:
Justin Clark-Casey (justincc)
2012-11-15 01:14:18 +00:00
parent 35fd4474b2
commit 2c36106675
2 changed files with 97 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
View File

@@ -60,16 +60,16 @@ namespace OpenMetaverse
/// <summary>Flag to process packets asynchronously or synchronously</summary>
private bool m_asyncPacketHandling;
/// <summary>
/// Pool to use for handling data. May be null if UsePools = false;
/// </summary>
protected OpenSim.Framework.Pool<UDPPacketBuffer> m_pool;
/// <summary>
/// Are we to use object pool(s) to reduce memory churn when receiving data?
/// </summary>
public bool UsePools { get; protected set; }
/// <summary>
/// Pool to use for handling data. May be null if UsePools = false;
/// </summary>
protected OpenSim.Framework.Pool<UDPPacketBuffer> Pool { get; private set; }
/// <summary>Returns true if the server is currently listening for inbound packets, otherwise false</summary>
public bool IsRunningInbound { get; private set; }
@@ -77,8 +77,6 @@ namespace OpenMetaverse
/// <remarks>If IsRunningOut = false, then any request to send a packet is simply dropped.</remarks>
public bool IsRunningOutbound { get; private set; }
private Stat m_poolCountStat;
/// <summary>
/// Default constructor
/// </summary>
@@ -182,21 +180,7 @@ namespace OpenMetaverse
{
if (!UsePools)
{
m_pool = new Pool<UDPPacketBuffer>(() => new UDPPacketBuffer(), 500);
m_poolCountStat
= new Stat(
"UDPPacketBufferPoolCount",
"Objects within the UDPPacketBuffer pool",
"The number of objects currently stored within the UDPPacketBuffer pool",
"",
"clientstack",
"packetpool",
StatType.Pull,
stat => stat.Value = m_pool.Count,
StatVerbosity.Debug);
StatsManager.RegisterStat(m_poolCountStat);
Pool = new Pool<UDPPacketBuffer>(() => new UDPPacketBuffer(), 500);
UsePools = true;
@@ -211,7 +195,6 @@ namespace OpenMetaverse
if (UsePools)
{
UsePools = false;
StatsManager.DeregisterStat(m_poolCountStat);
// We won't null out the pool to avoid a race condition with code that may be in the middle of using it.
@@ -226,7 +209,7 @@ namespace OpenMetaverse
UDPPacketBuffer buf;
if (UsePools)
buf = m_pool.GetObject();
buf = Pool.GetObject();
else
buf = new UDPPacketBuffer();
@@ -309,7 +292,7 @@ namespace OpenMetaverse
finally
{
if (UsePools)
m_pool.ReturnObject(buffer);
Pool.ReturnObject(buffer);
// Synchronous mode waits until the packet callback completes
// before starting the receive to fetch another packet