CTT argument parsing - adjust cache opt parser

CESNET · Dec 9, 2024 · 1053967 · 1053967
1 parent 06e469a
commit 1053967
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/storage/cache.cpp b/storage/cache.cpp
@@ -206,7 +206,8 @@ void NHTFlowCache::init(const char *params)
    m_line_mask = (m_cache_size - 1) & ~(m_line_size - 1);
    m_line_new_idx = m_line_size / 2;
    #ifdef WITH_CTT
-   m_ctt_controller.init(parser.m_dev, 0);
+   std::cout << "Cache created with device=" << parser.m_dev << " and component index=" << parser.m_component_index << "\n";
+   m_ctt_controller.init(parser.m_dev, parser.m_component_index);
    #endif /* WITH_CTT */
 
    if (m_export_queue == nullptr) {
@@ -752,4 +753,4 @@ std::vector<std::byte> CttController::assemble_state(
     return state;
 }
 #endif // WITH_CTT
-}
+}
diff --git a/storage/cache.hpp b/storage/cache.hpp
@@ -197,6 +197,7 @@ class CacheOptParser : public OptionsParser
    time_t m_frag_cache_timeout;
    #ifdef WITH_CTT
    std::string m_dev;
+   uint16_t m_component_index;
    #endif /* WITH_CTT */
 
    CacheOptParser() : OptionsParser("cache", "Storage plugin implemented as a hash table"),
@@ -263,6 +264,14 @@ class CacheOptParser : public OptionsParser
             return true;
          },
          OptionFlags::RequiredArgument);
+      register_option("ci", "compidx", "NUM", "Index of the ctt component", [this](const char *arg) {
+         try {
+            m_component_index = str2num<decltype(m_component_index)>(arg)/16;
+         } catch(std::invalid_argument &e) {
+            return false;
+         }
+         return true;
+      });
       #endif /* WITH_CTT */
 
    }
@@ -422,4 +431,4 @@ class NHTFlowCache : TelemetryUtils, public StoragePlugin
 };
 
 }
-#endif /* IPXP_STORAGE_CACHE_HPP */
+#endif /* IPXP_STORAGE_CACHE_HPP */