diff options
author | Wayne Davison <wayned@samba.org> | 2010-01-02 10:51:09 -0800 |
---|---|---|
committer | Wayne Davison <wayned@samba.org> | 2010-01-02 10:58:39 -0800 |
commit | 05c36015f79d0d2975f15b08e31ea72825700f11 (patch) | |
tree | 926a7977b092a1b6b30f46edcc7a323df69cf5ce /main.c | |
parent | e34f43495c0f0ab0e7b01983238f5d6e8988e30b (diff) | |
download | rsync-05c36015f79d0d2975f15b08e31ea72825700f11.tar.gz |
More --timeout improvements, especially for the receiving side:
- The receiver now sends keep-alive messages to the generator
when it is actively doing work and hasn't sent anything
recently. This ensures that the generator won't timeout
if the receiver is working hard.
- The perform_io() code has improved keep-alive participation.
- Allow the sender to send some keep-alive messages, which
ensures that if it is in a lull, it can probe the socket.
Diffstat (limited to 'main.c')
-rw-r--r-- | main.c | 5 |
1 files changed, 0 insertions, 5 deletions
@@ -73,7 +73,6 @@ extern int send_msgs_to_gen; extern pid_t cleanup_child_pid; extern size_t bwlimit_writemax; extern unsigned int module_dirlen; -extern BOOL we_send_keepalive_messages; extern BOOL flist_receiving_enabled; extern BOOL shutting_down; extern struct stats stats; @@ -765,8 +764,6 @@ static void do_server_sender(int f_in, int f_out, int argc, char *argv[]) struct file_list *flist; char *dir = argv[0]; - we_send_keepalive_messages = io_timeout != 0 && protocol_version < 31; - if (DEBUG_GTE(SEND, 1)) { rprintf(FINFO, "server_sender starting pid=%ld\n", (long)getpid()); @@ -907,7 +904,6 @@ static int do_recv(int f_in, int f_out, char *local_name) } am_generator = 1; - we_send_keepalive_messages = io_timeout != 0; flist_receiving_enabled = True; io_end_multiplex_in(MPLX_SWITCHING); @@ -1112,7 +1108,6 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[]) if (am_sender) { keep_dirlinks = 0; /* Must be disabled on the sender. */ - we_send_keepalive_messages = io_timeout != 0 && protocol_version < 31; if (always_checksum && (log_format_has(stdout_format, 'C') |