Author: dconrado
Date: 2009-04-14 20:20:18 +0000 (Tue, 14 Apr 2009)
New Revision: 26808
Modified:
trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java
trunk/freenet/src/freenet/node/PeerNodeStatus.java
Log:
Show total data transferred to/from a peer over its entire lifetime. Adding a
new column on Connections to friends/strangers in advanced interface mode with
total traffic since source after total traffic.
Modified: trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java
2009-04-14 20:14:17 UTC (rev 26807)
+++ trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java
2009-04-14 20:20:18 UTC (rev 26808)
@@ -117,9 +117,9 @@
long total1 =
firstNode.getTotalInputBytes()+firstNode.getTotalOutputBytes();
long total2 =
secondNode.getTotalInputBytes()+secondNode.getTotalOutputBytes();
return compareLongs(total1, total2);
- }else if(sortBy.equals("total_traffic_since_restart")){
- long total1 =
firstNode.getTotalInputBytes()+firstNode.getTotalInputSinceSource();
- long total2 =
secondNode.getTotalInputBytes()+secondNode.getTotalOutputSinceSource();
+ }else if(sortBy.equals("total_traffic_since_startup")){
+ long total1 =
firstNode.getTotalInputBytes()+firstNode.getTotalInputSinceStartup();
+ long total2 =
secondNode.getTotalInputBytes()+secondNode.getTotalOutputSinceStartup();
return compareLongs(total1, total2);
}else if(sortBy.equals("selection_percentage")){
return
Double.compare(firstNode.getSelectionRate(), secondNode.getSelectionRate());
@@ -406,7 +406,7 @@
peerTableHeaderRow.addChild("th").addChild("a", "href", sortString(isReversed,
"time_routable")).addChild("#", "%\u00a0Time Routable");
peerTableHeaderRow.addChild("th").addChild("a", "href", sortString(isReversed,
"selection_percentage")).addChild("#", "%\u00a0Selection");
peerTableHeaderRow.addChild("th").addChild("a", "href", sortString(isReversed,
"total_traffic")).addChild("#", "Total\u00a0Traffic\u00a0(in/out/resent)");
-
peerTableHeaderRow.addChild("th").addChild("a", "href", sortString(isReversed,
"total_traffic_since_restart")).addChild("#", "Total\u00a0Traffic\u00a0(in/out)
since restart");
+
peerTableHeaderRow.addChild("th").addChild("a", "href", sortString(isReversed,
"total_traffic_since_startup")).addChild("#", "Total\u00a0Traffic\u00a0(in/out)
since startup");
peerTableHeaderRow.addChild("th",
"Congestion\u00a0Control");
peerTableHeaderRow.addChild("th").addChild("a", "href", sortString(isReversed,
"time_delta")).addChild("#", "Time\u00a0Delta");
peerTableHeaderRow.addChild("th").addChild("a", "href", sortString(isReversed,
"uptime")).addChild("#", "Reported\u00a0Uptime");
Modified: trunk/freenet/src/freenet/node/PeerNodeStatus.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNodeStatus.java 2009-04-14 20:14:17 UTC
(rev 26807)
+++ trunk/freenet/src/freenet/node/PeerNodeStatus.java 2009-04-14 20:20:18 UTC
(rev 26808)
@@ -76,9 +76,9 @@
private long totalBytesOut;
- private long totalBytesInSinceSource;
+ private long totalBytesInSinceStartup;
- private long totalBytesOutSinceSource;
+ private long totalBytesOutSinceStartup;
private double percentTimeRoutableConnection;
@@ -142,8 +142,8 @@
this.pReject = peerNode.getPRejected();
this.totalBytesIn = peerNode.getTotalInputBytes();
this.totalBytesOut = peerNode.getTotalOutputBytes();
- this.totalBytesInSinceSource =
peerNode.getTotalInputSinceSource();
- this.totalBytesOutSinceSource =
peerNode.getTotalOutputSinceSource();
+ this.totalBytesInSinceStartup =
peerNode.getTotalInputSinceStartup();
+ this.totalBytesOutSinceStartup =
peerNode.getTotalOutputSinceStartup();
this.percentTimeRoutableConnection =
peerNode.getPercentTimeRoutableConnection();
this.throttle = peerNode.getThrottle();
this.clockDelta = peerNode.getClockDelta();
@@ -366,12 +366,12 @@
return totalBytesOut;
}
- public long getTotalInputSinceSource() {
- return totalBytesInSinceSource;
+ public long getTotalInputSinceStartup() {
+ return totalBytesInSinceStartup;
}
- public long getTotalOutputSinceSource() {
- return totalBytesOutSinceSource;
+ public long getTotalOutputSinceStartup() {
+ return totalBytesOutSinceStartup;
}
public double getPercentTimeRoutableConnection() {
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
