fixed some bugs in the async server

also added affinity to the stateless main object

4 files changed, 35 insertions, 23 deletions

diff --git a/src/rpc-server/trex_rpc_async_server.cpp b/src/rpc-server/trex_rpc_async_server.cpp
index 01f03af3..3313e42e 100644
--- a/src/rpc-server/trex_rpc_async_server.cpp
+++ b/src/rpc-server/trex_rpc_async_server.cpp
@@ -87,13 +87,13 @@ TrexRpcServerAsync::_rpc_thread_cb() {
 
         /* relax for some time */
         std::this_thread::sleep_for (std::chrono::milliseconds(1000));
-
     }
+
+    /* must be closed from the same thread */
+    zmq_close(m_socket);
 }
 
 void 
 TrexRpcServerAsync::_stop_rpc_thread() {
-    m_is_running = false;
-    this->m_thread->join();
     zmq_term(m_context);
 }
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() {
diff --git a/src/rpc-server/trex_rpc_server_api.h b/src/rpc-server/trex_rpc_server_api.h
index 5a7cad48..327c6eaa 100644
--- a/src/rpc-server/trex_rpc_server_api.h
+++ b/src/rpc-server/trex_rpc_server_api.h
@@ -140,8 +140,8 @@ class TrexRpcServer {
 public:
   
     /* creates the collection of servers using configurations */
-    TrexRpcServer(const TrexRpcServerConfig &req_resp_cfg,
-                  const TrexRpcServerConfig &async_cfg);
+    TrexRpcServer(const TrexRpcServerConfig *req_resp_cfg,
+                  const TrexRpcServerConfig *async_cfg);
 
     ~TrexRpcServer();
 
diff --git a/src/rpc-server/trex_rpc_server_mock.cpp b/src/rpc-server/trex_rpc_server_mock.cpp
index 32635c75..8dae42d7 100644
--- a/src/rpc-server/trex_rpc_server_mock.cpp
+++ b/src/rpc-server/trex_rpc_server_mock.cpp
@@ -44,31 +44,39 @@ int gtest_main(int argc, char **argv);
 
 int main(int argc, char *argv[]) {
 
-    /* configure the stateless object with 4 ports */
-    TrexStateless::configure(4);
+    bool is_gtest = false;
 
-    // gtest ?
+     // gtest ?
     if (argc > 1) {
         if (string(argv[1]) != "--ut") {
             cout << "\n[Usage] " << argv[0] << ": " << " [--ut]\n\n";
             exit(-1);
         }
-        return gtest_main(argc, argv);
+        is_gtest = true;
     }
 
-    cout << "\n-= Starting RPC Server Mock =-\n\n";
-    cout << "Listening on tcp://localhost:5050 [ZMQ]\n\n";
+    /* configure the stateless object with 4 ports */
+    TrexStatelessCfg cfg;
 
     TrexRpcServerConfig rpc_req_resp_cfg(TrexRpcServerConfig::RPC_PROT_TCP, 5050);
     TrexRpcServerConfig rpc_async_cfg(TrexRpcServerConfig::RPC_PROT_TCP, 5051);
 
-    TrexRpcServer rpc(rpc_req_resp_cfg, rpc_async_cfg);
+    cfg.m_port_count         = 4;
+    cfg.m_rpc_req_resp_cfg   = &rpc_req_resp_cfg;
+    cfg.m_rpc_async_cfg      = &rpc_async_cfg;
+    cfg.m_rpc_server_verbose = (is_gtest ? false : true);
 
-    /* init the RPC server */
-    rpc.start();
+    TrexStateless::create(cfg);
 
-    cout << "Setting Server To Full Verbose\n\n";
-    rpc.set_verbose(true);
+    /* gtest handling */
+    if (is_gtest) {
+        int rc = gtest_main(argc, argv);
+        TrexStateless::destroy();
+        return rc;
+    }
+
+    cout << "\n-= Starting RPC Server Mock =-\n\n";
+    cout << "Listening on tcp://localhost:5050 [ZMQ]\n\n";
 
     cout << "Server Started\n\n";
 
@@ -76,7 +84,6 @@ int main(int argc, char *argv[]) {
         sleep(1);
     }
 
-    rpc.stop();
-
-
+    TrexStateless::destroy();
 }
+