search for: last_token

...R_PROTOCOL); + } + + obuf = new_array(char, MAX_DATA_COUNT + 2); + if (!obuf) + out_of_memory("send_deflated_token"); + + ZSTD_CCtx_setParameter(zstd_cctx, ZSTD_c_compressionLevel, + def_compress_level); + zstd_out_buff.dst = obuf + 2; + + comp_init_done = 1; + } + + if (last_token == -1) { + last_run_end = 0; + run_start = token; + flush_pending = 0; + } else if (last_token == -2) { + run_start = token; + + } else if (nb != 0 || token != last_token + 1 + || token >= run_start + 65536) { + + /* output previous run */ + r = run_start - last_run_end; + n = last_to...

> Just curious: what about the rsync+ patch? Thanks for the reminder. I've just committed Jos's rsync+ patch onto the "branch_mbp_rsyncplus_merge" branch. If it works OK and nobody screams I will move it across onto the main tree tomorrow or Wednesday. I see the patch doesn't add documentation about the new options to the man page, so we should fix that in the future.

...en number */ #define TOKENRUN_REL 0xc0 /* ditto with 16-bit run count */ -#define MAX_DATA_COUNT 16383 /* fit 14 bit count into 2 bytes with flags */ +/* must be bigger than block_size + deflate()'s overhead */ +#define MAX_DATA_COUNT CHUNK_SIZE /* For coding runs of tokens */ static int last_token = -1;

...data sent (before compression). */ +static int send_deflated_token(int f, int token, struct map_struct *buf, OFF_T offset, int nb, int toklen) { int n, r; static int init_done, flush_pending; extern int write_batch; /* dw */ char temp_byte; /* dw */ + int data_read = 0; if (last_token == -1) { /* initialization */ if (!init_done) { @@ -215,13 +223,15 @@ do { if (tx_strm.avail_in == 0 && nb != 0) { /* give it some more input */ n = MIN(nb, CHUNK_SIZE); - tx_strm.next_in = (Bytef *) - map_ptr(buf, offset, n); - tx_strm.avail_in = n; - nb...