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,7 +1302,10 @@ 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;
165 + GEN_append_mode = append_mode;
166 + GEN_csum_length = csum_length;
168 if (protocol_version >= 29) {
170 @@ -1327,7 +1334,7 @@ void generate_files(int f_out, struct fi
171 do_delete_pass(flist);
174 - if (append_mode || whole_file < 0)
175 + if (GEN_append_mode || whole_file < 0)
178 rprintf(FINFO, "delta-transmission %s\n",
179 @@ -1336,12 +1343,6 @@ void generate_files(int f_out, struct fi
183 - /* Since we often fill up the outgoing socket and then just sit around
184 - * waiting for the other 2 processes to do their thing, we don't want
185 - * to exit on a timeout. If the data stops flowing, the receiver will
186 - * notice that and let us know via the redo pipe (or its closing). */
187 - ignore_timeout = 1;
189 for (i = 0; i < flist->count; i++) {
190 struct file_struct *file = flist->files[i];
192 @@ -1385,23 +1386,34 @@ void generate_files(int f_out, struct fi
193 delete_in_dir(NULL, NULL, NULL, NULL);
196 - csum_length = SUM_LENGTH;
197 + GEN_csum_length = SUM_LENGTH; /* csum_length is set by the receiver */
198 max_size = min_size = ignore_existing = ignore_non_existing = 0;
199 update_only = always_checksum = size_only = 0;
201 - if (append_mode) /* resend w/o append mode */
202 - append_mode = -1; /* ... but only longer files */
203 - make_backups = 0; /* avoid a duplicate backup for inplace processing */
204 + if (GEN_append_mode) /* resend w/o append mode */
205 + GEN_append_mode = -1; /* ... but only longer files */
206 + GEN_make_backups = 0; /* avoid a duplicate backup for inplace processing */
209 rprintf(FINFO,"generate_files phase=%d\n",phase);
211 write_int(f_out, -1);
212 + io_flush(NORMAL_FLUSH);
214 /* files can cycle through the system more than once
215 * to catch initial checksum errors */
216 - while ((i = get_redo_num(itemizing, code)) != -1) {
217 - struct file_struct *file = flist->files[i];
219 + struct file_struct *file;
220 + if (preserve_hard_links)
221 + check_for_finished_hlinks(itemizing, code);
222 + if ((i = get_redo_num()) < 0) {
225 + io_flush(NORMAL_FLUSH);
229 + file = flist->files[i];
231 strlcpy(fbuf, local_name, sizeof fbuf);
233 @@ -1413,27 +1425,43 @@ void generate_files(int f_out, struct fi
235 ignore_non_existing = save_ignore_non_existing;
236 ignore_existing = save_ignore_existing;
237 - make_backups = save_make_backups;
238 + GEN_make_backups = save_make_backups;
241 rprintf(FINFO,"generate_files phase=%d\n",phase);
243 write_int(f_out, -1);
244 + io_flush(NORMAL_FLUSH);
246 /* Reduce round-trip lag-time for a useless delay-updates phase. */
247 - if (protocol_version >= 29 && !delay_updates)
248 + if (protocol_version >= 29 && !delay_updates) {
249 write_int(f_out, -1);
250 + io_flush(NORMAL_FLUSH);
253 - /* Read MSG_DONE for the redo phase (and any prior messages). */
254 - get_redo_num(itemizing, code);
255 + /* Read end marker for the redo phase (and any prior messages). */
257 + if (preserve_hard_links)
258 + check_for_finished_hlinks(itemizing, code);
259 + if (get_redo_num() == -2)
261 + io_flush(NORMAL_FLUSH);
265 if (protocol_version >= 29) {
268 rprintf(FINFO, "generate_files phase=%d\n", phase);
270 + if (delay_updates) {
271 write_int(f_out, -1);
272 - /* Read MSG_DONE for delay-updates phase & prior messages. */
273 - get_redo_num(itemizing, code);
274 + io_flush(NORMAL_FLUSH);
276 + /* Read end marker for delay-updates phase & prior messages. */
277 + while (get_redo_num() != -2) {
278 + io_flush(NORMAL_FLUSH);
283 do_progress = save_do_progress;
286 @@ -46,20 +46,17 @@ extern int allowed_lull;
287 extern int am_server;
288 extern int am_daemon;
289 extern int am_sender;
290 -extern int am_generator;
291 extern int eol_nulls;
292 extern int read_batch;
293 extern int csum_length;
294 extern int checksum_seed;
295 extern int protocol_version;
296 -extern int remove_sent_files;
297 extern int preserve_hard_links;
298 extern char *filesfrom_host;
299 extern struct stats stats;
300 extern struct file_list *the_file_list;
302 const char phase_unknown[] = "unknown";
303 -int ignore_timeout = 0;
305 int batch_gen_fd = -1;
307 @@ -83,7 +80,6 @@ const char *io_read_phase = phase_unknow
308 int kluge_around_eof = 0;
311 -int msg_fd_out = -1;
315 @@ -110,27 +106,32 @@ static OFF_T active_bytecnt = 0;
316 static void read_loop(int fd, char *buf, size_t len);
318 struct flist_ndx_item {
319 - struct flist_ndx_item *next;
320 + volatile struct flist_ndx_item *next;
324 struct flist_ndx_list {
325 - struct flist_ndx_item *head, *tail;
326 + volatile struct flist_ndx_item *head, *tail;
327 + pthread_mutex_t mutex;
330 -static struct flist_ndx_list redo_list, hlink_list;
331 +static struct flist_ndx_list redo_list = { NULL, NULL, PTHREAD_MUTEX_INITIALIZER };
332 +static struct flist_ndx_list hlink_list = { NULL, NULL, PTHREAD_MUTEX_INITIALIZER };
334 struct msg_list_item {
335 - struct msg_list_item *next;
336 + volatile struct msg_list_item *next;
337 + pthread_mutex_t mutex;
344 - struct msg_list_item *head, *tail;
345 + volatile struct msg_list_item *head, *tail;
346 + pthread_mutex_t mutex;
349 -static struct msg_list msg_list;
350 +static struct msg_list msg_list = { NULL, NULL, PTHREAD_MUTEX_INITIALIZER };
352 static void flist_ndx_push(struct flist_ndx_list *lp, int ndx)
354 @@ -140,27 +141,31 @@ static void flist_ndx_push(struct flist_
355 out_of_memory("flist_ndx_push");
358 + pthread_mutex_lock(&redo_list.mutex);
360 lp->tail->next = item;
364 + pthread_mutex_unlock(&redo_list.mutex);
367 static int flist_ndx_pop(struct flist_ndx_list *lp)
369 - struct flist_ndx_item *next;
370 + struct flist_ndx_item *head, *next;
376 - ndx = lp->head->ndx;
377 - next = lp->head->next;
381 + pthread_mutex_lock(&hlink_list.mutex);
382 + head = (struct flist_ndx_item *)lp->head;
383 + next = (struct flist_ndx_item *)head->next;
385 + if (!(lp->head = next))
387 + pthread_mutex_unlock(&hlink_list.mutex);
392 @@ -169,7 +174,7 @@ static void check_timeout(void)
396 - if (!io_timeout || ignore_timeout)
401 @@ -210,45 +215,40 @@ void set_io_timeout(int secs)
403 /* Setup the fd used to receive MSG_* messages. Only needed during the
404 * early stages of being a local sender (up through the sending of the
405 - * file list) or when we're the generator (to fetch the messages from
406 - * the receiver). */
408 void set_msg_fd_in(int fd)
413 -/* Setup the fd used to send our MSG_* messages. Only needed when
414 - * we're the receiver (to send our messages to the generator). */
415 -void set_msg_fd_out(int fd)
418 - set_nonblocking(msg_fd_out);
421 /* Add a message to the pending MSG_* list. */
422 static void msg_list_add(int code, char *buf, int len)
424 struct msg_list_item *ml;
426 + assert(am_receiver());
427 if (!(ml = new(struct msg_list_item)))
428 out_of_memory("msg_list_add");
430 - if (!(ml->buf = new_array(char, len+4)))
431 + /* NOTE: the "+ 1" allows rwrite() to use the buf! */
432 + if (!(ml->buf = new_array(char, len + 1)))
433 out_of_memory("msg_list_add");
434 - SIVAL(ml->buf, 0, ((code+MPLEX_BASE)<<24) | len);
435 - memcpy(ml->buf+4, buf, len);
437 + memcpy(ml->buf, buf, len);
441 + pthread_mutex_lock(&msg_list.mutex);
443 msg_list.tail->next = ml;
447 + pthread_mutex_unlock(&msg_list.mutex);
450 -/* Read a message from the MSG_* fd and handle it. This is called either
451 +/* Read a message from the MSG_* fd and handle it. This is only called
452 * during the early stages of being a local sender (up through the sending
453 - * of the file list) or when we're the generator (to fetch the messages
454 - * from the receiver). */
455 + * of the file list). */
456 static void read_msg_fd(void)
459 @@ -267,51 +267,6 @@ static void read_msg_fd(void)
460 tag = (tag >> 24) - MPLEX_BASE;
464 - if (len != 0 || !am_generator) {
465 - rprintf(FERROR, "invalid message %d:%d\n", tag, len);
466 - exit_cleanup(RERR_STREAMIO);
468 - flist_ndx_push(&redo_list, -1);
471 - if (len != 4 || !am_generator) {
472 - rprintf(FERROR, "invalid message %d:%d\n", tag, len);
473 - exit_cleanup(RERR_STREAMIO);
475 - read_loop(fd, buf, 4);
476 - if (remove_sent_files)
477 - decrement_active_files(IVAL(buf,0));
478 - flist_ndx_push(&redo_list, IVAL(buf,0));
481 - if (len >= (int)sizeof buf || !am_generator) {
482 - rprintf(FERROR, "invalid message %d:%d\n", tag, len);
483 - exit_cleanup(RERR_STREAMIO);
485 - read_loop(fd, buf, len);
486 - io_multiplex_write(MSG_DELETED, buf, len);
489 - if (len != 4 || !am_generator) {
490 - rprintf(FERROR, "invalid message %d:%d\n", tag, len);
491 - exit_cleanup(RERR_STREAMIO);
493 - read_loop(fd, buf, len);
494 - if (remove_sent_files) {
495 - decrement_active_files(IVAL(buf,0));
496 - io_multiplex_write(MSG_SUCCESS, buf, len);
498 - if (preserve_hard_links)
499 - flist_ndx_push(&hlink_list, IVAL(buf,0));
502 - if (!am_generator) {
503 - rprintf(FERROR, "invalid message %d:%d\n", tag, len);
504 - exit_cleanup(RERR_STREAMIO);
506 - close_multiplexing_out();
511 @@ -354,71 +309,75 @@ void decrement_active_files(int ndx)
512 active_bytecnt -= the_file_list->files[ndx]->length;
515 -/* Try to push messages off the list onto the wire. If we leave with more
516 +/* Try to pop messages off the list onto the wire. If we leave with more
517 * to do, return 0. On error, return -1. If everything flushed, return 1.
518 - * This is only active in the receiver. */
519 + * This is only called by the generator. */
520 static int msg_list_flush(int flush_it_all)
522 - static int written = 0;
526 - if (msg_fd_out < 0)
529 + assert(am_generator());
531 while (msg_list.head) {
532 - struct msg_list_item *ml = msg_list.head;
533 - int n = write(msg_fd_out, ml->buf + written, ml->len - written);
535 - if (errno == EINTR)
537 - if (errno != EWOULDBLOCK && errno != EAGAIN)
542 - FD_SET(msg_fd_out, &fds);
543 - tv.tv_sec = select_timeout;
545 - if (!select(msg_fd_out+1, NULL, &fds, NULL, &tv))
547 - } else if ((written += n) == ml->len) {
549 - msg_list.head = ml->next;
550 - if (!msg_list.head)
551 - msg_list.tail = NULL;
554 + struct msg_list_item *ml = (struct msg_list_item *)msg_list.head;
555 + switch (ml->code) {
557 + close_multiplexing_out();
562 + rwrite(ml->code, ml->buf, ml->len);
565 + io_multiplex_write(ml->code, ml->buf, ml->len);
568 + pthread_mutex_lock(&msg_list.mutex);
569 + if (!(msg_list.head = ml->next))
570 + msg_list.tail = NULL;
571 + pthread_mutex_unlock(&msg_list.mutex);
582 void send_msg(enum msgcode code, char *buf, int len)
584 - if (msg_fd_out < 0) {
586 + msg_list_add(code, buf, len);
588 io_multiplex_write(code, buf, len);
591 - msg_list_add(code, buf, len);
592 - msg_list_flush(NORMAL_FLUSH);
595 -int get_redo_num(int itemizing, enum logcode code)
596 +/* This is only used by the receiver. */
597 +void push_redo_num(int ndx)
600 - if (hlink_list.head)
601 - check_for_finished_hlinks(itemizing, code);
602 - if (redo_list.head)
606 + assert(am_receiver());
607 + flist_ndx_push(&redo_list, ndx);
610 +/* This is only used by the generator. */
611 +int get_redo_num(void)
613 + assert(am_generator());
614 return flist_ndx_pop(&redo_list);
617 +/* This is only used by the receiver. */
618 +void push_hlink_num(int ndx)
620 + assert(am_receiver());
621 + flist_ndx_push(&hlink_list, ndx);
624 +/* This is only used by the generator. */
625 int get_hlink_num(void)
627 + assert(am_generator());
628 return flist_ndx_pop(&hlink_list);
631 @@ -498,11 +457,6 @@ static int read_timeout(int fd, char *bu
635 - if (msg_list.head) {
636 - FD_SET(msg_fd_out, &w_fds);
637 - if (msg_fd_out > maxfd)
638 - maxfd = msg_fd_out;
640 if (io_filesfrom_f_out >= 0) {
642 if (io_filesfrom_buflen == 0) {
643 @@ -535,9 +489,6 @@ static int read_timeout(int fd, char *bu
647 - if (msg_list.head && FD_ISSET(msg_fd_out, &w_fds))
648 - msg_list_flush(NORMAL_FLUSH);
650 if (io_filesfrom_f_out >= 0) {
651 if (io_filesfrom_buflen) {
652 if (FD_ISSET(io_filesfrom_f_out, &w_fds)) {
653 @@ -859,6 +810,8 @@ static void readfd(int fd, char *buffer,
656 if (fd == write_batch_monitor_in) {
657 + if (am_generator())
658 + rprintf(FINFO, "writing %d bytes to batch file from generator\n", total);
659 if ((size_t)write(batch_fd, buffer, total) != total)
660 exit_cleanup(RERR_FILEIO);
662 @@ -1114,7 +1067,6 @@ static void writefd_unbuffered(int fd,ch
663 * to grab any messages they sent before they died. */
664 while (fd == sock_f_out && io_multiplexing_in) {
666 - ignore_timeout = 0;
667 readfd_unbuffered(sock_f_in, io_filesfrom_buf,
668 sizeof io_filesfrom_buf);
670 @@ -1124,7 +1076,7 @@ static void writefd_unbuffered(int fd,ch
673 if (fd == sock_f_out) {
674 - if (io_timeout || am_generator)
675 + if (io_timeout || am_generator())
676 last_io_out = time(NULL);
677 sleep_for_bwlimit(cnt);
679 @@ -1148,7 +1100,7 @@ static void mplex_write(enum msgcode cod
680 * cause output to occur down the socket. Setting contiguous_write_len
681 * prevents the reading of msg_fd_in once we actually start to write
682 * this sequence of data (though we might read it before the start). */
683 - if (am_generator && msg_fd_in >= 0)
684 + if (am_generator() && msg_fd_in >= 0)
685 contiguous_write_len = len + 4;
687 if (n > sizeof buffer - 4)
688 @@ -1164,31 +1116,29 @@ static void mplex_write(enum msgcode cod
690 writefd_unbuffered(sock_f_out, buf, len);
692 - if (am_generator && msg_fd_in >= 0)
693 + if (am_generator() && msg_fd_in >= 0)
694 contiguous_write_len = 0;
697 void io_flush(int flush_it_all)
699 - msg_list_flush(flush_it_all);
701 - if (!iobuf_out_cnt || no_flush)
705 - if (io_multiplexing_out)
706 - mplex_write(MSG_DATA, iobuf_out, iobuf_out_cnt);
708 - writefd_unbuffered(sock_f_out, iobuf_out, iobuf_out_cnt);
710 + if (iobuf_out_cnt) {
711 + if (io_multiplexing_out)
712 + mplex_write(MSG_DATA, iobuf_out, iobuf_out_cnt);
714 + writefd_unbuffered(sock_f_out, iobuf_out, iobuf_out_cnt);
718 + if (am_generator())
719 + msg_list_flush(flush_it_all);
722 static void writefd(int fd,char *buf,size_t len)
724 - if (fd == msg_fd_out) {
725 - rprintf(FERROR, "Internal error: wrong write used in receiver.\n");
726 - exit_cleanup(RERR_PROTOCOL);
729 if (fd == sock_f_out)
730 stats.total_written += len;
732 @@ -1401,9 +1351,3 @@ void start_write_batch(int fd)
734 write_batch_monitor_in = fd;
737 -void stop_write_batch(void)
739 - write_batch_monitor_out = -1;
740 - write_batch_monitor_in = -1;
744 @@ -38,7 +38,6 @@ extern int am_sender;
745 extern int local_server;
747 extern int module_id;
748 -extern int msg_fd_out;
749 extern int allow_8bit_chars;
750 extern int protocol_version;
751 extern int preserve_times;
752 @@ -76,7 +75,6 @@ struct {
753 { RERR_IPC , "error in IPC code" },
754 { RERR_CRASHED , "sibling process crashed" },
755 { RERR_TERMINATED , "sibling process terminated abnormally" },
756 - { RERR_SIGNAL1 , "received SIGUSR1" },
757 { RERR_SIGNAL , "received SIGINT, SIGTERM, or SIGHUP" },
758 { RERR_WAITCHILD , "waitpid() failed" },
759 { RERR_MALLOC , "error allocating core memory buffers" },
760 @@ -232,8 +230,8 @@ void rwrite(enum logcode code, char *buf
761 if (quiet && code == FINFO)
764 - if (am_server && msg_fd_out >= 0) {
765 - /* Pass the message to our sibling. */
766 + if (am_receiver()) {
767 + /* Pass the message to the generator thread. */
768 send_msg((enum msgcode)code, buf, len);
773 @@ -30,7 +30,6 @@ extern int list_only;
775 extern int am_server;
776 extern int am_sender;
777 -extern int am_generator;
778 extern int am_daemon;
779 extern int blocking_io;
780 extern int remove_sent_files;
781 @@ -85,9 +84,20 @@ struct pid_status {
783 static time_t starttime, endtime;
784 static int64 total_read, total_written;
785 +static pthread_t receiver_tid;
787 static void show_malloc_stats(void);
791 + return receiver_tid != 0 && pthread_self() != receiver_tid;
796 + return receiver_tid != 0 && pthread_self() == receiver_tid;
799 /* Works like waitpid(), but if we already harvested the child pid in our
800 * remember_children(), we succeed instead of returning an error. */
801 pid_t wait_process(pid_t pid, int *status_ptr, int flags)
802 @@ -164,7 +174,7 @@ static void handle_stats(int f)
807 + if (am_generator())
811 @@ -617,12 +627,30 @@ static void do_server_sender(int f_in, i
815 +struct thread_args {
816 + struct file_list *flist;
821 +static void *start_receiver_thread(void *arg)
823 + static int exit_code;
824 + struct thread_args *ta = (struct thread_args *)arg;
826 + recv_files(ta->f_in, ta->flist, ta->local_name);
827 + handle_stats(ta->f_in);
831 + exit_code = log_got_error ? RERR_PARTIAL : 0;
835 static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
841 + struct thread_args args;
843 /* The receiving side mustn't obey this, or an existing symlink that
844 * points to an identical file won't be replaced by the referent. */
845 @@ -631,70 +659,16 @@ static int do_recv(int f_in,int f_out,st
846 if (preserve_hard_links)
849 - if (fd_pair(error_pipe) < 0) {
850 - rsyserr(FERROR, errno, "pipe failed in do_recv");
852 + args.flist = flist;
853 + args.local_name = local_name;
854 + if (pthread_create(&receiver_tid, NULL, start_receiver_thread, &args) < 0) {
855 + rsyserr(FERROR, errno, "pthread_create failed in do_recv");
856 exit_cleanup(RERR_IPC);
859 - io_flush(NORMAL_FLUSH);
861 - if ((pid = do_fork()) == -1) {
862 - rsyserr(FERROR, errno, "fork failed in do_recv");
863 - exit_cleanup(RERR_IPC);
867 - close(error_pipe[0]);
871 - /* we can't let two processes write to the socket at one time */
872 - close_multiplexing_out();
874 - /* set place to send errors */
875 - set_msg_fd_out(error_pipe[1]);
877 - recv_files(f_in, flist, local_name);
878 - io_flush(FULL_FLUSH);
879 - handle_stats(f_in);
881 - send_msg(MSG_DONE, "", 0);
882 - io_flush(FULL_FLUSH);
884 - /* Handle any keep-alive packets from the post-processing work
885 - * that the generator does. */
886 - if (protocol_version >= 29) {
887 - kluge_around_eof = -1;
889 - /* This should only get stopped via a USR2 signal. */
890 - while (read_int(f_in) == flist->count
891 - && read_shortint(f_in) == ITEM_IS_NEW) {}
893 - rprintf(FERROR, "Invalid packet at end of run [%s]\n",
895 - exit_cleanup(RERR_PROTOCOL);
898 - /* Finally, we go to sleep until our parent kills us with a
899 - * USR2 signal. We sleep for a short time, as on some OSes
900 - * a signal won't interrupt a sleep! */
906 - close_multiplexing_in();
907 - if (write_batch && !am_server)
908 - stop_write_batch();
910 - close(error_pipe[1]);
914 io_start_buffering_out();
916 - set_msg_fd_in(error_pipe[0]);
918 generate_files(f_out, flist, local_name);
921 @@ -705,10 +679,13 @@ static int do_recv(int f_in,int f_out,st
923 io_flush(FULL_FLUSH);
926 - kill(pid, SIGUSR2);
927 - wait_process_with_flush(pid, &exit_code);
929 + pthread_join(receiver_tid, &value_ptr);
935 + return *(int*)value_ptr;
939 @@ -1078,22 +1055,6 @@ static int start_client(int argc, char *
944 -static RETSIGTYPE sigusr1_handler(UNUSED(int val))
946 - exit_cleanup(RERR_SIGNAL1);
949 -static RETSIGTYPE sigusr2_handler(UNUSED(int val))
955 - _exit(RERR_PARTIAL);
959 RETSIGTYPE remember_children(UNUSED(int val))
962 @@ -1185,8 +1146,6 @@ int main(int argc,char *argv[])
964 sigact.sa_flags = SA_NOCLDSTOP;
966 - SIGACTMASK(SIGUSR1, sigusr1_handler);
967 - SIGACTMASK(SIGUSR2, sigusr2_handler);
968 SIGACTMASK(SIGCHLD, remember_children);
969 #ifdef MAINTAINER_MODE
970 SIGACTMASK(SIGSEGV, rsync_panic_handler);
977 -extern int do_progress;
978 +extern int recv_progress;
979 extern int checksum_seed;
980 extern int append_mode;
982 @@ -132,7 +132,7 @@ static void matched(int f, struct sum_st
986 - if (buf && do_progress)
987 + if (buf && recv_progress)
988 show_progress(last_match, buf->file_size);
991 @@ -332,7 +332,7 @@ void match_sums(int f, struct sum_struct
994 for (j = CHUNK_SIZE; j < s->flength; j += CHUNK_SIZE) {
995 - if (buf && do_progress)
996 + if (buf && recv_progress)
997 show_progress(last_match, buf->file_size);
998 sum_update(map_ptr(buf, last_match, CHUNK_SIZE),
1000 @@ -340,7 +340,7 @@ void match_sums(int f, struct sum_struct
1002 if (last_match < s->flength) {
1003 int32 len = s->flength - last_match;
1004 - if (buf && do_progress)
1005 + if (buf && recv_progress)
1006 show_progress(last_match, buf->file_size);
1007 sum_update(map_ptr(buf, last_match, len), len);
1008 last_match = s->flength;
1011 @@ -74,7 +74,6 @@ int def_compress_level = Z_DEFAULT_COMPR
1015 -int am_generator = 0;
1016 int am_starting_up = 1;
1017 int relative_paths = -1;
1018 int implied_dirs = 1;
1019 @@ -95,6 +94,7 @@ int am_daemon = 0;
1020 int daemon_over_rsh = 0;
1022 int do_progress = 0;
1023 +int recv_progress = 0;
1024 int keep_partial = 0;
1025 int safe_symlinks = 0;
1026 int copy_unsafe_links = 0;
1027 @@ -1299,6 +1299,7 @@ int parse_arguments(int *argc, const cha
1029 if (do_progress && !verbose && !log_before_transfer && !am_server)
1031 + recv_progress = do_progress;
1037 @@ -56,7 +56,7 @@ pid_t piped_child(char **command, int *f
1038 exit_cleanup(RERR_IPC);
1044 rsyserr(FERROR, errno, "fork");
1045 exit_cleanup(RERR_IPC);
1046 @@ -120,7 +120,7 @@ pid_t local_child(int argc, char **argv,
1047 exit_cleanup(RERR_IPC);
1053 rsyserr(FERROR, errno, "fork");
1054 exit_cleanup(RERR_IPC);
1057 @@ -24,7 +24,7 @@ extern int verbose;
1058 extern int do_xfers;
1059 extern int am_daemon;
1060 extern int am_server;
1061 -extern int do_progress;
1062 +extern int recv_progress;
1063 extern int log_before_transfer;
1064 extern int log_format_has_i;
1065 extern int daemon_log_format_has_i;
1066 @@ -153,7 +153,7 @@ static int receive_data(int f_in, char *
1068 sum.flength -= sum.blength - sum.remainder;
1069 for (j = CHUNK_SIZE; j < sum.flength; j += CHUNK_SIZE) {
1071 + if (recv_progress)
1072 show_progress(offset, total_size);
1073 sum_update(map_ptr(mapbuf, offset, CHUNK_SIZE),
1075 @@ -161,7 +161,7 @@ static int receive_data(int f_in, char *
1077 if (offset < sum.flength) {
1078 int32 len = sum.flength - offset;
1080 + if (recv_progress)
1081 show_progress(offset, total_size);
1082 sum_update(map_ptr(mapbuf, offset, len), len);
1083 offset = sum.flength;
1084 @@ -174,7 +174,7 @@ static int receive_data(int f_in, char *
1087 while ((i = recv_token(f_in, &data)) != 0) {
1089 + if (recv_progress)
1090 show_progress(offset, total_size);
1093 @@ -242,7 +242,7 @@ static int receive_data(int f_in, char *
1094 ftruncate(fd, offset);
1098 + if (recv_progress)
1099 end_progress(total_size);
1101 if (fd != -1 && offset > 0 && sparse_end(fd) != 0) {
1102 @@ -293,12 +293,12 @@ static void handle_delayed_updates(struc
1103 "rename failed for %s (from %s)",
1104 full_fname(fname), partialptr);
1106 - if (remove_sent_files
1107 - || (preserve_hard_links
1108 - && file->link_u.links)) {
1109 + if (remove_sent_files) {
1110 SIVAL(numbuf, 0, i);
1111 send_msg(MSG_SUCCESS,numbuf,4);
1113 + if (preserve_hard_links && file->link_u.links)
1114 + push_hlink_num(i);
1115 handle_partial_dir(partialptr, PDIR_DELETE);
1118 @@ -349,11 +349,6 @@ int recv_files(int f_in, struct file_lis
1120 rprintf(FINFO,"recv_files(%d) starting\n",flist->count);
1122 - if (flist->hlink_pool) {
1123 - pool_destroy(flist->hlink_pool);
1124 - flist->hlink_pool = NULL;
1128 delayed_bits = bitbag_create(flist->count);
1130 @@ -374,7 +369,7 @@ int recv_files(int f_in, struct file_lis
1131 rprintf(FINFO, "recv_files phase=%d\n", phase);
1132 if (phase == 2 && delay_updates)
1133 handle_delayed_updates(flist, local_name);
1134 - send_msg(MSG_DONE, "", 0);
1135 + push_redo_num(-2);
1136 if (keep_partial && !partial_dir)
1137 make_backups = 0; /* prevents double backup */
1139 @@ -596,7 +591,7 @@ int recv_files(int f_in, struct file_lis
1140 /* log the transfer */
1141 if (log_before_transfer)
1142 log_item(file, &initial_stats, iflags, NULL);
1143 - else if (!am_server && verbose && do_progress)
1144 + else if (!am_server && verbose && recv_progress)
1145 rprintf(FINFO, "%s\n", fname);
1147 /* recv file data */
1148 @@ -639,11 +634,13 @@ int recv_files(int f_in, struct file_lis
1152 - if (remove_sent_files
1153 - || (preserve_hard_links && file->link_u.links)) {
1154 + if (remove_sent_files) {
1155 + decrement_active_files(i);
1156 SIVAL(numbuf, 0, i);
1157 send_msg(MSG_SUCCESS, numbuf, 4);
1159 + if (preserve_hard_links && file->link_u.links)
1160 + push_hlink_num(i);
1161 } else if (!recv_ok) {
1162 int msgtype = phase || read_batch ? FERROR : FINFO;
1163 if (msgtype == FERROR || verbose) {
1164 @@ -666,8 +663,8 @@ int recv_files(int f_in, struct file_lis
1165 errstr, fname, keptstr, redostr);
1168 - SIVAL(numbuf, 0, i);
1169 - send_msg(MSG_REDO, numbuf, 4);
1170 + decrement_active_files(i);
1177 @@ -40,7 +40,6 @@ extern int omit_dir_times;
1179 extern int am_server;
1180 extern int am_sender;
1181 -extern int am_generator;
1182 extern int am_starting_up;
1183 extern int allow_8bit_chars;
1184 extern int preserve_uid;
1185 @@ -303,5 +302,5 @@ const char *who_am_i(void)
1188 return am_server ? "server" : "client";
1189 - return am_sender ? "sender" : am_generator ? "generator" : "receiver";
1190 + return am_sender ? "sender" : am_generator() ? "generator" : "receiver";
1194 @@ -166,10 +166,8 @@ enum msgcode {
1195 MSG_DATA=0, /* raw data on the multiplexed stream */
1196 MSG_ERROR=FERROR, MSG_INFO=FINFO, /* remote logging */
1197 MSG_LOG=FLOG, MSG_SOCKERR=FSOCKERR, /* sibling logging */
1198 - MSG_REDO=9, /* reprocess indicated flist index */
1199 MSG_SUCCESS=100,/* successfully updated indicated flist index */
1200 MSG_DELETED=101,/* successfully deleted a file on receiving side */
1201 - MSG_DONE=86 /* current phase is done */
1204 #include "errcode.h"
1205 @@ -320,6 +318,7 @@ enum msgcode {
1209 +#include <pthread.h>
1211 #include "lib/pool_alloc.h"
1215 @@ -420,49 +420,6 @@ int robust_rename(char *from, char *to,
1219 -static pid_t all_pids[10];
1220 -static int num_pids;
1222 -/** Fork and record the pid of the child. **/
1223 -pid_t do_fork(void)
1225 - pid_t newpid = fork();
1227 - if (newpid != 0 && newpid != -1) {
1228 - all_pids[num_pids++] = newpid;
1234 - * Kill all children.
1236 - * @todo It would be kind of nice to make sure that they are actually
1237 - * all our children before we kill them, because their pids may have
1238 - * been recycled by some other process. Perhaps when we wait for a
1239 - * child, we should remove it from this array. Alternatively we could
1240 - * perhaps use process groups, but I think that would not work on
1241 - * ancient Unix versions that don't support them.
1243 -void kill_all(int sig)
1247 - for (i = 0; i < num_pids; i++) {
1248 - /* Let's just be a little careful where we
1249 - * point that gun, hey? See kill(2) for the
1250 - * magic caused by negative values. */
1251 - pid_t p = all_pids[i];
1253 - if (p == getpid())
1262 /** Turn a user name into a uid */
1263 int name_to_uid(char *name, uid_t *uid)