ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

Moved some files and fixed some performance issues

Browse source
This commit is contained in:
Ziver Koc 2010-08-14 15:22:02 +00:00
parent bd7f3542f8
commit bd58efdd37
6 changed files with 38 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

53
src/zutil/io/BufferedRandomAccessFile.java
View file

@ -12,8 +12,8 @@ import java.io.RandomAccessFile;
* @author Ziver
*/
public class BufferedRandomAccessFile extends RandomAccessFile{
// The size of the buffer
private int BUF_SIZE = 256;
// The size of the buffer in Byte
private int BUF_SIZE = 64*1024;
// The Buffer
byte buffer[];
@ -73,22 +73,6 @@ public class BufferedRandomAccessFile extends RandomAccessFile{
buffer = new byte[BUF_SIZE];
}
/**
* @return the next byte in the buffer
*/
public final int read() throws IOException{
if(buf_pos >= buf_end) {
if(fillBuffer() < 0)
return -1;
}
if(buf_end == 0) {
return -1;
} else {
buf_pos++;
return buffer[buf_pos-1];
}
}
/**
* Reads in data from the file to the buffer
*
@ -116,6 +100,22 @@ public class BufferedRandomAccessFile extends RandomAccessFile{
file_pos = super.getFilePointer();
}
/**
* @return the next byte in the buffer
*/
public final int read() throws IOException{
if(buf_pos >= buf_end) {
if(fillBuffer() < 0)
return -1;
}
if(buf_end == 0) {
return -1;
} else {
buf_pos++;
return buffer[buf_pos-1];
}
}
/**
* Fills the given array with data from the buffer
*
@ -135,13 +135,26 @@ public class BufferedRandomAccessFile extends RandomAccessFile{
* @return the amount of bytes read or -1 if eof
*/
public int read(byte b[], int off, int len) throws IOException {
if(buf_pos >= buf_end) {
if(fillBuffer() < 0)
return -1; // EOF
}
// Copy from buffer
int leftover = buf_end - buf_pos;
if(len <= leftover) {
System.arraycopy(buffer, buf_pos, b, off, len);
buf_pos += len;
return len;
}
for(int i = 0; i < len; i++) {
System.arraycopy(buffer, buf_pos, b, off, leftover);
int n = super.read(b, off+leftover, len-leftover );
fillBuffer();
if( n >= 0 )
return leftover + n;
return leftover;
/*for(int i = 0; i < len; i++) {
int c = this.read();
if(c != -1)
b[off+i] = (byte)c;
@ -149,7 +162,7 @@ public class BufferedRandomAccessFile extends RandomAccessFile{
return i;
}
}
return len;
return len;*/
}
/**