Author: nextgens
Date: 2006-07-03 21:50:21 +0000 (Mon, 03 Jul 2006)
New Revision: 9451
Modified:
trunk/freenet/src/freenet/client/ArchiveStoreContext.java
trunk/freenet/src/freenet/client/ErrorArchiveStoreItem.java
trunk/freenet/src/freenet/client/FailureCodeTracker.java
trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
trunk/freenet/src/freenet/crypt/DiffieHellmanContext.java
trunk/freenet/src/freenet/node/ARKFetcher.java
trunk/freenet/src/freenet/node/CHKInsertSender.java
trunk/freenet/src/freenet/node/Version.java
trunk/freenet/src/freenet/node/fcp/ClientGet.java
trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
Log:
854:
* display the version of freenet-ext
* synchronization fixes
* some code refactoring and various patches
Modified: trunk/freenet/src/freenet/client/ArchiveStoreContext.java
===================================================================
--- trunk/freenet/src/freenet/client/ArchiveStoreContext.java 2006-07-03
21:29:13 UTC (rev 9450)
+++ trunk/freenet/src/freenet/client/ArchiveStoreContext.java 2006-07-03
21:50:21 UTC (rev 9451)
@@ -30,10 +30,6 @@
myItems = new DoublyLinkedListImpl();
}
- public void finalize() {
- // Need to do anything here?
- }
-
/**
* Get the metadata for a given archive.
* @return A Bucket containing the metadata, in binary format, for the
archive.
Modified: trunk/freenet/src/freenet/client/ErrorArchiveStoreItem.java
===================================================================
--- trunk/freenet/src/freenet/client/ErrorArchiveStoreItem.java 2006-07-03
21:29:13 UTC (rev 9450)
+++ trunk/freenet/src/freenet/client/ErrorArchiveStoreItem.java 2006-07-03
21:50:21 UTC (rev 9451)
@@ -21,10 +21,6 @@
this.error = error;
}
- public void finalize() {
- super.finalize();
- }
-
/**
* Throws an exception with the given error message, because this file
could not be
* extracted from the archive.
Modified: trunk/freenet/src/freenet/client/FailureCodeTracker.java
===================================================================
--- trunk/freenet/src/freenet/client/FailureCodeTracker.java 2006-07-03
21:29:13 UTC (rev 9450)
+++ trunk/freenet/src/freenet/client/FailureCodeTracker.java 2006-07-03
21:50:21 UTC (rev 9451)
@@ -40,7 +40,7 @@
}
}
- class Item {
+ private static class Item {
Item(int count) {
this.x = count;
}
Modified: trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java 2006-07-03
21:29:13 UTC (rev 9450)
+++ trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java 2006-07-03
21:50:21 UTC (rev 9451)
@@ -12,6 +12,7 @@
import freenet.client.InserterException;
import freenet.config.SubConfig;
import freenet.keys.FreenetURI;
+import freenet.node.ExtVersion;
import freenet.node.Node;
import freenet.node.Version;
import freenet.node.useralerts.UserAlert;
@@ -416,6 +417,16 @@
buf.append("Freenet "+Version.nodeVersion+" Build
#"+Version.buildNumber()+" r"+Version.cvsRevision+"<br/>");
+ int ExtBuildNumber = -1;
+ String ExtVer = null;
+ try{
+ ExtBuildNumber = ExtVersion.buildNumber();
+ ExtVer = ExtVersion.cvsRevision;
+ buf.append("Freenet-ext Build #"+ExtBuildNumber+"
r"+ExtVer+"<br/>");
+ }catch(Throwable t){
+ // Compatibility code ... will be removed
+ }
+
if(Version.buildNumber() < Version.highestSeenBuild &&
advancedDarknetOutputEnabled) {
buf.append("<br />");
buf.append("<b>A newer version is available! (Build
#"+Version.highestSeenBuild+")</b>");
Modified: trunk/freenet/src/freenet/crypt/DiffieHellmanContext.java
===================================================================
--- trunk/freenet/src/freenet/crypt/DiffieHellmanContext.java 2006-07-03
21:29:13 UTC (rev 9450)
+++ trunk/freenet/src/freenet/crypt/DiffieHellmanContext.java 2006-07-03
21:50:21 UTC (rev 9451)
@@ -47,7 +47,7 @@
logMINOR = Logger.shouldLog(Logger.MINOR, this);
}
- public NativeBigInteger getOurExponential() {
+ public synchronized NativeBigInteger getOurExponential() {
lastUsedTime = System.currentTimeMillis();
return myExponential;
}
@@ -102,7 +102,7 @@
/**
* @return The time at which this object was last used.
*/
- public long lastUsedTime() {
+ public synchronized long lastUsedTime() {
return lastUsedTime;
}
Modified: trunk/freenet/src/freenet/node/ARKFetcher.java
===================================================================
--- trunk/freenet/src/freenet/node/ARKFetcher.java 2006-07-03 21:29:13 UTC
(rev 9450)
+++ trunk/freenet/src/freenet/node/ARKFetcher.java 2006-07-03 21:50:21 UTC
(rev 9451)
@@ -98,12 +98,11 @@
if(cg != null)
try {
- synchronized(this) {
- if(!isFetching) {
-
node.addARKFetcher(identity,this);
- isFetching = true;
- }
+ if(!isFetching) {
+ node.addARKFetcher(identity,this);
+ isFetching = true;
}
+
cg.start();
} catch (FetchException e) {
onFailure(e, cg);
@@ -118,7 +117,6 @@
backoff = MIN_BACKOFF;
Logger.minor(this, "Cancelling ARK fetch for "+peer);
shouldRun = false;
- synchronized(this){
started = false;
if(node.arkFetchManager.hasReadyARKFetcher(this)) {
node.arkFetchManager.removeReadyARKFetcher(this);
@@ -127,7 +125,7 @@
node.removeARKFetcher(identity,this);
isFetching = false;
}
- }
+
if(getter != null)
getter.cancel();
}
Modified: trunk/freenet/src/freenet/node/CHKInsertSender.java
===================================================================
--- trunk/freenet/src/freenet/node/CHKInsertSender.java 2006-07-03 21:29:13 UTC
(rev 9450)
+++ trunk/freenet/src/freenet/node/CHKInsertSender.java 2006-07-03 21:50:21 UTC
(rev 9451)
@@ -17,7 +17,32 @@
import freenet.support.Logger;
public final class CHKInsertSender implements Runnable, AnyInsertSender {
-
+
+ private static class Sender implements Runnable {
+
+ final AwaitingCompletion completion;
+ final BlockTransmitter bt;
+
+ public Sender(AwaitingCompletion ac) {
+ this.bt = ac.bt;
+ this.completion = ac;
+ }
+
+ public void run() {
+ try {
+ bt.send();
+ if(bt.failedDueToOverload()) {
+ completion.completedTransfer(false);
+ } else {
+ completion.completedTransfer(true);
+ }
+ } catch (Throwable t) {
+ completion.completedTransfer(false);
+ Logger.error(this, "Caught "+t, t);
+ }
+ }
+ }
+
private class AwaitingCompletion {
/** Node we are waiting for response from */
@@ -89,30 +114,7 @@
}
}
- public class Sender implements Runnable {
-
- final AwaitingCompletion completion;
- final BlockTransmitter bt;
-
- public Sender(AwaitingCompletion ac) {
- this.bt = ac.bt;
- this.completion = ac;
- }
-
- public void run() {
- try {
- bt.send();
- if(bt.failedDueToOverload()) {
- completion.completedTransfer(false);
- } else {
- completion.completedTransfer(true);
- }
- } catch (Throwable t) {
- completion.completedTransfer(false);
- Logger.error(this, "Caught "+t, t);
- }
- }
- }
+
CHKInsertSender(NodeCHK myKey, long uid, byte[] headers, short htl,
PeerNode source, Node node, PartiallyReceivedBlock prb, boolean
fromStore, double closestLocation) {
@@ -523,29 +525,29 @@
status = code;
- synchronized(this) {
- notifyAll();
+ synchronized(this) {
+ notifyAll();
}
Logger.minor(this, "Set status code: "+getStatusString()+" on "+uid);
// Now wait for transfers, or for downstream transfer notifications.
- synchronized(this) {
- if(cw != null) {
- while(!allTransfersCompleted) {
- try {
- wait(10*1000);
- } catch (InterruptedException e) {
- // Try again
- }
+ if(cw != null) {
+ while(!allTransfersCompleted) {
+ try {
+ wait(10*1000);
+ } catch (InterruptedException e) {
+ // Try again
}
- } else {
- // There weren't any transfers
+ }
+ } else {
+ // There weren't any transfers
+ synchronized(this) {
allTransfersCompleted = true;
}
- notifyAll();
}
+ notifyAll();
Logger.minor(this, "Returning from finish()");
}
Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-07-03 21:29:13 UTC (rev
9450)
+++ trunk/freenet/src/freenet/node/Version.java 2006-07-03 21:50:21 UTC (rev
9451)
@@ -18,7 +18,7 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- private static final int buildNumber = 853;
+ private static final int buildNumber = 854;
/** Oldest build of Fred we will talk to */
private static final int oldLastGoodBuild = 839;
Modified: trunk/freenet/src/freenet/node/fcp/ClientGet.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientGet.java 2006-07-03 21:29:13 UTC
(rev 9450)
+++ trunk/freenet/src/freenet/node/fcp/ClientGet.java 2006-07-03 21:50:21 UTC
(rev 9451)
@@ -306,7 +306,7 @@
finish();
}
- private void trySendDataFoundOrGetFailed(FCPConnectionOutputHandler
handler) {
+ private synchronized void
trySendDataFoundOrGetFailed(FCPConnectionOutputHandler handler) {
FCPMessage msg;
@@ -386,7 +386,7 @@
// Ignore
}
- public void receive(ClientEvent ce) {
+ public synchronized void receive(ClientEvent ce) {
if(finished) return;
if(!(((verbosity & VERBOSITY_SPLITFILE_PROGRESS) ==
VERBOSITY_SPLITFILE_PROGRESS) &&
(ce instanceof SplitfileProgressEvent)))
@@ -414,6 +414,7 @@
fs.put("TempFilename", tempFile.getPath());
if(clientToken != null)
fs.put("ClientToken", clientToken);
+ //FIXME: what were we supposed to do there ?
if(returnType == ClientGetMessage.RETURN_TYPE_DISK &&
targetFile != null) {
// Otherwise we must re-run it anyway as we don't have
the data.
Modified: trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
===================================================================
--- trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2006-07-03
21:29:13 UTC (rev 9450)
+++ trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2006-07-03
21:50:21 UTC (rev 9451)
@@ -1298,7 +1298,7 @@
}
}
- public void setMaxKeys(long maxStoreKeys) throws DatabaseException,
IOException {
+ public synchronized void setMaxKeys(long maxStoreKeys) throws
DatabaseException, IOException {
maxChkBlocks = maxStoreKeys;
maybeShrink(false);
}
