++ cache

Author: Zadamsa

storage/cache.cpp

@@ -279,11 +279,7 @@ void NHTFlowCache::create_record(const Packet& packet, size_t flow_index, size_t
    }
    m_flow_table[flow_index]->m_flow.flow_hash_ctt = packet.cttmeta.flow_hash;
    if (only_metadata_required(m_flow_table[flow_index]->m_flow)) {
-      if (m_hashes_in_ctt.find(m_flow_table[flow_index]->m_flow.flow_hash_ctt) != m_hashes_in_ctt.end())
-      {
-         //throw "hash collision in create record!";
-      }
-      m_hashes_in_ctt.insert(m_flow_table[flow_index]->m_flow.flow_hash_ctt);
+      m_hashes_in_ctt[m_flow_table[flow_index]->m_flow.flow_hash_ctt]++;
       m_ctt_controller.create_record(m_flow_table[flow_index]->m_flow.flow_hash_ctt, m_flow_table[flow_index]->m_flow.time_first);
       m_flow_table[flow_index]->is_in_ctt = true;
    }
@@ -297,11 +293,7 @@ void NHTFlowCache::try_to_add_flow_to_ctt(size_t flow_index) noexcept
       return;
    }
    if (only_metadata_required(m_flow_table[flow_index]->m_flow)) {
-      if (m_hashes_in_ctt.find(m_flow_table[flow_index]->m_flow.flow_hash_ctt) != m_hashes_in_ctt.end())
-      {
-         //throw "hash collision in try_to_add_flow_to_ctt!";
-      }
-      m_hashes_in_ctt.insert(m_flow_table[flow_index]->m_flow.flow_hash_ctt);
+      m_hashes_in_ctt[m_flow_table[flow_index]->m_flow.flow_hash_ctt]++;
       m_ctt_controller.create_record(m_flow_table[flow_index]->m_flow.flow_hash_ctt, m_flow_table[flow_index]->m_flow.time_first);
       m_flow_table[flow_index]->is_in_ctt = true;
    }
@@ -373,11 +365,13 @@ bool NHTFlowCache::try_to_export(size_t flow_index, bool call_pre_export, const
 #ifdef WITH_CTT
 void NHTFlowCache::send_export_request_to_ctt(size_t ctt_flow_hash) noexcept
 {
-   if (m_hashes_in_ctt.find(ctt_flow_hash) == m_hashes_in_ctt.end())
+   if (--m_hashes_in_ctt[ctt_flow_hash] < 0)
    {
       throw "missing hash in send_export_request_to_ctt!";
    }
-   m_hashes_in_ctt.erase(ctt_flow_hash);
+   if (m_hashes_in_ctt[ctt_flow_hash] == 0) {
+      m_hashes_in_ctt.erase(ctt_flow_hash);
+   }
    m_ctt_controller.export_record(ctt_flow_hash);
 }
 #endif /* WITH_CTT */

storage/cache.hpp

@@ -38,7 +38,7 @@
 #include <optional>
 #include <ipfixprobe/flowifc.hpp>
 #include <ipfixprobe/telemetry-utils.hpp>
-#include <unordered_set>
+#include <unordered_map>
 #include "fragmentationCache/fragmentationCache.hpp"
 #include "cacheOptParser.hpp"
 #include "flowKey.tpp"
@@ -122,7 +122,7 @@ class NHTFlowCache : TelemetryUtils, public StoragePlugin
    std::string m_ctt_device;
    unsigned m_ctt_comp_index;
    CttController m_ctt_controller;
-   std::unordered_set<size_t> m_hashes_in_ctt;
+   std::unordered_map<size_t, size_t> m_hashes_in_ctt;
 #endif /* WITH_CTT */
 
    void try_to_fill_ports_to_fragmented_packet(Packet& packet);