Update of /cvsroot/freenet/freenet/src/freenet/node/ds
In directory sc8-pr-cvs1:/tmp/cvs-serv14016/src/freenet/node/ds
Modified Files:
FSDataStore.java
Log Message:
6290: don't show the request box either when in simple mode.
Index: FSDataStore.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/ds/FSDataStore.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -w -r1.21 -r1.22
--- FSDataStore.java 30 Oct 2003 02:39:37 -0000 1.21
+++ FSDataStore.java 31 Oct 2003 19:21:22 -0000 1.22
@@ -66,11 +66,11 @@
if (dataSize > maxDataSize) {
// create circular buffer
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this, "Max data size="+maxDataSize+
", but dataSize="+dataSize+
": creating circular buffer",
- Core.logger.DEBUG);
+ Logger.DEBUG);
buffer = new CircularBuffer(dir.forceStore(maxDataSize, fn),
dataSize);
dataSize = maxDataSize;
@@ -81,9 +81,9 @@
}
}
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this, "storing key: "+k+":"+dataSize,
- Core.logger.DEBUG);
+ Logger.DEBUG);
FSDataStoreElement dse = new FSDataStoreElement(this, k, buffer, dataSize);
KeyOutputStream kout = dse.getKeyOutputStream();
@@ -108,21 +108,21 @@
buffer = dir.fetch(fn);
long fetchedTime = System.currentTimeMillis();
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this, "Fetch took "+
(fetchedTime - startTime)+logString,
- Core.logger.DEBUG);
+ Logger.DEBUG);
if (buffer == null) {
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this, "key not found: "+k,
- Core.logger.DEBUG);
+ Logger.DEBUG);
return null;
}
buffer.touch(); // register access for LRU tracking
touchedTime = System.currentTimeMillis();
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this, "touch() took "+(touchedTime - fetchedTime)+
- logString+ "; key found: "+k, Core.logger.DEBUG);
+ logString+ "; key found: "+k, Logger.DEBUG);
KeyInputStream is = null;
try {
@@ -130,32 +130,32 @@
FSDataStoreElement dse = new FSDataStoreElement(this, k, buffer,
buffer.length());
long gotElementTime = System.currentTimeMillis();
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this, "new FSDataStoreElement took "+
(gotElementTime - touchedTime)+logString,
- Core.logger.DEBUG);
+ Logger.DEBUG);
is = dse.getKeyInputStream();
long gotInputStreamTime = System.currentTimeMillis();
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this, "getKeyInputStream took "+
(gotInputStreamTime - gotElementTime)+logString,
- Core.logger.DEBUG);
+ Logger.DEBUG);
return is;
}
catch (UTFDataFormatException e) {
// Corrupted file, remove it
Core.logger.log(this, "Corrupted fields in file in datastore, "
- + "deleting", e, Core.logger.NORMAL);
+ + "deleting", e, Logger.NORMAL);
buffer.release();
dir.delete(fn, false);
is = null;
return null;
} finally {
long finishedTime = System.currentTimeMillis();
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this, "Finishing "+((is == null) ? "(failed)" : "") +
"took "+(finishedTime - touchedTime)+
- " millis"+logString, Core.logger.DEBUG);
+ " millis"+logString, Logger.DEBUG);
}
}
@@ -223,10 +223,10 @@
Key[] ret = new Key[keyStack.size()];
keyStack.copyInto(ret);
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this,
"returning "+ret.length+" closest keys to: "+k,
- Core.logger.DEBUG);
+ Logger.DEBUG);
return ret;
}
@@ -246,11 +246,11 @@
if(histogram != null)
return histogram;
else {
- boolean shouldLog = Core.logger.shouldLog(Core.logger.DEBUG);
+ boolean shouldLog = Core.logger.shouldLog(Logger.DEBUG);
histogram = new KeyHistogram();
if(shouldLog)
- Core.logger.log(this,"getHistogram()",Core.logger.DEBUG);
+ Core.logger.log(this,"getHistogram()",Logger.DEBUG);
Enumeration keys;
synchronized (dir.semaphore()) {
keys = dir.keys(true);
@@ -259,11 +259,11 @@
FileNumber fn = (FileNumber) keys.nextElement();
if(shouldLog)
Core.logger.log(fn,"adding filenumber "+fn+" to histogram",
- Core.logger.DEBUG);
+ Logger.DEBUG);
Buffer buffer = dir.fetch(fn);
if(shouldLog)
Core.logger.log(buffer,"got buffer for filenumber",
- Core.logger.DEBUG);
+ Logger.DEBUG);
try {
histogram.add(fn.getByteArray());
}
@@ -273,7 +273,7 @@
}
if(shouldLog)
Core.logger.log(this,"getHistogram() returning",
- Core.logger.DEBUG);
+ Logger.DEBUG);
// FileNumber fn = NativeFSDirectory.randomKey;
// Core.logger.log(this, "Random key: "+fn, Logger.DEBUG);
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
