erofs-utils: list available compressors for help command
PATCH 1/1 erofs-utils: list available compressors for help command
Users can get knowledge of supported compression
algorithms then.
--- include/erofs/compress.h | 2 ++ lib/compressor.c | 17 +++++++++++++++++ mkfs/main.c | 15 +++++++++++++++ 3 files changed, 34 insertions(+)
include/erofs/compress.h +2 -0
@@ -21,5 +21,7 @@ int erofs_write_compressed_file(struct erofs_inode *inode);int z_erofs_compress_init (void );int z_erofs_compress_exit (void ); +const char *z_erofs_list_available_compressors (unsigned int i); +#endif
lib/compressor.c +17 -0
@@ -36,6 +36,23 @@ int erofs_compress_destsize(struct erofs_compress *c,return ret; } +const char *z_erofs_list_available_compressors (unsigned int i) +{ +static const char *compressors[] = { +#if LZ4_ENABLED +#if LZ4HC_ENABLED +"lz4hc" , +#endif +"lz4" , +#endif +NULL , + }; + +if (i >=ARRAY_SIZE (compressors)) +return NULL ; +return compressors[i]; +} +int erofs_compressor_init (struct erofs_compress *c,char *alg_name) {
mkfs/main.c +15 -0
@@ -29,6 +29,19 @@ static struct option long_options[] = { {0, 0, 0, 0}, }; +static void print_available_compressors (FILE *f,const char *delim) +{ +unsigned int i =0 ; +const char *s; + +while ((s =z_erofs_list_available_compressors (i)) !=NULL ) { +if (i++) +fputs (delim, f); +fputs (s, f); + } +fputc ('\n' , f); +} +static void usage (void ) {fprintf (stderr,"usage: [options] FILE DIRECTORY\n\n" );
@@ -39,6 +52,8 @@ static void usage(void)fprintf (stderr," -EX[,...] X=extended options\n" );fprintf (stderr," -T# set a fixed UNIX timestamp # to all files\n" );fprintf (stderr," --help display this help and exit\n" ); +fprintf (stderr,"\nAvailable compressors are: " ); +print_available_compressors (stderr,", " ); }static int parse_extended_opts (const char *opts)
Signature · 1 line
2.17.1
Hi Gao Xiang
What do you think put the compressor's name into structure of erofs_compressor ? So compressor's name will be matched to its implement not represented at two place.
Quoted 84 lines · Gao Xiang
Users can get knowledge of supported compression
algorithms then.Signed-off-by Gao Xiang <[email protected]>--- include/erofs/compress.h | 2 ++ lib/compressor.c | 17 +++++++++++++++++ mkfs/main.c | 15 +++++++++++++++ 3 files changed, 34 insertions(+)include/erofs/compress.h +2
-0@@ -21,5 +21,7 @@ int erofs_write_compressed_file(struct erofs_inode *inode);int z_erofs_compress_init (void );int z_erofs_compress_exit (void ); +const char *z_erofs_list_available_compressors (unsigned int i); +#endif lib/compressor.c +17
-0@@ -36,6 +36,23 @@ int erofs_compress_destsize(struct erofs_compress *c,return ret; } +const char *z_erofs_list_available_compressors (unsigned int i) +{ +static const char *compressors[] = { +#if LZ4_ENABLED +#if LZ4HC_ENABLED +"lz4hc" , +#endif +"lz4" , +#endif +NULL , + }; + +if (i >=ARRAY_SIZE (compressors)) +return NULL ; +return compressors[i]; +} +int erofs_compressor_init (struct erofs_compress *c,char *alg_name) {mkfs/main.c +15
-0@@ -29,6 +29,19 @@ static struct option long_options[] = { {0, 0, 0, 0}, }; +static void print_available_compressors (FILE *f,const char *delim) +{ +unsigned int i =0 ; +const char *s; + +while ((s =z_erofs_list_available_compressors (i)) !=NULL ) { +if (i++) +fputs (delim, f); +fputs (s, f); + } +fputc ('\n' , f); +} +static void usage (void ) {fprintf (stderr,"usage: [options] FILE DIRECTORY\n\n" );@@ -39,6 +52,8 @@ static void usage(void)fprintf (stderr," -EX[,...] X=extended options\n" );fprintf (stderr," -T# set a fixed UNIX timestamp # to all files\n" );fprintf (stderr," --help display this help and exit\n" ); +fprintf (stderr,"\nAvailable compressors are: " ); +print_available_compressors (stderr,", " ); }static int parse_extended_opts (const char *opts)
PATCH v2 1/1 erofs-utils: list available compressors for help command
From: Gao Xiang <[email protected]>
Users can get knowledge of supported compression
algorithms then.
--- include/erofs/compress.h | 2 ++ lib/compressor.c | 23 ++++++++++++++--------- lib/compressor.h | 1 + lib/compressor_lz4.c | 1 + lib/compressor_lz4hc.c | 1 + mkfs/main.c | 15 +++++++++++++++ 6 files changed, 34 insertions(+), 9 deletions(-)
include/erofs/compress.h +2 -0
@@ -21,5 +21,7 @@ int erofs_write_compressed_file(struct erofs_inode *inode);int z_erofs_compress_init (void );int z_erofs_compress_exit (void ); +const char *z_erofs_list_available_compressors (unsigned int i); +#endif
lib/compressor.c +14 -9
@@ -12,6 +12,15 @@#define EROFS_CONFIG_COMPR_DEF_BOUNDARY (128) +static struct erofs_compressor *compressors[] = { +#if LZ4_ENABLED +#if LZ4HC_ENABLED + &erofs_compressor_lz4hc, +#endif + &erofs_compressor_lz4, +#endif +}; + int erofs_compress_destsize(struct erofs_compress *c, int compression_level, void *src,
@@ -36,18 +45,14 @@ int erofs_compress_destsize(struct erofs_compress *c,return ret; } +const char *z_erofs_list_available_compressors (unsigned int i) +{ +return (i >=ARRAY_SIZE (compressors)) ?NULL : compressors[i]->name; +} +int erofs_compressor_init (struct erofs_compress *c,char *alg_name) { - static struct erofs_compressor *compressors[] = { -#if LZ4_ENABLED -#if LZ4HC_ENABLED - &erofs_compressor_lz4hc, -#endif - &erofs_compressor_lz4, -#endif - }; -int ret, i;/* should be written in "minimum compression ratio * 100" */
lib/compressor.h +1 -0
@@ -14,6 +14,7 @@struct erofs_compress ;struct erofs_compressor { +const char *name;int default_level;int best_level;
lib/compressor_lz4.c +1 -0
@@ -39,6 +39,7 @@ static int compressor_lz4_init(struct erofs_compress *c, }struct erofs_compressor erofs_compressor_lz4 = { + .name ="lz4" , .default_level =0 , .best_level =0 , .init = compressor_lz4_init,
lib/compressor_lz4hc.c +1 -0
@@ -52,6 +52,7 @@ static int compressor_lz4hc_init(struct erofs_compress *c, }struct erofs_compressor erofs_compressor_lz4hc = { + .name ="lz4hc" , .default_level =LZ4HC_CLEVEL_DEFAULT , .best_level =LZ4HC_CLEVEL_MAX , .init = compressor_lz4hc_init,
mkfs/main.c +15 -0
@@ -29,6 +29,19 @@ static struct option long_options[] = { {0, 0, 0, 0}, }; +static void print_available_compressors (FILE *f,const char *delim) +{ +unsigned int i =0 ; +const char *s; + +while ((s =z_erofs_list_available_compressors (i)) !=NULL ) { +if (i++) +fputs (delim, f); +fputs (s, f); + } +fputc ('\n' , f); +} +static void usage (void ) {fprintf (stderr,"usage: [options] FILE DIRECTORY\n\n" );
@@ -39,6 +52,8 @@ static void usage(void)fprintf (stderr," -EX[,...] X=extended options\n" );fprintf (stderr," -T# set a fixed UNIX timestamp # to all files\n" );fprintf (stderr," --help display this help and exit\n" ); +fprintf (stderr,"\nAvailable compressors are: " ); +print_available_compressors (stderr,", " ); }static int parse_extended_opts (const char *opts)
Signature · 1 line
2.17.1
Hi Guifu,
Quoted 8 lines · Li Guifu
From: Gao Xiang <[email protected]>
Users can get knowledge of supported compression
algorithms then.Signed-off-by Gao Xiang <[email protected]>Signed-off-by Li Guifu <[email protected]>---
That is a good idea, how about adding some changelogs at this place (you could try this from now on), e.g:
changes since v1:
- update according to
https://lore.kernel.org/r/[email protected]
Quoted 41 lines
include/erofs/compress.h | 2 ++ lib/compressor.c | 23 ++++++++++++++--------- lib/compressor.h | 1 + lib/compressor_lz4.c | 1 + lib/compressor_lz4hc.c | 1 + mkfs/main.c | 15 +++++++++++++++ 6 files changed, 34 insertions(+), 9 deletions(-)include/erofs/compress.h +2
-0@@ -21,5 +21,7 @@ int erofs_write_compressed_file(struct erofs_inode *inode);int z_erofs_compress_init (void );int z_erofs_compress_exit (void ); +const char *z_erofs_list_available_compressors (unsigned int i); +#endif lib/compressor.c +9
-0@@ -12,6 +12,15 @@#define EROFS_CONFIG_COMPR_DEF_BOUNDARY (128) +static struct erofs_compressor *compressors[] = { +#if LZ4_ENABLED +#if LZ4HC_ENABLED + &erofs_compressor_lz4hc, +#endif + &erofs_compressor_lz4, +#endif +}; + int erofs_compress_destsize(struct erofs_compress *c, int compression_level, void *src,
lib/compressor.c int erofs_compress_destsize(struct erofs_compress *c, · line 50
Quoted 6 lines
lib/compressor.c +3
-0@@ -36,18 +45,14 @@ int erofs_compress_destsize(struct erofs_compress *c,return ret; } +const char *z_erofs_list_available_compressors (unsigned int i) +{ +return (i >=ARRAY_SIZE (compressors)) ?NULL : compressors[i]->name;
no need extra parentheses
return i >= ARRAY_SIZE(compressors) ? NULL : compressors[i]->name;
Quoted 22 lines
lib/compressor.c +2
-9+} +int erofs_compressor_init (struct erofs_compress *c,char *alg_name) { - static struct erofs_compressor *compressors[] = { -#if LZ4_ENABLED -#if LZ4HC_ENABLED - &erofs_compressor_lz4hc, -#endif - &erofs_compressor_lz4, -#endif - }; -int ret, i;/* should be written in "minimum compression ratio * 100" */ lib/compressor.h +0
-0
lib/compressor.h line 17
Quoted 4 lines
lib/compressor.h +1
-0@@ -14,6 +14,7 @@struct erofs_compress ;struct erofs_compressor { +const char *name;
add a blank line?
lib/compressor_lz4.c static int compressor_lz4_init(struct erofs_compress *c,
Quoted 8 lines
lib/compressor.h +0
-0int default_level;int best_level;lib/compressor_lz4.c +0
-0@@ -39,6 +39,7 @@ static int compressor_lz4_init(struct erofs_compress *c,
How about moving
32 static int compressor_lz4_init(struct erofs_compress *c,
33 char *alg_name)
34 {
35 if (alg_name && strcmp(alg_name, "lz4"))
36 return -EINVAL;
to compress.c?
lib/compressor_lz4hc.c static int compressor_lz4hc_init(struct erofs_compress *c,
Quoted 12 lines
lib/compressor_lz4.c +1
-0}struct erofs_compressor erofs_compressor_lz4 = { + .name ="lz4" , .default_level =0 , .best_level =0 , .init = compressor_lz4_init,lib/compressor_lz4hc.c +0
-0@@ -52,6 +52,7 @@ static int compressor_lz4hc_init(struct erofs_compress *c,
ditto.
Thanks,
Gao Xiang
Quoted 43 lines
lib/compressor_lz4hc.c +1
-0}struct erofs_compressor erofs_compressor_lz4hc = { + .name ="lz4hc" , .default_level =LZ4HC_CLEVEL_DEFAULT , .best_level =LZ4HC_CLEVEL_MAX , .init = compressor_lz4hc_init,mkfs/main.c +15
-0@@ -29,6 +29,19 @@ static struct option long_options[] = { {0, 0, 0, 0}, }; +static void print_available_compressors (FILE *f,const char *delim) +{ +unsigned int i =0 ; +const char *s; + +while ((s =z_erofs_list_available_compressors (i)) !=NULL ) { +if (i++) +fputs (delim, f); +fputs (s, f); + } +fputc ('\n' , f); +} +static void usage (void ) {fprintf (stderr,"usage: [options] FILE DIRECTORY\n\n" );@@ -39,6 +52,8 @@ static void usage(void)fprintf (stderr," -EX[,...] X=extended options\n" );fprintf (stderr," -T# set a fixed UNIX timestamp # to all files\n" );fprintf (stderr," --help display this help and exit\n" ); +fprintf (stderr,"\nAvailable compressors are: " ); +print_available_compressors (stderr,", " ); }static int parse_extended_opts (const char *opts)Signature · 1 line
2.17.1
PATCH v3 1/1 erofs-utils: list available compressors for help command
From: Gao Xiang <[email protected]>
Users can get knowledge of supported compression
algorithms then.
--- include/erofs/compress.h | 2 ++ lib/compressor.c | 29 ++++++++++++++++++----------- lib/compressor.h | 4 +++- lib/compressor_lz4.c | 6 ++---- lib/compressor_lz4hc.c | 7 ++----- mkfs/main.c | 15 +++++++++++++++ 6 files changed, 42 insertions(+), 21 deletions(-)
include/erofs/compress.h +2 -0
@@ -21,5 +21,7 @@ int erofs_write_compressed_file(struct erofs_inode *inode);int z_erofs_compress_init (void );int z_erofs_compress_exit (void ); +const char *z_erofs_list_available_compressors (unsigned int i); +#endif
lib/compressor.c +18 -11
@@ -12,6 +12,15 @@#define EROFS_CONFIG_COMPR_DEF_BOUNDARY (128) +static struct erofs_compressor *compressors[] = { +#if LZ4_ENABLED +#if LZ4HC_ENABLED + &erofs_compressor_lz4hc, +#endif + &erofs_compressor_lz4, +#endif +}; + int erofs_compress_destsize(struct erofs_compress *c, int compression_level, void *src,
@@ -36,18 +45,13 @@ int erofs_compress_destsize(struct erofs_compress *c,return ret; } -int erofs_compressor_init (struct erofs_compress *c, -char *alg_name) +const char *z_erofs_list_available_compressors (unsigned int i) { - static struct erofs_compressor *compressors[] = { -#if LZ4_ENABLED -#if LZ4HC_ENABLED - &erofs_compressor_lz4hc, -#endif - &erofs_compressor_lz4, -#endif - }; +return i >=ARRAY_SIZE (compressors) ?NULL : compressors[i]->name; +} +int erofs_compressor_init (struct erofs_compress *c,char *alg_name) +{int ret, i;/* should be written in "minimum compression ratio * 100" */
@@ -65,7 +69,10 @@ int erofs_compressor_init(struct erofs_compress *c, ret = -EINVAL ;for (i =0 ; i <ARRAY_SIZE (compressors); ++i) { - ret = compressors[i]->init (c, alg_name); +if (alg_name &&strcmp (alg_name, compressors[i]->name)) +continue ; + + ret = compressors[i]->init (c);if (!ret) {DBG_BUGON (!c->alg);return 0 ;
lib/compressor.h +3 -1
@@ -14,10 +14,12 @@struct erofs_compress ;struct erofs_compressor { +const char *name; +int default_level;int best_level; -int (*init)(struct erofs_compress *c,char *alg_name); +int (*init)(struct erofs_compress *c);int (*exit)(struct erofs_compress *c); int (*compress_destsize)(struct erofs_compress *c,
lib/compressor_lz4.c +2 -4
@@ -29,16 +29,14 @@ static int compressor_lz4_exit(struct erofs_compress *c)return 0 ; } -static int compressor_lz4_init (struct erofs_compress *c, -char *alg_name) +static int compressor_lz4_init (struct erofs_compress *c) { -if (alg_name &&strcmp (alg_name,"lz4" )) -return -EINVAL ; c->alg = &erofs_compressor_lz4;return 0 ; }struct erofs_compressor erofs_compressor_lz4 = { + .name ="lz4" , .default_level =0 , .best_level =0 , .init = compressor_lz4_init,
lib/compressor_lz4hc.c +2 -5
@@ -37,12 +37,8 @@ static int compressor_lz4hc_exit(struct erofs_compress *c)return 0 ; } -static int compressor_lz4hc_init (struct erofs_compress *c, -char *alg_name) +static int compressor_lz4hc_init (struct erofs_compress *c) { -if (alg_name &&strcmp (alg_name,"lz4hc" )) -return -EINVAL ; - c->alg = &erofs_compressor_lz4hc; c->private_data =LZ4_createStreamHC ();
@@ -52,6 +48,7 @@ static int compressor_lz4hc_init(struct erofs_compress *c, }struct erofs_compressor erofs_compressor_lz4hc = { + .name ="lz4hc" , .default_level =LZ4HC_CLEVEL_DEFAULT , .best_level =LZ4HC_CLEVEL_MAX , .init = compressor_lz4hc_init,
mkfs/main.c +15 -0
@@ -29,6 +29,19 @@ static struct option long_options[] = { {0, 0, 0, 0}, }; +static void print_available_compressors (FILE *f,const char *delim) +{ +unsigned int i =0 ; +const char *s; + +while ((s =z_erofs_list_available_compressors (i)) !=NULL ) { +if (i++) +fputs (delim, f); +fputs (s, f); + } +fputc ('\n' , f); +} +static void usage (void ) {fprintf (stderr,"usage: [options] FILE DIRECTORY\n\n" );
@@ -39,6 +52,8 @@ static void usage(void)fprintf (stderr," -EX[,...] X=extended options\n" );fprintf (stderr," -T# set a fixed UNIX timestamp # to all files\n" );fprintf (stderr," --help display this help and exit\n" ); +fprintf (stderr,"\nAvailable compressors are: " ); +print_available_compressors (stderr,", " ); }static int parse_extended_opts (const char *opts)
Signature · 1 line
2.17.1