From c4cb15d2851df8d58ce38f9a49059a3cea5f565e Mon Sep 17 00:00:00 2001 From: Ryo Nakamura Date: Fri, 26 Apr 2024 18:17:13 +0900 Subject: [PATCH] change default minimum chunk size to 16MB --- doc/mscp.1.in | 2 +- doc/mscp.rst | 23 +++++++++++------------ src/main.c | 2 +- src/mscp.c | 2 +- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/doc/mscp.1.in b/doc/mscp.1.in index c180a13..4da161f 100644 --- a/doc/mscp.1.in +++ b/doc/mscp.1.in @@ -192,7 +192,7 @@ and remove the checkpoint if it returns 0. Specifies the minimum chunk size. .B mscp divides a single file into chunks and copies the chunks in -parallel. The default value is 67108864 (64MB). +parallel. The default value is 16M bytes. .TP .B \-S \fIMAX_CHUNK_SIZE\fR diff --git a/doc/mscp.rst b/doc/mscp.rst index c26f8b6..2aca3f4 100644 --- a/doc/mscp.rst +++ b/doc/mscp.rst @@ -2,7 +2,7 @@ MSCP ==== -:Date: v0.2.0 +:Date: v0.2.0-5-g08660bb NAME ==== @@ -12,15 +12,14 @@ mscp - copy files over multiple SSH connections SYNOPSIS ======== -**mscp** [**-46vqDpdNh**] [ **-n**\ *NR_CONNECTIONS* ] [ -**-m**\ *COREMASK* ] [ **-u**\ *MAX_STARTUPS* ] [ **-I**\ *INTERVAL* ] [ -**-W**\ *CHECKPOINT* ] [ **-R**\ *CHECKPOINT* ] [ -**-s**\ *MIN_CHUNK_SIZE* ] [ **-S**\ *MAX_CHUNK_SIZE* ] [ -**-a**\ *NR_AHEAD* ] [ **-b**\ *BUF_SIZE* ] [ **-L**\ *LIMIT_BITRATE* ] -[ **-l**\ *LOGIN_NAME* ] [ **-P**\ *PORT* ] [ **-F**\ *SSH_CONFIG* ] [ -**-o**\ *SSH_OPTION* ] [ **-i**\ *IDENTITY* ] [ **-J**\ *DESTINATION* ] -[ **-c**\ *CIPHER* ] [ **-M**\ *HMAC* ] [ **-C**\ *COMPRESS* ] [ -**-g**\ *CONGESTION* ] *source ... target* +**mscp** [**-46vqDpdNh**] [ **-n** *NR_CONNECTIONS* ] [ **-m** +*COREMASK* ] [ **-u** *MAX_STARTUPS* ] [ **-I** *INTERVAL* ] [ **-W** +*CHECKPOINT* ] [ **-R** *CHECKPOINT* ] [ **-s** *MIN_CHUNK_SIZE* ] [ +**-S** *MAX_CHUNK_SIZE* ] [ **-a** *NR_AHEAD* ] [ **-b** *BUF_SIZE* ] [ +**-L** *LIMIT_BITRATE* ] [ **-l** *LOGIN_NAME* ] [ **-P** *PORT* ] [ +**-F** *SSH_CONFIG* ] [ **-o** *SSH_OPTION* ] [ **-i** *IDENTITY* ] [ +**-J** *DESTINATION* ] [ **-c** *CIPHER* ] [ **-M** *HMAC* ] [ **-C** +*COMPRESS* ] [ **-g** *CONGESTION* ] *source ... target* DESCRIPTION =========== @@ -98,8 +97,8 @@ OPTIONS **-s MIN_CHUNK_SIZE** Specifies the minimum chunk size. **mscp** divides a single file into - chunks and copies the chunks in parallel. The default value is - 67108864 (64MB). + chunks and copies the chunks in parallel. The default value is 16M + bytes. **-S MAX_CHUNK_SIZE** Specifies the maximum chunk size. The default is file size divided by diff --git a/src/main.c b/src/main.c index 144f35c..f17d2ad 100644 --- a/src/main.c +++ b/src/main.c @@ -46,7 +46,7 @@ void usage(bool print_help) " -W CHECKPOINT write states to the checkpoint if transfer fails\n" " -R CHECKPOINT resume transferring from the checkpoint\n" "\n" - " -s MIN_CHUNK_SIZE min chunk size (default: 64MB)\n" + " -s MIN_CHUNK_SIZE min chunk size (default: 16M bytes)\n" " -S MAX_CHUNK_SIZE max chunk size (default: filesize/nr_conn)\n" " -a NR_AHEAD number of inflight SFTP commands (default: 32)\n" " -b BUF_SZ buffer size for i/o and transfer\n" diff --git a/src/mscp.c b/src/mscp.c index 61d31fb..1cb60ef 100644 --- a/src/mscp.c +++ b/src/mscp.c @@ -62,7 +62,7 @@ struct mscp { struct mscp_thread scan; /* mscp_thread for mscp_scan_thread() */ }; -#define DEFAULT_MIN_CHUNK_SZ (64 << 20) /* 64MB */ +#define DEFAULT_MIN_CHUNK_SZ (16 << 20) /* 16MB */ #define DEFAULT_NR_AHEAD 32 #define DEFAULT_BUF_SZ 16384 /* XXX: we use 16384 byte buffer pointed by