Author: zothar
Date: 2006-05-28 21:07:22 +0000 (Sun, 28 May 2006)
New Revision: 8903
Modified:
trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
trunk/freenet/src/freenet/node/PacketSender.java
trunk/freenet/src/freenet/node/PeerNode.java
trunk/freenet/src/freenet/node/Version.java
Log:
Some tweaks to the status updater/logger.
Modified: trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2006-05-28 20:58:04 UTC (rev 8902)
+++ trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2006-05-28 21:07:22 UTC (rev 8903)
@@ -111,6 +111,9 @@
long routingBackedOffUntil =
pn.getRoutingBackedOffUntil();
boolean routingBackedOffNow = (now <
routingBackedOffUntil);
int backoff =
(int)(Math.max(routingBackedOffUntil - now, 0));
+ // Don't list the backoff as zero before it's
actually zero
+ if(backoff > 0 && backoff < 1000 )
+ backoff = 1000;
long idle = pn.lastReceivedPacketTime();
// Elements must be HTML encoded.
Modified: trunk/freenet/src/freenet/node/PacketSender.java
===================================================================
--- trunk/freenet/src/freenet/node/PacketSender.java 2006-05-28 20:58:04 UTC
(rev 8902)
+++ trunk/freenet/src/freenet/node/PacketSender.java 2006-05-28 21:07:22 UTC
(rev 8903)
@@ -68,10 +68,15 @@
long now = System.currentTimeMillis();
PeerManager pm = node.peers;
PeerNode[] nodes = pm.myPeers;
+ // Run the time sensitive status updater separately
+ for(int i=0;i<nodes.length;i++) {
+ PeerNode pn = nodes[i];
+ pn.setPeerNodeStatus(now);
+ }
+ node.maybeLogPeerNodeStatusSummary(now);
long nextActionTime = Long.MAX_VALUE;
for(int i=0;i<nodes.length;i++) {
PeerNode pn = nodes[i];
- pn.setPeerNodeStatus(now);
lastReceivedPacketFromAnyNode =
Math.max(pn.lastReceivedPacketTime(),
lastReceivedPacketFromAnyNode);
if(pn.isConnected()) {
@@ -181,11 +186,15 @@
lastClearedOldSwapChains = now;
}
+ long oldNow = System.currentTimeMillis();
+
// Send may have taken some time
now = System.currentTimeMillis();
-
- node.maybeLogPeerNodeStatusSummary(now);
+ long nowDelta = now - oldNow;
+ if(nowDelta > (60*1000))
+ Logger.normal(this, "nowDelta("+nowDelta+") is greater than a
minute in PacketSender");
+
Vector jobsToRun = null;
synchronized(timedJobsByTime) {
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2006-05-28 20:58:04 UTC
(rev 8902)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2006-05-28 21:07:22 UTC
(rev 8903)
@@ -1425,6 +1425,7 @@
int x =
node.random.nextInt(routingBackoffLength);
routingBackedOffUntil = now + x;
setLastBackoffReason( reason );
+ setPeerNodeStatus(now);
String reasonWrapper = "";
if( 0 <= reason.length()) {
reasonWrapper = " because of
'"+reason+"'";
@@ -1448,6 +1449,7 @@
if(now > routingBackedOffUntil) {
routingBackoffLength =
INITIAL_ROUTING_BACKOFF_LENGTH;
Logger.minor(this, "Resetting routing backoff
on "+getPeer());
+ setPeerNodeStatus(now);
} else {
Logger.minor(this, "Ignoring
successNotOverload: "+(routingBackedOffUntil-now)+"ms remaining on routing
backoff on "+getPeer());
}
Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-05-28 20:58:04 UTC (rev
8902)
+++ trunk/freenet/src/freenet/node/Version.java 2006-05-28 21:07:22 UTC (rev
8903)
@@ -44,7 +44,7 @@
public static final int lastGoodStableBuild = 1;
/** Revision number of Version.java as read from CVS */
- public static final String cvsRevision = "@custom@";
+ public static final String cvsRevision = "8899M";
private static boolean logDEBUG =
Logger.shouldLog(Logger.DEBUG,Version.class);
