Author: toad
Date: 2008-04-22 13:55:40 +0000 (Tue, 22 Apr 2008)
New Revision: 19496
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:
Show the count of local requests on the stats page
Modified: trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
2008-04-22 13:44:48 UTC (rev 19495)
+++ trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
2008-04-22 13:55:40 UTC (rev 19496)
@@ -877,15 +877,23 @@
static HTMLNode drawActivity(HTMLNode activityInfoboxContent, Node
node) {
int numInserts = node.getNumInsertSenders();
- int numCHKInserts = node.getNumCHKInserts();
- int numSSKInserts = node.getNumSSKInserts();
+ int numLocalCHKInserts = node.getNumLocalCHKInserts();
+ int numRemoteCHKInserts = node.getNumRemoteCHKInserts();
+ int numLocalSSKInserts = node.getNumLocalSSKInserts();
+ int numRemoteSSKInserts = node.getNumRemoteSSKInserts();
int numRequests = node.getNumRequestSenders();
- int numCHKRequests = node.getNumCHKRequests();
- int numSSKRequests = node.getNumSSKRequests();
+ int numLocalCHKRequests = node.getNumLocalCHKRequests();
+ int numRemoteCHKRequests = node.getNumRemoteCHKRequests();
+ int numLocalSSKRequests = node.getNumLocalSSKRequests();
+ int numRemoteSSKRequests = node.getNumRemoteSSKRequests();
int numTransferringRequests =
node.getNumTransferringRequestSenders();
int numTransferringRequestHandlers =
node.getNumTransferringRequestHandlers();
int numCHKOfferReplys = node.getNumCHKOfferReplies();
int numSSKOfferReplys = node.getNumSSKOfferReplies();
+ int numCHKRequests = numLocalCHKRequests + numRemoteCHKRequests;
+ int numSSKRequests = numLocalSSKRequests + numRemoteSSKRequests;
+ int numCHKInserts = numLocalCHKInserts + numRemoteCHKInserts;
+ int numSSKInserts = numLocalSSKInserts + numRemoteSSKInserts;
if ((numInserts == 0) && (numRequests == 0) &&
(numTransferringRequests == 0) &&
(numCHKRequests == 0) && (numSSKRequests == 0)
&&
(numCHKInserts == 0) && (numSSKInserts == 0) &&
@@ -897,13 +905,13 @@
HTMLNode activityList =
activityInfoboxContent.addChild("ul");
if (numInserts > 0 || numCHKInserts > 0 ||
numSSKInserts > 0) {
activityList.addChild("li",
L10n.getString("StatisticsToadlet.activityInserts",
- new String[] { "totalSenders",
"CHKhandlers", "SSKhandlers" } ,
- new String[] {
Integer.toString(numInserts), Integer.toString(numCHKInserts),
Integer.toString(numSSKInserts)}));
+ new String[] { "totalSenders",
"CHKhandlers", "SSKhandlers", "local" } ,
+ new String[] {
Integer.toString(numInserts), Integer.toString(numCHKInserts),
Integer.toString(numSSKInserts), Integer.toString(numLocalCHKInserts +
numLocalSSKInserts)}));
}
if (numRequests > 0 || numCHKRequests > 0 ||
numSSKRequests > 0) {
activityList.addChild("li",
L10n.getString("StatisticsToadlet.activityRequests",
- new String[] { "totalSenders",
"CHKhandlers", "SSKhandlers" } ,
- new String[] {
Integer.toString(numRequests), Integer.toString(numCHKRequests),
Integer.toString(numSSKRequests)}));
+ new String[] { "totalSenders",
"CHKhandlers", "SSKhandlers", "local" } ,
+ new String[] {
Integer.toString(numRequests), Integer.toString(numCHKRequests),
Integer.toString(numSSKRequests), Integer.toString(numLocalCHKRequests +
numLocalSSKRequests)}));
}
if (numTransferringRequests > 0 ||
numTransferringRequestHandlers > 0) {
activityList.addChild("li",
L10n.getString("StatisticsToadlet.transferringRequests",
Modified: trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
===================================================================
--- trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties 2008-04-22
13:44:48 UTC (rev 19495)
+++ trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties 2008-04-22
13:55:40 UTC (rev 19496)
@@ -1019,8 +1019,8 @@
StaticToadlet.pathNotFound=The path you specified doesn't exist.
StaticToadlet.pathNotFoundTitle=Path Not Found
StatisticsToadlet.ackOnlyBytes=Ack-only packets: ${total}
-StatisticsToadlet.activityInserts=Inserts: ${totalSenders} total senders,
${CHKhandlers} CHK handlers, ${SSKhandlers} SSK handlers
-StatisticsToadlet.activityRequests=Requests: ${totalSenders} total senders,
${CHKhandlers} CHK handlers, ${SSKhandlers} SSK handlers
+StatisticsToadlet.activityInserts=Inserts: ${totalSenders} total senders,
${CHKhandlers} CHK handlers, ${SSKhandlers} SSK handlers (${local} local)
+StatisticsToadlet.activityRequests=Requests: ${totalSenders} total senders,
${CHKhandlers} CHK handlers, ${SSKhandlers} SSK handlers (${local} local)
StatisticsToadlet.adminBytes=Admin bytes: ${initial} initial messages,
${changedIP} IP change messages, ${disconn} disconnection notifications,
${routingStatus} routing status
StatisticsToadlet.allocMemory=Allocated Java memory: ${memory}
StatisticsToadlet.announceBytes=Announcement output: ${total}
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2008-04-22 13:44:48 UTC (rev
19495)
+++ trunk/freenet/src/freenet/node/Node.java 2008-04-22 13:55:40 UTC (rev
19496)
@@ -2490,6 +2490,38 @@
return runningCHKPutUIDs.size() + runningLocalCHKPutUIDs.size();
}
+ public int getNumLocalSSKRequests() {
+ return runningLocalSSKGetUIDs.size();
+ }
+
+ public int getNumLocalCHKRequests() {
+ return runningLocalCHKGetUIDs.size();
+ }
+
+ public int getNumRemoteSSKRequests() {
+ return runningSSKGetUIDs.size();
+ }
+
+ public int getNumRemoteCHKRequests() {
+ return runningCHKGetUIDs.size();
+ }
+
+ public int getNumLocalSSKInserts() {
+ return runningLocalSSKPutUIDs.size();
+ }
+
+ public int getNumLocalCHKInserts() {
+ return runningLocalCHKPutUIDs.size();
+ }
+
+ public int getNumRemoteSSKInserts() {
+ return runningSSKPutUIDs.size();
+ }
+
+ public int getNumRemoteCHKInserts() {
+ return runningCHKPutUIDs.size();
+ }
+
public int getNumSSKOfferReplies() {
return runningSSKOfferReplyUIDs.size();
}
