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

Simplify EventQueue cap setup so that it is also stat monitored. 

Curiously, the number of requests received is always one greater than that shown as handled - needs investigation
cpu-performance
Justin Clark-Casey (justincc) 2013-07-16 00:05:45 +01:00
parent eb14e5a175
commit e8e073aa97
1 changed files with 29 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
View File

@ -252,29 +252,32 @@ namespace OpenSim.Region.ClientStack.Linden
List<UUID> removeitems = new List<UUID>(); List<UUID> removeitems = new List<UUID>();
lock (m_AvatarQueueUUIDMapping) lock (m_AvatarQueueUUIDMapping)
{ m_AvatarQueueUUIDMapping.Remove(agentID);
foreach (UUID ky in m_AvatarQueueUUIDMapping.Keys)
{
// m_log.DebugFormat("[EVENTQUEUE]: Found key {0} in m_AvatarQueueUUIDMapping while looking for {1}", ky, AgentID);
if (ky == agentID)
{
removeitems.Add(ky);
}
}
foreach (UUID ky in removeitems) // lock (m_AvatarQueueUUIDMapping)
{ // {
UUID eventQueueGetUuid = m_AvatarQueueUUIDMapping[ky]; // foreach (UUID ky in m_AvatarQueueUUIDMapping.Keys)
m_AvatarQueueUUIDMapping.Remove(ky); // {
//// m_log.DebugFormat("[EVENTQUEUE]: Found key {0} in m_AvatarQueueUUIDMapping while looking for {1}", ky, AgentID);
string eqgPath = GenerateEqgCapPath(eventQueueGetUuid); // if (ky == agentID)
MainServer.Instance.RemovePollServiceHTTPHandler("", eqgPath); // {
// removeitems.Add(ky);
// m_log.DebugFormat( // }
// "[EVENT QUEUE GET MODULE]: Removed EQG handler {0} for {1} in {2}", // }
// eqgPath, agentID, m_scene.RegionInfo.RegionName); //
} // foreach (UUID ky in removeitems)
} // {
// UUID eventQueueGetUuid = m_AvatarQueueUUIDMapping[ky];
// m_AvatarQueueUUIDMapping.Remove(ky);
//
// string eqgPath = GenerateEqgCapPath(eventQueueGetUuid);
// MainServer.Instance.RemovePollServiceHTTPHandler("", eqgPath);
//
//// m_log.DebugFormat(
//// "[EVENT QUEUE GET MODULE]: Removed EQG handler {0} for {1} in {2}",
//// eqgPath, agentID, m_scene.RegionInfo.RegionName);
// }
// }
UUID searchval = UUID.Zero; UUID searchval = UUID.Zero;
@ -359,29 +362,10 @@ namespace OpenSim.Region.ClientStack.Linden
m_AvatarQueueUUIDMapping.Add(agentID, eventQueueGetUUID); m_AvatarQueueUUIDMapping.Add(agentID, eventQueueGetUUID);
} }
string eventQueueGetPath = GenerateEqgCapPath(eventQueueGetUUID); caps.RegisterPollHandler(
"EventQueueGet",
// Register this as a caps handler new PollServiceEventArgs(
// FIXME: Confusingly, we need to register separate as a capability so that the client is told about null, GenerateEqgCapPath(eventQueueGetUUID), HasEvents, GetEvents, NoEvents, agentID, 40000));
// EventQueueGet when it receive capability information, but then we replace the rest handler immediately
// afterwards with the poll service. So for now, we'll pass a null instead to simplify code reading, but
// really it should be possible to directly register the poll handler as a capability.
caps.RegisterHandler(
"EventQueueGet", new RestHTTPHandler("POST", eventQueueGetPath, null, "EventQueueGet", null));
// delegate(Hashtable m_dhttpMethod)
// {
// return ProcessQueue(m_dhttpMethod, agentID, caps);
// }));
// This will persist this beyond the expiry of the caps handlers
// TODO: Add EventQueueGet name/description for diagnostics
MainServer.Instance.AddPollServiceHTTPHandler(
eventQueueGetPath,
new PollServiceEventArgs(null, eventQueueGetPath, HasEvents, GetEvents, NoEvents, agentID, 40000));
// m_log.DebugFormat(
// "[EVENT QUEUE GET MODULE]: Registered EQG handler {0} for {1} in {2}",
// eventQueueGetPath, agentID, m_scene.RegionInfo.RegionName);
Random rnd = new Random(Environment.TickCount); Random rnd = new Random(Environment.TickCount);
lock (m_ids) lock (m_ids)