mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-05 23:35:48 +02:00
Code Issues Wiki Activity

Got rid of the caching of Chunks for now. The databases aren't too large yet and this makes Mozilla indexing 10% faster.

Browse source
This commit is contained in:
Doug Schaefer 2006-05-05 17:44:37 +00:00
parent 918b130a5b
commit 4a257e3fea
2 changed files with 0 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/Chunk.java
View file

@ -28,8 +28,6 @@ public class Chunk {
// Cache info // Cache info
private Database db; private Database db;
int index; int index;
private Chunk prevChunk;
private Chunk nextChunk;
Chunk(RandomAccessFile file, int offset) throws CoreException { Chunk(RandomAccessFile file, int offset) throws CoreException {
try { try {
@ -64,32 +62,13 @@ public class Chunk {
return buffer.getChar(offset % Database.CHUNK_SIZE); return buffer.getChar(offset % Database.CHUNK_SIZE);
} }
Chunk getNextChunk() {
return nextChunk;
}
void setNextChunk(Chunk nextChunk) {
this.nextChunk = nextChunk;
}
Chunk getPrevChunk() {
return prevChunk;
}
void setPrevChunk(Chunk prevChunk) {
this.prevChunk = prevChunk;
}
void clear(int offset, int length) { void clear(int offset, int length) {
buffer.position(offset % Database.CHUNK_SIZE); buffer.position(offset % Database.CHUNK_SIZE);
buffer.put(new byte[length]); buffer.put(new byte[length]);
} }
void free() { void free() {
// nextChunk should be null
db.toc[index] = null; db.toc[index] = null;
db.lruChunk = prevChunk;
prevChunk.nextChunk = null;
} }
} }

24
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/Database.java
View file

@ -26,15 +26,10 @@ public class Database {
private final RandomAccessFile file; private final RandomAccessFile file;
Chunk[] toc; Chunk[] toc;
Chunk mruChunk;
Chunk lruChunk;
private int loadedChunks;
// public for tests only, you shouldn't need these // public for tests only, you shouldn't need these
public static final int VERSION_OFFSET = 0; public static final int VERSION_OFFSET = 0;
public static final int CHUNK_SIZE = 4096; public static final int CHUNK_SIZE = 4096;
public static final int CACHE_SIZE = 10000; // Should be configable
public static final int MIN_SIZE = 16; public static final int MIN_SIZE = 16;
public static final int INT_SIZE = 4; public static final int INT_SIZE = 4;
public static final int CHAR_SIZE = 2; public static final int CHAR_SIZE = 2;
@ -106,28 +101,9 @@ public class Database {
int index = offset / CHUNK_SIZE; int index = offset / CHUNK_SIZE;
Chunk chunk = toc[index]; Chunk chunk = toc[index];
if (chunk == null) { if (chunk == null) {
if (loadedChunks == CACHE_SIZE)
// cache is full, free lruChunk
lruChunk.free();
chunk = toc[index] = new Chunk(file, index * CHUNK_SIZE); chunk = toc[index] = new Chunk(file, index * CHUNK_SIZE);
} }
// insert into cache
// TODO We can move this into the chunks
Chunk prevChunk = chunk.getPrevChunk();
Chunk nextChunk = chunk.getNextChunk();
if (prevChunk != null)
prevChunk.setNextChunk(nextChunk);
if (nextChunk != null)
nextChunk.setPrevChunk(prevChunk);
if (mruChunk != null) {
chunk.setNextChunk(mruChunk);
mruChunk.setPrevChunk(chunk);
}
mruChunk = chunk;
chunk.setPrevChunk(null);
return chunk; return chunk;
} }