From patchwork Fri Apr 9 11:36:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 42935 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 9CC98385DC2E; Fri, 9 Apr 2021 11:36:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9CC98385DC2E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1617968209; bh=q03/tsUlcCjf7YhY/JPjnWbsdlsQCwvYU3X7ZUzI7WI=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=KR7etVDO//UhKWPzxA36pcNIhd3xtLvlaQs9x/oKpWfSAXp9wPw8ubGpW+V0HyfiS atEOkpfHmvOoThcStjvHe08NIjm7H77ns326Mpg5qDMlzvv67yqSs0EbRlGS38LDuS 2J+r+KNhJ2K0foCRSAb8FI4KKC4np27gvFftaMnE= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qt1-x836.google.com (mail-qt1-x836.google.com [IPv6:2607:f8b0:4864:20::836]) by sourceware.org (Postfix) with ESMTPS id 9FECE385DC2E for ; Fri, 9 Apr 2021 11:36:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 9FECE385DC2E Received: by mail-qt1-x836.google.com with SMTP id u8so3852896qtq.12 for ; Fri, 09 Apr 2021 04:36:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=q03/tsUlcCjf7YhY/JPjnWbsdlsQCwvYU3X7ZUzI7WI=; b=QspLYHn6YMUKT6zqv50VOzZ1WG1r+QBpC3oHwCrrBpyqbaVqewcK98H2OE68gA8QR0 Sxx+g4a4Wy9gGFZBzFW62/uXumGTDP5pE/8eLBH2EwJNhR7UVnZl5apfcqVZ8rA6xhH6 c1Z4gU/pDkpKE82BQUgI9B9dBNR9UNiN9qpcbRKszR2YaZ5SNANrzd8Hh0wQZyZcZ0bx K++P9VG0hrN2RikuxRu0yUdXsZ9WKUPO0OSlToU0x3HeKWyqOtpgHlqHTfQytW/+1PjT nfJ3TxEPgi17JQxLBoG5TkSSB7g5s6SOY/ugC5HLV3nZxrNRzMDh90Z56PjuRbn4nq2P VcdA== X-Gm-Message-State: AOAM533d3qlrOB96LiqLJeIvYyOfBpuFD5SjfBDw7tPnmS9gfPMfVWqq vWPWfIlPl8wl04klDkTHmQ8EDjF78OUljqU1 X-Google-Smtp-Source: ABdhPJxRcB3jyjfDZpjBshuELtIAfw0EC14gTp9ywsU60Jk7AKEhYZkAT5JHVKWZhgr/MYgjwSdR9A== X-Received: by 2002:ac8:6a04:: with SMTP id t4mr12432210qtr.258.1617968206065; Fri, 09 Apr 2021 04:36:46 -0700 (PDT) Received: from localhost.localdomain ([177.194.41.149]) by smtp.googlemail.com with ESMTPSA id n9sm1450226qkk.92.2021.04.09.04.36.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Apr 2021 04:36:45 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v2 2/2] linux: always update select timeout (BZ #27706) Date: Fri, 9 Apr 2021 08:36:39 -0300 Message-Id: <20210409113639.1124756-2-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210409113639.1124756-1-adhemerval.zanella@linaro.org> References: <20210409113639.1124756-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, 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-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Cc: Andreas Schwab Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" The timeout should be updated even on failure for time64 support. Checked on i686-linux-gnu. --- misc/tst-select.c | 30 ++++++++++++++++++++++++++++++ sysdeps/unix/sysv/linux/select.c | 4 ++-- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/misc/tst-select.c b/misc/tst-select.c index dc7717a7a6..9c817f4035 100644 --- a/misc/tst-select.c +++ b/misc/tst-select.c @@ -23,6 +23,7 @@ #include #include #include +#include struct child_args { @@ -30,6 +31,12 @@ struct child_args struct timeval tmo; }; +static void +alarm_handler (int signum) +{ + /* Do nothing. */ +} + static void do_test_child (void *clousure) { @@ -59,6 +66,22 @@ do_test_child (void *clousure) xwrite (args->fds[1][1], "foo", 3); } +static void +do_test_child_alarm (void *clousure) +{ + struct sigaction act = { .sa_handler = alarm_handler }; + xsigaction (SIGALRM, &act, NULL); + alarm (1); + + struct timeval tv = { .tv_sec = 10, .tv_usec = 0 }; + int r = select (0, NULL, NULL, NULL, &tv); + TEST_COMPARE (r, -1); + TEST_COMPARE (errno, EINTR); + + if (support_select_modify_timeout ()) + TEST_VERIFY (tv.tv_sec < 10); +} + static int do_test (void) { @@ -98,6 +121,13 @@ do_test (void) xclose (args.fds[0][0]); xclose (args.fds[1][1]); + { + struct support_capture_subprocess result; + result = support_capture_subprocess (do_test_child_alarm, NULL); + support_capture_subprocess_check (&result, "tst-select-child", 0, + sc_allow_none); + } + { fd_set rfds; FD_ZERO (&rfds); diff --git a/sysdeps/unix/sysv/linux/select.c b/sysdeps/unix/sysv/linux/select.c index d075270ff4..4e426f9aed 100644 --- a/sysdeps/unix/sysv/linux/select.c +++ b/sysdeps/unix/sysv/linux/select.c @@ -110,7 +110,7 @@ __select64 (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, r = SYSCALL_CANCEL (pselect6, nfds, readfds, writefds, exceptfds, pts32, NULL); # endif - if (r >= 0 && timeout != NULL) + if (timeout != NULL) *timeout = valid_timespec_to_timeval64 (ts32); #endif @@ -131,7 +131,7 @@ __select (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, ptv64 = &tv64; } int r = __select64 (nfds, readfds, writefds, exceptfds, ptv64); - if (r >= 0 && timeout != NULL) + if (timeout != NULL) /* The remanining timeout will be always less the input TIMEOUT. */ *timeout = valid_timeval64_to_timeval (tv64); return r;