X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/8857e5dd70785b81146a6685d69f910627291dac..686ce3aa4f643829bdde0d9908228adb6b541f6d:/threaded-receiver.diff diff --git a/threaded-receiver.diff b/threaded-receiver.diff index a2ededd..d908d9a 100644 --- a/threaded-receiver.diff +++ b/threaded-receiver.diff @@ -18,11 +18,9 @@ NOTE: we still need to duplicate the partial_fname static in util.c! If you try this out, please send some email to wayned@samba.org or the rsync mailing list with your results, build changes, bug reports, etc. Thanks! -Be sure to run "make proto" before running "make". - ---- orig/Makefile.in 2006-01-14 08:14:29 -+++ Makefile.in 2005-12-10 18:35:39 -@@ -6,7 +6,7 @@ exec_prefix=@exec_prefix@ +--- old/Makefile.in ++++ new/Makefile.in +@@ -7,7 +7,7 @@ exec_prefix=@exec_prefix@ bindir=@bindir@ mandir=@mandir@ @@ -31,11 +29,11 @@ Be sure to run "make proto" before running "make". CC=@CC@ CFLAGS=@CFLAGS@ CPPFLAGS=@CPPFLAGS@ ---- orig/cleanup.c 2006-02-03 20:00:35 -+++ cleanup.c 2006-02-03 20:07:44 -@@ -26,10 +26,6 @@ extern int keep_partial; - extern int log_got_error; +--- old/cleanup.c ++++ new/cleanup.c +@@ -31,10 +31,6 @@ extern int log_got_error; extern char *partial_dir; + extern char *logfile_name; -#ifdef HAVE_SIGACTION -static struct sigaction sigact; @@ -44,27 +42,27 @@ Be sure to run "make proto" before running "make". /** * Close all open sockets and files, allowing a (somewhat) graceful * shutdown() of socket connections. This eliminates the abortive -@@ -98,9 +94,6 @@ void _exit_cleanup(int code, const char - } - inside_cleanup++; +@@ -98,9 +94,6 @@ NORETURN void _exit_cleanup(int code, co + static int exit_code = 0; + static int unmodified_code = 0; - SIGACTION(SIGUSR1, SIG_IGN); - SIGACTION(SIGUSR2, SIG_IGN); - - if (verbose > 3) { - rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): entered\n", - code, file, line); -@@ -132,8 +125,6 @@ void _exit_cleanup(int code, const char - io_flush(FULL_FLUSH); - if (cleanup_fname) - do_unlink(cleanup_fname); -- if (code) -- kill_all(SIGUSR1); - if (cleanup_pid && cleanup_pid == getpid()) { - char *pidf = lp_pid_file(); - if (pidf && *pidf) ---- orig/errcode.h 2005-12-16 23:48:43 -+++ errcode.h 2005-12-16 23:50:02 + if (exit_code) /* Preserve first error code when recursing. */ + code = exit_code; + +@@ -157,8 +150,6 @@ NORETURN void _exit_cleanup(int code, co + + if (cleanup_fname) + do_unlink(cleanup_fname); +- if (code) +- kill_all(SIGUSR1); + if (cleanup_pid && cleanup_pid == getpid()) { + char *pidf = lp_pid_file(); + if (pidf && *pidf) +--- old/errcode.h ++++ new/errcode.h @@ -37,7 +37,6 @@ #define RERR_CRASHED 15 /* sibling crashed */ #define RERR_TERMINATED 16 /* sibling terminated abnormally */ @@ -73,9 +71,9 @@ Be sure to run "make proto" before running "make". #define RERR_SIGNAL 20 /* status returned when sent SIGINT, SIGTERM, SIGHUP */ #define RERR_WAITCHILD 21 /* some error returned by waitpid() */ #define RERR_MALLOC 22 /* error allocating core memory buffers */ ---- orig/generator.c 2006-01-31 18:59:39 -+++ generator.c 2005-12-08 23:17:08 -@@ -68,7 +68,6 @@ extern OFF_T min_size; +--- old/generator.c ++++ new/generator.c +@@ -66,7 +66,6 @@ extern OFF_T min_size; extern int io_error; extern int allowed_lull; extern int sock_f_out; @@ -83,9 +81,9 @@ Be sure to run "make proto" before running "make". extern int protocol_version; extern int fuzzy_basis; extern int always_checksum; -@@ -99,6 +98,11 @@ static int deletion_count = 0; /* used t - static int can_link_symlinks = 1; /* start out optimistic */ - static int can_link_devices = 1; +@@ -95,6 +94,11 @@ extern struct filter_list_struct server_ + + static int deletion_count = 0; /* used to implement --max-delete */ +/* These vars are local copies so that the receiver can use the originals. */ +static int GEN_append_mode; @@ -95,7 +93,7 @@ Be sure to run "make proto" before running "make". /* For calling delete_file() */ #define DEL_FORCE_RECURSE (1<<1) /* recurse even w/o --force */ #define DEL_TERSE (1<<3) -@@ -448,8 +452,8 @@ static void sum_sizes_sqroot(struct sum_ +@@ -445,8 +449,8 @@ static void sum_sizes_sqroot(struct sum_ } if (protocol_version < 27) { @@ -106,8 +104,8 @@ Be sure to run "make proto" before running "make". s2length = SUM_LENGTH; } else { int32 c; -@@ -459,7 +463,7 @@ static void sum_sizes_sqroot(struct sum_ - for (c = blength; c >>= 1 && b; b--) {} +@@ -456,7 +460,7 @@ static void sum_sizes_sqroot(struct sum_ + for (c = blength; (c >>= 1) && b; b--) {} /* add a bit, subtract rollsum, round up. */ s2length = (b + 1 - 32 + 7) / 8; /* --optimize in compiler-- */ - s2length = MAX(s2length, csum_length); @@ -115,7 +113,7 @@ Be sure to run "make proto" before running "make". s2length = MIN(s2length, SUM_LENGTH); } -@@ -493,7 +497,7 @@ static void generate_and_send_sums(int f +@@ -490,7 +494,7 @@ static void generate_and_send_sums(int f sum_sizes_sqroot(&sum, len); write_sum_head(f_out, &sum); @@ -124,7 +122,7 @@ Be sure to run "make proto" before running "make". return; if (len > 0) -@@ -512,7 +516,7 @@ static void generate_and_send_sums(int f +@@ -509,7 +513,7 @@ static void generate_and_send_sums(int f if (f_copy >= 0) { full_write(f_copy, map, n1); @@ -133,7 +131,7 @@ Be sure to run "make proto" before running "make". continue; } -@@ -1142,7 +1146,7 @@ static void recv_generator(char *fname, +@@ -1205,7 +1209,7 @@ static void recv_generator(char *fname, return; } @@ -142,7 +140,7 @@ Be sure to run "make proto" before running "make". return; if (fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH) -@@ -1197,7 +1201,7 @@ static void recv_generator(char *fname, +@@ -1268,7 +1272,7 @@ static void recv_generator(char *fname, goto notify_others; } @@ -151,19 +149,21 @@ Be sure to run "make proto" before running "make". if (!(backupptr = get_backup_name(fname))) { close(fd); return; -@@ -1286,7 +1290,10 @@ void generate_files(int f_out, struct fi +@@ -1359,9 +1363,12 @@ void generate_files(int f_out, struct fi int save_ignore_existing = ignore_existing; int save_ignore_non_existing = ignore_non_existing; int save_do_progress = do_progress; - int save_make_backups = make_backups; + int save_make_backups = GEN_make_backups = make_backups; -+ + int dir_tweaking = !(list_only || local_name || dry_run); + + GEN_append_mode = append_mode; + GEN_csum_length = csum_length; - ++ if (protocol_version >= 29) { itemizing = 1; -@@ -1315,7 +1322,7 @@ void generate_files(int f_out, struct fi + maybe_ATTRS_REPORT = stdout_format_has_i ? 0 : ATTRS_REPORT; +@@ -1389,7 +1396,7 @@ void generate_files(int f_out, struct fi do_delete_pass(flist); do_progress = 0; @@ -172,7 +172,7 @@ Be sure to run "make proto" before running "make". whole_file = 0; if (verbose >= 2) { rprintf(FINFO, "delta-transmission %s\n", -@@ -1324,12 +1331,6 @@ void generate_files(int f_out, struct fi +@@ -1398,12 +1405,6 @@ void generate_files(int f_out, struct fi : "enabled"); } @@ -185,7 +185,7 @@ Be sure to run "make proto" before running "make". for (i = 0; i < flist->count; i++) { struct file_struct *file = flist->files[i]; -@@ -1373,23 +1374,34 @@ void generate_files(int f_out, struct fi +@@ -1447,23 +1448,34 @@ void generate_files(int f_out, struct fi delete_in_dir(NULL, NULL, NULL, NULL); phase++; @@ -226,7 +226,7 @@ Be sure to run "make proto" before running "make". if (local_name) strlcpy(fbuf, local_name, sizeof fbuf); else -@@ -1401,27 +1413,43 @@ void generate_files(int f_out, struct fi +@@ -1475,27 +1487,43 @@ void generate_files(int f_out, struct fi phase++; ignore_non_existing = save_ignore_non_existing; ignore_existing = save_ignore_existing; @@ -277,9 +277,9 @@ Be sure to run "make proto" before running "make". } do_progress = save_do_progress; ---- orig/io.c 2006-02-04 21:53:39 -+++ io.c 2006-02-01 19:50:09 -@@ -47,7 +47,6 @@ extern int allowed_lull; +--- old/io.c ++++ new/io.c +@@ -40,20 +40,17 @@ extern int allowed_lull; extern int am_server; extern int am_daemon; extern int am_sender; @@ -287,7 +287,12 @@ Be sure to run "make proto" before running "make". extern int eol_nulls; extern int read_batch; extern int csum_length; -@@ -60,7 +59,6 @@ extern struct stats stats; + extern int checksum_seed; + extern int protocol_version; +-extern int remove_source_files; + extern int preserve_hard_links; + extern char *filesfrom_host; + extern struct stats stats; extern struct file_list *the_file_list; const char phase_unknown[] = "unknown"; @@ -295,7 +300,7 @@ Be sure to run "make proto" before running "make". int batch_fd = -1; int batch_gen_fd = -1; -@@ -84,7 +82,6 @@ const char *io_read_phase = phase_unknow +@@ -61,7 +58,6 @@ int batch_gen_fd = -1; int kluge_around_eof = 0; int msg_fd_in = -1; @@ -303,7 +308,7 @@ Be sure to run "make proto" before running "make". int sock_f_in = -1; int sock_f_out = -1; -@@ -109,27 +106,32 @@ static int select_timeout = SELECT_TIMEO +@@ -88,27 +84,31 @@ static OFF_T active_bytecnt = 0; static void read_loop(int fd, char *buf, size_t len); struct flist_ndx_item { @@ -325,10 +330,9 @@ Be sure to run "make proto" before running "make". struct msg_list_item { - struct msg_list_item *next; + volatile struct msg_list_item *next; -+ pthread_mutex_t mutex; - char *buf; int len; + enum msgcode code; + char buf[1]; }; struct msg_list { @@ -337,12 +341,12 @@ Be sure to run "make proto" before running "make". + pthread_mutex_t mutex; }; --static struct msg_list msg_list; +-static struct msg_list msg2genr, msg2sndr; +static struct msg_list msg_list = { NULL, NULL, PTHREAD_MUTEX_INITIALIZER }; static void flist_ndx_push(struct flist_ndx_list *lp, int ndx) { -@@ -139,27 +141,31 @@ static void flist_ndx_push(struct flist_ +@@ -118,27 +118,31 @@ static void flist_ndx_push(struct flist_ out_of_memory("flist_ndx_push"); item->next = NULL; item->ndx = ndx; @@ -380,7 +384,7 @@ Be sure to run "make proto" before running "make". return ndx; } -@@ -168,7 +174,7 @@ static void check_timeout(void) +@@ -147,7 +151,7 @@ static void check_timeout(void) { time_t t; @@ -389,7 +393,7 @@ Be sure to run "make proto" before running "make". return; if (!last_io_in) { -@@ -209,45 +215,40 @@ void set_io_timeout(int secs) +@@ -188,44 +192,38 @@ void set_io_timeout(int secs) /* Setup the fd used to receive MSG_* messages. Only needed during the * early stages of being a local sender (up through the sending of the @@ -410,31 +414,34 @@ Be sure to run "make proto" before running "make". -} - /* Add a message to the pending MSG_* list. */ - static void msg_list_add(int code, char *buf, int len) +-static void msg_list_add(struct msg_list *lst, int code, char *buf, int len) ++static void msg_list_add(int code, char *buf, int len) { - struct msg_list_item *ml; + struct msg_list_item *m; +- int sz = len + 4 + sizeof m[0] - 1; ++ int sz = len + sizeof m[0] - 1; + assert(am_receiver()); - if (!(ml = new(struct msg_list_item))) - out_of_memory("msg_list_add"); - ml->next = NULL; -- if (!(ml->buf = new_array(char, len+4))) -+ /* NOTE: the "+ 1" allows rwrite() to use the buf! */ -+ if (!(ml->buf = new_array(char, len + 1))) + if (!(m = (struct msg_list_item *)new_array(char, sz))) out_of_memory("msg_list_add"); -- SIVAL(ml->buf, 0, ((code+MPLEX_BASE)<<24) | len); -- memcpy(ml->buf+4, buf, len); -- ml->len = len+4; -+ memcpy(ml->buf, buf, len); -+ ml->len = len; -+ ml->code = code; + m->next = NULL; +- m->len = len + 4; +- SIVAL(m->buf, 0, ((code+MPLEX_BASE)<<24) | len); +- memcpy(m->buf + 4, buf, len); +- if (lst->tail) +- lst->tail->next = m; ++ m->len = len; ++ m->code = code; ++ memcpy(m->buf, buf, len); + + pthread_mutex_lock(&msg_list.mutex); - if (msg_list.tail) - msg_list.tail->next = ml; ++ if (msg_list.tail) ++ msg_list.tail->next = m; else - msg_list.head = ml; - msg_list.tail = ml; +- lst->head = m; +- lst->tail = m; ++ msg_list.head = m; ++ msg_list.tail = m; + pthread_mutex_unlock(&msg_list.mutex); } @@ -447,7 +454,7 @@ Be sure to run "make proto" before running "make". static void read_msg_fd(void) { char buf[2048]; -@@ -266,47 +267,6 @@ static void read_msg_fd(void) +@@ -244,51 +242,6 @@ static void read_msg_fd(void) tag = (tag >> 24) - MPLEX_BASE; switch (tag) { @@ -464,6 +471,8 @@ Be sure to run "make proto" before running "make". - exit_cleanup(RERR_STREAMIO); - } - read_loop(fd, buf, 4); +- if (remove_source_files) +- decrement_active_files(IVAL(buf,0)); - flist_ndx_push(&redo_list, IVAL(buf,0)); - break; - case MSG_DELETED: @@ -472,7 +481,7 @@ Be sure to run "make proto" before running "make". - exit_cleanup(RERR_STREAMIO); - } - read_loop(fd, buf, len); -- io_multiplex_write(MSG_DELETED, buf, len); +- send_msg(MSG_DELETED, buf, len); - break; - case MSG_SUCCESS: - if (len != 4 || !am_generator) { @@ -480,8 +489,10 @@ Be sure to run "make proto" before running "make". - exit_cleanup(RERR_STREAMIO); - } - read_loop(fd, buf, len); -- if (remove_sent_files) -- io_multiplex_write(MSG_SUCCESS, buf, len); +- if (remove_source_files) { +- decrement_active_files(IVAL(buf,0)); +- send_msg(MSG_SUCCESS, buf, len); +- } - if (preserve_hard_links) - flist_ndx_push(&hlink_list, IVAL(buf,0)); - break; @@ -495,29 +506,31 @@ Be sure to run "make proto" before running "make". case MSG_INFO: case MSG_ERROR: case MSG_LOG: -@@ -327,71 +287,75 @@ static void read_msg_fd(void) - msg_fd_in = fd; +@@ -332,75 +285,80 @@ void decrement_active_files(int ndx) + active_bytecnt -= the_file_list->files[ndx]->length; } -/* Try to push messages off the list onto the wire. If we leave with more +/* Try to pop messages off the list onto the wire. If we leave with more * to do, return 0. On error, return -1. If everything flushed, return 1. - * This is only active in the receiver. */ +-static int msg2genr_flush(int flush_it_all) + * This is only called by the generator. */ - static int msg_list_flush(int flush_it_all) ++static void msg_list_flush(void) { - static int written = 0; - struct timeval tv; - fd_set fds; -- ++ assert(am_generator()); + - if (msg_fd_out < 0) - return -1; -- -+ assert(am_generator()); -+ no_flush++; - while (msg_list.head) { -- struct msg_list_item *ml = msg_list.head; -- int n = write(msg_fd_out, ml->buf + written, ml->len - written); ++ if (defer_forwarding_messages) ++ return; + +- while (msg2genr.head) { +- struct msg_list_item *m = msg2genr.head; +- int n = write(msg_fd_out, m->buf + written, m->len - written); - if (n < 0) { - if (errno == EINTR) - continue; @@ -531,52 +544,55 @@ Be sure to run "make proto" before running "make". - tv.tv_usec = 0; - if (!select(msg_fd_out+1, NULL, &fds, NULL, &tv)) - check_timeout(); -- } else if ((written += n) == ml->len) { -- free(ml->buf); -- msg_list.head = ml->next; -- if (!msg_list.head) -- msg_list.tail = NULL; -- free(ml); +- } else if ((written += n) == m->len) { +- msg2genr.head = m->next; +- if (!msg2genr.head) +- msg2genr.tail = NULL; +- free(m); - written = 0; -+ struct msg_list_item *ml = (struct msg_list_item *)msg_list.head; -+ switch (ml->code) { ++ no_flush++; ++ defer_forwarding_messages = 1; ++ while (msg_list.head) { ++ struct msg_list_item *m = (struct msg_list_item *)msg_list.head; ++ pthread_mutex_lock(&msg_list.mutex); ++ if (!(msg_list.head = m->next)) ++ msg_list.tail = NULL; ++ pthread_mutex_unlock(&msg_list.mutex); ++ switch (m->code) { + case MSG_SOCKERR: + close_multiplexing_out(); + /* FALL THROUGH */ + case MSG_INFO: + case MSG_ERROR: + case MSG_LOG: -+ rwrite(ml->code, ml->buf, ml->len); ++ rwrite(m->code, m->buf, m->len); + break; + default: -+ io_multiplex_write(ml->code, ml->buf, ml->len); ++ io_multiplex_write(m->code, m->buf, m->len); + break; } -+ pthread_mutex_lock(&msg_list.mutex); -+ if (!(msg_list.head = ml->next)) -+ msg_list.tail = NULL; -+ pthread_mutex_unlock(&msg_list.mutex); -+ free(ml->buf); -+ free(ml); -+ if (!flush_it_all) -+ break; ++ free(m); } +- return 1; ++ defer_forwarding_messages = 0; + no_flush--; -+ - return 1; } - void send_msg(enum msgcode code, char *buf, int len) + int send_msg(enum msgcode code, char *buf, int len) { - if (msg_fd_out < 0) { -+ if (am_receiver()) -+ msg_list_add(code, buf, len); -+ else - io_multiplex_write(code, buf, len); -- return; -- } -- msg_list_add(code, buf, len); -- msg_list_flush(NORMAL_FLUSH); ++ if (!am_receiver()) { + if (!defer_forwarding_messages) + return io_multiplex_write(code, buf, len); + if (!io_multiplexing_out) + return 0; +- msg_list_add(&msg2sndr, code, buf, len); +- return 1; + } +- msg_list_add(&msg2genr, code, buf, len); +- msg2genr_flush(NORMAL_FLUSH); ++ msg_list_add(code, buf, len); + return 1; } -int get_redo_num(int itemizing, enum logcode code) @@ -615,11 +631,11 @@ Be sure to run "make proto" before running "make". return flist_ndx_pop(&hlink_list); } -@@ -471,11 +435,6 @@ static int read_timeout(int fd, char *bu +@@ -480,11 +438,6 @@ static int read_timeout(int fd, char *bu FD_ZERO(&r_fds); FD_ZERO(&w_fds); FD_SET(fd, &r_fds); -- if (msg_list.head) { +- if (msg2genr.head) { - FD_SET(msg_fd_out, &w_fds); - if (msg_fd_out > maxfd) - maxfd = msg_fd_out; @@ -627,17 +643,17 @@ Be sure to run "make proto" before running "make". if (io_filesfrom_f_out >= 0) { int new_fd; if (io_filesfrom_buflen == 0) { -@@ -508,9 +467,6 @@ static int read_timeout(int fd, char *bu +@@ -517,9 +470,6 @@ static int read_timeout(int fd, char *bu continue; } -- if (msg_list.head && FD_ISSET(msg_fd_out, &w_fds)) -- msg_list_flush(NORMAL_FLUSH); +- if (msg2genr.head && FD_ISSET(msg_fd_out, &w_fds)) +- msg2genr_flush(NORMAL_FLUSH); - if (io_filesfrom_f_out >= 0) { if (io_filesfrom_buflen) { if (FD_ISSET(io_filesfrom_f_out, &w_fds)) { -@@ -832,6 +788,8 @@ static void readfd(int fd, char *buffer, +@@ -847,6 +797,8 @@ static void readfd(int fd, char *buffer, } if (fd == write_batch_monitor_in) { @@ -646,7 +662,7 @@ Be sure to run "make proto" before running "make". if ((size_t)write(batch_fd, buffer, total) != total) exit_cleanup(RERR_FILEIO); } -@@ -1087,7 +1045,6 @@ static void writefd_unbuffered(int fd,ch +@@ -1115,7 +1067,6 @@ static void writefd_unbuffered(int fd,ch * to grab any messages they sent before they died. */ while (fd == sock_f_out && io_multiplexing_in) { set_io_timeout(30); @@ -654,8 +670,8 @@ Be sure to run "make proto" before running "make". readfd_unbuffered(sock_f_in, io_filesfrom_buf, sizeof io_filesfrom_buf); } -@@ -1097,7 +1054,7 @@ static void writefd_unbuffered(int fd,ch - total += cnt; +@@ -1126,7 +1077,7 @@ static void writefd_unbuffered(int fd,ch + defer_forwarding_messages = 1; if (fd == sock_f_out) { - if (io_timeout || am_generator) @@ -663,48 +679,51 @@ Be sure to run "make proto" before running "make". last_io_out = time(NULL); sleep_for_bwlimit(cnt); } -@@ -1121,7 +1078,7 @@ static void mplex_write(enum msgcode cod - * cause output to occur down the socket. Setting contiguous_write_len - * prevents the reading of msg_fd_in once we actually start to write - * this sequence of data (though we might read it before the start). */ -- if (am_generator && msg_fd_in >= 0) -+ if (am_generator() && msg_fd_in >= 0) - contiguous_write_len = len + 4; - - if (n > sizeof buffer - 4) -@@ -1137,31 +1094,29 @@ static void mplex_write(enum msgcode cod - if (len) - writefd_unbuffered(sock_f_out, buf, len); - -- if (am_generator && msg_fd_in >= 0) -+ if (am_generator() && msg_fd_in >= 0) - contiguous_write_len = 0; +@@ -1136,23 +1087,6 @@ static void writefd_unbuffered(int fd,ch + no_flush--; } - void io_flush(int flush_it_all) - { -- msg_list_flush(flush_it_all); +-static void msg2sndr_flush(void) +-{ +- if (defer_forwarding_messages) +- return; - -- if (!iobuf_out_cnt || no_flush) -+ if (no_flush) - return; +- while (msg2sndr.head && io_multiplexing_out) { +- struct msg_list_item *m = msg2sndr.head; +- if (!(msg2sndr.head = m->next)) +- msg2sndr.tail = NULL; +- stats.total_written += m->len; +- defer_forwarding_messages = 1; +- writefd_unbuffered(sock_f_out, m->buf, m->len); +- defer_forwarding_messages = 0; +- free(m); +- } +-} +- + /** + * Write an message to a multiplexed stream. If this fails then rsync + * exits. +@@ -1178,14 +1112,15 @@ static void mplex_write(enum msgcode cod + defer_forwarding_messages = 1; + writefd_unbuffered(sock_f_out, buf, len); + defer_forwarding_messages = 0; +- msg2sndr_flush(); ++ if (am_generator()) ++ msg_list_flush(); + } + } -- if (io_multiplexing_out) -- mplex_write(MSG_DATA, iobuf_out, iobuf_out_cnt); -- else -- writefd_unbuffered(sock_f_out, iobuf_out, iobuf_out_cnt); -- iobuf_out_cnt = 0; -+ if (iobuf_out_cnt) { -+ if (io_multiplexing_out) -+ mplex_write(MSG_DATA, iobuf_out, iobuf_out_cnt); -+ else -+ writefd_unbuffered(sock_f_out, iobuf_out, iobuf_out_cnt); -+ iobuf_out_cnt = 0; -+ } -+ +-void io_flush(int flush_it_all) ++void io_flush(UNUSED(int flush_it_all)) + { +- msg2genr_flush(flush_it_all); +- msg2sndr_flush(); + if (am_generator()) -+ msg_list_flush(flush_it_all); - } ++ msg_list_flush(); + + if (!iobuf_out_cnt || no_flush) + return; +@@ -1199,11 +1134,6 @@ void io_flush(int flush_it_all) static void writefd(int fd,char *buf,size_t len) { @@ -716,7 +735,7 @@ Be sure to run "make proto" before running "make". if (fd == sock_f_out) stats.total_written += len; -@@ -1374,9 +1329,3 @@ void start_write_batch(int fd) +@@ -1409,9 +1339,3 @@ void start_write_batch(int fd) else write_batch_monitor_in = fd; } @@ -726,17 +745,17 @@ Be sure to run "make proto" before running "make". - write_batch_monitor_out = -1; - write_batch_monitor_in = -1; -} ---- orig/log.c 2006-02-05 04:53:34 -+++ log.c 2005-12-16 23:49:57 -@@ -38,7 +38,6 @@ extern int am_sender; +--- old/log.c ++++ new/log.c +@@ -33,7 +33,6 @@ extern int am_sender; extern int local_server; extern int quiet; extern int module_id; -extern int msg_fd_out; + extern int allow_8bit_chars; extern int protocol_version; extern int preserve_times; - extern int log_format_has_i; -@@ -74,7 +73,6 @@ struct { +@@ -75,7 +74,6 @@ struct { { RERR_IPC , "error in IPC code" }, { RERR_CRASHED , "sibling process crashed" }, { RERR_TERMINATED , "sibling process terminated abnormally" }, @@ -744,9 +763,9 @@ Be sure to run "make proto" before running "make". { RERR_SIGNAL , "received SIGINT, SIGTERM, or SIGHUP" }, { RERR_WAITCHILD , "waitpid() failed" }, { RERR_MALLOC , "error allocating core memory buffers" }, -@@ -234,8 +232,8 @@ void rwrite(enum logcode code, char *buf - if (quiet && code == FINFO) - return; +@@ -241,8 +239,8 @@ void rwrite(enum logcode code, char *buf + if (len < 0) + exit_cleanup(RERR_MESSAGEIO); - if (am_server && msg_fd_out >= 0) { - /* Pass the message to our sibling. */ @@ -755,17 +774,17 @@ Be sure to run "make proto" before running "make". send_msg((enum msgcode)code, buf, len); return; } ---- orig/main.c 2006-02-05 04:53:34 -+++ main.c 2006-02-02 02:43:44 -@@ -30,7 +30,6 @@ extern int list_only; +--- old/main.c ++++ new/main.c +@@ -32,7 +32,6 @@ extern int list_only; extern int am_root; extern int am_server; extern int am_sender; -extern int am_generator; extern int am_daemon; extern int blocking_io; - extern int remove_sent_files; -@@ -84,9 +83,20 @@ struct pid_status { + extern int remove_source_files; +@@ -96,9 +95,20 @@ struct pid_status { static time_t starttime, endtime; static int64 total_read, total_written; @@ -784,9 +803,9 @@ Be sure to run "make proto" before running "make". +} + /* Works like waitpid(), but if we already harvested the child pid in our - * sigchld_handler(), we succeed instead of returning an error. */ + * remember_children(), we succeed instead of returning an error. */ pid_t wait_process(pid_t pid, int *status_ptr, int flags) -@@ -163,7 +173,7 @@ static void handle_stats(int f) +@@ -175,7 +185,7 @@ static void handle_stats(int f) show_flist_stats(); } @@ -795,7 +814,7 @@ Be sure to run "make proto" before running "make". return; if (am_daemon) { -@@ -618,12 +628,30 @@ static void do_server_sender(int f_in, i +@@ -683,12 +693,30 @@ static void do_server_sender(int f_in, i exit_cleanup(0); } @@ -829,7 +848,7 @@ Be sure to run "make proto" before running "make". /* The receiving side mustn't obey this, or an existing symlink that * points to an identical file won't be replaced by the referent. */ -@@ -632,70 +660,16 @@ static int do_recv(int f_in,int f_out,st +@@ -697,70 +725,16 @@ static int do_recv(int f_in,int f_out,st if (preserve_hard_links) init_hard_links(); @@ -905,7 +924,7 @@ Be sure to run "make proto" before running "make". generate_files(f_out, flist, local_name); handle_stats(-1); -@@ -706,10 +680,13 @@ static int do_recv(int f_in,int f_out,st +@@ -771,10 +745,13 @@ static int do_recv(int f_in,int f_out,st } io_flush(FULL_FLUSH); @@ -923,7 +942,7 @@ Be sure to run "make proto" before running "make". } -@@ -1077,22 +1054,6 @@ static int start_client(int argc, char * +@@ -1176,22 +1153,6 @@ static int start_client(int argc, char * return ret; } @@ -943,30 +962,30 @@ Be sure to run "make proto" before running "make". - _exit(0); -} - - static RETSIGTYPE sigchld_handler(UNUSED(int val)) + RETSIGTYPE remember_children(UNUSED(int val)) { #ifdef WNOHANG -@@ -1184,8 +1145,6 @@ int main(int argc,char *argv[]) +@@ -1283,8 +1244,6 @@ int main(int argc,char *argv[]) # endif sigact.sa_flags = SA_NOCLDSTOP; #endif - SIGACTMASK(SIGUSR1, sigusr1_handler); - SIGACTMASK(SIGUSR2, sigusr2_handler); - SIGACTMASK(SIGCHLD, sigchld_handler); + SIGACTMASK(SIGCHLD, remember_children); #ifdef MAINTAINER_MODE SIGACTMASK(SIGSEGV, rsync_panic_handler); ---- orig/match.c 2005-11-10 16:58:36 -+++ match.c 2005-12-08 23:17:09 -@@ -21,7 +21,7 @@ +--- old/match.c ++++ new/match.c +@@ -23,7 +23,7 @@ + #include "rsync.h" extern int verbose; - extern int am_server; -extern int do_progress; +extern int recv_progress; extern int checksum_seed; extern int append_mode; -@@ -133,7 +133,7 @@ static void matched(int f, struct sum_st +@@ -113,7 +113,7 @@ static void matched(int f, struct sum_st else last_match = offset; @@ -975,7 +994,7 @@ Be sure to run "make proto" before running "make". show_progress(last_match, buf->file_size); } -@@ -333,7 +333,7 @@ void match_sums(int f, struct sum_struct +@@ -317,7 +317,7 @@ void match_sums(int f, struct sum_struct if (append_mode) { OFF_T j = 0; for (j = CHUNK_SIZE; j < s->flength; j += CHUNK_SIZE) { @@ -984,7 +1003,7 @@ Be sure to run "make proto" before running "make". show_progress(last_match, buf->file_size); sum_update(map_ptr(buf, last_match, CHUNK_SIZE), CHUNK_SIZE); -@@ -341,7 +341,7 @@ void match_sums(int f, struct sum_struct +@@ -325,7 +325,7 @@ void match_sums(int f, struct sum_struct } if (last_match < s->flength) { int32 len = s->flength - last_match; @@ -993,17 +1012,17 @@ Be sure to run "make proto" before running "make". show_progress(last_match, buf->file_size); sum_update(map_ptr(buf, last_match, len), len); last_match = s->flength; ---- orig/options.c 2006-02-03 23:51:57 -+++ options.c 2005-12-08 23:17:09 -@@ -73,7 +73,6 @@ int def_compress_level = Z_DEFAULT_COMPR +--- old/options.c ++++ new/options.c +@@ -74,7 +74,6 @@ int def_compress_level = Z_DEFAULT_COMPR int am_root = 0; int am_server = 0; int am_sender = 0; -int am_generator = 0; int am_starting_up = 1; - int orig_umask = 0; int relative_paths = -1; -@@ -94,6 +93,7 @@ int am_daemon = 0; + int implied_dirs = 1; +@@ -95,6 +94,7 @@ int am_daemon = 0; int daemon_over_rsh = 0; int do_stats = 0; int do_progress = 0; @@ -1011,17 +1030,17 @@ Be sure to run "make proto" before running "make". int keep_partial = 0; int safe_symlinks = 0; int copy_unsafe_links = 0; -@@ -1290,6 +1290,7 @@ int parse_arguments(int *argc, const cha - if ((do_progress || dry_run) && !verbose && !log_before_transfer - && !am_server) +@@ -1302,6 +1302,7 @@ int parse_arguments(int *argc, const cha + + if (do_progress && !verbose && !log_before_transfer && !am_server) verbose = 1; + recv_progress = do_progress; if (dry_run) do_xfers = 0; ---- orig/pipe.c 2006-01-21 08:03:40 -+++ pipe.c 2005-12-08 23:17:09 -@@ -56,7 +56,7 @@ pid_t piped_child(char **command, int *f +--- old/pipe.c ++++ new/pipe.c +@@ -59,7 +59,7 @@ pid_t piped_child(char **command, int *f exit_cleanup(RERR_IPC); } @@ -1030,7 +1049,7 @@ Be sure to run "make proto" before running "make". if (pid == -1) { rsyserr(FERROR, errno, "fork"); exit_cleanup(RERR_IPC); -@@ -120,7 +120,7 @@ pid_t local_child(int argc, char **argv, +@@ -123,7 +123,7 @@ pid_t local_child(int argc, char **argv, exit_cleanup(RERR_IPC); } @@ -1039,18 +1058,18 @@ Be sure to run "make proto" before running "make". if (pid == -1) { rsyserr(FERROR, errno, "fork"); exit_cleanup(RERR_IPC); ---- orig/receiver.c 2006-01-31 02:30:18 -+++ receiver.c 2006-01-14 08:30:29 -@@ -24,7 +24,7 @@ extern int verbose; +--- old/receiver.c ++++ new/receiver.c +@@ -25,7 +25,7 @@ + extern int verbose; extern int do_xfers; - extern int am_daemon; extern int am_server; -extern int do_progress; +extern int recv_progress; extern int log_before_transfer; - extern int log_format_has_i; - extern int daemon_log_format_has_i; -@@ -219,7 +219,7 @@ static int receive_data(int f_in, char * + extern int stdout_format_has_i; + extern int logfile_format_has_i; +@@ -157,7 +157,7 @@ static int receive_data(int f_in, char * if (sum.remainder) sum.flength -= sum.blength - sum.remainder; for (j = CHUNK_SIZE; j < sum.flength; j += CHUNK_SIZE) { @@ -1059,7 +1078,7 @@ Be sure to run "make proto" before running "make". show_progress(offset, total_size); sum_update(map_ptr(mapbuf, offset, CHUNK_SIZE), CHUNK_SIZE); -@@ -227,7 +227,7 @@ static int receive_data(int f_in, char * +@@ -165,7 +165,7 @@ static int receive_data(int f_in, char * } if (offset < sum.flength) { int32 len = sum.flength - offset; @@ -1068,7 +1087,7 @@ Be sure to run "make proto" before running "make". show_progress(offset, total_size); sum_update(map_ptr(mapbuf, offset, len), len); offset = sum.flength; -@@ -240,7 +240,7 @@ static int receive_data(int f_in, char * +@@ -178,7 +178,7 @@ static int receive_data(int f_in, char * } while ((i = recv_token(f_in, &data)) != 0) { @@ -1077,7 +1096,7 @@ Be sure to run "make proto" before running "make". show_progress(offset, total_size); if (i > 0) { -@@ -308,7 +308,7 @@ static int receive_data(int f_in, char * +@@ -248,7 +248,7 @@ static int receive_data(int f_in, char * ftruncate(fd, offset); #endif @@ -1086,14 +1105,14 @@ Be sure to run "make proto" before running "make". end_progress(total_size); if (fd != -1 && offset > 0 && sparse_end(fd) != 0) { -@@ -359,12 +359,12 @@ static void handle_delayed_updates(struc +@@ -299,12 +299,12 @@ static void handle_delayed_updates(struc "rename failed for %s (from %s)", full_fname(fname), partialptr); } else { -- if (remove_sent_files +- if (remove_source_files - || (preserve_hard_links - && file->link_u.links)) { -+ if (remove_sent_files) { ++ if (remove_source_files) { SIVAL(numbuf, 0, i); send_msg(MSG_SUCCESS,numbuf,4); } @@ -1102,7 +1121,7 @@ Be sure to run "make proto" before running "make". handle_partial_dir(partialptr, PDIR_DELETE); } } -@@ -415,11 +415,6 @@ int recv_files(int f_in, struct file_lis +@@ -355,11 +355,6 @@ int recv_files(int f_in, struct file_lis if (verbose > 2) rprintf(FINFO,"recv_files(%d) starting\n",flist->count); @@ -1112,9 +1131,9 @@ Be sure to run "make proto" before running "make". - } - if (delay_updates) - init_delayed_bits(flist->count); + delayed_bits = bitbag_create(flist->count); -@@ -440,7 +435,7 @@ int recv_files(int f_in, struct file_lis +@@ -382,7 +377,7 @@ int recv_files(int f_in, struct file_lis rprintf(FINFO, "recv_files phase=%d\n", phase); if (phase == 2 && delay_updates) handle_delayed_updates(flist, local_name); @@ -1123,22 +1142,23 @@ Be sure to run "make proto" before running "make". if (keep_partial && !partial_dir) make_backups = 0; /* prevents double backup */ if (append_mode) { -@@ -662,7 +657,7 @@ int recv_files(int f_in, struct file_lis +@@ -607,7 +602,7 @@ int recv_files(int f_in, struct file_lis /* log the transfer */ if (log_before_transfer) - log_item(file, &initial_stats, iflags, NULL); + log_item(FCLIENT, file, &initial_stats, iflags, NULL); - else if (!am_server && verbose && do_progress) + else if (!am_server && verbose && recv_progress) rprintf(FINFO, "%s\n", fname); /* recv file data */ -@@ -705,11 +700,12 @@ int recv_files(int f_in, struct file_lis +@@ -654,11 +649,13 @@ int recv_files(int f_in, struct file_lis cleanup_disable(); if (recv_ok > 0) { -- if (remove_sent_files +- if (remove_source_files - || (preserve_hard_links && file->link_u.links)) { -+ if (remove_sent_files) { ++ if (remove_source_files) { ++ decrement_active_files(i); SIVAL(numbuf, 0, i); send_msg(MSG_SUCCESS, numbuf, 4); } @@ -1147,39 +1167,37 @@ Be sure to run "make proto" before running "make". } else if (!recv_ok) { int msgtype = phase || read_batch ? FERROR : FINFO; if (msgtype == FERROR || verbose) { -@@ -731,10 +727,8 @@ int recv_files(int f_in, struct file_lis - "%s: %s failed verification -- update %s%s.\n", +@@ -681,8 +678,8 @@ int recv_files(int f_in, struct file_lis errstr, fname, keptstr, redostr); } -- if (!phase) { + if (!phase) { - SIVAL(numbuf, 0, i); - send_msg(MSG_REDO, numbuf, 4); -- } -+ if (!phase) ++ decrement_active_files(i); + push_redo_num(i); + } } } - make_backups = save_make_backups; ---- orig/rsync.c 2006-02-05 04:53:34 -+++ rsync.c 2005-12-08 23:17:10 -@@ -41,7 +41,6 @@ extern int orig_umask; +--- old/rsync.c ++++ new/rsync.c +@@ -39,7 +39,6 @@ extern int omit_dir_times; extern int am_root; extern int am_server; extern int am_sender; -extern int am_generator; extern int am_starting_up; + extern int allow_8bit_chars; extern int preserve_uid; - extern int preserve_gid; -@@ -288,5 +287,5 @@ const char *who_am_i(void) +@@ -305,5 +304,5 @@ const char *who_am_i(void) { if (am_starting_up) return am_server ? "server" : "client"; - return am_sender ? "sender" : am_generator ? "generator" : "receiver"; + return am_sender ? "sender" : am_generator() ? "generator" : "receiver"; } ---- orig/rsync.h 2006-02-03 20:00:36 -+++ rsync.h 2006-01-17 02:46:03 -@@ -166,10 +166,8 @@ enum msgcode { +--- old/rsync.h ++++ new/rsync.h +@@ -169,10 +169,8 @@ enum msgcode { MSG_DATA=0, /* raw data on the multiplexed stream */ MSG_ERROR=FERROR, MSG_INFO=FINFO, /* remote logging */ MSG_LOG=FLOG, MSG_SOCKERR=FSOCKERR, /* sibling logging */ @@ -1190,7 +1208,7 @@ Be sure to run "make proto" before running "make". }; #include "errcode.h" -@@ -320,6 +318,7 @@ enum msgcode { +@@ -329,6 +327,7 @@ enum msgcode { #endif #include @@ -1198,13 +1216,12 @@ Be sure to run "make proto" before running "make". #include "lib/pool_alloc.h" ---- orig/util.c 2006-02-03 20:00:36 -+++ util.c 2005-12-08 23:17:10 -@@ -413,51 +413,6 @@ int robust_rename(char *from, char *to, +--- old/util.c ++++ new/util.c +@@ -415,49 +415,6 @@ int robust_rename(char *from, char *to, return -1; } -- -static pid_t all_pids[10]; -static int num_pids; - @@ -1247,7 +1264,6 @@ Be sure to run "make proto" before running "make". - kill(p, sig); - } -} -- - /** Turn a user name into a uid */ int name_to_uid(char *name, uid_t *uid)