[freenet-cvs] r7964 - in trunk/freenet/src/freenet: client node

[t...@freenetproject.org]

Author: toad
Date: 2006-01-28 01:29:54 +0000 (Sat, 28 Jan 2006)
New Revision: 7964

Modified:
   trunk/freenet/src/freenet/client/StandardOnionFECCodec.java
   trunk/freenet/src/freenet/node/Version.java
Log:
415:
Can't replicate kukuks's crash...

Modified: trunk/freenet/src/freenet/client/StandardOnionFECCodec.java
===================================================================
--- trunk/freenet/src/freenet/client/StandardOnionFECCodec.java 2006-01-28 
01:20:12 UTC (rev 7963)
+++ trunk/freenet/src/freenet/client/StandardOnionFECCodec.java 2006-01-28 
01:29:54 UTC (rev 7964)
@@ -344,10 +344,10 @@
        private void realEncode(Bucket[] dataBlockStatus,
                        Bucket[] checkBlockStatus, int blockLength, 
BucketFactory bf)
                        throws IOException {
-               Runtime.getRuntime().gc();
-               Runtime.getRuntime().runFinalization();
-               Runtime.getRuntime().gc();
-               Runtime.getRuntime().runFinalization();
+//             Runtime.getRuntime().gc();
+//             Runtime.getRuntime().runFinalization();
+//             Runtime.getRuntime().gc();
+//             Runtime.getRuntime().runFinalization();
                long memUsedAtStart = Runtime.getRuntime().totalMemory() - 
Runtime.getRuntime().freeMemory();
                Logger.minor(this, "Memory in use at start: "+memUsedAtStart+" 
max="+Runtime.getRuntime().maxMemory());
                Logger.minor(this, "Doing encode: " + dataBlockStatus.length
@@ -404,10 +404,10 @@
                                }
                        }

-                       Runtime.getRuntime().gc();
-                       Runtime.getRuntime().runFinalization();
-                       Runtime.getRuntime().gc();
-                       Runtime.getRuntime().runFinalization();
+//                     Runtime.getRuntime().gc();
+//                     Runtime.getRuntime().runFinalization();
+//                     Runtime.getRuntime().gc();
+//                     Runtime.getRuntime().runFinalization();
                        long memUsedBeforeEncodes = 
Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory();
                        Logger.minor(this, "Memory in use before encodes: 
"+memUsedBeforeEncodes);

@@ -426,17 +426,17 @@
                                        // Do the encode
                                        // Not shuffled
                                        long startTime = 
System.currentTimeMillis();
-                                       Runtime.getRuntime().gc();
-                                       Runtime.getRuntime().runFinalization();
-                                       Runtime.getRuntime().gc();
-                                       Runtime.getRuntime().runFinalization();
+//                                     Runtime.getRuntime().gc();
+//                                     Runtime.getRuntime().runFinalization();
+//                                     Runtime.getRuntime().gc();
+//                                     Runtime.getRuntime().runFinalization();
                                        long memUsedBeforeStripe = 
Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory();
                                        Logger.minor(this, "Memory in use 
before stripe: "+memUsedBeforeStripe);
                                        encoder.encode(dataPackets, 
checkPackets, toEncode);
-                                       Runtime.getRuntime().gc();
-                                       Runtime.getRuntime().runFinalization();
-                                       Runtime.getRuntime().gc();
-                                       Runtime.getRuntime().runFinalization();
+//                                     Runtime.getRuntime().gc();
+//                                     Runtime.getRuntime().runFinalization();
+//                                     Runtime.getRuntime().gc();
+//                                     Runtime.getRuntime().runFinalization();
                                        long memUsedAfterStripe = 
Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory();
                                        Logger.minor(this, "Memory in use after 
stripe: "+memUsedAfterStripe);
                                        long endTime = 
System.currentTimeMillis();

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-01-28 01:20:12 UTC (rev 
7963)
+++ trunk/freenet/src/freenet/node/Version.java 2006-01-28 01:29:54 UTC (rev 
7964)
@@ -20,7 +20,7 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       private static final int buildNumber = 414;
+       private static final int buildNumber = 415;

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