Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-16 05:28:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Reworked initialization of globals for -O gen-standalone-C++ code

Browse source
This commit is contained in:
Vern Paxson 2025-09-30 11:27:53 -07:00
parent 0700427bac
commit eb13ff3110
15 changed files with 155 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/script_opt/CPP/Vars.cc
View file

@ -7,7 +7,7 @@ namespace zeek::detail {
using namespace std;
void CPPCompile::CreateGlobal(IDPtr g) {
bool CPPCompile::CreateGlobal(IDPtr g) {
auto gn = string(g->Name());
bool is_bif = pfs->BiFGlobals().contains(g);
@ -16,15 +16,17 @@ void CPPCompile::CreateGlobal(IDPtr g) {
// then we'll call it directly.
if ( compilable_funcs.contains(gn) ) {
AddGlobal(gn, "zf");
return;
return false;
}
if ( is_bif ) {
AddBiF(g, false);
return;
return false;
}
}
bool should_init = false;
if ( AddGlobal(gn, "gl") ) { // We'll be creating this global.
Emit("IDPtr %s;", globals[gn]);
@ -32,9 +34,7 @@ void CPPCompile::CreateGlobal(IDPtr g) {
// This is an event that's also used as a variable.
Emit("EventHandlerPtr %s_ev;", globals[gn]);
auto gi = GenerateGlobalInit(g);
global_id_info->AddInstance(gi);
global_gis[g] = std::move(gi);
should_init = true;
}
if ( is_bif )
@ -43,6 +43,8 @@ void CPPCompile::CreateGlobal(IDPtr g) {
AddBiF(g, true);
global_vars.emplace(g);
return should_init;
}
std::shared_ptr<CPP_InitInfo> CPPCompile::RegisterGlobal(IDPtr g) {