diff options
| author | Howard Stearns <howard.stearns@gmail.com> | 2022-08-30 10:20:15 -0700 |
|---|---|---|
| committer | Howard Stearns <howard.stearns@gmail.com> | 2022-08-30 10:20:15 -0700 |
| commit | 3b70c9d49c2a963439b3811e80d24576f390552b (patch) | |
| tree | 11461161da7c92d76a36d921247158230e4052f2 /indra/llcommon/lltimer.cpp | |
| parent | 6fbc733c9779454f2f1ebade494323e315917851 (diff) | |
| parent | 197ac7cc2048fe4c259858f48946cd954782dfc2 (diff) | |
Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into initscapade
Diffstat (limited to 'indra/llcommon/lltimer.cpp')
| -rw-r--r-- | indra/llcommon/lltimer.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/indra/llcommon/lltimer.cpp b/indra/llcommon/lltimer.cpp index aaa6df325c..39dfee3755 100644 --- a/indra/llcommon/lltimer.cpp +++ b/indra/llcommon/lltimer.cpp @@ -30,6 +30,9 @@ #include "u64.h" +#include <chrono> +#include <thread> + #if LL_WINDOWS # include "llwin32headerslean.h" #elif LL_LINUX || LL_DARWIN @@ -64,7 +67,13 @@ LLTimer* LLTimer::sTimer = NULL; #if LL_WINDOWS void ms_sleep(U32 ms) { - Sleep(ms); + LL_PROFILE_ZONE_SCOPED; + using TimePoint = std::chrono::steady_clock::time_point; + auto resume_time = TimePoint::clock::now() + std::chrono::milliseconds(ms); + while (TimePoint::clock::now() < resume_time) + { + std::this_thread::yield(); //note: don't use LLThread::yield here to avoid yielding for too long + } } U32 micro_sleep(U64 us, U32 max_yields) |