From patchwork Sat Dec 4 20:45:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 48501 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 791DD3858411 for ; Sat, 4 Dec 2021 20:48:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 791DD3858411 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1638650886; bh=XA5hHCs4q3YTmI2wrPhhYmiKNuWAhsxv5VDAW46W6gI=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=mpW65LgFxVXRxm4TclKLN3pdrSBWNlurbNu/Zbo7rQ+QNrQ2yfr578mcsF2ixKR2C 095JJCvbYZOK0ryiT5m8MgJJLBQcw1RhWPJW83oO2gjRHSlmqi/7TqT9wz+MnVj3ti mm6BNLnFkmCUhayNH8peAHkfn2Bhi67mHKyURUtk= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pj1-x1035.google.com (mail-pj1-x1035.google.com [IPv6:2607:f8b0:4864:20::1035]) by sourceware.org (Postfix) with ESMTPS id E4979385842B for ; Sat, 4 Dec 2021 20:45:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E4979385842B Received: by mail-pj1-x1035.google.com with SMTP id n15-20020a17090a160f00b001a75089daa3so7854687pja.1 for ; Sat, 04 Dec 2021 12:45:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=XA5hHCs4q3YTmI2wrPhhYmiKNuWAhsxv5VDAW46W6gI=; b=0VwyvOrF16jlW8eZ1ALIc0NKTwCjWaECpDkg34IMsEtHd+AkrPK1JmqT/WoPax95Hu 7GX3FdNziIvzeAUfdG1aiWcyEoljpzTW8QboVjgWqMS30/S29YUKmJNIFqwMHM3xb+Nq iRXHxQ99cdmG/iaMddlfuIEUtTrIFUbih31bz3pK2cyZqJ1tB2DxHmJTc2s9JE2bZwXV P9RCUjfpeLhqFbgQXQSR2i6LKdW4036TvtgMspNnmuXpurUwf1QHRH79Hcgzs3khBkxM QADv+/4lrHiThsaQTQEMViVt1AAL5fK4pflAbOB9+HzB4TbNH73YwmFNdGnv1QCCthPh Xeaw== X-Gm-Message-State: AOAM531QdTVzv+3x9k81ZNbb2QrR6fESDHRgmYi2/PyhBk/vKAgKvABy BX3f7qXAlkoginagyhP0nwR/+PtmO1o= X-Google-Smtp-Source: ABdhPJwAFPrB5fQFSIrDsQwNVDeHGXDUL+9STY4u2KCEttpheKJnrqHbyd8OQHSSWnKpbXux1g0nCA== X-Received: by 2002:a17:90a:f00e:: with SMTP id bt14mr24653245pjb.219.1638650728871; Sat, 04 Dec 2021 12:45:28 -0800 (PST) Received: from gnu-tgl-3.localdomain (71-222-78-46.lsv2.qwest.net. [71.222.78.46]) by smtp.gmail.com with ESMTPSA id j1sm7832980pfu.47.2021.12.04.12.45.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Dec 2021 12:45:28 -0800 (PST) Received: from gnu-tgl-3.. (localhost [IPv6:::1]) by gnu-tgl-3.localdomain (Postfix) with ESMTP id D96D1C0710; Sat, 4 Dec 2021 12:45:27 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH v2] Add --with-timeoutfactor=NUM to specify TIMEOUTFACTOR Date: Sat, 4 Dec 2021 12:45:27 -0800 Message-Id: <20211204204527.3749101-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.33.1 MIME-Version: 1.0 X-Spam-Status: No, score=-3031.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: "H.J. Lu via Libc-alpha" From: "H.J. Lu" Reply-To: "H.J. Lu" Cc: Florian Weimer Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" 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 | 5 +++++ config.h.in | 3 +++ configure | 16 ++++++++++++++++ configure.ac | 7 +++++++ manual/install.texi | 5 +++++ support/support_test_main.c | 2 +- 6 files changed, 37 insertions(+), 1 deletion(-) diff --git a/INSTALL b/INSTALL index 02dcf6b1ca..899d7f1ed7 100644 --- a/INSTALL +++ b/INSTALL @@ -106,6 +106,11 @@ 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. This + factor can be changed at run time using 'TIMEOUTFACTOR' environment + variable. + '--disable-shared' Don't build shared libraries even if it is possible. Not all systems support shared libraries; you need ELF support and diff --git a/config.h.in b/config.h.in index 0a6f57b006..2f5124684e 100644 --- a/config.h.in +++ b/config.h.in @@ -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 + /* */ diff --git a/configure b/configure index 2f9adca064..e4d013907c 100755 --- a/configure +++ b/configure @@ -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 diff --git a/configure.ac b/configure.ac index 7eb4239359..a91a7f399c 100644 --- a/configure.ac +++ b/configure.ac @@ -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@:>@]), diff --git a/manual/install.texi b/manual/install.texi index 46f73b538d..fce5155c22 100644 --- a/manual/install.texi +++ b/manual/install.texi @@ -131,6 +131,11 @@ 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. +This factor can be changed at run time using @env{TIMEOUTFACTOR} +environment variable. + @c disable static doesn't work currently @c @item --disable-static @c Don't build static libraries. Static libraries aren't that useful these diff --git a/support/support_test_main.c b/support/support_test_main.c index 66a754b84f..0e07dc53cd 100644 --- a/support/support_test_main.c +++ b/support/support_test_main.c @@ -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