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

Maintenance updates for -O gen-C++ / -O gen-standalone-C++

Browse source 
fixes for using BiFs in standalone global initializations
  avoiding redundant global initializations
  updates to maintenance scripts and notes
  removal of an unused member variable
This commit is contained in:
Vern Paxson 2023-01-12 14:08:45 -08:00
parent 5827e2ce5d
commit 18f4fcb5a4
12 changed files with 77 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/script_opt/CPP/RuntimeInits.h
View file

@ -405,9 +405,9 @@ class CPP_GlobalInit : public CPP_Init<void*>
{
public:
CPP_GlobalInit(IDPtr& _global, const char* _name, int _type, int _attrs, int _val,
bool _exported)
bool _exported, bool _func_with_no_val)
: CPP_Init<void*>(), global(_global), name(_name), type(_type), attrs(_attrs), val(_val),
exported(_exported)
exported(_exported), func_with_no_val(_func_with_no_val)
{
}
@ -421,6 +421,7 @@ protected:
int attrs;
int val;
bool exported;
bool func_with_no_val;
};
// Abstract class for constructing a CallExpr to evaluate a Zeek expression.
@ -534,7 +535,15 @@ public:
{
}
void ResolveBiF() const { bif_func = lookup_bif__CPP(bif_name.c_str()); }
void ResolveBiF() const
{
// We allow a BiF to be resolved multiple times. This is to
// support plugins that might load BiFs that aren't initially
// available, and also global initializations that might
// require (other) BiFs that *are* initially available.
if ( ! bif_func )
bif_func = lookup_bif__CPP(bif_name.c_str());
}
protected:
zeek::Func*& bif_func; // where to store the pointer to the BiF