Author: toad
Date: 2005-11-18 16:30:33 +0000 (Fri, 18 Nov 2005)
New Revision: 7565
Modified:
trunk/freenet/src/freenet/io/comm/UdpSocketManager.java
trunk/freenet/src/freenet/node/RequestSender.java
trunk/freenet/src/freenet/node/Version.java
Log:
195:
Logging to catch odd RejectedOverload race.
Modified: trunk/freenet/src/freenet/io/comm/UdpSocketManager.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/UdpSocketManager.java 2005-11-18
16:06:58 UTC (rev 7564)
+++ trunk/freenet/src/freenet/io/comm/UdpSocketManager.java 2005-11-18
16:30:33 UTC (rev 7565)
@@ -258,6 +258,7 @@
* filters after we return from dispatcher, for example.
*/
synchronized (_filters) {
+ Logger.minor(this, "Rechecking filters and
adding message");
for (ListIterator i = _filters.listIterator();
i.hasNext();) {
MessageFilter f = (MessageFilter)
i.next();
if (f.match(m)) {
@@ -277,6 +278,7 @@
}
_unclaimed.addLast(m);
}
+ Logger.minor(this, "Done");
}
}
}
@@ -300,6 +302,7 @@
}
public Message waitFor(MessageFilter filter) throws
DisconnectedException {
+ Logger.debug(this, "Waiting for "+filter);
long startTime = System.currentTimeMillis();
Message ret = null;
if(lowLevelFilter != null && filter._source != null &&
@@ -308,7 +311,7 @@
throw new DisconnectedException();
// Check to see whether the filter matches any of the recently
_unclaimed messages
synchronized (_filters) {
- Logger.debug(this, "Checking _unclaimed");
+ Logger.minor(this, "Checking _unclaimed");
for (ListIterator i = _unclaimed.listIterator();
i.hasNext();) {
Message m = (Message) i.next();
if (filter.match(m)) {
@@ -341,7 +344,7 @@
// Waiting on the filter won't release the outer lock
// So we have to release it here
if(ret == null) {
- Logger.debug(this, "Waiting...");
+ Logger.minor(this, "Waiting...");
synchronized (filter) {
try {
// Precaution against filter getting
matched between being added to _filters and
Modified: trunk/freenet/src/freenet/node/RequestSender.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestSender.java 2005-11-18 16:06:58 UTC
(rev 7564)
+++ trunk/freenet/src/freenet/node/RequestSender.java 2005-11-18 16:30:33 UTC
(rev 7565)
@@ -111,12 +111,12 @@
finish(ROUTE_NOT_FOUND, null);
return;
}
- Logger.minor(this, "Routing insert to "+next);
+ Logger.minor(this, "Routing request to "+next);
nodesRoutedTo.add(next);
if(Math.abs(target - nextValue) > Math.abs(target - nearestLoc)) {
- Logger.minor(this, "Backtracking: target="+target+"
next="+nextValue+" closest="+nearestLoc);
htl = node.decrementHTL(source, htl);
+ Logger.minor(this, "Backtracking: target="+target+"
next="+nextValue+" closest="+nearestLoc+" so htl="+htl);
}
Message req = DMT.createFNPDataRequest(uid, htl, key, nearestLoc);
Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2005-11-18 16:06:58 UTC (rev
7564)
+++ trunk/freenet/src/freenet/node/Version.java 2005-11-18 16:30:33 UTC (rev
7565)
@@ -20,10 +20,10 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- public static final int buildNumber = 194;
+ public static final int buildNumber = 195;
/** Oldest build of Fred we will talk to */
- public static final int lastGoodBuild = 194;
+ public static final int lastGoodBuild = 195;
/** The highest reported build of fred */
public static int highestSeenBuild = buildNumber;
