ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 17:05:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Numerous packet improvements.

Browse Source 
Don't allow packets to be resent before they have actually been sent for the
first time. Switch from serializing a packet to get it's length to the LibOMV
provided Length property. Fix resend timing. Fix the use of dangling references
to Acked packets. Fix the packet handler to play nice with the packet pool.
Fix the packet pool. Add data block recycling to the packet pool. Packet pool
is now ENABLED by default. Add config option to disable packet and data block
reuse. Add ObjectUpdate and ImprovedTerseObjectUpdate to the packets being
recycled.
This commit is contained in:
Melanie Thielker
2009-05-02 13:16:41 +00:00
parent 8c97214741
commit 62bcf0e694
7 changed files with 108 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
OpenSim/Framework/PacketPool.cs
View File

@@ -41,7 +41,8 @@ namespace OpenSim.Framework
private static readonly PacketPool instance = new PacketPool();
private bool packetPoolEnabled = false;
private bool packetPoolEnabled = true;
private bool dataBlockPoolEnabled = true;
private readonly Dictionary<PacketType, Stack<Packet>> pool = new Dictionary<PacketType, Stack<Packet>>();
@@ -57,6 +58,18 @@ namespace OpenSim.Framework
get { return instance; }
}
public bool RecyclePackets
{
set { packetPoolEnabled = value; }
get { return packetPoolEnabled; }
}
public bool RecycleDataBlocks
{
set { dataBlockPoolEnabled = value; }
get { return dataBlockPoolEnabled; }
}
public Packet GetPacket(PacketType type)
{
Packet packet;
@@ -140,55 +153,58 @@ namespace OpenSim.Framework
/// <param name="packet"></param>
public void ReturnPacket(Packet packet)
{
switch (packet.Type)
if (dataBlockPoolEnabled)
{
case PacketType.ObjectUpdate:
ObjectUpdatePacket oup = (ObjectUpdatePacket)packet;
switch (packet.Type)
{
case PacketType.ObjectUpdate:
ObjectUpdatePacket oup = (ObjectUpdatePacket)packet;
foreach (ObjectUpdatePacket.ObjectDataBlock oupod in
oup.ObjectData)
ReturnDataBlock<ObjectUpdatePacket.ObjectDataBlock>(oupod);
oup.ObjectData = null;
break;
foreach (ObjectUpdatePacket.ObjectDataBlock oupod in
oup.ObjectData)
ReturnDataBlock<ObjectUpdatePacket.ObjectDataBlock>(oupod);
oup.ObjectData = null;
break;
case PacketType.ImprovedTerseObjectUpdate:
ImprovedTerseObjectUpdatePacket itoup =
(ImprovedTerseObjectUpdatePacket)packet;
case PacketType.ImprovedTerseObjectUpdate:
ImprovedTerseObjectUpdatePacket itoup =
(ImprovedTerseObjectUpdatePacket)packet;
foreach (ImprovedTerseObjectUpdatePacket.ObjectDataBlock
itoupod in itoup.ObjectData)
ReturnDataBlock<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>(itoupod);
itoup.ObjectData = null;
break;
foreach (ImprovedTerseObjectUpdatePacket.ObjectDataBlock
itoupod in itoup.ObjectData)
ReturnDataBlock<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>(itoupod);
itoup.ObjectData = null;
break;
}
}
if (!packetPoolEnabled)
return;
switch (packet.Type)
if (packetPoolEnabled)
{
// List pooling packets here
case PacketType.PacketAck:
case PacketType.ObjectUpdate:
case PacketType.ImprovedTerseObjectUpdate:
lock (pool)
{
PacketType type = packet.Type;
switch (packet.Type)
{
// List pooling packets here
case PacketType.PacketAck:
case PacketType.ObjectUpdate:
case PacketType.ImprovedTerseObjectUpdate:
lock (pool)
{
PacketType type = packet.Type;
if (!pool.ContainsKey(type))
{
pool[type] = new Stack<Packet>();
if (!pool.ContainsKey(type))
{
pool[type] = new Stack<Packet>();
}
if ((pool[type]).Count < 50)
{
(pool[type]).Push(packet);
}
}
if ((pool[type]).Count < 50)
{
(pool[type]).Push(packet);
}
}
break;
// Other packets wont pool
default:
return;
break;
// Other packets wont pool
default:
return;
}
}
}