Update of /cvsroot/freenet/freenet/src/freenet/node/rt
In directory sc8-pr-cvs1:/tmp/cvs-serv14016/src/freenet/node/rt
Modified Files:
FFTTimeEstimator.java CPAlgoRoutingTable.java NGRouting.java
NGRoutingTable.java DataObjectRoutingStore.java
StoredRoutingTable.java DecayingRunningAverage.java
DataObjectRoutingMemory.java TreeRouting.java
Log Message:
6290: don't show the request box either when in simple mode.
Index: FFTTimeEstimator.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/FFTTimeEstimator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- FFTTimeEstimator.java 30 Oct 2003 01:34:06 -0000 1.4
+++ FFTTimeEstimator.java 31 Oct 2003 19:21:20 -0000 1.5
@@ -3,6 +3,7 @@
import java.math.BigInteger;
import freenet.Key;
+import freenet.node.rt.ResponseTimeEstimator.RecentReports;
public class FFTTimeEstimator extends ResponseTimeEstimator {
@@ -30,7 +31,7 @@
signal[recent.recentPtr][1]=new BigDecimal((double)usec);
//pad with 0s only if total number of measurements less than history size
- for (int i = recent.recentCount;i<recent.RECENT_LENGTH;i++) {
+ for (int i = recent.recentCount;i<RecentReports.RECENT_LENGTH;i++) {
signal[i][0]= new BigDecimal(BigInteger.ZERO);
signal[i][1]= new BigDecimal(BigInteger.ZERO);
}
@@ -38,7 +39,7 @@
//TODO: get rid of this
signal_double[recent.recentPtr][0] = signal[recent.recentPtr][0].doubleValue();
signal_double[recent.recentPtr][1] = signal[recent.recentPtr][1].doubleValue();
- for (int i = recent.recentCount;i<recent.RECENT_LENGTH;i++) {
+ for (int i = recent.recentCount;i<RecentReports.RECENT_LENGTH;i++) {
signal_double[i][0]= 0;
signal_double[i][1]= 0;
}
Index: CPAlgoRoutingTable.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/CPAlgoRoutingTable.java,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -w -r1.58 -r1.59
--- CPAlgoRoutingTable.java 30 Oct 2003 01:34:06 -0000 1.58
+++ CPAlgoRoutingTable.java 31 Oct 2003 19:21:20 -0000 1.59
@@ -91,20 +91,20 @@
Vector quickRefs = new Vector();
HashSet keys = new HashSet();
- boolean shouldLog = Core.logger.shouldLog(Core.logger.DEBUG);
+ boolean shouldLog = Core.logger.shouldLog(Logger.DEBUG);
synchronized(this) {
if(shouldLog)
- Core.logger.log(this, "Starting getSnapshot()", Core.logger.DEBUG);
+ Core.logger.log(this, "Starting getSnapshot()", Logger.DEBUG);
Enumeration memories = routingStore.elements();
while (memories.hasMoreElements()) {
if(shouldLog)
- Core.logger.log(this, "Next memory element", Core.logger.DEBUG);
+ Core.logger.log(this, "Next memory element", Logger.DEBUG);
RoutingMemory memory = (RoutingMemory)memories.nextElement();
NodeReference nodeRef = memory.getNodeReference();
if (nodeRef == null) {
if(shouldLog)
Core.logger.log(this, "ignored memory because nodeRef null",
- Core.logger.DEBUG);
+ Logger.DEBUG);
continue;
}
@@ -112,7 +112,7 @@
Enumeration refs = refSet.references();
while (refs.hasMoreElements()) {
if(shouldLog)
- Core.logger.log(this, "Next ref element", Core.logger.DEBUG);
+ Core.logger.log(this, "Next ref element", Logger.DEBUG);
Reference ref = (Reference) refs.nextElement();
if (!keys.contains(ref.key)) {
// REDFLAG: Change to only exclude "0000" keys once code is
@@ -125,16 +125,16 @@
keys.add(ref.key);
if(shouldLog)
Core.logger.log(this, "Got new key " +
- ref.key.toString(),Core.logger.DEBUG);
+ ref.key.toString(),Logger.DEBUG);
} else {
if(shouldLog)
Core.logger.log(this, "Ignored nonstandard key ending",
- Core.logger.DEBUG);
+ Logger.DEBUG);
}
} else {
if(shouldLog)
Core.logger.log(this, "Ignored duplicate key",
- Core.logger.DEBUG);
+ Logger.DEBUG);
}
}
if (!nodeRefs.contains(nodeRef)) {
@@ -161,7 +161,7 @@
Key[] keyList = (Key[])keys.toArray(new Key[keys.size()]);
if(shouldLog)
Core.logger.log(this,"got " + keyList.length + " keys in getSnapshot",
- Core.logger.DEBUG);
+ Logger.DEBUG);
int countedKeys = getKeyCount();
if(keyList.length != countedKeys)
@@ -262,7 +262,7 @@
boolean desperate, String addToLog) {
// Move all var decls up to the top to work around bugs in sun 1.4.1.
long startTime = System.currentTimeMillis();
- boolean shouldLog = Core.logger.shouldLog(Core.logger.DEBUG);
+ boolean shouldLog = Core.logger.shouldLog(Logger.DEBUG);
long gotFloatTime;
long syncedTime = -1;
long len, gotPropertyTime, gotCPTime, unsyncedTime, length;
@@ -270,7 +270,7 @@
CPAlgoData cpd;
if(shouldLog)
Core.logger.log(this, "isRoutable("+mem+","+desperate+") at "+
- startTime+addToLog, Core.logger.DEBUG);
+ startTime+addToLog, Logger.DEBUG);
float f = rand.nextFloat();
gotFloatTime = System.currentTimeMillis();
if(shouldLog)
@@ -286,7 +286,7 @@
Core.logger.log(this, "isRoutable("+mem+","+desperate+
") synchronized up in "+len+" at "+
syncedTime+addToLog,
- len>500?Core.logger.MINOR:Core.logger.DEBUG);
+ len>500?Logger.MINOR:Logger.DEBUG);
cpd = getProperty(mem, RMKEY, node);
gotPropertyTime = System.currentTimeMillis();
if(shouldLog || (gotPropertyTime - syncedTime) > 500)
@@ -295,13 +295,13 @@
gotPropertyTime+addToLog,
new Exception("debug"),
((gotPropertyTime - syncedTime)>500)
- ? Core.logger.MINOR : Core.logger.DEBUG);
+ ? Logger.MINOR : Logger.DEBUG);
if(desperate) {
if(shouldLog)
Core.logger.log(this, "Returning because desperate for " +
"isRoutable("+mem+") at "+
System.currentTimeMillis()+addToLog,
- Core.logger.DEBUG);
+ Logger.DEBUG);
returningTime = System.currentTimeMillis();
return true;
} else {
@@ -312,7 +312,7 @@
" in "+(gotCPTime - gotPropertyTime)+addToLog+
" at "+gotCPTime,
((gotCPTime - gotPropertyTime)>500)
- ? Core.logger.MINOR : Core.logger.DEBUG);
+ ? Logger.MINOR : Logger.DEBUG);
returningTime = System.currentTimeMillis();
return f <= y;
}
@@ -330,7 +330,7 @@
Core.logger.log(this, "isRoutable("+mem+","+desperate+
") locked RT for "+length+addToLog+", totally took "+
(unsyncedTime-startTime)+" at "+unsyncedTime,
- length>500 ? Core.logger.MINOR : Core.logger.DEBUG);
+ length>500 ? Logger.MINOR : Logger.DEBUG);
if(shouldLog)
Core.logger.log(this, "Returning through finally took "+
(unsyncedTime-returningTime)+", returning was at "+
@@ -382,9 +382,9 @@
private final synchronized boolean deleteReferences(ReferenceSet refSet,
long number) {
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this, "Removing "+number+" references.",
- Core.logger.DEBUG);
+ Logger.DEBUG);
long startTime = System.currentTimeMillis();
if (refSet.size() == 0) {
return false;
@@ -401,9 +401,9 @@
long endTime = System.currentTimeMillis();
long length = endTime-startTime;
- if(Core.logger.shouldLog(Core.logger.DEBUG) || length > 500)
+ if(Core.logger.shouldLog(Logger.DEBUG) || length > 500)
Core.logger.log(this, "deleteReferences held RT lock for "+length,
- length>500 ? Core.logger.MINOR : Core.logger.DEBUG);
+ length>500 ? Logger.MINOR : Logger.DEBUG);
return true;
}
@@ -589,10 +589,10 @@
Node node) {
CPAlgoData ret;
long startTime = System.currentTimeMillis();
- boolean shouldLog = Core.logger.shouldLog(Core.logger.DEBUG);
+ boolean shouldLog = Core.logger.shouldLog(Logger.DEBUG);
if(shouldLog)
Core.logger.log(this, "getProperty("+mem+","+name+",node) at "+startTime,
- Core.logger.DEBUG);
+ Logger.DEBUG);
try {
ret = (CPAlgoData) mem.getProperty(name);
}
@@ -602,7 +602,7 @@
Core.logger.log(this, "getProperty got DataObjectUnloadedException "+
"after "+(thrownTime - startTime),
((thrownTime - startTime) > 500)?
- Core.logger.MINOR:Core.logger.DEBUG);
+ Logger.MINOR:Logger.DEBUG);
ret = new CPAlgoData(e, mem.getNodeReference());
long constTime = System.currentTimeMillis();
long constLength = constTime-thrownTime;
@@ -610,19 +610,19 @@
Core.logger.log(this, "Constructed CPAlgoData from "+
"DataObjectUnloadedException in "+constLength,
constLength>500 ?
- Core.logger.MINOR : Core.logger.DEBUG);
+ Logger.MINOR : Logger.DEBUG);
mem.setProperty(name, ret);
long setTime = System.currentTimeMillis();
long setLength = setTime - constTime;
if(shouldLog)
Core.logger.log(this, "Set property "+name+" to mem ("+mem+
- ") in "+setLength, Core.logger.DEBUG);
+ ") in "+setLength, Logger.DEBUG);
}
long gotTime = System.currentTimeMillis();
long gotLength = gotTime - startTime;
if(shouldLog || gotLength>500)
Core.logger.log(this, "Got property from mem ("+mem+") in "+gotLength,
- gotLength>500?Core.logger.MINOR:Core.logger.DEBUG);
+ gotLength>500?Logger.MINOR:Logger.DEBUG);
if (ret == null) {
ret = new CPAlgoData(mem.getNodeReference());
mem.setProperty(name, ret);
@@ -630,7 +630,7 @@
long setLength = setTime - gotTime;
if(shouldLog)
Core.logger.log(this, "Set property "+name+" to mem ("+mem+
- ") in "+setLength, Core.logger.DEBUG);
+ ") in "+setLength, Logger.DEBUG);
}
return ret;
}
@@ -686,7 +686,7 @@
synchronized(lookupLock) {
if(lookup != null) {
Core.logger.log(this, "Killing ARK lookup in finalizer",
- Core.logger.DEBUG);
+ Logger.DEBUG);
lookup.kill();
lookup = null;
}
@@ -706,7 +706,7 @@
}
catch (IOException e) {
Core.logger.log(this, "IOException reading CP!",
- e, Core.logger.ERROR);
+ e, Logger.ERROR);
}
//wtf? Tavin, If this is ok there should be a comment explaining why.
//
@@ -835,16 +835,16 @@
public LookupARK(FreenetURI uri) throws KeyException {
super(new InternalClient(node), uri, false,
- new ArrayBucket(), node.maxHopsToLive);
+ new ArrayBucket(), Node.maxHopsToLive);
version = ref.revision()+1;
lastVersion = firstVersion = version;
sleepTimeMultiplier = 1.0F; // deal with it manually
// be a bit more aggressive than the others
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this, "Scheduling ARK fetch for "+getURI(),
- Core.logger.DEBUG);
+ Logger.DEBUG);
new Checkpoint(this).schedule(node);
- node.diagnostics.occurrenceCounting("startedLookupARK",1);
+ Core.diagnostics.occurrenceCounting("startedLookupARK",1);
synchronized(lookupThreadsLock) {
lookupThreads++;
if(Core.logger.shouldLog(Logger.DEBUG,this))
@@ -891,7 +891,7 @@
protected boolean success() {
String s = ((ArrayBucket)bucket).toString();
Core.logger.log(this, "Fetched ARK "+getURI()+": "+s,
- Core.logger.MINOR);
+ Logger.MINOR);
// REDFLAG/FIXME: CHECK LOCKING HERE
// hmmm... Dodgy. Need cast because
@@ -907,7 +907,7 @@
Core.logger.log(this,
"IOException reading FieldSet from ARK! ("+
getURI()+")",
- e, Core.logger.ERROR);
+ e, Logger.ERROR);
uri=getURI();
version++;
sleepTime = initialSleepTime; // probably not their fault
@@ -933,7 +933,7 @@
Core.logger.log(this,
"Invalid ARK - fetching next version: "
- +getURI(), e, Core.logger.MINOR);
+ +getURI(), e, Logger.MINOR);
uri = getURI();
return false;
}
@@ -950,7 +950,7 @@
if(lastVersion < version) lastVersion = version;
Core.logger.log(this,
- "Invalid ARK (tried to change identity) - fetching
next version: " + getURI(), Core.logger.MINOR);
+ "Invalid ARK (tried to change identity) - fetching
next version: " + getURI(), Logger.MINOR);
uri = getURI();
return false;
}
@@ -979,18 +979,18 @@
}
protected boolean failure() {
- boolean shouldLog = Core.logger.shouldLog(Core.logger.DEBUG);
+ boolean shouldLog = Core.logger.shouldLog(Logger.DEBUG);
if(shouldLog)
Core.logger.log(this, "LookupARK Failure: version="+version+
", firstVersion="+firstVersion+
", lastVersion="+lastVersion+" for "+
- getURI(), Core.logger.DEBUG);
+ getURI(), Logger.DEBUG);
if(dnf != null) {
seq++; // used by both branches
if (version == lastVersion) {
if(shouldLog)
Core.logger.log(this, "At last version",
- Core.logger.DEBUG);
+ Logger.DEBUG);
// exponential backoff, double up on every full pass
sleepTime *= 2;
@@ -1000,7 +1000,7 @@
Core.logger.log(this,
"Incrementing lastVersion to "+
lastVersion+" for "+
- getURI(), Core.logger.DEBUG);
+ getURI(), Logger.DEBUG);
}
version = firstVersion;
} else {
@@ -1009,21 +1009,21 @@
if(shouldLog)
Core.logger.log(this, "Incrementing version to "+
version+" for "+
- getURI(), Core.logger.DEBUG);
+ getURI(), Logger.DEBUG);
}
sleepTime *= 1.5;
}
} else {
if(shouldLog)
Core.logger.log(this, "ARK failure not a DNF for "+
- getURI(), Core.logger.DEBUG);
+ getURI(), Logger.DEBUG);
sleepTime *= 2;
// Standard response to RNFs: double the sleepTime
}
if(shouldLog)
Core.logger.log(this, "Retrying ARK fetch with version "+
version+" for "+getURI()+" (delay "+
- sleepTime+")", Core.logger.MINOR);
+ sleepTime+")", Logger.MINOR);
return false; // failed, retry exponentially
}
Index: NGRouting.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/NGRouting.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -r1.11 -r1.12
--- NGRouting.java 30 Oct 2003 01:34:06 -0000 1.11
+++ NGRouting.java 31 Oct 2003 19:21:20 -0000 1.12
@@ -76,14 +76,14 @@
// FIXME: factor out to superclass. duped in TreeRouting.
protected boolean freeConn(Identity id) {
if(logDEBUG)
- node.logger.log(this, "Checking for free conn...", Logger.DEBUG);
+ Core.logger.log(this, "Checking for free conn...", Logger.DEBUG);
long start = System.currentTimeMillis();
boolean ret = !(node.connections.needsConnection(id));
if(ret)
node.scheduleConnectionOpener(id);
long end = System.currentTimeMillis();
if(logDEBUG)
- node.logger.log(this, "Checking for free conn for "+id+
+ Core.logger.log(this, "Checking for free conn for "+id+
" took "+(end-start)+" for "+this+", result="+
ret, Logger.DEBUG);
return ret;
@@ -151,7 +151,7 @@
hasSearchFailed = true;
last.searchFailed(time);
} else {
- node.logger.log(this, "Search failed twice for "+this,
+ Core.logger.log(this, "Search failed twice for "+this,
new Exception("debug"), Logger.NORMAL);
}
}
@@ -169,7 +169,7 @@
last.transferSucceeded(key, searchTime, htl, size, transferTime);
long stdFileSize;
if(node.dir.countKeys() > 16)
- stdFileSize = (node.storeSize - node.dir.available()) /
+ stdFileSize = (Node.storeSize - node.dir.available()) /
node.dir.countKeys();
else stdFileSize = 100000;
long normalizedTime = searchTime + (transferTime*stdFileSize/size);
Index: NGRoutingTable.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/NGRoutingTable.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -w -r1.22 -r1.23
--- NGRoutingTable.java 30 Oct 2003 03:18:52 -0000 1.22
+++ NGRoutingTable.java 31 Oct 2003 19:21:20 -0000 1.23
@@ -300,7 +300,7 @@
public synchronized RTDiagSnapshot getSnapshot() {
HashSet nodeRefs = new HashSet();
HashSet refInfos = new HashSet();
- boolean shouldLog = Core.logger.shouldLog(Core.logger.DEBUG);
+ boolean shouldLog = Core.logger.shouldLog(Logger.DEBUG);
int connectedNodes = 0;
int successNodes = 0;
int triedNodes = 0;
@@ -347,8 +347,8 @@
props[5] = new Long(totalConnectSuccesses);
props[6] = new Float(pLegitDNF);
props[7] = new Float(pSemiLegitDNF);
- props[8] = new
String(globalEstimator.getHTMLReportingTool().lowestString(globalEstimator.TIME));
- props[9] = new
String(globalEstimator.getHTMLReportingTool().highestString(globalEstimator.TIME));
+ props[8] = new
String(globalEstimator.getHTMLReportingTool().lowestString(TimeEstimator.TIME));
+ props[9] = new
String(globalEstimator.getHTMLReportingTool().highestString(TimeEstimator.TIME));
props[10] = getClass().getName();
StringMap sm = new SimpleStringMap(TABLE_PROPERTIES, props);
// FIXME!
Index: DataObjectRoutingStore.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/DataObjectRoutingStore.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -w -r1.22 -r1.23
--- DataObjectRoutingStore.java 29 Jul 2003 17:30:46 -0000 1.22
+++ DataObjectRoutingStore.java 31 Oct 2003 19:21:20 -0000 1.23
@@ -43,7 +43,7 @@
Enumeration props = rtProps.keys(new PrefixFilePattern(fn, true));
if(props == null || !props.hasMoreElements()) {
Core.logger.log(this, "Removing orphaned node "+fn.toString(),
- Core.logger.NORMAL);
+ Logger.NORMAL);
rtNodes.remove(fn);
}
}
@@ -52,25 +52,25 @@
boolean gotIt = false;
Enumeration ee=rtNodes.keys(fn, false);
if(ee == null || !ee.hasMoreElements()) {
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this, "No nodes found looking for property...",
- Core.logger.DEBUG);
+ Logger.DEBUG);
} else {
FileNumber f = (FileNumber)ee.nextElement();
FilePattern p = new PrefixFilePattern(f, true);
if(p.matches(fn)) {
gotIt = true;
} else {
- if(Core.logger.shouldLog(Core.logger.DEBUG)) {
+ if(Core.logger.shouldLog(Logger.DEBUG)) {
Core.logger.log(this, "Pattern does not match: "+
f.toString()+" should be prefix of "+
- fn.toString(), Core.logger.DEBUG);
+ fn.toString(), Logger.DEBUG);
}
}
}
if(!gotIt) {
Core.logger.log(this, "Removing orphaned property "+fn.toString(),
- Core.logger.NORMAL);
+ Logger.NORMAL);
rtProps.remove(fn);
}
}
@@ -87,9 +87,9 @@
public synchronized final void checkpoint() {
// There might be a remove or something going on in parallel
// We need to serialize out a consistent state
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this, "DataObjectRoutingStore checkpointing",
- Core.logger.DEBUG);
+ Logger.DEBUG);
try {
rtNodes.flush();
rtProps.flush();
@@ -97,11 +97,11 @@
catch (IOException e) {
// hmz..
Core.logger.log(this, "I/O error flushing routing table data",
- e, Core.logger.ERROR);
+ e, Logger.ERROR);
}
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this, "DataObjectRoutingStore checkpointed",
- Core.logger.DEBUG);
+ Logger.DEBUG);
}
// Don't need to synchronize
@@ -112,16 +112,16 @@
public boolean remove(Identity ident) {
FileNumber fn = new FileNumber(ident.fingerprint());
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this, "Removing identity "+ident.fingerprint(),
- Core.logger.DEBUG);
+ Logger.DEBUG);
return remove(fn, ident.fingerprint().toString());
}
protected synchronized boolean remove(FileNumber fn, String log) {
if (rtNodes.remove(fn)) {
Core.logger.log(this, "Removed from rtNodes",
- Core.logger.DEBUG);
+ Logger.DEBUG);
--count;
// clear out properties entries
@@ -129,19 +129,19 @@
while (pk.hasMoreElements()) {
fn = (FileNumber) pk.nextElement();
Core.logger.log(this, "Removing "+fn+" from rtProps",
- Core.logger.DEBUG);
+ Logger.DEBUG);
rtProps.remove(fn);
Core.logger.log(this, "Removed "+fn+" from rtProps",
- Core.logger.DEBUG);
+ Logger.DEBUG);
}
Core.logger.log(this, "Removed identity "+log,
- Core.logger.DEBUG);
+ Logger.DEBUG);
return true;
}
Core.logger.log(this, "Failed removing identity "+log,
- Core.logger.DEBUG);
+ Logger.DEBUG);
return false;
}
@@ -204,13 +204,13 @@
}
catch (BadReferenceException e) {
Core.logger.log(this, "bad reference while resolving: "+fn,
- e, Core.logger.ERROR);
+ e, Logger.ERROR);
remove(fn, "FileNumber: "+fn.toString());
return null;
}
catch (IOException e) {
Core.logger.log(this, "I/O error while resolving: "+fn,
- e, Core.logger.ERROR);
+ e, Logger.ERROR);
remove(fn, "FileNumber: "+fn.toString());
return null;
}
@@ -224,7 +224,7 @@
public RoutingMemory putNode(NodeReference nr) {
- Core.logger.log(this, "Adding node to DataObjectRoutingStore",
Core.logger.DEBUG);
+ Core.logger.log(this, "Adding node to DataObjectRoutingStore", Logger.DEBUG);
Identity ident = nr.getIdentity();
FileNumber fn = new FileNumber(ident.fingerprint());
Index: StoredRoutingTable.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/StoredRoutingTable.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -r1.9 -r1.10
--- StoredRoutingTable.java 30 Oct 2003 01:34:06 -0000 1.9
+++ StoredRoutingTable.java 31 Oct 2003 19:21:20 -0000 1.10
@@ -97,7 +97,7 @@
synchronized(discardSync) {
int onum = num;
Core.logger.log(this, "Discarding "+num+" references",
- Core.logger.MINOR);
+ Logger.MINOR);
Heap heap = new Heap(routingStore.size());
long startTime, endTime;
synchronized(this) { // FIXME: can we improve on this?
@@ -112,7 +112,7 @@
}
long length = endTime-startTime;
Core.logger.log(this, "discard("+onum+") locked RT for
"+length,
-
length>500?Core.logger.MINOR:Core.logger.DEBUG);
+
length>500?Logger.MINOR:Logger.DEBUG);
DiscardSort d;
while (num-- > 0 && null != (d = (DiscardSort) heap.pop())) {
remove(d.mem, d.ident);
@@ -120,7 +120,7 @@
Core.logger.log(this, "Removing "+d,
Logger.DEBUG);
}
Core.logger.log(this, "Discarded "+onum+" references",
- Core.logger.DEBUG);
+ Logger.DEBUG);
}
}
Index: DecayingRunningAverage.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/DecayingRunningAverage.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- DecayingRunningAverage.java 30 Oct 2003 01:34:06 -0000 1.6
+++ DecayingRunningAverage.java 31 Oct 2003 19:21:20 -0000 1.7
@@ -23,7 +23,7 @@
if(currentVal<0 || currentVal>3600000) {
Core.logger.log(this, "reset "+currentVal,
new Exception("debug"),
- Core.logger.NORMAL);
+ Logger.NORMAL);
currentVal = Core.hopTime(1);
}
}
Index: DataObjectRoutingMemory.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/DataObjectRoutingMemory.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -r1.9 -r1.10
--- DataObjectRoutingMemory.java 29 Jul 2003 17:30:46 -0000 1.9
+++ DataObjectRoutingMemory.java 31 Oct 2003 19:21:20 -0000 1.10
@@ -67,27 +67,27 @@
public final DataObject getProperty(String name)
throws DataObjectUnloadedException {
long startedTime = -1;
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this, "getProperty("+name+")",
- Core.logger.DEBUG);
+ Logger.DEBUG);
FileNumber fn = makeFileNumber(name);
try {
startedTime = System.currentTimeMillis();
DataObject o = routingStore.rtProps.get(fn);
long gotObjectTime = System.currentTimeMillis();
long len2 = gotObjectTime - startedTime;
- if(Core.logger.shouldLog(Core.logger.DEBUG) || len2>500)
+ if(Core.logger.shouldLog(Logger.DEBUG) || len2>500)
Core.logger.log(this, "getProperty("+name+") getting DataObject took "+
- len2, len2>500?Core.logger.MINOR:Core.logger.DEBUG);
+ len2, len2>500?Logger.MINOR:Logger.DEBUG);
return o;
} catch (DataObjectUnloadedException e) {
long thrownTime = System.currentTimeMillis();
long len3 = thrownTime - startedTime;
- if(Core.logger.shouldLog(Core.logger.DEBUG) || len3>500)
+ if(Core.logger.shouldLog(Logger.DEBUG) || len3>500)
Core.logger.log(this, "getProperty("+name+
") throwing DataObjectUnloadedException; get("+
fn+") took "+len3,
- len3>500?Core.logger.MINOR:Core.logger.DEBUG);
+ len3>500?Logger.MINOR:Logger.DEBUG);
throw e;
}
}
Index: TreeRouting.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/TreeRouting.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -w -r1.28 -r1.29
--- TreeRouting.java 30 Oct 2003 01:34:06 -0000 1.28
+++ TreeRouting.java 31 Oct 2003 19:21:20 -0000 1.29
@@ -50,7 +50,7 @@
public NodeReference getNextRoute() {
while (true) {
- if (stepCount++ > node.maxRoutingSteps) {
+ if (stepCount++ > freenet.node.Node.maxRoutingSteps) {
// Just give up (RNF) once we have
// tried a reasonable number of references.
//
@@ -74,7 +74,7 @@
if(logDEBUG)
Core.logger.log(this, "Going into desperation mode routing
after "+stepCount+" steps for "+refWalk, Logger.DEBUG);
desperate = true;
- stepCount=node.maxRoutingSteps/2;
+ stepCount=freenet.node.Node.maxRoutingSteps/2;
continue;
}
}
@@ -90,7 +90,7 @@
enteredTime = System.currentTimeMillis();
long syncTime = enteredTime-doneTrivialTime;
if(syncTime>500)
- if(Core.logger.shouldLog(Core.logger.MINOR)) Core.logger.log(this,
"Got lock on RT in "+syncTime+" for "+refWalk, Core.logger.MINOR);
+ if(Core.logger.shouldLog(Logger.MINOR)) Core.logger.log(this, "Got
lock on RT in "+syncTime+" for "+refWalk, Logger.MINOR);
else
if(logDEBUG) Core.logger.log(this, "Got lock on RT in
"+syncTime+" for "+refWalk, Logger.DEBUG);
@@ -106,7 +106,7 @@
long gotNodeTime = System.currentTimeMillis();
long syncedTime = gotNodeTime - enteredTime;
if(syncedTime>500)
- if(Core.logger.shouldLog(Core.logger.MINOR)) Core.logger.log(this,
"Got node (synchronized) from "+refWalk+ " in "+syncedTime,Core.logger.MINOR);
+ if(Core.logger.shouldLog(Logger.MINOR)) Core.logger.log(this, "Got
node (synchronized) from "+refWalk+ " in "+syncedTime,Logger.MINOR);
else
if(logDEBUG) Core.logger.log(this, "Got node (synchronized) from
"+refWalk+ " in "+syncedTime,Logger.DEBUG);
@@ -262,7 +262,7 @@
terminate(true, true);
long stdFileSize;
if(node.dir.countKeys() > 16)
- stdFileSize = (node.storeSize - node.dir.available()) /
+ stdFileSize = (freenet.node.Node.storeSize - node.dir.available()) /
node.dir.countKeys();
else stdFileSize = 100000;
long normalizedTime = time + (etime*stdFileSize/size);
@@ -284,7 +284,7 @@
protected void reallyTerminate(boolean success, boolean routingRelated) {
super.reallyTerminate(success, routingRelated);
desperate = true;
- stepCount = node.maxRoutingSteps+1;
+ stepCount = freenet.node.Node.maxRoutingSteps+1;
}
}
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
