mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #186 from ThomasWaldmann/chunker_small_fixes 

Chunker small fixes
This commit is contained in:
TW 2015-09-06 22:22:19 +02:00
parent 947fc095d8 e244fe2f69
commit 68928e4c67
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
borg/_chunker.c
View File

@ -83,7 +83,8 @@ typedef struct {
PyObject *fd;
int fh;
int done, eof;
size_t remaining, bytes_read, bytes_yielded, position, last;
size_t remaining, position, last;
off_t bytes_read, bytes_yielded;
} Chunker;
static Chunker *
@ -96,6 +97,7 @@ chunker_init(int window_size, int chunk_mask, int min_size, int max_size, uint32
c->table = buzhash_init_table(seed);
c->buf_size = max_size;
c->data = malloc(c->buf_size);
c->fh = -1;
return c;
}
@ -128,7 +130,7 @@ static int
chunker_fill(Chunker *c)
{
ssize_t n;
size_t offset, length;
off_t offset, length;
PyObject *data;
memmove(c->data, c->data + c->last, c->position + c->remaining - c->last);
c->position -= c->last;
@ -161,7 +163,7 @@ chunker_fill(Chunker *c)
// size limit) kick out data from the cache that might be still useful
// for the OS or other processes.
if (length > 0) {
posix_fadvise(c->fh, (off_t) offset, (off_t) length, POSIX_FADV_DONTNEED);
posix_fadvise(c->fh, offset, length, POSIX_FADV_DONTNEED);
}
#endif
}