From patchwork Fri Feb 5 11:27:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 41947 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 97ACD39E4C28; Fri, 5 Feb 2021 11:28:13 +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.10]) by sourceware.org (Postfix) with ESMTPS id B00E7385DC39 for ; Fri, 5 Feb 2021 11:28:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org B00E7385DC39 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 4DXCpH1xvqz1s3pn; Fri, 5 Feb 2021 12:28:07 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4DXCpH0Ztkz1tYTp; Fri, 5 Feb 2021 12:28:07 +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 g1rPA94MNb48; Fri, 5 Feb 2021 12:28:04 +0100 (CET) X-Auth-Info: aPeC/VxsP3bNVu3TrGHFdp49whotw5Eh9vhizd6HpCE= 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; Fri, 5 Feb 2021 12:28:04 +0100 (CET) From: Lukasz Majewski To: Joseph Myers , Adhemerval Zanella , Florian Weimer Subject: [PATCH v3] tst: Provide test for ppoll Date: Fri, 5 Feb 2021 12:27:51 +0100 Message-Id: <20210205112751.13559-1-lukma@denx.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Spam-Status: No, score=-15.7 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: GNU C Library , Florian Weimer , Alistair Francis Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" 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). 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 --- 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 Changes for v3: - Use smaller timeout - 0.5s (TIMEOUT* defines can be removed) - Use TEST_TIMESPEC_NOW_OR_AFTER () to check if test has properly timed out --- sysdeps/unix/sysv/linux/Makefile | 2 +- sysdeps/unix/sysv/linux/tst-ppoll.c | 53 +++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 sysdeps/unix/sysv/linux/tst-ppoll.c 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 += 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 += tst-ofdlocks-compat tst-sigcontext-get_pc CFLAGS-tst-sigcontext-get_pc.c = -fasynchronous-unwind-tables diff --git a/sysdeps/unix/sysv/linux/tst-ppoll.c b/sysdeps/unix/sysv/linux/tst-ppoll.c new file mode 100644 index 0000000000..29d92485e8 --- /dev/null +++ b/sysdeps/unix/sysv/linux/tst-ppoll.c @@ -0,0 +1,53 @@ +/* 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 + +static int test_ppoll_timeout (bool zero_tmp) +{ + /* We wait for half a second. */ + struct timespec ts; + xclock_gettime (CLOCK_REALTIME, &ts); + struct timespec timeout = make_timespec (0, zero_tmo ? 0 : TIMESPEC_HZ/2); + ts = timespec_add (ts, timeout); + + /* Ignore fds - just wait for timeout. */ + struct pollfd fds = { -1, 0, 0 }; + TEST_COMPARE (ppoll (&fds, 1, &timeout, 0), 0); + + TEST_TIMESPEC_NOW_OR_AFTER (CLOCK_REALTIME, ts); + + return 0; +} + +static int +do_test (void) +{ + /* Check if ppoll exits immediately. */ + test_ppoll_timeout (true); + + /* Check if ppoll exits after specified timeout. */ + test_ppoll_timeout (false); + + return 0; +} + +#include