From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id EC11E39A1833; Sat, 14 Nov 2020 00:16:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EC11E39A1833 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r11-5021] libstdc++: Remove redundant overflow check for futex timeout [PR 93456] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: e400a64936efdc2424044aa74c0424df16242d2d X-Git-Newrev: b8d36dcc917e8a06d8c20b9f5ecc920ed2b9e947 Message-Id: <20201114001611.EC11E39A1833@sourceware.org> Date: Sat, 14 Nov 2020 00:16:11 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Nov 2020 00:16:12 -0000 https://gcc.gnu.org/g:b8d36dcc917e8a06d8c20b9f5ecc920ed2b9e947 commit r11-5021-gb8d36dcc917e8a06d8c20b9f5ecc920ed2b9e947 Author: Jonathan Wakely Date: Fri Nov 13 20:57:15 2020 +0000 libstdc++: Remove redundant overflow check for futex timeout [PR 93456] The relative_timespec function already checks for the case where the specified timeout is in the past, so the difference can never be negative. That means we dn't need to check if it's more negative than the minimum time_t value. libstdc++-v3/ChangeLog: PR libstdc++/93456 * src/c++11/futex.cc (relative_timespec): Remove redundant check negative values. * testsuite/30_threads/future/members/wait_until_overflow.cc: Moved to... * testsuite/30_threads/future/members/93456.cc: ...here. Diff: --- libstdc++-v3/src/c++11/futex.cc | 26 ++++++++++++---------- .../members/{wait_until_overflow.cc => 93456.cc} | 0 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/libstdc++-v3/src/c++11/futex.cc b/libstdc++-v3/src/c++11/futex.cc index 15959cebee5..c008798318c 100644 --- a/libstdc++-v3/src/c++11/futex.cc +++ b/libstdc++-v3/src/c++11/futex.cc @@ -73,21 +73,23 @@ namespace return rt; } - auto rel_s = abs_s.count() - now_s; + const auto rel_s = abs_s.count() - now_s; - // Avoid overflows + // Convert the absolute timeout to a relative timeout, without overflow. if (rel_s > __int_traits::__max) [[unlikely]] - rel_s = __int_traits::__max; - else if (rel_s < __int_traits::__min) [[unlikely]] - rel_s = __int_traits::__min; - - // Convert the absolute timeout value to a relative timeout - rt.tv_sec = rel_s; - rt.tv_nsec = abs_ns.count() - now_ns; - if (rt.tv_nsec < 0) { - rt.tv_nsec += 1000000000; - --rt.tv_sec; + rt.tv_sec = __int_traits::__max; + rt.tv_nsec = 999999999; + } + else + { + rt.tv_sec = rel_s; + rt.tv_nsec = abs_ns.count() - now_ns; + if (rt.tv_nsec < 0) + { + rt.tv_nsec += 1000000000; + --rt.tv_sec; + } } return rt; diff --git a/libstdc++-v3/testsuite/30_threads/future/members/wait_until_overflow.cc b/libstdc++-v3/testsuite/30_threads/future/members/93456.cc similarity index 100% rename from libstdc++-v3/testsuite/30_threads/future/members/wait_until_overflow.cc rename to libstdc++-v3/testsuite/30_threads/future/members/93456.cc