X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/b2bffbb2ca73c65175d6ceb4303a59ccc38c0307..9935066b704bcf2e6e48dac85cb1b4047d8f439d:/rsync.h diff --git a/rsync.h b/rsync.h index 61e5f06b..37a5d531 100644 --- a/rsync.h +++ b/rsync.h @@ -112,8 +112,6 @@ #define FULL_FLUSH 1 #define NORMAL_FLUSH 0 -#define CLEAR_STRUCT 0 -#define FREE_STRUCT 1 /* Log-message categories. FLOG is only used on the daemon side to * output messages to the log file. */ @@ -254,6 +252,7 @@ enum msgcode { #include +#include "lib/pool_alloc.h" #define BOOL int @@ -428,20 +427,34 @@ struct file_struct { uchar flags; /* this item MUST remain last */ }; -#define ARENA_SIZE (32 * 1024) +/* + * Start the flist array at FLIST_START entries and grow it + * by doubling until FLIST_LINEAR then grow by FLIST_LINEAR + */ +#define FLIST_START (32 * 1024) +#define FLIST_LINEAR (FLIST_START * 512) +/* + * Extent size for allocation pools A minimum size of 128KB + * is needed to mmap them so that freeing will release the + * space to the OS. + * + * Larger sizes reduce leftover fragments and speed free calls + * (when they happen) Smaller sizes increase the chance of + * freed allocations freeing whole extents. + */ -struct string_area { - char *base; - char *end; - char *current; - struct string_area *next; -}; +#define FILE_EXTENT (256 * 1024) +#define HLINK_EXTENT (128 * 1024) + +#define WITH_HLINK 1 +#define WITHOUT_HLINK 0 struct file_list { int count; int malloced; + alloc_pool_t file_pool; + alloc_pool_t hlink_pool; struct file_struct **files; - struct string_area *string_area; }; struct sum_buf {