mirror of
https://github.com/opensim/opensim.git
synced 2026-08-01 06:06:06 +08:00
replace GetMeshModule and GetTextureModule
This commit is contained in:
@@ -47,20 +47,23 @@ using Caps = OpenSim.Framework.Capabilities.Caps;
|
||||
|
||||
namespace OpenSim.Region.ClientStack.Linden
|
||||
{
|
||||
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "GetMeshModule")]
|
||||
public class GetMeshModule : INonSharedRegionModule
|
||||
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "GetAssetsModule")]
|
||||
public class GetAssetsModule : INonSharedRegionModule
|
||||
{
|
||||
// private static readonly ILog m_log =
|
||||
// LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
||||
|
||||
private Scene m_scene;
|
||||
private bool m_Enabled = true;
|
||||
private string m_URL;
|
||||
private string m_URL2;
|
||||
private bool m_Enabled;
|
||||
|
||||
private string m_GetTextureURL;
|
||||
private string m_GetMeshURL;
|
||||
private string m_GetMesh2URL;
|
||||
private string m_GetAssetURL;
|
||||
|
||||
class APollRequest
|
||||
{
|
||||
public PollServiceMeshEventArgs thepoll;
|
||||
public PollServiceAssetEventArgs thepoll;
|
||||
public UUID reqID;
|
||||
public Hashtable request;
|
||||
}
|
||||
@@ -73,15 +76,17 @@ namespace OpenSim.Region.ClientStack.Linden
|
||||
|
||||
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
||||
|
||||
private static GetMeshHandler m_getMeshHandler;
|
||||
|
||||
private IAssetService m_assetService = null;
|
||||
|
||||
private Dictionary<UUID, string> m_capsDict = new Dictionary<UUID, string>();
|
||||
private Dictionary<UUID, string> m_capsDict2 = new Dictionary<UUID, string>();
|
||||
private static IAssetService m_assetService = null;
|
||||
private static GetAssetsHandler m_getAssetHandler;
|
||||
private static Thread[] m_workerThreads = null;
|
||||
private static int m_NumberScenes = 0;
|
||||
private static BlockingCollection<APollRequest> m_queue = new BlockingCollection<APollRequest>();
|
||||
private static object m_loadLock = new object();
|
||||
|
||||
private Dictionary<UUID, string> m_capsDictTexture = new Dictionary<UUID, string>();
|
||||
private Dictionary<UUID, string> m_capsDictGetMesh = new Dictionary<UUID, string>();
|
||||
private Dictionary<UUID, string> m_capsDictGetMesh2 = new Dictionary<UUID, string>();
|
||||
private Dictionary<UUID, string> m_capsDictGetAsset = new Dictionary<UUID, string>();
|
||||
|
||||
#region Region Module interfaceBase Members
|
||||
|
||||
@@ -96,14 +101,20 @@ namespace OpenSim.Region.ClientStack.Linden
|
||||
if (config == null)
|
||||
return;
|
||||
|
||||
m_URL = config.GetString("Cap_GetMesh", string.Empty);
|
||||
// Cap doesn't exist
|
||||
if (m_URL != string.Empty)
|
||||
m_GetTextureURL = config.GetString("Cap_GetTexture", string.Empty);
|
||||
if (m_GetTextureURL != string.Empty)
|
||||
m_Enabled = true;
|
||||
|
||||
m_URL2 = config.GetString("Cap_GetMesh2", string.Empty);
|
||||
// Cap doesn't exist
|
||||
if (m_URL2 != string.Empty)
|
||||
m_GetMeshURL = config.GetString("Cap_GetMesh", string.Empty);
|
||||
if (m_GetMeshURL != string.Empty)
|
||||
m_Enabled = true;
|
||||
|
||||
m_GetMesh2URL = config.GetString("Cap_GetMesh2", string.Empty);
|
||||
if (m_GetMesh2URL != string.Empty)
|
||||
m_Enabled = true;
|
||||
|
||||
m_GetAssetURL = config.GetString("Cap_GetAsset", string.Empty);
|
||||
if (m_GetAssetURL != string.Empty)
|
||||
m_Enabled = true;
|
||||
}
|
||||
|
||||
@@ -131,37 +142,39 @@ namespace OpenSim.Region.ClientStack.Linden
|
||||
if (!m_Enabled)
|
||||
return;
|
||||
|
||||
if(m_assetService == null)
|
||||
lock(m_loadLock)
|
||||
{
|
||||
m_assetService = m_scene.RequestModuleInterface<IAssetService>();
|
||||
// We'll reuse the same handler for all requests.
|
||||
if(m_assetService == null)
|
||||
if (m_assetService == null && m_NumberScenes == 0)
|
||||
{
|
||||
m_assetService = s.RequestModuleInterface<IAssetService>();
|
||||
// We'll reuse the same handler for all requests.
|
||||
m_getAssetHandler = new GetAssetsHandler(m_assetService);
|
||||
}
|
||||
|
||||
if (m_assetService == null)
|
||||
{
|
||||
m_Enabled = false;
|
||||
return;
|
||||
}
|
||||
|
||||
m_getMeshHandler = new GetMeshHandler(m_assetService);
|
||||
}
|
||||
s.EventManager.OnRegisterCaps += RegisterCaps;
|
||||
s.EventManager.OnDeregisterCaps += DeregisterCaps;
|
||||
|
||||
s.EventManager.OnRegisterCaps += RegisterCaps;
|
||||
s.EventManager.OnDeregisterCaps += DeregisterCaps;
|
||||
m_NumberScenes++;
|
||||
|
||||
m_NumberScenes++;
|
||||
|
||||
if (m_workerThreads == null)
|
||||
{
|
||||
m_workerThreads = new Thread[2];
|
||||
|
||||
for (uint i = 0; i < 2; i++)
|
||||
if (m_workerThreads == null)
|
||||
{
|
||||
m_workerThreads[i] = WorkManager.StartThread(DoMeshRequests,
|
||||
String.Format("GetMeshWorker{0}", i),
|
||||
ThreadPriority.Normal,
|
||||
true,
|
||||
false,
|
||||
null,
|
||||
int.MaxValue);
|
||||
m_workerThreads = new Thread[3];
|
||||
for (uint i = 0; i < 3; i++)
|
||||
{
|
||||
m_workerThreads[i] = WorkManager.StartThread(DoAssetRequests,
|
||||
String.Format("GetAssetWorker{0}", i),
|
||||
ThreadPriority.Normal,
|
||||
true,
|
||||
false,
|
||||
null,
|
||||
int.MaxValue);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -170,7 +183,7 @@ namespace OpenSim.Region.ClientStack.Linden
|
||||
{
|
||||
if(m_NumberScenes <= 0 && m_workerThreads != null)
|
||||
{
|
||||
m_log.DebugFormat("[GetMeshModule] Closing");
|
||||
m_log.DebugFormat("[GetAssetsModule] Closing");
|
||||
foreach (Thread t in m_workerThreads)
|
||||
Watchdog.AbortThread(t.ManagedThreadId);
|
||||
// This will fail on region shutdown. Its harmless.
|
||||
@@ -183,38 +196,36 @@ namespace OpenSim.Region.ClientStack.Linden
|
||||
}
|
||||
}
|
||||
|
||||
public string Name { get { return "GetMeshModule"; } }
|
||||
public string Name { get { return "GetAssetsModule"; } }
|
||||
|
||||
#endregion
|
||||
|
||||
private static void DoMeshRequests()
|
||||
private static void DoAssetRequests()
|
||||
{
|
||||
while (m_NumberScenes > 0)
|
||||
{
|
||||
APollRequest poolreq;
|
||||
if(m_queue.TryTake(out poolreq, 4500))
|
||||
{
|
||||
if(m_NumberScenes <= 0)
|
||||
if (m_NumberScenes <= 0)
|
||||
break;
|
||||
|
||||
if(poolreq.reqID != UUID.Zero)
|
||||
Watchdog.UpdateThread();
|
||||
if (poolreq.reqID != UUID.Zero)
|
||||
poolreq.thepoll.Process(poolreq);
|
||||
}
|
||||
Watchdog.UpdateThread();
|
||||
Watchdog.UpdateThread();
|
||||
}
|
||||
}
|
||||
|
||||
private class PollServiceMeshEventArgs : PollServiceEventArgs
|
||||
private class PollServiceAssetEventArgs : PollServiceEventArgs
|
||||
{
|
||||
private List<Hashtable> requests =
|
||||
new List<Hashtable>();
|
||||
private Dictionary<UUID, APollResponse> responses =
|
||||
new Dictionary<UUID, APollResponse>();
|
||||
private List<Hashtable> requests = new List<Hashtable>();
|
||||
private Dictionary<UUID, APollResponse> responses =new Dictionary<UUID, APollResponse>();
|
||||
private HashSet<UUID> dropedResponses = new HashSet<UUID>();
|
||||
|
||||
private Scene m_scene;
|
||||
private ScenePresence m_presence;
|
||||
public PollServiceMeshEventArgs(string uri, UUID pId, Scene scene) :
|
||||
public PollServiceAssetEventArgs(string uri, UUID pId, Scene scene) :
|
||||
base(null, uri, null, null, null, null, pId, int.MaxValue)
|
||||
{
|
||||
m_scene = scene;
|
||||
@@ -326,7 +337,7 @@ namespace OpenSim.Region.ClientStack.Linden
|
||||
}
|
||||
}
|
||||
|
||||
curresponse = m_getMeshHandler.Handle(requestinfo.request);
|
||||
curresponse = m_getAssetHandler.Handle(requestinfo.request);
|
||||
|
||||
lock(responses)
|
||||
{
|
||||
@@ -360,48 +371,108 @@ namespace OpenSim.Region.ClientStack.Linden
|
||||
protocol = "https";
|
||||
}
|
||||
|
||||
if (m_URL == "localhost")
|
||||
string baseURL = String.Format("{0}://{1}:{2}", protocol, hostName, port);
|
||||
|
||||
if (m_GetTextureURL == "localhost")
|
||||
{
|
||||
string capUrl = "/CAPS/" + UUID.Random() + "/";
|
||||
|
||||
// Register this as a poll service
|
||||
PollServiceMeshEventArgs args = new PollServiceMeshEventArgs(capUrl, agentID, m_scene);
|
||||
args.Type = PollServiceEventArgs.EventType.Mesh;
|
||||
PollServiceAssetEventArgs args = new PollServiceAssetEventArgs(capUrl, agentID, m_scene);
|
||||
|
||||
args.Type = PollServiceEventArgs.EventType.Texture;
|
||||
MainServer.Instance.AddPollServiceHTTPHandler(capUrl, args);
|
||||
|
||||
caps.RegisterHandler("GetMesh", String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, capUrl));
|
||||
m_capsDict[agentID] = capUrl;
|
||||
IExternalCapsModule handler = m_scene.RequestModuleInterface<IExternalCapsModule>();
|
||||
if (handler != null)
|
||||
handler.RegisterExternalUserCapsHandler(agentID, caps, "GetTexture", capUrl);
|
||||
else
|
||||
caps.RegisterHandler("GetTexture", baseURL + capUrl);
|
||||
m_capsDictTexture[agentID] = capUrl;
|
||||
}
|
||||
else
|
||||
{
|
||||
caps.RegisterHandler("GetTexture", m_GetTextureURL);
|
||||
}
|
||||
else if (m_URL != string.Empty)
|
||||
caps.RegisterHandler("GetMesh", m_URL);
|
||||
|
||||
if (m_URL2 == "localhost")
|
||||
//GetMesh
|
||||
if (m_GetMeshURL == "localhost")
|
||||
{
|
||||
string capUrl = "/CAPS/" + UUID.Random() + "/";
|
||||
|
||||
// Register this as a poll service
|
||||
PollServiceMeshEventArgs args = new PollServiceMeshEventArgs(capUrl, agentID, m_scene);
|
||||
PollServiceAssetEventArgs args = new PollServiceAssetEventArgs(capUrl, agentID, m_scene);
|
||||
args.Type = PollServiceEventArgs.EventType.Mesh;
|
||||
MainServer.Instance.AddPollServiceHTTPHandler(capUrl, args);
|
||||
caps.RegisterHandler("GetMesh2", String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, capUrl));
|
||||
m_capsDict2[agentID] = capUrl;
|
||||
|
||||
IExternalCapsModule handler = m_scene.RequestModuleInterface<IExternalCapsModule>();
|
||||
if (handler != null)
|
||||
handler.RegisterExternalUserCapsHandler(agentID, caps, "GetMesh", capUrl);
|
||||
else
|
||||
caps.RegisterHandler("GetMesh", baseURL + capUrl);
|
||||
m_capsDictGetMesh[agentID] = capUrl;
|
||||
}
|
||||
else if(m_URL2 != string.Empty)
|
||||
caps.RegisterHandler("GetMesh2", m_URL2);
|
||||
else if (m_GetMeshURL != string.Empty)
|
||||
caps.RegisterHandler("GetMesh", m_GetMeshURL);
|
||||
|
||||
//GetMesh2
|
||||
if (m_GetMesh2URL == "localhost")
|
||||
{
|
||||
string capUrl = "/CAPS/" + UUID.Random() + "/";
|
||||
|
||||
PollServiceAssetEventArgs args = new PollServiceAssetEventArgs(capUrl, agentID, m_scene);
|
||||
args.Type = PollServiceEventArgs.EventType.Mesh2;
|
||||
MainServer.Instance.AddPollServiceHTTPHandler(capUrl, args);
|
||||
IExternalCapsModule handler = m_scene.RequestModuleInterface<IExternalCapsModule>();
|
||||
if (handler != null)
|
||||
handler.RegisterExternalUserCapsHandler(agentID, caps, "GetMesh2", capUrl);
|
||||
else
|
||||
caps.RegisterHandler("GetMesh2", baseURL + capUrl);
|
||||
m_capsDictGetMesh2[agentID] = capUrl;
|
||||
}
|
||||
else if (m_GetMesh2URL != string.Empty)
|
||||
caps.RegisterHandler("GetMesh2", m_GetMesh2URL);
|
||||
|
||||
//ViewerAsset
|
||||
if (m_GetAssetURL == "localhost")
|
||||
{
|
||||
string capUrl = "/CAPS/" + UUID.Random() + "/";
|
||||
|
||||
PollServiceAssetEventArgs args = new PollServiceAssetEventArgs(capUrl, agentID, m_scene);
|
||||
args.Type = PollServiceEventArgs.EventType.Asset;
|
||||
MainServer.Instance.AddPollServiceHTTPHandler(capUrl, args);
|
||||
IExternalCapsModule handler = m_scene.RequestModuleInterface<IExternalCapsModule>();
|
||||
if (handler != null)
|
||||
handler.RegisterExternalUserCapsHandler(agentID, caps, "ViewerAsset", capUrl);
|
||||
else
|
||||
caps.RegisterHandler("ViewerAsset", baseURL + capUrl);
|
||||
m_capsDictGetAsset[agentID] = capUrl;
|
||||
}
|
||||
else if (m_GetAssetURL != string.Empty)
|
||||
caps.RegisterHandler("ViewerAsset", m_GetMesh2URL);
|
||||
}
|
||||
|
||||
private void DeregisterCaps(UUID agentID, Caps caps)
|
||||
{
|
||||
string capUrl;
|
||||
if (m_capsDict.TryGetValue(agentID, out capUrl))
|
||||
{
|
||||
MainServer.Instance.RemovePollServiceHTTPHandler("", capUrl);
|
||||
m_capsDict.Remove(agentID);
|
||||
}
|
||||
if (m_capsDict2.TryGetValue(agentID, out capUrl))
|
||||
if (m_capsDictTexture.TryGetValue(agentID, out capUrl))
|
||||
{
|
||||
MainServer.Instance.RemovePollServiceHTTPHandler("", capUrl);
|
||||
m_capsDict2.Remove(agentID);
|
||||
m_capsDictTexture.Remove(agentID);
|
||||
}
|
||||
if (m_capsDictGetMesh.TryGetValue(agentID, out capUrl))
|
||||
{
|
||||
MainServer.Instance.RemovePollServiceHTTPHandler("", capUrl);
|
||||
m_capsDictGetMesh.Remove(agentID);
|
||||
}
|
||||
if (m_capsDictGetMesh2.TryGetValue(agentID, out capUrl))
|
||||
{
|
||||
MainServer.Instance.RemovePollServiceHTTPHandler("", capUrl);
|
||||
m_capsDictGetMesh2.Remove(agentID);
|
||||
}
|
||||
if (m_capsDictGetAsset.TryGetValue(agentID, out capUrl))
|
||||
{
|
||||
MainServer.Instance.RemovePollServiceHTTPHandler("", capUrl);
|
||||
m_capsDictGetAsset.Remove(agentID);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,406 +0,0 @@
|
||||
/*
|
||||
* 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.Collections.Concurrent;
|
||||
using System.Reflection;
|
||||
using System.Threading;
|
||||
using log4net;
|
||||
using Nini.Config;
|
||||
using Mono.Addins;
|
||||
using OpenMetaverse;
|
||||
using OpenSim.Framework;
|
||||
using OpenSim.Framework.Servers;
|
||||
using OpenSim.Framework.Servers.HttpServer;
|
||||
using OpenSim.Region.Framework.Interfaces;
|
||||
using OpenSim.Region.Framework.Scenes;
|
||||
using OpenSim.Services.Interfaces;
|
||||
using Caps = OpenSim.Framework.Capabilities.Caps;
|
||||
using OpenSim.Capabilities.Handlers;
|
||||
using OpenSim.Framework.Monitoring;
|
||||
|
||||
namespace OpenSim.Region.ClientStack.Linden
|
||||
{
|
||||
|
||||
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "GetTextureModule")]
|
||||
public class GetTextureModule : INonSharedRegionModule
|
||||
{
|
||||
|
||||
class APollRequest
|
||||
{
|
||||
public PollServiceTextureEventArgs thepoll;
|
||||
public UUID reqID;
|
||||
public Hashtable request;
|
||||
public bool send503;
|
||||
}
|
||||
|
||||
public class APollResponse
|
||||
{
|
||||
public Hashtable response;
|
||||
public int bytes;
|
||||
}
|
||||
|
||||
|
||||
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
||||
|
||||
private Scene m_scene;
|
||||
|
||||
private static GetTextureHandler m_getTextureHandler;
|
||||
|
||||
private IAssetService m_assetService = null;
|
||||
|
||||
private Dictionary<UUID, string> m_capsDict = new Dictionary<UUID, string>();
|
||||
private static Thread[] m_workerThreads = null;
|
||||
private static int m_NumberScenes = 0;
|
||||
private static BlockingCollection<APollRequest> m_queue = new BlockingCollection<APollRequest>();
|
||||
|
||||
private Dictionary<UUID,PollServiceTextureEventArgs> m_pollservices = new Dictionary<UUID,PollServiceTextureEventArgs>();
|
||||
|
||||
private string m_Url = "localhost";
|
||||
|
||||
#region ISharedRegionModule Members
|
||||
|
||||
public void Initialise(IConfigSource source)
|
||||
{
|
||||
IConfig config = source.Configs["ClientStack.LindenCaps"];
|
||||
|
||||
if (config == null)
|
||||
return;
|
||||
/*
|
||||
m_URL = config.GetString("Cap_GetTexture", string.Empty);
|
||||
// Cap doesn't exist
|
||||
if (m_URL != string.Empty)
|
||||
{
|
||||
m_Enabled = true;
|
||||
m_RedirectURL = config.GetString("GetTextureRedirectURL");
|
||||
}
|
||||
*/
|
||||
m_Url = config.GetString("Cap_GetTexture", "localhost");
|
||||
}
|
||||
|
||||
public void AddRegion(Scene s)
|
||||
{
|
||||
m_scene = s;
|
||||
}
|
||||
|
||||
public void RemoveRegion(Scene s)
|
||||
{
|
||||
s.EventManager.OnRegisterCaps -= RegisterCaps;
|
||||
s.EventManager.OnDeregisterCaps -= DeregisterCaps;
|
||||
m_NumberScenes--;
|
||||
m_scene = null;
|
||||
}
|
||||
|
||||
public void RegionLoaded(Scene s)
|
||||
{
|
||||
if(m_assetService == null)
|
||||
{
|
||||
m_assetService = s.RequestModuleInterface<IAssetService>();
|
||||
// We'll reuse the same handler for all requests.
|
||||
m_getTextureHandler = new GetTextureHandler(m_assetService);
|
||||
}
|
||||
|
||||
s.EventManager.OnRegisterCaps += RegisterCaps;
|
||||
s.EventManager.OnDeregisterCaps += DeregisterCaps;
|
||||
|
||||
m_NumberScenes++;
|
||||
|
||||
if (m_workerThreads == null)
|
||||
{
|
||||
m_workerThreads = new Thread[2];
|
||||
|
||||
for (uint i = 0; i < 2; i++)
|
||||
{
|
||||
m_workerThreads[i] = WorkManager.StartThread(DoTextureRequests,
|
||||
String.Format("GetTextureWorker{0}", i),
|
||||
ThreadPriority.Normal,
|
||||
true,
|
||||
false,
|
||||
null,
|
||||
int.MaxValue);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void PostInitialise()
|
||||
{
|
||||
}
|
||||
|
||||
public void Close()
|
||||
{
|
||||
if(m_NumberScenes <= 0 && m_workerThreads != null)
|
||||
{
|
||||
m_log.DebugFormat("[GetTextureModule] Closing");
|
||||
|
||||
foreach (Thread t in m_workerThreads)
|
||||
Watchdog.AbortThread(t.ManagedThreadId);
|
||||
|
||||
m_queue.Dispose();
|
||||
}
|
||||
}
|
||||
|
||||
public string Name { get { return "GetTextureModule"; } }
|
||||
|
||||
public Type ReplaceableInterface
|
||||
{
|
||||
get { return null; }
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
private class PollServiceTextureEventArgs : PollServiceEventArgs
|
||||
{
|
||||
private List<Hashtable> requests =
|
||||
new List<Hashtable>();
|
||||
private Dictionary<UUID, APollResponse> responses =
|
||||
new Dictionary<UUID, APollResponse>();
|
||||
private HashSet<UUID> dropedResponses = new HashSet<UUID>();
|
||||
|
||||
private Scene m_scene;
|
||||
private ScenePresence m_presence;
|
||||
public PollServiceTextureEventArgs(UUID pId, Scene scene) :
|
||||
base(null, "", null, null, null, null, pId, int.MaxValue)
|
||||
{
|
||||
m_scene = scene;
|
||||
// x is request id, y is userid
|
||||
HasEvents = (x, y) =>
|
||||
{
|
||||
lock (responses)
|
||||
{
|
||||
APollResponse response;
|
||||
if (responses.TryGetValue(x, out response))
|
||||
{
|
||||
if (m_presence == null)
|
||||
m_presence = m_scene.GetScenePresence(pId);
|
||||
|
||||
if (m_presence == null || m_presence.IsDeleted)
|
||||
return true;
|
||||
return m_presence.CapCanSendAsset(0, response.bytes);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
Drop = (x, y) =>
|
||||
{
|
||||
lock (responses)
|
||||
{
|
||||
responses.Remove(x);
|
||||
dropedResponses.Add(x);
|
||||
}
|
||||
};
|
||||
|
||||
GetEvents = (x, y) =>
|
||||
{
|
||||
lock (responses)
|
||||
{
|
||||
try
|
||||
{
|
||||
return responses[x].response;
|
||||
}
|
||||
finally
|
||||
{
|
||||
responses.Remove(x);
|
||||
}
|
||||
}
|
||||
};
|
||||
// x is request id, y is request data hashtable
|
||||
Request = (x, y) =>
|
||||
{
|
||||
APollRequest reqinfo = new APollRequest();
|
||||
reqinfo.thepoll = this;
|
||||
reqinfo.reqID = x;
|
||||
reqinfo.request = y;
|
||||
reqinfo.send503 = false;
|
||||
|
||||
lock (responses)
|
||||
{
|
||||
if (responses.Count > 0 && m_queue.Count > 32)
|
||||
reqinfo.send503 = true;
|
||||
}
|
||||
|
||||
m_queue.Add(reqinfo);
|
||||
};
|
||||
|
||||
// this should never happen except possible on shutdown
|
||||
NoEvents = (x, y) =>
|
||||
{
|
||||
/*
|
||||
lock (requests)
|
||||
{
|
||||
Hashtable request = requests.Find(id => id["RequestID"].ToString() == x.ToString());
|
||||
requests.Remove(request);
|
||||
}
|
||||
*/
|
||||
Hashtable response = new Hashtable();
|
||||
|
||||
response["int_response_code"] = 500;
|
||||
response["str_response_string"] = "timeout";
|
||||
response["content_type"] = "text/plain";
|
||||
response["keepalive"] = false;
|
||||
return response;
|
||||
};
|
||||
}
|
||||
|
||||
public void Process(APollRequest requestinfo)
|
||||
{
|
||||
Hashtable response;
|
||||
|
||||
UUID requestID = requestinfo.reqID;
|
||||
|
||||
if(m_scene.ShuttingDown)
|
||||
return;
|
||||
|
||||
lock (responses)
|
||||
{
|
||||
lock(dropedResponses)
|
||||
{
|
||||
if(dropedResponses.Contains(requestID))
|
||||
{
|
||||
dropedResponses.Remove(requestID);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (m_presence == null)
|
||||
m_presence = m_scene.GetScenePresence(Id);
|
||||
|
||||
if (m_presence == null || m_presence.IsDeleted)
|
||||
requestinfo.send503 = true;
|
||||
|
||||
if (requestinfo.send503)
|
||||
{
|
||||
response = new Hashtable();
|
||||
|
||||
response["int_response_code"] = 503;
|
||||
response["str_response_string"] = "Throttled";
|
||||
response["content_type"] = "text/plain";
|
||||
response["keepalive"] = false;
|
||||
|
||||
Hashtable headers = new Hashtable();
|
||||
headers["Retry-After"] = 20;
|
||||
response["headers"] = headers;
|
||||
|
||||
responses[requestID] = new APollResponse() { bytes = 0, response = response };
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
response = m_getTextureHandler.Handle(requestinfo.request);
|
||||
|
||||
lock (responses)
|
||||
{
|
||||
lock(dropedResponses)
|
||||
{
|
||||
if(dropedResponses.Contains(requestID))
|
||||
{
|
||||
dropedResponses.Remove(requestID);
|
||||
return;
|
||||
}
|
||||
}
|
||||
responses[requestID] = new APollResponse()
|
||||
{
|
||||
bytes = (int) response["int_bytes"],
|
||||
response = response
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void RegisterCaps(UUID agentID, Caps caps)
|
||||
{
|
||||
if (m_Url == "localhost")
|
||||
{
|
||||
string capUrl = "/CAPS/" + UUID.Random() + "/";
|
||||
|
||||
// Register this as a poll service
|
||||
PollServiceTextureEventArgs args = new PollServiceTextureEventArgs(agentID, m_scene);
|
||||
|
||||
args.Type = PollServiceEventArgs.EventType.Texture;
|
||||
MainServer.Instance.AddPollServiceHTTPHandler(capUrl, args);
|
||||
|
||||
string hostName = m_scene.RegionInfo.ExternalHostName;
|
||||
uint port = (MainServer.Instance == null) ? 0 : MainServer.Instance.Port;
|
||||
string protocol = "http";
|
||||
|
||||
if (MainServer.Instance.UseSSL)
|
||||
{
|
||||
hostName = MainServer.Instance.SSLCommonName;
|
||||
port = MainServer.Instance.SSLPort;
|
||||
protocol = "https";
|
||||
}
|
||||
IExternalCapsModule handler = m_scene.RequestModuleInterface<IExternalCapsModule>();
|
||||
if (handler != null)
|
||||
handler.RegisterExternalUserCapsHandler(agentID, caps, "GetTexture", capUrl);
|
||||
else
|
||||
caps.RegisterHandler("GetTexture", String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, capUrl));
|
||||
m_pollservices[agentID] = args;
|
||||
m_capsDict[agentID] = capUrl;
|
||||
}
|
||||
else
|
||||
{
|
||||
caps.RegisterHandler("GetTexture", m_Url);
|
||||
}
|
||||
}
|
||||
|
||||
private void DeregisterCaps(UUID agentID, Caps caps)
|
||||
{
|
||||
PollServiceTextureEventArgs args;
|
||||
|
||||
MainServer.Instance.RemoveHTTPHandler("", m_Url);
|
||||
m_capsDict.Remove(agentID);
|
||||
|
||||
if (m_pollservices.TryGetValue(agentID, out args))
|
||||
{
|
||||
m_pollservices.Remove(agentID);
|
||||
}
|
||||
}
|
||||
|
||||
private static void DoTextureRequests()
|
||||
{
|
||||
APollRequest poolreq;
|
||||
while (m_NumberScenes > 0)
|
||||
{
|
||||
poolreq = null;
|
||||
if(!m_queue.TryTake(out poolreq, 4500) || poolreq == null)
|
||||
{
|
||||
Watchdog.UpdateThread();
|
||||
continue;
|
||||
}
|
||||
|
||||
if(m_NumberScenes <= 0)
|
||||
break;
|
||||
|
||||
Watchdog.UpdateThread();
|
||||
if(poolreq.reqID != UUID.Zero)
|
||||
poolreq.thepoll.Process(poolreq);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -398,22 +398,13 @@ namespace OpenSim.Region.ClientStack.Linden
|
||||
while (true)
|
||||
{
|
||||
APollRequest poolreq;
|
||||
if (!m_queue.TryTake(out poolreq, 4500) || poolreq == null || poolreq.thepoll == null)
|
||||
if (m_queue.TryTake(out poolreq, 4500))
|
||||
{
|
||||
Watchdog.UpdateThread();
|
||||
continue;
|
||||
if (poolreq.thepoll != null)
|
||||
poolreq.thepoll.Process(poolreq);
|
||||
}
|
||||
|
||||
Watchdog.UpdateThread();
|
||||
try
|
||||
{
|
||||
poolreq.thepoll.Process(poolreq);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
m_log.ErrorFormat(
|
||||
"[INVENTORY]: Failed to process queued inventory Exception {0}", e.Message);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user