diff options
author | Mic Bowman | 2011-04-11 08:37:43 -0700 |
---|---|---|
committer | Mic Bowman | 2011-04-11 08:37:43 -0700 |
commit | f778056c7a81443b11c0c4288979af3a8c6b5b9f (patch) | |
tree | 3df50f71b50eb8a24228565641848c4b334eb601 | |
parent | Changed the "not in scene" check in the prioritizier to just (diff) | |
download | opensim-SC_OLD-f778056c7a81443b11c0c4288979af3a8c6b5b9f.zip opensim-SC_OLD-f778056c7a81443b11c0c4288979af3a8c6b5b9f.tar.gz opensim-SC_OLD-f778056c7a81443b11c0c4288979af3a8c6b5b9f.tar.bz2 opensim-SC_OLD-f778056c7a81443b11c0c4288979af3a8c6b5b9f.tar.xz |
Removed some priority queue debugging code
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 80 |
1 files changed, 0 insertions, 80 deletions
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 | |||
300 | /// <summary>Used to adjust Sun Orbit values so Linden based viewers properly position sun</summary> | 300 | /// <summary>Used to adjust Sun Orbit values so Linden based viewers properly position sun</summary> |
301 | private const float m_sunPainDaHalfOrbitalCutoff = 4.712388980384689858f; | 301 | private const float m_sunPainDaHalfOrbitalCutoff = 4.712388980384689858f; |
302 | 302 | ||
303 | // First log file or time has expired, start writing to a new log file | ||
304 | //<MIC> | ||
305 | // ----------------------------------------------------------------- | ||
306 | // ----------------------------------------------------------------- | ||
307 | // THIS IS DEBUGGING CODE & SHOULD BE REMOVED | ||
308 | // ----------------------------------------------------------------- | ||
309 | // ----------------------------------------------------------------- | ||
310 | public class QueueLogger | ||
311 | { | ||
312 | public Int32 start = 0; | ||
313 | public StreamWriter Log = null; | ||
314 | private Dictionary<UUID,int> m_idMap = new Dictionary<UUID,int>(); | ||
315 | |||
316 | public QueueLogger() | ||
317 | { | ||
318 | DateTime now = DateTime.Now; | ||
319 | String fname = String.Format("queue-{0}.log", now.ToString("yyyyMMddHHmmss")); | ||
320 | Log = new StreamWriter(fname); | ||
321 | |||
322 | start = Util.EnvironmentTickCount(); | ||
323 | } | ||
324 | |||
325 | public int LookupID(UUID uuid) | ||
326 | { | ||
327 | int localid; | ||
328 | if (! m_idMap.TryGetValue(uuid,out localid)) | ||
329 | { | ||
330 | localid = m_idMap.Count + 1; | ||
331 | m_idMap[uuid] = localid; | ||
332 | } | ||
333 | |||
334 | return localid; | ||
335 | } | ||
336 | } | ||
337 | |||
338 | public static QueueLogger QueueLog = null; | ||
339 | |||
340 | // ----------------------------------------------------------------- | ||
341 | public void LogAvatarUpdateEvent(UUID client, UUID avatar, Int32 timeinqueue) | ||
342 | { | ||
343 | if (QueueLog == null) | ||
344 | QueueLog = new QueueLogger(); | ||
345 | |||
346 | Int32 ticks = Util.EnvironmentTickCountSubtract(QueueLog.start); | ||
347 | lock(QueueLog) | ||
348 | { | ||
349 | int cid = QueueLog.LookupID(client); | ||
350 | int aid = QueueLog.LookupID(avatar); | ||
351 | QueueLog.Log.WriteLine("{0},AU,AV{1:D4},AV{2:D4},{3}",ticks,cid,aid,timeinqueue); | ||
352 | } | ||
353 | } | ||
354 | |||
355 | // ----------------------------------------------------------------- | ||
356 | public void LogQueueProcessEvent(UUID client, PriorityQueue queue, uint maxup) | ||
357 | { | ||
358 | if (QueueLog == null) | ||
359 | QueueLog = new QueueLogger(); | ||
360 | |||
361 | Int32 ticks = Util.EnvironmentTickCountSubtract(QueueLog.start); | ||
362 | lock(QueueLog) | ||
363 | { | ||
364 | int cid = QueueLog.LookupID(client); | ||
365 | QueueLog.Log.WriteLine("{0},PQ,AV{1:D4},{2},{3}",ticks,cid,maxup,queue.ToString()); | ||
366 | } | ||
367 | } | ||
368 | // ----------------------------------------------------------------- | ||
369 | // ----------------------------------------------------------------- | ||
370 | // ----------------------------------------------------------------- | ||
371 | // ----------------------------------------------------------------- | ||
372 | //</MIC> | ||
373 | |||
374 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 303 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
375 | protected static Dictionary<PacketType, PacketMethod> PacketHandlers = new Dictionary<PacketType, PacketMethod>(); //Global/static handlers for all clients | 304 | protected static Dictionary<PacketType, PacketMethod> PacketHandlers = new Dictionary<PacketType, PacketMethod>(); //Global/static handlers for all clients |
376 | 305 | ||
@@ -3667,10 +3596,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3667 | 3596 | ||
3668 | int updatesThisCall = 0; | 3597 | int updatesThisCall = 0; |
3669 | 3598 | ||
3670 | //<MIC> | ||
3671 | // DEBUGGING CODE... REMOVE | ||
3672 | // LogQueueProcessEvent(this.m_agentId,m_entityUpdates,m_maxUpdates); | ||
3673 | //</MIC> | ||
3674 | // We must lock for both manipulating the kill record and sending the packet, in order to avoid a race | 3599 | // We must lock for both manipulating the kill record and sending the packet, in order to avoid a race |
3675 | // condition where a kill can be processed before an out-of-date update for the same object. | 3600 | // condition where a kill can be processed before an out-of-date update for the same object. |
3676 | lock (m_killRecord) | 3601 | lock (m_killRecord) |
@@ -3687,11 +3612,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3687 | avgTimeDilation += update.TimeDilation; | 3612 | avgTimeDilation += update.TimeDilation; |
3688 | avgTimeDilation *= 0.5f; | 3613 | avgTimeDilation *= 0.5f; |
3689 | 3614 | ||
3690 | // <MIC> | ||
3691 | // DEBUGGING CODE... REMOVE | ||
3692 | // if (update.Entity is ScenePresence) | ||
3693 | // LogAvatarUpdateEvent(this.m_agentId,update.Entity.UUID,timeinqueue); | ||
3694 | // </MIC> | ||
3695 | 3615 | ||
3696 | if (update.Entity is SceneObjectPart) | 3616 | if (update.Entity is SceneObjectPart) |
3697 | { | 3617 | { |