Author: toad
Date: 2008-06-14 11:14:27 +0000 (Sat, 14 Jun 2008)
New Revision: 20331
Modified:
branches/db4o/freenet/src/freenet/client/FetchContext.java
branches/db4o/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
branches/db4o/freenet/src/freenet/client/async/ClientContext.java
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
Log:
Move healingQueue from FetchContext to ClientContext
Modified: branches/db4o/freenet/src/freenet/client/FetchContext.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/FetchContext.java 2008-06-13
20:48:08 UTC (rev 20330)
+++ branches/db4o/freenet/src/freenet/client/FetchContext.java 2008-06-14
11:14:27 UTC (rev 20331)
@@ -6,7 +6,6 @@
import java.util.Set;
import freenet.client.async.BlockSet;
-import freenet.client.async.HealingQueue;
import freenet.client.async.USKManager;
import freenet.client.events.ClientEventProducer;
import freenet.client.events.SimpleEventProducer;
@@ -45,7 +44,6 @@
/** If true, and we get a ZIP manifest, and we have no meta-strings
left, then
* return the manifest contents as data. */
public boolean returnZIPManifests;
- public final HealingQueue healingQueue;
public final boolean ignoreTooManyPathComponents;
/** If set, contains a set of blocks to be consulted before checking
the datastore. */
public BlockSet blocks;
@@ -62,7 +60,7 @@
int maxDataBlocksPerSegment, int
maxCheckBlocksPerSegment,
BucketFactory bucketFactory,
ClientEventProducer producer, boolean
cacheLocalRequests, USKManager uskManager,
- HealingQueue hq, boolean ignoreTooManyPathComponents,
Ticker ticker, Executor executor,
+ boolean ignoreTooManyPathComponents, Ticker ticker,
Executor executor,
Executor[] slowSerialExecutor) {
this.ticker = ticker;
this.executor = executor;
@@ -86,12 +84,10 @@
this.maxDataBlocksPerSegment = maxDataBlocksPerSegment;
this.maxCheckBlocksPerSegment = maxCheckBlocksPerSegment;
this.cacheLocalRequests = cacheLocalRequests;
- this.healingQueue = hq;
this.ignoreTooManyPathComponents = ignoreTooManyPathComponents;
}
public FetchContext(FetchContext ctx, int maskID, boolean keepProducer)
{
- this.healingQueue = ctx.healingQueue;
if(keepProducer)
this.eventProducer = ctx.eventProducer;
else
Modified:
branches/db4o/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
2008-06-13 20:48:08 UTC (rev 20330)
+++ branches/db4o/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
2008-06-14 11:14:27 UTC (rev 20331)
@@ -7,12 +7,10 @@
import java.util.HashMap;
import java.util.Set;
-import freenet.client.async.BackgroundBlockEncoder;
import freenet.client.async.BaseClientPutter;
import freenet.client.async.ClientCallback;
import freenet.client.async.ClientGetter;
import freenet.client.async.ClientPutter;
-import freenet.client.async.HealingQueue;
import freenet.client.async.SimpleManifestPutter;
import freenet.client.events.ClientEventListener;
import freenet.client.events.ClientEventProducer;
@@ -47,7 +45,6 @@
private long curMaxTempLength;
private int curMaxMetadataLength;
private final RandomSource random;
- private final HealingQueue healingQueue;
private final Executor slowSerialExecutor[];
/** See comments in Node */
private final boolean cacheLocalRequests;
@@ -97,7 +94,6 @@
curMaxMetadataLength = 1024 * 1024;
this.cacheLocalRequests = cacheLocalRequests;
this.persistentBucketFactory =
node.persistentEncryptedTempBucketFactory;
- this.healingQueue = node.getHealingQueue();
}
public void setMaxLength(long maxLength) {
@@ -194,8 +190,7 @@
FETCH_SPLITFILES, FOLLOW_REDIRECTS,
LOCAL_REQUESTS_ONLY,
MAX_SPLITFILE_BLOCKS_PER_SEGMENT,
MAX_SPLITFILE_CHECK_BLOCKS_PER_SEGMENT,
bucketFactory, globalEventProducer,
- cacheLocalRequests, core.uskManager,
healingQueue,
- false, core.getTicker(), core.getExecutor(),
slowSerialExecutor);
+ cacheLocalRequests, core.uskManager, false,
core.getTicker(), core.getExecutor(), slowSerialExecutor);
}
public InsertContext getInsertContext(boolean forceNonPersistent) {
Modified: branches/db4o/freenet/src/freenet/client/async/ClientContext.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/ClientContext.java
2008-06-13 20:48:08 UTC (rev 20330)
+++ branches/db4o/freenet/src/freenet/client/async/ClientContext.java
2008-06-14 11:14:27 UTC (rev 20331)
@@ -34,6 +34,7 @@
public final RandomSource random;
public final ArchiveManager archiveManager;
public final BucketFactory persistentBucketFactory;
+ public final HealingQueue healingQueue;
public ClientContext(NodeClientCore core) {
this.fecQueue = core.fecQueue;
@@ -48,6 +49,7 @@
this.random = core.random;
archiveManager = core.archiveManager;
this.persistentBucketFactory =
core.persistentEncryptedTempBucketFactory;
+ this.healingQueue = core.getHealingQueue();
}
public void start(final ClientPutter inserter, final boolean
earlyEncode) throws InsertException {
Modified:
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
2008-06-13 20:48:08 UTC (rev 20330)
+++ branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
2008-06-14 11:14:27 UTC (rev 20331)
@@ -340,7 +340,7 @@
private void queueHeal(Bucket data, ClientContext context) {
if(logMINOR) Logger.minor(this, "Queueing healing insert");
- fetchContext.healingQueue.queue(data, context);
+ context.healingQueue.queue(data, context);
}
/** This is after any retries and therefore is either out-of-retries or
fatal
