embedaddon/rsync/fileio.c - diff

Return to fileio.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / rsync

Diff for /embedaddon/rsync/fileio.c between versions 1.1 and 1.1.1.2

version 1.1, 2012/02/17 15:09:30	version 1.1.1.2, 2013/10/14 07:51:14
Line 3	Line 3
*	*
* Copyright (C) 1998 Andrew Tridgell	* Copyright (C) 1998 Andrew Tridgell
* Copyright (C) 2002 Martin Pool	* Copyright (C) 2002 Martin Pool
* Copyright (C) 2004-2009 Wayne Davison	* Copyright (C) 2004-2013 Wayne Davison
*	*
* This program is free software; you can redistribute it and/or modify	* 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	* it under the terms of the GNU General Public License as published by
Line 20	Line 20
*/	*/

#include "rsync.h"	#include "rsync.h"
	#include "inums.h"

#ifndef ENODATA	#ifndef ENODATA
#define ENODATA EAGAIN	#define ENODATA EAGAIN
#endif	#endif

	/* We want all reads to be aligned on 1K boundries. */
	#define ALIGN_BOUNDRY 1024
	/* How far past the boundary is an offset? */
	#define ALIGNED_OVERSHOOT(oft) ((oft) & (ALIGN_BOUNDRY-1))
	/* Round up a length to the next boundary */
	#define ALIGNED_LENGTH(len) ((((len) - 1) \| (ALIGN_BOUNDRY-1)) + 1)

extern int sparse_files;	extern int sparse_files;

static OFF_T sparse_seek = 0;	static OFF_T sparse_seek = 0;
Line 76 static int write_sparse(int f, char *buf, int len)	Line 84 static int write_sparse(int f, char *buf, int len)
while ((ret = write(f, buf + l1, len - (l1+l2))) <= 0) {	while ((ret = write(f, buf + l1, len - (l1+l2))) <= 0) {
if (ret < 0 && errno == EINTR)	if (ret < 0 && errno == EINTR)
continue;	continue;
	sparse_seek = 0;
return ret;	return ret;
}	}

if (ret != (int)(len - (l1+l2)))	if (ret != (int)(len - (l1+l2))) {
	sparse_seek = 0;
return l1+ret;	return l1+ret;
	}

return len;	return len;
}	}
Line 158 int write_file(int f, char *buf, int len)	Line 169 int write_file(int f, char *buf, int len)
* It gives sliding window access to a file. mmap() is not used because of	* 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	* the possibility of another program (such as a mailer) truncating the
* file thus giving us a SIGBUS. */	* file thus giving us a SIGBUS. */
struct map_struct *map_file(int fd, OFF_T len, int32 read_size,	struct map_struct *map_file(int fd, OFF_T len, int32 read_size, int32 blk_size)
int32 blk_size)
{	{
struct map_struct *map;	struct map_struct *map;

Line 171 struct map_struct *map_file(int fd, OFF_T len, int32 r	Line 181 struct map_struct *map_file(int fd, OFF_T len, int32 r

map->fd = fd;	map->fd = fd;
map->file_size = len;	map->file_size = len;
map->def_window_size = read_size;	map->def_window_size = ALIGNED_LENGTH(read_size);

return map;	return map;
}	}
Line 180 struct map_struct *map_file(int fd, OFF_T len, int32 r	Line 190 struct map_struct *map_file(int fd, OFF_T len, int32 r
/* slide the read window in the file */	/* slide the read window in the file */
char map_ptr(struct map_struct map, OFF_T offset, int32 len)	char map_ptr(struct map_struct map, OFF_T offset, int32 len)
{	{
int32 nread;
OFF_T window_start, read_start;	OFF_T window_start, read_start;
int32 window_size, read_size, read_offset;	int32 window_size, read_size, read_offset, align_fudge;

if (len == 0)	if (len == 0)
return NULL;	return NULL;
Line 197 char map_ptr(struct map_struct map, OFF_T offset, in	Line 206 char map_ptr(struct map_struct map, OFF_T offset, in
return map->p + (offset - map->p_offset);	return map->p + (offset - map->p_offset);

/* nope, we are going to have to do a read. Work out our desired window */	/* nope, we are going to have to do a read. Work out our desired window */
window_start = offset;	align_fudge = (int32)ALIGNED_OVERSHOOT(offset);
	window_start = offset - align_fudge;
window_size = map->def_window_size;	window_size = map->def_window_size;
if (window_start + window_size > map->file_size)	if (window_start + window_size > map->file_size)
window_size = (int32)(map->file_size - window_start);	window_size = (int32)(map->file_size - window_start);
if (len > window_size)	if (window_size < len + align_fudge)
window_size = len;	window_size = ALIGNED_LENGTH(len + align_fudge);

/* make sure we have allocated enough memory for the window */	/* make sure we have allocated enough memory for the window */
if (window_size > map->p_size) {	if (window_size > map->p_size) {
Line 212 char map_ptr(struct map_struct map, OFF_T offset, in	Line 222 char map_ptr(struct map_struct map, OFF_T offset, in
map->p_size = window_size;	map->p_size = window_size;
}	}

/* Now try to avoid re-reading any bytes by reusing any bytes	/* Now try to avoid re-reading any bytes by reusing any bytes from the previous buffer. */
* from the previous buffer. */	if (window_start >= map->p_offset && window_start < map->p_offset + map->p_len
if (window_start >= map->p_offset &&	&& window_start + window_size >= map->p_offset + map->p_len) {
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_start = map->p_offset + map->p_len;
read_offset = (int32)(read_start - window_start);	read_offset = (int32)(read_start - window_start);
read_size = window_size - read_offset;	read_size = window_size - read_offset;
Line 236 char map_ptr(struct map_struct map, OFF_T offset, in	Line 244 char map_ptr(struct map_struct map, OFF_T offset, in
if (map->p_fd_offset != read_start) {	if (map->p_fd_offset != read_start) {
OFF_T ret = do_lseek(map->fd, read_start, SEEK_SET);	OFF_T ret = do_lseek(map->fd, read_start, SEEK_SET);
if (ret != read_start) {	if (ret != read_start) {
rsyserr(FERROR, errno, "lseek returned %.0f, not %.0f",	rsyserr(FERROR, errno, "lseek returned %s, not %s",
(double)ret, (double)read_start);	big_num(ret), big_num(read_start));
exit_cleanup(RERR_FILEIO);	exit_cleanup(RERR_FILEIO);
}	}
map->p_fd_offset = read_start;	map->p_fd_offset = read_start;
Line 246 char map_ptr(struct map_struct map, OFF_T offset, in	Line 254 char map_ptr(struct map_struct map, OFF_T offset, in
map->p_len = window_size;	map->p_len = window_size;

while (read_size > 0) {	while (read_size > 0) {
nread = read(map->fd, map->p + read_offset, read_size);	int32 nread = read(map->fd, map->p + read_offset, read_size);
if (nread <= 0) {	if (nread <= 0) {
if (!map->status)	if (!map->status)
map->status = nread ? errno : ENODATA;	map->status = nread ? errno : ENODATA;
Line 260 char map_ptr(struct map_struct map, OFF_T offset, in	Line 268 char map_ptr(struct map_struct map, OFF_T offset, in
read_size -= nread;	read_size -= nread;
}	}

return map->p;	return map->p + align_fudge;
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.1
changed lines
	Added in v.1.1.1.2