From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-out.m-online.net (mail-out.m-online.net [212.18.0.10]) by sourceware.org (Postfix) with ESMTPS id 358C33858034 for ; Thu, 4 Feb 2021 14:42:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 358C33858034 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: sourceware.org; spf=none smtp.mailfrom=lukma@denx.de Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4DWh8z3c8pz1s7n0; Thu, 4 Feb 2021 15:42:27 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4DWh8z2SB5z1t6pZ; Thu, 4 Feb 2021 15:42:27 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id X1eNKaNDSt7r; Thu, 4 Feb 2021 15:42:25 +0100 (CET) X-Auth-Info: vjl+cavLNnVlm5k0Xn+xmWKU4Dfbyb/cRZ/byNgHaB4= Received: from jawa (85-222-111-42.dynamic.chello.pl [85.222.111.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA; Thu, 4 Feb 2021 15:42:25 +0100 (CET) Date: Thu, 4 Feb 2021 15:42:24 +0100 From: Lukasz Majewski To: Adhemerval Zanella Cc: Joseph Myers , Paul Eggert , Alistair Francis , Arnd Bergmann , Alistair Francis , GNU C Library , Florian Weimer , Carlos O'Donell , Florian Weimer , Zack Weinberg Subject: Re: [PATCH v2] tst: Provide test for ppoll Message-ID: <20210204154224.20f4e316@jawa> In-Reply-To: References: <20210114163239.16505-1-lukma@denx.de> Organization: denx.de X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/uDOxmaetzu9A=8t87Kp388V"; protocol="application/pgp-signature" X-Spam-Status: No, score=-15.8 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_LAZY_DOMAIN_SECURITY, KAM_SHORT, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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-List-Received-Date: Thu, 04 Feb 2021 14:42:32 -0000 --Sig_/uDOxmaetzu9A=8t87Kp388V Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Adhemerval, > On 14/01/2021 13:32, Lukasz Majewski wrote: > > This change adds new test to assess ppoll()'s timeout related > > functionality (the struct pollfd does not provide valid fd to wait > > for - just wait for timeout). > >=20 > > To be more specific - two use cases are checked: > > - if ppoll() times out immediately when passed struct timespec has > > zero values of tv_nsec and tv_sec. > > - if ppoll() times out after timeout specified in passed argument > >=20 > > --- > > Changes for v2: > > - Remove _GNU_SOURCE definition if not already defined > > - Replace clock_gettime with xclock_gettime > > - Use FAIL_EXIT1 instead of plain ret value returning from the test > > --- > > sysdeps/unix/sysv/linux/Makefile | 2 +- > > sysdeps/unix/sysv/linux/tst-ppoll.c | 62 > > +++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 1 > > deletion(-) create mode 100644 sysdeps/unix/sysv/linux/tst-ppoll.c > >=20 > > diff --git a/sysdeps/unix/sysv/linux/Makefile > > b/sysdeps/unix/sysv/linux/Makefile index 7503b356c8..f4029a74ca > > 100644 --- a/sysdeps/unix/sysv/linux/Makefile > > +++ b/sysdeps/unix/sysv/linux/Makefile > > @@ -108,7 +108,7 @@ tests +=3D tst-clone tst-clone2 tst-clone3 > > tst-fanotify tst-personality \ test-errno-linux tst-memfd_create > > tst-mlock2 tst-pkey \ tst-rlimit-infinity tst-ofdlocks tst-gettid > > tst-gettid-kill \ tst-tgkill tst-sysvsem-linux tst-sysvmsg-linux > > tst-sysvshm-linux \ > > - tst-timerfd > > + tst-timerfd tst-ppoll > > tests-internal +=3D tst-ofdlocks-compat tst-sigcontext-get_pc > > =20 > > CFLAGS-tst-sigcontext-get_pc.c =3D -fasynchronous-unwind-tables =20 >=20 > Ok. >=20 > > diff --git a/sysdeps/unix/sysv/linux/tst-ppoll.c > > b/sysdeps/unix/sysv/linux/tst-ppoll.c new file mode 100644 > > index 0000000000..eeff97f103 > > --- /dev/null > > +++ b/sysdeps/unix/sysv/linux/tst-ppoll.c > > @@ -0,0 +1,62 @@ > > +/* Test for ppoll timeout > > + Copyright (C) 2021 Free Software Foundation, Inc. > > + This file is part of the GNU C Library. > > + > > + The GNU C Library is free software; you can redistribute it > > and/or > > + modify it under the terms of the GNU Lesser General Public > > + License as published by the Free Software Foundation; either > > + version 2.1 of the License, or (at your option) any later > > version. + > > + The GNU C Library is distributed in the hope that it will be > > useful, > > + but WITHOUT ANY WARRANTY; without even the implied warranty of > > + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > > GNU > > + Lesser General Public License for more details. > > + > > + You should have received a copy of the GNU Lesser General Public > > + License along with the GNU C Library; if not, see > > + . */ > > + > > +#include > > +#include > > +#include > > +#include > > + > > +/* Timeout in seconds for PPOLL. */ > > +#define PPOLL_TIMEOUT 2 > > +/* Timeout for test program - must be larger than PPOLL_TIMEOUT. > > */ +#define TIMEOUT 3 =20 >=20 > This define is unused.=20 When TIMEOUT is not specified - the default time out for test is used (2 seconds). For the ppoll test we want to wait for 2 seconds, so without this local #define TIMEOUT 3 the test is terminated by glibc test suite before we go out from the ppoll. However, as we now wait for 0.5 sec, it is feasible to just remove it and used default settings. >=20 > > + > > +static int test_ppoll_timeout (int timeout) > > +{ > > + struct timespec tv0 =3D { 0, 0 }, tv1 =3D { 0, 0 }, tv =3D { 0, 0 }; > > + struct pollfd fds =3D { -1, 0, 0 }; /* Ignore fds - just wait > > for timeout. */ > > + int ret; > > + > > + tv.tv_sec =3D timeout; > > + > > + xclock_gettime (CLOCK_REALTIME, &tv0); > > + > > + ret =3D ppoll (&fds, 1, &tv, 0); > > + if (ret !=3D 0) > > + FAIL_EXIT1 ("*** ppoll failed: %m\n"); > > + > > + xclock_gettime (CLOCK_REALTIME, &tv1); > > + if (tv0.tv_sec + timeout !=3D tv1.tv_sec) > > + FAIL_EXIT1 ("*** ppoll failed to timeout after %d [s]\n", > > timeout); + > > + return 0; > > +} > > + > > +static int > > +do_test (void) > > +{ > > + /* Check if ppoll exits immediately. */ > > + test_ppoll_timeout (0); > > + > > + /* Check if ppoll exits after specified timeout. */ > > + test_ppoll_timeout (PPOLL_TIMEOUT); > > + > > + return 0; > > +} > > + > > +#include =20 >=20 > The exactly timeout check is subjected to a scheduler pressure and it > might indicate false positive depending of the system load. It would > be better to check only if subsequent clock_gettime returns a time > after previously than the ppoll check. Like: >=20 > static int test_ppoll_timeout (bool zero_tmo) > {=20 > /* We wait for half a second. */ > struct timespec ts; > xclock_gettime (CLOCK_REALTIME, &ts); > struct timespec timeout =3D make_timespec (0, zero_tmo ? 0 : > TIMESPEC_HZ/2); ts =3D timespec_add (ts, timeout); >=20 > /* Ignore fds - just wait for timeout. */ > struct pollfd fds =3D { -1, 0, 0 }; > TEST_COMPARE (ppoll (&fds, 1, &timeout, 0), 0); >=20 > TEST_TIMESPEC_NOW_OR_AFTER (CLOCK_REALTIME, ts); >=20 > return 0; > } >=20 > static int > do_test (void) > {=20 > /* Check if ppoll exits immediately. */ > test_ppoll_timeout (true); >=20 > /* Check if ppoll exits after specified timeout. */ > test_ppoll_timeout (false); >=20 > return 0; > } >=20 >=20 Thanks for the tip. I will add this code to the test. Best regards, Lukasz Majewski -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma@denx.de --Sig_/uDOxmaetzu9A=8t87Kp388V Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEgAyFJ+N6uu6+XupJAR8vZIA0zr0FAmAcB9AACgkQAR8vZIA0 zr2/zQgAjvS6B0yZ5nvKPn8eOjhxpkZGK/aowA2aHDoHkkXSSCf7J9cGBU4SI5o1 Fqj3h9+cbfMFjHgtlUttUBMg5X3YWtOh1aHbarWUCvYmaLe0iu7oAxbCAmqr++DX Ymalp4lBPVIQ6W5d4di6gX5NGaWE/xRtCoRqkIfOPtxJf4s2cGlaP0WviGKvKA8o 3imQdUFFygrhRxqQ+ZVR1nSuDPuCrFgZhlc6o6lu8OmELmISDxobRH0B9dk9LhRm LkfJsnJiLzbnqS5E+OwHI47J1Db/qiJgBooncSnqx7LMwRAEFK+yhiTbBPVBVUcf gwfZvHaRfJyH0FtB1jgkgDk5y1gHzA== =BN+y -----END PGP SIGNATURE----- --Sig_/uDOxmaetzu9A=8t87Kp388V--