diff options
| author |   Neale Ranns <nranns@cisco.com> | 2018-12-14 05:48:02 -0800 |
|---|---|---|
| committer |   Florin Coras <florin.coras@gmail.com> | 2018-12-16 00:59:53 +0000 |
| commit | 7e70ff52c18e62f4fdef1f63dea4edd64bcf9c76 (patch) | |
| tree | 09b3bd59dbcb8b8873a9a2f9c770565166b61f2f | |
| parent | 884f0aff0e94ee35d7dd3c6dd55041d4872a9a9b (diff) | |
VOM: fixes for stats
Change-Id: I62582123361e091e79bbcc6d71794c6f76216b25
Signed-off-by: Neale Ranns <nranns@cisco.com>
| -rw-r--r-- | extras/vom/vom/gbp_bridge_domain.cpp | 6 | ||||
| -rw-r--r-- | extras/vom/vom/gbp_bridge_domain.hpp | 1 | ||||
| -rw-r--r-- | extras/vom/vom/interface.cpp | 8 | ||||
| -rw-r--r-- | extras/vom/vom/stat_reader.cpp | 4 |
4 files changed, 9 insertions, 10 deletions
diff --git a/extras/vom/vom/gbp_bridge_domain.cpp b/extras/vom/vom/gbp_bridge_domain.cpp index 92d1a13062b..953c40c1c29 100644 --- a/extras/vom/vom/gbp_bridge_domain.cpp +++ b/extras/vom/vom/gbp_bridge_domain.cpp @@ -39,12 +39,6 @@ gbp_bridge_domain::gbp_bridge_domain(const bridge_domain& bd, { } -gbp_bridge_domain::gbp_bridge_domain(const bridge_domain& bd) - : m_id(bd.id()) - , m_bd(bd.singular()) -{ -} - gbp_bridge_domain::gbp_bridge_domain(const bridge_domain& bd, const interface& bvi, const interface& uu_fwd) diff --git a/extras/vom/vom/gbp_bridge_domain.hpp b/extras/vom/vom/gbp_bridge_domain.hpp index 031510aa461..c86c53ebf24 100644 --- a/extras/vom/vom/gbp_bridge_domain.hpp +++ b/extras/vom/vom/gbp_bridge_domain.hpp @@ -38,7 +38,6 @@ public: * Construct a GBP bridge_domain */ gbp_bridge_domain(const bridge_domain& bd, const interface& bvi); - gbp_bridge_domain(const bridge_domain& bd); gbp_bridge_domain(const bridge_domain& bd, const interface& bvi, const interface& uu_fwd); diff --git a/extras/vom/vom/interface.cpp b/extras/vom/vom/interface.cpp index bbbc187747c..504511eabc9 100644 --- a/extras/vom/vom/interface.cpp +++ b/extras/vom/vom/interface.cpp @@ -58,6 +58,8 @@ interface::interface(const std::string& name, , m_table_id(route::DEFAULT_TABLE) , m_l2_address(l2_address_t::ZERO, rc_t::UNSET) , m_stats_type(stats_type_t::NORMAL) + , m_stats({}) + , m_listener(nullptr) , m_oper(oper_state_t::DOWN) , m_tag(tag) { @@ -76,6 +78,8 @@ interface::interface(const std::string& name, , m_table_id(m_rd->table_id()) , m_l2_address(l2_address_t::ZERO, rc_t::UNSET) , m_stats_type(stats_type_t::NORMAL) + , m_stats({}) + , m_listener(nullptr) , m_oper(oper_state_t::DOWN) , m_tag(tag) { @@ -90,6 +94,8 @@ interface::interface(const interface& o) , m_table_id(o.m_table_id) , m_l2_address(o.m_l2_address) , m_stats_type(o.m_stats_type) + , m_stats(o.m_stats) + , m_listener(o.m_listener) , m_oper(o.m_oper) , m_tag(o.m_tag) { @@ -177,7 +183,7 @@ interface::sweep() } if (m_listener) { - disable_stats(); + disable_stats_i(); } // If the interface is up, bring it down diff --git a/extras/vom/vom/stat_reader.cpp b/extras/vom/vom/stat_reader.cpp index 4b054aba5af..931d0888f71 100644 --- a/extras/vom/vom/stat_reader.cpp +++ b/extras/vom/vom/stat_reader.cpp @@ -49,13 +49,13 @@ stat_reader::disconnect() void stat_reader::registers(const interface& intf) { - m_stat_itf_indexes.insert(intf.handle().value()); + m_stat_itf_indexes.insert(intf.handle_i().value()); } void stat_reader::unregisters(const interface& intf) { - m_stat_itf_indexes.erase(intf.handle().value()); + m_stat_itf_indexes.erase(intf.handle_i().value()); } void |