Author: toad
Date: 2009-04-02 21:11:09 +0000 (Thu, 02 Apr 2009)
New Revision: 26384
Modified:
trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
trunk/freenet/src/freenet/client/async/PersistentChosenBlock.java
trunk/freenet/src/freenet/client/async/TransientChosenBlock.java
trunk/freenet/src/freenet/node/RequestScheduler.java
Log:
Minor refactor, delete obsolete comment
Modified: trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
2009-04-02 20:59:07 UTC (rev 26383)
+++ trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
2009-04-02 21:11:09 UTC (rev 26384)
@@ -905,16 +905,10 @@
return choosenPriorityScheduler;
}
- /*
- * tripPendingKey() callbacks must run quickly, since we've found a
block.
- * succeeded() must run quickly, since we delete the
PersistentChosenRequest.
- * tripPendingKey() must run before succeeded() so we don't choose the
same
- * request again, then remove it from pendingKeys before it completes!
- */
static final short TRIP_PENDING_PRIORITY = NativeThread.HIGH_PRIORITY-1;
- public synchronized void succeeded(final BaseSendableGet succeeded,
final ChosenBlock req) {
- if(req.isPersistent()) {
+ public synchronized void succeeded(final BaseSendableGet succeeded,
boolean persistent) {
+ if(persistent) {
jobRunner.queue(new DBJob() {
public void run(ObjectContainer container,
ClientContext context) {
Modified: trunk/freenet/src/freenet/client/async/PersistentChosenBlock.java
===================================================================
--- trunk/freenet/src/freenet/client/async/PersistentChosenBlock.java
2009-04-02 20:59:07 UTC (rev 26383)
+++ trunk/freenet/src/freenet/client/async/PersistentChosenBlock.java
2009-04-02 21:11:09 UTC (rev 26384)
@@ -52,7 +52,7 @@
fetchSucceeded = true;
}
parent.onFinished(this, context);
- parent.scheduler.succeeded((SendableGet)parent.request, this);
+ parent.scheduler.succeeded((SendableGet)parent.request, true);
}
@Override
Modified: trunk/freenet/src/freenet/client/async/TransientChosenBlock.java
===================================================================
--- trunk/freenet/src/freenet/client/async/TransientChosenBlock.java
2009-04-02 20:59:07 UTC (rev 26383)
+++ trunk/freenet/src/freenet/client/async/TransientChosenBlock.java
2009-04-02 21:11:09 UTC (rev 26384)
@@ -57,7 +57,7 @@
@Override
public void onFetchSuccess(ClientContext context) {
- sched.succeeded((SendableGet)request, this);
+ sched.succeeded((SendableGet)request, false);
}
@Override
Modified: trunk/freenet/src/freenet/node/RequestScheduler.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestScheduler.java 2009-04-02
20:59:07 UTC (rev 26383)
+++ trunk/freenet/src/freenet/node/RequestScheduler.java 2009-04-02
21:11:09 UTC (rev 26384)
@@ -19,10 +19,10 @@
* Tell the scheduler that a request from a specific RandomGrabArray
succeeded.
* Definition of "succeeded" will vary, but the point is most
schedulers will run another
* request from the parentGrabArray in the near future on the theory
that if one works,
- * another may also work. Also, delete the ChosenRequest if it is
persistent.
+ * another may also work.
* @param req The request we ran, which must be deleted.
* */
- public void succeeded(BaseSendableGet get, ChosenBlock req);
+ public void succeeded(BaseSendableGet get, boolean persistent);
/**
* After a key has been requested a few times, it is added to the
cooldown queue for
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
