Update of /cvsroot/freenet/freenet/src/freenet
In directory sc8-pr-cvs1:/tmp/cvs-serv22956/src/freenet

Modified Files:
        Ticker.java Version.java 
Log Message:
6240:
Timing/logging.
Significant bugfixes in SendData (trailers).
Fix rare NPE in WSL.


Index: Ticker.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/Ticker.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -w -r1.23 -r1.24
--- Ticker.java 14 Oct 2003 16:58:14 -0000      1.23
+++ Ticker.java 14 Oct 2003 17:52:48 -0000      1.24
@@ -100,12 +100,21 @@
         * Otherwise add(now, mo)
         */
        private final void runOrSchedule(MessageObject mo) {
+               long startTime = System.currentTimeMillis();
                try {
                        if(!mh.handle(mo, true)) add(0, mo);
                } catch (Throwable t) {
                        Core.logger.log(this, "Caught "+t+" handling "+mo+
                                                        " in Ticker.addNowOrRun", 
Logger.ERROR);
                }
+               long endTime = System.currentTimeMillis();
+               if(endTime - startTime > 1000) {
+                       Core.logger.log(this, "Handling "+mo+" took more than 1000ms: 
"+
+                                                       (endTime-startTime)+" at 
"+endTime+"!",
+                                                       Logger.ERROR);
+               } else
+                       Core.logger.log(this, "Handling "+mo+" took 
"+(endTime-startTime)+
+                                                       "ms", Logger.MINOR);
        }
        
     /**

Index: Version.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/Version.java,v
retrieving revision 1.432
retrieving revision 1.433
diff -u -w -r1.432 -r1.433
--- Version.java        14 Oct 2003 17:24:45 -0000      1.432
+++ Version.java        14 Oct 2003 17:52:48 -0000      1.433
@@ -18,7 +18,7 @@
     public static String protocolVersion = "1.46";
     
     /** The build number of the current revision */
-    public static final int buildNumber = 6239;
+    public static final int buildNumber = 6240;
     // 6028: may 3; ARK retrieval fix
 
     public static final int ignoreBuildsAfter = 6500;

_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs

Reply via email to