Adding dedicated vector per vendor to handle threads, standalone coll…

…ector ...
network-analytics · Oct 7, 2023 · b02b364 · b02b364
1 parent e178a31
commit b02b364
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 16 deletions.
diff --git a/doc/Changelog b/doc/Changelog
@@ -9,10 +9,11 @@ The keys used are:
 
 current -- XX-XX.20XX
 
-v1.1.3 -- 06-10.2023
-  + Adding support for certain releases of rhel & rocky Linux to the install.sh script
-  ! Adding simple checks before every "delete" statement to avoid double deletion
-  ! Fixing Segfault issue affecting start_grpc_dialout_collector() function
+v1.1.3 -- 07-10.2023
+  + Adding dedicated vector per vendor to handle threads, standalone collector
+  + Adding support for rhel & rocky Linux, install.sh script
+  ! Adding checks before every "delete" statement to avoid double deletion
+  ! Fixing Segfault issue affecting the start_grpc_dialout_collector() function
   ! Fixing memory leak affecting the Srv::*Stream::Start() functions
   ! Making the free_grpc_payload() and the InitGrpcPayload() function safer (pointers handling)
   ! Making start_grpc_dialout_collector() safer (vector to store the workers threads)

diff --git a/src/bridge/grpc_collector_bridge.cc b/src/bridge/grpc_collector_bridge.cc
@@ -350,7 +350,7 @@ extern "C" {
         const char *workers_str)
     {
         if (main_cfg_parameters.at(ipv4_socket_str).empty() == false) {
-            size_t replies =
+            int replies =
                 std::stoi(main_cfg_parameters.at(replies_str));
             if (replies < 0 || replies > 1000) {
                 spdlog::get("multi-logger")->
@@ -359,15 +359,15 @@ extern "C" {
                     "and 1000. (default = 0 => unlimited)", replies_str);
                 std::exit(EXIT_FAILURE);
             }
-            size_t workers = std::stoi(main_cfg_parameters.at(workers_str));
+            int workers = std::stoi(main_cfg_parameters.at(workers_str));
             if (workers < 1 || workers > 5) {
                 spdlog::get("multi-logger")->
                     error("[{}] configuration issue: the "
                     "allowed amount of workers is defined between 1 "
                     "and 5. (default = 1)", workers_str);
                 std::exit(EXIT_FAILURE);
             }
-            for (size_t w = 0; w < workers; w++) {
+            for (int w = 0; w < workers; w++) {
                 int res = pthread_create(&workers_vec[w], NULL, VendorThread,
                     (void *)ipv4_socket_str);
                 if (res != 0) {

diff --git a/src/mdt_dialout_collector.cc b/src/mdt_dialout_collector.cc
@@ -193,25 +193,41 @@ int main(int argc, char *argv[])
     zmq_single_thread_poller.detach();
     // --- ZMQ - Poller ---
 
-    std::vector<std::thread> workers;
+    std::vector<std::thread> cisco_workers;
+    std::vector<std::thread> juniper_workers;
+    std::vector<std::thread> huawei_workers;
 
     // Cisco
-    LoadThreads(workers, "ipv4_socket_cisco", "replies_cisco",
+    LoadThreads(cisco_workers, "ipv4_socket_cisco", "replies_cisco",
         "cisco_workers");
 
     // Juniper
-    LoadThreads(workers, "ipv4_socket_juniper", "replies_juniper",
+    LoadThreads(juniper_workers, "ipv4_socket_juniper", "replies_juniper",
         "juniper_workers");
 
     // Huawei
-    LoadThreads(workers, "ipv4_socket_huawei", "replies_huawei",
+    LoadThreads(huawei_workers, "ipv4_socket_huawei", "replies_huawei",
         "huawei_workers");
 
     signal(SIGUSR1, SignalHandler);
 
-    //std::cout << "WORKERS: " << workers.size() << "\n";
+    //std::cout << "CISCO_WORKERS:   " << cisco_workers.size() << "\n";
+    //std::cout << "JUNIPER_WORKERS: " << juniper_workers.size() << "\n";
+    //std::cout << "HUAWEI_WORKERS:  " << huawei_workers.size() << "\n";
 
-    for (std::thread &w : workers) {
+    for (std::thread &w : cisco_workers) {
+        if(w.joinable()) {
+            w.join();
+        }
+    }
+
+    for (std::thread &w : juniper_workers) {
+        if(w.joinable()) {
+            w.join();
+        }
+    }
+
+    for (std::thread &w : huawei_workers) {
         if(w.joinable()) {
             w.join();
         }
@@ -270,7 +286,7 @@ void LoadThreads(std::vector<std::thread> &workers_vec,
     const std::string &workers_str)
 {
     if (main_cfg_parameters.at(ipv4_socket_str).empty() == false) {
-        size_t replies =
+        int replies =
             std::stoi(main_cfg_parameters.at(replies_str));
         if (replies < 0 || replies > 1000) {
             spdlog::get("multi-logger")->
@@ -279,15 +295,15 @@ void LoadThreads(std::vector<std::thread> &workers_vec,
                 "and 1000. (default = 0 => unlimited)", replies_str);
             std::exit(EXIT_FAILURE);
         }
-        size_t workers = std::stoi(main_cfg_parameters.at(workers_str));
+        int workers = std::stoi(main_cfg_parameters.at(workers_str));
         if (workers < 1 || workers > 5) {
             spdlog::get("multi-logger")->
                 error("[{}] configuration issue: the "
                 "allowed amount of workers is defined between 1 "
                 "and 5. (default = 1)", workers_str);
             std::exit(EXIT_FAILURE);
         }
-        for (size_t w = 0; w < workers; w++) {
+        for (int w = 0; w < workers; w++) {
             workers_vec.push_back(std::thread(&VendorThread,
                 ipv4_socket_str));
         }