From 4d53d6e2633caed782067965b1b4422b45dab4a2 Mon Sep 17 00:00:00 2001
From: imarom <imarom@cisco.com>
Date: Wed, 7 Oct 2015 14:57:48 +0200
Subject: added async publisher to the RPC server

---
 src/rpc-server/trex_rpc_server.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/rpc-server/trex_rpc_server.cpp')

diff --git a/src/rpc-server/trex_rpc_server.cpp b/src/rpc-server/trex_rpc_server.cpp
index 6b8c200d..18265a0e 100644
--- a/src/rpc-server/trex_rpc_server.cpp
+++ b/src/rpc-server/trex_rpc_server.cpp
@@ -21,6 +21,7 @@ limitations under the License.
 
 #include <trex_rpc_server_api.h>
 #include <trex_rpc_req_resp_server.h>
+#include <trex_rpc_async_server.h>
 #include <trex_rpc_jsonrpc_v2_parser.h>
 #include <unistd.h>
 #include <zmq.h>
@@ -112,10 +113,13 @@ get_current_date_time() {
 
 const std::string TrexRpcServer::s_server_uptime = get_current_date_time();
 
-TrexRpcServer::TrexRpcServer(const TrexRpcServerConfig &req_resp_cfg) {
+TrexRpcServer::TrexRpcServer(const TrexRpcServerConfig &req_resp_cfg,
+                             const TrexRpcServerConfig &async_cfg) {
 
     /* add the request response server */
     m_servers.push_back(new TrexRpcServerReqRes(req_resp_cfg));
+    /* add async publisher */
+    m_servers.push_back(new TrexRpcServerAsync(async_cfg));
 }
 
 TrexRpcServer::~TrexRpcServer() {
-- 
cgit 


From 09c9d77dc2f5a89924bd27226727220801a5df13 Mon Sep 17 00:00:00 2001
From: imarom <imarom@cisco.com>
Date: Thu, 8 Oct 2015 10:23:33 +0200
Subject: fixed some bugs in the async server also added affinity to the
 stateless main object

---
 src/rpc-server/trex_rpc_server.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'src/rpc-server/trex_rpc_server.cpp')

diff --git a/src/rpc-server/trex_rpc_server.cpp b/src/rpc-server/trex_rpc_server.cpp
index 18265a0e..8749c9b4 100644
--- a/src/rpc-server/trex_rpc_server.cpp
+++ b/src/rpc-server/trex_rpc_server.cpp
@@ -113,13 +113,18 @@ get_current_date_time() {
 
 const std::string TrexRpcServer::s_server_uptime = get_current_date_time();
 
-TrexRpcServer::TrexRpcServer(const TrexRpcServerConfig &req_resp_cfg,
-                             const TrexRpcServerConfig &async_cfg) {
+TrexRpcServer::TrexRpcServer(const TrexRpcServerConfig *req_resp_cfg,
+                             const TrexRpcServerConfig *async_cfg) {
 
     /* add the request response server */
-    m_servers.push_back(new TrexRpcServerReqRes(req_resp_cfg));
+    if (req_resp_cfg) {
+        m_servers.push_back(new TrexRpcServerReqRes(*req_resp_cfg));
+    }
+    
     /* add async publisher */
-    m_servers.push_back(new TrexRpcServerAsync(async_cfg));
+    if (async_cfg) {
+        m_servers.push_back(new TrexRpcServerAsync(*async_cfg));
+    }
 }
 
 TrexRpcServer::~TrexRpcServer() {
-- 
cgit 


From 6c7880b9881ed6690954f0c29259dd0b584b3970 Mon Sep 17 00:00:00 2001
From: imarom <imarom@cisco.com>
Date: Sun, 11 Oct 2015 14:42:24 +0200
Subject: DP cores now inject a single packet as a dummy to see stats

---
 src/rpc-server/trex_rpc_server.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/rpc-server/trex_rpc_server.cpp')

diff --git a/src/rpc-server/trex_rpc_server.cpp b/src/rpc-server/trex_rpc_server.cpp
index 8749c9b4..a14e6f97 100644
--- a/src/rpc-server/trex_rpc_server.cpp
+++ b/src/rpc-server/trex_rpc_server.cpp
@@ -30,7 +30,7 @@ limitations under the License.
 
 /************** RPC server interface ***************/
 
-TrexRpcServerInterface::TrexRpcServerInterface(const TrexRpcServerConfig &cfg, const std::string &name) : m_cfg(cfg), m_name(name)  {
+TrexRpcServerInterface::TrexRpcServerInterface(const TrexRpcServerConfig &cfg, const std::string &name, std::mutex *lock) : m_cfg(cfg), m_name(name), m_lock(lock)  {
     m_is_running = false;
     m_is_verbose = false;
 }
@@ -114,16 +114,17 @@ get_current_date_time() {
 const std::string TrexRpcServer::s_server_uptime = get_current_date_time();
 
 TrexRpcServer::TrexRpcServer(const TrexRpcServerConfig *req_resp_cfg,
-                             const TrexRpcServerConfig *async_cfg) {
+                             const TrexRpcServerConfig *async_cfg,
+                             std::mutex *lock) {
 
     /* add the request response server */
     if (req_resp_cfg) {
-        m_servers.push_back(new TrexRpcServerReqRes(*req_resp_cfg));
+        m_servers.push_back(new TrexRpcServerReqRes(*req_resp_cfg, lock));
     }
     
     /* add async publisher */
     if (async_cfg) {
-        m_servers.push_back(new TrexRpcServerAsync(*async_cfg));
+        m_servers.push_back(new TrexRpcServerAsync(*async_cfg, lock));
     }
 }
 
-- 
cgit