Author: toad
Date: 2009-01-16 14:05:04 +0000 (Fri, 16 Jan 2009)
New Revision: 25079
Modified:
trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
trunk/freenet/src/freenet/node/Node.java
Log:
Reject on 10 incoming turtles, not on turtles for 10 keys.
Show number of incoming turtles on stats page.
Modified: trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
2009-01-16 13:47:54 UTC (rev 25078)
+++ trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
2009-01-16 14:05:04 UTC (rev 25079)
@@ -916,6 +916,7 @@
int numSSKRequests = numLocalSSKRequests + numRemoteSSKRequests;
int numCHKInserts = numLocalCHKInserts + numRemoteCHKInserts;
int numSSKInserts = numLocalSSKInserts + numRemoteSSKInserts;
+ int numIncomingTurtles = node.getNumIncomingTurtles();
if ((numInserts == 0) && (numRequests == 0) &&
(numTransferringRequests == 0) &&
(numCHKRequests == 0) && (numSSKRequests == 0)
&&
(numCHKInserts == 0) && (numSSKInserts == 0) &&
@@ -937,7 +938,7 @@
}
if (numTransferringRequests > 0 ||
numTransferringRequestHandlers > 0) {
activityList.addChild("li",
L10n.getString("StatisticsToadlet.transferringRequests",
- new String[] { "senders",
"receivers" }, new String[] { Integer.toString(numTransferringRequests),
Integer.toString(numTransferringRequestHandlers)}));
+ new String[] { "senders",
"receivers", "turtles" }, new String[] {
Integer.toString(numTransferringRequests),
Integer.toString(numTransferringRequestHandlers),
Integer.toString(numIncomingTurtles)}));
}
if (numCHKOfferReplys > 0 || numSSKOfferReplys > 0) {
activityList.addChild("li",
L10n.getString("StatisticsToadlet.offerReplys",
Modified: trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
===================================================================
--- trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties 2009-01-16
13:47:54 UTC (rev 25078)
+++ trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties 2009-01-16
14:05:04 UTC (rev 25079)
@@ -1228,7 +1228,7 @@
StatisticsToadlet.requestOutput=Request output (excluding payload): CHK ${chk}
SSK ${ssk}.
StatisticsToadlet.totalInput=Total Input: ${total} (${rate}/sec)
StatisticsToadlet.totalOutput=Total Output: ${total} (${rate}/sec)
-StatisticsToadlet.transferringRequests=Transferring Requests: sending
${senders}, receiving ${receivers}
+StatisticsToadlet.transferringRequests=Transferring Requests: sending
${senders}, receiving ${receivers}, receiving turtles ${turtles}
StatisticsToadlet.uomBytes=Updater Output: ${total}
StatisticsToadlet.unaccountedBytes=Other output: ${total} (${percent}%)
StatisticsToadlet.usedMemory=Used Java memory: ${memory}
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2009-01-16 13:47:54 UTC (rev
25078)
+++ trunk/freenet/src/freenet/node/Node.java 2009-01-16 14:05:04 UTC (rev
25079)
@@ -4114,7 +4114,7 @@
private boolean registerTurtleTransfer(RequestSender sender) {
Key key = sender.key;
synchronized(turtlingTransfers) {
- if(turtlingTransfers.size() >= MAX_TURTLES) {
+ if(getNumIncomingTurtles() >= MAX_TURTLES) {
System.err.println("Too many turtles running
globally");
return false;
}
@@ -4187,5 +4187,13 @@
}
}
+ public int getNumIncomingTurtles() {
+ synchronized(turtlingTransfers) {
+ int turtles = 0;
+ for(RequestSender[] senders :
turtlingTransfers.values())
+ turtles += senders.length;
+ return turtles;
+ }
+ }
}
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
