Add --with-timeoutfactor=NUM to specify TIMEOUTFACTOR
Checks
| Context |
Check |
Description |
| dj/TryBot-apply_patch |
success
|
Patch applied to master at the time it was sent
|
| dj/TryBot-32bit |
success
|
Build for i686
|
Commit Message
On Ice Lake and Tiger Lake laptops, some test programs timeout when there
are 3 "make check -j8" runs in parallel. Add --with-timeoutfactor=NUM to
specify an integer to scale the timeout of test programs, which can be
overriden by TIMEOUTFACTOR environment variable.
---
INSTALL | 3 +++
config.h.in | 3 +++
configure | 16 ++++++++++++++++
configure.ac | 7 +++++++
manual/install.texi | 3 +++
support/support_test_main.c | 2 +-
6 files changed, 33 insertions(+), 1 deletion(-)
Comments
* H. J. Lu via Libc-alpha:
> diff --git a/manual/install.texi b/manual/install.texi
> index 46f73b538d..832a7ac0fe 100644
> --- a/manual/install.texi
> +++ b/manual/install.texi
> @@ -131,6 +131,9 @@ that the objects in @file{libc_nonshared.a} are compiled with this flag
> (although this will not affect the generated code in this particular
> case and potentially change debugging information and metadata only).
>
> +@item --with-timeoutfactor=@var{NUM}
> +Specify an integer @var{NUM} to scale the timeout of test programs.
Maybe add “This factor can be set at run time using @env{TIMEOUTFACTOR}
environment variable.”?
The mechanics of the patch look right to me.
Thanks,
Florian
On Sat, Dec 4, 2021 at 12:37 PM Florian Weimer <fweimer@redhat.com> wrote:
>
> * H. J. Lu via Libc-alpha:
>
> > diff --git a/manual/install.texi b/manual/install.texi
> > index 46f73b538d..832a7ac0fe 100644
> > --- a/manual/install.texi
> > +++ b/manual/install.texi
> > @@ -131,6 +131,9 @@ that the objects in @file{libc_nonshared.a} are compiled with this flag
> > (although this will not affect the generated code in this particular
> > case and potentially change debugging information and metadata only).
> >
> > +@item --with-timeoutfactor=@var{NUM}
> > +Specify an integer @var{NUM} to scale the timeout of test programs.
>
> Maybe add “This factor can be set at run time using @env{TIMEOUTFACTOR}
> environment variable.”?
I changed it to
@item --with-timeoutfactor=@var{NUM}
Specify an integer @var{NUM} to scale the timeout of test programs.
This factor can be changed at run time using @env{TIMEOUTFACTOR}
environment variable.
in the v2 patch.
> The mechanics of the patch look right to me.
>
> Thanks,
> Florian
>
Thanks.
@@ -106,6 +106,9 @@ if 'CFLAGS' is specified it must enable optimization. For example:
particular case and potentially change debugging information and
metadata only).
+'--with-timeoutfactor=NUM'
+ Specify an integer NUM to scale the timeout of test programs.
+
'--disable-shared'
Don't build shared libraries even if it is possible. Not all
systems support shared libraries; you need ELF support and
@@ -196,6 +196,9 @@
/* Define to 1 if libpthread actually resides in libc. */
#define PTHREAD_IN_LIBC 0
+/* An integer used to scale the timeout of test programs. */
+#define TIMEOUTFACTOR 1
+
/*
*/
@@ -764,6 +764,7 @@ with_selinux
with_headers
with_default_link
with_nonshared_cflags
+with_timeoutfactor
enable_sanity_checks
enable_shared
enable_profile
@@ -1482,6 +1483,8 @@ Optional Packages:
--with-default-link do not use explicit linker scripts
--with-nonshared-cflags=CFLAGS
build nonshared libraries with additional CFLAGS
+ --with-timeoutfactor=NUM
+ specify an integer to scale the timeout
--with-cpu=CPU select code for CPU variant
Some influential environment variables:
@@ -3386,6 +3389,19 @@ fi
+
+# Check whether --with-timeoutfactor was given.
+if test "${with_timeoutfactor+set}" = set; then :
+ withval=$with_timeoutfactor; timeoutfactor=$withval
+else
+ timeoutfactor=1
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define TIMEOUTFACTOR $timeoutfactor
+_ACEOF
+
+
# Check whether --enable-sanity-checks was given.
if test "${enable_sanity_checks+set}" = set; then :
enableval=$enable_sanity_checks; enable_sanity=$enableval
@@ -163,6 +163,13 @@ AC_ARG_WITH([nonshared-cflags],
[extra_nonshared_cflags=])
AC_SUBST(extra_nonshared_cflags)
+AC_ARG_WITH([timeoutfactor],
+ AS_HELP_STRING([--with-timeoutfactor=NUM],
+ [specify an integer to scale the timeout]),
+ [timeoutfactor=$withval],
+ [timeoutfactor=1])
+AC_DEFINE_UNQUOTED(TIMEOUTFACTOR, $timeoutfactor)
+
AC_ARG_ENABLE([sanity-checks],
AS_HELP_STRING([--disable-sanity-checks],
[really do not use threads (should not be used except in special situations) @<:@default=yes@:>@]),
@@ -131,6 +131,9 @@ that the objects in @file{libc_nonshared.a} are compiled with this flag
(although this will not affect the generated code in this particular
case and potentially change debugging information and metadata only).
+@item --with-timeoutfactor=@var{NUM}
+Specify an integer @var{NUM} to scale the timeout of test programs.
+
@c disable static doesn't work currently
@c @item --disable-static
@c Don't build static libraries. Static libraries aren't that useful these
@@ -286,7 +286,7 @@ support_test_main (int argc, char **argv, const struct test_config *config)
int direct = 0; /* Directly call the test function? */
int status;
int opt;
- unsigned int timeoutfactor = 1;
+ unsigned int timeoutfactor = TIMEOUTFACTOR;
pid_t termpid;
/* If we're debugging the test, we need to disable timeouts and use