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

Add httpserver.<port>.QueuedPollResponses and httpserver.<port>.ProcessedPollResponses statistics

0.8.0.3
Justin Clark-Casey (justincc) 2014-03-18 23:47:33 +00:00
parent 9e0d419239
commit fad1d70180
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
View File

@ -58,6 +58,11 @@ namespace OpenSim.Framework.Servers.HttpServer
/// </summary> /// </summary>
public bool PerformResponsesAsync { get; private set; } public bool PerformResponsesAsync { get; private set; }
/// <summary>
/// Number of responses actually processed and sent to viewer (or aborted due to error).
/// </summary>
public int ResponsesProcessed { get; private set; }
private readonly BaseHttpServer m_server; private readonly BaseHttpServer m_server;
private BlockingQueue<PollServiceHttpRequest> m_requests = new BlockingQueue<PollServiceHttpRequest>(); private BlockingQueue<PollServiceHttpRequest> m_requests = new BlockingQueue<PollServiceHttpRequest>();
@ -81,14 +86,27 @@ namespace OpenSim.Framework.Servers.HttpServer
StatsManager.RegisterStat( StatsManager.RegisterStat(
new Stat( new Stat(
"QueuedPollResponses", "QueuedPollResponses",
"Number of poll responses queued for sending.", "Number of poll responses queued for processing.",
"", "",
"", "",
"httpserver", "httpserver",
m_server.Port.ToString(), m_server.Port.ToString(),
StatType.Pull, StatType.Pull,
MeasuresOfInterest.AverageChangeOverTime, MeasuresOfInterest.AverageChangeOverTime,
stat => m_requests.Count(), stat => stat.Value = m_requests.Count(),
StatVerbosity.Debug));
StatsManager.RegisterStat(
new Stat(
"ProcessedPollResponses",
"Number of poll responses processed.",
"",
"",
"httpserver",
m_server.Port.ToString(),
StatType.Pull,
MeasuresOfInterest.AverageChangeOverTime,
stat => stat.Value = ResponsesProcessed,
StatVerbosity.Debug)); StatVerbosity.Debug));
} }
@ -210,6 +228,7 @@ namespace OpenSim.Framework.Servers.HttpServer
try try
{ {
wreq = m_requests.Dequeue(0); wreq = m_requests.Dequeue(0);
ResponsesProcessed++;
wreq.DoHTTPGruntWork( wreq.DoHTTPGruntWork(
m_server, wreq.PollServiceArgs.NoEvents(wreq.RequestID, wreq.PollServiceArgs.Id)); m_server, wreq.PollServiceArgs.NoEvents(wreq.RequestID, wreq.PollServiceArgs.Id));
} }
@ -256,6 +275,7 @@ namespace OpenSim.Framework.Servers.HttpServer
{ {
try try
{ {
ResponsesProcessed++;
req.DoHTTPGruntWork(m_server, responsedata); req.DoHTTPGruntWork(m_server, responsedata);
} }
catch (ObjectDisposedException e) // Browser aborted before we could read body, server closed the stream catch (ObjectDisposedException e) // Browser aborted before we could read body, server closed the stream
@ -270,6 +290,7 @@ namespace OpenSim.Framework.Servers.HttpServer
{ {
try try
{ {
ResponsesProcessed++;
req.DoHTTPGruntWork(m_server, responsedata); req.DoHTTPGruntWork(m_server, responsedata);
} }
catch (ObjectDisposedException e) // Browser aborted before we could read body, server closed the stream catch (ObjectDisposedException e) // Browser aborted before we could read body, server closed the stream
@ -290,6 +311,7 @@ namespace OpenSim.Framework.Servers.HttpServer
{ {
if ((Environment.TickCount - req.RequestTime) > req.PollServiceArgs.TimeOutms) if ((Environment.TickCount - req.RequestTime) > req.PollServiceArgs.TimeOutms)
{ {
ResponsesProcessed++;
req.DoHTTPGruntWork( req.DoHTTPGruntWork(
m_server, req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id)); m_server, req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id));
} }