Update of /cvsroot/freenet/freenet/src/freenet/node/ds
In directory sc8-pr-cvs1:/tmp/cvs-serv24032/src/freenet/node/ds
Modified Files:
FSDataStore.java
Removed Files:
DSConsole.java
Log Message:
Remove the monolithic datastore, and about fscking time! Made rather easy by Eclipse.
Index: FSDataStore.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/ds/FSDataStore.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -w -r1.20 -r1.21
--- FSDataStore.java 10 Jul 2003 00:47:08 -0000 1.20
+++ FSDataStore.java 30 Oct 2003 02:39:37 -0000 1.21
@@ -2,13 +2,10 @@
import freenet.*;
import freenet.fs.dir.*;
-import freenet.fs.acct.Fragment;
import freenet.support.*;
import freenet.support.io.*;
import java.io.*;
import java.util.*;
-import java.text.DateFormat;
-
/**
* A DataStore implementation that uses a freenet.fs.LossyDirectory
@@ -26,58 +23,8 @@
pw.println("Free space: "+ds.dir.available());
pw.println();
- pw.println("Committed keys");
- pw.println("--------------");
- dumpCommittedKeys(ds, pw);
-
- pw.println("LRU keys (oldest last)");
- pw.println("----------------------");
- dumpLRUKeys(ds, pw);
- }
- }
-
- public static void dumpCommittedKeys(FSDataStore ds, PrintWriter pw) {
- synchronized (ds.dir.semaphore()) {
- Enumeration keys = ds.dir.keys(true);
- while (keys.hasMoreElements()) {
- FileNumber fn = (FileNumber) keys.nextElement();
- Buffer buffer = ds.dir.fetch(fn);
- try {
- pw.print(Fields.bytesToHex(fn.getByteArray()));
- pw.print(" @ " + Fragment.rangeList(buffer.ticket().ranges));
- pw.println();
- }
- finally {
- buffer.release();
- }
- }
- pw.println();
- }
- }
-
- public static void dumpLRUKeys(FSDataStore ds, PrintWriter pw) {
- synchronized (ds.dir.semaphore()) {
- DateFormat df = DateFormat.getDateTimeInstance();
- Enumeration keys = ds.dir.lruKeys(false);
- while (keys.hasMoreElements()) {
- FileNumber fn = (FileNumber) keys.nextElement();
- Buffer buffer = ds.dir.fetch(fn);
- try {
- pw.print(Fields.bytesToHex(fn.getByteArray()));
- pw.print(" @ " + df.format(new Date(buffer.ticket().timestamp)));
- pw.println();
- }
- finally {
- buffer.release();
- }
- }
- pw.println();
}
}
-
-
-
-
final LossyDirectory dir;
--- DSConsole.java DELETED ---
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
