[counter]: support enable/disable counter query (sonic-net#322)

* [counter]: support enable/disable counter query Signed-off-by: Sihui Han <sihan@microsoft.com> * Set counter polling by default disabled Signed-off-by: Sihui Han <sihan@microsoft.com>
volodymyrsamotiy · Jul 30, 2019 · b2dfe06 · b2dfe06
1 parent ffb2f43
commit b2dfe06
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 2 deletions.
diff --git a/syncd/syncd.cpp b/syncd/syncd.cpp
@@ -2580,6 +2580,10 @@ void processFlexCounterGroupEvent(
                     FlexCounter::addPortCounterPlugin(sha, groupName);
                 }
             }
+            else if (field == FLEX_COUNTER_STATUS_FIELD)
+            {
+                FlexCounter::updateFlexCounterStatus(value, groupName);
+            }
             else
             {
                 SWSS_LOG_ERROR("Field is not supported %s", field.c_str());

diff --git a/syncd/syncd_flex_counter.cpp b/syncd/syncd_flex_counter.cpp
@@ -42,6 +42,28 @@ void FlexCounter::setPollInterval(
     fc.m_pollInterval = pollInterval;
 }
 
+void FlexCounter::updateFlexCounterStatus(
+        _In_ std::string status,
+        _In_ std::string instanceId)
+{
+    SWSS_LOG_ENTER();
+
+    FlexCounter &fc = getInstance(instanceId);
+    if (status == "enable")
+    {
+        fc.m_enable = true;
+    }
+    else if (status == "disable")
+    {
+        fc.m_enable = false;
+    }
+    else
+    {
+        SWSS_LOG_NOTICE("Input value %s is not supported for Flex counter status, enter enable or disable", status.c_str());
+    }
+
+}
+
 /* The current implementation of 'setPortCounterList' and 'setQueueCounterList' are
  * not the same. Need to refactor these two functions to have the similar logic.
  * Either the full SAI attributes are queried once, or each of the needed counters
@@ -593,8 +615,11 @@ void FlexCounter::flexCounterThread(void)
     {
         auto start = std::chrono::steady_clock::now();
 
-        collectCounters(countersTable);
-        runPlugins(db);
+        if (m_enable)
+        {
+            collectCounters(countersTable);
+            runPlugins(db);
+        }
 
         auto finish = std::chrono::steady_clock::now();
         uint32_t delay = static_cast<uint32_t>(

diff --git a/syncd/syncd_flex_counter.h b/syncd/syncd_flex_counter.h
@@ -32,6 +32,10 @@ class FlexCounter
                 _In_ sai_object_id_t queueId,
                 _In_ std::string instanceId,
                 _In_ const std::vector<sai_queue_attr_t> &attrIds);
+        static void updateFlexCounterStatus(
+                _In_ std::string status,
+                _In_ std::string instanceId);
+
 
         static void removePort(
                 _In_ sai_object_id_t portVid,
@@ -120,6 +124,7 @@ class FlexCounter
 
         uint32_t m_pollInterval = 0;
         std::string m_instanceId;
+        bool m_enable = false;
 };
 
 #endif