size_t n, total = 0;
fd_set w_fds, r_fds;
int maxfd, count, cnt, using_r_fds;
+ int defer_save = defer_forwarding_messages;
struct timeval tv;
no_flush++;
if (!FD_ISSET(fd, &w_fds))
continue;
- if (msg2sndr.head && !defer_forwarding_messages) {
- struct msg_list_item *m = msg2sndr.head;
- if (!(msg2sndr.head = m->next))
- msg2sndr.tail = NULL;
- defer_forwarding_messages = 1;
- io_multiplex_write(IVAL(m->buf,0), m->buf+4, m->len-4);
- defer_forwarding_messages = 0;
- free(m);
- continue;
- }
-
n = len - total;
if (bwlimit_writemax && n > bwlimit_writemax)
n = bwlimit_writemax;
sleep_for_bwlimit(cnt);
}
}
- defer_forwarding_messages = 0;
+ defer_forwarding_messages = defer_save;
no_flush--;
}
+static void msg2sndr_flush(void)
+{
+ if (defer_forwarding_messages)
+ 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.
len -= n;
buf += n;
- if (len)
+ if (len) {
+ defer_forwarding_messages = 1;
writefd_unbuffered(sock_f_out, buf, len);
+ defer_forwarding_messages = 0;
+ msg2sndr_flush();
+ }
}
void io_flush(int flush_it_all)
{
msg2genr_flush(flush_it_all);
+ msg2sndr_flush();
if (!iobuf_out_cnt || no_flush)
return;