Matt McCutchen's Web Site
/
rsync
/
rsync-patches.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
bb81ee9
)
Fixed a failing hunk.
author
Wayne Davison
<wayned@samba.org>
Sun, 5 Feb 2006 05:08:54 +0000
(
05:08
+0000)
committer
Wayne Davison
<wayned@samba.org>
Sun, 5 Feb 2006 05:08:54 +0000
(
05:08
+0000)
threaded-receiver.diff
patch
|
blob
|
blame
|
history
diff --git
a/threaded-receiver.diff
b/threaded-receiver.diff
index
8a303de
..
a2ededd
100644
(file)
--- a/
threaded-receiver.diff
+++ b/
threaded-receiver.diff
@@
-31,13
+31,13
@@
Be sure to run "make proto" before running "make".
CC=@CC@
CFLAGS=@CFLAGS@
CPPFLAGS=@CPPFLAGS@
CC=@CC@
CFLAGS=@CFLAGS@
CPPFLAGS=@CPPFLAGS@
---- orig/cleanup.c 2006-02-0
2 02:41:08
-+++ cleanup.c 2006-02-0
2 02:43:3
4
+--- orig/cleanup.c 2006-02-0
3 20:00:35
++++ cleanup.c 2006-02-0
3 20:07:4
4
@@ -26,10 +26,6 @@ extern int keep_partial;
extern int log_got_error;
extern char *partial_dir;
@@ -26,10 +26,6 @@ extern int keep_partial;
extern int log_got_error;
extern char *partial_dir;
--#if
defined HAVE_SIGACTION && defined HAVE_SIGPROCMASK
+-#if
def HAVE_SIGACTION
-static struct sigaction sigact;
-#endif
-
-static struct sigaction sigact;
-#endif
-
@@
-277,7
+277,7
@@
Be sure to run "make proto" before running "make".
}
do_progress = save_do_progress;
}
do_progress = save_do_progress;
---- orig/io.c 2006-02-0
1 19:37:05
+--- orig/io.c 2006-02-0
4 21:53:39
+++ io.c 2006-02-01 19:50:09
@@ -47,7 +47,6 @@ extern int allowed_lull;
extern int am_server;
+++ io.c 2006-02-01 19:50:09
@@ -47,7 +47,6 @@ extern int allowed_lull;
extern int am_server;
@@
-637,7
+637,7
@@
Be sure to run "make proto" before running "make".
if (io_filesfrom_f_out >= 0) {
if (io_filesfrom_buflen) {
if (FD_ISSET(io_filesfrom_f_out, &w_fds)) {
if (io_filesfrom_f_out >= 0) {
if (io_filesfrom_buflen) {
if (FD_ISSET(io_filesfrom_f_out, &w_fds)) {
-@@ -83
1,6 +787
,8 @@ static void readfd(int fd, char *buffer,
+@@ -83
2,6 +788
,8 @@ static void readfd(int fd, char *buffer,
}
if (fd == write_batch_monitor_in) {
}
if (fd == write_batch_monitor_in) {
@@
-646,7
+646,7
@@
Be sure to run "make proto" before running "make".
if ((size_t)write(batch_fd, buffer, total) != total)
exit_cleanup(RERR_FILEIO);
}
if ((size_t)write(batch_fd, buffer, total) != total)
exit_cleanup(RERR_FILEIO);
}
-@@ -108
6,7 +1044
,6 @@ static void writefd_unbuffered(int fd,ch
+@@ -108
7,7 +1045
,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);
* to grab any messages they sent before they died. */
while (fd == sock_f_out && io_multiplexing_in) {
set_io_timeout(30);
@@
-654,7
+654,7
@@
Be sure to run "make proto" before running "make".
readfd_unbuffered(sock_f_in, io_filesfrom_buf,
sizeof io_filesfrom_buf);
}
readfd_unbuffered(sock_f_in, io_filesfrom_buf,
sizeof io_filesfrom_buf);
}
-@@ -109
6,7 +1053
,7 @@ static void writefd_unbuffered(int fd,ch
+@@ -109
7,7 +1054
,7 @@ static void writefd_unbuffered(int fd,ch
total += cnt;
if (fd == sock_f_out) {
total += cnt;
if (fd == sock_f_out) {
@@
-663,7
+663,7
@@
Be sure to run "make proto" before running "make".
last_io_out = time(NULL);
sleep_for_bwlimit(cnt);
}
last_io_out = time(NULL);
sleep_for_bwlimit(cnt);
}
-@@ -112
0,7 +1077
,7 @@ static void mplex_write(enum msgcode cod
+@@ -112
1,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). */
* 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). */
@@
-672,7
+672,7
@@
Be sure to run "make proto" before running "make".
contiguous_write_len = len + 4;
if (n > sizeof buffer - 4)
contiguous_write_len = len + 4;
if (n > sizeof buffer - 4)
-@@ -113
5,31 +1092
,29 @@ static void mplex_write(enum msgcode cod
+@@ -113
7,31 +1094
,29 @@ static void mplex_write(enum msgcode cod
if (len)
writefd_unbuffered(sock_f_out, buf, len);
if (len)
writefd_unbuffered(sock_f_out, buf, len);
@@
-716,7
+716,7
@@
Be sure to run "make proto" before running "make".
if (fd == sock_f_out)
stats.total_written += len;
if (fd == sock_f_out)
stats.total_written += len;
-@@ -137
2,9 +1327
,3 @@ void start_write_batch(int fd)
+@@ -137
4,9 +1329
,3 @@ void start_write_batch(int fd)
else
write_batch_monitor_in = fd;
}
else
write_batch_monitor_in = fd;
}
@@
-726,9
+726,9
@@
Be sure to run "make proto" before running "make".
- write_batch_monitor_out = -1;
- write_batch_monitor_in = -1;
-}
- write_batch_monitor_out = -1;
- write_batch_monitor_in = -1;
-}
---- orig/log.c 2006-02-0
1 19:37:05
+--- orig/log.c 2006-02-0
5 04:53:34
+++ log.c 2005-12-16 23:49:57
+++ log.c 2005-12-16 23:49:57
-@@ -3
5,7 +35
,6 @@ extern int am_sender;
+@@ -3
8,7 +38
,6 @@ extern int am_sender;
extern int local_server;
extern int quiet;
extern int module_id;
extern int local_server;
extern int quiet;
extern int module_id;
@@
-736,7
+736,7
@@
Be sure to run "make proto" before running "make".
extern int protocol_version;
extern int preserve_times;
extern int log_format_has_i;
extern int protocol_version;
extern int preserve_times;
extern int log_format_has_i;
-@@ -
68,7 +67
,6 @@ struct {
+@@ -
74,7 +73
,6 @@ struct {
{ RERR_IPC , "error in IPC code" },
{ RERR_CRASHED , "sibling process crashed" },
{ RERR_TERMINATED , "sibling process terminated abnormally" },
{ RERR_IPC , "error in IPC code" },
{ RERR_CRASHED , "sibling process crashed" },
{ RERR_TERMINATED , "sibling process terminated abnormally" },
@@
-744,7
+744,7
@@
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" },
{ RERR_SIGNAL , "received SIGINT, SIGTERM, or SIGHUP" },
{ RERR_WAITCHILD , "waitpid() failed" },
{ RERR_MALLOC , "error allocating core memory buffers" },
-@@ -2
24,8 +22
2,8 @@ void rwrite(enum logcode code, char *buf
+@@ -2
34,8 +23
2,8 @@ void rwrite(enum logcode code, char *buf
if (quiet && code == FINFO)
return;
if (quiet && code == FINFO)
return;
@@
-755,7
+755,7
@@
Be sure to run "make proto" before running "make".
send_msg((enum msgcode)code, buf, len);
return;
}
send_msg((enum msgcode)code, buf, len);
return;
}
---- orig/main.c 2006-02-0
2 02:41:09
+--- orig/main.c 2006-02-0
5 04:53:34
+++ main.c 2006-02-02 02:43:44
@@ -30,7 +30,6 @@ extern int list_only;
extern int am_root;
+++ main.c 2006-02-02 02:43:44
@@ -30,7 +30,6 @@ extern int list_only;
extern int am_root;
@@
-765,7
+765,7
@@
Be sure to run "make proto" before running "make".
extern int am_daemon;
extern int blocking_io;
extern int remove_sent_files;
extern int am_daemon;
extern int blocking_io;
extern int remove_sent_files;
-@@ -8
0,9 +79
,20 @@ struct pid_status {
+@@ -8
4,9 +83
,20 @@ struct pid_status {
static time_t starttime, endtime;
static int64 total_read, total_written;
static time_t starttime, endtime;
static int64 total_read, total_written;
@@
-786,7
+786,7
@@
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. */
pid_t wait_process(pid_t pid, int *status_ptr, int flags)
/* Works like waitpid(), but if we already harvested the child pid in our
* sigchld_handler(), we succeed instead of returning an error. */
pid_t wait_process(pid_t pid, int *status_ptr, int flags)
-@@ -1
59,7 +169
,7 @@ static void handle_stats(int f)
+@@ -1
63,7 +173
,7 @@ static void handle_stats(int f)
show_flist_stats();
}
show_flist_stats();
}
@@
-795,7
+795,7
@@
Be sure to run "make proto" before running "make".
return;
if (am_daemon) {
return;
if (am_daemon) {
-@@ -61
4,12 +624
,30 @@ static void do_server_sender(int f_in, i
+@@ -61
8,12 +628
,30 @@ static void do_server_sender(int f_in, i
exit_cleanup(0);
}
exit_cleanup(0);
}
@@
-829,7
+829,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. */
/* The receiving side mustn't obey this, or an existing symlink that
* points to an identical file won't be replaced by the referent. */
-@@ -6
28,70 +656
,16 @@ static int do_recv(int f_in,int f_out,st
+@@ -6
32,70 +660
,16 @@ static int do_recv(int f_in,int f_out,st
if (preserve_hard_links)
init_hard_links();
if (preserve_hard_links)
init_hard_links();
@@
-905,7
+905,7
@@
Be sure to run "make proto" before running "make".
generate_files(f_out, flist, local_name);
handle_stats(-1);
generate_files(f_out, flist, local_name);
handle_stats(-1);
-@@ -70
2,10 +676
,13 @@ static int do_recv(int f_in,int f_out,st
+@@ -70
6,10 +680
,13 @@ static int do_recv(int f_in,int f_out,st
}
io_flush(FULL_FLUSH);
}
io_flush(FULL_FLUSH);
@@
-923,7
+923,7
@@
Be sure to run "make proto" before running "make".
}
}
-@@ -10
67,22 +104
4,6 @@ static int start_client(int argc, char *
+@@ -10
77,22 +105
4,6 @@ static int start_client(int argc, char *
return ret;
}
return ret;
}
@@
-946,8
+946,8
@@
Be sure to run "make proto" before running "make".
static RETSIGTYPE sigchld_handler(UNUSED(int val))
{
#ifdef WNOHANG
static RETSIGTYPE sigchld_handler(UNUSED(int val))
{
#ifdef WNOHANG
-@@ -11
72,8 +1133
,6 @@ int main(int argc,char *argv[])
- sigemptyset(&sigmask);
+@@ -11
84,8 +1145
,6 @@ int main(int argc,char *argv[])
+ # endif
sigact.sa_flags = SA_NOCLDSTOP;
#endif
- SIGACTMASK(SIGUSR1, sigusr1_handler);
sigact.sa_flags = SA_NOCLDSTOP;
#endif
- SIGACTMASK(SIGUSR1, sigusr1_handler);
@@
-993,7
+993,7
@@
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;
show_progress(last_match, buf->file_size);
sum_update(map_ptr(buf, last_match, len), len);
last_match = s->flength;
---- orig/options.c 2006-0
1-31 03:11:30
+--- orig/options.c 2006-0
2-03 23:51:57
+++ options.c 2005-12-08 23:17:09
@@ -73,7 +73,6 @@ int def_compress_level = Z_DEFAULT_COMPR
int am_root = 0;
+++ options.c 2005-12-08 23:17:09
@@ -73,7 +73,6 @@ int def_compress_level = Z_DEFAULT_COMPR
int am_root = 0;
@@
-1160,9
+1160,9
@@
Be sure to run "make proto" before running "make".
}
}
make_backups = save_make_backups;
}
}
make_backups = save_make_backups;
---- orig/rsync.c 2006-02-0
2 02:41:09
+--- orig/rsync.c 2006-02-0
5 04:53:34
+++ rsync.c 2005-12-08 23:17:10
+++ rsync.c 2005-12-08 23:17:10
-@@ -
32,7 +32
,6 @@ extern int orig_umask;
+@@ -
41,7 +41
,6 @@ extern int orig_umask;
extern int am_root;
extern int am_server;
extern int am_sender;
extern int am_root;
extern int am_server;
extern int am_sender;
@@
-1170,14
+1170,14
@@
Be sure to run "make proto" before running "make".
extern int am_starting_up;
extern int preserve_uid;
extern int preserve_gid;
extern int am_starting_up;
extern int preserve_uid;
extern int preserve_gid;
-@@ -2
47,5 +246
,5 @@ const char *who_am_i(void)
+@@ -2
88,5 +287
,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";
}
{
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-0
2 02:41:09
+--- orig/rsync.h 2006-02-0
3 20:00:36
+++ rsync.h 2006-01-17 02:46:03
@@ -166,10 +166,8 @@ enum msgcode {
MSG_DATA=0, /* raw data on the multiplexed stream */
+++ rsync.h 2006-01-17 02:46:03
@@ -166,10 +166,8 @@ enum msgcode {
MSG_DATA=0, /* raw data on the multiplexed stream */
@@
-1198,7
+1198,7
@@
Be sure to run "make proto" before running "make".
#include "lib/pool_alloc.h"
#include "lib/pool_alloc.h"
---- orig/util.c 2006-0
1-30 07:18:28
+--- orig/util.c 2006-0
2-03 20:00:36
+++ util.c 2005-12-08 23:17:10
@@ -413,51 +413,6 @@ int robust_rename(char *from, char *to,
return -1;
+++ util.c 2005-12-08 23:17:10
@@ -413,51 +413,6 @@ int robust_rename(char *from, char *to,
return -1;