generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

N3191: C++ Timeout Specification

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@119909 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Howard Hinnant
2010-11-20 19:16:30 +00:00
parent f048fe3a09
commit f8f852138f
23 changed files with 63 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/__mutex_base
View File

@@ -382,11 +382,11 @@ condition_variable::wait_for(unique_lock<mutex>& __lk,
const chrono::duration<_Rep, _Period>& __d)
{
using namespace chrono;
system_clock::time_point __s_now = system_clock::now();
monotonic_clock::time_point __c_now = monotonic_clock::now();
system_clock::time_point __s_now = system_clock::now();
steady_clock::time_point __c_now = steady_clock::now();
__do_timed_wait(__lk, __s_now + __ceil<nanoseconds>(__d));
return monotonic_clock::now() - __c_now < __d ? cv_status::no_timeout :
cv_status::timeout;
return steady_clock::now() - __c_now < __d ? cv_status::no_timeout :
cv_status::timeout;
}
template <class _Rep, class _Period, class _Predicate>
@@ -396,7 +396,7 @@ condition_variable::wait_for(unique_lock<mutex>& __lk,
const chrono::duration<_Rep, _Period>& __d,
_Predicate __pred)
{
return wait_until(__lk, chrono::monotonic_clock::now() + __d,
return wait_until(__lk, chrono::steady_clock::now() + __d,
_STD::move(__pred));
}