commit 17551b8ba54de37ed84f3c56e052f481075e3a07
author Ed Tanous <edtanous@google.com> Wed Jan 26 16:47:17 2022 -0800
committer Ed Tanous <ed@tanous.net> Fri Feb 11 17:09:47 2022 +0000
tree 193afb9d2f8d513bdf0a887b0fa71ce5e134a949
parent 51ad6674d51e6ad0900a1236ec3606d1daa3363b

Remove isValidLevel()

Every usage of isValidLevel is done after the levels have been parsed
and are already known to be correct.  Checking that Level is valid is
wasteful, and in some cases, is already checked by
getThresholdInterface, which can already bounds check this.

This check is not needed.

Signed-off-by: Ed Tanous <edtanous@google.com>
Change-Id: I1d03c1c66ae37ca86a48175ec9c739c2d3966662

include/Thresholds.hpp

diff --git a/include/Thresholds.hpp b/include/Thresholds.hpp
index fb266d0..42a441f 100644
--- a/include/Thresholds.hpp
+++ b/include/Thresholds.hpp
@@ -112,8 +112,6 @@
     std::list<TimerPair> timers;
 };
 
-bool isValidLevel(Level lev);
-
 bool parseThresholdsFromConfig(
     const SensorData& sensorData,
     std::vector<thresholds::Threshold>& thresholdVector,

include/sensor.hpp

diff --git a/include/sensor.hpp b/include/sensor.hpp
index e966c20..12de959 100644
--- a/include/sensor.hpp
+++ b/include/sensor.hpp
@@ -261,10 +261,7 @@
             {
                 threshold.hysteresis = hysteresisTrigger;
             }
-            if (!thresholds::isValidLevel(threshold.level))
-            {
-                continue;
-            }
+
             std::shared_ptr<sdbusplus::asio::dbus_interface> iface =
                 getThresholdInterface(threshold.level);
 

src/Thresholds.cpp

diff --git a/src/Thresholds.cpp b/src/Thresholds.cpp
index 89269a2..5fa82aa 100644
--- a/src/Thresholds.cpp
+++ b/src/Thresholds.cpp
@@ -44,18 +44,6 @@
     return Direction::ERROR;
 }
 
-bool isValidLevel(Level lev)
-{
-    for (const ThresholdDefinition& prop : thresProp)
-    {
-        if (prop.level == lev)
-        {
-            return true;
-        }
-    }
-    return false;
-}
-
 bool parseThresholdsFromConfig(
     const SensorData& sensorData,
     std::vector<thresholds::Threshold>& thresholdVector,
@@ -214,10 +202,6 @@
 {
     for (const auto& threshold : sensor->thresholds)
     {
-        if (!isValidLevel(threshold.level))
-        {
-            continue;
-        }
         std::shared_ptr<sdbusplus::asio::dbus_interface> interface =
             sensor->getThresholdInterface(threshold.level);
 
@@ -454,11 +438,6 @@
                       thresholds::Level level, thresholds::Direction direction,
                       bool assert)
 {
-    if (!isValidLevel(level))
-    {
-        return;
-    }
-
     std::shared_ptr<sdbusplus::asio::dbus_interface> interface =
         sensor->getThresholdInterface(level);