From patchwork Wed Mar 24 13:01:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 42766 X-Patchwork-Delegate: azanella@linux.vnet.ibm.com 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 0D3733857C5F; Wed, 24 Mar 2021 13:01:24 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-out.m-online.net (mail-out.m-online.net [212.18.0.9]) by sourceware.org (Postfix) with ESMTPS id 319963857C50 for ; Wed, 24 Mar 2021 13:01:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 319963857C50 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 4F57f41MKjz1qtxP; Wed, 24 Mar 2021 14:01:16 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4F57f40YWtz1qskC; Wed, 24 Mar 2021 14:01:16 +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 0okWalz-jasn; Wed, 24 Mar 2021 14:01:13 +0100 (CET) X-Auth-Info: xVKD+78TKpJGfgvcvMjohYbqItMZguMA41d2k6JTVmQ= Received: from localhost.localdomain (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, 24 Mar 2021 14:01:13 +0100 (CET) From: Lukasz Majewski To: Joseph Myers , Adhemerval Zanella Subject: [PATCH v2] tst: Add test for adjtime Date: Wed, 24 Mar 2021 14:01:02 +0100 Message-Id: <20210324130102.9752-1-lukma@denx.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 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: , Cc: Florian Weimer , GNU C Library Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" 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. As the delta added to clock is only 1 sec the original time is not restored and further tests are executed with this bias. 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 = 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. 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. As a reference - CLOCK_MONOTONIC is used to check if CLOCK_REALTIME has been adjusted. The difference between them is measured. --- Changes for v2: - Correct code indentation --- 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 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 += 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 # 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) == NULL) + FAIL_UNSUPPORTED ("adjtime is executed only when "\ + SETTIME_ENV_NAME" is set\n"); + + tv_then = xclock_now (CLOCK_REALTIME); + tv_then_m = xclock_now (CLOCK_MONOTONIC); + + /* Setup time value to adjust - 1 sec. */ + delta.tv_sec = 1; + delta.tv_usec = 0; + + ret = adjtime (&delta, NULL); + if (ret == -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 = adjtime (NULL, &odelta); + if (ret == -1) + FAIL_EXIT1 ("adjtime failed: %m\n"); + + ret = usleep (ADJTIME_LOOP_SLEEP); + if (ret != 0) + FAIL_EXIT1 ("usleep failed: %m\n"); + } + while ( ! (odelta.tv_sec == 0 && odelta.tv_usec == 0)); + + tv_now = xclock_now (CLOCK_REALTIME); + tv_now_m = xclock_now (CLOCK_MONOTONIC); + + /* Check if adjtime adjusted the system time. */ + struct timespec r = timespec_sub (tv_now, tv_then); + struct timespec r_m = timespec_sub (tv_now_m, tv_then_m); + + struct timespec r_adjtime = 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