X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=extras%2Fvom%2Fvom%2Fstat_reader.cpp;h=82e09aedce0e730a6300524f6ce860ae0fd40d6f;hb=refs%2Fchanges%2F45%2F16545%2F4;hp=931d0888f71b69584a4aa0d95efa2c338ecb44c1;hpb=7fd73afc60d6526a2c0f805385127b39daac9145;p=vpp.git diff --git a/extras/vom/vom/stat_reader.cpp b/extras/vom/vom/stat_reader.cpp index 931d0888f71..82e09aedce0 100644 --- a/extras/vom/vom/stat_reader.cpp +++ b/extras/vom/vom/stat_reader.cpp @@ -61,7 +61,7 @@ stat_reader::unregisters(const interface& intf) void stat_reader::read() { - stat_client::stat_data_vec_t sd = m_client.dump(); + const stat_client::stat_data_vec_t& sd = m_client.dump(); for (auto& sde : sd) { std::string name; @@ -74,28 +74,29 @@ stat_reader::read() case STAT_DIR_TYPE_COUNTER_VECTOR_SIMPLE: case STAT_DIR_TYPE_ERROR_INDEX: case STAT_DIR_TYPE_SCALAR_INDEX: + case STAT_DIR_TYPE_ILLEGAL: break; - case STAT_DIR_TYPE_COUNTER_VECTOR_COMBINED: + case STAT_DIR_TYPE_COUNTER_VECTOR_COMBINED: { + vlib_counter_t** data; + + data = sde.get_stat_segment_combined_counter_data(); + if (name.find("/if") != std::string::npos) name.erase(0, 4); for (auto& i : m_stat_itf_indexes) { - counter_t count = {.packets = 0, .bytes = 0 }; - for (int k = 0; k < m_client.vec_len( - sde.get_stat_segment_combined_counter_data()); - k++) { - count.packets += - sde.get_stat_segment_combined_counter_data()[k][i].packets; - count.bytes += - sde.get_stat_segment_combined_counter_data()[k][i].bytes; + counter_t count; + + for (int k = 0; k < m_client.vec_len(data); k++) { + count.packets += data[k][i].packets; + count.bytes += data[k][i].bytes; } std::shared_ptr itf = interface::find(i); if (itf) itf->set(count, name); } break; - - default:; + } } }