Author: toad
Date: 2008-08-07 22:11:21 +0000 (Thu, 07 Aug 2008)
New Revision: 21658
Modified:
branches/db4o/freenet/src/freenet/clients/http/QueueToadlet.java
Log:
Show total bytes queued to download/upload in log when loading the queue page.
FIXME: make this part of the queue page.
Modified: branches/db4o/freenet/src/freenet/clients/http/QueueToadlet.java
===================================================================
--- branches/db4o/freenet/src/freenet/clients/http/QueueToadlet.java
2008-08-07 18:30:55 UTC (rev 21657)
+++ branches/db4o/freenet/src/freenet/clients/http/QueueToadlet.java
2008-08-07 22:11:21 UTC (rev 21658)
@@ -591,6 +591,9 @@
short lowestQueuedPrio = RequestStarter.MINIMUM_PRIORITY_CLASS;
+ long totalQueuedDownloadSize = 0;
+ long totalQueuedUploadSize = 0;
+
for(int i=0;i<reqs.length;i++) {
ClientRequest req = reqs[i];
if(req instanceof ClientGet) {
@@ -610,6 +613,9 @@
if(prio < lowestQueuedPrio)
lowestQueuedPrio = prio;
uncompletedDownload.add(cg);
+ long size = cg.getDataSize(container);
+ if(size > 0)
+ totalQueuedDownloadSize += size;
}
} else if(req instanceof ClientPut) {
ClientPut cp = (ClientPut) req;
@@ -623,6 +629,9 @@
lowestQueuedPrio = prio;
uncompletedUpload.add(cp);
}
+ long size = cp.getDataSize();
+ if(size > 0)
+ totalQueuedUploadSize += size;
} else if(req instanceof ClientPutDir) {
ClientPutDir cp = (ClientPutDir) req;
if(cp.hasSucceeded()) {
@@ -635,8 +644,13 @@
lowestQueuedPrio = prio;
uncompletedDirUpload.add(cp);
}
+ long size = cp.getTotalDataSize();
+ if(size > 0)
+ totalQueuedUploadSize += size;
}
}
+ System.err.println("Total queued downloads:
"+SizeUtil.formatSize(totalQueuedDownloadSize));
+ System.err.println("Total queued uploads:
"+SizeUtil.formatSize(totalQueuedUploadSize));
Comparator jobComparator = new Comparator() {
public int compare(Object first, Object second) {
