Move SelectableChannel classes to libsaimeta

sonic-net · Aug 21, 2021 · 855be73 · 855be73
1 parent 016b5d9
commit 855be73
Show file tree

Hide file tree

Showing 19 changed files with 34 additions and 37 deletions.
diff --git a/lib/inc/ServerSai.h b/lib/inc/ServerSai.h
@@ -2,7 +2,7 @@
 
 #include "meta/SaiInterface.h"
 #include "meta/SaiAttributeList.h"
-#include "syncd/SelectableChannel.h"
+#include "meta/SelectableChannel.h"
 
 #include "swss/selectableevent.h"
 
@@ -256,7 +256,7 @@ namespace sairedis
             void serverThreadFunction();
 
             void processEvent(
-                    _In_ syncd::SelectableChannel& consumer);
+                    _In_ SelectableChannel& consumer);
 
             sai_status_t processSingleEvent(
                     _In_ const swss::KeyOpFieldsValuesTuple &kco);
@@ -375,7 +375,7 @@ namespace sairedis
 
             std::shared_ptr<std::thread> m_serverThread;
 
-            std::shared_ptr<syncd::SelectableChannel> m_selectableChannel;
+            std::shared_ptr<SelectableChannel> m_selectableChannel;
 
             swss::SelectableEvent m_serverThreadThreadShouldEndEvent;
     };

diff --git a/lib/src/Makefile.am b/lib/src/Makefile.am
@@ -10,8 +10,6 @@ lib_LTLIBRARIES = libsairedis.la
 
 noinst_LIBRARIES = libSaiRedis.a
 libSaiRedis_a_SOURCES = \
-						 ../../syncd/ZeroMQSelectableChannel.cpp \
-						 ../../syncd/SelectableChannel.cpp \
 						 ClientConfig.cpp \
 						 ServerConfig.cpp \
 						 ClientServerSai.cpp \
@@ -105,4 +103,3 @@ tests_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON)
 tests_LDADD = -lhiredis -lswsscommon -lpthread $(top_srcdir)/meta/libsaimetadata.la $(top_srcdir)/meta/libsaimeta.la libsairedis.la -lzmq
 
 TESTS = tests
-
diff --git a/lib/src/ServerSai.cpp b/lib/src/ServerSai.cpp
@@ -4,10 +4,9 @@
 #include "ServerConfig.h"
 #include "sairediscommon.h"
 
-#include "syncd/ZeroMQSelectableChannel.h"
-
 #include "meta/sai_serialize.h"
 #include "meta/SaiAttributeList.h"
+#include "meta/ZeroMQSelectableChannel.h"
 
 #include "swss/logger.h"
 #include "swss/select.h"
@@ -90,7 +89,7 @@ sai_status_t ServerSai::initialize(
 
         auto cc = ServerConfig::loadFromFile(serverConfig);
 
-        m_selectableChannel = std::make_shared<syncd::ZeroMQSelectableChannel>(cc->m_zmqEndpoint);
+        m_selectableChannel = std::make_shared<ZeroMQSelectableChannel>(cc->m_zmqEndpoint);
 
         SWSS_LOG_NOTICE("starting server thread");
 
@@ -630,7 +629,7 @@ void ServerSai::serverThreadFunction()
 }
 
 void ServerSai::processEvent(
-        _In_ syncd::SelectableChannel& consumer)
+        _In_ SelectableChannel& consumer)
 {
     MUTEX();
     SWSS_LOG_ENTER();

diff --git a/meta/Makefile.am b/meta/Makefile.am
@@ -42,6 +42,9 @@ libsaimeta_la_SOURCES = \
 				PortRelatedSet.cpp \
 				MetaKeyHasher.cpp \
 				PerformanceIntervalTimer.cpp \
+				SelectableChannel.cpp \
+				RedisSelectableChannel.cpp \
+				ZeroMQSelectableChannel.cpp \
 				Meta.cpp
 
 libsaimeta_la_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS)
@@ -60,6 +63,6 @@ tests_SOURCES = \
 				../lib/src/SwitchConfigContainer.cpp
 
 tests_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON)
-tests_LDADD = -lhiredis -lswsscommon -lpthread libsaimetadata.la libsaimeta.la
+tests_LDADD = -lhiredis -lswsscommon -lpthread libsaimetadata.la libsaimeta.la -lzmq
 
 TESTS = tests
diff --git a/syncd/RedisSelectableChannel.cpp → meta/RedisSelectableChannel.cpp b/syncd/RedisSelectableChannel.cpp → meta/RedisSelectableChannel.cpp
@@ -2,7 +2,7 @@
 
 #include "swss/logger.h"
 
-using namespace syncd;
+using namespace sairedis;
 
 RedisSelectableChannel::RedisSelectableChannel(
         _In_ std::shared_ptr<swss::DBConnector> dbAsic,

diff --git a/syncd/RedisSelectableChannel.h → meta/RedisSelectableChannel.h b/syncd/RedisSelectableChannel.h → meta/RedisSelectableChannel.h
@@ -5,7 +5,7 @@
 #include "swss/consumertable.h"
 #include "swss/producertable.h"
 
-namespace syncd
+namespace sairedis
 {
     class RedisSelectableChannel:
         public SelectableChannel

diff --git a/syncd/SelectableChannel.cpp → meta/SelectableChannel.cpp b/syncd/SelectableChannel.cpp → meta/SelectableChannel.cpp
@@ -2,7 +2,7 @@
 
 #include "swss/logger.h"
 
-using namespace syncd;
+using namespace sairedis;
 
 SelectableChannel::SelectableChannel(
         _In_ int pri):

diff --git a/syncd/SelectableChannel.h → meta/SelectableChannel.h b/syncd/SelectableChannel.h → meta/SelectableChannel.h
@@ -7,7 +7,7 @@
 #include <string>
 #include <vector>
 
-namespace syncd
+namespace sairedis
 {
     class SelectableChannel:
         public swss::Selectable

diff --git a/syncd/ZeroMQSelectableChannel.cpp → meta/ZeroMQSelectableChannel.cpp b/syncd/ZeroMQSelectableChannel.cpp → meta/ZeroMQSelectableChannel.cpp
@@ -11,7 +11,7 @@
 //#define ZMQ_POLL_TIMEOUT (2*60*1000)
 #define ZMQ_POLL_TIMEOUT (1000)
 
-using namespace syncd;
+using namespace sairedis;
 
 ZeroMQSelectableChannel::ZeroMQSelectableChannel(
         _In_ const std::string& endpoint):

diff --git a/syncd/ZeroMQSelectableChannel.h → meta/ZeroMQSelectableChannel.h b/syncd/ZeroMQSelectableChannel.h → meta/ZeroMQSelectableChannel.h
@@ -9,7 +9,7 @@
 #include <thread>
 #include <memory>
 
-namespace syncd
+namespace sairedis
 {
     class ZeroMQSelectableChannel:
         public SelectableChannel

diff --git a/saidiscovery/Makefile.am b/saidiscovery/Makefile.am
@@ -18,4 +18,4 @@ saidiscovery_SOURCES = saidiscovery.cpp
 
 saidiscovery_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS)
 saidiscovery_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS)
-saidiscovery_LDADD = -lhiredis -lswsscommon $(top_srcdir)/syncd/libSyncd.a $(SAILIB) -lpthread -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta $(CODE_COVERAGE_LIBS)
+saidiscovery_LDADD = -lhiredis -lswsscommon $(top_srcdir)/syncd/libSyncd.a $(SAILIB) -lpthread -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -lzmq $(CODE_COVERAGE_LIBS)
diff --git a/saiplayer/Makefile.am b/saiplayer/Makefile.am
@@ -21,4 +21,4 @@ libSaiPlayer_a_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_C
 saiplayer_SOURCES = saiplayer_main.cpp
 saiplayer_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS)
 saiplayer_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS)
-saiplayer_LDADD = libSaiPlayer.a ../syncd/libSyncd.a ../lib/src/libSaiRedis.a -lhiredis -lswsscommon -lpthread -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -lzmq $(CODE_COVERAGE_LIBS)
+saiplayer_LDADD = libSaiPlayer.a $(top_srcdir)/syncd/libSyncd.a $(top_srcdir)/lib/src/libSaiRedis.a -lhiredis -lswsscommon -lpthread -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -lzmq $(CODE_COVERAGE_LIBS)
diff --git a/saisdkdump/Makefile.am b/saisdkdump/Makefile.am
@@ -18,4 +18,4 @@ endif
 saisdkdump_SOURCES = saisdkdump.cpp
 saisdkdump_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS)
 saisdkdump_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS)
-saisdkdump_LDADD = -lhiredis -lswsscommon $(SAILIB) -lpthread -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta $(CODE_COVERAGE_LIBS)
+saisdkdump_LDADD = -lhiredis -lswsscommon $(SAILIB) -lpthread -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -lzmq $(CODE_COVERAGE_LIBS)
diff --git a/syncd/Makefile.am b/syncd/Makefile.am
@@ -18,9 +18,6 @@ noinst_LIBRARIES = libSyncd.a libSyncdRequestShutdown.a
 libSyncd_a_SOURCES = \
 				WatchdogScope.cpp \
 				SaiSwitchInterface.cpp \
-				ZeroMQSelectableChannel.cpp \
-				RedisSelectableChannel.cpp \
-				SelectableChannel.cpp \
 				ZeroMQNotificationProducer.cpp \
 				RedisNotificationProducer.cpp \
 				ComparisonLogic.cpp \
@@ -66,7 +63,7 @@ libSyncd_a_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVER
 syncd_SOURCES = main.cpp
 syncd_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS)
 syncd_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS)
-syncd_LDADD = libSyncd.a ../lib/src/libSaiRedis.a -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -ldl -lhiredis -lswsscommon $(SAILIB) -lpthread -lzmq $(CODE_COVERAGE_LIBS)
+syncd_LDADD = libSyncd.a $(top_srcdir)/lib/src/libSaiRedis.a -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -ldl -lhiredis -lswsscommon $(SAILIB) -lpthread -lzmq $(CODE_COVERAGE_LIBS)
 
 if SAITHRIFT
 libSyncd_a_CXXFLAGS += -DSAITHRIFT=yes
@@ -90,7 +87,7 @@ libSyncdRequestShutdown_a_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMO
 syncd_request_shutdown_SOURCES = syncd_request_shutdown.cpp
 syncd_request_shutdown_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS)
 syncd_request_shutdown_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS)
-syncd_request_shutdown_LDADD = libSyncdRequestShutdown.a ../lib/src/libSaiRedis.a -lhiredis -lswsscommon -lpthread $(CODE_COVERAGE_LIBS)
+syncd_request_shutdown_LDADD = libSyncdRequestShutdown.a $(top_srcdir)/lib/src/libSaiRedis.a -lhiredis -lswsscommon -lpthread $(CODE_COVERAGE_LIBS)
 
 tests_SOURCES = tests.cpp
 

diff --git a/syncd/Syncd.cpp b/syncd/Syncd.cpp
@@ -11,8 +11,6 @@
 #include "BreakConfigParser.h"
 #include "RedisNotificationProducer.h"
 #include "ZeroMQNotificationProducer.h"
-#include "RedisSelectableChannel.h"
-#include "ZeroMQSelectableChannel.h"
 #include "WatchdogScope.h"
 
 #include "sairediscommon.h"
@@ -23,6 +21,8 @@
 #include "swss/notificationproducer.h"
 
 #include "meta/sai_serialize.h"
+#include "meta/ZeroMQSelectableChannel.h"
+#include "meta/RedisSelectableChannel.h"
 #include "meta/PerformanceIntervalTimer.h"
 
 #include "vslib/inc/saivs.h"
@@ -115,7 +115,7 @@ Syncd::Syncd(
 
         m_enableSyncMode = true;
 
-        m_selectableChannel = std::make_shared<ZeroMQSelectableChannel>(m_contextConfig->m_zmqEndpoint);
+        m_selectableChannel = std::make_shared<sairedis::ZeroMQSelectableChannel>(m_contextConfig->m_zmqEndpoint);
     }
     else
     {
@@ -125,7 +125,7 @@ Syncd::Syncd(
 
         bool modifyRedis = m_enableSyncMode ? false : true;
 
-        m_selectableChannel = std::make_shared<RedisSelectableChannel>(
+        m_selectableChannel = std::make_shared<sairedis::RedisSelectableChannel>(
                 m_dbAsic,
                 ASIC_STATE_TABLE,
                 REDIS_TABLE_GETRESPONSE,
@@ -278,7 +278,7 @@ bool Syncd::isInitViewMode() const
 }
 
 void Syncd::processEvent(
-        _In_ SelectableChannel& consumer)
+        _In_ sairedis::SelectableChannel& consumer)
 {
     SWSS_LOG_ENTER();
 

diff --git a/syncd/Syncd.h b/syncd/Syncd.h
@@ -16,10 +16,10 @@
 #include "ContextConfig.h"
 #include "BreakConfig.h"
 #include "NotificationProducerBase.h"
-#include "SelectableChannel.h"
 #include "TimerWatchdog.h"
 
 #include "meta/SaiAttributeList.h"
+#include "meta/SelectableChannel.h"
 
 #include "swss/consumertable.h"
 #include "swss/producertable.h"
@@ -64,7 +64,7 @@ namespace syncd
         public: // TODO private
 
             void processEvent(
-                    _In_ SelectableChannel& consumer);
+                    _In_ sairedis::SelectableChannel& consumer);
 
             sai_status_t processQuadEventInInitViewMode(
                     _In_ sai_object_type_t objectType,
@@ -441,7 +441,7 @@ namespace syncd
 
             std::shared_ptr<syncd::NotificationProcessor> m_processor;
 
-            std::shared_ptr<SelectableChannel> m_selectableChannel;
+            std::shared_ptr<sairedis::SelectableChannel> m_selectableChannel;
 
             bool m_enableSyncMode;
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
@@ -14,7 +14,7 @@ vssyncd_SOURCES = main.cpp
 
 vssyncd_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS)
 vssyncd_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS)
-vssyncd_LDADD = ../syncd/libSyncd.a ../lib/src/libSaiRedis.a -lhiredis -lswsscommon $(SAILIB) -lpthread -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -ldl -lzmq $(CODE_COVERAGE_LIBS)
+vssyncd_LDADD = $(top_srcdir)/syncd/libSyncd.a $(top_srcdir)/lib/src/libSaiRedis.a -lhiredis -lswsscommon $(SAILIB) -lpthread -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -ldl -lzmq $(CODE_COVERAGE_LIBS)
 
 if SAITHRIFT
 vssyncd_LDADD += -lrpcserver -lthrift

diff --git a/tests/tests.cpp b/tests/tests.cpp
@@ -5,16 +5,17 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "lib/inc/ZeroMQChannel.h"
 #include "syncd/ZeroMQNotificationProducer.h"
 
+#include "lib/inc/ZeroMQChannel.h"
+
 #include "meta/sai_serialize.h"
 
 #include <thread>
 #include <memory>
 
-using namespace sairedis;
 using namespace syncd;
+using namespace sairedis;
 
 #define ASSERT_EQ(a,b) if ((a) != (b)) { SWSS_LOG_THROW("ASSERT EQ FAILED: " #a " != " #b); }
 

diff --git a/vslib/src/Makefile.am b/vslib/src/Makefile.am
@@ -126,6 +126,6 @@ bin_PROGRAMS = tests
 
 tests_SOURCES = tests.cpp
 tests_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON)
-tests_LDADD = -lhiredis -lswsscommon -lpthread libsaivs.la $(top_srcdir)/meta/libsaimetadata.la $(top_srcdir)/meta/libsaimeta.la
+tests_LDADD = -lhiredis -lswsscommon -lpthread libsaivs.la $(top_srcdir)/meta/libsaimetadata.la $(top_srcdir)/meta/libsaimeta.la -lzmq
 
 TESTS = tests