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

Merge branch 'ubitwork' into avination

avinationmerge
Melanie 2012-09-10 01:50:41 +02:00
parent afb4e06f63 a7250c6ea1
commit 761bf8c1eb
2 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
View File

@ -1618,7 +1618,8 @@ namespace OpenSim.Framework.Servers.HttpServer
m_httpListener2.Start(64); m_httpListener2.Start(64);
// Long Poll Service Manager with 3 worker threads a 25 second timeout for no events // Long Poll Service Manager with 3 worker threads a 25 second timeout for no events
m_PollServiceManager = new PollServiceRequestManager(this, 3, 25000); // m_PollServiceManager = new PollServiceRequestManager(this, 3, 25000);
m_PollServiceManager = new PollServiceRequestManager(this, 4, 25000);
HTTPDRunning = true; HTTPDRunning = true;
//HttpListenerContext context; //HttpListenerContext context;

43
OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
View File

@ -60,11 +60,12 @@ namespace OpenSim.Region.ClientStack.Linden
private WebFetchInvDescHandler m_webFetchHandler; private WebFetchInvDescHandler m_webFetchHandler;
private ManualResetEvent m_ev = new ManualResetEvent(true); // private ManualResetEvent m_ev = new ManualResetEvent(true);
private object m_lock = new object(); private object m_lock = new object();
private Dictionary<UUID, string> m_capsDict = new Dictionary<UUID, string>(); private Dictionary<UUID, string> m_capsDict = new Dictionary<UUID, string>();
private Dictionary<UUID, Hashtable> m_requests = new Dictionary<UUID, Hashtable>(); private Dictionary<UUID, Hashtable> m_requests = new Dictionary<UUID, Hashtable>();
bool m_busy = false;
#region ISharedRegionModule Members #region ISharedRegionModule Members
@ -116,7 +117,9 @@ namespace OpenSim.Region.ClientStack.Linden
string capUrl = "/CAPS/" + UUID.Random() + "/"; string capUrl = "/CAPS/" + UUID.Random() + "/";
// Register this as a poll service // Register this as a poll service
// absurd large timeout to tune later to make a bit less than viewer
PollServiceEventArgs args = new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, agentID, 300000); PollServiceEventArgs args = new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, agentID, 300000);
args.Type = PollServiceEventArgs.EventType.Inventory; args.Type = PollServiceEventArgs.EventType.Inventory;
MainServer.Instance.AddPollServiceHTTPHandler(capUrl, args); MainServer.Instance.AddPollServiceHTTPHandler(capUrl, args);
@ -133,6 +136,8 @@ namespace OpenSim.Region.ClientStack.Linden
caps.RegisterHandler("FetchInventoryDescendents2", String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, capUrl)); caps.RegisterHandler("FetchInventoryDescendents2", String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, capUrl));
m_capsDict[agentID] = capUrl; m_capsDict[agentID] = capUrl;
m_busy = false;
} }
private void DeregisterCaps(UUID agentID, Caps caps) private void DeregisterCaps(UUID agentID, Caps caps)
@ -149,25 +154,30 @@ namespace OpenSim.Region.ClientStack.Linden
public void HttpRequestHandler(UUID requestID, Hashtable request) public void HttpRequestHandler(UUID requestID, Hashtable request)
{ {
// m_log.DebugFormat("[FETCH2]: Received request {0}", requestID); // m_log.DebugFormat("[FETCH2]: Received request {0}", requestID);
m_requests[requestID] = request; lock(m_lock)
m_requests[requestID] = request;
} }
private bool HasEvents(UUID requestID, UUID sessionID) private bool HasEvents(UUID requestID, UUID sessionID)
{ {
lock (m_lock) lock (m_lock)
{ {
/*
if (m_ev.WaitOne(0)) if (m_ev.WaitOne(0))
{ {
m_ev.Reset(); m_ev.Reset();
return true; return true;
} }
return false; return false;
*/
return !m_busy;
} }
} }
private Hashtable NoEvents(UUID requestID, UUID sessionID) private Hashtable NoEvents(UUID requestID, UUID sessionID)
{ {
m_requests.Remove(requestID); lock(m_lock)
m_requests.Remove(requestID);
Hashtable response = new Hashtable(); Hashtable response = new Hashtable();
@ -177,11 +187,17 @@ namespace OpenSim.Region.ClientStack.Linden
response["keepalive"] = false; response["keepalive"] = false;
response["reusecontext"] = false; response["reusecontext"] = false;
lock (m_lock)
m_busy = false;
return response; return response;
} }
private Hashtable GetEvents(UUID requestID, UUID sessionID, string request) private Hashtable GetEvents(UUID requestID, UUID sessionID, string request)
{ {
lock (m_lock)
m_busy = true;
Hashtable response = new Hashtable(); Hashtable response = new Hashtable();
response["int_response_code"] = 500; response["int_response_code"] = 500;
@ -192,20 +208,24 @@ namespace OpenSim.Region.ClientStack.Linden
try try
{ {
Hashtable requestHash; Hashtable requestHash;
if (!m_requests.TryGetValue(requestID, out requestHash)) lock (m_lock)
{ {
lock (m_lock) if (!m_requests.TryGetValue(requestID, out requestHash))
m_ev.Set(); {
response["str_response_string"] = "Invalid request"; m_busy = false;
return response; // m_ev.Set();
response["str_response_string"] = "Invalid request";
return response;
}
m_requests.Remove(requestID);
} }
// m_log.DebugFormat("[FETCH2]: Processed request {0}", requestID); // m_log.DebugFormat("[FETCH2]: Processed request {0}", requestID);
string reply = m_webFetchHandler.FetchInventoryDescendentsRequest(requestHash["body"].ToString(), String.Empty, String.Empty, null, null); string reply = m_webFetchHandler.FetchInventoryDescendentsRequest(requestHash["body"].ToString(), String.Empty, String.Empty, null, null);
m_requests.Remove(requestID);
response["int_response_code"] = 200; response["int_response_code"] = 200;
response["str_response_string"] = reply; response["str_response_string"] = reply;
@ -213,7 +233,8 @@ namespace OpenSim.Region.ClientStack.Linden
finally finally
{ {
lock (m_lock) lock (m_lock)
m_ev.Set(); // m_ev.Set();
m_busy = false;
} }
return response; return response;