tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] Simplify OnlineFileSource's Timer use

Browse Source 
There is no need for the timer to be created only under certain conditions. Stopping a non-started timer is a no-op. Therefore it can simply be a direct member.

While here, rename the variable. It's a timer, not a request.
This commit is contained in:
John Firebaugh
2016-01-07 21:06:44 -08:00
parent 4b7db28157
commit adf3dea4e5
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
platform/default/online_file_source.cpp
View File

@@ -50,7 +50,7 @@ public:
const Resource resource;
std::unique_ptr<WorkRequest> cacheRequest;
RequestBase* realRequest = nullptr;
std::unique_ptr<util::Timer> timerRequest;
util::Timer realRequestTimer;
inline OnlineFileRequestImpl(const Resource& resource_)
: resource(resource_) {}
@@ -268,10 +268,8 @@ void OnlineFileSource::Impl::startCacheRequest(OnlineFileRequestImpl& request) {
void OnlineFileSource::Impl::startRealRequest(OnlineFileRequestImpl& request) {
assert(!request.realRequest);
// Cancel the timer if we have one.
if (request.timerRequest) {
request.timerRequest->stop();
}
// Ensure the timer is stopped.
request.realRequestTimer.stop();
auto callback = [this, &request](std::shared_ptr<const Response> response) {
request.realRequest = nullptr;
@@ -332,11 +330,7 @@ void OnlineFileSource::Impl::reschedule(OnlineFileRequestImpl& request) {
if (timeout == Seconds::zero()) {
update(request);
} else if (timeout > Seconds::zero()) {
if (!request.timerRequest) {
request.timerRequest = std::make_unique<util::Timer>();
}
request.timerRequest->start(timeout, Duration::zero(), [this, &request] {
request.realRequestTimer.start(timeout, Duration::zero(), [this, &request] {
assert(!request.realRequest);
startRealRequest(request);
});
@@ -350,7 +344,7 @@ OnlineFileRequestImpl::~OnlineFileRequestImpl() {
realRequest->cancel();
realRequest = nullptr;
}
// timerRequest and cacheRequest are automatically canceld upon destruction.
// realRequestTimer and cacheRequest are automatically canceled upon destruction.
}
void OnlineFileRequestImpl::addObserver(FileRequest* req, Callback callback) {