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

Merge branch 'master' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2021-04-05 17:50:39 +01:00
parent 297b340697 9bfa7198fd
commit 5e14b54a0c
164 changed files with 3493 additions and 2443 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/progress.cpp
View File

@@ -11,76 +11,16 @@
#include "progress.h"
#include "video/video_driver.hpp"
#include <chrono>
#include <mutex>
#include <condition_variable>
#if defined(__MINGW32__)
#include "3rdparty/mingw-std-threads/mingw.mutex.h"
#include "3rdparty/mingw-std-threads/mingw.condition_variable.h"
#endif
#include "safeguards.h"
/** Are we in a modal progress or not? */
bool _in_modal_progress = false;
bool _first_in_modal_loop = false;
/** Threading usable for modal progress? */
bool _use_threaded_modal_progress = true;
/** Rights for the performing work. */
std::mutex _modal_progress_work_mutex;
/** Rights for the painting. */
std::mutex _modal_progress_paint_mutex;
static std::mutex _modal_progress_cv_mutex;
static std::condition_variable _modal_progress_cv;
/**
* Set the modal progress state.
* @note Makes IsFirstModalProgressLoop return true for the next call.
* @param state The new state; are we modal or not?
*/
void SetModalProgress(bool state)
{
_modal_progress_cv_mutex.lock();
_in_modal_progress = state;
_first_in_modal_loop = true;
_modal_progress_cv_mutex.unlock();
if (!state) _modal_progress_cv.notify_all();
}
/**
* Check whether this is the first modal progress loop.
* @note Set by SetModalProgress, unset by calling this method.
* @return True if this is the first loop.
*/
bool IsFirstModalProgressLoop()
{
bool ret = _first_in_modal_loop;
_first_in_modal_loop = false;
return ret;
}
void SleepWhileModalProgress(int milliseconds)
{
std::unique_lock<std::mutex> lk(_modal_progress_cv_mutex);
_modal_progress_cv.wait_for(lk, std::chrono::milliseconds(milliseconds), []{ return !_in_modal_progress; });
}
void WaitUntilModalProgressCompleted()
{
if (HasModalProgress()) {
_modal_progress_paint_mutex.unlock();
_modal_progress_work_mutex.unlock();
{
std::unique_lock<std::mutex> lk(_modal_progress_cv_mutex);
_modal_progress_cv.wait(lk, []{ return !_in_modal_progress; });
}
/* Modal progress thread may need blitter access while we are waiting for it. */
VideoDriver::GetInstance()->ReleaseBlitterLock();
_modal_progress_paint_mutex.lock();
VideoDriver::GetInstance()->AcquireBlitterLock();
_modal_progress_work_mutex.lock();
}
}