X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/76c21947140b90edaa5591c63b10ca00f939ad9b..deb5bf1dffcfc0507befb1c5fa61d16dea607048:/fileio.c diff --git a/fileio.c b/fileio.c index bc244286..2b86a5ef 100644 --- a/fileio.c +++ b/fileio.c @@ -1,30 +1,31 @@ -/* +/* Copyright (C) Andrew Tridgell 1998 Copyright (C) 2002 by Martin Pool - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* - File IO utilities used in rsync + File IO utilities used in rsync */ #include "rsync.h" +extern int sparse_files; + static char last_byte; static int last_sparse; -extern int sparse_files; int sparse_end(int f) { @@ -42,8 +43,8 @@ static int write_sparse(int f,char *buf,size_t len) size_t l1=0, l2=0; int ret; - for (l1=0;l1 0) { - do_lseek(f,l1,SEEK_CUR); + do_lseek(f,l1,SEEK_CUR); } - if (l1 == len) + if (l1 == len) return len; ret = write(f, buf + l1, len - (l1+l2)); if (ret == -1 || ret == 0) return ret; - else if (ret != (int) (len - (l1+l2))) + else if (ret != (int) (len - (l1+l2))) return (l1+ret); if (l2 > 0) do_lseek(f,l2,SEEK_CUR); - + return len; } @@ -76,14 +77,22 @@ static size_t wf_writeBufCnt; int flush_write_file(int f) { - int ret = write(f, wf_writeBuf, wf_writeBufCnt); - if (ret < 0) - return ret; - /* if (ret < wf_writeBufCnt) ??? */ - wf_writeBufCnt = 0; + int ret = 0; + char *bp = wf_writeBuf; + + while (wf_writeBufCnt > 0) { + if ((ret = write(f, bp, wf_writeBufCnt)) < 0) { + if (errno == EINTR) + continue; + return ret; + } + wf_writeBufCnt -= ret; + bp += ret; + } return ret; } + /* * write_file does not allow incomplete writes. It loops internally * until len bytes are written or errno is set. @@ -92,17 +101,18 @@ int write_file(int f,char *buf,size_t len) { int ret = 0; - while (len>0) { + while (len > 0) { int r1; if (sparse_files) { int len1 = MIN(len, SPARSE_WRITE_SIZE); r1 = write_sparse(f, buf, len1); } else { if (!wf_writeBuf) { - wf_writeBufSize = MAX_MAP_SIZE; + wf_writeBufSize = WRITE_SIZE * 8; wf_writeBufCnt = 0; - wf_writeBuf = new_array(char, MAX_MAP_SIZE); - if (!wf_writeBuf) out_of_memory("write_file"); + wf_writeBuf = new_array(char, wf_writeBufSize); + if (!wf_writeBuf) + out_of_memory("write_file"); } r1 = MIN(len, wf_writeBufSize - wf_writeBufCnt); if (r1) { @@ -110,13 +120,15 @@ int write_file(int f,char *buf,size_t len) wf_writeBufCnt += r1; } if (wf_writeBufCnt == wf_writeBufSize) { - if (flush_write_file(f) < 0) return -1; + if (flush_write_file(f) < 0) + return -1; if (!r1 && len) continue; } } if (r1 <= 0) { - if (ret > 0) return ret; + if (ret > 0) + return ret; return r1; } len -= r1; @@ -127,29 +139,30 @@ int write_file(int f,char *buf,size_t len) } - -/* this provides functionality somewhat similar to mmap() but using - read(). It gives sliding window access to a file. mmap() is not - used because of the possibility of another program (such as a - mailer) truncating the file thus giving us a SIGBUS */ -struct map_struct *map_file(int fd,OFF_T len) +/* This provides functionality somewhat similar to mmap() but using read(). + * It gives sliding window access to a file. mmap() is not used because of + * the possibility of another program (such as a mailer) truncating the + * file thus giving us a SIGBUS. */ +struct map_struct *map_file(int fd, OFF_T len, OFF_T map_size, + size_t block_size) { struct map_struct *map; - map = new(struct map_struct); - if (!map) out_of_memory("map_file"); + if (!(map = new(struct map_struct))) + out_of_memory("map_file"); + + if (block_size && (map_size % block_size)) + map_size += block_size - (map_size % block_size); + + memset(map, 0, sizeof map[0]); map->fd = fd; map->file_size = len; - map->p = NULL; - map->p_size = 0; - map->p_offset = 0; - map->p_fd_offset = 0; - map->p_len = 0; - map->status = 0; + map->def_window_size = map_size; return map; } + /* slide the read window in the file */ char *map_ptr(struct map_struct *map,OFF_T offset,int len) { @@ -157,9 +170,8 @@ char *map_ptr(struct map_struct *map,OFF_T offset,int len) OFF_T window_start, read_start; int window_size, read_size, read_offset; - if (len == 0) { + if (len == 0) return NULL; - } /* can't go beyond the end of file */ if (len > (map->file_size - offset)) { @@ -167,20 +179,14 @@ char *map_ptr(struct map_struct *map,OFF_T offset,int len) } /* in most cases the region will already be available */ - if (offset >= map->p_offset && + if (offset >= map->p_offset && offset+len <= map->p_offset+map->p_len) { return (map->p + (offset - map->p_offset)); } - /* nope, we are going to have to do a read. Work out our desired window */ - if (offset > 2*CHUNK_SIZE) { - window_start = offset - 2*CHUNK_SIZE; - window_start &= ~((OFF_T)(CHUNK_SIZE-1)); /* assumes power of 2 */ - } else { - window_start = 0; - } - window_size = MAX_MAP_SIZE; + window_start = offset; + window_size = map->def_window_size; if (window_start + window_size > map->file_size) { window_size = map->file_size - window_start; } @@ -191,7 +197,8 @@ char *map_ptr(struct map_struct *map,OFF_T offset,int len) /* make sure we have allocated enough memory for the window */ if (window_size > map->p_size) { map->p = realloc_array(map->p, char, window_size); - if (!map->p) out_of_memory("map_ptr"); + if (!map->p) + out_of_memory("map_ptr"); map->p_size = window_size; } @@ -236,8 +243,8 @@ char *map_ptr(struct map_struct *map,OFF_T offset,int len) map->p_offset = window_start; map->p_len = window_size; - - return map->p + (offset - map->p_offset); + + return map->p + (offset - map->p_offset); } @@ -250,9 +257,8 @@ int unmap_file(struct map_struct *map) map->p = NULL; } ret = map->status; - memset(map, 0, sizeof(*map)); + memset(map, 0, sizeof map[0]); free(map); return ret; } -