Author: toad
Date: 2009-02-04 17:49:14 +0000 (Wed, 04 Feb 2009)
New Revision: 25544
Modified:
branches/db4o/freenet/src/freenet/client/async/BaseSingleFileFetcher.java
branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerBase.java
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
branches/db4o/freenet/src/freenet/client/async/OfferedKeysList.java
branches/db4o/freenet/src/freenet/client/async/SingleBlockInserter.java
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java
branches/db4o/freenet/src/freenet/node/SendableRequest.java
branches/db4o/freenet/src/freenet/node/SimpleSendableInsert.java
Log:
Pass in context to allKeys and sendableKeys
Modified:
branches/db4o/freenet/src/freenet/client/async/BaseSingleFileFetcher.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/BaseSingleFileFetcher.java
2009-02-04 15:51:57 UTC (rev 25543)
+++ branches/db4o/freenet/src/freenet/client/async/BaseSingleFileFetcher.java
2009-02-04 17:49:14 UTC (rev 25544)
@@ -50,12 +50,12 @@
}
@Override
- public SendableRequestItem[] allKeys(ObjectContainer container) {
+ public SendableRequestItem[] allKeys(ObjectContainer container,
ClientContext context) {
return keys;
}
@Override
- public SendableRequestItem[] sendableKeys(ObjectContainer container) {
+ public SendableRequestItem[] sendableKeys(ObjectContainer container,
ClientContext context) {
return keys;
}
Modified:
branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
2009-02-04 15:51:57 UTC (rev 25543)
+++ branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
2009-02-04 17:49:14 UTC (rev 25544)
@@ -1020,7 +1020,7 @@
}
public long countTransientQueuedRequests() {
- return schedTransient.countQueuedRequests(null);
+ return schedTransient.countQueuedRequests(null, clientContext);
}
public KeysFetchingLocally fetchingKeys() {
@@ -1105,7 +1105,7 @@
}
public long countPersistentQueuedRequests(ObjectContainer container) {
- return schedCore.countQueuedRequests(container);
+ return schedCore.countQueuedRequests(container, clientContext);
}
public boolean isQueueAlmostEmpty() {
Modified:
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerBase.java
===================================================================
---
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerBase.java
2009-02-04 15:51:57 UTC (rev 25543)
+++
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerBase.java
2009-02-04 17:49:14 UTC (rev 25544)
@@ -406,7 +406,7 @@
return sb.toString();
}
- public synchronized long countQueuedRequests(ObjectContainer container)
{
+ public synchronized long countQueuedRequests(ObjectContainer container,
ClientContext context) {
long total = 0;
for(int i=0;i<priorities.length;i++) {
SortedVectorByNumber prio = priorities[i];
@@ -442,8 +442,8 @@
SendableRequest
req = (SendableRequest) rga.get(m, container);
if(req == null)
continue;
container.activate(req, 1);
- sendable +=
req.sendableKeys(container).length;
- all +=
req.allKeys(container).length;
+ sendable +=
req.sendableKeys(container, context).length;
+ all +=
req.allKeys(container, context).length;
container.deactivate(req, 1);
}
System.out.println("Sendable keys: "+sendable+" all keys "+all+" diff
"+(all-sendable));
Modified:
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
===================================================================
---
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
2009-02-04 15:51:57 UTC (rev 25543)
+++
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
2009-02-04 17:49:14 UTC (rev 25544)
@@ -738,8 +738,8 @@
startRegisterMeRunner(runner);
}
- public synchronized long countQueuedRequests(ObjectContainer container)
{
- long ret = super.countQueuedRequests(container);
+ public synchronized long countQueuedRequests(ObjectContainer container,
ClientContext context) {
+ long ret = super.countQueuedRequests(container, context);
long cooldown = persistentCooldownQueue.size(container);
System.out.println("Cooldown queue size: "+cooldown);
return ret + cooldown;
Modified: branches/db4o/freenet/src/freenet/client/async/OfferedKeysList.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/OfferedKeysList.java
2009-02-04 15:51:57 UTC (rev 25543)
+++ branches/db4o/freenet/src/freenet/client/async/OfferedKeysList.java
2009-02-04 17:49:14 UTC (rev 25544)
@@ -72,13 +72,13 @@
}
@Override
- public SendableRequestItem[] allKeys(ObjectContainer container) {
+ public SendableRequestItem[] allKeys(ObjectContainer container,
ClientContext context) {
// Not supported.
throw new UnsupportedOperationException();
}
@Override
- public SendableRequestItem[] sendableKeys(ObjectContainer container) {
+ public SendableRequestItem[] sendableKeys(ObjectContainer container,
ClientContext context) {
// Not supported.
throw new UnsupportedOperationException();
}
Modified:
branches/db4o/freenet/src/freenet/client/async/SingleBlockInserter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SingleBlockInserter.java
2009-02-04 15:51:57 UTC (rev 25543)
+++ branches/db4o/freenet/src/freenet/client/async/SingleBlockInserter.java
2009-02-04 17:49:14 UTC (rev 25544)
@@ -523,7 +523,7 @@
}
@Override
- public synchronized SendableRequestItem[] sendableKeys(ObjectContainer
container) {
+ public synchronized SendableRequestItem[] sendableKeys(ObjectContainer
container, ClientContext context) {
if(finished)
return new SendableRequestItem[] {};
else
@@ -531,8 +531,8 @@
}
@Override
- public synchronized SendableRequestItem[] allKeys(ObjectContainer
container) {
- return sendableKeys(container);
+ public synchronized SendableRequestItem[] allKeys(ObjectContainer
container, ClientContext context) {
+ return sendableKeys(container, context);
}
@Override
Modified:
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java
===================================================================
---
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java
2009-02-04 15:51:57 UTC (rev 25543)
+++
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java
2009-02-04 17:49:14 UTC (rev 25544)
@@ -119,7 +119,7 @@
* those on cooldown queues. This is important when unregistering.
*/
@Override
- public SendableRequestItem[] allKeys(ObjectContainer container) {
+ public SendableRequestItem[] allKeys(ObjectContainer container,
ClientContext context) {
if(persistent) {
container.activate(this, 1);
container.activate(segment, 1);
@@ -134,7 +134,7 @@
* Just those keys which are eligible to be started now.
*/
@Override
- public SendableRequestItem[] sendableKeys(ObjectContainer container) {
+ public SendableRequestItem[] sendableKeys(ObjectContainer container,
ClientContext context) {
if(persistent) {
container.activate(this, 1);
container.activate(blockNums, 1);
Modified: branches/db4o/freenet/src/freenet/node/SendableRequest.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/SendableRequest.java 2009-02-04
15:51:57 UTC (rev 25543)
+++ branches/db4o/freenet/src/freenet/node/SendableRequest.java 2009-02-04
17:49:14 UTC (rev 25544)
@@ -52,11 +52,11 @@
/** All key identifiers. Including those not currently eligible to be
sent because
* they are on a cooldown queue, requests for them are in progress,
etc. */
- public abstract SendableRequestItem[] allKeys(ObjectContainer
container);
+ public abstract SendableRequestItem[] allKeys(ObjectContainer
container, ClientContext context);
/** All key identifiers currently eligible to be sent. Does not include
those
* currently running, on the cooldown queue etc. */
- public abstract SendableRequestItem[] sendableKeys(ObjectContainer
container);
+ public abstract SendableRequestItem[] sendableKeys(ObjectContainer
container, ClientContext context);
/**
* Get or create a SendableRequestSender for this object. This is a
non-persistent
Modified: branches/db4o/freenet/src/freenet/node/SimpleSendableInsert.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/SimpleSendableInsert.java
2009-02-04 15:51:57 UTC (rev 25543)
+++ branches/db4o/freenet/src/freenet/node/SimpleSendableInsert.java
2009-02-04 17:49:14 UTC (rev 25544)
@@ -150,13 +150,13 @@
};
@Override
- public synchronized SendableRequestItem[] allKeys(ObjectContainer
container) {
+ public synchronized SendableRequestItem[] allKeys(ObjectContainer
container, ClientContext context) {
if(finished) return new SendableRequestItem[] {};
return new SendableRequestItem[] {
NullSendableRequestItem.nullItem };
}
@Override
- public synchronized SendableRequestItem[] sendableKeys(ObjectContainer
container) {
+ public synchronized SendableRequestItem[] sendableKeys(ObjectContainer
container, ClientContext context) {
if(finished) return new SendableRequestItem[] {};
return new SendableRequestItem[] {
NullSendableRequestItem.nullItem };
}
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
