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

Avoid data race in modal progress mode

Browse Source
This commit is contained in:
Jonathan G Rennison
2020-04-11 18:23:38 +01:00
parent 1e7a73b2c7
commit e2ab622a14
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gfx.cpp
View File

@@ -1490,12 +1490,17 @@ void DrawDirtyBlocks()
if (HasModalProgress()) { if (HasModalProgress()) {
/* We are generating the world, so release our rights to the map and /* We are generating the world, so release our rights to the map and
* painting while we are waiting a bit. */ * painting while we are waiting a bit. */
bool is_first_modal_progress_loop = IsFirstModalProgressLoop();
_modal_progress_paint_mutex.unlock(); _modal_progress_paint_mutex.unlock();
_modal_progress_work_mutex.unlock(); _modal_progress_work_mutex.unlock();
/* Wait a while and update _realtime_tick so we are given the rights */ /* Wait a while and update _realtime_tick so we are given the rights */
if (!IsFirstModalProgressLoop()) CSleep(MODAL_PROGRESS_REDRAW_TIMEOUT); if (!is_first_modal_progress_loop) CSleep(MODAL_PROGRESS_REDRAW_TIMEOUT);
#if defined(__GNUC__) || defined(__clang__)
__atomic_add_fetch(&_realtime_tick, MODAL_PROGRESS_REDRAW_TIMEOUT, __ATOMIC_RELAXED);
#else
_realtime_tick += MODAL_PROGRESS_REDRAW_TIMEOUT; _realtime_tick += MODAL_PROGRESS_REDRAW_TIMEOUT;
#endif
/* Modal progress thread may need blitter access while we are waiting for it. */ /* Modal progress thread may need blitter access while we are waiting for it. */
VideoDriver::GetInstance()->ReleaseBlitterLock(); VideoDriver::GetInstance()->ReleaseBlitterLock();

16
src/newgrf_config.cpp
View File

@@ -721,8 +721,13 @@ class GRFFileScanner : FileScanner {
std::vector<GRFConfig *> grfs; std::vector<GRFConfig *> grfs;
public: public:
GRFFileScanner() : next_update(_realtime_tick), num_scanned(0) GRFFileScanner() : num_scanned(0)
{ {
#if defined(__GNUC__) || defined(__clang__)
this->next_update = __atomic_load_n(&_realtime_tick, __ATOMIC_RELAXED);
#else
this->next_update = _realtime_tick;
#endif
} }
bool AddFile(const char *filename, size_t basepath_length, const char *tar_filename) override; bool AddFile(const char *filename, size_t basepath_length, const char *tar_filename) override;
@@ -783,7 +788,12 @@ bool GRFFileScanner::AddFile(const char *filename, size_t basepath_length, const
} }
this->num_scanned++; this->num_scanned++;
if (this->next_update <= _realtime_tick) { #if defined(__GNUC__) || defined(__clang__)
const uint32 now = __atomic_load_n(&_realtime_tick, __ATOMIC_RELAXED);
#else
const uint32 now = _realtime_tick;
#endif
if (this->next_update <= now) {
_modal_progress_work_mutex.unlock(); _modal_progress_work_mutex.unlock();
_modal_progress_paint_mutex.lock(); _modal_progress_paint_mutex.lock();
@@ -795,7 +805,7 @@ bool GRFFileScanner::AddFile(const char *filename, size_t basepath_length, const
_modal_progress_work_mutex.lock(); _modal_progress_work_mutex.lock();
_modal_progress_paint_mutex.unlock(); _modal_progress_paint_mutex.unlock();
this->next_update = _realtime_tick + MODAL_PROGRESS_REDRAW_TIMEOUT; this->next_update = now + MODAL_PROGRESS_REDRAW_TIMEOUT;
} }
if (!added) { if (!added) {