libarchive: add capability to unpack to mem.buffer
The performance and number of processes for a "depmod -a" with gzipped
modules was abysmal. This patch adds a code path without fork,
benefiting all users of xmalloc_open_zipped_read_close.
"modinfo radeon.ko.gz", a single-file reader, got 30% faster.
"depmod -a", which used to fork over 800 times, got 20% faster.
Heavily based on a patch by Lauri Kasanen <curaga@operamail.com>
function old new delta
setup_transformer_on_fd - 159 +159
transformer_write - 122 +122
fork_transformer - 112 +112
xmalloc_open_zipped_read_close 63 118 +55
read_bunzip 1866 1896 +30
xtransformer_write - 19 +19
unzip_main 2449 2462 +13
bbunpack 755 766 +11
unpack_lzma_stream 2717 2723 +6
unpack_xz_stream 2393 2397 +4
unpack_Z_stream 1173 1175 +2
inflate_unzip 111 105 -6
check_signature16 70 63 -7
unpack_bz2_stream 359 349 -10
unpack_unxz 12 - -12
unpack_unlzma 12 - -12
unpack_uncompress 12 - -12
unpack_gunzip 12 - -12
unpack_bunzip2 12 - -12
open_transformer 106 92 -14
inflate_unzip_internal 1945 1916 -29
unpack_gz_stream 693 655 -38
open_zipped 89 47 -42
setup_unzip_on_fd 142 53 -89
------------------------------------------------------------------------------
(add/remove: 4/5 grow/shrink: 7/8 up/down: 533/-295) Total: 238 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index 84f58f1..90aac14 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -122,6 +122,8 @@
if (!(option_mask32 & SEAMLESS_MAGIC)) {
init_transformer_state(&xstate);
xstate.check_signature = 1;
+ /*xstate.src_fd = STDIN_FILENO; - already is */
+ xstate.dst_fd = STDOUT_FILENO;
status = unpacker(&xstate);
if (status < 0)
exitcode = 1;
@@ -226,18 +228,13 @@
//applet:IF_UNCOMPRESS(APPLET(uncompress, BB_DIR_BIN, BB_SUID_DROP))
//kbuild:lib-$(CONFIG_UNCOMPRESS) += bbunzip.o
#if ENABLE_UNCOMPRESS
-static
-IF_DESKTOP(long long) int FAST_FUNC unpack_uncompress(transformer_state_t *xstate)
-{
- return unpack_Z_stream(xstate, STDIN_FILENO, STDOUT_FILENO);
-}
int uncompress_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int uncompress_main(int argc UNUSED_PARAM, char **argv)
{
getopt32(argv, "cf");
argv += optind;
- return bbunpack(argv, unpack_uncompress, make_new_name_generic, "Z");
+ return bbunpack(argv, unpack_Z_stream, make_new_name_generic, "Z");
}
#endif
@@ -324,11 +321,6 @@
}
return filename;
}
-static
-IF_DESKTOP(long long) int FAST_FUNC unpack_gunzip(transformer_state_t *xstate)
-{
- return unpack_gz_stream(xstate, STDIN_FILENO, STDOUT_FILENO);
-}
/*
* Linux kernel build uses gzip -d -n. We accept and ignore it.
* Man page says:
@@ -355,7 +347,7 @@
if (applet_name[1] == 'c')
option_mask32 |= OPT_STDOUT | SEAMLESS_MAGIC;
- return bbunpack(argv, unpack_gunzip, make_new_name_gunzip, /*unused:*/ NULL);
+ return bbunpack(argv, unpack_gz_stream, make_new_name_gunzip, /*unused:*/ NULL);
}
#endif
@@ -395,11 +387,6 @@
//kbuild:lib-$(CONFIG_BZIP2) += bbunzip.o
//kbuild:lib-$(CONFIG_BUNZIP2) += bbunzip.o
#if ENABLE_BUNZIP2
-static
-IF_DESKTOP(long long) int FAST_FUNC unpack_bunzip2(transformer_state_t *xstate)
-{
- return unpack_bz2_stream(xstate, STDIN_FILENO, STDOUT_FILENO);
-}
int bunzip2_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int bunzip2_main(int argc UNUSED_PARAM, char **argv)
{
@@ -408,7 +395,7 @@
if (applet_name[2] == 'c') /* bzcat */
option_mask32 |= OPT_STDOUT;
- return bbunpack(argv, unpack_bunzip2, make_new_name_generic, "bz2");
+ return bbunpack(argv, unpack_bz2_stream, make_new_name_generic, "bz2");
}
#endif
@@ -494,11 +481,6 @@
//applet:IF_LZMA(APPLET_ODDNAME(lzma, unlzma, BB_DIR_USR_BIN, BB_SUID_DROP, lzma))
//kbuild:lib-$(CONFIG_UNLZMA) += bbunzip.o
#if ENABLE_UNLZMA
-static
-IF_DESKTOP(long long) int FAST_FUNC unpack_unlzma(transformer_state_t *xstate)
-{
- return unpack_lzma_stream(xstate, STDIN_FILENO, STDOUT_FILENO);
-}
int unlzma_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int unlzma_main(int argc UNUSED_PARAM, char **argv)
{
@@ -513,7 +495,7 @@
option_mask32 |= OPT_STDOUT;
argv += optind;
- return bbunpack(argv, unpack_unlzma, make_new_name_generic, "lzma");
+ return bbunpack(argv, unpack_lzma_stream, make_new_name_generic, "lzma");
}
#endif
@@ -537,11 +519,6 @@
//applet:IF_XZ(APPLET_ODDNAME(xz, unxz, BB_DIR_USR_BIN, BB_SUID_DROP, xz))
//kbuild:lib-$(CONFIG_UNXZ) += bbunzip.o
#if ENABLE_UNXZ
-static
-IF_DESKTOP(long long) int FAST_FUNC unpack_unxz(transformer_state_t *xstate)
-{
- return unpack_xz_stream(xstate, STDIN_FILENO, STDOUT_FILENO);
-}
int unxz_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int unxz_main(int argc UNUSED_PARAM, char **argv)
{
@@ -556,6 +533,6 @@
option_mask32 |= OPT_STDOUT;
argv += optind;
- return bbunpack(argv, unpack_unxz, make_new_name_generic, "xz");
+ return bbunpack(argv, unpack_xz_stream, make_new_name_generic, "xz");
}
#endif