summaryrefslogtreecommitdiff
path: root/src/mscp.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mscp.c')
-rw-r--r--src/mscp.c238
1 files changed, 27 insertions, 211 deletions
diff --git a/src/mscp.c b/src/mscp.c
index 9fb0e27..49af7f4 100644
--- a/src/mscp.c
+++ b/src/mscp.c
@@ -1,11 +1,11 @@
#include <stdbool.h>
#include <unistd.h>
-#include <signal.h>
#include <sys/time.h>
#include <sys/ioctl.h>
#include <math.h>
#include <pthread.h>
+
#include <list.h>
#include <util.h>
#include <ssh.h>
@@ -31,12 +31,10 @@ struct mscp {
struct list_head chunk_list;
lock chunk_lock;
+ size_t total_bytes; /* total bytes to be transferred */
struct mscp_thread *threads;
};
-__thread struct mscp *m_local; /* mscp instance for this
- * process/thread. it is used for
- * sighandler SIGINT and print stats */
struct mscp_thread {
struct mscp *m;
@@ -286,6 +284,7 @@ int mscp_prepare(struct mscp *m)
sftp_session src_sftp = NULL, dst_sftp = NULL;
bool src_path_is_dir, dst_path_is_dir, dst_path_should_dir = false;
struct list_head tmp;
+ struct path *p;
struct src *s;
mstat ss, ds;
@@ -341,19 +340,18 @@ int mscp_prepare(struct mscp *m)
m->opts->max_chunk_sz, m->opts->min_chunk_sz) < 0)
return -1;
+ /* save total bytes to be transferred */
+ m->total_bytes = 0;
+ list_for_each_entry(p, &m->path_list, list) {
+ m->total_bytes += p->size;
+ }
+
return 0;
}
-
-static void *mscp_copy_thread(void *arg);
-static int mscp_stat_init();
-static void mscp_stat_final();
-
-static void stop_copy_threads(int sig)
+void mscp_stop(struct mscp *m)
{
- struct mscp *m = m_local;
- int n;
-
+ int n;
pr("stopping...\n");
for (n = 0; n < m->opts->nr_threads; n++) {
if (m->threads[n].tid && !m->threads[n].finished)
@@ -361,16 +359,13 @@ static void stop_copy_threads(int sig)
}
}
+
+static void *mscp_copy_thread(void *arg);
+
int mscp_start(struct mscp *m)
{
int n, ret;
- /* set this mscp instance to thread local storage. after
- * spawning threads, this thread waits for joining copy theads
- * and print stats by SIGALRM.
- */
- m_local = m;
-
if ((n = list_count(&m->chunk_list)) < m->opts->nr_threads) {
pprint1("we have only %d chunk(s). "
"set number of connections to %d\n", n, n);
@@ -400,31 +395,18 @@ int mscp_start(struct mscp *m)
}
}
- /* init mscp stat for printing progress bar */
- if (mscp_stat_init() < 0) {
- ret = 1;
- goto out;
- }
-
/* spawn copy threads */
for (n = 0; n < m->opts->nr_threads; n++) {
struct mscp_thread *t = &m->threads[n];
ret = pthread_create(&t->tid, NULL, mscp_copy_thread, t);
if (ret < 0) {
pr_err("pthread_create error: %d\n", ret);
- stop_copy_threads(0);
+ mscp_stop(m);
ret = 1;
goto join_out;
}
}
- /* register SIGINT to stop threads */
- if (signal(SIGINT, stop_copy_threads) == SIG_ERR) {
- pr_err("cannot set signal: %s\n", strerrno());
- ret = 1;
- goto out;
- }
-
join_out:
/* waiting for threads join... */
for (n = 0; n < m->opts->nr_threads; n++) {
@@ -435,18 +417,19 @@ join_out:
}
}
- /* print final result */
- mscp_stat_final();
-
out:
- if (m->first)
+ if (m->first) {
ssh_sftp_close(m->first);
+ m->first = NULL;
+ }
if (m->threads) {
for (n = 0; n < m->opts->nr_threads; n++) {
struct mscp_thread *t = &m->threads[n];
- if (t->sftp)
+ if (t->sftp) {
ssh_sftp_close(t->sftp);
+ t->sftp = NULL;
+ }
}
}
@@ -591,178 +574,11 @@ void mscp_free(struct mscp *m)
free(m);
}
-/* progress bar-related functions */
-
-double calculate_timedelta(struct timeval *b, struct timeval *a)
-{
- double sec, usec;
-
- if (a->tv_usec < b->tv_usec) {
- a->tv_usec += 1000000;
- a->tv_sec--;
- }
-
- sec = a->tv_sec - b->tv_sec;
- usec = a->tv_usec - b->tv_usec;
- sec += usec / 1000000;
-
- return sec;
-}
-
-
-static double calculate_bps(size_t diff, struct timeval *b, struct timeval *a)
-{
- return (double)diff / calculate_timedelta(b, a);
-}
-
-static char *calculate_eta(size_t remain, size_t diff,
- struct timeval *b, struct timeval *a)
-{
- static char buf[16];
- double elapsed = calculate_timedelta(b, a);
- double eta;
-
- if (diff == 0)
- snprintf(buf, sizeof(buf), "--:-- ETA");
- else {
- eta = remain / (diff / elapsed);
- snprintf(buf, sizeof(buf), "%02d:%02d ETA",
- (int)floor(eta / 60), (int)round(eta) % 60);
- }
- return buf;
-}
-
-static void print_progress_bar(double percent, char *suffix)
-{
- int n, thresh, bar_width;
- struct winsize ws;
- char buf[128];
-
- /*
- * [=======> ] XX% SUFFIX
- */
-
- buf[0] = '\0';
-
- if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) < 0)
- return; /* XXX */
- bar_width = min(sizeof(buf), ws.ws_col) - strlen(suffix) - 7;
-
- memset(buf, 0, sizeof(buf));
- if (bar_width > 8) {
- thresh = floor(bar_width * (percent / 100)) - 1;
-
- for (n = 1; n < bar_width - 1; n++) {
- if (n <= thresh)
- buf[n] = '=';
- else
- buf[n] = ' ';
- }
- buf[thresh] = '>';
- buf[0] = '[';
- buf[bar_width - 1] = ']';
- snprintf(buf + bar_width, sizeof(buf) - bar_width,
- " %3d%% ", (int)floor(percent));
- }
-
- pprint0("%s%s", buf, suffix);
-}
-
-static void print_progress(struct timeval *b, struct timeval *a,
- size_t total, size_t last, size_t done)
+void mscp_get_stats(struct mscp *m, struct mscp_stats *s)
{
- char *bps_units[] = { "B/s ", "KB/s", "MB/s", "GB/s" };
- char *byte_units[] = { "B ", "KB", "MB", "GB", "TB", "PB" };
- char suffix[128];
- int bps_u, byte_tu, byte_du;
- size_t total_round, done_round;
- int percent;
- double bps;
-
-#define array_size(a) (sizeof(a) / sizeof(a[0]))
-
- if (total <= 0) {
- pprint1("total 0 byte transferred");
- return; /* copy 0-byte file(s) */
- }
-
- total_round = total;
- for (byte_tu = 0; total_round > 1000 && byte_tu < array_size(byte_units) - 1;
- byte_tu++)
- total_round /= 1024;
-
- bps = calculate_bps(done - last, b, a);
- for (bps_u = 0; bps > 1000 && bps_u < array_size(bps_units); bps_u++)
- bps /= 1000;
-
- percent = floor(((double)(done) / (double)total) * 100);
-
- done_round = done;
- for (byte_du = 0; done_round > 1000 && byte_du < array_size(byte_units) - 1;
- byte_du++)
- done_round /= 1024;
-
- snprintf(suffix, sizeof(suffix), "%4lu%s/%lu%s %6.1f%s %s",
- done_round, byte_units[byte_du], total_round, byte_units[byte_tu],
- bps, bps_units[bps_u], calculate_eta(total - done, done - last, b, a));
-
- print_progress_bar(percent, suffix);
-}
-
-
-struct xfer_stat {
- struct timeval start, before, after;
- size_t total;
- size_t last;
- size_t done;
-};
-__thread struct xfer_stat s;
-
-static void mscp_stat_handler(int signum)
-{
- struct mscp *m = m_local;
- int n;
-
- for (s.done = 0, n = 0; n < m->opts->nr_threads; n++)
- s.done += m->threads[n].done;
-
- gettimeofday(&s.after, NULL);
- if (signum == SIGALRM) {
- alarm(1);
- print_progress(&s.before, &s.after, s.total, s.last, s.done);
- s.before = s.after;
- s.last = s.done;
- } else {
- /* called from mscp_stat_final. calculate progress from the beginning */
- print_progress(&s.start, &s.after, s.total, 0, s.done);
- pprint(0, "\n"); /* this is final output. */
- }
-}
-
-static int mscp_stat_init()
-{
- struct mscp *m = m_local;
- struct path *p;
-
- memset(&s, 0, sizeof(s));
- list_for_each_entry(p, &m->path_list, list) {
- s.total += p->size;
- }
-
- if (signal(SIGALRM, mscp_stat_handler) == SIG_ERR) {
- pr_err("signal: %s\n", strerrno());
- return -1;
- }
-
- gettimeofday(&s.start, NULL);
- s.before = s.start;
- alarm(1);
-
- return 0;
-}
-
-static void mscp_stat_final()
-{
- alarm(0);
- mscp_stat_handler(0);
+ int n;
+ s->total = m->total_bytes;
+ for (s->done = 0, n = 0; n < m->opts->nr_threads; n++) {
+ s->done += m->threads[n].done;
+ }
}