From a3233ca1fc8f561adbbd5c9a0c9fdace15210f58 Mon Sep 17 00:00:00 2001
From: liuh-80 <liuh@microsoft.com>
Date: Sat, 23 Nov 2024 02:39:45 +0000
Subject: [PATCH] Improve memory usage by move ZMQ serialize buffer from
 ZmqProducerStateTable to ZmqClient

---
 common/c-api/zmqclient.cpp       |  4 +---
 common/zmqclient.cpp             | 10 +++++-----
 common/zmqclient.h               |  5 +++--
 common/zmqproducerstatetable.cpp |  2 --
 common/zmqproducerstatetable.h   |  2 --
 5 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/common/c-api/zmqclient.cpp b/common/c-api/zmqclient.cpp
index 49a9e05f7..fa1d59ca2 100644
--- 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/zmqclient.cpp b/common/zmqclient.cpp
index 0225d4374..5a84160e9 100644
--- 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
index 313e65735..adc36b053 100644
--- 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
index ec9396b39..43fc3257d 100644
--- 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());
diff --git a/common/zmqproducerstatetable.h b/common/zmqproducerstatetable.h
index 749107825..015419bd2 100644
--- 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;