Author: j16sdiz
Date: 2009-04-22 06:26:12 +0000 (Wed, 22 Apr 2009)
New Revision: 27192
Modified:
trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
trunk/freenet/src/freenet/node/LocationManager.java
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/node/NodeStats.java
trunk/freenet/src/freenet/node/simulator/RealNodeRoutingTest.java
Log:
Remove unused field: swapsRejectedLoop
Modified: trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
2009-04-22 06:25:31 UTC (rev 27191)
+++ trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
2009-04-22 06:26:12 UTC (rev 27192)
@@ -651,7 +651,6 @@
int swapsRejectedAlreadyLocked =
node.getSwapsRejectedAlreadyLocked();
int swapsRejectedNowhereToGo =
node.getSwapsRejectedNowhereToGo();
int swapsRejectedRateLimit = node.getSwapsRejectedRateLimit();
- int swapsRejectedLoop = node.getSwapsRejectedLoop();
int swapsRejectedRecognizedID =
node.getSwapsRejectedRecognizedID();
double locChangeSession = node.getLocationChangeSession();
int averageSwapTime = node.getAverageOutgoingSwapTime();
@@ -694,9 +693,6 @@
if (swapsRejectedRateLimit > 0) {
locationSwapList.addChild("li",
"swapsRejectedRateLimit:\u00a0" + swapsRejectedRateLimit);
}
- if (swapsRejectedLoop > 0) {
- locationSwapList.addChild("li",
"swapsRejectedLoop:\u00a0" + swapsRejectedLoop);
- }
if (swapsRejectedRecognizedID > 0) {
locationSwapList.addChild("li",
"swapsRejectedRecognizedID:\u00a0" + swapsRejectedRecognizedID);
}
Modified: trunk/freenet/src/freenet/node/LocationManager.java
===================================================================
--- trunk/freenet/src/freenet/node/LocationManager.java 2009-04-22 06:25:31 UTC
(rev 27191)
+++ trunk/freenet/src/freenet/node/LocationManager.java 2009-04-22 06:26:12 UTC
(rev 27192)
@@ -666,7 +666,6 @@
public static int swapsRejectedAlreadyLocked;
public static int swapsRejectedNowhereToGo;
public static int swapsRejectedRateLimit;
- public static int swapsRejectedLoop;
public static int swapsRejectedRecognizedID;
long lockedTime;
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2009-04-22 06:25:31 UTC (rev
27191)
+++ trunk/freenet/src/freenet/node/Node.java 2009-04-22 06:26:12 UTC (rev
27192)
@@ -3714,10 +3714,6 @@
return LocationManager.swapsRejectedAlreadyLocked;
}
- public int getSwapsRejectedLoop() {
- return LocationManager.swapsRejectedLoop;
- }
-
public int getSwapsRejectedNowhereToGo() {
return LocationManager.swapsRejectedNowhereToGo;
}
Modified: trunk/freenet/src/freenet/node/NodeStats.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeStats.java 2009-04-22 06:25:31 UTC
(rev 27191)
+++ trunk/freenet/src/freenet/node/NodeStats.java 2009-04-22 06:26:12 UTC
(rev 27192)
@@ -1156,7 +1156,6 @@
int swapsRejectedAlreadyLocked =
node.getSwapsRejectedAlreadyLocked();
int swapsRejectedNowhereToGo =
node.getSwapsRejectedNowhereToGo();
int swapsRejectedRateLimit = node.getSwapsRejectedRateLimit();
- int swapsRejectedLoop = node.getSwapsRejectedLoop();
int swapsRejectedRecognizedID =
node.getSwapsRejectedRecognizedID();
double locationChangePerSession =
node.getLocationChangeSession();
double locationChangePerSwap = 0.0;
@@ -1191,7 +1190,6 @@
fs.put("swapsRejectedAlreadyLocked",
swapsRejectedAlreadyLocked);
fs.put("swapsRejectedNowhereToGo", swapsRejectedNowhereToGo);
fs.put("swapsRejectedRateLimit", swapsRejectedRateLimit);
- fs.put("swapsRejectedLoop", swapsRejectedLoop);
fs.put("swapsRejectedRecognizedID", swapsRejectedRecognizedID);
long fix32kb = 32 * 1024;
long cachedKeys = node.getChkDatacache().keyCount();
Modified: trunk/freenet/src/freenet/node/simulator/RealNodeRoutingTest.java
===================================================================
--- trunk/freenet/src/freenet/node/simulator/RealNodeRoutingTest.java
2009-04-22 06:25:31 UTC (rev 27191)
+++ trunk/freenet/src/freenet/node/simulator/RealNodeRoutingTest.java
2009-04-22 06:26:12 UTC (rev 27192)
@@ -107,7 +107,6 @@
System.err.println("Swaps rejected (already locked): "
+ LocationManager.swapsRejectedAlreadyLocked);
System.err.println("Swaps rejected (nowhere to go): " +
LocationManager.swapsRejectedNowhereToGo);
System.err.println("Swaps rejected (rate limit): " +
LocationManager.swapsRejectedRateLimit);
- System.err.println("Swaps rejected (loop): " +
LocationManager.swapsRejectedLoop);
System.err.println("Swaps rejected (recognized ID):" +
LocationManager.swapsRejectedRecognizedID);
System.err.println("Swaps failed:" +
LocationManager.noSwaps);
System.err.println("Swaps succeeded:" +
LocationManager.swaps);
@@ -170,7 +169,6 @@
System.err.println("Total rejected swaps
(already locked): " + LocationManager.swapsRejectedAlreadyLocked);
System.err.println("Total swaps rejected
(nowhere to go): " + LocationManager.swapsRejectedNowhereToGo);
System.err.println("Total swaps rejected (rate
limit): " + LocationManager.swapsRejectedRateLimit);
- System.err.println("Total swaps rejected
(loop): " + LocationManager.swapsRejectedLoop);
System.err.println("Total swaps rejected
(recognized ID):" + LocationManager.swapsRejectedRecognizedID);
System.err.println("Total swaps failed:" +
LocationManager.noSwaps);
System.err.println("Total swaps succeeded:" +
LocationManager.swaps);
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
