Commit e4fb896c authored by Dominik Charousset's avatar Dominik Charousset Committed by Dominik Charousset

Remove proxy_registry::backend::registry_context

parent 7cbbfbb6
...@@ -42,8 +42,6 @@ public: ...@@ -42,8 +42,6 @@ public:
/// Creates a new proxy instance. /// Creates a new proxy instance.
virtual strong_actor_ptr make_proxy(node_id, actor_id) = 0; virtual strong_actor_ptr make_proxy(node_id, actor_id) = 0;
virtual execution_unit* registry_context() = 0;
}; };
proxy_registry(actor_system& sys, backend& be); proxy_registry(actor_system& sys, backend& be);
......
...@@ -82,7 +82,6 @@ bool forwarding_actor_proxy::remove_backlink(abstract_actor* x) { ...@@ -82,7 +82,6 @@ bool forwarding_actor_proxy::remove_backlink(abstract_actor* x) {
} }
void forwarding_actor_proxy::kill_proxy(execution_unit* ctx, error rsn) { void forwarding_actor_proxy::kill_proxy(execution_unit* ctx, error rsn) {
CAF_ASSERT(ctx != nullptr);
actor tmp; actor tmp;
{ // lifetime scope of guard { // lifetime scope of guard
std::unique_lock<detail::shared_spinlock> guard(broker_mtx_); std::unique_lock<detail::shared_spinlock> guard(broker_mtx_);
......
...@@ -115,7 +115,7 @@ void proxy_registry::kill_proxy(strong_actor_ptr& ptr, error rsn) { ...@@ -115,7 +115,7 @@ void proxy_registry::kill_proxy(strong_actor_ptr& ptr, error rsn) {
if (!ptr) if (!ptr)
return; return;
auto pptr = static_cast<actor_proxy*>(actor_cast<abstract_actor*>(ptr)); auto pptr = static_cast<actor_proxy*>(actor_cast<abstract_actor*>(ptr));
pptr->kill_proxy(backend_.registry_context(), std::move(rsn)); pptr->kill_proxy(nullptr, std::move(rsn));
} }
} // namespace caf } // namespace caf
...@@ -48,9 +48,6 @@ struct basp_broker_state : proxy_registry::backend, basp::instance::callee { ...@@ -48,9 +48,6 @@ struct basp_broker_state : proxy_registry::backend, basp::instance::callee {
// inherited from proxy_registry::backend // inherited from proxy_registry::backend
strong_actor_ptr make_proxy(node_id nid, actor_id aid) override; strong_actor_ptr make_proxy(node_id nid, actor_id aid) override;
// inherited from proxy_registry::backend
execution_unit* registry_context() override;
// inherited from basp::instance::callee // inherited from basp::instance::callee
void finalize_handshake(const node_id& nid, actor_id aid, void finalize_handshake(const node_id& nid, actor_id aid,
std::set<std::string>& sigs) override; std::set<std::string>& sigs) override;
......
...@@ -92,10 +92,6 @@ strong_actor_ptr basp_broker_state::make_proxy(node_id nid, actor_id aid) { ...@@ -92,10 +92,6 @@ strong_actor_ptr basp_broker_state::make_proxy(node_id nid, actor_id aid) {
return res; return res;
} }
execution_unit* basp_broker_state::registry_context() {
return self->context();
}
void basp_broker_state::finalize_handshake(const node_id& nid, actor_id aid, void basp_broker_state::finalize_handshake(const node_id& nid, actor_id aid,
std::set<std::string>& sigs) { std::set<std::string>& sigs) {
CAF_LOG_TRACE(CAF_ARG(nid) << CAF_ARG(aid) << CAF_ARG(sigs)); CAF_LOG_TRACE(CAF_ARG(nid) << CAF_ARG(aid) << CAF_ARG(sigs));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment