vcs-svn: improve support for reading large files
Move from uint32_t to off_t as the fundamental unit of length used by the line_buffer library. Performance would get worse if anything but I think it's worth it for support of deltas that need to skip large pieces (> 4 GiB). Exception: buffer_read_string still takes a uint32_t, since it keeps its result in an in-core obj_pool. Callers still have to be updated to take advantage of this. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: David Barr <david.barr@cordelta.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
This commit is contained in:
@ -104,7 +104,7 @@ void buffer_read_binary(struct line_buffer *buf,
|
|||||||
strbuf_fread(sb, size, buf->infile);
|
strbuf_fread(sb, size, buf->infile);
|
||||||
}
|
}
|
||||||
|
|
||||||
void buffer_copy_bytes(struct line_buffer *buf, uint32_t len)
|
void buffer_copy_bytes(struct line_buffer *buf, off_t len)
|
||||||
{
|
{
|
||||||
char byte_buffer[COPY_BUFFER_LEN];
|
char byte_buffer[COPY_BUFFER_LEN];
|
||||||
uint32_t in;
|
uint32_t in;
|
||||||
@ -120,7 +120,7 @@ void buffer_copy_bytes(struct line_buffer *buf, uint32_t len)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void buffer_skip_bytes(struct line_buffer *buf, uint32_t len)
|
void buffer_skip_bytes(struct line_buffer *buf, off_t len)
|
||||||
{
|
{
|
||||||
char byte_buffer[COPY_BUFFER_LEN];
|
char byte_buffer[COPY_BUFFER_LEN];
|
||||||
uint32_t in;
|
uint32_t in;
|
||||||
|
@ -26,7 +26,7 @@ char *buffer_read_line(struct line_buffer *buf);
|
|||||||
char *buffer_read_string(struct line_buffer *buf, uint32_t len);
|
char *buffer_read_string(struct line_buffer *buf, uint32_t len);
|
||||||
int buffer_read_char(struct line_buffer *buf);
|
int buffer_read_char(struct line_buffer *buf);
|
||||||
void buffer_read_binary(struct line_buffer *buf, struct strbuf *sb, uint32_t len);
|
void buffer_read_binary(struct line_buffer *buf, struct strbuf *sb, uint32_t len);
|
||||||
void buffer_copy_bytes(struct line_buffer *buf, uint32_t len);
|
void buffer_copy_bytes(struct line_buffer *buf, off_t len);
|
||||||
void buffer_skip_bytes(struct line_buffer *buf, uint32_t len);
|
void buffer_skip_bytes(struct line_buffer *buf, off_t len);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
Reference in New Issue
Block a user