From e6d7303b296468a06ada761706e25d49587b308f Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Thu, 5 Nov 2009 12:01:40 -0800
Subject: Applying #4332, optional packet statistics logging
---
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 4 ++++
1 file changed, 4 insertions(+)
(limited to 'OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs')
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 34cad7b..101a44b 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -4905,6 +4905,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// Throttling category for the packet
protected void OutPacket(Packet packet, ThrottleOutPacketType throttlePacketType)
{
+ #region BinaryStats
+ LLUDPServer.LogPacketHeader(false, m_circuitCode, 0, packet.Type, (ushort)packet.Length);
+ #endregion BinaryStats
+
m_udpServer.SendPacket(m_udpClient, packet, throttlePacketType, true);
}
--
cgit v1.1
From 6ed57814c1db72463acc3c5fca154a289eee433e Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Thu, 5 Nov 2009 23:50:17 -0800
Subject: * Clamp the CoarseLocationUpdate packet at a maximum of 60 positions
per packet. This is a limitation of LLUDP, nothing we can really do about it
* Marking CoarseLocationUpdate as *not* zerocoded. Zerocoding can only save
space when a packet contains three or more contiguous zeroes, and will use
more space if it contains single zeroes randomly scattered through the packet
(which is what you see when you send a long list of UUIDs)
---
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
(limited to 'OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs')
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 101a44b..35ccad9 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -3196,12 +3196,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if (!IsActive) return; // We don't need to update inactive clients.
CoarseLocationUpdatePacket loc = (CoarseLocationUpdatePacket)PacketPool.Instance.GetPacket(PacketType.CoarseLocationUpdate);
- // TODO: don't create new blocks if recycling an old packet
- int total = CoarseLocations.Count;
- CoarseLocationUpdatePacket.IndexBlock ib =
- new CoarseLocationUpdatePacket.IndexBlock();
+ loc.Header.Reliable = false;
+
+ // Each packet can only hold around 62 avatar positions and the client clears the mini-map each time
+ // a CoarseLocationUpdate packet is received. Oh well.
+ int total = Math.Min(CoarseLocations.Count, 60);
+
+ CoarseLocationUpdatePacket.IndexBlock ib = new CoarseLocationUpdatePacket.IndexBlock();
+
loc.Location = new CoarseLocationUpdatePacket.LocationBlock[total];
loc.AgentData = new CoarseLocationUpdatePacket.AgentDataBlock[total];
+
int selfindex = -1;
for (int i = 0; i < total; i++)
{
@@ -3211,18 +3216,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP
lb.X = (byte)CoarseLocations[i].X;
lb.Y = (byte)CoarseLocations[i].Y;
- lb.Z = CoarseLocations[i].Z > 1024 ? (byte)0 : (byte)(CoarseLocations[i].Z * 0.25);
+ lb.Z = CoarseLocations[i].Z > 1024 ? (byte)0 : (byte)(CoarseLocations[i].Z * 0.25f);
loc.Location[i] = lb;
loc.AgentData[i] = new CoarseLocationUpdatePacket.AgentDataBlock();
loc.AgentData[i].AgentID = users[i];
if (users[i] == AgentId)
selfindex = i;
}
+
ib.You = (short)selfindex;
ib.Prey = -1;
loc.Index = ib;
- loc.Header.Reliable = false;
- loc.Header.Zerocoded = true;
OutPacket(loc, ThrottleOutPacketType.Task);
}
--
cgit v1.1
From aff5fe10b0ad95489909f74f9ee2f6bb85f3d338 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 8 Nov 2009 22:29:36 +0000
Subject: test commit with debug output per folder fetch. NOT FOR PRODUCTION,
SPEWY
---
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 1 +
1 file changed, 1 insertion(+)
(limited to 'OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs')
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 35ccad9..06ce79d 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -1255,6 +1255,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
List folders, int version,
bool fetchFolders, bool fetchItems)
{
+ m_log.DebugFormat("[CLIENT]: Request folder details for folder {0}", folderID.ToString());
// An inventory descendents packet consists of a single agent section and an inventory details
// section for each inventory item. The size of each inventory item is approximately 550 bytes.
// In theory, UDP has a maximum packet size of 64k, so it should be possible to send descendent
--
cgit v1.1
From f8bcbe5492330bd14ecec76f11e3a33ea4fd6ef6 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 8 Nov 2009 22:39:00 +0000
Subject: remove the debug stuff
---
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 1 -
1 file changed, 1 deletion(-)
(limited to 'OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs')
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 06ce79d..35ccad9 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -1255,7 +1255,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
List folders, int version,
bool fetchFolders, bool fetchItems)
{
- m_log.DebugFormat("[CLIENT]: Request folder details for folder {0}", folderID.ToString());
// An inventory descendents packet consists of a single agent section and an inventory details
// section for each inventory item. The size of each inventory item is approximately 550 bytes.
// In theory, UDP has a maximum packet size of 64k, so it should be possible to send descendent
--
cgit v1.1