-/*
- 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.
+ *
+ * Copyright (C) 1998 Andrew Tridgell
+ * Copyright (C) 2002 Martin Pool
+ * Copyright (C) 2004-2008 Wayne Davison
+ *
+ * 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 3 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, visit the http://fsf.org website.
+ */
+
#include "rsync.h"
-static char last_byte;
-static int last_sparse;
+#ifndef ENODATA
+#define ENODATA EAGAIN
+#endif
+
extern int sparse_files;
+static char last_byte;
+static size_t sparse_seek = 0;
+
int sparse_end(int f)
{
- if (last_sparse) {
- do_lseek(f,-1,SEEK_CUR);
- return (write(f,&last_byte,1) == 1 ? 0 : -1);
- }
- last_sparse = 0;
- return 0;
+ int ret;
+
+ if (!sparse_seek)
+ return 0;
+
+ do_lseek(f, sparse_seek-1, SEEK_CUR);
+ sparse_seek = 0;
+
+ do {
+ ret = write(f, "", 1);
+ } while (ret < 0 && errno == EINTR);
+
+ return ret <= 0 ? -1 : 0;
}
-static int write_sparse(int f,char *buf,size_t len)
+static int write_sparse(int f, char *buf, size_t len)
{
- size_t l1=0, l2=0;
+ size_t l1 = 0, l2 = 0;
int ret;
- for (l1=0;l1<len && buf[l1]==0;l1++) ;
- for (l2=0;l2<(len-l1) && buf[len-(l2+1)]==0;l2++) ;
+ for (l1 = 0; l1 < len && buf[l1] == 0; l1++) {}
+ for (l2 = 0; l2 < len-l1 && buf[len-(l2+1)] == 0; l2++) {}
+ /* XXX Riddle me this: why does this function SLOW DOWN when I
+ * remove the following (unneeded) line?? Core Duo weirdness? */
last_byte = buf[len-1];
- if (l1 == len || l2 > 0)
- last_sparse=1;
-
- if (l1 > 0) {
- do_lseek(f,l1,SEEK_CUR);
- }
+ sparse_seek += l1;
- if (l1 == len)
+ if (l1 == len)
return len;
- ret = write(f, buf + l1, len - (l1+l2));
- if (ret == -1 || ret == 0)
+ if (sparse_seek)
+ do_lseek(f, sparse_seek, SEEK_CUR);
+ sparse_seek = l2;
+
+ while ((ret = write(f, buf + l1, len - (l1+l2))) <= 0) {
+ if (ret < 0 && errno == EINTR)
+ continue;
return ret;
- else if (ret != (int) (len - (l1+l2)))
- return (l1+ret);
+ }
+
+ if (ret != (int)(len - (l1+l2)))
+ return l1+ret;
- if (l2 > 0)
- do_lseek(f,l2,SEEK_CUR);
-
return len;
}
{
int ret = 0;
char *bp = wf_writeBuf;
-
+
while (wf_writeBufCnt > 0) {
if ((ret = write(f, bp, wf_writeBufCnt)) < 0) {
if (errno == EINTR)
return ret;
}
+
/*
* write_file does not allow incomplete writes. It loops internally
* until len bytes are written or errno is set.
while (len > 0) {
int r1;
- if (sparse_files) {
+ if (sparse_files > 0) {
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);
+ wf_writeBuf = new_array(char, wf_writeBufSize);
if (!wf_writeBuf)
out_of_memory("write_file");
}
}
}
if (r1 <= 0) {
- if (ret > 0) return ret;
+ if (ret > 0)
+ return ret;
return r1;
}
len -= r1;
}
-
-/* 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, int32 read_size,
+ int32 blk_size)
{
struct map_struct *map;
- map = new(struct map_struct);
- if (!map) out_of_memory("map_file");
+
+ if (!(map = new0(struct map_struct)))
+ out_of_memory("map_file");
+
+ if (blk_size && (read_size % blk_size))
+ read_size += blk_size - (read_size % blk_size);
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 = read_size;
return map;
}
+
/* slide the read window in the file */
-char *map_ptr(struct map_struct *map,OFF_T offset,int len)
+char *map_ptr(struct map_struct *map, OFF_T offset, int32 len)
{
- int nread;
+ int32 nread;
OFF_T window_start, read_start;
- int window_size, read_size, read_offset;
+ int32 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)) {
- len = map->file_size - offset;
+ if (len < 0) {
+ rprintf(FERROR, "invalid len passed to map_ptr: %ld\n",
+ (long)len);
+ exit_cleanup(RERR_FILEIO);
}
/* in most cases the region will already be available */
- if (offset >= map->p_offset &&
- offset+len <= map->p_offset+map->p_len) {
- return (map->p + (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;
- if (window_start + window_size > map->file_size) {
- window_size = map->file_size - window_start;
- }
- if (offset + len > window_start + window_size) {
- window_size = (offset+len) - window_start;
- }
+ window_start = offset;
+ window_size = map->def_window_size;
+ if (window_start + window_size > map->file_size)
+ window_size = (int32)(map->file_size - window_start);
+ if (len > window_size)
+ window_size = 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;
}
- /* now try to avoid re-reading any bytes by reusing any bytes from the previous
- buffer. */
+ /* Now try to avoid re-reading any bytes by reusing any bytes
+ * from the previous buffer. */
if (window_start >= map->p_offset &&
window_start < map->p_offset + map->p_len &&
window_start + window_size >= map->p_offset + map->p_len) {
read_start = map->p_offset + map->p_len;
- read_offset = read_start - window_start;
+ read_offset = (int32)(read_start - window_start);
read_size = window_size - read_offset;
memmove(map->p, map->p + (map->p_len - read_offset), read_offset);
} else {
}
if (read_size <= 0) {
- rprintf(FINFO,"Warning: unexpected read size of %d in map_ptr\n", read_size);
- } else {
- if (map->p_fd_offset != read_start) {
- if (do_lseek(map->fd,read_start,SEEK_SET) != read_start) {
- rprintf(FERROR,"lseek failed in map_ptr\n");
- exit_cleanup(RERR_FILEIO);
- }
- map->p_fd_offset = read_start;
+ rprintf(FERROR, "invalid read_size of %ld in map_ptr\n",
+ (long)read_size);
+ exit_cleanup(RERR_FILEIO);
+ }
+
+ if (map->p_fd_offset != read_start) {
+ OFF_T ret = do_lseek(map->fd, read_start, SEEK_SET);
+ if (ret != read_start) {
+ rsyserr(FERROR, errno, "lseek returned %s, not %s",
+ big_num(ret, 0), big_num(read_start, 0));
+ exit_cleanup(RERR_FILEIO);
}
+ map->p_fd_offset = read_start;
+ }
+ map->p_offset = window_start;
+ map->p_len = window_size;
- if ((nread=read(map->fd,map->p + read_offset,read_size)) != read_size) {
- if (nread < 0) {
- nread = 0;
- if (!map->status)
- map->status = errno;
- }
- /* the best we can do is zero the buffer - the file
- has changed mid transfer! */
- memset(map->p+read_offset+nread, 0, read_size - nread);
+ while (read_size > 0) {
+ nread = read(map->fd, map->p + read_offset, read_size);
+ if (nread <= 0) {
+ if (!map->status)
+ map->status = nread ? errno : ENODATA;
+ /* The best we can do is zero the buffer -- the file
+ * has changed mid transfer! */
+ memset(map->p + read_offset, 0, read_size);
+ break;
}
map->p_fd_offset += nread;
+ read_offset += nread;
+ read_size -= nread;
}
- map->p_offset = window_start;
- map->p_len = window_size;
-
- return map->p + (offset - map->p_offset);
+ return map->p;
}
map->p = NULL;
}
ret = map->status;
- memset(map, 0, sizeof(*map));
+ memset(map, 0, sizeof map[0]);
free(map);
return ret;
}
-
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff