From d3fabf89d7d38a436672ac2deea7904351b1b12a Mon Sep 17 00:00:00 2001 From: Michel Stam Date: Tue, 4 Nov 2014 12:19:04 +0100 Subject: zcip: Add environment variable for overriding log functionality function old new delta bb_logenv_override - 70 +70 packed_usage 29969 30033 +64 zcip_main 1426 1431 +5 ------------------------------------------------------------------------------ (add/remove: 2/0 grow/shrink: 2/0 up/down: 139/0) Total: 139 bytes Signed-off-by: Michel Stam Signed-off-by: Denys Vlasenko --- libbb/Kbuild.src | 3 +++ libbb/logenv.c | 24 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 libbb/logenv.c (limited to 'libbb') diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src index 0a9e803d7..f204816c5 100644 --- a/libbb/Kbuild.src +++ b/libbb/Kbuild.src @@ -187,3 +187,6 @@ lib-$(CONFIG_PGREP) += xregcomp.o lib-$(CONFIG_PKILL) += xregcomp.o lib-$(CONFIG_DEVFSD) += xregcomp.o lib-$(CONFIG_FEATURE_FIND_REGEX) += xregcomp.o + +# Add the experimental logging functionality, only used by zcip +lib-$(CONFIG_ZCIP) += logenv.o diff --git a/libbb/logenv.c b/libbb/logenv.c new file mode 100644 index 000000000..66c60bd4e --- /dev/null +++ b/libbb/logenv.c @@ -0,0 +1,24 @@ +/* vi: set sw=4 ts=4: */ +/* + * Utility routines. + * + * Copyright (C) 2014 by Fugro Intersite B.V. + * + * Licensed under GPLv2 or later, see file LICENSE in this source tree. + */ +#include "libbb.h" + +void FAST_FUNC bb_logenv_override(void) +{ + const char* mode = getenv("LOGGING"); + + if (!mode) + return; + + if (strcmp(mode, "none") == 0) + logmode = LOGMODE_NONE; +#if ENABLE_FEATURE_SYSLOG + else if (strcmp(mode, "syslog") == 0) + logmode = LOGMODE_SYSLOG; +#endif +} -- cgit v1.2.3-55-g6feb From 628f134fe7f1f868c60f8bd18645a626e9c5487f Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 17 Nov 2014 17:03:47 +0100 Subject: exit with 127 if appled name wasn't found - it's more POSIXy Signed-off-by: Denys Vlasenko --- libbb/appletlib.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'libbb') diff --git a/libbb/appletlib.c b/libbb/appletlib.c index cb16e310f..54300bd87 100644 --- a/libbb/appletlib.c +++ b/libbb/appletlib.c @@ -733,7 +733,8 @@ static int busybox_main(char **argv) /*bb_error_msg_and_die("applet not found"); - sucks in printf */ full_write2_str(applet_name); full_write2_str(": applet not found\n"); - xfunc_die(); + /* POSIX: "If a command is not found, the exit status shall be 127" */ + exit(127); } void FAST_FUNC run_applet_no_and_exit(int applet_no, char **argv) @@ -838,6 +839,7 @@ int main(int argc UNUSED_PARAM, char **argv) /*bb_error_msg_and_die("applet not found"); - sucks in printf */ full_write2_str(applet_name); full_write2_str(": applet not found\n"); - xfunc_die(); + /* POSIX: "If a command is not found, the exit status shall be 127" */ + exit(127); #endif } -- cgit v1.2.3-55-g6feb From 2835a224cd603489ac08625265d383d4690cb58a Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Wed, 26 Nov 2014 14:04:51 +0100 Subject: bbunit: fix WANT_TIMING compilation Signed-off-by: Denys Vlasenko --- libbb/bbunit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libbb') diff --git a/libbb/bbunit.c b/libbb/bbunit.c index 256014441..4c692d59f 100644 --- a/libbb/bbunit.c +++ b/libbb/bbunit.c @@ -77,7 +77,7 @@ int unit_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) #if WANT_TIMING gettimeofday(&end, NULL); timeval_diff(&time_spent, &end, &begin); - bb_error_msg("Elapsed time %u.%06u seconds" + bb_error_msg("Elapsed time %u.%06u seconds", (int)time_spent.tv_sec, (int)time_spent.tv_usec); #endif -- cgit v1.2.3-55-g6feb From 04c14176023c65550fd46c2e44a1aa04d426d69a Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Wed, 26 Nov 2014 15:17:59 +0100 Subject: libbb: use ARG_MAX for bb_arg_max() only if it's 60k+ Sometimes ARG_MAX is small (like 32k) yet sysconf(_SC_ARG_MAX) is big, and people prefer using the bigger value. OTOH, with sufficiently large ARG_MAX, further wins from sysconf(_SC_ARG_MAX) being bigger are exponentially smaller: you can see 4 times fewer fork+execs when you run find, but when each execed process already takes a thousand parameters it's likely execution time is dominated by what that process does with each parameter. Thus, with this change ARG_MAX is used if it's sufficiently big, otherwise sysconf(_SC_ARG_MAX) is used. Signed-off-by: Denys Vlasenko --- include/libbb.h | 7 +++++-- libbb/sysconf.c | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'libbb') diff --git a/include/libbb.h b/include/libbb.h index cc2bea32d..17a0089d8 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -731,11 +731,14 @@ extern void *xmalloc_open_read_close(const char *filename, size_t *maxsz_p) FAST /* Never returns NULL */ extern void *xmalloc_xopen_read_close(const char *filename, size_t *maxsz_p) FAST_FUNC RETURNS_MALLOC; -#if defined ARG_MAX +#if defined(ARG_MAX) && (ARG_MAX >= 60*1024 || !defined(_SC_ARG_MAX)) +/* Use _constant_ maximum if: defined && (big enough || no variable one exists) */ # define bb_arg_max() ((unsigned)ARG_MAX) -#elif defined _SC_ARG_MAX +#elif defined(_SC_ARG_MAX) +/* Else use variable one (a bit more expensive) */ unsigned bb_arg_max(void) FAST_FUNC; #else +/* If all else fails */ # define bb_arg_max() ((unsigned)(32 * 1024)) #endif unsigned bb_clk_tck(void) FAST_FUNC; diff --git a/libbb/sysconf.c b/libbb/sysconf.c index 031901980..cfad9cdc0 100644 --- a/libbb/sysconf.c +++ b/libbb/sysconf.c @@ -8,7 +8,7 @@ */ #include "libbb.h" -#if !defined(ARG_MAX) && defined(_SC_ARG_MAX) +#if !defined(bb_arg_max) unsigned FAST_FUNC bb_arg_max(void) { return sysconf(_SC_ARG_MAX); -- cgit v1.2.3-55-g6feb From 8d75d794ea505003fddea8e757d43976db8d6861 Mon Sep 17 00:00:00 2001 From: Bartosz Golaszewski Date: Thu, 27 Nov 2014 13:20:24 +0100 Subject: libbb: use sendfile() to copy data between file descriptors Busybox already uses sendfile in httpd. This patch proposes to use it globally to copy data between file descriptors. It speeds up the copying on slow systems a lot - below are the times needed to copy a 450Mb file with and without this option enabled on a BeagleBone Black: sendfile: user 0m0.000s sys 0m8.170s read/write 4k: user 0m0.470s sys 0m16.300s function old new delta bb_full_fd_action 394 474 +80 Signed-off-by: Bartosz Golaszewski Signed-off-by: Denys Vlasenko --- Config.in | 12 +++++++ libbb/copyfd.c | 87 +++++++++++++++++++++++++++++++++------------------ networking/Config.src | 8 ----- networking/httpd.c | 6 ++-- 4 files changed, 71 insertions(+), 42 deletions(-) (limited to 'libbb') diff --git a/Config.in b/Config.in index b83beb52d..285fe0a19 100644 --- a/Config.in +++ b/Config.in @@ -264,6 +264,18 @@ config PAM Use PAM in some busybox applets (currently login and httpd) instead of direct access to password database. +config FEATURE_USE_SENDFILE + bool "Use sendfile system call" + default y + help + When enabled, busybox will use the kernel sendfile() function + instead of read/write loops to copy data between file descriptors + (for example, cp command does this a lot). + If sendfile() doesn't work, copying code falls back to read/write + loop. sendfile() was originally implemented for faster I/O + from files to sockets, but since Linux 2.6.33 it was extended + to work for many more file types. + config LONG_OPTS bool "Support for --long-options" default y diff --git a/libbb/copyfd.c b/libbb/copyfd.c index eda2747f9..7e3531903 100644 --- a/libbb/copyfd.c +++ b/libbb/copyfd.c @@ -8,6 +8,20 @@ */ #include "libbb.h" +#if ENABLE_FEATURE_USE_SENDFILE +# include +#else +# define sendfile(a,b,c,d) (-1) +#endif + +/* + * We were using 0x7fff0000 as sendfile chunk size, but it + * was seen to cause largish delays when user tries to ^C a file copy. + * Let's use a saner size. + * Note: needs to be >= max(CONFIG_FEATURE_COPYBUF_KB), + * or else "copy to eof" code will use neddlesly short reads. + */ +#define SENDFILE_BIGBUF (16*1024*1024) /* Used by NOFORK applets (e.g. cat) - must not use xmalloc. * size < 0 means "ignore write errors", used by tar --to-command @@ -18,12 +32,13 @@ static off_t bb_full_fd_action(int src_fd, int dst_fd, off_t size) int status = -1; off_t total = 0; bool continue_on_write_error = 0; -#if CONFIG_FEATURE_COPYBUF_KB <= 4 + ssize_t sendfile_sz; +#if CONFIG_FEATURE_COPYBUF_KB > 4 + char *buffer = buffer; /* for compiler */ + int buffer_size = 0; +#else char buffer[CONFIG_FEATURE_COPYBUF_KB * 1024]; enum { buffer_size = sizeof(buffer) }; -#else - char *buffer; - int buffer_size; #endif if (size < 0) { @@ -31,46 +46,58 @@ static off_t bb_full_fd_action(int src_fd, int dst_fd, off_t size) continue_on_write_error = 1; } -#if CONFIG_FEATURE_COPYBUF_KB > 4 - if (size > 0 && size <= 4 * 1024) - goto use_small_buf; - /* We want page-aligned buffer, just in case kernel is clever - * and can do page-aligned io more efficiently */ - buffer = mmap(NULL, CONFIG_FEATURE_COPYBUF_KB * 1024, - PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANON, - /* ignored: */ -1, 0); - buffer_size = CONFIG_FEATURE_COPYBUF_KB * 1024; - if (buffer == MAP_FAILED) { - use_small_buf: - buffer = alloca(4 * 1024); - buffer_size = 4 * 1024; - } -#endif - if (src_fd < 0) goto out; + sendfile_sz = !ENABLE_FEATURE_USE_SENDFILE + ? 0 + : SENDFILE_BIGBUF; if (!size) { - size = buffer_size; + size = SENDFILE_BIGBUF; status = 1; /* copy until eof */ } while (1) { ssize_t rd; - rd = safe_read(src_fd, buffer, size > buffer_size ? buffer_size : size); - - if (!rd) { /* eof - all done */ - status = 0; - break; + if (sendfile_sz) { + rd = sendfile(dst_fd, src_fd, NULL, + size > sendfile_sz ? sendfile_sz : size); + if (rd >= 0) + goto read_ok; + sendfile_sz = 0; /* do not try sendfile anymore */ + } +#if CONFIG_FEATURE_COPYBUF_KB > 4 + if (buffer_size == 0) { + if (size > 0 && size <= 4 * 1024) + goto use_small_buf; + /* We want page-aligned buffer, just in case kernel is clever + * and can do page-aligned io more efficiently */ + buffer = mmap(NULL, CONFIG_FEATURE_COPYBUF_KB * 1024, + PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANON, + /* ignored: */ -1, 0); + buffer_size = CONFIG_FEATURE_COPYBUF_KB * 1024; + if (buffer == MAP_FAILED) { + use_small_buf: + buffer = alloca(4 * 1024); + buffer_size = 4 * 1024; + } } +#endif + rd = safe_read(src_fd, buffer, + size > buffer_size ? buffer_size : size); if (rd < 0) { bb_perror_msg(bb_msg_read_error); break; } + read_ok: + if (!rd) { /* eof - all done */ + status = 0; + break; + } /* dst_fd == -1 is a fake, else... */ - if (dst_fd >= 0) { + if (dst_fd >= 0 && !sendfile_sz) { ssize_t wr = full_write(dst_fd, buffer, rd); if (wr < rd) { if (!continue_on_write_error) { @@ -92,10 +119,8 @@ static off_t bb_full_fd_action(int src_fd, int dst_fd, off_t size) } out: -#if CONFIG_FEATURE_COPYBUF_KB > 4 - if (buffer_size != 4 * 1024) + if (buffer_size > 4 * 1024) munmap(buffer, buffer_size); -#endif return status ? -1 : total; } diff --git a/networking/Config.src b/networking/Config.src index e56646917..15a696876 100644 --- a/networking/Config.src +++ b/networking/Config.src @@ -181,14 +181,6 @@ config FEATURE_HTTPD_RANGES "Range: bytes=NNN-[MMM]" header. Allows for resuming interrupted downloads, seeking in multimedia players etc. -config FEATURE_HTTPD_USE_SENDFILE - bool "Use sendfile system call" - default y - depends on HTTPD - help - When enabled, httpd will use the kernel sendfile() function - instead of read/write loop. - config FEATURE_HTTPD_SETUID bool "Enable -u option" default y diff --git a/networking/httpd.c b/networking/httpd.c index 621d9cddc..9cf080401 100644 --- a/networking/httpd.c +++ b/networking/httpd.c @@ -133,7 +133,7 @@ # include # include #endif -#if ENABLE_FEATURE_HTTPD_USE_SENDFILE +#if ENABLE_FEATURE_USE_SENDFILE # include #endif /* amount of buffering in a pipe */ @@ -1624,7 +1624,7 @@ static NOINLINE void send_file_and_exit(const char *url, int what) #endif if (what & SEND_HEADERS) send_headers(HTTP_OK); -#if ENABLE_FEATURE_HTTPD_USE_SENDFILE +#if ENABLE_FEATURE_USE_SENDFILE { off_t offset = range_start; while (1) { @@ -1654,7 +1654,7 @@ static NOINLINE void send_file_and_exit(const char *url, int what) break; } if (count < 0) { - IF_FEATURE_HTTPD_USE_SENDFILE(fin:) + IF_FEATURE_USE_SENDFILE(fin:) if (verbose > 1) bb_perror_msg("error"); } -- cgit v1.2.3-55-g6feb From d598a8d4e655b095c741f0cf73e139b3c9524da1 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Wed, 10 Dec 2014 17:22:13 +0100 Subject: lineedit: don't fall back to simple line input if tty is in raw mode Testcase: shell command input after python ^Z should still work Signed-off-by: Denys Vlasenko --- libbb/lineedit.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'libbb') diff --git a/libbb/lineedit.c b/libbb/lineedit.c index 85643079b..3961b1de3 100644 --- a/libbb/lineedit.c +++ b/libbb/lineedit.c @@ -2256,9 +2256,13 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman INIT_S(); if (tcgetattr(STDIN_FILENO, &initial_settings) < 0 - || !(initial_settings.c_lflag & ECHO) + || (initial_settings.c_lflag & (ECHO|ICANON)) == ICANON ) { - /* Happens when e.g. stty -echo was run before */ + /* Happens when e.g. stty -echo was run before. + * But if ICANON is not set, we don't come here. + * (example: interactive python ^Z-backgrounded, + * tty is still in "raw mode"). + */ parse_and_put_prompt(prompt); /* fflush_all(); - done by parse_and_put_prompt */ if (fgets(command, maxsize, stdin) == NULL) -- cgit v1.2.3-55-g6feb