Author: toad
Date: 2005-11-11 18:57:07 +0000 (Fri, 11 Nov 2005)
New Revision: 7528
Modified:
trunk/freenet/src/freenet/client/InserterException.java
trunk/freenet/src/freenet/client/StandardOnionFECCodec.java
trunk/freenet/src/freenet/node/Version.java
trunk/freenet/src/freenet/support/PaddedEphemerallyEncryptedBucket.java
trunk/freenet/src/freenet/support/io/TempBucketFactory.java
Log:
164:
Fix major bug in padding. Was using all CPU and all disk. :|
Modified: trunk/freenet/src/freenet/client/InserterException.java
===================================================================
--- trunk/freenet/src/freenet/client/InserterException.java 2005-11-11
18:06:23 UTC (rev 7527)
+++ trunk/freenet/src/freenet/client/InserterException.java 2005-11-11
18:57:07 UTC (rev 7528)
@@ -19,12 +19,14 @@
public InserterException(int m, String msg) {
super(getMessage(m)+": "+msg);
mode = m;
+ Logger.minor(this, "Creating InserterException:
"+getMessage(mode)+": "+msg);
errorCodes = null;
}
public InserterException(int m) {
super(getMessage(m));
mode = m;
+ Logger.minor(this, "Creating InserterException:
"+getMessage(mode));
errorCodes = null;
}
@@ -39,6 +41,7 @@
public InserterException(int mode, FailureCodeTracker errorCodes) {
super(getMessage(mode));
this.mode = mode;
+ Logger.minor(this, "Creating InserterException:
"+getMessage(mode));
this.errorCodes = errorCodes;
}
Modified: trunk/freenet/src/freenet/client/StandardOnionFECCodec.java
===================================================================
--- trunk/freenet/src/freenet/client/StandardOnionFECCodec.java 2005-11-11
18:06:23 UTC (rev 7527)
+++ trunk/freenet/src/freenet/client/StandardOnionFECCodec.java 2005-11-11
18:57:07 UTC (rev 7528)
@@ -316,6 +316,7 @@
int thisCycle = Math.min(remaining, buf.length);
mt.nextBytes(buf); // FIXME??
os.write(buf, 0, thisCycle);
+ x += thisCycle;
}
os.close();
if(b.size() != blockLength)
Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2005-11-11 18:06:23 UTC (rev
7527)
+++ trunk/freenet/src/freenet/node/Version.java 2005-11-11 18:57:07 UTC (rev
7528)
@@ -20,10 +20,10 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- public static final int buildNumber = 163;
+ public static final int buildNumber = 164;
/** Oldest build of Fred we will talk to */
- public static final int lastGoodBuild = 162;
+ public static final int lastGoodBuild = 164;
/** The highest reported build of fred */
public static int highestSeenBuild = buildNumber;
Modified:
trunk/freenet/src/freenet/support/PaddedEphemerallyEncryptedBucket.java
===================================================================
--- trunk/freenet/src/freenet/support/PaddedEphemerallyEncryptedBucket.java
2005-11-11 18:06:23 UTC (rev 7527)
+++ trunk/freenet/src/freenet/support/PaddedEphemerallyEncryptedBucket.java
2005-11-11 18:57:07 UTC (rev 7528)
@@ -191,7 +191,12 @@
while(true) {
if(max < 0)
throw new Error("Impossible size: "+size+" -
min="+min+", max="+max);
- if(size >= min && size <= max) return max;
+ if(size < min)
+ throw new IllegalStateException("???");
+ if(size >= min && size <= max) {
+ Logger.minor(this, "Padded: "+max+" was:
"+dataLength+" for "+getName());
+ return max;
+ }
min = max;
max = max << 1;
}
Modified: trunk/freenet/src/freenet/support/io/TempBucketFactory.java
===================================================================
--- trunk/freenet/src/freenet/support/io/TempBucketFactory.java 2005-11-11
18:06:23 UTC (rev 7527)
+++ trunk/freenet/src/freenet/support/io/TempBucketFactory.java 2005-11-11
18:57:07 UTC (rev 7528)
@@ -71,8 +71,8 @@
logDebug = Logger.shouldLog(Logger.DEBUG,this);
File f = filenameGenerator.makeRandomFilename();
- if (logDebug)
- Logger.debug(
+ //if (logDebug)
+ Logger.minor(
this,
"Temp bucket created: "
+ f.getAbsolutePath()
