* Copyright (C) 1996 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
* Copyright (C) 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2004, 2005, 2006 Wayne Davison
+ * Copyright (C) 2004-2007 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 2 of the License, or
+ * 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,
* 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.,
- * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ * with this program; if not, visit the http://fsf.org website.
*/
#include "rsync.h"
extern int dry_run;
extern int do_xfers;
extern int link_dest;
+extern int preserve_acls;
extern int make_backups;
+extern int protocol_version;
extern int remove_source_files;
extern int stdout_format_has_i;
extern int maybe_ATTRS_REPORT;
extern char *basis_dir[];
-extern struct file_list *the_file_list;
+extern struct file_list *cur_flist;
+#ifdef ICONV_OPTION
+extern int ic_ndx;
+#endif
#ifdef SUPPORT_HARD_LINKS
-alloc_pool_t hlink_pool;
+#define HASH_LOAD_LIMIT(size) ((size)*3/4)
-#define FPTR(i) (the_file_list->files[i])
-#define LINKED(i1,i2) ((i1)->dev == (i2)->dev && (i1)->ino == (i2)->ino)
+struct ihash_table {
+ int32 size;
+ int32 entries;
+ struct idev_node *buckets;
+} *dev_tbl;
-void init_hard_links(void)
+static struct idev_node *ihash_node(struct ihash_table *tbl, int64 key);
+
+/* Starting with protocol 30, we use a simple hashtable on the sending side
+ * for hashing the st_dev and st_ino info. The receiving side gets told
+ * (via flags and a "group index") which items are hard-linked together, so
+ * we can avoid the pool of dev+inode data. */
+
+static struct ihash_table *ihash_create(int size)
{
- if (!(hlink_pool = pool_create(HLINK_EXTENT, sizeof (struct idev),
- out_of_memory, POOL_INTERN)))
- out_of_memory("init_hard_links");
+ struct ihash_table *tbl;
+
+ /* Pick a power of 2 that can hold the requested size. */
+ if (size & (size-1) || size < 16) {
+ int req = size;
+ size = 16;
+ while (size < req)
+ size *= 2;
+ }
+
+ if (!(tbl = new(struct ihash_table))
+ || !(tbl->buckets = new_array(struct idev_node, size)))
+ out_of_memory("ihash_create");
+ memset(tbl->buckets, 0, size * sizeof tbl->buckets[0]);
+ tbl->size = size;
+ tbl->entries = 0;
+
+ return tbl;
}
-static int hlink_compare(int *int1, int *int2)
+static void ihash_destroy(struct ihash_table *tbl)
{
- struct file_struct *f1 = FPTR(*int1);
- struct file_struct *f2 = FPTR(*int2);
- struct idev *i1 = F_HL_IDEV(f1);
- struct idev *i2 = F_HL_IDEV(f2);
+ free(tbl->buckets);
+ free(tbl);
+}
- if (i1->dev != i2->dev)
- return i1->dev > i2->dev ? 1 : -1;
+void init_hard_links(void)
+{
+ dev_tbl = ihash_create(16);
+}
- if (i1->ino != i2->ino)
- return i1->ino > i2->ino ? 1 : -1;
+static void expand_ihash(struct ihash_table *tbl)
+{
+ struct idev_node *old_buckets = tbl->buckets;
+ int size = tbl->size * 2;
+ int i;
+
+ if (!(tbl->buckets = new_array(struct idev_node, size)))
+ out_of_memory("ihash_create");
+ memset(tbl->buckets, 0, size * sizeof (struct idev_node));
+ tbl->size = size;
+ tbl->entries = 0;
+
+ for (i = size / 2; i-- > 0; ) {
+ int64 key = old_buckets[i].key;
+ if (key == 0)
+ continue;
+ ihash_node(tbl, key)->data = old_buckets[i].data;
+ }
- return f_name_cmp(f1, f2);
+ free(old_buckets);
}
-/* Analyze the dev+inode data in the file-list by creating a list of all
- * the items that have hlink data, sorting them, and matching up identical
- * values into clusters. These will be a single linked list from last to
- * first when we're done. */
-void match_hard_links(void)
+/* This returns the node for the indicated key, either newly created,
+ * or already existing. */
+static struct idev_node *ihash_node(struct ihash_table *tbl, int64 key)
{
- int32 from, prev, *ndx_list;
- struct file_struct *file, *file_next;
- struct idev *idev, *idev_next;
- int i, ndx_count = 0;
+ uint32 bkt;
- if (!(ndx_list = new_array(int32, the_file_list->count)))
- out_of_memory("match_hard_links");
+ if (tbl->entries > HASH_LOAD_LIMIT(tbl->size))
+ expand_ihash(tbl);
- for (i = 0; i < the_file_list->count; i++) {
- if (F_IS_HLINKED(FPTR(i)))
- ndx_list[ndx_count++] = i;
+#if SIZEOF_INT64 < 8
+ /* Based on Jenkins One-at-a-time hash. */
+ {
+ uchar *keyp = (uchar*)&key;
+ int i;
+
+ for (bkt = 0, i = 0; i < SIZEOF_INT64; i++) {
+ bkt += keyp[i];
+ bkt += (bkt << 10);
+ bkt ^= (bkt >> 6);
+ }
+ bkt += (bkt << 3);
+ bkt ^= (bkt >> 11);
+ bkt += (bkt << 15);
}
+#else
+#define rot(x,k) (((x)<<(k)) ^ ((x)>>(32-(k))))
+ /* Based on Jenkins hashword() from lookup3.c. */
+ {
+ uint32 a, b, c;
+
+ /* Set up the internal state */
+ a = b = c = 0xdeadbeef + (8 << 2);
+
+ b += (uint32)(key >> 32);
+ a += (uint32)key;
+ c ^= b; c -= rot(b, 14);
+ a ^= c; a -= rot(c, 11);
+ b ^= a; b -= rot(a, 25);
+ c ^= b; c -= rot(b, 16);
+ a ^= c; a -= rot(c, 4);
+ b ^= a; b -= rot(a, 14);
+ c ^= b; c -= rot(b, 24);
+ bkt = c;
+ }
+#endif
- if (!ndx_count) {
- free(ndx_list);
- return;
+ /* If it already exists, return it. */
+ while (1) {
+ bkt &= tbl->size - 1;
+ if (tbl->buckets[bkt].key == key)
+ return &tbl->buckets[bkt];
+ if (tbl->buckets[bkt].key == 0)
+ break;
+ bkt++;
}
+ /* Otherwise, take over this empty spot and then return it. */
+ tbl->buckets[bkt].key = key;
+ tbl->entries++;
+ return &tbl->buckets[bkt];
+}
+
+struct idev_node *idev_node(int64 dev, int64 ino)
+{
+ static struct idev_node *dev_node = NULL;
+ struct ihash_table *tbl;
+
+ if (!dev_node || dev_node->key != dev) {
+ /* We keep a separate hash table of inodes for every device. */
+ dev_node = ihash_node(dev_tbl, dev);
+ if (!(tbl = dev_node->data))
+ tbl = dev_node->data = ihash_create(512);
+ } else
+ tbl = dev_node->data;
+
+ return ihash_node(tbl, ino);
+}
+
+void idev_destroy(void)
+{
+ int i;
+
+ for (i = 0; i < dev_tbl->size; i++) {
+ if (dev_tbl->buckets[i].data)
+ ihash_destroy(dev_tbl->buckets[i].data);
+ }
+
+ ihash_destroy(dev_tbl);
+}
+
+static int hlink_compare_gnum(int *int1, int *int2)
+{
+ struct file_struct *f1 = cur_flist->sorted[*int1];
+ struct file_struct *f2 = cur_flist->sorted[*int2];
+ int32 gnum1 = F_HL_GNUM(f1);
+ int32 gnum2 = F_HL_GNUM(f2);
+
+ if (gnum1 != gnum2)
+ return gnum1 > gnum2 ? 1 : -1;
+
+ return *int1 > *int2 ? 1 : -1;
+}
+
+static void match_gnums(int32 *ndx_list, int ndx_count)
+{
+ int32 from, prev;
+ struct file_struct *file, *file_next;
+ int32 gnum, gnum_next;
+
qsort(ndx_list, ndx_count, sizeof ndx_list[0],
- (int (*)()) hlink_compare);
+ (int (*)()) hlink_compare_gnum);
for (from = 0; from < ndx_count; from++) {
- for (file = FPTR(ndx_list[from]), idev = F_HL_IDEV(file), prev = -1;
+ for (file = cur_flist->sorted[ndx_list[from]], gnum = F_HL_GNUM(file), prev = -1;
from < ndx_count-1;
- file = file_next, idev = idev_next, prev = ndx_list[from++])
+ file = file_next, gnum = gnum_next, from++) /*SHARED ITERATOR*/
{
- file_next = FPTR(ndx_list[from+1]);
- idev_next = F_HL_IDEV(file_next);
- if (!LINKED(idev, idev_next))
+ file_next = cur_flist->sorted[ndx_list[from+1]];
+ gnum_next = F_HL_GNUM(file_next);
+ if (gnum != gnum_next)
break;
- pool_free(hlink_pool, 0, idev);
if (prev < 0)
file->flags |= FLAG_HLINK_FIRST;
F_HL_PREV(file) = prev;
+ /* The linked list must use raw ndx values. */
+#ifdef ICONV_OPTION
+ if (ic_ndx)
+ prev = F_NDX(file);
+ else
+#endif
+ prev = ndx_list[from];
}
- pool_free(hlink_pool, 0, idev);
if (prev < 0)
file->flags &= ~FLAG_HLINKED;
else {
F_HL_PREV(file) = prev;
}
}
+}
+
+/* Analyze the hard-links in the file-list by creating a list of all the
+ * items that have hlink data, sorting them, and matching up identical
+ * values into clusters. These will be a single linked list from last
+ * to first when we're done. */
+void match_hard_links(void)
+{
+ int i, ndx_count = 0;
+ int32 *ndx_list;
+
+ if (!(ndx_list = new_array(int32, cur_flist->used)))
+ out_of_memory("match_hard_links");
+
+ for (i = 0; i < cur_flist->used; i++) {
+ if (F_IS_HLINKED(cur_flist->sorted[i]))
+ ndx_list[ndx_count++] = i;
+ }
+
+ if (ndx_count)
+ match_gnums(ndx_list, ndx_count);
- pool_destroy(hlink_pool);
free(ndx_list);
+ if (protocol_version < 30)
+ idev_destroy();
}
static int maybe_hard_link(struct file_struct *file, int ndx,
- const char *fname, int statret, STRUCT_STAT *stp,
+ const char *fname, int statret, statx *sxp,
const char *oldname, STRUCT_STAT *old_stp,
const char *realname, int itemizing, enum logcode code)
{
if (statret == 0) {
- if (stp->st_dev == old_stp->st_dev
- && stp->st_ino == old_stp->st_ino) {
+ if (sxp->st.st_dev == old_stp->st_dev
+ && sxp->st.st_ino == old_stp->st_ino) {
if (itemizing) {
- itemize(file, ndx, statret, stp,
+ itemize(fname, file, ndx, statret, sxp,
ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS,
0, "");
}
file->flags |= FLAG_HLINK_DONE;
return 0;
}
- if (make_backups) {
+ if (make_backups > 0) {
if (!make_backup(fname))
return -1;
} else if (robust_unlink(fname)) {
if (hard_link_one(file, fname, oldname, 0)) {
if (itemizing) {
- itemize(file, ndx, statret, stp,
+ itemize(fname, file, ndx, statret, sxp,
ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS, 0,
realname);
}
/* Only called if FLAG_HLINKED is set and FLAG_HLINK_FIRST is not. Returns:
* 0 = process the file, 1 = skip the file, -1 = error occurred. */
int hard_link_check(struct file_struct *file, int ndx, const char *fname,
- int statret, STRUCT_STAT *stp, int itemizing,
+ int statret, statx *sxp, int itemizing,
enum logcode code)
{
STRUCT_STAT prev_st;
char prev_name[MAXPATHLEN], altbuf[MAXPATHLEN], *realname;
int alt_dest, prev_ndx = F_HL_PREV(file);
- struct file_struct *prev_file = FPTR(prev_ndx);
+ struct file_struct *prev_file = cur_flist->files[prev_ndx];
/* Is the previous link is not complete yet? */
if (!(prev_file->flags & FLAG_HLINK_DONE)) {
/* Is the previous link being transferred? */
- if (prev_file->flags & FLAG_SENT) {
+ if (prev_file->flags & FLAG_FILE_SENT) {
/* Add ourselves to the list of files that will be
* updated when the transfer completes, and mark
* ourself as waiting for the transfer. */
F_HL_PREV(file) = F_HL_PREV(prev_file);
F_HL_PREV(prev_file) = ndx;
- file->flags |= FLAG_SENT;
+ file->flags |= FLAG_FILE_SENT;
return 1;
}
return 0;
if (!(prev_file->flags & FLAG_HLINK_FIRST)) {
/* The previous previous will be marked with FIRST. */
prev_ndx = F_HL_PREV(prev_file);
- prev_file = FPTR(prev_ndx);
+ prev_file = cur_flist->files[prev_ndx];
/* Update our previous pointer to point to the first. */
F_HL_PREV(file) = prev_ndx;
}
if (statret < 0 && basis_dir[0] != NULL) {
/* If we match an alt-dest item, we don't output this as a change. */
char cmpbuf[MAXPATHLEN];
- STRUCT_STAT alt_st;
+ statx alt_sx;
int j = 0;
+#ifdef SUPPORT_ACLS
+ alt_sx.acc_acl = alt_sx.def_acl = NULL;
+#endif
do {
pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
- if (link_stat(cmpbuf, &alt_st, 0) < 0)
+ if (link_stat(cmpbuf, &alt_sx.st, 0) < 0)
continue;
if (link_dest) {
- if (prev_st.st_dev != alt_st.st_dev
- || prev_st.st_ino != alt_st.st_ino)
+ if (prev_st.st_dev != alt_sx.st.st_dev
+ || prev_st.st_ino != alt_sx.st.st_ino)
continue;
statret = 1;
- *stp = alt_st;
if (verbose < 2 || !stdout_format_has_i) {
itemizing = 0;
code = FNONE;
}
break;
}
- if (!unchanged_file(cmpbuf, file, &alt_st))
+ if (!unchanged_file(cmpbuf, file, &alt_sx.st))
continue;
statret = 1;
- *stp = alt_st;
- if (unchanged_attrs(file, &alt_st))
+ if (unchanged_attrs(cmpbuf, file, &alt_sx))
break;
} while (basis_dir[++j] != NULL);
+ if (statret == 1) {
+ sxp->st = alt_sx.st;
+#ifdef SUPPORT_ACLS
+ if (preserve_acls && !S_ISLNK(file->mode)) {
+ if (!ACL_READY(*sxp))
+ get_acl(cmpbuf, sxp);
+ else {
+ sxp->acc_acl = alt_sx.acc_acl;
+ sxp->def_acl = alt_sx.def_acl;
+ }
+ }
+#endif
+ }
+#ifdef SUPPORT_ACLS
+ else if (preserve_acls)
+ free_acl(&alt_sx);
+#endif
}
- if (maybe_hard_link(file, ndx, fname, statret, stp, prev_name, &prev_st,
+ if (maybe_hard_link(file, ndx, fname, statret, sxp, prev_name, &prev_st,
realname, itemizing, code) < 0)
return -1;
STRUCT_STAT *stp, int itemizing, enum logcode code,
int alt_dest)
{
- STRUCT_STAT st, prev_st;
+ statx prev_sx;
+ STRUCT_STAT st;
char alt_name[MAXPATHLEN], *prev_name;
const char *our_name;
int prev_statret, ndx, prev_ndx = F_HL_PREV(file);
} else
our_name = fname;
+#ifdef SUPPORT_ACLS
+ prev_sx.acc_acl = prev_sx.def_acl = NULL;
+#endif
+
while ((ndx = prev_ndx) >= 0) {
- file = FPTR(ndx);
+ int val;
+ file = cur_flist->files[ndx];
file->flags = (file->flags & ~FLAG_HLINK_FIRST) | FLAG_HLINK_DONE;
prev_ndx = F_HL_PREV(file);
prev_name = f_name(file, NULL);
- prev_statret = link_stat(prev_name, &prev_st, 0);
- if (maybe_hard_link(file, ndx, prev_name, prev_statret, &prev_st,
- our_name, stp, fname, itemizing, code) < 0)
+ prev_statret = link_stat(prev_name, &prev_sx.st, 0);
+ val = maybe_hard_link(file, ndx, prev_name, prev_statret, &prev_sx,
+ our_name, stp, fname, itemizing, code);
+#ifdef SUPPORT_ACLS
+ if (preserve_acls)
+ free_acl(&prev_sx);
+#endif
+ if (val < 0)
continue;
if (remove_source_files == 1 && do_xfers)
send_msg_int(MSG_SUCCESS, ndx);
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff