Author: toad
Date: 2007-07-17 17:48:04 +0000 (Tue, 17 Jul 2007)
New Revision: 14170
Modified:
trunk/freenet/src/freenet/node/GlobalProbe.java
trunk/freenet/src/freenet/node/NodeDispatcher.java
Log:
Probe trace logging
Modified: trunk/freenet/src/freenet/node/GlobalProbe.java
===================================================================
--- trunk/freenet/src/freenet/node/GlobalProbe.java 2007-07-17 17:39:49 UTC
(rev 14169)
+++ trunk/freenet/src/freenet/node/GlobalProbe.java 2007-07-17 17:48:04 UTC
(rev 14170)
@@ -31,8 +31,8 @@
}
public void onTrace(long uid, double target, double
nearest, double best, short htl, short counter, double location, long nodeUID,
double[] peerLocs, long[] peerUIDs, double[] locsNotVisited, short forkCount,
short linearCount, String reason, long prevUID) {
- String msg = "Probe trace: UID="+uid+"
target="+target+" nearest="+nearest+" best="+best+" htl="+htl+"
counter="+counter+" location="+location+" node UID="+nodeUID+" prev
UID="+prevUID+" peer locs="+StringArray.toString(peerLocs)+" peer
UIDs="+StringArray.toString(peerUIDs)+" locs not visited:
"+StringArray.toString(locsNotVisited)+" fork count: "+forkCount+" linear
count: "+linearCount+" from "+reason;
- Logger.error(this, msg);
+ String msg = "Probe trace: UID="+uid+"
target="+target+" nearest="+nearest+" best="+best+" htl="+htl+"
counter="+counter+" location="+location+" node UID="+nodeUID+" prev
UID="+prevUID+" peers="+NodeDispatcher.peersUIDsToString(peerUIDs, peerLocs)+"
locs not visited: "+StringArray.toString(locsNotVisited)+" fork count:
"+forkCount+" linear count: "+linearCount+" from "+reason;
+ Logger.normal(this, msg);
}
};
Modified: trunk/freenet/src/freenet/node/NodeDispatcher.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeDispatcher.java 2007-07-17 17:39:49 UTC
(rev 14169)
+++ trunk/freenet/src/freenet/node/NodeDispatcher.java 2007-07-17 17:48:04 UTC
(rev 14170)
@@ -1017,4 +1017,30 @@
void start(NodeStats stats) {
this.nodeStats = stats;
}
+
+ public static String peersUIDsToString(long[] peerUIDs, double[]
peerLocs) {
+ StringBuffer sb = new
StringBuffer(peerUIDs.length*23+peerLocs.length*26);
+ int min=Math.min(peerUIDs.length, peerLocs.length);
+ for(int i=0;i<min;i++) {
+ double loc = peerLocs[i];
+ long uid = peerUIDs[i];
+ sb.append(loc);
+ sb.append('=');
+ sb.append(uid);
+ if(i != min-1)
+ sb.append('|');
+ }
+ if(peerUIDs.length > min) {
+ for(int i=min;i<peerUIDs.length;i++) {
+ sb.append("|U:");
+ sb.append(peerUIDs[i]);
+ }
+ } else if(peerLocs.length > min) {
+ for(int i=min;i<peerLocs.length;i++) {
+ sb.append("|L:");
+ sb.append(peerLocs[i]);
+ }
+ }
+ return sb.toString();
+ }
}
\ No newline at end of file
