Skip to content

revoke promise when provider is gone #4152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zizhong merged 1 commit into from
Sep 12, 2018
Merged

revoke promise when provider is gone #4152

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions include/tscpp/api/Async.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@

#pragma once

#include <list>
#include <memory>
#include <mutex>
#include <unordered_map>

#include "tscpp/api/noncopyable.h"

Expand Down Expand Up @@ -91,7 +91,7 @@ class AsyncProvider
}
}

virtual ~AsyncProvider() {}
virtual ~AsyncProvider() { this->cancel(); }

protected:
std::shared_ptr<AsyncDispatchControllerBase>
Expand Down Expand Up @@ -137,7 +137,10 @@ class AsyncDispatchController : public AsyncDispatchControllerBase
disable() override
{
std::lock_guard<Mutex> scopedLock(*dispatch_mutex_);
event_receiver_ = nullptr;
if (event_receiver_ != nullptr) {
event_receiver_->revokePromise(this);
event_receiver_ = nullptr;
}
}

bool
Expand Down Expand Up @@ -209,13 +212,20 @@ template <typename AsyncProviderType> class AsyncReceiver : noncopyable
*/
virtual void handleAsyncComplete(AsyncProviderType &provider) = 0;
virtual ~AsyncReceiver() {}
void
revokePromise(AsyncDispatchController<AsyncReceiver<AsyncProviderType>, AsyncProviderType> *dispatch_controller_ptr)
{
receiver_promises_.erase(dispatch_controller_ptr);
}

protected:
AsyncReceiver() {}
friend class Async;

private:
mutable std::list<std::shared_ptr<AsyncReceiverPromise<AsyncReceiver<AsyncProviderType>, AsyncProviderType>>> receiver_promises_;
mutable std::unordered_map<AsyncDispatchController<AsyncReceiver<AsyncProviderType>, AsyncProviderType> *,
std::shared_ptr<AsyncReceiverPromise<AsyncReceiver<AsyncProviderType>, AsyncProviderType>>>
receiver_promises_;
};

/**
Expand Down Expand Up @@ -246,7 +256,7 @@ class Async : noncopyable
new AsyncDispatchController<AsyncReceiver<AsyncProviderType>, AsyncProviderType>(event_receiver, provider, mutex));
std::shared_ptr<AsyncReceiverPromise<AsyncReceiver<AsyncProviderType>, AsyncProviderType>> receiver_promise(
new AsyncReceiverPromise<AsyncReceiver<AsyncProviderType>, AsyncProviderType>(dispatcher));
event_receiver->receiver_promises_.push_back(receiver_promise); // now if the event receiver dies, we're safe.
event_receiver->receiver_promises_[dispatcher.get()] = receiver_promise;
provider->doRun(dispatcher);
}
};
Expand Down