Update of /cvsroot/freenet/freenet/src/freenet/fs/dir
In directory sc8-pr-cvs1:/tmp/cvs-serv14016/src/freenet/fs/dir
Modified Files:
DirectoryIDFilePattern.java LossyDirectory.java
NativeFSDirectory.java FSDataObjectStore.java
Log Message:
6290: don't show the request box either when in simple mode.
Index: DirectoryIDFilePattern.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/fs/dir/DirectoryIDFilePattern.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- DirectoryIDFilePattern.java 30 Oct 2003 01:34:07 -0000 1.5
+++ DirectoryIDFilePattern.java 31 Oct 2003 19:21:22 -0000 1.6
@@ -28,13 +28,13 @@
public final boolean matches(FileNumber fn) {
for (int i=0; i<dirID.length; ++i) {
- //Core.logger.log(this,"Searching for dirID = " + dirID[i] + " to match "
+ fn.dirID,Core.logger.DEBUG);
+ //Core.logger.log(this,"Searching for dirID = " + dirID[i] + " to match "
+ fn.dirID,Logger.DEBUG);
if (fn.dirID == dirID[i]) {
- //Core.logger.log(this, "Matches", Core.logger.DEBUG);
+ //Core.logger.log(this, "Matches", Logger.DEBUG);
return true;
}
}
- //Core.logger.log(this,"Does not match",Core.logger.DEBUG);
+ //Core.logger.log(this,"Does not match",Logger.DEBUG);
return false;
}
Index: LossyDirectory.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/fs/dir/LossyDirectory.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -r1.9 -r1.10
--- LossyDirectory.java 30 Oct 2003 01:34:07 -0000 1.9
+++ LossyDirectory.java 31 Oct 2003 19:21:22 -0000 1.10
@@ -88,11 +88,11 @@
*/
public final void getSpace(long size) throws IOException {
synchronized(getSpaceLock) {
- boolean shouldLog = Core.logger.shouldLog(Core.logger.DEBUG);
+ boolean shouldLog = Core.logger.shouldLog(Logger.DEBUG);
while (available() < size) {
if(shouldLog)
Core.logger.log(this, "Available now: "+available(),
- Core.logger.DEBUG);
+ Logger.DEBUG);
try {
Walk walk = FileNumber.filter(lossyPattern,
new
EnumerationWalk(dir.lruKeys(true)));
@@ -100,12 +100,12 @@
do {
if(shouldLog)
Core.logger.log(this, "Trying to remove LRU ("+x+")",
- Core.logger.DEBUG);
+ Logger.DEBUG);
FileNumber fn = (FileNumber) walk.getNext();
if(shouldLog)
Core.logger.log(this, "LRU ("+x+") is "+
((fn==null)?"(null)":fn.toString()),
- Core.logger.DEBUG);
+ Logger.DEBUG);
x++;
if (fn == null) {
IOException e =
@@ -119,7 +119,7 @@
dir.delete(fn, false);
if(shouldLog)
Core.logger.log(this, "Deleted LRU ("+x+","+fn
- +")", Core.logger.DEBUG);
+ +")", Logger.DEBUG);
}
while (available() < size);
}
@@ -136,9 +136,9 @@
* @throws IOException if not enough space could be freed
*/
public final Buffer forceStore(long size, FileNumber fnew) throws IOException {
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this, "Trying to forceStore "+fnew+" ("+size+")",
- Core.logger.DEBUG);
+ Logger.DEBUG);
getSpace(size);
Buffer buffer = null;
synchronized(semaphore()) {
Index: NativeFSDirectory.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/fs/dir/NativeFSDirectory.java,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -w -r1.168 -r1.169
--- NativeFSDirectory.java 30 Oct 2003 02:39:37 -0000 1.168
+++ NativeFSDirectory.java 31 Oct 2003 19:21:22 -0000 1.169
@@ -391,7 +391,7 @@
s = new FileInputStream(index);
} catch (IOException e) {
Core.logger.log(this, "Cannot read index file",
- e, Core.logger.ERROR);
+ e, Logger.ERROR);
readFromIndex = false;
s = null;
}
@@ -524,13 +524,13 @@
Core.logger.log(this,
"Truncated index file ("+
x+"/"+length+"); rebuilding",
- e, Core.logger.NORMAL);
+ e, Logger.NORMAL);
return false;
} catch (IOException e) {
Core.logger.log(this,
"I/O Error reading index file; "+
"trying to rebuild",
- e, Core.logger.ERROR);
+ e, Logger.ERROR);
return false;
}
return true;
@@ -842,7 +842,7 @@
Core.logger.log(this, "innerClearWrite("+curLength+","+finalLength+
"); spaceUsed="+spaceUsed+", tempSpaceUsed="+
tempSpaceUsed, (spaceUsed < 0 || tempSpaceUsed < 0) ?
- Core.logger.ERROR : Logger.DEBUG);
+ Logger.ERROR : Logger.DEBUG);
Core.logger.log(this, "delta = "+delta, Logger.DEBUG);
}
if((tempSpaceUsed + delta > maxTempSpaceUsed) && delta > 0) {
@@ -867,7 +867,7 @@
Core.logger.log(this, "clearWrite("+curLength+","+finalLength+
") would make spaceUsed or tempSpaceUsed negative... "+
"spaceUsed="+spaceUsed+", tempSpaceUsed="+tempSpaceUsed,
- e, Core.logger.ERROR);
+ e, Logger.ERROR);
}
spaceUsed += delta;
if(spaceUsed < 0) spaceUsed = 0;
@@ -942,7 +942,7 @@
s = new FileOutputStream(index.toString(), false);
} catch (IOException e) {
Core.logger.log(this, "Can't write index file!",
- e, Core.logger.ERROR);
+ e, Logger.ERROR);
return false;
}
} else {
@@ -1014,7 +1014,7 @@
b.release();
} catch (DirectoryException exx) {
Core.logger.log(this, "Got DirectoryException releasing "+
- b+": "+exx, exx, Core.logger.ERROR);
+ b+": "+exx, exx, Logger.ERROR);
}
}
}
@@ -1024,7 +1024,7 @@
Core.logger.log(this, "Finished commit", Logger.DEBUG);
} catch (IOException e) {
Core.logger.log(this, "IOException writing index file",
- e, Core.logger.ERROR);
+ e, Logger.ERROR);
return false;
}
return true;
@@ -1224,9 +1224,9 @@
Logger.DEBUG);
b.renameToTemp();
} catch (IOException e) {
- if (Core.logger.shouldLog(Core.logger.ERROR))
+ if (Core.logger.shouldLog(Logger.ERROR))
Core.logger.log(this, "IOException reopening file while "+
- "renaming to temp", e, Core.logger.ERROR);
+ "renaming to temp", e, Logger.ERROR);
throw new DirectoryException("IOException renaming file "+
"to temp");
}
@@ -1322,9 +1322,9 @@
try {
x = new NativeBuffer(fn, length, false, prev, modified);
} catch (java.io.IOException e) {
- if (Core.logger.shouldLog(Core.logger.ERROR))
+ if (Core.logger.shouldLog(Logger.ERROR))
Core.logger.log(this, "Something fucked up in preload()", e,
- Core.logger.ERROR);
+ Logger.ERROR);
throw new DirectoryException("Something fucked up in preload()");
}
// Core.logger.log(this, "Preloaded: "+fn+": "+x, Logger.DEBUG);
@@ -1384,7 +1384,7 @@
else mostRecentlyUsed.nextLRU = x;
if(x.lastModified < mostRecentlyUsed.lastModified) {
Core.logger.log(this, "ERROR! Clock skew detected!",
- Core.logger.ERROR);
+ Logger.ERROR);
x.prevLRU = null;
x.nextLRU = null;
x.setLastModified(x.lastModified);
@@ -1955,10 +1955,10 @@
}
raf = null;
} catch (IOException e) {
- if (Core.logger.shouldLog(Core.logger.ERROR))
+ if (Core.logger.shouldLog(Logger.ERROR))
Core.logger.log(this,
"IOException while closing",
- e, Core.logger.ERROR);
+ e, Logger.ERROR);
throw new DirectoryException
("IOException while closing");
}
@@ -2187,7 +2187,7 @@
}
} catch (IOException e) {
Core.logger.log(this, "IOException trying to sync in commit()",
- e, Core.logger.NORMAL);
+ e, Logger.NORMAL);
throw new DirectoryException
("IOException trying to sync in commit()");
}
@@ -2229,7 +2229,7 @@
raf = null;
} catch (IOException e) {
Core.logger.log(this, "IOException while closing in "
- + "commit", e, Core.logger.NORMAL);
+ + "commit", e, Logger.NORMAL);
throw new DirectoryException
("IOException while closing in commit()");
}
@@ -2263,7 +2263,7 @@
} catch (IOException e) {
Core.logger.log(this, "IOException reopening"+
" file in commit()", e,
- Core.logger.NORMAL);
+ Logger.NORMAL);
raf = null;
throw new DirectoryException
("IOException reopening file in commit()");
@@ -2509,7 +2509,7 @@
"the user or there is a bug. Please report"+
" to [EMAIL PROTECTED]",
new DirectoryException("backtrace"),
- Core.logger.NORMAL);
+ Logger.NORMAL);
} else {
if(!f.delete()) {
if(f.exists()) {
Index: FSDataObjectStore.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/fs/dir/FSDataObjectStore.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -r1.11 -r1.12
--- FSDataObjectStore.java 29 Jul 2003 17:30:44 -0000 1.11
+++ FSDataObjectStore.java 31 Oct 2003 19:21:23 -0000 1.12
@@ -27,8 +27,8 @@
public synchronized void flush() throws IOException {
synchronized (dir.semaphore()) {
- if(Core.logger.shouldLog(Core.logger.DEBUG))
- Core.logger.log(this, "Flushing FSDataObjectStore", Core.logger.DEBUG);
+ if(Core.logger.shouldLog(Logger.DEBUG))
+ Core.logger.log(this, "Flushing FSDataObjectStore", Logger.DEBUG);
Enumeration keys = outputQueue.keys();
int x = 0;
while (keys.hasMoreElements()) {
@@ -39,49 +39,49 @@
DataOutputStream out;
OutputStream os = null;
try {
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this, "Flushing " + key.toString() +
" to disk in FSDataObjectStore ("+x+
- ")", Core.logger.DEBUG);
+ ")", Logger.DEBUG);
os = buffer.getOutputStream();
if(os == null) throw new DirectoryException
("buffer returned no output streams: " +
key.toString());
- if(Core.logger.shouldLog(Core.logger.DEBUG))
- Core.logger.log(this, "Got output stream ("+x+")",
Core.logger.DEBUG);
+ if(Core.logger.shouldLog(Logger.DEBUG))
+ Core.logger.log(this, "Got output stream ("+x+")",
Logger.DEBUG);
out = new DataOutputStream(os);
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this, "Got data output stream ("+x+
- ")", Core.logger.DEBUG);
+ ")", Logger.DEBUG);
o.writeTo(out);
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this, "Written data ("+x+
- ")", Core.logger.DEBUG);
+ ")", Logger.DEBUG);
out.close();
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this, "Closed ("+x+")",
- Core.logger.DEBUG);
+ Logger.DEBUG);
dir.delete(key, false);
buffer.commit();
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this, "Committed ("+x+")" +
key.toString() +
" in FSDataObjectStore",
- Core.logger.DEBUG);
+ Logger.DEBUG);
}
finally {
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this, "Running finalizers for flush ("+
- x+")", Core.logger.DEBUG);
+ x+")", Logger.DEBUG);
if(os != null) os.close();
buffer.release();
}
}
outputQueue.clear();
dir.forceFlush();
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this, "Flushed FSDataObjectStore",
- Core.logger.DEBUG);
+ Logger.DEBUG);
}
}
@@ -124,13 +124,13 @@
public void set(FileNumber key, DataObject o) {
Core.logger.log(this, "Adding object to FSDataObjectStore",
- Core.logger.DEBUG);
+ Logger.DEBUG);
dataObjects.put(key, o);
Core.logger.log(this, "Added object to dataObjects",
- Core.logger.DEBUG);
+ Logger.DEBUG);
outputQueue.put(key, o);
Core.logger.log(this, "Added object to outputQueue",
- Core.logger.DEBUG);
+ Logger.DEBUG);
}
public final boolean contains(FileNumber key) {
@@ -139,21 +139,21 @@
public final boolean remove(FileNumber key) {
boolean ret = false;
- Core.logger.log(this, "Removing "+key, Core.logger.DEBUG);
+ Core.logger.log(this, "Removing "+key, Logger.DEBUG);
if (null != dataObjects.remove(key)) ret = true;
- else if(Core.logger.shouldLog(Core.logger.DEBUG))
+ else if(Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this, key.toString()+" not in dataObjects",
- Core.logger.DEBUG);
+ Logger.DEBUG);
if (null != outputQueue.remove(key)) ret = true;
- else if(Core.logger.shouldLog(Core.logger.DEBUG))
+ else if(Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this, key.toString()+" not in outputQueue",
- Core.logger.DEBUG);
+ Logger.DEBUG);
if (dir.delete(key, false)) ret = true;
- else if(Core.logger.shouldLog(Core.logger.DEBUG))
+ else if(Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this, key.toString()+" not in underlying Dir",
- Core.logger.DEBUG);
+ Logger.DEBUG);
Core.logger.log(this, "Remove "+key+" returning "+ret,
- Core.logger.DEBUG);
+ Logger.DEBUG);
return ret;
}
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
