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

commenting out rather expensive bits of GetClientInfo() --- the only 

bit of GetClientInfo that is actually used seems to be userEP as part of the
OSSL osGetAgentIP() script function. Now commented are the parts where
we serialize and copy out the *entire* packet queue of the client
(locking the packet handler in the process).
0.6.6-post-fixes
Dr Scofield 2009-06-25 07:59:38 +00:00
parent 77122d7861
commit fa060a7282
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
View File

@ -638,22 +638,29 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public ClientInfo GetClientInfo() public ClientInfo GetClientInfo()
{ {
ClientInfo info = new ClientInfo(); ClientInfo info = new ClientInfo();
info.pendingAcks = m_PendingAcks;
info.needAck = new Dictionary<uint, byte[]>();
lock (m_NeedAck) // nobody seems to even look at the following data. since
{ // it's a rather expensive operation (lock, serializing
foreach (uint key in m_NeedAck.Keys) // packets, copying it into dictionary, etc) i've
info.needAck.Add(key, m_NeedAck[key].Packet.ToBytes()); // commented out the expensive (but unwanted?) bits below
} // (dr scofield, 2009-06-24)
LLQueItem[] queitems = m_PacketQueue.GetQueueArray(); // info.pendingAcks = m_PendingAcks;
// info.needAck = new Dictionary<uint, byte[]>();
for (int i = 0; i < queitems.Length; i++) // lock (m_NeedAck)
{ // {
if (queitems[i].Incoming == false) // foreach (uint key in m_NeedAck.Keys)
info.out_packets.Add(queitems[i].Packet.ToBytes()); // info.needAck.Add(key, m_NeedAck[key].Packet.ToBytes());
} // }
// LLQueItem[] queitems = m_PacketQueue.GetQueueArray();
// for (int i = 0; i < queitems.Length; i++)
// {
// if (queitems[i].Incoming == false)
// info.out_packets.Add(queitems[i].Packet.ToBytes());
// }
info.sequence = m_Sequence; info.sequence = m_Sequence;