From: Jonathan Wakely <jwakely@redhat.com>
To: Mike Crowe <mac@mcrowe.com>
Cc: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org,
Tom Wood <tom.wood@redembedded.com>
Subject: Re: [PATCH] Use steady_clock to implement condition_variable::wait_for with predicate
Date: Tue, 25 Sep 2018 14:59:00 -0000 [thread overview]
Message-ID: <20180925145824.GX23172@redhat.com> (raw)
In-Reply-To: <20180912143527.18621-1-mac@mcrowe.com>
[-- Attachment #1: Type: text/plain, Size: 404 bytes --]
On 12/09/18 15:35 +0100, Mike Crowe wrote:
>In r263225 (d2e378182a12d68fe5caeffae681252662a2fe7b), I fixed
>condition_variable::wait_for to use std::chrono::steady_clock for the wait.
>Unfortunately, I failed to spot that the same fix is required for the
>wait_for variant that takes a predicate too.
Thanks, I'm going to commit this slightly tweaked patch (keeping the
line shorter than 80 columns).
[-- Attachment #2: patch.txt --]
[-- Type: text/x-patch, Size: 1469 bytes --]
commit 355442478e2876845564d502d83af4c59f601ec9
Author: Jonathan Wakely <jwakely@redhat.com>
Date: Tue Sep 25 15:10:56 2018 +0100
Use steady_clock to implement condition_variable::wait_for with predicate
In r263225 (d2e378182a12d68fe5caeffae681252662a2fe7b), I fixed
condition_variable::wait_for to use std::chrono::steady_clock for the wait.
Unfortunately, I failed to spot that the same fix is required for the
wait_for variant that takes a predicate too.
2018-09-25 Mike Crowe <mac@mcrowe.com>
* include/std/condition_variable (condition_variable::wait_for): Use
steady clock in overload that uses a predicate.
diff --git a/libstdc++-v3/include/std/condition_variable b/libstdc++-v3/include/std/condition_variable
index 1f84ea324eb..84173012b5b 100644
--- a/libstdc++-v3/include/std/condition_variable
+++ b/libstdc++-v3/include/std/condition_variable
@@ -158,11 +158,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
const chrono::duration<_Rep, _Period>& __rtime,
_Predicate __p)
{
- using __dur = typename __clock_t::duration;
+ using __dur = typename __steady_clock_t::duration;
auto __reltime = chrono::duration_cast<__dur>(__rtime);
if (__reltime < __rtime)
++__reltime;
- return wait_until(__lock, __clock_t::now() + __reltime, std::move(__p));
+ return wait_until(__lock, __steady_clock_t::now() + __reltime,
+ std::move(__p));
}
native_handle_type
prev parent reply other threads:[~2018-09-25 14:58 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-12 14:35 Mike Crowe
2018-09-25 14:59 ` Jonathan Wakely [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180925145824.GX23172@redhat.com \
--to=jwakely@redhat.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=libstdc++@gcc.gnu.org \
--cc=mac@mcrowe.com \
--cc=tom.wood@redembedded.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).