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

captures for "when" statements

Browse source 
update Triggers to IntrusivePtr's and simpler AST traversal
introduce IDSet type, migrate associated "ID*" types to "const ID*"
This commit is contained in:
Vern Paxson 2022-01-07 14:50:35 -08:00
parent fa142438fe
commit f895008c34
24 changed files with 648 additions and 202 deletions
Download patch file Download diff file Expand all files Collapse all files

47
src/script_opt/ProfileFunc.h
View file

@ -97,23 +97,23 @@ public:
// See the comments for the associated member variables for each
// of these accessors.
const std::unordered_set<const ID*>& Globals() const { return globals; }
const std::unordered_set<const ID*>& AllGlobals() const { return all_globals; }
const std::unordered_set<const ID*>& Locals() const { return locals; }
const std::unordered_set<const ID*>& Params() const { return params; }
const IDSet& Globals() const { return globals; }
const IDSet& AllGlobals() const { return all_globals; }
const IDSet& Locals() const { return locals; }
const IDSet& WhenLocals() const { return when_locals; }
const IDSet& Params() const { return params; }
const std::unordered_map<const ID*, int>& Assignees() const { return assignees; }
const std::unordered_set<const ID*>& Inits() const { return inits; }
const IDSet& Inits() const { return inits; }
const std::vector<const Stmt*>& Stmts() const { return stmts; }
const std::vector<const Expr*>& Exprs() const { return exprs; }
const std::vector<const LambdaExpr*>& Lambdas() const { return lambdas; }
const std::vector<const ConstExpr*>& Constants() const { return constants; }
const std::unordered_set<const ID*>& UnorderedIdentifiers() const { return ids; }
const IDSet& UnorderedIdentifiers() const { return ids; }
const std::vector<const ID*>& OrderedIdentifiers() const { return ordered_ids; }
const std::unordered_set<const Type*>& UnorderedTypes() const { return types; }
const std::vector<const Type*>& OrderedTypes() const { return ordered_types; }
const std::unordered_set<ScriptFunc*>& ScriptCalls() const { return script_calls; }
const std::unordered_set<const ID*>& BiFGlobals() const { return BiF_globals; }
const std::unordered_set<ScriptFunc*>& WhenCalls() const { return when_calls; }
const IDSet& BiFGlobals() const { return BiF_globals; }
const std::unordered_set<std::string>& Events() const { return events; }
const std::unordered_set<const Attributes*>& ConstructorAttrs() const
{
@ -162,17 +162,20 @@ protected:
//
// Does *not* include globals solely seen as the function being
// called in a call.
std::unordered_set<const ID*> globals;
IDSet globals;
// Same, but also includes globals only seen as called functions.
std::unordered_set<const ID*> all_globals;
IDSet all_globals;
// Locals seen in the function.
std::unordered_set<const ID*> locals;
IDSet locals;
// Same, but for those declared in "when" expressions.
IDSet when_locals;
// The function's parameters. Empty if our starting point was
// profiling an expression.
std::unordered_set<const ID*> params;
IDSet params;
// How many parameters the function has. The default value flags
// that we started the profile with an expression rather than a
@ -187,7 +190,7 @@ protected:
// Same for locals seen in initializations, so we can find,
// for example, unused aggregates.
std::unordered_set<const ID*> inits;
IDSet inits;
// Statements seen in the function. Does not include indirect
// statements, such as those in lambda bodies.
@ -203,13 +206,13 @@ protected:
std::vector<const LambdaExpr*> lambdas;
// If we're profiling a lambda function, this holds the captures.
std::unordered_set<const ID*> captures;
IDSet captures;
// Constants seen in the function.
std::vector<const ConstExpr*> constants;
// Identifiers seen in the function.
std::unordered_set<const ID*> ids;
IDSet ids;
// The same, but in a deterministic order.
std::vector<const ID*> ordered_ids;
@ -226,7 +229,7 @@ protected:
// Same for BiF's, though for them we record the corresponding global
// rather than the BuiltinFunc*.
std::unordered_set<const ID*> BiF_globals;
IDSet BiF_globals;
// Script functions appearing in "when" clauses.
std::unordered_set<ScriptFunc*> when_calls;
@ -283,13 +286,13 @@ public:
// The following accessors provide a global profile across all of
// the (non-skipped) functions in "funcs". See the comments for
// the associated member variables for documentation.
const std::unordered_set<const ID*>& Globals() const { return globals; }
const std::unordered_set<const ID*>& AllGlobals() const { return all_globals; }
const IDSet& Globals() const { return globals; }
const IDSet& AllGlobals() const { return all_globals; }
const std::unordered_set<const ConstExpr*>& Constants() const { return constants; }
const std::vector<const Type*>& MainTypes() const { return main_types; }
const std::vector<const Type*>& RepTypes() const { return rep_types; }
const std::unordered_set<ScriptFunc*>& ScriptCalls() const { return script_calls; }
const std::unordered_set<const ID*>& BiFGlobals() const { return BiF_globals; }
const IDSet& BiFGlobals() const { return BiF_globals; }
const std::unordered_set<const LambdaExpr*>& Lambdas() const { return lambdas; }
const std::unordered_set<std::string>& Events() const { return events; }
@ -345,10 +348,10 @@ protected:
// Globals seen across the functions, other than those solely seen
// as the function being called in a call.
std::unordered_set<const ID*> globals;
IDSet globals;
// Same, but also includes globals only seen as called functions.
std::unordered_set<const ID*> all_globals;
IDSet all_globals;
// Constants seen across the functions.
std::unordered_set<const ConstExpr*> constants;
@ -369,7 +372,7 @@ protected:
std::unordered_set<ScriptFunc*> script_calls;
// Same for BiF's.
std::unordered_set<const ID*> BiF_globals;
IDSet BiF_globals;
// And for lambda's.
std::unordered_set<const LambdaExpr*> lambdas;