Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
this is a large commit which adds io multiplexing, thus giving error
[rsync/rsync.git]
/
main.c
diff --git
a/main.c
b/main.c
index
e9a0039
..
5a5d515
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-32,6
+32,14
@@
static void report(int f)
time_t t = time(NULL);
extern int am_server;
extern int am_sender;
time_t t = time(NULL);
extern int am_server;
extern int am_sender;
+ extern int am_daemon;
+
+ if (am_daemon) {
+ syslog(LOG_INFO,"wrote %.0f bytes read %.0f bytes total size %.0f\n",
+ (double)write_total(),(double)read_total(),
+ (double)total_size);
+ if (f == -1 || !am_sender) return;
+ }
if (!verbose) return;
if (!verbose) return;
@@
-48,8
+56,8
@@
static void report(int f)
out = write_total();
tsize = total_size;
} else {
out = write_total();
tsize = total_size;
} else {
- in = read_longint(f);
out = read_longint(f);
out = read_longint(f);
+ in = read_longint(f);
tsize = read_longint(f);
}
tsize = read_longint(f);
}
@@
-183,7
+191,6
@@
static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
struct file_list *flist;
char *dir = argv[0];
extern int relative_paths;
struct file_list *flist;
char *dir = argv[0];
extern int relative_paths;
- extern int am_daemon;
extern int recurse;
if (verbose > 2)
extern int recurse;
if (verbose > 2)
@@
-204,61
+211,67
@@
static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
argv[i] += l+1;
}
argv[i] += l+1;
}
- if (am_daemon) {
- extern int module_id;
- char *name = lp_name(module_id);
- int l = strlen(name);
- for (i=0;i<argc;i++) {
- if (strncmp(argv[i], name, l) == 0) {
- argv[i] += l;
- if (!*argv[i]) argv[i] = ".";
- }
- }
- }
-
if (argc == 0 && recurse) {
argc=1;
argv--;
argv[0] = ".";
}
if (argc == 0 && recurse) {
argc=1;
argv--;
argv[0] = ".";
}
- rprintf(FINFO,"sending file list\n");
-
flist = send_file_list(f_out,argc,argv);
flist = send_file_list(f_out,argc,argv);
+ if (!flist || flist->count == 0) {
+ exit_cleanup(0);
+ }
+
send_files(flist,f_out,f_in);
report(f_out);
send_files(flist,f_out,f_in);
report(f_out);
+ io_flush();
exit_cleanup(0);
}
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
{
exit_cleanup(0);
}
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
{
- int pid;
- int status=0;
- int recv_pipe[2];
- extern int preserve_hard_links;
+ int pid;
+ int status=0;
+ int recv_pipe[2];
+ extern int preserve_hard_links;
+ extern int am_server;
- if (preserve_hard_links)
- init_hard_links(flist);
+
if (preserve_hard_links)
+
init_hard_links(flist);
- if (pipe(recv_pipe) < 0) {
- rprintf(FERROR,"pipe failed in do_recv\n");
-
exit
(1);
- }
+
if (pipe(recv_pipe) < 0) {
+
rprintf(FERROR,"pipe failed in do_recv\n");
+
exit_cleanup
(1);
+
}
+ io_flush();
+
+ if ((pid=do_fork()) == 0) {
+ close(recv_pipe[1]);
+ io_close_input(f_in);
+ if (f_in != f_out) close(f_in);
+ generate_files(f_out,flist,local_name,recv_pipe[0]);
+
+ io_flush();
+ _exit(0);
+ }
- if ((pid=do_fork()) == 0) {
- recv_files(f_in,flist,local_name,recv_pipe[1]);
- if (verbose > 2)
- rprintf(FINFO,"receiver read %ld\n",(long)read_total());
- exit_cleanup(0);
- }
- generate_files(f_out,flist,local_name,recv_pipe[0]);
+ close(recv_pipe[0]);
+ if (f_in != f_out) close(f_out);
- waitpid(pid, &status, 0);
+ recv_files(f_in,flist,local_name,recv_pipe[1]);
+ if (!am_server)
+ report(f_in);
- return status;
+ if (verbose > 3)
+ rprintf(FINFO,"do_recv waiting on %d\n",pid);
+
+ io_flush();
+ waitpid(pid, &status, 0);
+
+ return status;
}
}
@@
-274,18
+287,6
@@
static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
if (verbose > 2)
rprintf(FINFO,"server_recv(%d) starting pid=%d\n",argc,(int)getpid());
if (verbose > 2)
rprintf(FINFO,"server_recv(%d) starting pid=%d\n",argc,(int)getpid());
- if (am_daemon) {
- extern int module_id;
- char *name = lp_name(module_id);
- int i, l = strlen(name);
- for (i=0;i<argc;i++) {
- if (strncmp(argv[i], name, l) == 0) {
- argv[i] += l;
- if (!*argv[i]) argv[i] = ".";
- }
- }
- }
-
if (argc > 0) {
dir = argv[0];
argc--;
if (argc > 0) {
dir = argv[0];
argc--;
@@
-302,7
+303,7
@@
static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
flist = recv_file_list(f_in);
if (!flist || flist->count == 0) {
flist = recv_file_list(f_in);
if (!flist || flist->count == 0) {
- rprintf(FERROR,"nothing to do\n");
+ rprintf(FERROR,"
server_recv:
nothing to do\n");
exit_cleanup(1);
}
exit_cleanup(1);
}
@@
-359,7
+360,8
@@
int client_run(int f_in, int f_out, int pid, int argc, char *argv[])
send_files(flist,f_out,f_in);
if (pid != -1) {
if (verbose > 3)
send_files(flist,f_out,f_in);
if (pid != -1) {
if (verbose > 3)
- rprintf(FINFO,"waiting on %d\n",pid);
+ rprintf(FINFO,"client_run waiting on %d\n",pid);
+ io_flush();
waitpid(pid, &status, 0);
}
report(-1);
waitpid(pid, &status, 0);
}
report(-1);
@@
-370,7
+372,7
@@
int client_run(int f_in, int f_out, int pid, int argc, char *argv[])
flist = recv_file_list(f_in);
if (!flist || flist->count == 0) {
flist = recv_file_list(f_in);
if (!flist || flist->count == 0) {
- rprintf(FINFO,"nothing to do\n");
+ rprintf(FINFO,"
client:
nothing to do\n");
exit_cleanup(0);
}
exit_cleanup(0);
}
@@
-378,9
+380,10
@@
int client_run(int f_in, int f_out, int pid, int argc, char *argv[])
status2 = do_recv(f_in,f_out,flist,local_name);
status2 = do_recv(f_in,f_out,flist,local_name);
- report(f_in);
-
if (pid != -1) {
if (pid != -1) {
+ if (verbose > 3)
+ rprintf(FINFO,"client_run2 waiting on %d\n",pid);
+ io_flush();
waitpid(pid, &status, 0);
}
waitpid(pid, &status, 0);
}
@@
-496,6
+499,11
@@
int main(int argc,char *argv[])
starttime = time(NULL);
am_root = (getuid() == 0);
starttime = time(NULL);
am_root = (getuid() == 0);
+ if (argc < 2) {
+ usage(FERROR);
+ exit_cleanup(1);
+ }
+
/* we set a 0 umask so that correct file permissions can be
carried across */
orig_umask = (int)umask(0);
/* we set a 0 umask so that correct file permissions can be
carried across */
orig_umask = (int)umask(0);
@@
-515,6
+523,11
@@
int main(int argc,char *argv[])
return daemon_main();
}
return daemon_main();
}
+ if (argc < 1) {
+ usage(FERROR);
+ exit_cleanup(1);
+ }
+
if (dry_run)
verbose = MAX(verbose,1);
if (dry_run)
verbose = MAX(verbose,1);