mirror of
https://github.com/opensim/opensim.git
synced 2026-05-15 03:15:41 +08:00
This is to avoid logging a 'slow' request when the source of delay is the viewer in processing a response. This is not something we can do much about on the server end - it's server-side delay that we're interested in. To ensure consistency, this commit also had to refactor and simplify inbound non-poll network request handling, though there should be no functional change. IOSHttpResponse no longer exposes the Send() method, only classes in OpenSim.Framework.Servers.HttpServer should be doing this. Only the GetTextureHandler was sending its own response. Now it leaves this to BaseHttpServer, like all other core handlers.
166 lines
6.2 KiB
C#
166 lines
6.2 KiB
C#
/*
|
|
* Copyright (c) Contributors, http://opensimulator.org/
|
|
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are met:
|
|
* * Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* * Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* * Neither the name of the OpenSimulator Project nor the
|
|
* names of its contributors may be used to endorse or promote products
|
|
* derived from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
|
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
|
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
using System;
|
|
using System.Collections;
|
|
using System.Collections.Generic;
|
|
using System.IO;
|
|
using System.Text;
|
|
using HttpServer;
|
|
using OpenMetaverse;
|
|
using System.Reflection;
|
|
using log4net;
|
|
|
|
namespace OpenSim.Framework.Servers.HttpServer
|
|
{
|
|
public delegate void ReQueuePollServiceItem(PollServiceHttpRequest req);
|
|
|
|
public class PollServiceWorkerThread
|
|
{
|
|
private static readonly ILog m_log =
|
|
LogManager.GetLogger(
|
|
MethodBase.GetCurrentMethod().DeclaringType);
|
|
|
|
public event ReQueuePollServiceItem ReQueue;
|
|
|
|
private readonly BaseHttpServer m_server;
|
|
private BlockingQueue<PollServiceHttpRequest> m_request;
|
|
private bool m_running = true;
|
|
private int m_timeout = 250;
|
|
|
|
public PollServiceWorkerThread(BaseHttpServer pSrv, int pTimeout)
|
|
{
|
|
m_request = new BlockingQueue<PollServiceHttpRequest>();
|
|
m_server = pSrv;
|
|
m_timeout = pTimeout;
|
|
}
|
|
|
|
public void ThreadStart()
|
|
{
|
|
Run();
|
|
}
|
|
|
|
public void Run()
|
|
{
|
|
while (m_running)
|
|
{
|
|
PollServiceHttpRequest req = m_request.Dequeue();
|
|
|
|
Watchdog.UpdateThread();
|
|
|
|
try
|
|
{
|
|
if (req.PollServiceArgs.HasEvents(req.RequestID, req.PollServiceArgs.Id))
|
|
{
|
|
StreamReader str;
|
|
try
|
|
{
|
|
str = new StreamReader(req.Request.Body);
|
|
}
|
|
catch (System.ArgumentException)
|
|
{
|
|
// Stream was not readable means a child agent
|
|
// was closed due to logout, leaving the
|
|
// Event Queue request orphaned.
|
|
continue;
|
|
}
|
|
|
|
Hashtable responsedata = req.PollServiceArgs.GetEvents(req.RequestID, req.PollServiceArgs.Id, str.ReadToEnd());
|
|
DoHTTPGruntWork(m_server, req, responsedata);
|
|
}
|
|
else
|
|
{
|
|
if ((Environment.TickCount - req.RequestTime) > m_timeout)
|
|
{
|
|
DoHTTPGruntWork(
|
|
m_server,
|
|
req,
|
|
req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id));
|
|
}
|
|
else
|
|
{
|
|
ReQueuePollServiceItem reQueueItem = ReQueue;
|
|
if (reQueueItem != null)
|
|
reQueueItem(req);
|
|
}
|
|
}
|
|
}
|
|
catch (Exception e)
|
|
{
|
|
m_log.ErrorFormat("Exception in poll service thread: " + e.ToString());
|
|
}
|
|
}
|
|
}
|
|
|
|
internal void Enqueue(PollServiceHttpRequest pPollServiceHttpRequest)
|
|
{
|
|
m_request.Enqueue(pPollServiceHttpRequest);
|
|
}
|
|
|
|
/// <summary>
|
|
/// FIXME: This should be part of BaseHttpServer
|
|
/// </summary>
|
|
internal static void DoHTTPGruntWork(BaseHttpServer server, PollServiceHttpRequest req, Hashtable responsedata)
|
|
{
|
|
OSHttpResponse response
|
|
= new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request), req.HttpContext);
|
|
|
|
byte[] buffer
|
|
= server.DoHTTPGruntWork(
|
|
responsedata, new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request), req.HttpContext));
|
|
|
|
response.SendChunked = false;
|
|
response.ContentLength64 = buffer.Length;
|
|
response.ContentEncoding = Encoding.UTF8;
|
|
|
|
try
|
|
{
|
|
response.OutputStream.Write(buffer, 0, buffer.Length);
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
m_log.Warn(string.Format("[POLL SERVICE WORKER THREAD]: Error ", ex));
|
|
}
|
|
finally
|
|
{
|
|
//response.OutputStream.Close();
|
|
try
|
|
{
|
|
response.OutputStream.Flush();
|
|
response.Send();
|
|
|
|
//if (!response.KeepAlive && response.ReuseContext)
|
|
// response.FreeContext();
|
|
}
|
|
catch (Exception e)
|
|
{
|
|
m_log.Warn(String.Format("[POLL SERVICE WORKER THREAD]: Error ", e));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
} |