Update of /cvsroot/freenet/freenet/src/freenet/fs/dir
In directory sc8-pr-cvs1:/tmp/cvs-serv24032/src/freenet/fs/dir
Modified Files:
CircularBuffer.java NativeFSDirectory.java Buffer.java
NullBuffer.java
Removed Files:
FragmentManager.java FSDirectory.java FSDirectoryConst.java
LRUMap.java FSDirectoryCheck.java TicketMap.java
FSDirectoryRoot.java FragmentMap.java FSConsole.java
Ticket.java FragmentSizeMap.java TicketLock.java
FragmentRecord.java TicketManager.java KeyMap.java
FragmentPositionMap.java
Log Message:
Remove the monolithic datastore, and about fscking time! Made rather easy by Eclipse.
Index: CircularBuffer.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/fs/dir/CircularBuffer.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -w -r1.19 -r1.20
--- CircularBuffer.java 21 Oct 2003 01:52:35 -0000 1.19
+++ CircularBuffer.java 30 Oct 2003 02:39:37 -0000 1.20
@@ -36,11 +36,6 @@
}
- public final Ticket ticket() {
- return lapbuf.ticket();
- }
-
-
public final void touch() {
//throw new DirectoryException("now what's the point of that?");
}
Index: NativeFSDirectory.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/fs/dir/NativeFSDirectory.java,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -w -r1.167 -r1.168
--- NativeFSDirectory.java 30 Oct 2003 01:34:07 -0000 1.167
+++ NativeFSDirectory.java 30 Oct 2003 02:39:37 -0000 1.168
@@ -1534,13 +1534,6 @@
return (buffer==null) ? false : buffer.failed();
}
- /**
- * We do not use tickets
- */
- public Ticket ticket() {
- return null;
- }
-
public void touch() {
if(buffer!=null) buffer.touch();
}
@@ -2070,12 +2063,6 @@
touch();
return str;
}
-
- // and ticklock interface
- /**
- * We don't use tickets
- */
- public Ticket ticket() { return null; }
/**
* Set the last used time to now
Index: Buffer.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/fs/dir/Buffer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- Buffer.java 21 Oct 2003 01:52:35 -0000 1.3
+++ Buffer.java 30 Oct 2003 02:39:37 -0000 1.4
@@ -2,7 +2,7 @@
import java.io.*;
-public interface Buffer extends TicketLock {
+public interface Buffer {
/**
* length of buffer, buffer may not be filled up yet
@@ -20,6 +20,12 @@
InputStream getInputStream() throws IOException;
OutputStream getOutputStream() throws IOException;
+
+ void touch();
+
+ void commit();
+
+ void release();
}
Index: NullBuffer.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/fs/dir/NullBuffer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- NullBuffer.java 21 Oct 2003 01:52:36 -0000 1.2
+++ NullBuffer.java 30 Oct 2003 02:39:37 -0000 1.3
@@ -5,10 +5,6 @@
public class NullBuffer implements Buffer {
- public final Ticket ticket() {
- return null;
- }
-
public final void touch() {}
public final void commit() {}
--- FragmentManager.java DELETED ---
--- FSDirectory.java DELETED ---
--- FSDirectoryConst.java DELETED ---
--- LRUMap.java DELETED ---
--- FSDirectoryCheck.java DELETED ---
--- TicketMap.java DELETED ---
--- FSDirectoryRoot.java DELETED ---
--- FragmentMap.java DELETED ---
--- FSConsole.java DELETED ---
--- Ticket.java DELETED ---
--- FragmentSizeMap.java DELETED ---
--- TicketLock.java DELETED ---
--- FragmentRecord.java DELETED ---
--- TicketManager.java DELETED ---
--- KeyMap.java DELETED ---
--- FragmentPositionMap.java DELETED ---
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
