Fix review comment

sonic-net · Apr 12, 2022 · 930b021 · 930b021
1 parent fef7d62
commit 930b021
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 17 deletions.
diff --git a/orchagent/flex_counter/flowcounterrouteorch.cpp b/orchagent/flex_counter/flowcounterrouteorch.cpp
@@ -37,13 +37,6 @@ gRouteBulker(sai_route_api, gMaxBulkSize)
 {
     SWSS_LOG_ENTER();
     initRouteFlowCounterCapability();
-    if (mRouteFlowCounterSupported)
-    {
-        auto intervT = timespec { .tv_sec = FLEX_COUNTER_UPD_INTERVAL , .tv_nsec = 0 };
-        mFlexCounterUpdTimer = new SelectableTimer(intervT);
-        auto executorT = new ExecutableTimer(mFlexCounterUpdTimer, this, "FLEX_COUNTER_UPD_TIMER");
-        Orch::addExecutor(executorT);
-    }
 }
 
 FlowCounterRouteOrch::~FlowCounterRouteOrch()
@@ -177,9 +170,27 @@ void FlowCounterRouteOrch::initRouteFlowCounterCapability()
     capability_table.set(FLOW_COUNTER_ROUTE_KEY, fvs);
 }
 
+void FlowCounterRouteOrch::createFlexCounterUpdateTimer()
+{
+    if (!mFlexCounterUpdTimer)
+    {
+        auto intervT = timespec { .tv_sec = FLEX_COUNTER_UPD_INTERVAL , .tv_nsec = 0 };
+        mFlexCounterUpdTimer = new SelectableTimer(intervT);
+        auto executorT = new ExecutableTimer(mFlexCounterUpdTimer, this, "FLEX_COUNTER_UPD_TIMER");
+        Orch::addExecutor(executorT);
+    }
+}
+
 void FlowCounterRouteOrch::generateRouteFlowStats()
 {
     SWSS_LOG_ENTER();
+    if (!mRouteFlowCounterSupported)
+    {
+        return;
+    }
+
+    createFlexCounterUpdateTimer();
+
     for (const auto &route_pattern : mRoutePatternSet)
     {
         createRouteFlowCounterByPattern(route_pattern, 0);

diff --git a/orchagent/flex_counter/flowcounterrouteorch.h b/orchagent/flex_counter/flowcounterrouteorch.h
@@ -150,6 +150,7 @@ class FlowCounterRouteOrch : public Orch
 
     EntityBulker<sai_route_api_t> gRouteBulker;
 
+    void createFlexCounterUpdateTimer();
     void initRouteFlowCounterCapability();
     void removeRoutePattern(const RoutePattern &route_pattern);
     void removeRouteFlowCounterFromDB(sai_object_id_t vrf_id, const IpPrefix& ip_prefix, sai_object_id_t counter_oid);

diff --git a/orchagent/routeorch.cpp b/orchagent/routeorch.cpp
@@ -1,18 +1,14 @@
 #include <assert.h>
 #include <inttypes.h>
 #include <algorithm>
-#include <sstream>
-#include <list>
 #include "routeorch.h"
 #include "nhgorch.h"
 #include "cbf/cbfnhgorch.h"
-#include "flexcounterorch.h"
 #include "logger.h"
 #include "flowcounterrouteorch.h"
 #include "swssnet.h"
 #include "crmorch.h"
 #include "directory.h"
-#include "timer.h"
 
 extern sai_object_id_t gVirtualRouterId;
 extern sai_object_id_t gSwitchId;

diff --git a/orchagent/routeorch.h b/orchagent/routeorch.h
@@ -174,7 +174,6 @@ struct LabelRouteBulkContext
     }
 };
 
-
 class RouteOrch : public Orch, public Subject
 {
 public:
@@ -215,6 +214,7 @@ class RouteOrch : public Orch, public Subject
 
     unsigned int getNhgCount() { return m_nextHopGroupCount; }
     unsigned int getMaxNhgCount() { return m_maxNextHopGroupCount; }
+
     void increaseNextHopGroupCount();
     void decreaseNextHopGroupCount();
     bool checkNextHopGroupCount();

diff --git a/orchagent/swssnet.h b/orchagent/swssnet.h
@@ -77,7 +77,7 @@ inline static sai_ip_prefix_t& copy(sai_ip_prefix_t& dst, const IpAddress& src)
     return dst;
 }
 
-static int getPrefixLenFromAddr(const uint8_t *addr, int len)
+static int getPrefixLenFromAddrMask(const uint8_t *addr, int len)
 {
     int i = 0;
     uint8_t non_zero = 0xFF;
@@ -114,11 +114,11 @@ inline static IpPrefix convert(const sai_ip_prefix_t& src)
         case SAI_IP_ADDR_FAMILY_IPV4:
             ip.family = AF_INET;
             ip.ip_addr.ipv4_addr = src.addr.ip4;
-            return IpPrefix(ip, getPrefixLenFromAddr(reinterpret_cast<const uint8_t*>(&src.mask.ip4), 4));
+            return IpPrefix(ip, getPrefixLenFromAddrMask(reinterpret_cast<const uint8_t*>(&src.mask.ip4), 4));
         case SAI_IP_ADDR_FAMILY_IPV6:
             ip.family = AF_INET6;
             memcpy(ip.ip_addr.ipv6_addr, src.addr.ip6, 16);
-            return IpPrefix(ip, getPrefixLenFromAddr(src.mask.ip6, 16));
+            return IpPrefix(ip, getPrefixLenFromAddrMask(src.mask.ip6, 16));
         default:
             throw std::logic_error("Invalid family");
     }

diff --git a/orchagent/vrforch.cpp b/orchagent/vrforch.cpp
@@ -11,7 +11,6 @@
 #include "request_parser.h"
 #include "vrforch.h"
 #include "vxlanorch.h"
-#include "routeorch.h"
 #include "flowcounterrouteorch.h"
 #include "directory.h"
 
@@ -23,7 +22,6 @@ extern sai_object_id_t gSwitchId;
 
 extern Directory<Orch*>      gDirectory;
 extern PortsOrch*            gPortsOrch;
-extern RouteOrch*            gRouteOrch;
 extern FlowCounterRouteOrch* gFlowCounterRouteOrch;
 
 bool VRFOrch::addOperation(const Request& request)