out_of_memory("flist_expand");
}
+static void flist_done_allocating(struct file_list *flist)
+{
+ void *ptr = pool_boundary(flist->file_pool, 8*1024);
+ if (flist->pool_boundary == ptr)
+ flist->pool_boundary = NULL; /* list didn't use any pool memory */
+ else
+ flist->pool_boundary = ptr;
+}
+
int push_pathname(const char *dir, int len)
{
if (dir == pathname)
*(struct file_struct **)file2);
}
-/* The guts of a merge sort algorithm. This was derived from the GNU C
+/* The guts of a merge-sort algorithm. This was derived from the glibc
* version, but I (Wayne) changed the merge code to do less copying and
* to require only half the amount of temporary memory. */
static void fsort_tmp(struct file_struct **fp, size_t num,
future_cnt = 0;
while (future_cnt < at_least) {
struct file_struct *file = dir_flist->sorted[send_dir_ndx];
- int dstart = dir_count;
+ int dir_ndx, dstart = dir_count;
int32 *dp;
flist = flist_new(0, "send_extra_file_list");
start_write = stats.total_written;
- /* If this is the first of a set of duplicate dirs, we must
- * send all the dirs together in a single file-list. We must
- * also send the index of the last dir in the header. */
- if (file->flags & FLAG_DUPLICATE) {
- int dir_ndx, end_ndx = send_dir_ndx;
- struct file_struct *fp = file;
-
- while (1) {
- dp = F_DIRNODE_P(fp);
- end_ndx = DIR_NEXT_SIBLING(dp);
- fp = dir_flist->sorted[end_ndx];
- if (!(fp->flags & FLAG_DUPLICATE))
- break;
- }
-
#ifdef ICONV_OPTION
- if (ic_ndx)
- dir_ndx = F_NDX(fp);
- else
+ if (ic_ndx)
+ dir_ndx = F_NDX(file);
+ else
#endif
- dir_ndx = end_ndx;
- write_ndx(f, NDX_FLIST_OFFSET - dir_ndx);
+ dir_ndx = send_dir_ndx;
+ write_ndx(f, NDX_FLIST_OFFSET - dir_ndx);
- while (1) {
- send1extra(f, file, flist);
- if (send_dir_ndx == end_ndx)
- break;
- dp = F_DIRNODE_P(file);
- send_dir_ndx = DIR_NEXT_SIBLING(dp);
- file = dir_flist->sorted[send_dir_ndx];
- }
- } else {
- int dir_ndx;
-#ifdef ICONV_OPTION
- if (ic_ndx)
- dir_ndx = F_NDX(file);
- else
-#endif
- dir_ndx = send_dir_ndx;
- write_ndx(f, NDX_FLIST_OFFSET - dir_ndx);
+ send1extra(f, file, flist);
+ dp = F_DIRNODE_P(file);
+ /* If there are any duplicate directory names that follow, we
+ * send all the dirs together in one file-list. The dir_flist
+ * tree links all the child subdirs onto the last dup dir. */
+ while ((dir_ndx = DIR_NEXT_SIBLING(dp)) >= 0
+ && dir_flist->sorted[dir_ndx]->flags & FLAG_DUPLICATE) {
+ send_dir_ndx = dir_ndx;
+ file = dir_flist->sorted[dir_ndx];
send1extra(f, file, flist);
+ dp = F_DIRNODE_P(file);
}
+
write_byte(f, 0);
#ifdef ICONV_OPTION
clean_flist(flist, 0);
add_dirs_to_tree(send_dir_ndx, flist, dir_count - dstart);
+ flist_done_allocating(flist);
file_total += flist->count;
future_cnt += flist->count;
if (verbose > 3)
output_flist(flist);
- dp = F_DIRNODE_P(file);
if (DIR_FIRST_CHILD(dp) >= 0) {
send_dir_ndx = DIR_FIRST_CHILD(dp);
send_dir_depth++;
if (inc_recurse) {
add_dirs_to_tree(-1, flist, dir_count);
+ flist_done_allocating(flist);
if (send_dir_ndx < 0) {
write_ndx(f, NDX_FLIST_EOF);
flist_eof = 1;
}
}
- if (!inc_recurse && f >= 0)
+ if (inc_recurse)
+ flist_done_allocating(flist);
+ else if (f >= 0)
recv_id_list(f, flist);
clean_flist(flist, relative_paths);
memset(flist, 0, sizeof flist[0]);
- if (!(flags & FLIST_TEMP)) {
- if (first_flist) {
- flist->ndx_start = first_flist->prev->ndx_start
- + first_flist->prev->count;
- }
+ if (flags & FLIST_TEMP) {
+ if (!(flist->file_pool = pool_create(SMALL_EXTENT, 0,
+ out_of_memory, POOL_INTERN)))
+ out_of_memory(msg);
+ } else {
/* This is a doubly linked list with prev looping back to
* the end of the list, but the last next pointer is NULL. */
- if (!first_flist)
+ if (!first_flist) {
+ flist->file_pool = pool_create(NORMAL_EXTENT, 0,
+ out_of_memory, POOL_INTERN);
+ if (!flist->file_pool)
+ out_of_memory(msg);
+
first_flist = cur_flist = flist->prev = flist;
- else {
+ } else {
+ flist->file_pool = first_flist->file_pool;
+
+ flist->ndx_start = first_flist->prev->ndx_start
+ + first_flist->prev->count;
+
flist->prev = first_flist->prev;
flist->prev->next = first_flist->prev = flist;
}
+ flist->pool_boundary = pool_boundary(flist->file_pool, 0);
flist_cnt++;
}
- if (!(flist->file_pool = pool_create(FILE_EXTENT, 0, out_of_memory, POOL_INTERN)))
- out_of_memory(msg);
-
return flist;
}
/* Free up all elements in a flist. */
void flist_free(struct file_list *flist)
{
- if (!flist->prev)
- ; /* Was FLIST_TEMP dir-list. */
- else if (flist == flist->prev) {
+ if (!flist->prev) {
+ /* Was FLIST_TEMP dir-list. */
+ } else if (flist == flist->prev) {
first_flist = cur_flist = NULL;
file_total = 0;
flist_cnt = 0;
flist_cnt--;
}
- pool_destroy(flist->file_pool);
+ if (!flist->prev || !flist_cnt)
+ pool_destroy(flist->file_pool);
+ else
+ pool_free_old(flist->file_pool, flist->pool_boundary);
+
if (flist->sorted && flist->sorted != flist->files)
free(flist->sorted);
free(flist->files);
} else
j = -1;
if (j >= 0) {
- struct file_struct *fp = flist->sorted[j];
int keep, drop;
/* If one is a dir and the other is not, we want to
* keep the dir because it might have contents in the
* list. */
- if (S_ISDIR(file->mode) != S_ISDIR(fp->mode)) {
- if (S_ISDIR(file->mode))
+ if (S_ISDIR(file->mode)) {
+ struct file_struct *fp = flist->sorted[j];
+ if (!S_ISDIR(fp->mode))
keep = i, drop = j;
else
keep = j, drop = i;
- } else if (protocol_version < 27)
+ } else
keep = j, drop = i;
- else
- keep = i, drop = j;
if (am_sender)
flist->sorted[drop]->flags |= FLAG_DUPLICATE;
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff