make WorkRequests cancelable

This commit is contained in:
Konstantin Käfer
2015-05-08 14:49:32 +02:00
parent e20faf7a8d
commit 8ee40a544e
9 changed files with 112 additions and 74 deletions

View File

@@ -1,38 +1,16 @@
#include <mbgl/util/work_request.hpp>
#include <mbgl/util/work_task.hpp>
#include <cassert>
namespace mbgl {
WorkRequest::WorkRequest() = default;
WorkRequest::WorkRequest(Future&& future, JoinedFlag flag)
: complete(std::move(future)),
joinedFlag(flag) {
}
WorkRequest::WorkRequest(WorkRequest&& o)
: complete(std::move(o.complete)),
joinedFlag(std::move(o.joinedFlag)) {
WorkRequest::WorkRequest(Task task_) : task(task_) {
assert(task);
}
WorkRequest::~WorkRequest() {
if (complete.valid()) {
join();
}
}
WorkRequest& WorkRequest::operator=(WorkRequest&& o) {
complete = std::move(o.complete);
joinedFlag = std::move(o.joinedFlag);
return *this;
}
WorkRequest::operator bool() const {
return complete.valid();
}
void WorkRequest::join() {
*joinedFlag = true;
complete.get();
task->cancel();
}
}