From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Wed, 26 Nov 2014 14:17:59 +0000 (+0100)
Subject: libbb: use ARG_MAX for bb_arg_max() only if it's 60k+
X-Git-Tag: 1_23_0~18
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=04c14176023c65550fd46c2e44a1aa04d426d69a;p=oweals%2Fbusybox.git

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 <vda.linux@googlemail.com>
---

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);