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

[t...@freenetproject.org]

Author: toad
Date: 2005-11-11 18:06:23 +0000 (Fri, 11 Nov 2005)
New Revision: 7527

Modified:
   trunk/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
   trunk/freenet/src/freenet/client/StandardOnionFECCodec.java
   trunk/freenet/src/freenet/node/Version.java
Log:
163:
No retries on insert for now.
Time encodes, try to find out if we can make them faster.

Modified: trunk/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
===================================================================
--- trunk/freenet/src/freenet/client/HighLevelSimpleClientImpl.java     
2005-11-11 17:46:41 UTC (rev 7526)
+++ trunk/freenet/src/freenet/client/HighLevelSimpleClientImpl.java     
2005-11-11 18:06:23 UTC (rev 7527)
@@ -42,7 +42,7 @@
         * Don't turn this off either. */
        static final boolean LOCAL_REQUESTS_ONLY = false;
        static final int SPLITFILE_INSERT_THREADS = 10;
-       static final int SPLITFILE_INSERT_RETRIES = 3;
+       static final int SPLITFILE_INSERT_RETRIES = 0;


        public HighLevelSimpleClientImpl(SimpleLowLevelClient client, 
ArchiveManager mgr, BucketFactory bf, RandomSource r) {

Modified: trunk/freenet/src/freenet/client/StandardOnionFECCodec.java
===================================================================
--- trunk/freenet/src/freenet/client/StandardOnionFECCodec.java 2005-11-11 
17:46:41 UTC (rev 7526)
+++ trunk/freenet/src/freenet/client/StandardOnionFECCodec.java 2005-11-11 
18:06:23 UTC (rev 7527)
@@ -78,6 +78,7 @@
                this.k = k;
                this.n = n;
                code = DefaultFECCodeFactory.getDefault().createFECCode(k,n);
+               Logger.minor(this, "FEC impl is "+code);
                // revert to below if above causes JVM crashes
                //code = new PureCode(k,n);
        }
@@ -210,7 +211,10 @@
                        runningDecodes++;
                }
                try {
+                       long startTime = System.currentTimeMillis();
                        realEncode(dataBlockStatus, checkBlockStatus, 
blockLength, bf);
+                       long endTime = System.currentTimeMillis();
+                       Logger.minor(this, "Splitfile encode: k="+k+", n="+n+" 
encode took "+(endTime-startTime)+"ms");
                } finally {
                        synchronized(runningDecodesSync) {
                                runningDecodes--;
@@ -276,7 +280,10 @@
                                }
                                // Do the encode
                                // Not shuffled
+                               long startTime = System.currentTimeMillis();
                                code.encode(dataPackets, checkPackets, 
toEncode);
+                               long endTime = System.currentTimeMillis();
+                               Logger.minor(this, "Stripe encode took 
"+(endTime-startTime)+" ms for k="+k+", n="+n+", stripeSize="+STRIPE_SIZE);
                                // packets now contains an array of decoded 
blocks, in order
                                // Write the data out
                                for(int i=k;i<n;i++) {

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2005-11-11 17:46:41 UTC (rev 
7526)
+++ trunk/freenet/src/freenet/node/Version.java 2005-11-11 18:06:23 UTC (rev 
7527)
@@ -20,7 +20,7 @@
        public static final String protocolVersion = "1.0";

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

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