From f778056c7a81443b11c0c4288979af3a8c6b5b9f Mon Sep 17 00:00:00 2001
From: Mic Bowman
Date: Mon, 11 Apr 2011 08:37:43 -0700
Subject: Removed some priority queue debugging code
---
.../Region/ClientStack/LindenUDP/LLClientView.cs | 80 ----------------------
1 file changed, 80 deletions(-)
(limited to 'OpenSim/Region/ClientStack')
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index a724099..b5bf26d 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -300,77 +300,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// Used to adjust Sun Orbit values so Linden based viewers properly position sun
private const float m_sunPainDaHalfOrbitalCutoff = 4.712388980384689858f;
- // First log file or time has expired, start writing to a new log file
-//
-// -----------------------------------------------------------------
-// -----------------------------------------------------------------
-// THIS IS DEBUGGING CODE & SHOULD BE REMOVED
-// -----------------------------------------------------------------
-// -----------------------------------------------------------------
- public class QueueLogger
- {
- public Int32 start = 0;
- public StreamWriter Log = null;
- private Dictionary m_idMap = new Dictionary();
-
- public QueueLogger()
- {
- DateTime now = DateTime.Now;
- String fname = String.Format("queue-{0}.log", now.ToString("yyyyMMddHHmmss"));
- Log = new StreamWriter(fname);
-
- start = Util.EnvironmentTickCount();
- }
-
- public int LookupID(UUID uuid)
- {
- int localid;
- if (! m_idMap.TryGetValue(uuid,out localid))
- {
- localid = m_idMap.Count + 1;
- m_idMap[uuid] = localid;
- }
-
- return localid;
- }
- }
-
- public static QueueLogger QueueLog = null;
-
- // -----------------------------------------------------------------
- public void LogAvatarUpdateEvent(UUID client, UUID avatar, Int32 timeinqueue)
- {
- if (QueueLog == null)
- QueueLog = new QueueLogger();
-
- Int32 ticks = Util.EnvironmentTickCountSubtract(QueueLog.start);
- lock(QueueLog)
- {
- int cid = QueueLog.LookupID(client);
- int aid = QueueLog.LookupID(avatar);
- QueueLog.Log.WriteLine("{0},AU,AV{1:D4},AV{2:D4},{3}",ticks,cid,aid,timeinqueue);
- }
- }
-
- // -----------------------------------------------------------------
- public void LogQueueProcessEvent(UUID client, PriorityQueue queue, uint maxup)
- {
- if (QueueLog == null)
- QueueLog = new QueueLogger();
-
- Int32 ticks = Util.EnvironmentTickCountSubtract(QueueLog.start);
- lock(QueueLog)
- {
- int cid = QueueLog.LookupID(client);
- QueueLog.Log.WriteLine("{0},PQ,AV{1:D4},{2},{3}",ticks,cid,maxup,queue.ToString());
- }
- }
-// -----------------------------------------------------------------
-// -----------------------------------------------------------------
-// -----------------------------------------------------------------
-// -----------------------------------------------------------------
-//
-
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
protected static Dictionary PacketHandlers = new Dictionary(); //Global/static handlers for all clients
@@ -3667,10 +3596,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
int updatesThisCall = 0;
-//
-// DEBUGGING CODE... REMOVE
-// LogQueueProcessEvent(this.m_agentId,m_entityUpdates,m_maxUpdates);
-//
// We must lock for both manipulating the kill record and sending the packet, in order to avoid a race
// condition where a kill can be processed before an out-of-date update for the same object.
lock (m_killRecord)
@@ -3687,11 +3612,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
avgTimeDilation += update.TimeDilation;
avgTimeDilation *= 0.5f;
-//
-// DEBUGGING CODE... REMOVE
-// if (update.Entity is ScenePresence)
-// LogAvatarUpdateEvent(this.m_agentId,update.Entity.UUID,timeinqueue);
-//
if (update.Entity is SceneObjectPart)
{
--
cgit v1.1