Merge "Add life time references to all referred tables from service c…

…hain"
Juniper · Jun 23, 2016 · b2a3b29 · b2a3b29
2 parents 3ee2d1d + 2a6ca3c
commit b2a3b29
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/bgp/routing-instance/service_chaining.cc b/src/bgp/routing-instance/service_chaining.cc
@@ -69,7 +69,9 @@ ServiceChain<T>::ServiceChain(ServiceChainMgrT *manager, RoutingInstance *src,
       connected_table_unregistered_(false),
       dest_table_unregistered_(false),
       aggregate_(false),
-      src_table_delete_ref_(this, src_table()->deleter()) {
+      src_table_delete_ref_(this, src_table()->deleter()),
+      dest_table_delete_ref_(this, dest_table()->deleter()),
+      connected_table_delete_ref_(this, connected_table()->deleter()) {
     for (vector<string>::const_iterator it = subnets.begin();
          it != subnets.end(); ++it) {
         error_code ec;
@@ -904,9 +906,9 @@ ServiceChainMgr<T>::ServiceChainMgr(BgpServer *server)
         service_chain_task_id_ = scheduler->GetTaskId("bgp::ServiceChain");
     }
 
-    process_queue_ =
+    process_queue_.reset(
         new WorkQueue<ServiceChainRequestT *>(service_chain_task_id_, 0,
-                     bind(&ServiceChainMgr::RequestHandler, this, _1));
+                     bind(&ServiceChainMgr::RequestHandler, this, _1)));
 
     id_ = server->routing_instance_mgr()->RegisterInstanceOpCallback(
         bind(&ServiceChainMgr::RoutingInstanceCallback, this, _1, _2));
@@ -918,7 +920,7 @@ ServiceChainMgr<T>::ServiceChainMgr(BgpServer *server)
 
 template <typename T>
 ServiceChainMgr<T>::~ServiceChainMgr() {
-    delete process_queue_;
+    process_queue_->Shutdown();
     server_->routing_instance_mgr()->UnregisterInstanceOpCallback(id_);
     BgpMembershipManager *membership_mgr = server_->membership_mgr();
     membership_mgr->UnregisterPeerRegistrationCallback(registration_id_);

diff --git a/src/bgp/routing-instance/service_chaining.h b/src/bgp/routing-instance/service_chaining.h
@@ -215,6 +215,8 @@ class ServiceChain : public ConditionMatch {
     bool dest_table_unregistered_;
     bool aggregate_;  // Whether the host route needs to be aggregated
     LifetimeRef<ServiceChain> src_table_delete_ref_;
+    LifetimeRef<ServiceChain> dest_table_delete_ref_;
+    LifetimeRef<ServiceChain> connected_table_delete_ref_;
 
     // Helper function to match
     bool IsMoreSpecific(BgpRoute *route, PrefixT *aggregate_match) const;
@@ -309,7 +311,7 @@ class ServiceChainMgr : public IServiceChainMgr {
     BgpServer *server_;
     BgpConditionListener *listener_;
     boost::scoped_ptr<TaskTrigger> resolve_trigger_;
-    WorkQueue<ServiceChainRequestT *> *process_queue_;
+    boost::scoped_ptr<WorkQueue<ServiceChainRequestT *> > process_queue_;
     bool aggregate_host_route_;
     ServiceChainMap chain_set_;
     PendingServiceChainList pending_chains_;