cheers
tobi
-Changes:
+Changes:
2007-04-23
diff --git a/cleanup.c b/cleanup.c
--- a/cleanup.c
+++ b/cleanup.c
-@@ -47,7 +47,13 @@ void close_all(void)
+@@ -46,7 +46,13 @@ void close_all(void)
int fd;
int ret;
STRUCT_STAT st;
+++ b/fileio.c
@@ -30,6 +30,12 @@ extern int sparse_files;
static char last_byte;
- static size_t sparse_seek = 0;
+ static OFF_T sparse_seek = 0;
+#ifdef HAVE_POSIX_FADVISE64
+#define close(fd) fadv_close(fd)
int cvs_exclude = 0;
int dry_run = 0;
int do_xfers = 1;
-@@ -326,6 +327,9 @@ void usage(enum logcode F)
+@@ -327,6 +328,9 @@ void usage(enum logcode F)
rprintf(F," --backup-dir=DIR make backups into hierarchy based in DIR\n");
rprintf(F," --suffix=SUFFIX set backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX);
rprintf(F," -u, --update skip files that are newer on the receiver\n");
rprintf(F," --inplace update destination files in-place (SEE MAN PAGE)\n");
rprintf(F," --append append data onto shorter files\n");
rprintf(F," --append-verify like --append, but with old data in file checksum\n");
-@@ -534,6 +538,9 @@ static struct poptOption long_options[] = {
+@@ -535,6 +539,9 @@ static struct poptOption long_options[] = {
{"no-one-file-system",'x',POPT_ARG_VAL, &one_file_system, 0, 0, 0 },
{"no-x", 'x', POPT_ARG_VAL, &one_file_system, 0, 0, 0 },
{"update", 'u', POPT_ARG_NONE, &update_only, 0, 0, 0 },
{"existing", 0, POPT_ARG_NONE, &ignore_non_existing, 0, 0, 0 },
{"ignore-non-existing",0,POPT_ARG_NONE, &ignore_non_existing, 0, 0, 0 },
{"ignore-existing", 0, POPT_ARG_NONE, &ignore_existing, 0, 0, 0 },
-@@ -1719,6 +1726,11 @@ void server_options(char **args, int *argc_p)
+@@ -1720,6 +1727,11 @@ void server_options(char **args, int *argc_p)
if (!am_sender)
args[ac++] = "--sender";
diff --git a/receiver.c b/receiver.c
--- a/receiver.c
+++ b/receiver.c
-@@ -62,6 +62,10 @@ static int phase = 0, redoing = 0;
+@@ -63,6 +63,10 @@ static flist_ndx_list batch_redo_list;
/* We're either updating the basis file or an identical copy: */
static int updating_basis_or_equiv;
diff --git a/rsync.yo b/rsync.yo
--- a/rsync.yo
+++ b/rsync.yo
-@@ -352,6 +352,7 @@ to the detailed description below for a complete description. verb(
+@@ -356,6 +356,7 @@ to the detailed description below for a complete description. verb(
--super receiver attempts super-user activities
--fake-super store/recover privileged attrs using xattrs
-S, --sparse handle sparse files efficiently
-n, --dry-run perform a trial run with no changes made
-W, --whole-file copy files whole (w/o delta-xfer algorithm)
-x, --one-file-system don't cross filesystem boundaries
-@@ -1043,6 +1044,10 @@ NOTE: Don't use this option when the destination is a Solaris "tmpfs"
+@@ -1053,6 +1054,10 @@ NOTE: Don't use this option when the destination is a Solaris "tmpfs"
filesystem. It doesn't seem to handle seeks over null regions
correctly and ends up corrupting the files.
extern int modify_window;
extern int relative_paths;
extern int human_readable;
-@@ -41,6 +42,131 @@ char curr_dir[MAXPATHLEN];
+@@ -42,6 +43,131 @@ char curr_dir[MAXPATHLEN];
unsigned int curr_dir_len;
int curr_dir_depth; /* This is only set for a sanitizing daemon. */
+ fadv_fd_init_func();
+ fadv_close_buffer_size += pos - fadv_fd_pos[fd];
+ fadv_close_ring[fadv_close_ring_head] = newfd;
-+ fadv_close_ring_head = (fadv_close_ring_head + 1) % fadv_max_fd;
++ fadv_close_ring_head = (fadv_close_ring_head + 1) % fadv_max_fd;
+ fadv_close_ring_size ++;
+ if (fadv_close_ring_size == fadv_max_fd || fadv_close_buffer_size > 1024*1024 ){
+ /* it seems fastest to drop things 'in groups' */
+ fadv_close_all();
-+ }
++ }
+ }
+ return close(fd);
+}