[freenet-cvs] r9146 - trunk/freenet/src/freenet/io/comm

[zot...@freenetproject.org]

Author: zothar
Date: 2006-06-11 05:51:22 +0000 (Sun, 11 Jun 2006)
New Revision: 9146

Modified:
   trunk/freenet/src/freenet/io/comm/Message.java
   trunk/freenet/src/freenet/io/comm/UdpSocketManager.java
Log:
When dropping an unclaimed message, log how long we had that Message instance.

Modified: trunk/freenet/src/freenet/io/comm/Message.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/Message.java      2006-06-11 04:44:19 UTC 
(rev 9145)
+++ trunk/freenet/src/freenet/io/comm/Message.java      2006-06-11 05:51:22 UTC 
(rev 9146)
@@ -38,6 +38,7 @@
        private final MessageType _spec;
        private final PeerContext _source;
        private final HashMap _payload = new HashMap();
+       public final long localInstantiationTime;

        public static Message decodeFromPacket(byte[] buf, int offset, int 
length, PeerContext peer) {
                DataInputStream dis
@@ -81,6 +82,7 @@
        }

        private Message(MessageType spec, PeerContext source) {
+               localInstantiationTime = System.currentTimeMillis();
                _spec = spec;
                _source = source;
        }

Modified: trunk/freenet/src/freenet/io/comm/UdpSocketManager.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/UdpSocketManager.java     2006-06-11 
04:44:19 UTC (rev 9145)
+++ trunk/freenet/src/freenet/io/comm/UdpSocketManager.java     2006-06-11 
05:51:22 UTC (rev 9146)
@@ -323,11 +323,11 @@
                                if(!matched) {
                                    while (_unclaimed.size() > 
MAX_UNMATCHED_FIFO_SIZE) {
                                        Message removed = 
(Message)_unclaimed.removeFirst();
-                                       if ((removed.getSource()) instanceof 
PeerNode)
-                                       {
-                                           Logger.normal(this, "Dropping 
unclaimed from "+removed.getSource().getPeer()+": "+removed);
+                                       long messageLifeTime = 
System.currentTimeMillis() - removed.localInstantiationTime;
+                                       if ((removed.getSource()) instanceof 
PeerNode) {
+                                           Logger.normal(this, "Dropping 
unclaimed from "+removed.getSource().getPeer()+", lived "+messageLifeTime+"ms : 
"+removed);
                                        } else {
-                                           Logger.normal(this, "Dropping 
unclaimed: "+removed);
+                                           Logger.normal(this, "Dropping 
unclaimed, lived "+messageLifeTime+"ms : "+removed);
                                        }
                                    }
                                    _unclaimed.addLast(m);