Skip to content

Ensure that robin_hood unordered map uses Stable references #653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 27, 2023
Merged

Ensure that robin_hood unordered map uses Stable references #653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libs/visor_dns/PublicSuffixList.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ namespace visor::lib::dns {
using namespace std::literals;

// ===BEGIN ICANN DOMAINS===
static const robin_hood::unordered_map<std::string_view, std::vector<std::string_view>> ICANN_DOMAINS = {
static const robin_hood::unordered_node_map<std::string_view, std::vector<std::string_view>> ICANN_DOMAINS = {
{"ac"sv, {"com.ac"sv, "edu.ac"sv, "gov.ac"sv, "net.ac"sv, "mil.ac"sv, "org.ac"sv}},
{"ad"sv, {"nom.ad"sv}},
{"ae"sv, {"co.ae"sv, "net.ae"sv, "org.ae"sv, "sch.ae"sv, "ac.ae"sv, "gov.ae"sv, "mil.ae"sv}},
Expand Down
2 changes: 1 addition & 1 deletion libs/visor_transaction/TransactionManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ template <typename XactID, typename TransactionType, typename Hash = hash_pair>
class TransactionManager
{
static_assert(std::is_base_of<Transaction, TransactionType>::value, "TransactionType must inherit from Transaction structure");
typedef robin_hood::unordered_map<XactID, TransactionType, Hash> XactMap;
typedef robin_hood::unordered_node_map<XactID, TransactionType, Hash> XactMap;

uint32_t _ttl_secs{0};
uint32_t _ttl_ms{0};
Expand Down
4 changes: 2 additions & 2 deletions src/VisorLRUList.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class LRUList
{
public:
typedef typename std::list<std::pair<T, V>>::iterator ListIterator;
typedef typename robin_hood::unordered_map<T, ListIterator>::iterator MapIterator;
typedef typename robin_hood::unordered_node_map<T, ListIterator>::iterator MapIterator;

/**
* A c'tor for this class
Expand Down Expand Up @@ -151,7 +151,7 @@ class LRUList

private:
std::list<std::pair<T, V>> m_CacheItemsList;
robin_hood::unordered_map<T, ListIterator> m_CacheItemsMap;
robin_hood::unordered_node_map<T, ListIterator> m_CacheItemsMap;
size_t m_MaxSize;
};

Expand Down
4 changes: 2 additions & 2 deletions src/inputs/flow/NetflowData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ struct hash_pair {
};

using NfMapID = std::pair<uint32_t, uint16_t>;
static robin_hood::unordered_map<NfMapID, peer_nf9_template, hash_pair> nf9_template_map;
static robin_hood::unordered_map<NfMapID, peer_nf10_template, hash_pair> nf10_template_map;
static robin_hood::unordered_node_map<NfMapID, peer_nf9_template, hash_pair> nf9_template_map;
static robin_hood::unordered_node_map<NfMapID, peer_nf10_template, hash_pair> nf10_template_map;

static bool process_netflow_v1(NFSample *sample)
{
Expand Down