Update of /cvsroot/freenet/freenet/src/freenet/node/rt
In directory sc8-pr-cvs1:/tmp/cvs-serv17951/src/freenet/node/rt
Modified Files:
CPAlgoRoutingTable.java NGRouting.java
ResponseTimeEstimator.java StoredRoutingTable.java
TreeRouting.java TreeRoutingTable.java
Log Message:
6195: (mostly) asynchronous trailer writing, lots of logging improvements (most code
supports selective logging now), bugfixes
Index: CPAlgoRoutingTable.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/CPAlgoRoutingTable.java,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- CPAlgoRoutingTable.java 30 Aug 2003 23:16:52 -0000 1.54
+++ CPAlgoRoutingTable.java 18 Sep 2003 17:48:10 -0000 1.55
@@ -851,7 +851,7 @@
node.diagnostics.occurrenceCounting("startedLookupARK",1);
synchronized(lookupThreadsLock) {
lookupThreads++;
- if(Core.logger.shouldLog(Logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG,this))
Core.logger.log(this, "Added new ARK lookup - now up to "+
lookupThreads, Logger.DEBUG);
}
@@ -880,7 +880,7 @@
protected void onFinish() {
synchronized(lookupThreadsLock) {
- if(Core.logger.shouldLog(Logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG,this))
Core.logger.log(this, "Terminated ARK lookup - now up to "+
lookupThreads, Logger.DEBUG);
lookupThreads--;
Index: NGRouting.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/NGRouting.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NGRouting.java 2 Sep 2003 21:37:32 -0000 1.4
+++ NGRouting.java 18 Sep 2003 17:48:10 -0000 1.5
@@ -41,7 +41,7 @@
this.ngrt = ngrt;
this.doDesperate = doDesperate;
this.node = n;
- logDEBUG = n.logger.shouldLog(Logger.DEBUG);
+ logDEBUG = n.logger.shouldLog(Logger.DEBUG,this);
this.isInsert = isInsert;
}
@@ -67,7 +67,7 @@
if(desperate || freeConn(ref.getIdentity())) {
hasSearchFailed = false;
lastTime = System.currentTimeMillis();
- logDEBUG = node.logger.shouldLog(Logger.DEBUG);
+ logDEBUG = node.logger.shouldLog(Logger.DEBUG,this);
return ref;
}
}
Index: ResponseTimeEstimator.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/ResponseTimeEstimator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ResponseTimeEstimator.java 30 Aug 2003 23:16:52 -0000 1.5
+++ ResponseTimeEstimator.java 18 Sep 2003 17:48:10 -0000 1.6
@@ -166,7 +166,7 @@
}
private void logDEBUG(String s) {
- if(Core.logger.shouldLog(Logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG,this))
Core.logger.log(this, s+" ("+this+")", Logger.DEBUG);
}
Index: StoredRoutingTable.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/StoredRoutingTable.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- StoredRoutingTable.java 8 Sep 2003 17:14:50 -0000 1.6
+++ StoredRoutingTable.java 18 Sep 2003 17:48:10 -0000 1.7
@@ -107,7 +107,7 @@
DiscardSort d;
while (num-- > 0 && null != (d = (DiscardSort) heap.pop())) {
remove(d.mem, d.ident);
- if(Core.logger.shouldLog(Logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG,this))
Core.logger.log(this, "Removing "+d,
Logger.DEBUG);
}
Core.logger.log(this, "Discarded "+onum+" references",
Index: TreeRouting.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/TreeRouting.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- TreeRouting.java 30 Aug 2003 23:16:52 -0000 1.24
+++ TreeRouting.java 18 Sep 2003 17:48:10 -0000 1.25
@@ -44,7 +44,7 @@
this.desperate = false;
this.doDesperate = doDesperate;
this.node = n;
- logDEBUG = Core.logger.shouldLog(Logger.DEBUG); // HACK
+ logDEBUG = Core.logger.shouldLog(Logger.DEBUG,this); // HACK
if (logDEBUG) Core.logger.log(this, "Created TreeRouting at
"+System.currentTimeMillis()+
" for "+refWalk, Logger.DEBUG);
}
Index: TreeRoutingTable.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/TreeRoutingTable.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- TreeRoutingTable.java 30 Aug 2003 23:16:52 -0000 1.25
+++ TreeRoutingTable.java 18 Sep 2003 17:48:10 -0000 1.26
@@ -105,7 +105,7 @@
boolean isInsert) {
long x = -1;
- boolean logDEBUG = Core.logger.shouldLog(Logger.DEBUG);
+ boolean logDEBUG = Core.logger.shouldLog(Logger.DEBUG,this);
boolean logMINOR = Core.logger.shouldLog(Logger.MINOR);
if(logDEBUG) {
x = System.currentTimeMillis();
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
