From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from rock.gnat.com (rock.gnat.com [205.232.38.15]) by sourceware.org (Postfix) with ESMTPS id 9A6B0383568F; Wed, 22 Jun 2022 06:03:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 9A6B0383568F Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 48D6C1160FA; Wed, 22 Jun 2022 02:03:23 -0400 (EDT) X-Virus-Scanned: Debian amavisd-new at gnat.com Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 1QdQX41Oe5L0; Wed, 22 Jun 2022 02:03:23 -0400 (EDT) Received: from free.home (tron.gnat.com [IPv6:2620:20:4000:0:46a8:42ff:fe0e:e294]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by rock.gnat.com (Postfix) with ESMTPS id 124CF1160F1; Wed, 22 Jun 2022 02:03:22 -0400 (EDT) Received: from livre (livre.home [172.31.160.2]) by free.home (8.15.2/8.15.2) with ESMTPS id 25M63FWd723448 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 22 Jun 2022 03:03:15 -0300 From: Alexandre Oliva To: gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org Subject: [PATCH] libstdc++: async: tolerate slightly shorter sleep Organization: Free thinker, does not speak for AdaCore Errors-To: aoliva@lxoliva.fsfla.org Date: Wed, 22 Jun 2022 03:03:15 -0300 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Scanned-By: MIMEDefang 2.84 X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libstdc++@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++ mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Jun 2022 06:03:25 -0000 Even without frequent signals interrupting nanosleep, sleep_for on rtems on qemu wakes up too early by a predictable margin of less than 0,3%, which some async tests complain about the too-short wait times. Allow the tests to tolerate a little sleep deprivation. Regstrapped on x86_64-linux-gnu, also tested with a cross to aarch64-rtems6. Ok to install? for libstdc++-v3/ChangeLog * testsuite/30_threads/async/async.cc: Tolerate early wakeup. --- libstdc++-v3/testsuite/30_threads/async/async.cc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/testsuite/30_threads/async/async.cc b/libstdc++-v3/testsuite/30_threads/async/async.cc index 38943ff1a9a5e..b151677af6a0e 100644 --- a/libstdc++-v3/testsuite/30_threads/async/async.cc +++ b/libstdc++-v3/testsuite/30_threads/async/async.cc @@ -104,7 +104,8 @@ void test03() VERIFY( status == std::future_status::ready ); auto const elapsed = CLOCK::now() - start; - VERIFY( elapsed >= std::chrono::seconds(2) ); + auto const tolerance = std::chrono::milliseconds(6); + VERIFY( elapsed + tolerance >= std::chrono::seconds(2) ); VERIFY( elapsed < std::chrono::seconds(5) ); } @@ -169,7 +170,8 @@ void test_pr91486_wait_for() auto status = f1.wait_for(wait_time); auto const elapsed_steady = chrono::steady_clock::now() - start_steady; - VERIFY( elapsed_steady >= std::chrono::seconds(1) ); + auto const tolerance = std::chrono::milliseconds(3); + VERIFY( elapsed_steady + tolerance >= std::chrono::seconds(1) ); } // This is a clock with a very recent epoch which ensures that the difference @@ -222,7 +224,8 @@ void test_pr91486_wait_until() auto const elapsed_steady = chrono::steady_clock::now() - start_steady; // This checks that we didn't come back too soon - VERIFY( elapsed_steady >= std::chrono::seconds(1) ); + auto const tolerance = std::chrono::milliseconds(3); + VERIFY( elapsed_steady + tolerance >= std::chrono::seconds(1) ); // This checks that wait_until didn't busy wait checking the clock more times // than necessary. -- Alexandre Oliva, happy hacker https://FSFLA.org/blogs/lxo/ Free Software Activist GNU Toolchain Engineer Disinformation flourishes because many people care deeply about injustice but very few check the facts. Ask me about