Commit 04b9853a authored by Marshall Clow's avatar Marshall Clow
Browse files

Swap two lines in __mutex_base. On systems with high clock rates, we could... 

Swap two lines in __mutex_base. On systems with high clock rates, we could mistakenly return no_timeout when a mutex had timed out if we got a tick between these two lines.  Thanks to Brian Cain for the bug report.

llvm-svn: 291492
parent 46d134c4

libcxx/include/__mutex_base

+1 −1
Original line number Diff line number Diff line
@@ -410,8 +410,8 @@ condition_variable::wait_for(unique_lock<mutex>& __lk, 
    typedef time_point<system_clock, duration<long double, nano> > __sys_tpf;

    typedef time_point<system_clock, nanoseconds> __sys_tpi;

    __sys_tpf _Max = __sys_tpi::max();

    system_clock::time_point __s_now = system_clock::now();

    steady_clock::time_point __c_now = steady_clock::now();

    system_clock::time_point __s_now = system_clock::now();

    if (_Max - __d > __s_now)

        __do_timed_wait(__lk, __s_now + __ceil<nanoseconds>(__d));

    else