dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use atomic load for _realtime_tick in _SetGeneratingWorldProgress

Browse Source
This commit is contained in:
Jonathan G Rennison
2020-05-06 22:16:36 +01:00
parent a1d85b812b
commit af09391bfb
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/genworld_gui.cpp
View File

@@ -1344,7 +1344,12 @@ static void _SetGeneratingWorldProgress(GenWorldProgress cls, uint progress, uin
} }
/* Don't update the screen too often. So update it once in every once in a while... */ /* Don't update the screen too often. So update it once in every once in a while... */
if (!_network_dedicated && _gws.timer != 0 && _realtime_tick - _gws.timer < MODAL_PROGRESS_REDRAW_TIMEOUT) return; #if defined(__GNUC__) || defined(__clang__)
const uint32 now = __atomic_load_n(&_realtime_tick, __ATOMIC_RELAXED);
#else
const uint32 now = _realtime_tick;
#endif
if (!_network_dedicated && _gws.timer != 0 && now - _gws.timer < MODAL_PROGRESS_REDRAW_TIMEOUT) return;
/* Percentage is about the number of completed tasks, so 'current - 1' */ /* Percentage is about the number of completed tasks, so 'current - 1' */
_gws.percent = percent_table[cls] + (percent_table[cls + 1] - percent_table[cls]) * (_gws.current == 0 ? 0 : _gws.current - 1) / _gws.total; _gws.percent = percent_table[cls] + (percent_table[cls + 1] - percent_table[cls]) * (_gws.current == 0 ? 0 : _gws.current - 1) / _gws.total;
@@ -1380,7 +1385,11 @@ static void _SetGeneratingWorldProgress(GenWorldProgress cls, uint progress, uin
_modal_progress_work_mutex.lock(); _modal_progress_work_mutex.lock();
_modal_progress_paint_mutex.unlock(); _modal_progress_paint_mutex.unlock();
#if defined(__GNUC__) || defined(__clang__)
_gws.timer = __atomic_load_n(&_realtime_tick, __ATOMIC_RELAXED);
#else
_gws.timer = _realtime_tick; _gws.timer = _realtime_tick;
#endif
} }
/** /**