Reference safety for Worker after callbacks

Joining a WorkRequest now ensures that either the after callback has
already been executed, or will never be executed.

Fixes #1438
This commit is contained in:
John Firebaugh
2015-05-06 13:19:00 -07:00
parent 6c31d928e1
commit 5b4015ccba
6 changed files with 96 additions and 10 deletions

View File

@@ -4,22 +4,25 @@ namespace mbgl {
WorkRequest::WorkRequest() = default;
WorkRequest::WorkRequest(Future&& future)
: complete(std::move(future)) {
WorkRequest::WorkRequest(Future&& future, JoinedFlag flag)
: complete(std::move(future)),
joinedFlag(flag) {
}
WorkRequest::WorkRequest(WorkRequest&& o)
: complete(std::move(o.complete)) {
: complete(std::move(o.complete)),
joinedFlag(std::move(o.joinedFlag)) {
}
WorkRequest::~WorkRequest() {
if (complete.valid()) {
complete.get();
join();
}
}
WorkRequest& WorkRequest::operator=(WorkRequest&& o) {
complete = std::move(o.complete);
joinedFlag = std::move(o.joinedFlag);
return *this;
}
@@ -28,6 +31,7 @@ WorkRequest::operator bool() const {
}
void WorkRequest::join() {
*joinedFlag = true;
complete.get();
}