1 This patch changes the receiving side to have the receiving code use a thread
2 instead of a forked process. This extra thread does read from the socket, but
3 it sends any stdout/stderr messages to the generator (main thread) to output.
5 ** This is very new code. ** Yes, it passes the "make test" testsuite, but
6 there may still be some problems, especially in some of the untested features.
7 (For one thing, I haven't yet added code to properly handle any keep-alive
8 messages that arrive on the receiving side during the --delete-after phase!)
10 This code just uses pthread.h directly, so configure changes will probably be
11 needed to make this compatible with more systems. I have also tested that
12 this code works fine using the GNU pth library without any code changes if
13 you configured it with --enable-syscall-soft --enable-pthread (you may need
14 to twiddle the Makefile options if you didn't install the library, though).
16 NOTE: we still need to duplicate the partial_fname static in util.c!
18 If you try this out, please send some email to wayned@samba.org or the rsync
19 mailing list with your results, build changes, bug reports, etc. Thanks!
21 After applying this patch, run these commands for a successful build:
24 ./configure (optional if already run)
29 @@ -6,7 +6,7 @@ exec_prefix=@exec_prefix@
34 +LIBS=@LIBS@ -lpthread
40 @@ -26,10 +26,6 @@ extern int keep_partial;
41 extern int log_got_error;
42 extern char *partial_dir;
44 -#ifdef HAVE_SIGACTION
45 -static struct sigaction sigact;
49 * Close all open sockets and files, allowing a (somewhat) graceful
50 * shutdown() of socket connections. This eliminates the abortive
51 @@ -98,9 +94,6 @@ void _exit_cleanup(int code, const char
55 - SIGACTION(SIGUSR1, SIG_IGN);
56 - SIGACTION(SIGUSR2, SIG_IGN);
59 rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): entered\n",
61 @@ -132,8 +125,6 @@ void _exit_cleanup(int code, const char
64 do_unlink(cleanup_fname);
67 if (cleanup_pid && cleanup_pid == getpid()) {
68 char *pidf = lp_pid_file();
73 #define RERR_CRASHED 15 /* sibling crashed */
74 #define RERR_TERMINATED 16 /* sibling terminated abnormally */
76 -#define RERR_SIGNAL1 19 /* status returned when sent SIGUSR1 */
77 #define RERR_SIGNAL 20 /* status returned when sent SIGINT, SIGTERM, SIGHUP */
78 #define RERR_WAITCHILD 21 /* some error returned by waitpid() */
79 #define RERR_MALLOC 22 /* error allocating core memory buffers */
82 @@ -67,7 +67,6 @@ extern OFF_T min_size;
84 extern int allowed_lull;
85 extern int sock_f_out;
86 -extern int ignore_timeout;
87 extern int protocol_version;
88 extern int fuzzy_basis;
89 extern int always_checksum;
90 @@ -97,6 +96,11 @@ static int deletion_count = 0; /* used t
91 static int can_link_symlinks = 1; /* start out optimistic */
92 static int can_link_devices = 1;
94 +/* These vars are local copies so that the receiver can use the originals. */
95 +static int GEN_append_mode;
96 +static int GEN_make_backups;
97 +static int GEN_csum_length;
99 /* For calling delete_file() */
100 #define DEL_FORCE_RECURSE (1<<1) /* recurse even w/o --force */
101 #define DEL_TERSE (1<<3)
102 @@ -445,8 +449,8 @@ static void sum_sizes_sqroot(struct sum_
105 if (protocol_version < 27) {
106 - s2length = csum_length;
107 - } else if (csum_length == SUM_LENGTH) {
108 + s2length = GEN_csum_length;
109 + } else if (GEN_csum_length == SUM_LENGTH) {
110 s2length = SUM_LENGTH;
113 @@ -456,7 +460,7 @@ static void sum_sizes_sqroot(struct sum_
114 for (c = blength; c >>= 1 && b; b--) {}
115 /* add a bit, subtract rollsum, round up. */
116 s2length = (b + 1 - 32 + 7) / 8; /* --optimize in compiler-- */
117 - s2length = MAX(s2length, csum_length);
118 + s2length = MAX(s2length, GEN_csum_length);
119 s2length = MIN(s2length, SUM_LENGTH);
122 @@ -490,7 +494,7 @@ static void generate_and_send_sums(int f
123 sum_sizes_sqroot(&sum, len);
124 write_sum_head(f_out, &sum);
126 - if (append_mode > 0 && f_copy < 0)
127 + if (GEN_append_mode > 0 && f_copy < 0)
131 @@ -509,7 +513,7 @@ static void generate_and_send_sums(int f
134 full_write(f_copy, map, n1);
135 - if (append_mode > 0)
136 + if (GEN_append_mode > 0)
140 @@ -1152,7 +1156,7 @@ static void recv_generator(char *fname,
144 - if (append_mode && st.st_size > file->length)
145 + if (GEN_append_mode && st.st_size > file->length)
148 if (fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH)
149 @@ -1207,7 +1211,7 @@ static void recv_generator(char *fname,
153 - if (inplace && make_backups && fnamecmp_type == FNAMECMP_FNAME) {
154 + if (inplace && GEN_make_backups && fnamecmp_type == FNAMECMP_FNAME) {
155 if (!(backupptr = get_backup_name(fname))) {
158 @@ -1298,9 +1302,12 @@ void generate_files(int f_out, struct fi
159 int save_ignore_existing = ignore_existing;
160 int save_ignore_non_existing = ignore_non_existing;
161 int save_do_progress = do_progress;
162 - int save_make_backups = make_backups;
163 + int save_make_backups = GEN_make_backups = make_backups;
164 int dir_tweaking = !(list_only || local_name || dry_run);
166 + GEN_append_mode = append_mode;
167 + GEN_csum_length = csum_length;
169 if (protocol_version >= 29) {
171 maybe_ATTRS_REPORT = log_format_has_i ? 0 : ATTRS_REPORT;
172 @@ -1328,7 +1335,7 @@ void generate_files(int f_out, struct fi
173 do_delete_pass(flist);
176 - if (append_mode || whole_file < 0)
177 + if (GEN_append_mode || whole_file < 0)
180 rprintf(FINFO, "delta-transmission %s\n",
181 @@ -1337,12 +1344,6 @@ void generate_files(int f_out, struct fi
185 - /* Since we often fill up the outgoing socket and then just sit around
186 - * waiting for the other 2 processes to do their thing, we don't want
187 - * to exit on a timeout. If the data stops flowing, the receiver will
188 - * notice that and let us know via the redo pipe (or its closing). */
189 - ignore_timeout = 1;
191 for (i = 0; i < flist->count; i++) {
192 struct file_struct *file = flist->files[i];
194 @@ -1386,23 +1387,34 @@ void generate_files(int f_out, struct fi
195 delete_in_dir(NULL, NULL, NULL, NULL);
198 - csum_length = SUM_LENGTH;
199 + GEN_csum_length = SUM_LENGTH; /* csum_length is set by the receiver */
200 max_size = min_size = ignore_existing = ignore_non_existing = 0;
201 update_only = always_checksum = size_only = 0;
203 - if (append_mode) /* resend w/o append mode */
204 - append_mode = -1; /* ... but only longer files */
205 - make_backups = 0; /* avoid a duplicate backup for inplace processing */
206 + if (GEN_append_mode) /* resend w/o append mode */
207 + GEN_append_mode = -1; /* ... but only longer files */
208 + GEN_make_backups = 0; /* avoid a duplicate backup for inplace processing */
211 rprintf(FINFO,"generate_files phase=%d\n",phase);
213 write_int(f_out, -1);
214 + io_flush(NORMAL_FLUSH);
216 /* files can cycle through the system more than once
217 * to catch initial checksum errors */
218 - while ((i = get_redo_num(itemizing, code)) != -1) {
219 - struct file_struct *file = flist->files[i];
221 + struct file_struct *file;
222 + if (preserve_hard_links)
223 + check_for_finished_hlinks(itemizing, code);
224 + if ((i = get_redo_num()) < 0) {
227 + io_flush(NORMAL_FLUSH);
231 + file = flist->files[i];
233 strlcpy(fbuf, local_name, sizeof fbuf);
235 @@ -1414,27 +1426,43 @@ void generate_files(int f_out, struct fi
237 ignore_non_existing = save_ignore_non_existing;
238 ignore_existing = save_ignore_existing;
239 - make_backups = save_make_backups;
240 + GEN_make_backups = save_make_backups;
243 rprintf(FINFO,"generate_files phase=%d\n",phase);
245 write_int(f_out, -1);
246 + io_flush(NORMAL_FLUSH);
248 /* Reduce round-trip lag-time for a useless delay-updates phase. */
249 - if (protocol_version >= 29 && !delay_updates)
250 + if (protocol_version >= 29 && !delay_updates) {
251 write_int(f_out, -1);
252 + io_flush(NORMAL_FLUSH);
255 - /* Read MSG_DONE for the redo phase (and any prior messages). */
256 - get_redo_num(itemizing, code);
257 + /* Read end marker for the redo phase (and any prior messages). */
259 + if (preserve_hard_links)
260 + check_for_finished_hlinks(itemizing, code);
261 + if (get_redo_num() == -2)
263 + io_flush(NORMAL_FLUSH);
267 if (protocol_version >= 29) {
270 rprintf(FINFO, "generate_files phase=%d\n", phase);
272 + if (delay_updates) {
273 write_int(f_out, -1);
274 - /* Read MSG_DONE for delay-updates phase & prior messages. */
275 - get_redo_num(itemizing, code);
276 + io_flush(NORMAL_FLUSH);
278 + /* Read end marker for delay-updates phase & prior messages. */
279 + while (get_redo_num() != -2) {
280 + io_flush(NORMAL_FLUSH);
285 do_progress = save_do_progress;
288 @@ -46,20 +46,17 @@ extern int allowed_lull;
289 extern int am_server;
290 extern int am_daemon;
291 extern int am_sender;
292 -extern int am_generator;
293 extern int eol_nulls;
294 extern int read_batch;
295 extern int csum_length;
296 extern int checksum_seed;
297 extern int protocol_version;
298 -extern int remove_sent_files;
299 extern int preserve_hard_links;
300 extern char *filesfrom_host;
301 extern struct stats stats;
302 extern struct file_list *the_file_list;
304 const char phase_unknown[] = "unknown";
305 -int ignore_timeout = 0;
307 int batch_gen_fd = -1;
309 @@ -83,7 +80,6 @@ const char *io_read_phase = phase_unknow
310 int kluge_around_eof = 0;
313 -int msg_fd_out = -1;
317 @@ -110,27 +106,32 @@ static OFF_T active_bytecnt = 0;
318 static void read_loop(int fd, char *buf, size_t len);
320 struct flist_ndx_item {
321 - struct flist_ndx_item *next;
322 + volatile struct flist_ndx_item *next;
326 struct flist_ndx_list {
327 - struct flist_ndx_item *head, *tail;
328 + volatile struct flist_ndx_item *head, *tail;
329 + pthread_mutex_t mutex;
332 -static struct flist_ndx_list redo_list, hlink_list;
333 +static struct flist_ndx_list redo_list = { NULL, NULL, PTHREAD_MUTEX_INITIALIZER };
334 +static struct flist_ndx_list hlink_list = { NULL, NULL, PTHREAD_MUTEX_INITIALIZER };
336 struct msg_list_item {
337 - struct msg_list_item *next;
338 + volatile struct msg_list_item *next;
339 + pthread_mutex_t mutex;
346 - struct msg_list_item *head, *tail;
347 + volatile struct msg_list_item *head, *tail;
348 + pthread_mutex_t mutex;
351 -static struct msg_list msg_list;
352 +static struct msg_list msg_list = { NULL, NULL, PTHREAD_MUTEX_INITIALIZER };
354 static void flist_ndx_push(struct flist_ndx_list *lp, int ndx)
356 @@ -140,27 +141,31 @@ static void flist_ndx_push(struct flist_
357 out_of_memory("flist_ndx_push");
360 + pthread_mutex_lock(&redo_list.mutex);
362 lp->tail->next = item;
366 + pthread_mutex_unlock(&redo_list.mutex);
369 static int flist_ndx_pop(struct flist_ndx_list *lp)
371 - struct flist_ndx_item *next;
372 + struct flist_ndx_item *head, *next;
378 - ndx = lp->head->ndx;
379 - next = lp->head->next;
383 + pthread_mutex_lock(&hlink_list.mutex);
384 + head = (struct flist_ndx_item *)lp->head;
385 + next = (struct flist_ndx_item *)head->next;
387 + if (!(lp->head = next))
389 + pthread_mutex_unlock(&hlink_list.mutex);
394 @@ -169,7 +174,7 @@ static void check_timeout(void)
398 - if (!io_timeout || ignore_timeout)
403 @@ -210,45 +215,40 @@ void set_io_timeout(int secs)
405 /* Setup the fd used to receive MSG_* messages. Only needed during the
406 * early stages of being a local sender (up through the sending of the
407 - * file list) or when we're the generator (to fetch the messages from
408 - * the receiver). */
410 void set_msg_fd_in(int fd)
415 -/* Setup the fd used to send our MSG_* messages. Only needed when
416 - * we're the receiver (to send our messages to the generator). */
417 -void set_msg_fd_out(int fd)
420 - set_nonblocking(msg_fd_out);
423 /* Add a message to the pending MSG_* list. */
424 static void msg_list_add(int code, char *buf, int len)
426 struct msg_list_item *ml;
428 + assert(am_receiver());
429 if (!(ml = new(struct msg_list_item)))
430 out_of_memory("msg_list_add");
432 - if (!(ml->buf = new_array(char, len+4)))
433 + /* NOTE: the "+ 1" allows rwrite() to use the buf! */
434 + if (!(ml->buf = new_array(char, len + 1)))
435 out_of_memory("msg_list_add");
436 - SIVAL(ml->buf, 0, ((code+MPLEX_BASE)<<24) | len);
437 - memcpy(ml->buf+4, buf, len);
439 + memcpy(ml->buf, buf, len);
443 + pthread_mutex_lock(&msg_list.mutex);
445 msg_list.tail->next = ml;
449 + pthread_mutex_unlock(&msg_list.mutex);
452 -/* Read a message from the MSG_* fd and handle it. This is called either
453 +/* Read a message from the MSG_* fd and handle it. This is only called
454 * during the early stages of being a local sender (up through the sending
455 - * of the file list) or when we're the generator (to fetch the messages
456 - * from the receiver). */
457 + * of the file list). */
458 static void read_msg_fd(void)
461 @@ -267,51 +267,6 @@ static void read_msg_fd(void)
462 tag = (tag >> 24) - MPLEX_BASE;
466 - if (len != 0 || !am_generator) {
467 - rprintf(FERROR, "invalid message %d:%d\n", tag, len);
468 - exit_cleanup(RERR_STREAMIO);
470 - flist_ndx_push(&redo_list, -1);
473 - if (len != 4 || !am_generator) {
474 - rprintf(FERROR, "invalid message %d:%d\n", tag, len);
475 - exit_cleanup(RERR_STREAMIO);
477 - read_loop(fd, buf, 4);
478 - if (remove_sent_files)
479 - decrement_active_files(IVAL(buf,0));
480 - flist_ndx_push(&redo_list, IVAL(buf,0));
483 - if (len >= (int)sizeof buf || !am_generator) {
484 - rprintf(FERROR, "invalid message %d:%d\n", tag, len);
485 - exit_cleanup(RERR_STREAMIO);
487 - read_loop(fd, buf, len);
488 - io_multiplex_write(MSG_DELETED, buf, len);
491 - if (len != 4 || !am_generator) {
492 - rprintf(FERROR, "invalid message %d:%d\n", tag, len);
493 - exit_cleanup(RERR_STREAMIO);
495 - read_loop(fd, buf, len);
496 - if (remove_sent_files) {
497 - decrement_active_files(IVAL(buf,0));
498 - io_multiplex_write(MSG_SUCCESS, buf, len);
500 - if (preserve_hard_links)
501 - flist_ndx_push(&hlink_list, IVAL(buf,0));
504 - if (!am_generator) {
505 - rprintf(FERROR, "invalid message %d:%d\n", tag, len);
506 - exit_cleanup(RERR_STREAMIO);
508 - close_multiplexing_out();
513 @@ -354,71 +309,75 @@ void decrement_active_files(int ndx)
514 active_bytecnt -= the_file_list->files[ndx]->length;
517 -/* Try to push messages off the list onto the wire. If we leave with more
518 +/* Try to pop messages off the list onto the wire. If we leave with more
519 * to do, return 0. On error, return -1. If everything flushed, return 1.
520 - * This is only active in the receiver. */
521 + * This is only called by the generator. */
522 static int msg_list_flush(int flush_it_all)
524 - static int written = 0;
528 - if (msg_fd_out < 0)
531 + assert(am_generator());
533 while (msg_list.head) {
534 - struct msg_list_item *ml = msg_list.head;
535 - int n = write(msg_fd_out, ml->buf + written, ml->len - written);
537 - if (errno == EINTR)
539 - if (errno != EWOULDBLOCK && errno != EAGAIN)
544 - FD_SET(msg_fd_out, &fds);
545 - tv.tv_sec = select_timeout;
547 - if (!select(msg_fd_out+1, NULL, &fds, NULL, &tv))
549 - } else if ((written += n) == ml->len) {
551 - msg_list.head = ml->next;
552 - if (!msg_list.head)
553 - msg_list.tail = NULL;
556 + struct msg_list_item *ml = (struct msg_list_item *)msg_list.head;
557 + switch (ml->code) {
559 + close_multiplexing_out();
564 + rwrite(ml->code, ml->buf, ml->len);
567 + io_multiplex_write(ml->code, ml->buf, ml->len);
570 + pthread_mutex_lock(&msg_list.mutex);
571 + if (!(msg_list.head = ml->next))
572 + msg_list.tail = NULL;
573 + pthread_mutex_unlock(&msg_list.mutex);
584 void send_msg(enum msgcode code, char *buf, int len)
586 - if (msg_fd_out < 0) {
588 + msg_list_add(code, buf, len);
590 io_multiplex_write(code, buf, len);
593 - msg_list_add(code, buf, len);
594 - msg_list_flush(NORMAL_FLUSH);
597 -int get_redo_num(int itemizing, enum logcode code)
598 +/* This is only used by the receiver. */
599 +void push_redo_num(int ndx)
602 - if (hlink_list.head)
603 - check_for_finished_hlinks(itemizing, code);
604 - if (redo_list.head)
608 + assert(am_receiver());
609 + flist_ndx_push(&redo_list, ndx);
612 +/* This is only used by the generator. */
613 +int get_redo_num(void)
615 + assert(am_generator());
616 return flist_ndx_pop(&redo_list);
619 +/* This is only used by the receiver. */
620 +void push_hlink_num(int ndx)
622 + assert(am_receiver());
623 + flist_ndx_push(&hlink_list, ndx);
626 +/* This is only used by the generator. */
627 int get_hlink_num(void)
629 + assert(am_generator());
630 return flist_ndx_pop(&hlink_list);
633 @@ -498,11 +457,6 @@ static int read_timeout(int fd, char *bu
637 - if (msg_list.head) {
638 - FD_SET(msg_fd_out, &w_fds);
639 - if (msg_fd_out > maxfd)
640 - maxfd = msg_fd_out;
642 if (io_filesfrom_f_out >= 0) {
644 if (io_filesfrom_buflen == 0) {
645 @@ -535,9 +489,6 @@ static int read_timeout(int fd, char *bu
649 - if (msg_list.head && FD_ISSET(msg_fd_out, &w_fds))
650 - msg_list_flush(NORMAL_FLUSH);
652 if (io_filesfrom_f_out >= 0) {
653 if (io_filesfrom_buflen) {
654 if (FD_ISSET(io_filesfrom_f_out, &w_fds)) {
655 @@ -859,6 +810,8 @@ static void readfd(int fd, char *buffer,
658 if (fd == write_batch_monitor_in) {
659 + if (am_generator())
660 + rprintf(FINFO, "writing %d bytes to batch file from generator\n", total);
661 if ((size_t)write(batch_fd, buffer, total) != total)
662 exit_cleanup(RERR_FILEIO);
664 @@ -1119,7 +1072,6 @@ static void writefd_unbuffered(int fd,ch
665 * to grab any messages they sent before they died. */
666 while (fd == sock_f_out && io_multiplexing_in) {
668 - ignore_timeout = 0;
669 readfd_unbuffered(sock_f_in, io_filesfrom_buf,
670 sizeof io_filesfrom_buf);
672 @@ -1129,7 +1081,7 @@ static void writefd_unbuffered(int fd,ch
675 if (fd == sock_f_out) {
676 - if (io_timeout || am_generator)
677 + if (io_timeout || am_generator())
678 last_io_out = time(NULL);
679 sleep_for_bwlimit(cnt);
681 @@ -1153,7 +1105,7 @@ static void mplex_write(enum msgcode cod
682 * cause output to occur down the socket. Setting contiguous_write_len
683 * prevents the reading of msg_fd_in once we actually start to write
684 * this sequence of data (though we might read it before the start). */
685 - if (am_generator && msg_fd_in >= 0)
686 + if (am_generator() && msg_fd_in >= 0)
687 contiguous_write_len = len + 4;
689 if (n > sizeof buffer - 4)
690 @@ -1169,31 +1121,29 @@ static void mplex_write(enum msgcode cod
692 writefd_unbuffered(sock_f_out, buf, len);
694 - if (am_generator && msg_fd_in >= 0)
695 + if (am_generator() && msg_fd_in >= 0)
696 contiguous_write_len = 0;
699 void io_flush(int flush_it_all)
701 - msg_list_flush(flush_it_all);
703 - if (!iobuf_out_cnt || no_flush)
707 - if (io_multiplexing_out)
708 - mplex_write(MSG_DATA, iobuf_out, iobuf_out_cnt);
710 - writefd_unbuffered(sock_f_out, iobuf_out, iobuf_out_cnt);
712 + if (iobuf_out_cnt) {
713 + if (io_multiplexing_out)
714 + mplex_write(MSG_DATA, iobuf_out, iobuf_out_cnt);
716 + writefd_unbuffered(sock_f_out, iobuf_out, iobuf_out_cnt);
720 + if (am_generator())
721 + msg_list_flush(flush_it_all);
724 static void writefd(int fd,char *buf,size_t len)
726 - if (fd == msg_fd_out) {
727 - rprintf(FERROR, "Internal error: wrong write used in receiver.\n");
728 - exit_cleanup(RERR_PROTOCOL);
731 if (fd == sock_f_out)
732 stats.total_written += len;
734 @@ -1406,9 +1356,3 @@ void start_write_batch(int fd)
736 write_batch_monitor_in = fd;
739 -void stop_write_batch(void)
741 - write_batch_monitor_out = -1;
742 - write_batch_monitor_in = -1;
746 @@ -38,7 +38,6 @@ extern int am_sender;
747 extern int local_server;
749 extern int module_id;
750 -extern int msg_fd_out;
751 extern int allow_8bit_chars;
752 extern int protocol_version;
753 extern int preserve_times;
754 @@ -76,7 +75,6 @@ struct {
755 { RERR_IPC , "error in IPC code" },
756 { RERR_CRASHED , "sibling process crashed" },
757 { RERR_TERMINATED , "sibling process terminated abnormally" },
758 - { RERR_SIGNAL1 , "received SIGUSR1" },
759 { RERR_SIGNAL , "received SIGINT, SIGTERM, or SIGHUP" },
760 { RERR_WAITCHILD , "waitpid() failed" },
761 { RERR_MALLOC , "error allocating core memory buffers" },
762 @@ -232,8 +230,8 @@ void rwrite(enum logcode code, char *buf
763 if (quiet && code == FINFO)
766 - if (am_server && msg_fd_out >= 0) {
767 - /* Pass the message to our sibling. */
768 + if (am_receiver()) {
769 + /* Pass the message to the generator thread. */
770 send_msg((enum msgcode)code, buf, len);
775 @@ -30,7 +30,6 @@ extern int list_only;
777 extern int am_server;
778 extern int am_sender;
779 -extern int am_generator;
780 extern int am_daemon;
781 extern int blocking_io;
782 extern int remove_sent_files;
783 @@ -85,9 +84,20 @@ struct pid_status {
785 static time_t starttime, endtime;
786 static int64 total_read, total_written;
787 +static pthread_t receiver_tid;
789 static void show_malloc_stats(void);
793 + return receiver_tid != 0 && pthread_self() != receiver_tid;
798 + return receiver_tid != 0 && pthread_self() == receiver_tid;
801 /* Works like waitpid(), but if we already harvested the child pid in our
802 * remember_children(), we succeed instead of returning an error. */
803 pid_t wait_process(pid_t pid, int *status_ptr, int flags)
804 @@ -164,7 +174,7 @@ static void handle_stats(int f)
809 + if (am_generator())
813 @@ -628,12 +638,30 @@ static void do_server_sender(int f_in, i
817 +struct thread_args {
818 + struct file_list *flist;
823 +static void *start_receiver_thread(void *arg)
825 + static int exit_code;
826 + struct thread_args *ta = (struct thread_args *)arg;
828 + recv_files(ta->f_in, ta->flist, ta->local_name);
829 + handle_stats(ta->f_in);
833 + exit_code = log_got_error ? RERR_PARTIAL : 0;
837 static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
843 + struct thread_args args;
845 /* The receiving side mustn't obey this, or an existing symlink that
846 * points to an identical file won't be replaced by the referent. */
847 @@ -642,70 +670,16 @@ static int do_recv(int f_in,int f_out,st
848 if (preserve_hard_links)
851 - if (fd_pair(error_pipe) < 0) {
852 - rsyserr(FERROR, errno, "pipe failed in do_recv");
854 + args.flist = flist;
855 + args.local_name = local_name;
856 + if (pthread_create(&receiver_tid, NULL, start_receiver_thread, &args) < 0) {
857 + rsyserr(FERROR, errno, "pthread_create failed in do_recv");
858 exit_cleanup(RERR_IPC);
861 - io_flush(NORMAL_FLUSH);
863 - if ((pid = do_fork()) == -1) {
864 - rsyserr(FERROR, errno, "fork failed in do_recv");
865 - exit_cleanup(RERR_IPC);
869 - close(error_pipe[0]);
873 - /* we can't let two processes write to the socket at one time */
874 - close_multiplexing_out();
876 - /* set place to send errors */
877 - set_msg_fd_out(error_pipe[1]);
879 - recv_files(f_in, flist, local_name);
880 - io_flush(FULL_FLUSH);
881 - handle_stats(f_in);
883 - send_msg(MSG_DONE, "", 0);
884 - io_flush(FULL_FLUSH);
886 - /* Handle any keep-alive packets from the post-processing work
887 - * that the generator does. */
888 - if (protocol_version >= 29) {
889 - kluge_around_eof = -1;
891 - /* This should only get stopped via a USR2 signal. */
892 - while (read_int(f_in) == flist->count
893 - && read_shortint(f_in) == ITEM_IS_NEW) {}
895 - rprintf(FERROR, "Invalid packet at end of run [%s]\n",
897 - exit_cleanup(RERR_PROTOCOL);
900 - /* Finally, we go to sleep until our parent kills us with a
901 - * USR2 signal. We sleep for a short time, as on some OSes
902 - * a signal won't interrupt a sleep! */
908 - close_multiplexing_in();
909 - if (write_batch && !am_server)
910 - stop_write_batch();
912 - close(error_pipe[1]);
916 io_start_buffering_out();
918 - set_msg_fd_in(error_pipe[0]);
920 generate_files(f_out, flist, local_name);
923 @@ -716,10 +690,13 @@ static int do_recv(int f_in,int f_out,st
925 io_flush(FULL_FLUSH);
928 - kill(pid, SIGUSR2);
929 - wait_process_with_flush(pid, &exit_code);
931 + pthread_join(receiver_tid, &value_ptr);
937 + return *(int*)value_ptr;
941 @@ -1089,22 +1066,6 @@ static int start_client(int argc, char *
946 -static RETSIGTYPE sigusr1_handler(UNUSED(int val))
948 - exit_cleanup(RERR_SIGNAL1);
951 -static RETSIGTYPE sigusr2_handler(UNUSED(int val))
957 - _exit(RERR_PARTIAL);
961 RETSIGTYPE remember_children(UNUSED(int val))
964 @@ -1196,8 +1157,6 @@ int main(int argc,char *argv[])
966 sigact.sa_flags = SA_NOCLDSTOP;
968 - SIGACTMASK(SIGUSR1, sigusr1_handler);
969 - SIGACTMASK(SIGUSR2, sigusr2_handler);
970 SIGACTMASK(SIGCHLD, remember_children);
971 #ifdef MAINTAINER_MODE
972 SIGACTMASK(SIGSEGV, rsync_panic_handler);
979 -extern int do_progress;
980 +extern int recv_progress;
981 extern int checksum_seed;
982 extern int append_mode;
984 @@ -110,7 +110,7 @@ static void matched(int f, struct sum_st
988 - if (buf && do_progress)
989 + if (buf && recv_progress)
990 show_progress(last_match, buf->file_size);
993 @@ -314,7 +314,7 @@ void match_sums(int f, struct sum_struct
996 for (j = CHUNK_SIZE; j < s->flength; j += CHUNK_SIZE) {
997 - if (buf && do_progress)
998 + if (buf && recv_progress)
999 show_progress(last_match, buf->file_size);
1000 sum_update(map_ptr(buf, last_match, CHUNK_SIZE),
1002 @@ -322,7 +322,7 @@ void match_sums(int f, struct sum_struct
1004 if (last_match < s->flength) {
1005 int32 len = s->flength - last_match;
1006 - if (buf && do_progress)
1007 + if (buf && recv_progress)
1008 show_progress(last_match, buf->file_size);
1009 sum_update(map_ptr(buf, last_match, len), len);
1010 last_match = s->flength;
1013 @@ -74,7 +74,6 @@ int def_compress_level = Z_DEFAULT_COMPR
1017 -int am_generator = 0;
1018 int am_starting_up = 1;
1019 int relative_paths = -1;
1020 int implied_dirs = 1;
1021 @@ -95,6 +94,7 @@ int am_daemon = 0;
1022 int daemon_over_rsh = 0;
1024 int do_progress = 0;
1025 +int recv_progress = 0;
1026 int keep_partial = 0;
1027 int safe_symlinks = 0;
1028 int copy_unsafe_links = 0;
1029 @@ -1301,6 +1301,7 @@ int parse_arguments(int *argc, const cha
1031 if (do_progress && !verbose && !log_before_transfer && !am_server)
1033 + recv_progress = do_progress;
1039 @@ -56,7 +56,7 @@ pid_t piped_child(char **command, int *f
1040 exit_cleanup(RERR_IPC);
1046 rsyserr(FERROR, errno, "fork");
1047 exit_cleanup(RERR_IPC);
1048 @@ -120,7 +120,7 @@ pid_t local_child(int argc, char **argv,
1049 exit_cleanup(RERR_IPC);
1055 rsyserr(FERROR, errno, "fork");
1056 exit_cleanup(RERR_IPC);
1059 @@ -24,7 +24,7 @@ extern int verbose;
1060 extern int do_xfers;
1061 extern int am_daemon;
1062 extern int am_server;
1063 -extern int do_progress;
1064 +extern int recv_progress;
1065 extern int log_before_transfer;
1066 extern int log_format_has_i;
1067 extern int daemon_log_format_has_i;
1068 @@ -153,7 +153,7 @@ static int receive_data(int f_in, char *
1070 sum.flength -= sum.blength - sum.remainder;
1071 for (j = CHUNK_SIZE; j < sum.flength; j += CHUNK_SIZE) {
1073 + if (recv_progress)
1074 show_progress(offset, total_size);
1075 sum_update(map_ptr(mapbuf, offset, CHUNK_SIZE),
1077 @@ -161,7 +161,7 @@ static int receive_data(int f_in, char *
1079 if (offset < sum.flength) {
1080 int32 len = sum.flength - offset;
1082 + if (recv_progress)
1083 show_progress(offset, total_size);
1084 sum_update(map_ptr(mapbuf, offset, len), len);
1085 offset = sum.flength;
1086 @@ -174,7 +174,7 @@ static int receive_data(int f_in, char *
1089 while ((i = recv_token(f_in, &data)) != 0) {
1091 + if (recv_progress)
1092 show_progress(offset, total_size);
1095 @@ -242,7 +242,7 @@ static int receive_data(int f_in, char *
1096 ftruncate(fd, offset);
1100 + if (recv_progress)
1101 end_progress(total_size);
1103 if (fd != -1 && offset > 0 && sparse_end(fd) != 0) {
1104 @@ -293,12 +293,12 @@ static void handle_delayed_updates(struc
1105 "rename failed for %s (from %s)",
1106 full_fname(fname), partialptr);
1108 - if (remove_sent_files
1109 - || (preserve_hard_links
1110 - && file->link_u.links)) {
1111 + if (remove_sent_files) {
1112 SIVAL(numbuf, 0, i);
1113 send_msg(MSG_SUCCESS,numbuf,4);
1115 + if (preserve_hard_links && file->link_u.links)
1116 + push_hlink_num(i);
1117 handle_partial_dir(partialptr, PDIR_DELETE);
1120 @@ -349,11 +349,6 @@ int recv_files(int f_in, struct file_lis
1122 rprintf(FINFO,"recv_files(%d) starting\n",flist->count);
1124 - if (flist->hlink_pool) {
1125 - pool_destroy(flist->hlink_pool);
1126 - flist->hlink_pool = NULL;
1130 delayed_bits = bitbag_create(flist->count);
1132 @@ -374,7 +369,7 @@ int recv_files(int f_in, struct file_lis
1133 rprintf(FINFO, "recv_files phase=%d\n", phase);
1134 if (phase == 2 && delay_updates)
1135 handle_delayed_updates(flist, local_name);
1136 - send_msg(MSG_DONE, "", 0);
1137 + push_redo_num(-2);
1138 if (keep_partial && !partial_dir)
1139 make_backups = 0; /* prevents double backup */
1141 @@ -596,7 +591,7 @@ int recv_files(int f_in, struct file_lis
1142 /* log the transfer */
1143 if (log_before_transfer)
1144 log_item(file, &initial_stats, iflags, NULL);
1145 - else if (!am_server && verbose && do_progress)
1146 + else if (!am_server && verbose && recv_progress)
1147 rprintf(FINFO, "%s\n", fname);
1149 /* recv file data */
1150 @@ -639,11 +634,13 @@ int recv_files(int f_in, struct file_lis
1154 - if (remove_sent_files
1155 - || (preserve_hard_links && file->link_u.links)) {
1156 + if (remove_sent_files) {
1157 + decrement_active_files(i);
1158 SIVAL(numbuf, 0, i);
1159 send_msg(MSG_SUCCESS, numbuf, 4);
1161 + if (preserve_hard_links && file->link_u.links)
1162 + push_hlink_num(i);
1163 } else if (!recv_ok) {
1164 int msgtype = phase || read_batch ? FERROR : FINFO;
1165 if (msgtype == FERROR || verbose) {
1166 @@ -666,8 +663,8 @@ int recv_files(int f_in, struct file_lis
1167 errstr, fname, keptstr, redostr);
1170 - SIVAL(numbuf, 0, i);
1171 - send_msg(MSG_REDO, numbuf, 4);
1172 + decrement_active_files(i);
1179 @@ -40,7 +40,6 @@ extern int omit_dir_times;
1181 extern int am_server;
1182 extern int am_sender;
1183 -extern int am_generator;
1184 extern int am_starting_up;
1185 extern int allow_8bit_chars;
1186 extern int preserve_uid;
1187 @@ -303,5 +302,5 @@ const char *who_am_i(void)
1190 return am_server ? "server" : "client";
1191 - return am_sender ? "sender" : am_generator ? "generator" : "receiver";
1192 + return am_sender ? "sender" : am_generator() ? "generator" : "receiver";
1196 @@ -166,10 +166,8 @@ enum msgcode {
1197 MSG_DATA=0, /* raw data on the multiplexed stream */
1198 MSG_ERROR=FERROR, MSG_INFO=FINFO, /* remote logging */
1199 MSG_LOG=FLOG, MSG_SOCKERR=FSOCKERR, /* sibling logging */
1200 - MSG_REDO=9, /* reprocess indicated flist index */
1201 MSG_SUCCESS=100,/* successfully updated indicated flist index */
1202 MSG_DELETED=101,/* successfully deleted a file on receiving side */
1203 - MSG_DONE=86 /* current phase is done */
1206 #include "errcode.h"
1207 @@ -320,6 +318,7 @@ enum msgcode {
1211 +#include <pthread.h>
1213 #include "lib/pool_alloc.h"
1217 @@ -420,49 +420,6 @@ int robust_rename(char *from, char *to,
1221 -static pid_t all_pids[10];
1222 -static int num_pids;
1224 -/** Fork and record the pid of the child. **/
1225 -pid_t do_fork(void)
1227 - pid_t newpid = fork();
1229 - if (newpid != 0 && newpid != -1) {
1230 - all_pids[num_pids++] = newpid;
1236 - * Kill all children.
1238 - * @todo It would be kind of nice to make sure that they are actually
1239 - * all our children before we kill them, because their pids may have
1240 - * been recycled by some other process. Perhaps when we wait for a
1241 - * child, we should remove it from this array. Alternatively we could
1242 - * perhaps use process groups, but I think that would not work on
1243 - * ancient Unix versions that don't support them.
1245 -void kill_all(int sig)
1249 - for (i = 0; i < num_pids; i++) {
1250 - /* Let's just be a little careful where we
1251 - * point that gun, hey? See kill(2) for the
1252 - * magic caused by negative values. */
1253 - pid_t p = all_pids[i];
1255 - if (p == getpid())
1264 /** Turn a user name into a uid */
1265 int name_to_uid(char *name, uid_t *uid)