Author: toad
Date: 2008-06-14 11:18:07 +0000 (Sat, 14 Jun 2008)
New Revision: 20332
Modified:
branches/db4o/freenet/src/freenet/client/FetchContext.java
branches/db4o/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
branches/db4o/freenet/src/freenet/client/async/ClientGetter.java
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
Log:
Remove Ticker and Executor from FetchContext
Modified: branches/db4o/freenet/src/freenet/client/FetchContext.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/FetchContext.java 2008-06-14
11:14:27 UTC (rev 20331)
+++ branches/db4o/freenet/src/freenet/client/FetchContext.java 2008-06-14
11:18:07 UTC (rev 20332)
@@ -9,7 +9,6 @@
import freenet.client.async.USKManager;
import freenet.client.events.ClientEventProducer;
import freenet.client.events.SimpleEventProducer;
-import freenet.node.Ticker;
import freenet.support.Executor;
import freenet.support.api.BucketFactory;
@@ -48,8 +47,6 @@
/** If set, contains a set of blocks to be consulted before checking
the datastore. */
public BlockSet blocks;
public Set allowedMIMETypes;
- public final Ticker ticker;
- public final Executor executor;
public final Executor[] slowSerialExecutor;
public FetchContext(long curMaxLength,
@@ -60,10 +57,8 @@
int maxDataBlocksPerSegment, int
maxCheckBlocksPerSegment,
BucketFactory bucketFactory,
ClientEventProducer producer, boolean
cacheLocalRequests, USKManager uskManager,
- boolean ignoreTooManyPathComponents, Ticker ticker,
Executor executor,
+ boolean ignoreTooManyPathComponents,
Executor[] slowSerialExecutor) {
- this.ticker = ticker;
- this.executor = executor;
this.slowSerialExecutor = slowSerialExecutor;
this.maxOutputLength = curMaxLength;
this.uskManager = uskManager;
@@ -92,8 +87,6 @@
this.eventProducer = ctx.eventProducer;
else
this.eventProducer = new SimpleEventProducer();
- this.ticker = ctx.ticker;
- this.executor = ctx.executor;
this.slowSerialExecutor = ctx.slowSerialExecutor;
this.uskManager = ctx.uskManager;
this.ignoreTooManyPathComponents =
ctx.ignoreTooManyPathComponents;
Modified:
branches/db4o/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
2008-06-14 11:14:27 UTC (rev 20331)
+++ branches/db4o/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
2008-06-14 11:18:07 UTC (rev 20332)
@@ -190,7 +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, false,
core.getTicker(), core.getExecutor(), slowSerialExecutor);
+ cacheLocalRequests, core.uskManager, false,
slowSerialExecutor);
}
public InsertContext getInsertContext(boolean forceNonPersistent) {
@@ -242,7 +242,7 @@
FetchContext ctx = getFetchContext(maxSize);
ctx.allowedMIMETypes = allowedTypes;
final ClientGetter get = new ClientGetter(nullCallback,
core.requestStarters.chkFetchScheduler, core.requestStarters.sskFetchScheduler,
uri, ctx, RequestStarter.PREFETCH_PRIORITY_CLASS, this, new NullBucket(), null);
- ctx.ticker.queueTimedJob(new Runnable() {
+ core.getTicker().queueTimedJob(new Runnable() {
public void run() {
get.cancel();
Modified: branches/db4o/freenet/src/freenet/client/async/ClientGetter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/ClientGetter.java
2008-06-14 11:14:27 UTC (rev 20331)
+++ branches/db4o/freenet/src/freenet/client/async/ClientGetter.java
2008-06-14 11:18:07 UTC (rev 20332)
@@ -154,7 +154,7 @@
Logger.minor(this, "client.async returned data
in returnBucket");
}
final FetchResult res = result;
- ctx.executor.execute(new PrioRunnable() {
+ context.mainExecutor.execute(new PrioRunnable() {
public void run() {
clientCallback.onSuccess(res,
ClientGetter.this);
}
@@ -204,7 +204,7 @@
e = new FetchException(e,
FetchException.ALL_DATA_NOT_FOUND);
Logger.minor(this, "onFailure("+e+", "+state+") on
"+this+" for "+uri, e);
final FetchException e1 = e;
- ctx.executor.execute(new PrioRunnable() {
+ context.mainExecutor.execute(new PrioRunnable() {
public void run() {
clientCallback.onFailure(e1,
ClientGetter.this);
}
Modified:
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
2008-06-14 11:14:27 UTC (rev 20331)
+++ branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
2008-06-14 11:18:07 UTC (rev 20332)
@@ -209,7 +209,7 @@
// Now decode
if(logMINOR) Logger.minor(this, "Decoding
"+SplitFileFetcherSegment.this);
- codec = FECCodec.getCodec(splitfileType, dataKeys.length,
checkKeys.length, blockFetchContext.executor);
+ codec = FECCodec.getCodec(splitfileType, dataKeys.length,
checkKeys.length, sched.getContext().mainExecutor);
if(splitfileType != Metadata.SPLITFILE_NONREDUNDANT) {
FECQueue queue = sched.getFECQueue();
