Ma/mscp
1
0
Fork 0
mirror of https://github.com/upa/mscp.git synced 2026-03-16 05:17:35 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

rename sscp to mscp

Browse Source
This commit is contained in:
Ryo Nakamura
2022-10-30 15:20:05 +09:00
parent 37c37990f5
commit c495f6b89b
4 changed files with 72 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@@ -1,12 +1,12 @@
cmake_minimum_required(VERSION 3.13) cmake_minimum_required(VERSION 3.13)
project(sscp C) project(mscp C)
set(CMAKE_C_FLAGS "-Wall -g") set(CMAKE_C_FLAGS "-Wall -g")
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DDEBUG") set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DDEBUG")
add_executable(sscp src/main.c src/platform.c src/ssh.c src/file.c src/pprint.c) add_executable(mscp src/main.c src/platform.c src/ssh.c src/file.c src/pprint.c)
target_include_directories(sscp PUBLIC ./src /usr/local/include) target_include_directories(mscp PUBLIC ./src /usr/local/include)
target_link_directories(sscp PUBLIC /usr/local/lib) target_link_directories(mscp PUBLIC /usr/local/lib)
target_link_libraries(sscp ssh pthread m) target_link_libraries(mscp ssh pthread m)

5
src/file.c
View File

@@ -235,9 +235,10 @@ static int file_fill_recursive(struct list_head *file_list,
snprintf(f->dst_path, PATH_MAX, "%s%s", rel_path, dst_path); snprintf(f->dst_path, PATH_MAX, "%s%s", rel_path, dst_path);
list_add_tail(&f->list, file_list); list_add_tail(&f->list, file_list);
pprint2("file %s %s -> %s %s\n", pprint2("file %s %s -> %s %s %luB\n",
f->path, dst_is_remote ? "(local)" : "(remote)", f->path, dst_is_remote ? "(local)" : "(remote)",
f->dst_path, dst_is_remote ? "(remote)" : "(local)"); f->dst_path, dst_is_remote ? "(remote)" : "(local)",
f->size);
return 0; return 0;
} }

4
src/file.h
View File

@@ -10,7 +10,7 @@
#include <atomic.h> #include <atomic.h>
struct file { struct file {
struct list_head list; /* sscp->file_list */ struct list_head list; /* mscp->file_list */
char path[PATH_MAX]; /* copy source path */ char path[PATH_MAX]; /* copy source path */
bool remote; /* source is remote */ bool remote; /* source is remote */
@@ -51,7 +51,7 @@ struct file {
*/ */
struct chunk { struct chunk {
struct list_head list; /* sscp->chunk_list */ struct list_head list; /* mscp->chunk_list */
struct file *f; struct file *f;
size_t off; /* offset of this chunk on the file f */ size_t off; /* offset of this chunk on the file f */
size_t len; /* length of this chunk */ size_t len; /* length of this chunk */

124
src/main.c
View File

@@ -21,7 +21,7 @@
#define DEFAULT_IO_BUF_SZ DEFAULT_SFTP_BUF_SZ #define DEFAULT_IO_BUF_SZ DEFAULT_SFTP_BUF_SZ
/* XXX: need to investigate max buf size for sftp_read/sftp_write */ /* XXX: need to investigate max buf size for sftp_read/sftp_write */
struct sscp { struct mscp {
char *host; /* remote host (and username) */ char *host; /* remote host (and username) */
struct ssh_opts *opts; /* ssh parameters */ struct ssh_opts *opts; /* ssh parameters */
sftp_session ctrl; /* control sftp session */ sftp_session ctrl; /* control sftp session */
@@ -37,8 +37,8 @@ struct sscp {
struct timeval start; /* timestamp of starting copy */ struct timeval start; /* timestamp of starting copy */
}; };
struct sscp_thread { struct mscp_thread {
struct sscp *sscp; struct mscp *mscp;
sftp_session sftp; sftp_session sftp;
pthread_t tid; pthread_t tid;
@@ -46,11 +46,11 @@ struct sscp_thread {
bool finished; bool finished;
}; };
void *sscp_copy_thread(void *arg); void *mscp_copy_thread(void *arg);
void *sscp_monitor_thread(void *arg); void *mscp_monitor_thread(void *arg);
static pthread_t mtid; static pthread_t mtid;
struct sscp_thread *threads; struct mscp_thread *threads;
int nr_threads; int nr_threads;
void stop_copy_threads(int sig) void stop_copy_threads(int sig)
@@ -65,9 +65,9 @@ void stop_copy_threads(int sig)
void usage(bool print_help) { void usage(bool print_help) {
printf("sscp: super scp, copy files over multiple ssh connections\n" printf("mscp: copy files over multiple ssh connections\n"
"\n" "\n"
"Usage: sscp [CvqDdh] [-n nr_conns] [-s min_chunk_sz] [-S max_chunk_sz]\n" "Usage: mscp [CvqDdh] [-n nr_conns] [-s min_chunk_sz] [-S max_chunk_sz]\n"
" [-b sftp_buf_sz] [-B io_buf_sz]\n" " [-b sftp_buf_sz] [-B io_buf_sz]\n"
" [-l login_name] [-p port] [-i identity_file]\n" " [-l login_name] [-p port] [-i identity_file]\n"
" [-c cipher_spec] source ... target\n" " [-c cipher_spec] source ... target\n"
@@ -142,7 +142,7 @@ err_out:
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
struct sscp sscp; struct mscp m;
struct ssh_opts opts; struct ssh_opts opts;
int min_chunk_sz = DEFAULT_MIN_CHUNK_SZ; int min_chunk_sz = DEFAULT_MIN_CHUNK_SZ;
int max_chunk_sz = 0; int max_chunk_sz = 0;
@@ -152,12 +152,12 @@ int main(int argc, char **argv)
char ch; char ch;
memset(&opts, 0, sizeof(opts)); memset(&opts, 0, sizeof(opts));
memset(&sscp, 0, sizeof(sscp)); memset(&m, 0, sizeof(m));
INIT_LIST_HEAD(&sscp.file_list); INIT_LIST_HEAD(&m.file_list);
INIT_LIST_HEAD(&sscp.chunk_list); INIT_LIST_HEAD(&m.chunk_list);
lock_init(&sscp.chunk_lock); lock_init(&m.chunk_lock);
sscp.sftp_buf_sz = DEFAULT_SFTP_BUF_SZ; m.sftp_buf_sz = DEFAULT_SFTP_BUF_SZ;
sscp.io_buf_sz = DEFAULT_IO_BUF_SZ; m.io_buf_sz = DEFAULT_IO_BUF_SZ;
nr_threads = (int)(nr_cpus() / 2); nr_threads = (int)(nr_cpus() / 2);
nr_threads = nr_threads == 0 ? 1 : nr_threads; nr_threads = nr_threads == 0 ? 1 : nr_threads;
@@ -202,15 +202,15 @@ int main(int argc, char **argv)
} }
break; break;
case 'b': case 'b':
sscp.sftp_buf_sz = atoi(optarg); m.sftp_buf_sz = atoi(optarg);
if (sscp.sftp_buf_sz < 1) { if (m.sftp_buf_sz < 1) {
pr_err("invalid buffer size: %s\n", optarg); pr_err("invalid buffer size: %s\n", optarg);
return -1; return -1;
} }
break; break;
case 'B': case 'B':
sscp.io_buf_sz = atoi(optarg); m.io_buf_sz = atoi(optarg);
if (sscp.io_buf_sz < 1) { if (m.io_buf_sz < 1) {
pr_err("invalid buffer size: %s\n", optarg); pr_err("invalid buffer size: %s\n", optarg);
return -1; return -1;
} }
@@ -260,44 +260,44 @@ int main(int argc, char **argv)
} }
if (argc - optind < 2) { if (argc - optind < 2) {
/* sscp needs at lease 2 (src and target) argument */ /* mscp needs at lease 2 (src and target) argument */
usage(false); usage(false);
return 1; return 1;
} }
sscp.target = argv[argc - 1]; m.target = argv[argc - 1];
/* create control session */ /* create control session */
sscp.host = find_hostname(optind, argc, argv); m.host = find_hostname(optind, argc, argv);
if (!sscp.host) { if (!m.host) {
pr_err("no remote host given\n"); pr_err("no remote host given\n");
return 1; return 1;
} }
pprint3("connecting to %s for checking destinations...\n", sscp.host); pprint3("connecting to %s for checking destinations...\n", m.host);
sscp.ctrl = ssh_make_sftp_session(sscp.host, &opts); m.ctrl = ssh_make_sftp_session(m.host, &opts);
if (!sscp.ctrl) if (!m.ctrl)
return 1; return 1;
sscp.opts = &opts; /* save ssh-able ssh_opts */ m.opts = &opts; /* save ssh-able ssh_opts */
/* fill file list */ /* fill file list */
ret = file_fill(sscp.ctrl, &sscp.file_list, &argv[optind], argc - optind - 1, ret = file_fill(m.ctrl, &m.file_list, &argv[optind], argc - optind - 1,
sscp.target); m.target);
if (ret < 0) if (ret < 0)
goto out; goto out;
#ifdef DEBUG #ifdef DEBUG
file_dump(&sscp.file_list); file_dump(&m.file_list);
#endif #endif
/* fill chunk list */ /* fill chunk list */
ret = chunk_fill(&sscp.file_list, &sscp.chunk_list, ret = chunk_fill(&m.file_list, &m.chunk_list,
nr_threads, min_chunk_sz, max_chunk_sz); nr_threads, min_chunk_sz, max_chunk_sz);
if (ret < 0) if (ret < 0)
goto out; goto out;
#ifdef DEBUG #ifdef DEBUG
chunk_dump(&sscp.chunk_list); chunk_dump(&m.chunk_list);
#endif #endif
if (dryrun) if (dryrun)
@@ -311,20 +311,20 @@ int main(int argc, char **argv)
} }
/* prepare thread instances */ /* prepare thread instances */
threads = calloc(nr_threads, sizeof(struct sscp_thread)); threads = calloc(nr_threads, sizeof(struct mscp_thread));
memset(threads, 0, nr_threads * sizeof(struct sscp_thread)); memset(threads, 0, nr_threads * sizeof(struct mscp_thread));
for (n = 0; n < nr_threads; n++) { for (n = 0; n < nr_threads; n++) {
struct sscp_thread *t = &threads[n]; struct mscp_thread *t = &threads[n];
t->sscp = &sscp; t->mscp = &m;
t->finished = false; t->finished = false;
pprint3("connecting to %s for a copy thread...\n", sscp.host); pprint3("connecting to %s for a copy thread...\n", m.host);
t->sftp = ssh_make_sftp_session(sscp.host, sscp.opts); t->sftp = ssh_make_sftp_session(m.host, m.opts);
if (!t->sftp) if (!t->sftp)
goto join_out; goto join_out;
} }
/* spawn count thread */ /* spawn count thread */
ret = pthread_create(&mtid, NULL, sscp_monitor_thread, &sscp); ret = pthread_create(&mtid, NULL, mscp_monitor_thread, &m);
if (ret < 0) { if (ret < 0) {
pr_err("pthread_create error: %d\n", ret); pr_err("pthread_create error: %d\n", ret);
stop_copy_threads(0); stop_copy_threads(0);
@@ -332,12 +332,12 @@ int main(int argc, char **argv)
} }
/* save start time */ /* save start time */
gettimeofday(&sscp.start, NULL); gettimeofday(&m.start, NULL);
/* spawn threads */ /* spawn threads */
for (n = 0; n < nr_threads; n++) { for (n = 0; n < nr_threads; n++) {
struct sscp_thread *t = &threads[n]; struct mscp_thread *t = &threads[n];
ret = pthread_create(&t->tid, NULL, sscp_copy_thread, t); ret = pthread_create(&t->tid, NULL, mscp_copy_thread, t);
if (ret < 0) { if (ret < 0) {
pr_err("pthread_create error: %d\n", ret); pr_err("pthread_create error: %d\n", ret);
stop_copy_threads(0); stop_copy_threads(0);
@@ -357,35 +357,35 @@ join_out:
} }
out: out:
if (sscp.ctrl) if (m.ctrl)
ssh_sftp_close(sscp.ctrl); ssh_sftp_close(m.ctrl);
return ret; return ret;
} }
void sscp_copy_thread_cleanup(void *arg) void mscp_copy_thread_cleanup(void *arg)
{ {
struct sscp_thread *t = arg; struct mscp_thread *t = arg;
if (t->sftp) if (t->sftp)
ssh_sftp_close(t->sftp); ssh_sftp_close(t->sftp);
t->finished = true; t->finished = true;
} }
void *sscp_copy_thread(void *arg) void *mscp_copy_thread(void *arg)
{ {
struct sscp_thread *t = arg; struct mscp_thread *t = arg;
struct sscp *sscp = t->sscp; struct mscp *m = t->mscp;
sftp_session sftp = t->sftp; sftp_session sftp = t->sftp;
struct chunk *c; struct chunk *c;
pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL); pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL); pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL);
pthread_cleanup_push(sscp_copy_thread_cleanup, t); pthread_cleanup_push(mscp_copy_thread_cleanup, t);
while (1) { while (1) {
lock_acquire(&sscp->chunk_lock); lock_acquire(&m->chunk_lock);
c = chunk_acquire(&sscp->chunk_list); c = chunk_acquire(&m->chunk_list);
lock_release(&sscp->chunk_lock); lock_release(&m->chunk_lock);
if (!c) if (!c)
break; /* no more chunks */ break; /* no more chunks */
@@ -394,7 +394,7 @@ void *sscp_copy_thread(void *arg)
break; break;
if (chunk_copy(c, sftp, if (chunk_copy(c, sftp,
sscp->sftp_buf_sz, sscp->io_buf_sz, &t->done) < 0) m->sftp_buf_sz, m->io_buf_sz, &t->done) < 0)
break; break;
} }
@@ -488,9 +488,9 @@ static void print_progress(struct timeval *start, struct timeval *end,
print_progress_bar(percent, suffix); print_progress_bar(percent, suffix);
} }
void sscp_monitor_thread_cleanup(void *arg) void mscp_monitor_thread_cleanup(void *arg)
{ {
struct sscp *sscp = arg; struct mscp *m = arg;
struct timeval end; struct timeval end;
struct file *f; struct file *f;
size_t total, done; size_t total, done;
@@ -501,7 +501,7 @@ void sscp_monitor_thread_cleanup(void *arg)
gettimeofday(&end, NULL); gettimeofday(&end, NULL);
/* get total byte to be transferred */ /* get total byte to be transferred */
list_for_each_entry(f, &sscp->file_list, list) { list_for_each_entry(f, &m->file_list, list) {
total += f->size; total += f->size;
} }
@@ -510,13 +510,13 @@ void sscp_monitor_thread_cleanup(void *arg)
done += threads[n].done; done += threads[n].done;
} }
print_progress(&sscp->start, &end, total, 0, done); print_progress(&m->start, &end, total, 0, done);
fputs("\n", stdout); /* the final ouput. we need \n */ fputs("\n", stdout); /* the final ouput. we need \n */
} }
void *sscp_monitor_thread(void *arg) void *mscp_monitor_thread(void *arg)
{ {
struct sscp *sscp = arg; struct mscp *m = arg;
struct timeval a, b; struct timeval a, b;
struct file *f; struct file *f;
bool all_done; bool all_done;
@@ -525,11 +525,11 @@ void *sscp_monitor_thread(void *arg)
pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL); pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL); pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL);
pthread_cleanup_push(sscp_monitor_thread_cleanup, sscp); pthread_cleanup_push(mscp_monitor_thread_cleanup, m);
/* get total byte to be transferred */ /* get total byte to be transferred */
total = 0; total = 0;
list_for_each_entry(f, &sscp->file_list, list) { list_for_each_entry(f, &m->file_list, list) {
total += f->size; total += f->size;
} }