Author: toad
Date: 2005-12-10 00:50:31 +0000 (Sat, 10 Dec 2005)
New Revision: 7703

Modified:
   trunk/freenet/src/freenet/node/Version.java
   trunk/freenet/src/freenet/support/FileLoggerHook.java
Log:
301:
Minor logging optimizations (buffer before reaches gzip; uncompressed logs 
should hit disk immediately, but compressed logs can wait and be compressed 
efficiently one 32kB block at a time).


Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2005-12-10 00:08:42 UTC (rev 
7702)
+++ trunk/freenet/src/freenet/node/Version.java 2005-12-10 00:50:31 UTC (rev 
7703)
@@ -20,7 +20,7 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       public static final int buildNumber = 300;
+       public static final int buildNumber = 301;

        /** Oldest build of Fred we will talk to */
        public static final int lastGoodBuild = 300;

Modified: trunk/freenet/src/freenet/support/FileLoggerHook.java
===================================================================
--- trunk/freenet/src/freenet/support/FileLoggerHook.java       2005-12-10 
00:08:42 UTC (rev 7702)
+++ trunk/freenet/src/freenet/support/FileLoggerHook.java       2005-12-10 
00:50:31 UTC (rev 7703)
@@ -295,7 +295,8 @@
                                                }
                                        }
                                        if(list.size() == 0) {
-                                       myWrite(logStream, null);
+                                               if(currentFilename == null)
+                                                       myWrite(logStream, 
null);
                                        if(altLogStream != null)
                                                myWrite(altLogStream, null);
                                        }
@@ -367,9 +368,15 @@
                                long sleepTime = 1000;
                                try {
                                        OutputStream o = new 
FileOutputStream(filename, !logOverwrite);
-                                       o = new BufferedOutputStream(o, 32768);
                                        if(compress) {
+                                               // buffer -> gzip -> buffer -> 
file
+                                               o = new BufferedOutputStream(o, 
32768); // to file
                                                o = new GZIPOutputStream(o);
+                                               // gzip block size is 32kB
+                                               o = new BufferedOutputStream(o, 
65536); // to gzipper
+                                       } else {
+                                               // buffer -> file
+                                               o = new BufferedOutputStream(o, 
32768);
                                        }
                                        return o;
                                } catch (IOException e) {


Reply via email to