Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-08 17:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

DFA: remove uses of PDict

Browse source
This commit is contained in:
Tim Wojtulewicz 2019-07-26 12:48:19 -07:00
parent acff8d5a2b
commit bbf49406c1
2 changed files with 36 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/DFA.h
View file

@ -17,7 +17,6 @@ class DFA_State;
class DFA_Machine;
class DFA_State;
struct CacheEntry;
class DFA_State : public BroObj {
public:
@ -64,15 +63,11 @@ protected:
NFA_state_list* nfa_states;
EquivClass* meta_ec; // which ec's make same transition
DFA_State* mark;
CacheEntry* centry;
static unsigned int transition_counter; // see Xtion()
};
struct CacheEntry {
DFA_State* state;
HashKey* hash;
};
using DigestStr = basic_string<u_char>;
class DFA_State_Cache {
public:
@ -80,13 +75,12 @@ public:
~DFA_State_Cache();
// If the caller stores the handle, it has to call Ref() on it.
DFA_State* Lookup(const NFA_state_list& nfa_states,
HashKey** hash);
DFA_State* Lookup(const NFA_state_list& nfa_states, DigestStr& digest);
// Takes ownership of both; hash is the one returned by Lookup().
DFA_State* Insert(DFA_State* state, HashKey* hash);
DFA_State* Insert(DFA_State* state, const DigestStr& digest);
int NumEntries() const { return states.Length(); }
int NumEntries() const { return states.size(); }
struct Stats {
// Sum of all NFA states
@ -106,7 +100,7 @@ private:
int misses;
// Hash indexed by NFA states (MD5s of them, actually).
PDict<CacheEntry> states;
std::map<DigestStr, DFA_State*> states;
};
class DFA_Machine : public BroObj {
@ -134,7 +128,7 @@ protected:
int state_count;
// The state list has to be sorted according to IDs.
int StateSetToDFA_State(NFA_state_list* state_set, DFA_State*& d,
bool StateSetToDFA_State(NFA_state_list* state_set, DFA_State*& d,
const EquivClass* ec);
const EquivClass* EC() const { return ec; }