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

FuncInfo now tracks priority; some tidying/widening of its accessors

Browse source
This commit is contained in:
Vern Paxson 2021-04-19 16:19:22 -07:00
parent 8d2bb28f03
commit 72f62f398a
3 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/script_opt/ScriptOpt.cc
View file

@ -138,8 +138,10 @@ void optimize_func(ScriptFunc* f, std::shared_ptr<ProfileFunc> pf,
}
FuncInfo::FuncInfo(ScriptFuncPtr _func, ScopePtr _scope, StmtPtr _body)
: func(std::move(_func)), scope(std::move(_scope)), body(std::move(_body))
FuncInfo::FuncInfo(ScriptFuncPtr _func, ScopePtr _scope, StmtPtr _body,
int _priority)
: func(std::move(_func)), scope(std::move(_scope)),
body(std::move(_body)), priority(_priority)
{}
void FuncInfo::SetProfile(std::shared_ptr<ProfileFunc> _pf)
@ -151,7 +153,8 @@ void analyze_func(ScriptFuncPtr f)
*analysis_options.only_func != f->Name() )
return;
funcs.emplace_back(f, ScopePtr{NewRef{}, f->GetScope()}, f->CurrentBody());
funcs.emplace_back(f, ScopePtr{NewRef{}, f->GetScope()},
f->CurrentBody(), f->CurrentPriority());
}
const FuncInfo* analyze_global_stmts(Stmt* stmts)
@ -170,7 +173,7 @@ const FuncInfo* analyze_global_stmts(Stmt* stmts)
StmtPtr stmts_p{NewRef{}, stmts};
auto sf = make_intrusive<ScriptFunc>(id, stmts_p, empty_inits, sc->Length(), 0);
funcs.emplace_back(sf, ScopePtr{NewRef{}, sc}, stmts_p);
funcs.emplace_back(sf, ScopePtr{NewRef{}, sc}, stmts_p, 0);
return &funcs.back();
}
@ -301,7 +304,7 @@ void analyze_scripts()
continue;
auto new_body = f.Body();
optimize_func(f.Func(), f.Profile(), f.Scope(),
optimize_func(f.Func(), f.ProfilePtr(), f.Scope(),
new_body, analysis_options);
f.SetBody(new_body);
}