Author: toad
Date: 2008-06-18 22:53:39 +0000 (Wed, 18 Jun 2008)
New Revision: 20467
Modified:
branches/db4o/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
branches/db4o/freenet/src/freenet/client/InsertContext.java
branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
branches/db4o/freenet/src/freenet/client/async/USKInserter.java
branches/db4o/freenet/src/freenet/node/NodeClientCore.java
branches/db4o/freenet/src/freenet/node/RequestStarter.java
Log:
Remove USKManager from InsertContext
Modified:
branches/db4o/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
2008-06-18 22:14:08 UTC (rev 20466)
+++ branches/db4o/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
2008-06-18 22:53:39 UTC (rev 20467)
@@ -197,7 +197,7 @@
forceNonPersistent ? new
NullPersistentFileTracker() : persistentFileTracker,
INSERT_RETRIES, CONSECUTIVE_RNFS_ASSUME_SUCCESS,
SPLITFILE_INSERT_THREADS,
SPLITFILE_BLOCKS_PER_SEGMENT, SPLITFILE_CHECK_BLOCKS_PER_SEGMENT,
- globalEventProducer, cacheLocalRequests,
core.uskManager);
+ globalEventProducer, cacheLocalRequests);
}
public FreenetURI[] generateKeyPair(String docName) {
Modified: branches/db4o/freenet/src/freenet/client/InsertContext.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/InsertContext.java 2008-06-18
22:14:08 UTC (rev 20466)
+++ branches/db4o/freenet/src/freenet/client/InsertContext.java 2008-06-18
22:53:39 UTC (rev 20467)
@@ -27,15 +27,13 @@
public final ClientEventProducer eventProducer;
/** Interesting tradeoff, see comments at top of Node.java. */
public final boolean cacheLocalRequests;
- public final USKManager uskManager;
public InsertContext(BucketFactory bf, BucketFactory persistentBF,
PersistentFileTracker tracker,
int maxRetries, int rnfsToSuccess, int maxThreads, int
splitfileSegmentDataBlocks, int splitfileSegmentCheckBlocks,
- ClientEventProducer eventProducer, boolean
cacheLocalRequests, USKManager uskManager) {
+ ClientEventProducer eventProducer, boolean
cacheLocalRequests) {
this.bf = bf;
this.persistentFileTracker = tracker;
this.persistentBucketFactory = persistentBF;
- this.uskManager = uskManager;
dontCompress = false;
splitfileAlgorithm = Metadata.SPLITFILE_ONION_STANDARD;
this.consecutiveRNFsCountAsSuccess = rnfsToSuccess;
@@ -49,7 +47,6 @@
public InsertContext(InsertContext ctx, SimpleEventProducer producer,
boolean forceNonPersistent) {
this.persistentFileTracker = forceNonPersistent ? new
NullPersistentFileTracker() : ctx.persistentFileTracker;
- this.uskManager = ctx.uskManager;
this.bf = ctx.bf;
this.persistentBucketFactory = forceNonPersistent ? ctx.bf :
ctx.persistentBucketFactory;
this.dontCompress = ctx.dontCompress;
@@ -65,7 +62,6 @@
public InsertContext(InsertContext ctx, SimpleEventProducer producer) {
this.persistentFileTracker = ctx.persistentFileTracker;
- this.uskManager = ctx.uskManager;
this.bf = ctx.bf;
this.persistentBucketFactory = ctx.persistentBucketFactory;
this.dontCompress = ctx.dontCompress;
Modified:
branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
2008-06-18 22:14:08 UTC (rev 20466)
+++ branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
2008-06-18 22:53:39 UTC (rev 20467)
@@ -312,6 +312,7 @@
}
schedCore.innerRegister(req, random);
schedCore.deleteRegisterMe(req);
+ starter.wakeUp();
} else {
databaseExecutor.execute(new Runnable() {
public void run() {
Modified: branches/db4o/freenet/src/freenet/client/async/USKInserter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/USKInserter.java
2008-06-18 22:14:08 UTC (rev 20466)
+++ branches/db4o/freenet/src/freenet/client/async/USKInserter.java
2008-06-18 22:53:39 UTC (rev 20467)
@@ -76,7 +76,7 @@
if(Logger.shouldLog(Logger.MINOR, this))
Logger.minor(this, "scheduling fetcher for
"+pubUSK.getURI());
if(finished) return;
- fetcher =
ctx.uskManager.getFetcherForInsertDontSchedule(pubUSK, parent.priorityClass,
this, parent.getClient(), container, context);
+ fetcher =
context.uskManager.getFetcherForInsertDontSchedule(pubUSK,
parent.priorityClass, this, parent.getClient(), container, context);
}
fetcher.schedule(container, context);
}
@@ -118,7 +118,7 @@
}
private void scheduleInsert(ObjectContainer container, ClientContext
context) {
- long edNo = Math.max(edition, ctx.uskManager.lookup(pubUSK)+1);
+ long edNo = Math.max(edition,
context.uskManager.lookup(pubUSK)+1);
synchronized(this) {
if(finished) return;
edition = edNo;
@@ -146,7 +146,7 @@
else {
if(Logger.shouldLog(Logger.MINOR, this))
Logger.minor(this, "URI should be "+targetURI+"
actually is "+realURI);
- ctx.uskManager.update(pubUSK, edition, context);
+ context.uskManager.update(pubUSK, edition, context);
}
// FINISHED!!!! Yay!!!
}
Modified: branches/db4o/freenet/src/freenet/node/NodeClientCore.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/NodeClientCore.java 2008-06-18
22:14:08 UTC (rev 20466)
+++ branches/db4o/freenet/src/freenet/node/NodeClientCore.java 2008-06-18
22:53:39 UTC (rev 20467)
@@ -305,7 +305,7 @@
healingQueue = new
SimpleHealingQueue(requestStarters.chkPutScheduler,
new InsertContext(tempBucketFactory,
tempBucketFactory, persistentTempBucketFactory,
0, 2, 1, 0, 0, new
SimpleEventProducer(),
-
!Node.DONT_CACHE_LOCAL_REQUESTS, uskManager),
RequestStarter.PREFETCH_PRIORITY_CLASS, 512 /* FIXME make configurable */);
+
!Node.DONT_CACHE_LOCAL_REQUESTS), RequestStarter.PREFETCH_PRIORITY_CLASS, 512
/* FIXME make configurable */);
nodeConfig.register("lazyResume", false, sortOrder++, true,
false, "NodeClientCore.lazyResume",
"NodeClientCore.lazyResumeLong", new
BooleanCallback() {
Modified: branches/db4o/freenet/src/freenet/node/RequestStarter.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/RequestStarter.java 2008-06-18
22:14:08 UTC (rev 20466)
+++ branches/db4o/freenet/src/freenet/node/RequestStarter.java 2008-06-18
22:53:39 UTC (rev 20467)
@@ -165,7 +165,7 @@
req = getRequest();
if(req == null) {
try {
- wait(1*1000); // as
close to indefinite as I'm comfortable with! Toad
+ wait(100*1000); // as
close to indefinite as I'm comfortable with! Toad
} catch (InterruptedException
e) {
// Ignore
}
