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

Replace uses of the old Dict generation code with new template versions

Browse source
This commit is contained in:
Tim Wojtulewicz 2019-07-02 18:55:55 -07:00 • committed by Jon Siwek
parent e2feec52be
commit 50943a580c
26 changed files with 62 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/DFA.h
View file

@ -105,10 +105,8 @@ private:
int hits; // Statistics
int misses;
declare(PDict,CacheEntry);
// Hash indexed by NFA states (MD5s of them, actually).
PDict(CacheEntry) states;
PDict<CacheEntry> states;
};
class DFA_Machine : public BroObj {

4
src/DNS_Mgr.h
View file

@ -28,8 +28,6 @@ typedef PList<DNS_Mgr_Request> DNS_mgr_request_list;
struct nb_dns_info;
struct nb_dns_result;
declare(PDict,ListVal);
class DNS_Mapping;
enum DNS_MgrMode {
@ -143,7 +141,7 @@ protected:
DNS_MgrMode mode;
PDict(ListVal) services;
PDict<ListVal> services;
HostMap host_mappings;
AddrMap addr_mappings;

2
src/Debug.cc
View file

@ -27,7 +27,7 @@ using namespace std;
bool g_policy_debug = false;
DebuggerState g_debugger_state;
TraceState g_trace_state;
PDict(Filemap) g_dbgfilemaps;
PDict<Filemap> g_dbgfilemaps;
// These variables are used only to decide whether or not to print the
// current context; you don't want to do it after a step or next

3
src/Debug.h
View file

@ -31,7 +31,6 @@ struct ParseLocationRec {
class StmtLocMapping;
declare(PQueue,StmtLocMapping);
typedef PQueue(StmtLocMapping) Filemap; // mapping for a single file
declare(PDict,Filemap);
class DbgBreakpoint;
class DbgWatch;
@ -178,7 +177,7 @@ string get_context_description(const Stmt* stmt, const Frame* frame);
extern Frame* g_dbg_locals; // variables created within debugger context
extern PDict(Filemap) g_dbgfilemaps; // filename => filemap
extern PDict<Filemap> g_dbgfilemaps; // filename => filemap
// Perhaps add a code/priority argument to do selective output.
int debug_msg(const char* fmt, ...) __attribute__ ((format (printf, 1, 2)));

2
src/DebugCmds.cc
View file

@ -51,7 +51,7 @@ void lookup_global_symbols_regex(const string& orig_regex, vector<ID*>& matches,
}
Scope* global = global_scope();
PDict(ID)* syms = global->Vars();
PDict<ID>* syms = global->Vars();
ID* nextid;
IterCookie* cookie = syms->InitForIteration();

3
src/EventRegistry.h
View file

@ -37,8 +37,7 @@ public:
void PrintDebug();
private:
declare(PDict, EventHandler);
typedef PDict(EventHandler) handler_map;
typedef PDict<EventHandler> handler_map;
handler_map handlers;
};

7
src/RE.h
View file

@ -22,9 +22,6 @@ class Specific_RE_Matcher;
class RE_Matcher;
class DFA_State;
declare(PDict,char);
declare(PDict,CCL);
extern int case_insensitive;
extern CCL* curr_ccl;
extern NFA_Machine* nfa;
@ -122,8 +119,8 @@ protected:
int multiline;
char* pattern_text;
PDict(char) defs;
PDict(CCL) ccl_dict;
PDict<char> defs;
PDict<CCL> ccl_dict;
PList<CCL> ccl_list;
EquivClass equiv_class;
int* ecs;

4
src/Rule.h
View file

@ -15,9 +15,7 @@ class RuleHdrTest;
class Rule;
typedef PList<Rule> rule_list;
declare(PDict, Rule);
typedef PDict(Rule) rule_dict;
typedef PDict<Rule> rule_dict;
class Rule {
public:

4
src/Scope.cc
View file

@ -19,7 +19,7 @@ Scope::Scope(ID* id, attr_list* al)
attrs = al;
return_type = 0;
local = new PDict(ID)(ORDERED);
local = new PDict<ID>(ORDERED);
inits = new id_list;
if ( id )
@ -108,7 +108,7 @@ void Scope::Describe(ODesc* d) const
TraversalCode Scope::Traverse(TraversalCallback* cb) const
{
PDict(ID)* ids = GetIDs();
PDict<ID>* ids = GetIDs();
IterCookie* iter = ids->InitForIteration();
HashKey* key;

8
src/Scope.h
View file

@ -15,8 +15,6 @@ class ID;
class BroType;
class ListVal;
declare(PDict,ID);
class Scope : public BroObj {
public:
explicit Scope(ID* id, attr_list* al);
@ -35,11 +33,11 @@ public:
BroType* ReturnType() const { return return_type; }
int Length() const { return local->Length(); }
PDict(ID)* Vars() const { return local; }
PDict<ID>* Vars() const { return local; }
ID* GenerateTemporary(const char* name);
PDict(ID)* GetIDs() const { return local; }
PDict<ID>* GetIDs() const { return local; }
// Returns the list of variables needing initialization, and
// removes it from this Scope.
@ -56,7 +54,7 @@ protected:
ID* scope_id;
attr_list* attrs;
BroType* return_type;
PDict(ID)* local;
PDict<ID>* local;
id_list* inits;
};

11
src/Sessions.h
View file

@ -20,9 +20,6 @@ class Connection;
class ConnCompressor;
struct ConnID;
declare(PDict,Connection);
declare(PDict,FragReassembler);
class Discarder;
class PacketFilter;
@ -216,10 +213,10 @@ protected:
const Packet *pkt, const EncapsulationStack* encap);
CompositeHash* ch;
PDict(Connection) tcp_conns;
PDict(Connection) udp_conns;
PDict(Connection) icmp_conns;
PDict(FragReassembler) fragments;
PDict<Connection> tcp_conns;
PDict<Connection> udp_conns;
PDict<Connection> icmp_conns;
PDict<FragReassembler> fragments;
typedef pair<IPAddr, IPAddr> IPPair;
typedef pair<EncapsulatingConn, double> TunnelActivity;

2
src/Stats.cc
View file

@ -239,7 +239,7 @@ void ProfileLogger::Log()
// Script-level state.
unsigned int size, mem = 0;
PDict(ID)* globals = global_scope()->Vars();
PDict<ID>* globals = global_scope()->Vars();
if ( expensive )
{

2
src/Stmt.cc
View file

@ -1147,7 +1147,7 @@ Val* ForStmt::DoExec(Frame* f, Val* v, stmt_flow_type& flow) const
if ( v->Type()->Tag() == TYPE_TABLE )
{
TableVal* tv = v->AsTableVal();
const PDict(TableEntryVal)* loop_vals = tv->AsTable();
const PDict<TableEntryVal>* loop_vals = tv->AsTable();
if ( ! loop_vals->Length() )
return 0;

4
src/Stmt.h
View file

@ -17,8 +17,6 @@
class StmtList;
class ForStmt;
declare(PDict, int);
class Stmt : public BroObj {
public:
BroStmtTag Tag() const { return tag; }
@ -237,7 +235,7 @@ protected:
case_list* cases;
int default_case_idx;
CompositeHash* comp_hash;
PDict(int) case_label_value_map;
PDict<int> case_label_value_map;
std::vector<std::pair<ID*, int>> case_label_type_list;
};

38
src/Val.cc
View file

@ -956,7 +956,7 @@ void TableVal::Init(TableType* t)
subnets = 0;
table_hash = new CompositeHash(table_type->Indices());
val.table_val = new PDict(TableEntryVal);
val.table_val = new PDict<TableEntryVal>;
val.table_val->SetDeleteFunc(table_entry_val_delete_func);
}
@ -979,7 +979,7 @@ void TableVal::RemoveAll()
{
// Here we take the brute force approach.
delete AsTable();
val.table_val = new PDict(TableEntryVal);
val.table_val = new PDict<TableEntryVal>;
val.table_val->SetDeleteFunc(table_entry_val_delete_func);
}
@ -992,7 +992,7 @@ int TableVal::RecursiveSize() const
!= TYPE_TABLE )
return n;
PDict(TableEntryVal)* v = val.table_val;
PDict<TableEntryVal>* v = val.table_val;
IterCookie* c = v->InitForIteration();
TableEntryVal* tv;
@ -1130,7 +1130,7 @@ int TableVal::AddTo(Val* val, int is_first_init, bool propagate_ops) const
return 0;
}
const PDict(TableEntryVal)* tbl = AsTable();
const PDict<TableEntryVal>* tbl = AsTable();
IterCookie* c = tbl->InitForIteration();
HashKey* k;
@ -1178,7 +1178,7 @@ int TableVal::RemoveFrom(Val* val) const
return 0;
}
const PDict(TableEntryVal)* tbl = AsTable();
const PDict<TableEntryVal>* tbl = AsTable();
IterCookie* c = tbl->InitForIteration();
HashKey* k;
@ -1200,14 +1200,14 @@ TableVal* TableVal::Intersect(const TableVal* tv) const
{
TableVal* result = new TableVal(table_type);
const PDict(TableEntryVal)* t0 = AsTable();
const PDict(TableEntryVal)* t1 = tv->AsTable();
PDict(TableEntryVal)* t2 = result->AsNonConstTable();
const PDict<TableEntryVal>* t0 = AsTable();
const PDict<TableEntryVal>* t1 = tv->AsTable();
PDict<TableEntryVal>* t2 = result->AsNonConstTable();
// Figure out which is smaller; assign it to t1.
if ( t1->Length() > t0->Length() )
{ // Swap.
const PDict(TableEntryVal)* tmp = t1;
const PDict<TableEntryVal>* tmp = t1;
t1 = t0;
t0 = tmp;
}
@ -1229,8 +1229,8 @@ TableVal* TableVal::Intersect(const TableVal* tv) const
bool TableVal::EqualTo(const TableVal* tv) const
{
const PDict(TableEntryVal)* t0 = AsTable();
const PDict(TableEntryVal)* t1 = tv->AsTable();
const PDict<TableEntryVal>* t0 = AsTable();
const PDict<TableEntryVal>* t1 = tv->AsTable();
if ( t0->Length() != t1->Length() )
return false;
@ -1256,8 +1256,8 @@ bool TableVal::EqualTo(const TableVal* tv) const
bool TableVal::IsSubsetOf(const TableVal* tv) const
{
const PDict(TableEntryVal)* t0 = AsTable();
const PDict(TableEntryVal)* t1 = tv->AsTable();
const PDict<TableEntryVal>* t0 = AsTable();
const PDict<TableEntryVal>* t1 = tv->AsTable();
if ( t0->Length() > t1->Length() )
return false;
@ -1437,7 +1437,7 @@ Val* TableVal::Lookup(Val* index, bool use_default_val)
return def;
}
const PDict(TableEntryVal)* tbl = AsTable();
const PDict<TableEntryVal>* tbl = AsTable();
if ( tbl->Length() > 0 )
{
@ -1582,7 +1582,7 @@ ListVal* TableVal::ConvertToList(TypeTag t) const
{
ListVal* l = new ListVal(t);
const PDict(TableEntryVal)* tbl = AsTable();
const PDict<TableEntryVal>* tbl = AsTable();
IterCookie* c = tbl->InitForIteration();
HashKey* k;
@ -1623,7 +1623,7 @@ ListVal* TableVal::ConvertToPureList() const
void TableVal::Describe(ODesc* d) const
{
const PDict(TableEntryVal)* tbl = AsTable();
const PDict<TableEntryVal>* tbl = AsTable();
int n = tbl->Length();
if ( d->IsBinary() || d->IsPortable() )
@ -1767,7 +1767,7 @@ void TableVal::DoExpire(double t)
if ( ! type )
return; // FIX ME ###
PDict(TableEntryVal)* tbl = AsNonConstTable();
PDict<TableEntryVal>* tbl = AsNonConstTable();
double timeout = GetExpireTime();
@ -1952,7 +1952,7 @@ Val* TableVal::DoClone(CloneState* state)
auto tv = new TableVal(table_type);
state->NewClone(this, tv);
const PDict(TableEntryVal)* tbl = AsTable();
const PDict<TableEntryVal>* tbl = AsTable();
IterCookie* cookie = tbl->InitForIteration();
HashKey* key;
@ -2001,7 +2001,7 @@ unsigned int TableVal::MemoryAllocation() const
{
unsigned int size = 0;
PDict(TableEntryVal)* v = val.table_val;
PDict<TableEntryVal>* v = val.table_val;
IterCookie* c = v->InitForIteration();
TableEntryVal* tv;

7
src/Val.h
View file

@ -55,7 +55,6 @@ class StateAccess;
class VectorVal;
class TableEntryVal;
declare(PDict,TableEntryVal);
typedef union {
// Used for bool, int, enum.
@ -77,7 +76,7 @@ typedef union {
Func* func_val;
BroFile* file_val;
RE_Matcher* re_val;
PDict(TableEntryVal)* table_val;
PDict<TableEntryVal>* table_val;
val_list* val_list_val;
vector<Val*>* vector_val;
@ -228,7 +227,7 @@ public:
CONST_ACCESSOR2(TYPE_ENUM, int, int_val, AsEnum)
CONST_ACCESSOR(TYPE_STRING, BroString*, string_val, AsString)
CONST_ACCESSOR(TYPE_FUNC, Func*, func_val, AsFunc)
CONST_ACCESSOR(TYPE_TABLE, PDict(TableEntryVal)*, table_val, AsTable)
CONST_ACCESSOR(TYPE_TABLE, PDict<TableEntryVal>*, table_val, AsTable)
CONST_ACCESSOR(TYPE_RECORD, val_list*, val_list_val, AsRecord)
CONST_ACCESSOR(TYPE_FILE, BroFile*, file_val, AsFile)
CONST_ACCESSOR(TYPE_PATTERN, RE_Matcher*, re_val, AsPattern)
@ -396,7 +395,7 @@ protected:
#endif
}
ACCESSOR(TYPE_TABLE, PDict(TableEntryVal)*, table_val, AsNonConstTable)
ACCESSOR(TYPE_TABLE, PDict<TableEntryVal>*, table_val, AsNonConstTable)
ACCESSOR(TYPE_RECORD, val_list*, val_list_val, AsNonConstRecord)
// For internal use by the Val::Clone() methods.

4
src/analyzer/protocol/rpc/RPC.h
View file

@ -99,8 +99,6 @@ protected:
Val* v; // single (perhaps compound) value corresponding to call
};
declare(PDict,RPC_CallInfo);
class RPC_Interpreter {
public:
explicit RPC_Interpreter(analyzer::Analyzer* analyzer);
@ -125,7 +123,7 @@ protected:
void Weird(const char* name, const char* addl = "");
PDict(RPC_CallInfo) calls;
PDict<RPC_CallInfo> calls;
analyzer::Analyzer* analyzer;
};

5
src/analyzer/protocol/stepping-stone/SteppingStone.h
View file

@ -14,7 +14,6 @@ class SteppingStoneEndpoint;
class SteppingStoneManager;
declare(PQueue,SteppingStoneEndpoint);
declare(PDict,SteppingStoneEndpoint);
class SteppingStoneEndpoint : public BroObj {
public:
@ -41,8 +40,8 @@ protected:
// no LOOP in Bro language.
int stp_id;
HashKey* stp_key;
PDict(SteppingStoneEndpoint) stp_inbound_endps;
PDict(SteppingStoneEndpoint) stp_outbound_endps;
PDict<SteppingStoneEndpoint> stp_inbound_endps;
PDict<SteppingStoneEndpoint> stp_outbound_endps;
};
class SteppingStone_Analyzer : public tcp::TCP_ApplicationAnalyzer {

2
src/broker/messaging.bif
View file

@ -28,7 +28,7 @@ std::set<std::string> val_to_topic_set(Val* val)
rval.emplace(val->AsString()->CheckString());
else
{
const PDict(TableEntryVal)* tbl = val->AsTable();
const PDict<TableEntryVal>* tbl = val->AsTable();
if ( tbl->Length() == 0 )
return rval;

3
src/file_analysis/AnalyzerSet.h
View file

@ -14,7 +14,6 @@
namespace file_analysis {
class File;
declare(PDict,Analyzer);
/**
* A set of file analysis analyzers indexed by an \c AnalyzerArgs (script-layer
@ -139,7 +138,7 @@ private:
File* file; /**< File which owns the set */
CompositeHash* analyzer_hash; /**< AnalyzerArgs hashes. */
PDict(file_analysis::Analyzer) analyzer_map; /**< Indexed by AnalyzerArgs. */
PDict<file_analysis::Analyzer> analyzer_map; /**< Indexed by AnalyzerArgs. */
/**
* Abstract base class for analyzer set modifications.

11
src/file_analysis/Manager.h
View file

@ -26,9 +26,6 @@
namespace file_analysis {
declare(PDict,bool);
declare(PDict,File);
/**
* Main entry point for interacting with file analysis.
*/
@ -339,8 +336,8 @@ public:
protected:
friend class FileTimer;
typedef PDict(bool) IDSet;
typedef PDict(File) IDMap;
typedef PDict<bool> IDSet;
typedef PDict<File> IDMap;
/**
* Create a new file to be analyzed or retrieve an existing one.
@ -410,8 +407,8 @@ private:
TagSet* LookupMIMEType(const string& mtype, bool add_if_not_found);
PDict(File) id_map; /**< Map file ID to file_analysis::File records. */
PDict(bool) ignored; /**< Ignored files. Will be finally removed on EOF. */
PDict<File> id_map; /**< Map file ID to file_analysis::File records. */
PDict<bool> ignored; /**< Ignored files. Will be finally removed on EOF. */
string current_file_id; /**< Hash of what get_file_handle event sets. */
RuleFileMagicState* magic_state; /**< File magic signature match state. */
MIMEMap mime_types;/**< Mapping of MIME types to analyzers. */

12
src/input/Manager.cc
View file

@ -52,8 +52,6 @@ static void input_hash_delete_func(void* val)
delete h;
}
declare(PDict, InputHash);
/**
* Base stuff that every stream can do.
*/
@ -109,8 +107,8 @@ public:
RecordType* rtype;
RecordType* itype;
PDict(InputHash)* currDict;
PDict(InputHash)* lastDict;
PDict<InputHash>* currDict;
PDict<InputHash>* lastDict;
Func* pred;
@ -703,9 +701,9 @@ bool Manager::CreateTableStream(RecordVal* fval)
stream->itype = idx->AsRecordType();
stream->event = event ? event_registry->Lookup(event->Name()) : 0;
stream->error_event = error_event ? event_registry->Lookup(error_event->Name()) : nullptr;
stream->currDict = new PDict(InputHash);
stream->currDict = new PDict<InputHash>;
stream->currDict->SetDeleteFunc(input_hash_delete_func);
stream->lastDict = new PDict(InputHash);
stream->lastDict = new PDict<InputHash>;
stream->lastDict->SetDeleteFunc(input_hash_delete_func);
stream->want_record = ( want_record->InternalInt() == 1 );
@ -1425,7 +1423,7 @@ void Manager::EndCurrentSend(ReaderFrontend* reader)
delete(stream->lastDict);
stream->lastDict = stream->currDict;
stream->currDict = new PDict(InputHash);
stream->currDict = new PDict<InputHash>;
stream->currDict->SetDeleteFunc(input_hash_delete_func);
#ifdef DEBUG

2
src/iosource/PktSrc.h
View file

@ -10,8 +10,6 @@
#include "Dict.h"
#include "Packet.h"
declare(PDict,BPF_Program);
namespace iosource {
/**

4
src/probabilistic/Topk.cc
View file

@ -40,7 +40,7 @@ HashKey* TopkVal::GetHash(Val* v) const
TopkVal::TopkVal(uint64 arg_size) : OpaqueVal(topk_type)
{
elementDict = new PDict(Element);
elementDict = new PDict<Element>;
elementDict->SetDeleteFunc(topk_element_hash_delete_func);
size = arg_size;
type = 0;
@ -51,7 +51,7 @@ TopkVal::TopkVal(uint64 arg_size) : OpaqueVal(topk_type)
TopkVal::TopkVal() : OpaqueVal(topk_type)
{
elementDict = new PDict(Element);
elementDict = new PDict<Element>;
elementDict->SetDeleteFunc(topk_element_hash_delete_func);
size = 0;
type = 0;

4
src/probabilistic/Topk.h
View file

@ -33,8 +33,6 @@ struct Element {
~Element();
};
declare(PDict, Element);
class TopkVal : public OpaqueVal {
public:
@ -168,7 +166,7 @@ private:
BroType* type;
CompositeHash* hash;
std::list<Bucket*> buckets;
PDict(Element)* elementDict;
PDict<Element>* elementDict;
uint64 size; // how many elements are we tracking?
uint64 numElements; // how many elements do we have at the moment
bool pruned; // was this data structure pruned?

4
src/zeek.bif
View file

@ -1898,7 +1898,7 @@ function reading_traces%(%): bool
function global_sizes%(%): var_sizes
%{
TableVal* sizes = new TableVal(var_sizes);
PDict(ID)* globals = global_scope()->Vars();
PDict<ID>* globals = global_scope()->Vars();
IterCookie* c = globals->InitForIteration();
ID* id;
@ -1925,7 +1925,7 @@ function global_sizes%(%): var_sizes
function global_ids%(%): id_table
%{
TableVal* ids = new TableVal(id_table);
PDict(ID)* globals = global_scope()->Vars();
PDict<ID>* globals = global_scope()->Vars();
IterCookie* c = globals->InitForIteration();
ID* id;