Add unit test for trap flow flex counter

sonic-net · Nov 9, 2021 · 5b77bf7 · 5b77bf7
1 parent 6e5cf82
commit 5b77bf7
Show file tree

Hide file tree

Showing 8 changed files with 489 additions and 10 deletions.
diff --git a/syncd/FlexCounter.cpp b/syncd/FlexCounter.cpp
@@ -10,6 +10,7 @@
 #include <vector>
 
 using namespace syncd;
+using namespace std;
 
 #define MUTEX std::unique_lock<std::mutex> _lock(m_mtx);
 #define MUTEX_UNLOCK _lock.unlock();
@@ -18,6 +19,7 @@ FlexCounter::FlexCounter(
         _In_ const std::string& instanceId,
         _In_ std::shared_ptr<sairedis::SaiInterface> vendorSai,
         _In_ const std::string& dbCounters):
+    m_readyToPoll(false),
     m_pollInterval(0),
     m_instanceId(instanceId),
     m_vendorSai(vendorSai),
@@ -633,7 +635,14 @@ void FlexCounter::setTunnelCounterList(
     for (auto &counter : counterIds)
     {
         if (isTunnelCounterSupported(counter))
-            SWSS_LOG_NOTICE("Tunnel %s does not have supported counters", sai_serialize_object_id(tunnelRid).c_str());
+        {
+            supportedIds.push_back(counter);
+        }
+    }
+
+    if (supportedIds.empty())
+    {
+        SWSS_LOG_NOTICE("Tunnel %s does not have supported counters", sai_serialize_object_id(tunnelRid).c_str());
         return;
     }
 
@@ -1190,7 +1199,7 @@ void FlexCounter::addCounterPlugin(
     }
 
     // notify thread to start polling
-    m_pollCond.notify_all();
+    notifyPoll();
 }
 
 bool FlexCounter::isEmpty()
@@ -2138,10 +2147,7 @@ void FlexCounter::flexCounterThreadRunFunction()
         MUTEX_UNLOCK; // explicit unlock
 
         // nothing to collect, wait until notified
-
-        std::unique_lock<std::mutex> lk(m_mtxSleep);
-
-        m_pollCond.wait(lk); // wait on mutex
+        waitPoll();
     }
 }
 
@@ -2169,7 +2175,7 @@ void FlexCounter::endFlexCounterThread(void)
 
     m_runFlexCounterThread = false;
 
-    m_pollCond.notify_all();
+    notifyPoll();
 
     m_cvSleep.notify_all();
 
@@ -3136,5 +3142,19 @@ void FlexCounter::addCounter(
     }
 
     // notify thread to start polling
+    notifyPoll();
+}
+
+void FlexCounter::waitPoll()
+{
+    std::unique_lock<std::mutex> lk(m_mtxSleep);
+    m_pollCond.wait(lk, [&](){return m_readyToPoll;});
+    m_readyToPoll = false;
+}
+
+void FlexCounter::notifyPoll()
+{
+    std::unique_lock<std::mutex> lk(m_mtxSleep);
+    m_readyToPoll = true;
     m_pollCond.notify_all();
 }
diff --git a/syncd/FlexCounter.h b/syncd/FlexCounter.h
@@ -489,6 +489,11 @@ namespace syncd
             void removeCollectCountersHandler(
                     _In_ const std::string& key);
 
+        private:
+            void waitPoll();
+
+            void notifyPoll();
+
         private: // plugins
 
             std::set<std::string> m_queuePlugins;
@@ -540,6 +545,8 @@ namespace syncd
 
             std::condition_variable m_pollCond;
 
+            bool m_readyToPoll;
+
             uint32_t m_pollInterval;
 
             std::string m_instanceId;

diff --git a/unittest/meta/TestSaiSerialize.cpp b/unittest/meta/TestSaiSerialize.cpp
@@ -338,6 +338,11 @@ TEST(SaiSerialize, sai_serialize_tunnel_stat)
     EXPECT_EQ(sai_serialize_tunnel_stat(SAI_TUNNEL_STAT_IN_OCTETS), "SAI_TUNNEL_STAT_IN_OCTETS");
 }
 
+TEST(SaiSerialize, sai_serialize_counter_stat)
+{
+    EXPECT_EQ(sai_serialize_counter_stat(SAI_COUNTER_STAT_PACKETS), "SAI_COUNTER_STAT_PACKETS");
+}
+
 TEST(SaiSerialize, sai_serialize_queue_attr)
 {
     EXPECT_EQ(sai_serialize_queue_attr(SAI_QUEUE_ATTR_TYPE), "SAI_QUEUE_ATTR_TYPE");

diff --git a/unittest/syncd/Makefile.am b/unittest/syncd/Makefile.am
@@ -1,11 +1,16 @@
-AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/syncd -I$(top_srcdir)/lib -I$(top_srcdir)/vslib
+AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/syncd -I$(top_srcdir)/lib -I$(top_srcdir)/vslib -I$(top_srcdir)/meta
 
 bin_PROGRAMS = tests
 
 LDADD_GTEST = -L/usr/src/gtest -lgtest -lgtest_main
 
 tests_SOURCES = main.cpp \
-				TestCommandLineOptions.cpp
+                ../../meta/DummySaiInterface.cpp \
+                MockHelper.cpp \
+				TestCommandLineOptions.cpp \
+				TestFlexCounter.cpp
 
 tests_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON)
-tests_LDADD = $(LDADD_GTEST) $(top_srcdir)/syncd/libSyncd.a -lswsscommon -lpthread -L$(top_srcdir)/lib/.libs -lsairedis -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -lzmq $(CODE_COVERAGE_LIBS)
+tests_LDADD = $(LDADD_GTEST) $(top_srcdir)/syncd/libSyncd.a -lhiredis -lswsscommon -lpthread -L$(top_srcdir)/lib/.libs -lsairedis -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -lzmq $(CODE_COVERAGE_LIBS)
+
+TESTS = tests
diff --git a/unittest/syncd/MockHelper.cpp b/unittest/syncd/MockHelper.cpp
@@ -0,0 +1,36 @@
+#include "VidManager.h"
+#include "swss/dbconnector.h"
+#include "swss/table.h"
+
+namespace test_syncd {
+    sai_object_type_t mock_objectTypeQuery_result;
+    void mockVidManagerObjectTypeQuery(sai_object_type_t mock_result)
+    {
+        mock_objectTypeQuery_result = mock_result;
+    }
+}
+
+namespace syncd {
+    sai_object_type_t VidManager::objectTypeQuery(_In_ sai_object_id_t objectId)
+    {
+        return test_syncd::mock_objectTypeQuery_result;
+    }
+}
+
+/*
+namespace swss {
+    DBConnector::DBConnector(const std::string& dbName, unsigned int timeout, bool isTcpConn)
+    {
+    }
+
+    DBConnector *DBConnector::newConnector(unsigned int timeout) const
+    {
+        return nullptr;
+    }
+
+    Table::Table(RedisPipeline *pipeline, const std::string &tableName, bool buffered)
+    {
+    }
+
+
+}*/
diff --git a/unittest/syncd/MockHelper.h b/unittest/syncd/MockHelper.h
@@ -0,0 +1,5 @@
+#pragma once
+
+namespace test_syncd {
+    void mockVidManagerObjectTypeQuery(sai_object_type_t);
+}