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 B8AA13858012 for ; Wed, 31 Mar 2021 12:50:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org B8AA13858012 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 4F9R3s2Skpz1s31b; Wed, 31 Mar 2021 14:50:01 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4F9R3s1Tvxz1qqw6; Wed, 31 Mar 2021 14:50:01 +0200 (CEST) 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 Xr1G95Ie5K1t; Wed, 31 Mar 2021 14:49:59 +0200 (CEST) X-Auth-Info: IfNWAPU+szlm9yg1JWeb/OWMpuVwvYteDig6Vn5AYmU= 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; Wed, 31 Mar 2021 14:49:59 +0200 (CEST) Date: Wed, 31 Mar 2021 14:49:52 +0200 From: Lukasz Majewski To: Joseph Myers , Adhemerval Zanella Cc: Paul Eggert , Arnd Bergmann , GNU C Library , Florian Weimer , Carlos O'Donell Subject: Re: [PATCH v2] tst: Add test for adjtime Message-ID: <20210331144952.45eb7202@jawa> In-Reply-To: <20210324130102.9752-1-lukma@denx.de> References: <20210324130102.9752-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_/HcDf8iEU13jNtWvkzvtykai"; protocol="application/pgp-signature" X-Spam-Status: No, score=-14.5 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: Wed, 31 Mar 2021 12:50:06 -0000 --Sig_/HcDf8iEU13jNtWvkzvtykai Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Dear Community, > This code provides test to check if time on target machine is properly > adjusted. > The time is altered only when cross-test-ssh.sh is executed with > --allow-time-setting flag. >=20 > As the delta added to clock is only 1 sec the original time is not > restored and further tests are executed with this bias. >=20 > It is important to note that adjtime() adjusts the system time with > small amounts in each second (it is in fact a wrapper on clock_adjtime > with modes =3D ADJ_OFFSET_SINGLESHOT). In other words some seconds > (may be a random value) needs to elapse until the required time offset > is added to the clock. It may take considerable time (in minutes) to > adjust clock by e.g. 1 second. >=20 > To handle that the struct timeval odelta is passed to adjtime (NULL, > &odelta) to get information of the still required delta to be added > to clock. This is done in loop until its members are equal to 0. >=20 > As a reference - CLOCK_MONOTONIC is used to check if CLOCK_REALTIME > has been adjusted. The difference between them is measured. >=20 > --- > Changes for v2: > - Correct code indentation > --- Gentle ping on this patch. Is this approach acceptable for testing adjtime?=20 > sysdeps/unix/sysv/linux/Makefile | 3 +- > sysdeps/unix/sysv/linux/tst-adjtime.c | 83 > +++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 1 > deletion(-) create mode 100644 sysdeps/unix/sysv/linux/tst-adjtime.c >=20 > diff --git a/sysdeps/unix/sysv/linux/Makefile > b/sysdeps/unix/sysv/linux/Makefile index ddc1e748e6..30c8629386 100644 > --- a/sysdeps/unix/sysv/linux/Makefile > +++ b/sysdeps/unix/sysv/linux/Makefile > @@ -113,7 +113,8 @@ tests +=3D tst-clone tst-clone2 tst-clone3 > tst-fanotify tst-personality \ tst-tgkill tst-sysvsem-linux > tst-sysvmsg-linux tst-sysvshm-linux \ tst-timerfd tst-ppoll > tst-futimens tst-utime tst-utimes \ tst-clock_adjtime tst-adjtimex > tst-ntp_adjtime tst-ntp_gettime \ > - tst-ntp_gettimex tst-sigtimedwait tst-futimes tst-lutimes > + tst-ntp_gettimex tst-sigtimedwait tst-futimes tst-lutimes \ > + tst-adjtime > =20 > # Test for the symbol version of fcntl that was replaced in glibc > 2.28. ifeq ($(have-GLIBC_2.27)$(build-shared),yesyes) > diff --git a/sysdeps/unix/sysv/linux/tst-adjtime.c > b/sysdeps/unix/sysv/linux/tst-adjtime.c new file mode 100644 > index 0000000000..4b24fcb890 > --- /dev/null > +++ b/sysdeps/unix/sysv/linux/tst-adjtime.c > @@ -0,0 +1,83 @@ > +/* Test for adjtime. > + 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 > +#include > +#include > +#include > + > +#define TIMEOUT (60*10) > +#define ADJTIME_LOOP_SLEEP 10000 > + > +static int > +do_test (void) > +{ > + struct timespec tv_then, tv_now, tv_then_m, tv_now_m; > + struct timeval delta, odelta; > + int ret; > + > + /* Check if altering target time is allowed. */ > + if (getenv (SETTIME_ENV_NAME) =3D=3D NULL) > + FAIL_UNSUPPORTED ("adjtime is executed only when "\ > + SETTIME_ENV_NAME" is set\n"); > + > + tv_then =3D xclock_now (CLOCK_REALTIME); > + tv_then_m =3D xclock_now (CLOCK_MONOTONIC); > + > + /* Setup time value to adjust - 1 sec. */ > + delta.tv_sec =3D 1; > + delta.tv_usec =3D 0; > + > + ret =3D adjtime (&delta, NULL); > + if (ret =3D=3D -1) > + FAIL_EXIT1 ("adjtime failed: %m\n"); > + > + /* As adjtime adjust clock time gradually by some small percentage > + of delta in each second one needs to check if this process has > + been finished. */ > + do > + { > + ret =3D adjtime (NULL, &odelta); > + if (ret =3D=3D -1) > + FAIL_EXIT1 ("adjtime failed: %m\n"); > + > + ret =3D usleep (ADJTIME_LOOP_SLEEP); > + if (ret !=3D 0) > + FAIL_EXIT1 ("usleep failed: %m\n"); > + } > + while ( ! (odelta.tv_sec =3D=3D 0 && odelta.tv_usec =3D=3D 0)); > + > + tv_now =3D xclock_now (CLOCK_REALTIME); > + tv_now_m =3D xclock_now (CLOCK_MONOTONIC); > + > + /* Check if adjtime adjusted the system time. */ > + struct timespec r =3D timespec_sub (tv_now, tv_then); > + struct timespec r_m =3D timespec_sub (tv_now_m, tv_then_m); > + > + struct timespec r_adjtime =3D timespec_sub (r, r_m); > + > + TEST_COMPARE (support_timespec_check_in_range > + ((struct timespec) { 1, 0 }, r_adjtime, 0.9, 1.1), > 1); + > + return 0; > +} > + > +#include 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_/HcDf8iEU13jNtWvkzvtykai Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEgAyFJ+N6uu6+XupJAR8vZIA0zr0FAmBkb/AACgkQAR8vZIA0 zr2jIQf+KGDl9xRLdHK94jlQZ/Ei1ubF4jE8IvISuDSmAGQB/I9Mx09iH9ecG/9d fbJ1R7WlPE5SL/S2CI+K+L+OBK6kFi7kFGSL5XGHhs8NJeaNiZUv8aQ6USn/nbCC +Zt10XWmTTB7ZrWwblt3Z+zM/E+ZOVLF/W8R+OhLP4nTANMztBLWf4mlQpgoXmn0 ypC/s/qwFDC7wZTFjwIWGUdbXdTV3A7GFfeIAd+U3oNv3s3H7L++kFMVlt3TWR/D IDaiS1sB0sz1K4ngYlADqU+9EC7SZ25QfraXHSN4VeENIEYLWEdQdq4BTtYL/Hwd gWObor/HqlX2k9yw+5+Hx3cCwgPW8w== =3azd -----END PGP SIGNATURE----- --Sig_/HcDf8iEU13jNtWvkzvtykai--