diff options
author | Johan Berntsson | 2008-01-03 05:06:55 +0000 |
---|---|---|
committer | Johan Berntsson | 2008-01-03 05:06:55 +0000 |
commit | 3f78e55ef4abb85533a0967bd6d42b65455292bb (patch) | |
tree | 0f559a17f9b4ee9918083f51a3f37d3540a17a8e | |
parent | Reduce maximum number of items in an inventory packet to approximate Linden s... (diff) | |
download | opensim-SC_OLD-3f78e55ef4abb85533a0967bd6d42b65455292bb.zip opensim-SC_OLD-3f78e55ef4abb85533a0967bd6d42b65455292bb.tar.gz opensim-SC_OLD-3f78e55ef4abb85533a0967bd6d42b65455292bb.tar.bz2 opensim-SC_OLD-3f78e55ef4abb85533a0967bd6d42b65455292bb.tar.xz |
Packet recycling has been temporarily disabled to avoid the performance problems reported in Mantis 281
-rw-r--r-- | OpenSim/Framework/PacketPool.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Framework/PacketPool.cs b/OpenSim/Framework/PacketPool.cs index 744ae51..49aeb16 100644 --- a/OpenSim/Framework/PacketPool.cs +++ b/OpenSim/Framework/PacketPool.cs | |||
@@ -49,6 +49,8 @@ namespace OpenSim.Framework | |||
49 | 49 | ||
50 | public Packet GetPacket(PacketType type) | 50 | public Packet GetPacket(PacketType type) |
51 | { | 51 | { |
52 | return Packet.BuildPacket(type); | ||
53 | /* Skip until PacketPool performance problems have been resolved (mantis 281) | ||
52 | Packet packet = null; | 54 | Packet packet = null; |
53 | 55 | ||
54 | lock (pool) | 56 | lock (pool) |
@@ -66,6 +68,7 @@ namespace OpenSim.Framework | |||
66 | } | 68 | } |
67 | 69 | ||
68 | return packet; | 70 | return packet; |
71 | */ | ||
69 | } | 72 | } |
70 | 73 | ||
71 | // Copied from LibSL, and added a check to avoid overwriting the | 74 | // Copied from LibSL, and added a check to avoid overwriting the |
@@ -137,6 +140,7 @@ namespace OpenSim.Framework | |||
137 | 140 | ||
138 | public void ReturnPacket(Packet packet) | 141 | public void ReturnPacket(Packet packet) |
139 | { | 142 | { |
143 | /* Skip until PacketPool performance problems have been resolved (mantis 281) | ||
140 | lock (pool) | 144 | lock (pool) |
141 | { | 145 | { |
142 | PacketType type = packet.Type; | 146 | PacketType type = packet.Type; |
@@ -148,6 +152,7 @@ namespace OpenSim.Framework | |||
148 | 152 | ||
149 | ((Stack) pool[type]).Push(packet); | 153 | ((Stack) pool[type]).Push(packet); |
150 | } | 154 | } |
155 | */ | ||
151 | } | 156 | } |
152 | } | 157 | } |
153 | } | 158 | } |