ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

On GUI-less servers the frame rate can be <1ms. Previously the minimum

Browse Source 
time-step size was 1 ms, which resulted in the world time advancing
faster than real time.  This caused problems in the communication
and synchronisation with clients.
This commit is contained in:
hiker 2018-01-23 08:30:23 +11:00
parent a34b014fb5
commit b4d9e03e5c
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main_loop.cpp
View File

@ -79,11 +79,22 @@ float MainLoop::getLimitedDt()
{ {
m_curr_time = device->getTimer()->getRealTime(); m_curr_time = device->getTimer()->getRealTime();
dt = (float)(m_curr_time - m_prev_time); dt = (float)(m_curr_time - m_prev_time);
if (dt <= 0) // On a server (i.e. without graphics) the frame rate can be under
// 1 ms, i.e. dt = 0. Additionally, the resolution of a sleep
// statement is not that precise either: if the sleep statement
// would be consistent < 1ms, but the stk time would increase by
// 1 ms, the stk clock would be desynchronised from real time
// (it would go faster), resulting in synchronisation problems
// with clients (server time is supposed to be behind client time).
// So we play it safe by adding a loop to make sure at least 1ms
// (minimum time that can be handled by the integer timer) delay here.
while (dt <= 0)
{ {
dt = 1; // at least 1 ms, otherwise with dt=0 bad things happen StkTime::sleep(1);
break; // should not really happen m_curr_time = device->getTimer()->getRealTime();
dt = (float)(m_curr_time - m_prev_time);
} }
const World* const world = World::getWorld(); const World* const world = World::getWorld();
if (UserConfigParams::m_fps_debug && world) if (UserConfigParams::m_fps_debug && world)
{ {