GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Merge branch 'fix_timeouts_in_task_wait' of https://github.com/Weyzu/FlaxEngine into Weyzu-fix_timeouts_in_task_wait

Browse Source
This commit is contained in:
Wojtek Figat
2025-06-01 15:50:03 +02:00
parent 619c5ac3b0 6be8158209
commit 2cd03787cd
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Engine/Threading/Task.cpp
View File

@@ -40,7 +40,7 @@ void Task::Cancel()
bool Task::Wait(double timeoutMilliseconds) const bool Task::Wait(double timeoutMilliseconds) const
{ {
PROFILE_CPU(); PROFILE_CPU();
double startTime = Platform::GetTimeSeconds() * 0.001; const double startTime = Platform::GetTimeSeconds();
// TODO: no active waiting! use a semaphore! // TODO: no active waiting! use a semaphore!
@@ -54,7 +54,7 @@ bool Task::Wait(double timeoutMilliseconds) const
// Wait for child if has // Wait for child if has
if (_continueWith) if (_continueWith)
{ {
auto spendTime = Platform::GetTimeSeconds() * 0.001 - startTime; const auto spendTime = (Platform::GetTimeSeconds() - startTime) * 1000.0;
return _continueWith->Wait(timeoutMilliseconds - spendTime); return _continueWith->Wait(timeoutMilliseconds - spendTime);
} }
@@ -66,7 +66,7 @@ bool Task::Wait(double timeoutMilliseconds) const
return true; return true;
Platform::Sleep(1); Platform::Sleep(1);
} while (timeoutMilliseconds <= 0.0 || Platform::GetTimeSeconds() * 0.001 - startTime < timeoutMilliseconds); } while (timeoutMilliseconds <= 0.0 || (Platform::GetTimeSeconds() - startTime) * 1000.0 < timeoutMilliseconds);
// Timeout reached! // Timeout reached!
LOG(Warning, "\'{0}\' has timed out. Wait time: {1} ms", ToString(), timeoutMilliseconds); LOG(Warning, "\'{0}\' has timed out. Wait time: {1} ms", ToString(), timeoutMilliseconds);