use bitset operator[] to reduce overhead

orb-community · Feb 11, 2022 · a6b8b83 · a6b8b83
1 parent b354c61
commit a6b8b83
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/src/AbstractMetricsManager.h b/src/AbstractMetricsManager.h
@@ -262,6 +262,7 @@ class AbstractMetricsManager
  std::unique_ptr<MetricsBucketClass> expiring_bucket;
  // this changes the live bucket
  _metric_buckets.emplace_front(std::make_unique<MetricsBucketClass>());
+ _metric_buckets[0]->configure_groups(_groups);
  _metric_buckets[0]->set_start_tstamp(stamp);
  if (_recorded_stream) {
  _metric_buckets[0]->set_recorded_stream();

diff --git a/src/Policies.cpp b/src/Policies.cpp
@@ -198,6 +198,7 @@ std::vector<Policy *> PolicyManager::load(const YAML::Node &policy_yaml)
  if (!module.IsMap()) {
  throw PolicyException("expecting Handler configuration map");
  }
+
  if (!module["type"] || !module["type"].IsScalar()) {
  throw PolicyException("missing or invalid stream handler type at key 'type'");
  }

diff --git a/src/handlers/dns/DnsStreamHandler.cpp b/src/handlers/dns/DnsStreamHandler.cpp
@@ -21,7 +21,7 @@
 namespace visor::handler::dns {
 
 DnsStreamHandler::DnsStreamHandler(const std::string &name, InputStream *stream, const Configurable *window_config, StreamHandler *handler)
- : StreamMetricsHandler(name, window_config)
+ : visor::StreamMetricsHandler<DnsMetricsManager>(name, window_config)
 {
  if (handler) {
  throw StreamHandlerException(fmt::format("DnsStreamHandler: unsupported upstream chained stream handler {}", handler->name()));
@@ -282,12 +282,12 @@ static inline bool endsWith(std::string_view str, std::string_view suffix)
 }
 bool DnsStreamHandler::_filtering(DnsLayer &payload, [[maybe_unused]] PacketDirection dir, [[maybe_unused]] pcpp::ProtocolType l3, [[maybe_unused]] pcpp::ProtocolType l4, [[maybe_unused]] uint16_t port, timespec stamp)
 {
- if (_f_enabled.test(Filters::ExcludingRCode) && payload.getDnsHeader()->responseCode == _f_rcode) {
+ if (_f_enabled[Filters::ExcludingRCode] && payload.getDnsHeader()->responseCode == _f_rcode) {
  goto will_filter;
- } else if (_f_enabled.test(Filters::OnlyRCode) && payload.getDnsHeader()->responseCode != _f_rcode) {
+ } else if (_f_enabled[Filters::OnlyRCode] && payload.getDnsHeader()->responseCode != _f_rcode) {
  goto will_filter;
  }
- if (_f_enabled.test(Filters::OnlyQNameSuffix)) {
+ if (_f_enabled[Filters::OnlyQNameSuffix]) {
  if (!payload.parseResources(true) || payload.getFirstQuery() == nullptr) {
  goto will_filter;
  }
@@ -591,7 +591,7 @@ void DnsMetricsBucket::process_dns_layer(bool deep, DnsLayer &payload, bool dnst
  _dns_qnameCard.update(name);
  _dns_topQType.update(query->getDnsType());
 
- if (_groups->test(group::DnsMetrics::TopQnames)) {
+ if ((*_groups)[group::DnsMetrics::TopQnames]) {
  if (payload.getDnsHeader()->queryOrResponse == response) {
  switch (payload.getDnsHeader()->responseCode) {
  case SrvFail:
@@ -725,7 +725,7 @@ void DnsMetricsManager::process_dns_layer(DnsLayer &payload, PacketDirection dir
  // process in the "live" bucket. this will parse the resources if we are deep sampling
  live_bucket()->process_dns_layer(_deep_sampling_now, payload, false, l3, l4, port);
 
- if (_groups->test(group::DnsMetrics::DnsTransactions)) {
+ if ((*_groups)[group::DnsMetrics::DnsTransactions]) {
  // handle dns transactions (query/response pairs)
  if (payload.getDnsHeader()->queryOrResponse == QR::response) {
  auto xact = _qr_pair_manager.maybe_end_transaction(flowkey, payload.getDnsHeader()->transactionID, stamp);

diff --git a/src/tests/test_metrics.cpp b/src/tests/test_metrics.cpp
@@ -6,9 +6,6 @@ using namespace visor;
 class TestMetricsBucket : public AbstractMetricsBucket
 {
 public:
- TestMetricsBucket()
- {
- }
  void specialized_merge([[maybe_unused]] const AbstractMetricsBucket &other)
  {
  }