Move LifetimeRef to BgpTable from PeerRibState to RibState

Change-Id: I93c3e8ae5bc2458d9a71767c9081bbdee7ffe5bd Partial-Bug: 1672512
Juniper · Mar 22, 2017 · fef6fe6 · fef6fe6
1 parent 22625b3
commit fef6fe6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/bgp/bgp_membership.cc b/src/bgp/bgp_membership.cc
@@ -822,7 +822,8 @@ BgpMembershipManager::RibState::RibState(BgpMembershipManager *manager,
     : manager_(manager),
       table_(table),
       request_count_(0),
-      walk_count_(0) {
+      walk_count_(0),
+      table_delete_ref_(this, table->deleter()) {
 }
 
 //
@@ -898,8 +899,7 @@ BgpMembershipManager::PeerRibState::PeerRibState(BgpMembershipManager *manager,
       ribin_registered_(false),
       ribout_registered_(false),
       instance_id_(-1),
-      subscription_gen_id_(0),
-      table_delete_ref_(this, rs->table()->deleter()) {
+      subscription_gen_id_(0) {
 }
 
 //

diff --git a/src/bgp/bgp_membership.h b/src/bgp/bgp_membership.h
@@ -296,6 +296,7 @@ class BgpMembershipManager::RibState {
 
     explicit RibState(BgpMembershipManager *manager, BgpTable *table);
     ~RibState();
+    void ManagedDelete() {}
 
     iterator begin() { return pending_peer_rib_list_.begin(); }
     iterator end() { return pending_peer_rib_list_.end(); }
@@ -318,6 +319,7 @@ class BgpMembershipManager::RibState {
     uint32_t walk_count_;
     PeerRibList peer_rib_list_;
     PeerRibList pending_peer_rib_list_;
+    LifetimeRef<RibState> table_delete_ref_;
 
     DISALLOW_COPY_AND_ASSIGN(RibState);
 };
@@ -344,7 +346,6 @@ class BgpMembershipManager::PeerRibState {
     void DeactivateRibOut();
     void UnregisterRibIn();
     void WalkRibIn();
-    void ManagedDelete() {}
 
     void FillMembershipInfo(ShowMembershipPeerInfo *smpi) const;
 
@@ -381,7 +382,6 @@ class BgpMembershipManager::PeerRibState {
     bool ribout_registered_;
     int instance_id_;
     uint64_t subscription_gen_id_;
-    LifetimeRef<PeerRibState> table_delete_ref_;
 
     DISALLOW_COPY_AND_ASSIGN(PeerRibState);
 };