Merge branch 'sonic-net:master' into SAI_DBG_GEN_DUMP_support

sonic-net · Dec 5, 2024 · 5a27e33 · 5a27e33
2 parents 986c9ae + fb6ce44
commit 5a27e33
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 26 deletions.
diff --git a/common/c-api/zmqclient.cpp b/common/c-api/zmqclient.cpp
@@ -27,9 +27,7 @@ void SWSSZmqClient_sendMsg(SWSSZmqClient zmqc, const char *dbName, const char *t
                            SWSSKeyOpFieldValuesArray arr) {
     SWSSTry({
         vector<KeyOpFieldsValuesTuple> kcos = takeKeyOpFieldValuesArray(arr);
-        size_t bufSize = BinarySerializer::serializedSize(dbName, tableName, kcos);
-        vector<char> v(bufSize);
         ((ZmqClient *)zmqc)
-            ->sendMsg(string(dbName), string(tableName), kcos, v);
+            ->sendMsg(string(dbName), string(tableName), kcos);
     });
 }
diff --git a/common/redispipeline.h b/common/redispipeline.h
@@ -164,7 +164,7 @@ class RedisPipeline {
             return;
 
         m_channels.insert(channel);
-        m_luaPub += "redis.call('PUBLISH', '" + channel + "', 'G');";
+        m_luaPub += "redis.call('PUBLISH', '" + channel + "', 'G')\n";
         m_shaPub = loadRedisScript(m_luaPub);
     }
 

diff --git a/common/schema.h b/common/schema.h
@@ -478,11 +478,12 @@ namespace swss {
 
 #define CFG_SUPPRESS_ASIC_SDK_HEALTH_EVENT_NAME     "SUPPRESS_ASIC_SDK_HEALTH_EVENT"
 
+#define CFG_MEMORY_STATISTICS_TABLE_NAME            "MEMORY_STATISTICS"  
+
 #define CFG_PAC_PORT_CONFIG_TABLE   "PAC_PORT_CONFIG_TABLE"
 #define CFG_PAC_GLOBAL_CONFIG_TABLE    "PAC_GLOBAL_CONFIG_TABLE"
 #define CFG_PAC_HOSTAPD_GLOBAL_CONFIG_TABLE    "HOSTAPD_GLOBAL_CONFIG_TABLE"
 
-
 /***** STATE DATABASE *****/
 
 #define STATE_SWITCH_CAPABILITY_TABLE_NAME          "SWITCH_CAPABILITY"

diff --git a/common/zmqclient.cpp b/common/zmqclient.cpp
@@ -51,6 +51,7 @@ void ZmqClient::initialize(const std::string& endpoint, const std::string& vrf)
     m_context = nullptr;
     m_socket = nullptr;
     m_vrf = vrf;
+    m_sendbuffer.resize(MQ_RESPONSE_MAX_COUNT);
 
     connect();
 }
@@ -116,12 +117,11 @@ void ZmqClient::connect()
 void ZmqClient::sendMsg(
         const std::string& dbName,
         const std::string& tableName,
-        const std::vector<KeyOpFieldsValuesTuple>& kcos,
-        std::vector<char>& sendbuffer)
+        const std::vector<KeyOpFieldsValuesTuple>& kcos)
 {
     int serializedlen = (int)BinarySerializer::serializeBuffer(
-                                                        sendbuffer.data(),
-                                                        sendbuffer.size(),
+                                                        m_sendbuffer.data(),
+                                                        m_sendbuffer.size(),
                                                         dbName,
                                                         tableName,
                                                         kcos);
@@ -144,7 +144,7 @@ void ZmqClient::sendMsg(
             std::lock_guard<std::mutex> lock(m_socketMutex);
 
             // Use none block mode to use all bandwidth: http://api.zeromq.org/2-1%3Azmq-send
-            rc = zmq_send(m_socket, sendbuffer.data(), serializedlen, ZMQ_NOBLOCK);
+            rc = zmq_send(m_socket, m_sendbuffer.data(), serializedlen, ZMQ_NOBLOCK);
         }
 
         if (rc >= 0)

diff --git a/common/zmqclient.h b/common/zmqclient.h
@@ -22,8 +22,7 @@ class ZmqClient
 
     void sendMsg(const std::string& dbName,
                  const std::string& tableName,
-                 const std::vector<KeyOpFieldsValuesTuple>& kcos,
-                 std::vector<char>& sendbuffer);
+                 const std::vector<KeyOpFieldsValuesTuple>& kcos);
 private:
     void initialize(const std::string& endpoint, const std::string& vrf);
 
@@ -38,6 +37,8 @@ class ZmqClient
     bool m_connected;
 
     std::mutex m_socketMutex;
+
+    std::vector<char> m_sendbuffer;
 };
 
 }
diff --git a/common/zmqproducerstatetable.cpp b/common/zmqproducerstatetable.cpp
@@ -38,8 +38,6 @@ ZmqProducerStateTable::ZmqProducerStateTable(RedisPipeline *pipeline, const stri
 
 void ZmqProducerStateTable::initialize(DBConnector *db, const std::string &tableName, bool dbPersistence)
 {
-    m_sendbuffer.resize(MQ_RESPONSE_MAX_COUNT);
-
     if (dbPersistence)
     {
         SWSS_LOG_DEBUG("Database persistence enabled, tableName: %s", tableName.c_str());
@@ -64,8 +62,7 @@ void ZmqProducerStateTable::set(
     m_zmqClient.sendMsg(
                         m_dbName,
                         m_tableNameStr,
-                        kcos,
-                        m_sendbuffer);
+                        kcos);
 
     if (m_asyncDBUpdater != nullptr)
     {
@@ -93,8 +90,7 @@ void ZmqProducerStateTable::del(
     m_zmqClient.sendMsg(
                         m_dbName,
                         m_tableNameStr,
-                        kcos,
-                        m_sendbuffer);
+                        kcos);
 
     if (m_asyncDBUpdater != nullptr)
     {
@@ -112,8 +108,7 @@ void ZmqProducerStateTable::set(const std::vector<KeyOpFieldsValuesTuple> &value
     m_zmqClient.sendMsg(
                         m_dbName,
                         m_tableNameStr,
-                        values,
-                        m_sendbuffer);
+                        values);
 
     if (m_asyncDBUpdater != nullptr)
     {
@@ -136,8 +131,7 @@ void ZmqProducerStateTable::del(const std::vector<std::string> &keys)
     m_zmqClient.sendMsg(
                         m_dbName,
                         m_tableNameStr,
-                        kcos,
-                        m_sendbuffer);
+                        kcos);
 
     if (m_asyncDBUpdater != nullptr)
     {
@@ -157,8 +151,7 @@ void ZmqProducerStateTable::send(const std::vector<KeyOpFieldsValuesTuple> &kcos
     m_zmqClient.sendMsg(
                         m_dbName,
                         m_tableNameStr,
-                        kcos,
-                        m_sendbuffer);
+                        kcos);
 
     if (m_asyncDBUpdater != nullptr)
     {

diff --git a/common/zmqproducerstatetable.h b/common/zmqproducerstatetable.h
@@ -42,8 +42,6 @@ class ZmqProducerStateTable : public ProducerStateTable
     void initialize(DBConnector *db, const std::string &tableName, bool dbPersistence);
 
     ZmqClient& m_zmqClient;
-
-    std::vector<char> m_sendbuffer;
 
     const std::string m_dbName;
     const std::string m_tableNameStr;