mirror of
https://github.com/zeek/zeek.git
synced 2025-10-06 00:28:21 +00:00
0db61f3094
The Zeek code base has very inconsistent #includes. Many sources included a few headers, and those headers included other headers, and in the end, nearly everything is included everywhere, so missing #includes were never noticed. Another side effect was a lot of header bloat which slows down the build. First step to fix it: in each source file, its own header should be included first to verify that each header's includes are correct, and none is missing. After adding the missing #includes, I replaced lots of #includes inside headers with class forward declarations. In most headers, object pointers are never referenced, so declaring the function prototypes with forward-declared classes is just fine. This patch speeds up the build by 19%, because each compilation unit gets smaller. Here are the "time" numbers for a fresh build (with a warm page cache but without ccache): Before this patch: 3144.94user 161.63system 3:02.87elapsed 1808%CPU (0avgtext+0avgdata 2168608maxresident)k 760inputs+12008400outputs (1511major+57747204minor)pagefaults 0swaps After this patch: 2565.17user 141.83system 2:25.46elapsed 1860%CPU (0avgtext+0avgdata 1489076maxresident)k 72576inputs+9130920outputs (1667major+49400430minor)pagefaults 0swaps
66 lines
1.8 KiB
C++
66 lines
1.8 KiB
C++
#pragma once
|
|
|
|
#include "IPAddr.h"
|
|
|
|
extern "C" {
|
|
#include "patricia.h"
|
|
}
|
|
|
|
#include <list>
|
|
|
|
using std::list;
|
|
using std::tuple;
|
|
|
|
class Val;
|
|
class SubNetVal;
|
|
|
|
class PrefixTable {
|
|
private:
|
|
struct iterator {
|
|
patricia_node_t* Xstack[PATRICIA_MAXBITS+1];
|
|
patricia_node_t** Xsp;
|
|
patricia_node_t* Xrn;
|
|
patricia_node_t* Xnode;
|
|
};
|
|
|
|
public:
|
|
PrefixTable() { tree = New_Patricia(128); delete_function = nullptr; }
|
|
~PrefixTable() { Destroy_Patricia(tree, delete_function); }
|
|
|
|
// Addr in network byte order. If data is zero, acts like a set.
|
|
// Returns ptr to old data if already existing.
|
|
// For existing items without data, returns non-nil if found.
|
|
void* Insert(const IPAddr& addr, int width, void* data = 0);
|
|
|
|
// Value may be addr or subnet.
|
|
void* Insert(const Val* value, void* data = 0);
|
|
|
|
// Returns nil if not found, pointer to data otherwise.
|
|
// For items without data, returns non-nil if found.
|
|
// If exact is false, performs exact rather than longest-prefix match.
|
|
void* Lookup(const IPAddr& addr, int width, bool exact = false) const;
|
|
void* Lookup(const Val* value, bool exact = false) const;
|
|
|
|
// Returns list of all found matches or empty list otherwise.
|
|
list<tuple<IPPrefix,void*>> FindAll(const IPAddr& addr, int width) const;
|
|
list<tuple<IPPrefix,void*>> FindAll(const SubNetVal* value) const;
|
|
|
|
// Returns pointer to data or nil if not found.
|
|
void* Remove(const IPAddr& addr, int width);
|
|
void* Remove(const Val* value);
|
|
|
|
void Clear() { Clear_Patricia(tree, delete_function); }
|
|
|
|
// Sets a function to call for each node when table is cleared/destroyed.
|
|
void SetDeleteFunction(data_fn_t del_fn) { delete_function = del_fn; }
|
|
|
|
iterator InitIterator();
|
|
void* GetNext(iterator* i);
|
|
|
|
private:
|
|
static prefix_t* MakePrefix(const IPAddr& addr, int width);
|
|
static IPPrefix PrefixToIPPrefix(prefix_t* p);
|
|
|
|
patricia_tree_t* tree;
|
|
data_fn_t delete_function;
|
|
};
|