Ma/mscp
1
0
Fork 0
mirror of https://github.com/upa/mscp.git synced 2026-05-22 13:47:30 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

write total transferred bytes and number of files

Browse Source 
at the end of output when serverity is notice.
This commit is contained in:
Ryo Nakamura
2023-09-13 14:35:44 +09:00
parent cfbadebe6d
commit 139ba12f1a
2 changed files with 46 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/main.c
View File

@@ -536,17 +536,42 @@ struct xfer_stat {
}; };
struct xfer_stat x; struct xfer_stat x;
void print_stat_thread_cleanup(void *arg) void print_stat(bool final)
{ {
struct pollfd pfd = { .fd = msg_fd, .events = POLLIN };
struct mscp_stats s; struct mscp_stats s;
char buf[8192];
int timeout;
if (poll(&pfd, 1, !final ? 100 : 0) < 0) {
fprintf(stderr, "poll: %s\n", strerror(errno));
return;
}
if (pfd.revents & POLLIN) {
memset(buf, 0, sizeof(buf));
if (read(msg_fd, buf, sizeof(buf)) < 0) {
fprintf(stderr, "read: %s\n", strerror(errno));
return;
}
print_cli("\r\033[K" "%s", buf);
}
gettimeofday(&x.after, NULL); gettimeofday(&x.after, NULL);
mscp_get_stats(m, &s); if (calculate_timedelta(&x.before, &x.after) > 1 || final) {
x.total = s.total; mscp_get_stats(m, &s);
x.done = s.done; x.total = s.total;
x.done = s.done;
print_progress(!final ? &x.before : &x.start, &x.after,
x.total, !final ? x.last : 0, x.done, final);
x.before = x.after;
x.last = x.done;
}
}
/* print progress from the beginning */ void print_stat_thread_cleanup(void *arg)
print_progress(&x.start, &x.after, x.total, 0, x.done, true); {
print_stat(true);
print_cli("\n"); /* final output */ print_cli("\n"); /* final output */
} }
@@ -565,31 +590,7 @@ void *print_stat_thread(void *arg)
pthread_cleanup_push(print_stat_thread_cleanup, NULL); pthread_cleanup_push(print_stat_thread_cleanup, NULL);
while (true) { while (true) {
if (poll(&pfd, 1, 100) < 0) { print_stat(false);
fprintf(stderr, "poll: %s\n", strerror(errno));
return NULL;
}
if (pfd.revents & POLLIN) {
memset(buf, 0, sizeof(buf));
if (read(msg_fd, buf, sizeof(buf)) < 0) {
fprintf(stderr, "read: %s\n", strerror(errno));
return NULL;
}
print_cli("\r\033[K" "%s", buf);
}
gettimeofday(&x.after, NULL);
if (calculate_timedelta(&x.before, &x.after) > 1) {
mscp_get_stats(m, &s);
x.total = s.total;
x.done = s.done;
print_progress(&x.before, &x.after, x.total, x.last, x.done,
false);
x.before = x.after;
x.last = x.done;
}
} }
pthread_cleanup_pop(1); pthread_cleanup_pop(1);

14
src/mscp.c
View File

@@ -554,6 +554,8 @@ int mscp_start(struct mscp *m)
int mscp_join(struct mscp *m) int mscp_join(struct mscp *m)
{ {
struct mscp_thread *t; struct mscp_thread *t;
struct path *p;
size_t done = 0, nr_copied = 0, nr_tobe_copied = 0;
int n, ret = 0; int n, ret = 0;
/* waiting for scan thread joins... */ /* waiting for scan thread joins... */
@@ -563,6 +565,7 @@ int mscp_join(struct mscp *m)
RWLOCK_READ_ACQUIRE(&m->thread_rwlock); RWLOCK_READ_ACQUIRE(&m->thread_rwlock);
list_for_each_entry(t, &m->thread_list, list) { list_for_each_entry(t, &m->thread_list, list) {
pthread_join(t->tid, NULL); pthread_join(t->tid, NULL);
done += t->done;
if (t->ret < 0) if (t->ret < 0)
ret = t->ret; ret = t->ret;
if (t->sftp) { if (t->sftp) {
@@ -577,6 +580,17 @@ int mscp_join(struct mscp *m)
m->first = NULL; m->first = NULL;
} }
/* count up number of transferred files */
list_for_each_entry(p, &m->path_list, list) {
nr_tobe_copied++;
if (p->state == FILE_STATE_DONE) {
nr_copied++;
}
}
mpr_notice(m->msg_fp, "%lu/%lu bytes copied for %lu/%lu files\n",
done, m->total_bytes, nr_copied, nr_tobe_copied);
return ret; return ret;
} }